diff --git a/admin-web-master/src/components/editor/index.vue b/admin-web-master/src/components/editor/index.vue
index 281cec8..73decdd 100644
--- a/admin-web-master/src/components/editor/index.vue
+++ b/admin-web-master/src/components/editor/index.vue
@@ -177,5 +177,7 @@ value(newVule,old){
     display: none;
   }
 }
-
+::v-deep .title{
+	margin: 0 !important;
+}
 </style>
diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue
index 9a2c8d2..44610e0 100644
--- a/admin-web-master/src/layout/index.vue
+++ b/admin-web-master/src/layout/index.vue
@@ -27,7 +27,7 @@
 							<span class="user-name">{{ name }}</span>
 						</div>
 					</div>
-					
+
 					<!-- <el-dropdown  trigger="click">
 						<div class="avatar-wrapper" style="margin-left: 20px">
 							<img :src="userAvatar" class="user-avatar">
@@ -716,9 +716,9 @@
 			gzt() {
 
 				// window.location.href = 'https://admin-uat.028wlkj.com:1020/application-manage'
-				window.location.href = 'https://zhgw.028wlkj.com:20443/home'
+				window.location.href = 'https://zhgw-uat.028wlkj.com/home'
 				// window.location.href = 'http://128.10.9.151:5173/home'
-				
+
 
 			},
 			findMatchingNames(List, msg) {
@@ -782,7 +782,7 @@
 				]
 				// this.getMemu()
 				// this.waibu()
-				
+
 				this.neibu()
 				this.list = this.mumeList
 			},
@@ -1044,4 +1044,4 @@
 	.el-menu {
 		padding: 12px 0;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index dcad9bb..366206c 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -18,7 +18,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost
 
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
   // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
-  baseURL = 'http://128.10.250.218:9003';
+  baseURL = 'http://128.10.249.21:9003';
 
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
   // baseURL = 'http://192.168.2.225:9003';
diff --git a/admin-web-master/src/views/customer/yixiang/index.vue b/admin-web-master/src/views/customer/yixiang/index.vue
index da4139f..8b6a560 100644
--- a/admin-web-master/src/views/customer/yixiang/index.vue
+++ b/admin-web-master/src/views/customer/yixiang/index.vue
@@ -8,16 +8,13 @@
       <div>
         <!-- 搜索 -->
         <div class="formSearch">
-          <el-form :inline="true" :model="formSel">
+          <!-- <el-form :inline="true" :model="formSel">
             <el-form-item label="意向客户名称">
               <el-input v-model="formSel.intentCustomerName" placeholder="请输入" class="moren" style="width:168px" />
             </el-form-item>
             <el-form-item label="意向资源名称">
               <el-input v-model="formSel.intentionalStoreName" placeholder="请输入" class="moren" style="width:168px" />
             </el-form-item>
-            <!-- <el-form-item label="编号">
-              <el-input v-model="formSel.id" placeholder="请输入" class="moren" style="width:168px" />
-            </el-form-item> -->
             <el-form-item label="意向资源类型">
               <el-select v-model="formSel.intentionalBusinessType" placeholder="请选择" style="width:168px">
                 <el-option label="商铺" value="商铺" />
@@ -27,14 +24,14 @@
             </el-form-item>
 
 
-          </el-form>
-          <div>
+          </el-form> -->
+          <!-- <div>
             <el-button style="background-color: #3F9B6A;color: #fff" @click="onSubmit">查询
             </el-button>
             <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
               @click="resetting">重置
             </el-button>
-          </div>
+          </div> -->
 
         </div>
         <div style="margin-bottom:20px;">
@@ -55,7 +52,7 @@
              <el-table-column label="意向租金(月)" prop="rentalRent" min-width="120" />
              <el-table-column label="意向区域" prop="intentionRegion" min-width="150" />
 
-              <el-table-column label="操作" min-width="200" fixed="right">
+              <el-table-column label="操作" min-width="100" fixed="right">
                 <template slot-scope="scope">
                   <div class="tableBtn greens" @click="handleEditForm(scope.row)">
                     查看
@@ -63,9 +60,9 @@
                   <div class="tableBtn greens" @click="bianjilist(scope.row)" >
                     编辑
                   </div>
-                  <div class="tableBtn greens" @click="pipei(scope.row)" >
+                  <!-- <div class="tableBtn greens" @click="pipei(scope.row)" >
                     一键匹配
-                  </div>
+                  </div> -->
                 </template>
               </el-table-column>
             </el-table>
@@ -76,7 +73,7 @@
                 @current-change="handleCurrentChange" />
             </div>
 
-        
+
         <!-- 详情框  :visible.sync="detbox" -->
         <!-- <div  v-show="detbox" class="dialog_css_Xq " style="padding: 0;width:85%"> -->
         <el-dialog :visible.sync="detbox" custom-class="tongyong_css" style="padding: 0" width="55%" center
@@ -291,8 +288,8 @@
             </div>
           </div>
         </el-dialog>
-        
-        
+
+
       </div>
     </div>
 	<!-- 一键匹配 -->
@@ -317,7 +314,7 @@
                 <el-option label="广告位" value="gg" />
                 <el-option label="场地" value="cd" />
               </el-select>
-    
+
             </el-form-item>
             <el-form-item label="租期">
               <el-select v-model="pipeiSel.resources.cereRentalPolicies.leaseTerm"  style="width: 90%;">
@@ -342,7 +339,7 @@
 			  @click="pipeiClose">重置</el-button>
               <el-button style="background-color: #3F9B6A;color: #fff"
             @click="pipeiBtn">查询</el-button>
-              
+
             </div>
         </div>
       </div>
diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js
index 41a9fbf..aa714e5 100644
--- a/ceres-uniapp-master/config/api.js
+++ b/ceres-uniapp-master/config/api.js
@@ -1,6 +1,7 @@
 
 const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
 const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
+const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
 // const DOMAIN_PREFIXPING = 'http://128.10.250.134:9003' 
 // const DOMAIN_PREFIX = 'http://128.10.250.134:9007'
 const LIULIANG = 'https://jy.scjysm.asia:18086/liuliang'
@@ -44,7 +45,7 @@ module.exports = {
 	terminal: TERMINAL, // 画布设备 1 小程序，2 H5，3 App 4 电脑
 	SettledMerchantPrefix: 'https://jy.scjysm.asia:18086/cdwlMall/settled-merchant', //商家入驻链接
 	
-	shareLink: DOMAIN_PREFIX + '/cdwlMall/meh5', // 分享地址
+	shareLink: TIAOZHUAN + 'meh5', // 分享地址
 	// shareLink: 'http://172.16.61.123:9007/h5', // 分享地址
 	
 
diff --git a/wenjuan-h5/config/api.js b/wenjuan-h5/config/api.js
index 29a66ed..696fd5f 100644
--- a/wenjuan-h5/config/api.js
+++ b/wenjuan-h5/config/api.js
@@ -1,33 +1,21 @@
 
-// const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/admin-server'
-// const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/api'
-// let DOMAIN_PREFIXPING = 'http://172.16.61.125:9003' 
-// let DOMAIN_PREFIX = 'http://172.16.61.125:9007'
-
-
-// const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/meserver/admin-server'
-// const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/meserver/api'
-// const DOMAIN_PREFIXPING = 'http://172.16.61.123:80/cdwlMall/admin-server' 
-// const DOMAIN_PREFIX = 'http://172.16.61.123:80/cdwlMall/api'
-
-// const host = `${window.location.protocol}//${window.location.host}`
-// const DOMAIN_PREFIXPING = `${host}/cdwlMall/admin-server`
-// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` 
 
 let DOMAIN_PREFIXPING = `http://10.0.0.41:9003`
 let DOMAIN_PREFIX = 'http://10.0.0.41:9007'
 
 let host = window.location.host;
 let hostall = window.location.href;
-if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
+if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:8082'|| host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
 
-  DOMAIN_PREFIXPING = 'http://10.0.0.41:9003'
-  DOMAIN_PREFIX = 'http://10.0.0.41:9007'
+  // DOMAIN_PREFIXPING = 'http://10.0.0.41:9003'
+  DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
+ DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
+  // DOMAIN_PREFIX = 'http://10.0.0.41:9007'
 
 } else {
   let c1 = hostall.split('cdwlMall')[0];
    DOMAIN_PREFIXPING = `${c1}/cdwlMall/admin-server`
-   DOMAIN_PREFIX =`${c1}/cdwlMall/meserver/api` 
+   DOMAIN_PREFIX =`${c1}/cdwlMall/meserver/api`
 }
 // #ifndef H5
 const WX_API_BASE = DOMAIN_PREFIX // app
diff --git a/wenjuan-h5/pages_category_page1/question/question.vue b/wenjuan-h5/pages_category_page1/question/question.vue
index 9eee1e1..0d90e37 100644
--- a/wenjuan-h5/pages_category_page1/question/question.vue
+++ b/wenjuan-h5/pages_category_page1/question/question.vue
@@ -702,7 +702,9 @@
 
 				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`
diff --git a/wenjuan-pc/src/utils/request.js b/wenjuan-pc/src/utils/request.js
index d4868b5..fd25394 100644
--- a/wenjuan-pc/src/utils/request.js
+++ b/wenjuan-pc/src/utils/request.js
@@ -21,8 +21,8 @@ let hostall = window.location.href;
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
 
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
-  baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
-  // baseURL = 'http://172.16.61.123:9003';
+  // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
+  baseURL = 'http://128.10.249.21:9003';
   // baseURL = 'http://172.16.61.125:9003';
   // baseURL = 'http://192.168.2.36:9003';
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
diff --git a/wenjuan-pc/src/views/investigation/index.vue b/wenjuan-pc/src/views/investigation/index.vue
index a0b09f0..7566e51 100644
--- a/wenjuan-pc/src/views/investigation/index.vue
+++ b/wenjuan-pc/src/views/investigation/index.vue
@@ -359,19 +359,22 @@
 						<!-- <img :src="secondData.coverImage" alt="" style="width:25%" /> -->
 					</div>
 					<div style="padding: 20px 0 ;">参与答卷奖励</div>
-					<el-descriptions class="margin-top" :column="3" border :label-style="labelStyle"
-						:content-style="contentStyle">
+					<el-descriptions class="margin-top" :column="3" border :label-style="labelStylejiang"
+						:content-style="contentStylejiang">
 						<el-descriptions-item>
 							<template slot="label">
 								提交问卷后
 							</template>
-							{{ secondData.rewardForParticipation }}
+							{{ secondData.rewardForParticipation!=''?'转盘抽奖':'不设置奖励'}}
 						</el-descriptions-item>
 						<el-descriptions-item>
 							<template slot="label">
 								奖励
 							</template>
-
+							<div>
+								 <span>{{ secondData.rewardForParticipation!=''?'转盘抽奖活动':''}}</span>
+								 <span  v-if="jiangli.id && jiangli.id!=''" style="padding: 0 20px;color: #3F9B6A;cursor: pointer;" @click="actGo(1)">查看</span>
+							</div>
 						</el-descriptions-item>
 					</el-descriptions>
 					<div style="padding: 20px 0 ;">问卷题目</div>
@@ -566,7 +569,7 @@
 										</div>
 										<el-form ref="form" :model="formInline" label-width="140px"
 											style="padding:20px;">
-											<el-radio-group v-model="formInline.rewardForParticipation"
+											<el-radio-group v-model="radioreward"
 												@change="radioClick">
 												<el-radio label="不设置奖励" value="不设置奖励">不设置奖励</el-radio>
 												<!-- <el-radio label="奖励积分" value="奖励积分">奖励积分</el-radio> -->
@@ -580,16 +583,15 @@
 												奖励 <el-input v-model="jifen" style="width:50px;" />积分
 											</div>
 										</div> -->
-										<div v-if="formInline.rewardForParticipation === '转盘抽奖'"
+										<div v-if="radioreward === '转盘抽奖'"
 											style="padding: 0  0 20px 20px;">
-											
-											<div v-if="jiangli && jiangli.id"  style="padding: 10px 0;">
+											<div  v-if="jiangli.id && jiangli.id!=''" style="padding: 10px 0;">
 												 <span>{{jiangli.name}}</span>
 												 <span style="padding: 0 20px;color: #3F9B6A;cursor: pointer;" @click="actGo(1)">查看</span>
 												 <span style="color: #3F9B6A;cursor: pointer;" @click="actGo(2)">编辑</span>
 											</div>
 											<div   v-else>
-												<el-button class="buttonHover"
+												<el-button
 													style="color: #fff;background-color: #3F9B6A;"
 													@click="actGo(0)">创建活动</el-button>
 											</div>
@@ -606,15 +608,7 @@
 
 								</div>
 							</div>
-							<el-dialog :visible.sync="iframaShow" title="创建活动" width="90%" center top="1%"
-								:close-on-click-modal="false" append-to-body>
-								<div style="padding:20px;">
-									<iframe :src="iframaUrl" ref="iframe" frameborder="0" width="100%" height="700px" />
-									<div style="padding-top:20px;display:flex;justify-content: flex-end;">
-									</div>
-								</div>
 
-							</el-dialog>
 						</el-tab-pane>
 						<el-tab-pane label="问卷内容" name="second">
 							<div style="width: 100%">
@@ -1002,27 +996,27 @@
 										<div>参与答卷奖励</div>
 									</div>
 									<el-form ref="form" :model="secondData" label-width="140px" style="padding:20px;">
-										<el-radio-group v-model="secondData.rewardForParticipation"
+										<el-radio-group v-model="radioreward"
 											@change="radioClick">
 											<el-radio label="不设置奖励" value="不设置奖励">不设置奖励</el-radio>
 											<!-- <el-radio label="奖励积分" value="奖励积分">奖励积分</el-radio> -->
 											<el-radio label="转盘抽奖" value="转盘抽奖">转盘抽奖</el-radio>
 											<!-- <el-radio label="优惠券" value="优惠券">优惠券</el-radio> -->
 										</el-radio-group>
-										<div v-if="secondData.rewardForParticipation === '转盘抽奖'"
+										<div v-if="radioreward === '转盘抽奖'"
 											style="padding: 0  0 20px 20px;">
-											<div  v-if="jiangli && jiangli.id" style="padding: 10px 0;">
+											<div  v-if="jiangli.id && jiangli.id!=''" style="padding: 10px 0;">
 												 <span>{{jiangli.name}}</span>
 												 <span style="padding: 0 20px;color: #3F9B6A;cursor: pointer;" @click="actGo(1)">查看</span>
 												 <span style="color: #3F9B6A;cursor: pointer;" @click="actGo(2)">编辑</span>
 											</div>
 											<div v-else>
-												<el-button class="buttonHover"
+												<el-button
 													style="color: #fff;background-color: #3F9B6A;"
 													@click="actGo(0)">创建活动</el-button>
 											</div>
-											
-											
+
+
 										</div>
 									</el-form>
 								</div>
@@ -1458,6 +1452,15 @@
 				</div>
 			</div>
 		</el-dialog>
+		<el-dialog :visible.sync="iframaShow" title="创建活动" width="90%" center top="1%"
+			:close-on-click-modal="false" append-to-body>
+			<div style="padding:20px;">
+				<iframe :src="iframaUrl" ref="iframe" frameborder="0" width="100%" height="700px" />
+				<div style="padding-top:20px;display:flex;justify-content: flex-end;">
+				</div>
+			</div>
+
+		</el-dialog>
 	</div>
 
 </template>
@@ -1526,7 +1529,7 @@
 					filler: '',
 					fillingConditions: '可重复填写',
 					coverImage: '',
-					rewardForParticipation: '不设置奖励',
+					rewardForParticipation: '',
 					questionId: '',
 					responseStatus: '',
 					reviewStatus: '1',
@@ -1596,6 +1599,12 @@
 				contentStyle: {
 					width: '246px'
 				},
+				labelStylejiang: {
+					width: '180px'
+				},
+				contentStylejiang: {
+					width: '300px'
+				},
 				timuXiang: false,
 				timuData: {},
 				multipleSelection: [],
@@ -1725,9 +1734,13 @@
 				iframaShow: false,
 				iframeWin:null,
 				jiangli:{
-					id:1894944771529637890,
-					name:'商业抽奖活动'
-				}
+					id:'1894944771529637890',  //活动id
+					name:'商业抽奖活动', //活动名称
+					styles:'1', //抽奖样式 1：大转盘 2：砸金蛋 3：刮刮卡 4：翻牌乐 5：福袋 6：摇一摇
+					// id:'',
+					// name:''
+				},
+				radioreward:'不设置奖励'
 			}
 		},
 		computed: {
@@ -1738,21 +1751,18 @@
 		},
 		 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
-				  // }
 				  this.jiangli = {
-				  					  id:1894944771529637890,
-				  					  name:'商业抽奖活动'
+					  id:''+data.id,
+					  name:data.name,
+					  styles:data.style
 				  }
+				  this.iframaShow = false
 		        }
 		      })
 		      // this.iframeWin = this.$refs.iframe.contentWindow
@@ -1799,23 +1809,15 @@
 							})
 							return false;
 						}
-						if (this.formInline.rewardForParticipation == '奖励积分') {
-							if (this.jifen == '') {
+						if (this.radioreward == '转盘抽奖') {
+							if (this.jiangli.id && this.jiangli.id== '') {
 								this.$message({
-									message: '请输入设置的积分',
-								})
-								return false;
-							}
-						} else {
-							// this.formInline.rewardForParticipation =
-						}
-						if (this.formInline.rewardForParticipation == '转盘抽奖') {
-							if (this.choujiang == '') {
-								this.$message({
-									message: '请输入转盘抽奖次数',
+									message: '请创建转盘活动',
 								})
 								return false;
 							}
+						}else{
+							this.jiangli.id = ''
 						}
 						let ids = null
 						if (this.wenConstData.length != 0) {
@@ -1827,7 +1829,7 @@
 							})
 							return false;
 						}
-
+						this.formInline.rewardForParticipation = this.jiangli.id
 						this.formInline.createTime = this.currentTime()
 						TerminaAdd(this.formInline).then(res => {
 							if (res.data.code == '500') {
@@ -1894,7 +1896,7 @@
 					item.question = JSON.parse(item.question)
 				}
 				const array = this.objectToArray(item.question)
-
+				this.jiangli.id	= item.rewardForParticipation
 				this.wenData = array
 				// this.secondData.cereQuestionManagements.map((res, index) => {
 				//   if (typeof res.optionSettings == 'string') {
@@ -2060,7 +2062,12 @@
 				if (typeof item.question === 'string') {
 					item.question = JSON.parse(item.question)
 				}
-
+				if(item.rewardForParticipation!=''){
+					this.radioreward='转盘抽奖'
+				}else{
+					this.radioreward='不设置奖励'
+				}
+			this.jiangli.id	= item.rewardForParticipation
 				this.secondDataTi = item.cereQuestionManagements
 				this.bainjiBox = true
 
@@ -2083,6 +2090,17 @@
 				if (this.secondDataTi.length != 0) {
 					ids = this.secondDataTi.map(item => item.id);
 				}
+				if (this.radioreward == '转盘抽奖') {
+					if (this.jiangli.id &&this.jiangli.id== '') {
+						this.$message({
+							message: '请创建转盘活动',
+						})
+						return false;
+					}
+				}else{
+					this.jiangli.id = ''
+				}
+				this.secondData.rewardForParticipation = this.jiangli.id
 				this.secondData.questionId = ids.join(',')
 				this.secondData.updateTime = this.currentTime()
 
@@ -2561,7 +2579,7 @@
 					filler: '',
 					fillingConditions: '可重复填写',
 					coverImage: '',
-					rewardForParticipation: '不设置奖励',
+					rewardForParticipation: '',
 					questionId: '',
 					responseStatus: '',
 					reviewStatus: '1',
@@ -2570,8 +2588,13 @@
 					needGender: '必填',
 					needOpinion: '必填',
 				}
+				// this.jiangli={
+				// 	id:'',
+				// 	name:'',
+				// 	styles:''
+				// }
 				this.xuanzheData = []
-
+				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());
@@ -2814,10 +2837,10 @@
 					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 = 
+
+				// window.location.href =
 			},
-		
+
 		}
 
 	}
@@ -3191,4 +3214,4 @@
 		}
 
 	}
-</style>
\ No newline at end of file
+</style>