diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue
index bfe4062..bea6de8 100644
--- a/admin-web-master/src/layout/index.vue
+++ b/admin-web-master/src/layout/index.vue
@@ -197,17 +197,17 @@
 				}
 			}
 			return {
-				msg: [],
-				list: [],
+				// msg: [],
+				// list: [],
 				// msg: ['招商服务系统'],
-				// msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],
-				// list: [
-				// 	['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],
-				// 	['品牌策划', '活动策划', '氛围策划', '媒体推广'],
-				// 	['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],
-				// 	['联机交易', '对账处理', '日志管理', '商户服务'],
-				// 	['渠道售票统计分析', '销售额统计分析'],
-				// ],
+				msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],
+				list: [
+					['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],
+					['品牌策划', '活动策划', '氛围策划', '媒体推广'],
+					['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],
+					['联机交易', '对账处理', '日志管理', '商户服务'],
+					['渠道售票统计分析', '销售额统计分析'],
+				],
 				listMune: [],
 				mumeList: [],
 				mumeChildren1: [],
@@ -296,10 +296,10 @@
 			this.userAvatar = getUserAvatar()
 		},
 		mounted() {
-			this.getMemu()
-			this.address()
-			this.waibu()
-			// this.neibu()
+			// this.getMemu()
+			// this.address()
+			// this.waibu()
+			this.neibu()
 		},
 
 		methods: {
diff --git a/admin-web-master/src/views/customer/rUser/index.vue b/admin-web-master/src/views/customer/rUser/index.vue
index 860894b..46ea0e5 100644
--- a/admin-web-master/src/views/customer/rUser/index.vue
+++ b/admin-web-master/src/views/customer/rUser/index.vue
@@ -326,10 +326,30 @@ import merchantInformation from '../../../components/merchantInformation/index.v
         },
         this.getAll()
       },
-     async sethei(ids, num) {
-       // console.log(ids, num)
-      await cerePlatformMerchantedit({id:ids,isBlackList:num})
-      this.getAll()
+      sethei(ids, num) {
+         const h = this.$createElement;
+                   this.$msgbox({
+                     title: '消息',
+                     message: h('p', null, [
+                       h('span', null, '是否处理'),
+                     ]),
+                     showCancelButton: true,
+                     showClose:false,
+                     confirmButtonText: '确定',
+                     cancelButtonText: '取消',
+                     customClass:'oe-dialog-btn',
+                     beforeClose: (action, instance, done) => {
+                       if (action === 'confirm') {
+                         cerePlatformMerchantedit({id:ids,isBlackList:num}).then(res=>{
+                            this.getAll()
+                           done();
+                         })
+                       } else {
+                         done();
+                       }
+         }
+         })
+       
       }
     }
   }
diff --git a/admin-web-master/src/views/customer/yixiang/index.vue b/admin-web-master/src/views/customer/yixiang/index.vue
index e56042a..5db57b7 100644
--- a/admin-web-master/src/views/customer/yixiang/index.vue
+++ b/admin-web-master/src/views/customer/yixiang/index.vue
@@ -33,6 +33,14 @@
 					</el-table-column>
 					<el-table-column prop="actualUsableArea" min-width="150" label="实际使用面积" show-overflow-tooltip>
 					</el-table-column>
+					<el-table-column prop="createTime" label="匹配时间" min-width="140">
+						<template slot-scope="scope">
+								{{formatISODate(scope.row.createTime)}}
+						</template>
+						</el-table-column>
+						<el-table-column prop="shopId" label="匹配人" min-width="150">
+							
+							</el-table-column>
 					<el-table-column label="操作" min-width="100" fixed="right">
 						<template slot-scope="scope">
 							<!-- <div class="tableBtn greens" @click="handleEditForm(scope.row)">
@@ -114,9 +122,9 @@
 							<el-select v-model="pipeiSel.resources.cereRentalPolicies.rentalPrice" placeholder="请选择"
 								style="width: 100%;">
 								<el-option label="0-2000" value="0-2000" />
-								<el-option label="2000-5000" value="2000-5000" />
-								<el-option label="5000-10000" value="5000-10000" />
-								<el-option label="10000-20000" value="10000-20000" />
+								<el-option label="2001-5000" value="2001-5000" />
+								<el-option label="5001-10000" value="5001-10000" />
+								<el-option label="10001-20000" value="10001-20000" />
 							</el-select>
 						</el-form-item>
 						<el-form-item style="margin-left: -70px;">
@@ -169,7 +177,7 @@
 								{{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):'无'}}
 						</template>
 						</el-table-column>
-
+					
 				</el-table>
 
 				<div class="fenye">
@@ -380,7 +388,8 @@
 									belongingRegion:this.pipeiSel.belongingRegion,
 									applicableResources:this.pipeiSel.resources.cereRentalPolicies.applicableResources,
 									matchingRecord: JSON.stringify(res.data.content),
-									type:2
+									type:2,
+									shopId:localStorage.getItem('roleName')
 								}
 								recordInsert(obj).then(item=>{})
 							}
@@ -415,6 +424,23 @@
 				this.$refs.pipform.resetFields();
 				this.pipData = []
 			},
+			formatISODate(isoDateStr, format = 'YYYY-MM-DD HH:mm:ss') {
+			    const date = new Date(isoDateStr);
+			    const year = date.getFullYear();
+			    const month = String(date.getMonth() + 1).padStart(2, '0');
+			    const day = String(date.getDate()).padStart(2, '0');
+			    const hours = String(date.getHours()).padStart(2, '0');
+			    const minutes = String(date.getMinutes()).padStart(2, '0');
+			    const seconds = String(date.getSeconds()).padStart(2, '0');
+			
+			    return format
+			      .replace('YYYY', year)
+			      .replace('MM', month)
+			      .replace('DD', day)
+			      .replace('HH', hours)
+			      .replace('mm', minutes)
+			      .replace('ss', seconds);
+			}
 		}
 	}
 </script>
diff --git a/admin-web-master/src/views/serve/Merchant/index.vue b/admin-web-master/src/views/serve/Merchant/index.vue
index 4ca2718..fb6f4e9 100644
--- a/admin-web-master/src/views/serve/Merchant/index.vue
+++ b/admin-web-master/src/views/serve/Merchant/index.vue
@@ -19,14 +19,14 @@
             <el-form-item label="联系电话">
               <el-input v-model="pageindex.contactPhone" placeholder="请输入" style="width:168px;" />
             </el-form-item>
-            <el-form-item label="合作类型">
+            <!-- <el-form-item label="合作类型">
               <el-select v-model="pageindex.cooperationType" placeholder="请选择" style="width:168px;margin-right: 15px">
                 <el-option label="品牌推广合作" value="品牌推广合作" />
                 <el-option label="场地租赁合作" value="场地租赁合作" />
                 <el-option label="文化旅游合作" value="文化旅游合作" />
                 <el-option label="健康生活产品合作" value="健康生活产品合作" />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </el-form>
           <div style="width:20%">
             <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
diff --git a/ceres-uniapp-master/pages/tabbar/user/index.vue b/ceres-uniapp-master/pages/tabbar/user/index.vue
index 4a44547..82adcda 100644
--- a/ceres-uniapp-master/pages/tabbar/user/index.vue
+++ b/ceres-uniapp-master/pages/tabbar/user/index.vue
@@ -27,7 +27,7 @@
 			<view class="user-info-box " v-else>
 				<image class="user-image u-skeleton-fillet"
 					@click="handleJump('../../../pages_category_page2/userModule/personalDetails')"
-					v-if="userItem.headImage" :src="userItem.headImage" mode="widthFix"
+					v-if="userItem.headImage" :src="$baseURL+userItem.headImage" 
 					style="border-radius: 25%; border: 2px solid #fff;"></image>
 				<image class="user-image" v-else src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/img//user/morentouxiang.png"
 					mode="widthFix">
diff --git a/ceres-uniapp-master/pages_category_page2/userModule/personalDetails.vue b/ceres-uniapp-master/pages_category_page2/userModule/personalDetails.vue
index df4d9f2..cb7c3cd 100644
--- a/ceres-uniapp-master/pages_category_page2/userModule/personalDetails.vue
+++ b/ceres-uniapp-master/pages_category_page2/userModule/personalDetails.vue
@@ -5,9 +5,14 @@
 		<view class="headBox">
 			<view class="personalHead-box flex-sp-between flex-display flex-items">
 				<label>头像</label>
-				<image class="user-headImg" v-if="item.headImage" :src="item.headImage"></image>
+				<image
+				      class="user-headImg"
+				      :src="$baseURL+item.headImage || 'https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/img//user/morentouxiang.png'"
+				      @click="userHeadTap"
+				    ></image>
+			<!-- 	<image class="user-headImg" v-if="item.headImage" :src="item.headImage"></image>
 				<image class="user-headImg" v-else src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/img//user/morentouxiang.png">
-				</image>
+				</image> -->
 			</view>
 		</view>
 		<view class="personalBack-box flex-items-plus flex-column">
@@ -261,15 +266,44 @@
 					this.name = res.data.name
 					this.birthday = res.data.birthday
 				}).catch(res => {
-
+			
 				})
 			},
 			userHeadTap() {
-				return
+				// return
 				uni.chooseImage({
 					count: 1,
-					sizeType: ['compressed'],
-					success: (res) => {}
+					sizeType: ['compressed','album', 'camera'],
+					success: (res) => {
+						  const tempFilePaths = res.tempFilePaths;
+						          // 这里可以进行图片上传操作，以下只是示例更新本地数据
+						 this.item.headImage = tempFilePaths[0];
+						// console.log('23423423',res)
+						uni.uploadFile({
+						            url: API.UpUrl,
+						            filePath: tempFilePaths[0],
+						            name: 'file',
+						            success: (uploadRes) => {
+						              console.log('上传成功', JSON.parse(uploadRes.data).data);
+										NET.request(API.UpdateUser, {
+											headImage:JSON.parse(uploadRes.data).data
+										}, 'POST').then(res => {
+											this.GetUser()
+											uni.hideLoading()
+											uni.showToast({
+												title: '修改成功',
+												icon: "success"
+											})
+										}).catch(res => {
+											uni.hideLoading()
+										})
+						            },
+						            fail: (err) => {
+						              console.log('上传失败', err);
+						            }
+						          })
+						
+					}
 				})
 			},
 			//生日
diff --git a/ceres-uniapp-master/utils/payUtil.js b/ceres-uniapp-master/utils/payUtil.js
index b0f1ea6..c98f737 100644
--- a/ceres-uniapp-master/utils/payUtil.js
+++ b/ceres-uniapp-master/utils/payUtil.js
@@ -21,20 +21,24 @@ async function payH5InEquipment(payInfo) {
 		 // })
 		  // NET.request(API.gotoH5Pay, payInfo, 'POST').then(res1=>{
 			  console.log('支付参数',payInfo)
-         NET.request(API.Wenlv, payInfo, 'POST').then(res1=>{
-			 console.log('文旅支付参数',JSON.parse(res1.data).data.codeUrl)
-			   uni.setStorageSync('homePageRoute', '/pages/tabbar/user/index');
-			   
-			  location.replace(JSON.parse(res1.data).data.codeUrl)
-		 //  NET.request(API.Gethu,payInfo, 'POST').then(res=>{
-			  
-			//   // location.replace(res1.data.codeUrl)
-		 // }).catch(err=>{
-			//  console.log(err)
-		 // })
+  //        NET.request(API.Wenlv, payInfo, 'POST').then(res1=>{
+		// 	 console.log('文旅支付参数',JSON.parse(res1.data).data.codeUrl)
+		// 	   uni.setStorageSync('homePageRoute', '/pages/tabbar/user/index');
+		// 	  location.replace(JSON.parse(res1.data).data.codeUrl)
+		//   NET.request(API.Gethu,payInfo, 'POST').then(res=>{
+
+		//  }).catch(err=>{
+		// 	 console.log(err)
+		//  })
 			
-		})
-       
+		// })
+       const res1 = await NET.request(API.Wenlv, payInfo, 'POST');
+               console.log('文旅支付参数', JSON.parse(res1.data).data.codeUrl)
+               const codeUrl = JSON.parse(res1.data).data.codeUrl
+			   if(codeUrl){
+				   location.replace(codeUrl)
+			   }
+               
     } catch (e) {
         this.submitActive = true
         uni.showToast({
diff --git a/lvdao-miniapp/pages/shops/shops.vue b/lvdao-miniapp/pages/shops/shops.vue
index 2d98da2..193f442 100644
--- a/lvdao-miniapp/pages/shops/shops.vue
+++ b/lvdao-miniapp/pages/shops/shops.vue
@@ -345,11 +345,15 @@
 						},
 						{
 							value: '2',
-							label: '2000-5000'
+							label: '2001-5000'
 						},
 						{
 							value: '3',
-							label: '5000-10000'
+							label: '5001-10000'
+						},
+						{
+							value: '4',
+							label: '10001-20000'
 						}
 					]
 				} else {
@@ -442,6 +446,14 @@
 				})
 			},
 			request() {
+				const isLogin = uni.getStorageSync('user');
+				if (isLogin == '') {
+					// 如果未登录，跳转到登录页面
+					uni.navigateTo({
+						url: '/pages/login/login'
+					})
+					return false
+				}
 				if (!this.formList.belongingRegion) {
 					uni.showToast({
 						icon: 'none',
@@ -481,7 +493,8 @@
 							belongingRegion:this.formList.belongingRegion,
 							applicableResources:'商铺',
 							matchingRecord: JSON.stringify(res.data.data.content),
-							type:2
+							type:2,
+							shopId:isLogin.phone
 						}
 						this.$http.sendRequest('/resourceStrategyMatchingRecord/insert', 'POST', obj, 1).then(
 							res => {