diff --git a/admin-web-master/src/components/chakan/cd.vue b/admin-web-master/src/components/chakan/cd.vue
index 91d1860..8664bec 100644
--- a/admin-web-master/src/components/chakan/cd.vue
+++ b/admin-web-master/src/components/chakan/cd.vue
@@ -20,7 +20,7 @@
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="实际使用面积" prop="actualArea">
-                      <div class="duiqi">{{editbgid.actualArea  || '无'}}</div>
+                      <div class="duiqi">{{editbgid.actualArea?editbgid.actualArea+' ㎡': '无'}}</div>
                     </el-form-item>
                   </el-col>
                 </el-row>
diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue
index bea6de8..6eb4386 100644
--- a/admin-web-master/src/layout/index.vue
+++ b/admin-web-master/src/layout/index.vue
@@ -512,11 +512,11 @@
 			getMemu() {
 				// console.log(userData, 'userData')
 
-				let userData = JSON.parse(localStorage.getItem('user'));
-				if (!userData) {
-					window.location.href = 'https://admin-uat.028wlkj.com:1020/login'
-					// window.location.href = 'http://128.10.9.151:5173/home'
-				}
+				// let userData = JSON.parse(localStorage.getItem('user'));
+				// if (!userData) {
+				// 	window.location.href = 'https://admin-uat.028wlkj.com:1020/login'
+				// 	// window.location.href = 'http://128.10.9.151:5173/home'
+				// }
 				const protocol = window.location.protocol; // 获取协议，如 'https:'
 				const host = window.location.host; // 获取域名和端口，如 'zhgw.028wlkj.com:20443'
 				let baseUrl = protocol + '//' + host;
@@ -774,18 +774,21 @@
 			clk(index) {
 				this.index = index
 				this.listMune = []
-				this.list = [
-					['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],
-					['品牌策划', '活动策划', '氛围策划', '媒体推广'],
-					['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],
-					['联机交易', '对账处理', '日志管理', '商户服务'],
-					['渠道售票统计分析', '销售额统计分析'],
-				]
-				// this.getMemu()
-				// this.waibu()
+				// this.list = [
+				// 	['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],
+				// 	['品牌策划', '活动策划', '氛围策划', '媒体推广'],
+				// 	['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],
+				// 	['联机交易', '对账处理', '日志管理', '商户服务'],
+				// 	['渠道售票统计分析', '销售额统计分析'],
+				// ]
+				// this.neibu()
+
+
+				this.getMemu()
+				this.waibu()
+				this.list = this.mumeList
+				 
 
-				this.neibu()
-				// this.list = this.mumeList
 			},
 			handleClickOutside() {
 				this.$store.dispatch('app/closeSideBar', {
diff --git a/lvdao-miniapp/manifest.json b/lvdao-miniapp/manifest.json
index ac3b56a..c759f17 100644
--- a/lvdao-miniapp/manifest.json
+++ b/lvdao-miniapp/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "绿道",
-    "appid" : "__UNI__F034047",
+    "appid" : "__UNI__189D96A",
     "description" : "",
     "versionName" : "1.0.2",
     "versionCode" : "100",
diff --git a/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.scss b/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.scss
index 13017c3..c391a1f 100644
--- a/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.scss
+++ b/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.scss
@@ -41,7 +41,7 @@
 		.info-title {
 			font-weight: bold;
 			font-size: 32rpx;
-			margin-bottom: 24rpx;
+			// margin-bottom: 24rpx;
 			span {
 				display: inline-block;
 				padding: 0 8rpx;
diff --git a/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue b/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
index 45a6c86..7adc558 100644
--- a/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
+++ b/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
@@ -5,8 +5,8 @@
 				<view class="info-title">
 					{{tableData.advertisingName}}
 				</view>
-				<view class="info-text">{{tableData.shopDescription}}</view>
-				<view class="info-racord" v-if="moban.length !=0">
+				<!-- <view class="info-text">{{tableData.shopDescription}}</view> -->
+				<view class="info-racord" style="margin: 20rpx 0;" v-if="moban.length !=0">
 					<view class="info-price"><span>{{moban[0].rentalPrice || ''}}</span>元/{{moban[0].leaseTerm || ''}}
 					</view>
 					<!-- <view class="info-intention">{{tableData.id}}人有意向</view> -->
@@ -26,18 +26,80 @@
 								<text>{{tableData.advertisingType}}</text>
 							</view>
 						</u-col>
-						<u-col span="5">
-							<view class="form-item">
-								<view class="label">所属端：</view>
-								<text>{{tableData.affiliation || '--'}}</text>
-							</view>
-						</u-col>
-						<u-col span="7">
-							<view class="form-item">
-								<view class="label">轮播顺序：</view>
-								<text>{{tableData.rotationOrder || '--'}}</text>
-							</view>
-						</u-col>
+						<view v-if="tableData.advertisingType == '线上广告位'">
+							<u-col span="5" >
+								<view class="form-item">
+									<view class="label">所属端：</view>
+									<text>{{tableData.affiliation || '--'}}</text>
+								</view>
+							</u-col>
+							<u-col span="5" >
+								<view class="form-item">
+									<view class="label">广告位数量：</view>
+									<text>{{tableData.advertisingNumber || '--'}}</text>
+								</view>
+							</u-col>
+					<!-- 		<u-col span="5" >
+								<view class="form-item">
+									<view class="label">广告尺寸：</view>
+									<text>{{tableData.dimensions || '--'}}</text>
+								</view>
+							</u-col> -->
+							<u-col span="5" >
+								<view class="form-item">
+									<view class="label">可上传大小：</view>
+									<text>{{tableData.size || '--'}}</text>
+								</view>
+							</u-col>
+							<u-col span="5" >
+								<view class="form-item">
+									<view class="label">播放时长：</view>
+									<text>{{tableData.playDuration || '--'}}</text>
+								</view>
+							</u-col>
+							<u-col span="5" >
+								<view class="form-item">
+									<view class="label">推送地址：</view>
+									<text>{{tableData.pushAddress || '--'}}</text>
+								</view>
+							</u-col>
+							<u-col span="12">
+								<view class="form-item">
+									<view class="label">介绍：</view>
+									<view style='flex: 1;'>
+										<rich-text v-if="tableData.memo" :nodes="tableData.memo"></rich-text>
+										<text v-else>无</text>
+									</view>
+								</view>
+							</u-col>
+						</view>
+						<view v-if="tableData.advertisingType == '实体广告位'">
+							<u-col span="5" >
+								<view class="form-item">
+									<view class="label">设备类型：</view>
+									<text>{{tableData.deviceType || '--'}}</text>
+								</view>
+							</u-col>
+							<u-col span="5" >
+								<view class="form-item">
+									<view class="label">设备大小：</view>
+									<text>{{tableData.equipmentSize || '--'}}</text>
+								</view>
+							</u-col>
+				<!-- 			<u-col span="5" >
+								<view class="form-item">
+									<view class="label">广告尺寸：</view>
+									<text>{{tableData.dimensions || '--'}}</text>
+								</view>
+							</u-col> -->
+							<u-col span="5" >
+								<view class="form-item">
+									<view class="label">广告材质：</view>
+									<text>{{tableData.advertisingMaterial || '--'}}</text>
+								</view>
+							</u-col>
+						
+						</view>
 					</u-row>
 				</view>
 			</view>
@@ -51,12 +113,12 @@
 								<text>{{tableData.dimensions || '--'}}</text>
 							</view>
 						</u-col>
-						<u-col span="5">
+				<!-- 		<u-col span="5">
 							<view class="form-item">
 								<view class="label">可上传大小：</view>
 								<text>{{tableData.size || '--'}}</text>
 							</view>
-						</u-col>
+						</u-col> -->
 						<u-col span="7">
 							<view class="form-item">
 								<view class="label">位置示意图：</view>
@@ -74,7 +136,24 @@
 					</u-row>
 				</view>
 			</view>
+			<view class="banner-item position" v-if="tableData.advertisingType == '实体广告位'">
+				<view class="banner-item-title">位置信息</view>
+				<view style="margin-top: 16rpx;">
+					<map style="width: 100%; height: 200rpx;">
+						<view class="position-info" @click="gomapApp(latitude,longitude)">
+							<u-image :showLoading="true" :src="$imgUrl('/location-icon.png')" width="20rpx"
+								height="20rpx"></u-image>
+							<view>
+								<text >{{tableData.detailedLocation}}</text>
+							</view>
+			
+			
+						</view>
+					</map>
+				</view>
+			</view>
 		</view>
+
 		<view style="height: 100rpx;"></view>
 		<!-- 底部 -->
 		<view class="page-footer">
@@ -133,8 +212,22 @@
 				console.log(err)
 				//请求失败
 			})
+			if (data.mapPunctuation) {
+				this.latitude = parseFloat(data.mapPunctuation.split(',')[0])
+				this.longitude = parseFloat(data.mapPunctuation.split(',')[1])
+			}
 		},
 		methods: {
+			gomapApp(latitude, longitude, ) {
+				let url = "";
+				uni.openLocation({
+					latitude: latitude,
+					longitude: longitude,
+					success: function() {
+						console.log('success');
+					}
+				});
+			},
 			openimg(urls,index) {
 				urls =urls.split(',')
 				let list = urls.map(item=>{
diff --git a/lvdao-miniapp/pages/details/details.scss b/lvdao-miniapp/pages/details/details.scss
index 1c0d7bf..74d8c93 100644
--- a/lvdao-miniapp/pages/details/details.scss
+++ b/lvdao-miniapp/pages/details/details.scss
@@ -49,7 +49,7 @@
 		.info-title {
 			font-weight: bold;
 			font-size: 32rpx;
-			margin-bottom: 24rpx;
+			// margin-bottom: 24rpx;
 			span {
 				display: inline-block;
 				padding: 0 8rpx;
diff --git a/lvdao-miniapp/pages/details/details.vue b/lvdao-miniapp/pages/details/details.vue
index e0ce55d..74d0c0e 100644
--- a/lvdao-miniapp/pages/details/details.vue
+++ b/lvdao-miniapp/pages/details/details.vue
@@ -1,9 +1,6 @@
 <template>
 	<view>
 		<view class="banner-img">
-			<!-- <u-image :showLoading="true"
-				:src="$img + "
-				width="100%" height="100%"></u-image> -->
 			<swiper :indicator-dots="true" :autoplay="false" :interval="3000" :duration="500" style="height: 30vh;" indicator-active-color="#fff">
 				<swiper-item v-for="(imageUrl, index) in lunbo" :key="index">
 					<view style="width: 100%;height: 100%;" v-if="imageUrl.type == 'img'" @click="openimg2(index)">
@@ -14,7 +11,6 @@
 					</view>
 				</swiper-item>
 			</swiper>
-			 <!-- <u-swiper :list="lunbo" keyName="url" :autoplay="false" :indicator="false"></u-swiper> -->
 		</view>
 		<view class="banner">
 			<view class="banner-item info">
@@ -22,62 +18,174 @@
 					{{tableData.shopName || tableData.venueName}}
 
 				</view>
-				<view class="info-text">{{tableData.shopDescription}}</view>
-				<view class="info-racord" v-if="moban.length !=0">
-					<view class="info-price"><span>{{moban[0].rentalPrice || ''}}</span>元/{{moban[0].leaseTerm || ''}}
-					</view>
-					<!-- <view class="info-intention">{{tableData.id}}人有意向</view> -->
+				<!-- <view class="info-text">{{tableData.shopDescription}}</view> -->
+				<view class="info-racord" style="margin: 20rpx 0;" v-if="moban.length !=0">
+					<view class="info-price"><span>{{moban[0].rentalPrice || ''}}</span>元/{{moban[0].leaseTerm || ''}}</view>
 				</view>
 				<view class="" v-if="moban.length !=0" @click="moreZu">
 					查看更多租金优惠
 					<u-icon name="arrow-right"></u-icon>
 				</view>
 			</view>
-			<view class="banner-item field">
+			<view class="banner-item field" v-if="tableData.shopName">
+				<view class="banner-item-title">商铺信息</view>
+				<view class="banner-item-form">
+					<u-row gutter="10">
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">商铺类型：</view>
+								<text>{{tableData.shopType=='1'?'移动铺位':tableData.shopType=='2'?'固定铺位':'无'}}</text>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">测绘面积：</view>
+								<text>{{tableData.surveyingArea?tableData.surveyingArea+' ㎡': '无'}}</text>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">产权面积：</view>
+								<text>{{tableData.propertyArea?tableData.propertyArea+' ㎡': '无'}}</text>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">实际使用面积：</view>
+								<text>{{tableData.actualUsableArea?tableData.actualUsableArea+' ㎡': '无'}}</text>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">所属区域：</view>
+								<text>{{tableData.belongingRegion || '无'}}</text>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">所属绿道段：</view>
+								<text>{{tableData.belongingGreenwaySection || '无'}}</text>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">门牌号：</view>
+								<text>{{tableData.houseNumber || '无'}}</text>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">归属部门：</view>
+								<text>{{tableData.belongingDepartment || '无'}}</text>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">负责人：</view>
+								<text>{{tableData.head || '无'}}</text>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">联系人：</view>
+								<text>{{tableData.contacts || '无'}}</text>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">联系方式：</view>
+								<text>{{tableData.telephone || '无'}}</text>
+							</view>
+						</u-col>
+						<u-col span="12">
+							<view class="form-item">
+								<view class="label" style="width: 142rpx;">商铺描述：</view>
+								<view style='flex: 1;'>
+									<text>{{tableData.shopDescription || '无'}}</text>
+								</view>
+							</view>
+						</u-col>
+						<u-col span="12">
+							<view class="form-item">
+								<view class="label">建筑图纸：</view>
+								<view style='flex: 1;' v-if="!tableData.architecturalDrawings.length>0">
+									<text>暂无</text>
+								</view>
+							</view>
+							<view style="display: flex;flex-wrap: wrap;" v-if="tableData.architecturalDrawings.length>0">
+								<u-image @click="openimg1(tableData.architecturalDrawings,index)" :showLoading="true" v-for="(item,index) in tableData.architecturalDrawings" :src="imgUrl+item" width="100px" height="100px" border-radius="20" style="margin-bottom:25rpx;margin-left: 25rpx;"></u-image>
+							</view>
+							
+						</u-col>
+					</u-row>
+				</view>
+			</view>
+			<view class="banner-item field" v-else>
 				<view class="banner-item-title">场地信息</view>
 				<view class="banner-item-form">
 					<u-row gutter="10">
 						<u-col span="6">
 							<view class="form-item">
 								<view class="label">场地类型：</view>
-								<text>{{tableData.shopName?'商铺':'场地'}}</text>
+								<text>{{tableData.venueType || '无'}}</text>
 							</view>
 						</u-col>
 						<u-col span="6">
 							<view class="form-item">
 								<view class="label">实际使用面积：</view>
-								<text v-if="tableData.actualUsableArea">{{tableData.actualUsableArea}}m²</text>
-								<text v-else-if="tableData.actualArea">{{tableData.actualArea}}m²</text>
-								<text v-else="tableData.actualUsableArea">暂无</text>
+								<text>{{tableData.actualArea?tableData.actualArea+' ㎡': '无'}}</text>
 							</view>
 						</u-col>
 						<u-col span="6">
 							<view class="form-item">
 								<view class="label">所属区域：</view>
-								<text>{{tableData.belongingRegion || tableData.district}}</text>
+								<text>{{tableData.district  || '无'}}</text>
 							</view>
 						</u-col>
-						<u-col span="12">
+						<u-col span="6">
 							<view class="form-item">
-								<view class="label">规划图纸：</view>
+								<view class="label">归属部门：</view>
+								<text>{{tableData.department || '无'}}</text>
 							</view>
-							<view style="display: flex;flex-wrap: wrap;">
-								<u-image @click="openimg1(tableData.architecturalDrawings,index)" :showLoading="true" v-for="(item,index) in tableData.architecturalDrawings"
-									v-if="tableData.architecturalDrawings" :src="imgUrl+item" width="100px"
-									height="100px" border-radius="20"
-									style="margin-bottom:25rpx;margin-left: 25rpx;"></u-image>
-								<text v-else>暂无</text>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">负责人：</view>
+								<text>{{tableData.belongingParkTrail || '无'}}</text>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">联系人：</view>
+								<text>{{tableData.contact || '无'}}</text>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">联系方式：</view>
+								<text>{{tableData.belongingParkTrail || '无'}}</text>
 							</view>
 						</u-col>
 						<u-col span="12">
 							<view class="form-item">
-								<view class="label" style="width: 142rpx;">{{tableData.shopName?'位置描述：':'场地描述：'}}</view>
-
+								<view class="label" style="width: 142rpx;">场地描述：</view>
 								<view style='flex: 1;'>
-									<text v-if="tableData.shopName">{{tableData.detailedLocation}}</text>
-									<u-parse :html="tableData.description" v-else></u-parse>
+									<rich-text v-if="tableData.description" :nodes="tableData.description"></rich-text>
+									<text v-else>无</text>
+								</view>
+							</view>
+						</u-col>
+						<u-col span="12">
+							<view class="form-item">
+								<view class="label">规划图纸：</view>
+								<view style='flex: 1;' v-if="!tableData.planningDrawing.length>0">
+									<text>暂无</text>
 								</view>
 							</view>
+							<view style="display: flex;flex-wrap: wrap;" v-if="tableData.planningDrawing.length>0">
+								<u-image @click="openimg1(tableData.planningDrawing,index)" :showLoading="true" v-for="(item,index) in tableData.architecturalDrawings" :src="imgUrl+item" width="100px" height="100px" border-radius="20" style="margin-bottom:25rpx;margin-left: 25rpx;"></u-image>
+							</view>
+							
 						</u-col>
 					</u-row>
 				</view>
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index 1454b95..9244e1d 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -1,8 +1,8 @@
 
 //  let hostall = window.location.href;
 // let c1 = hostall.split('cdwlMall')[0];
-// let c1 = 'https://jy.scjysm.asia:18086/'
-let c1 = 'https://zhgw-uat.028wlkj.com/'
+let c1 = 'https://jy.scjysm.asia:18086/'
+// let c1 = 'https://zhgw-uat.028wlkj.com/'
 //封装request请求
 const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 	//判断header提交数据类型