From 0e6c481b3c552c17c779d638a7f32796c968b8b1 Mon Sep 17 00:00:00 2001
From: wesley88 <9519127+wesley88@user.noreply.gitee.com>
Date: Mon, 3 Mar 2025 16:03:35 +0800
Subject: [PATCH] 1

---
 admin-web-master/src/components/chakan/ggsh.vue |   3 ++-
 admin-web-master/src/components/chakan/zl.vue   |   3 ++-
 admin-web-master/src/utils/request.js           |   2 +-
 lvdao-miniapp/pages.json                        |   7 +++++++
 lvdao-miniapp/pages/complaint/complaint.vue     | 238 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------
 lvdao-miniapp/pages/my/my.scss                  |   4 ++--
 lvdao-miniapp/pages/my/my.vue                   |  12 ++++++------
 lvdao-miniapp/pages/repair/repair.vue           | 285 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------
 lvdao-miniapp/pages/serve/serve.vue             | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------
 lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue   | 524 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 lvdao-miniapp/pagesA/tishi/tishi.vue            |  22 ++++++++++++++++++++++
 lvdao-miniapp/static/icon/bg1.png               | Bin 0 -> 93090 bytes
 lvdao-miniapp/static/icon/icon1.png             | Bin 0 -> 1387 bytes
 lvdao-miniapp/static/icon/icon2.png             | Bin 0 -> 885 bytes
 lvdao-miniapp/static/icon/icon3.png             | Bin 0 -> 954 bytes
 lvdao-miniapp/static/icon/icon4.png             | Bin 0 -> 900 bytes
 lvdao-miniapp/static/icon/icon5.png             | Bin 0 -> 1416 bytes
 lvdao-miniapp/static/icon/icon6.png             | Bin 0 -> 1023 bytes
 18 files changed, 680 insertions(+), 596 deletions(-)
 create mode 100644 lvdao-miniapp/pagesA/tishi/tishi.vue
 create mode 100644 lvdao-miniapp/static/icon/bg1.png
 create mode 100644 lvdao-miniapp/static/icon/icon1.png
 create mode 100644 lvdao-miniapp/static/icon/icon2.png
 create mode 100644 lvdao-miniapp/static/icon/icon3.png
 create mode 100644 lvdao-miniapp/static/icon/icon4.png
 create mode 100644 lvdao-miniapp/static/icon/icon5.png
 create mode 100644 lvdao-miniapp/static/icon/icon6.png

diff --git a/admin-web-master/src/components/chakan/ggsh.vue b/admin-web-master/src/components/chakan/ggsh.vue
index 8554e0f..b92675e 100644
--- a/admin-web-master/src/components/chakan/ggsh.vue
+++ b/admin-web-master/src/components/chakan/ggsh.vue
@@ -353,7 +353,8 @@
         AdvertiserInfoEdit({
           id: this.info.id,
           'auditStatus': this.radio,
-          auditComments: this.auditComments
+          auditComments: this.auditComments,
+          rentalResourcesId: this.info.rentalResourcesId
         }).then(res => {
           console.error(res)
           if (res.code == 200) {
diff --git a/admin-web-master/src/components/chakan/zl.vue b/admin-web-master/src/components/chakan/zl.vue
index 25b061d..e320306 100644
--- a/admin-web-master/src/components/chakan/zl.vue
+++ b/admin-web-master/src/components/chakan/zl.vue
@@ -507,7 +507,8 @@
         msgedit({
           id: this.info.id,
           'auditStatus': this.radio,
-          auditSuggestions: this.info.auditSuggestions
+          auditSuggestions: this.info.auditSuggestions,
+          rentalResourcesId:this.info.rentalResourcesId
         }).then(res => {
           console.error(res)
           if (res.code == 200) {
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index 30edaa9..0f94b76 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -17,7 +17,7 @@ let baseURL =  ''
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
 
   // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
-  baseURL = 'http://128.10.249.21:9003';
+  baseURL = 'http://128.10.249.24:9003';
 
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
   // baseURL = 'http://192.168.2.225:9003';
diff --git a/lvdao-miniapp/pages.json b/lvdao-miniapp/pages.json
index ac3f361..cc42e01 100644
--- a/lvdao-miniapp/pages.json
+++ b/lvdao-miniapp/pages.json
@@ -397,6 +397,13 @@
 		"name": "pagesA",
 		"pages": [
 			{
+				"path": "tishi/tishi",
+				"style": {
+					"navigationBarBackgroundColor": "#FFFFFF",
+					"navigationBarTitleText": "提示"
+				}
+			},
+			{
 				"path": "hxlist/hxlist",
 				"style": {
 					"navigationBarBackgroundColor": "#FFFFFF",
diff --git a/lvdao-miniapp/pages/complaint/complaint.vue b/lvdao-miniapp/pages/complaint/complaint.vue
index 8217a0e..8813daf 100644
--- a/lvdao-miniapp/pages/complaint/complaint.vue
+++ b/lvdao-miniapp/pages/complaint/complaint.vue
@@ -23,15 +23,15 @@
 							<input type="text" placeholder="请输入" v-model="ruleForm.problemDescription">
 						</view>
 					</view>
-					
+
 				</view>
 			</view>
 		</view>
-		
+
 		<view class="item">
-			<view class="contents"  style="background-color:#fff;padding:10px 20px;">
+			<view class="contents" style="background-color:#fff;padding:10px 20px;">
 				<view class="feedback-data">
-					<view >
+					<view>
 						<view class="title">
 							<text style="font-weight: bold;">*现场照片</text>
 							<!-- <text class="star">*</text> -->
@@ -46,9 +46,9 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<view class="item">
-			<view class="contents"  style="background-color:#fff;padding:10px 20px;">
+			<view class="contents" style="background-color:#fff;padding:10px 20px;">
 				<view class="feedback-data">
 					<view>
 						<view class="title">
@@ -59,19 +59,23 @@
 					<view class="voucher-img">
 						<view class="voucher-list" style="width: 100%;">
 							<view class="" style="background-color: #F0F0F0;border-radius: 20rpx;">
-								<textarea name="" id="" cols="30" rows="10" placeholder="请输入" style="font-size: 24rpx;background-color: #F0F0F0;border-radius: 20rpx;width: 96%;margin: 0 auto;padding: 20rpx;" v-model="ruleForm.remark"></textarea>
+								<textarea name="" id="" cols="30" rows="10" placeholder="请输入"
+									style="font-size: 24rpx;background-color: #F0F0F0;border-radius: 20rpx;width: 96%;margin: 0 auto;padding: 20rpx;"
+									v-model="ruleForm.remark"></textarea>
 							</view>
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
-			<u-select v-model="popup1" mode="mutil-column-auto" :list="list" @confirm="pops" label-name="label" value-name="value"></u-select>
+		<u-select v-model="popup1" mode="mutil-column-auto" :list="list" @confirm="pops" label-name="label"
+			value-name="value"></u-select>
 		<!-- 保存按钮 -->
-		
+
 		<!-- <view class="page-footer">
 			<u-button type="success" style="flex: 1; margin: 0 10px;" >提交</u-button>
 		</view> -->
+		<view style="height: 140rpx;"></view>
 		<view class="page-footer">
 			<view class="footer-btn">
 				<u-button type="success" style="width: 100%;border-radius: 10px;" @click="submit">提交</u-button>
@@ -84,11 +88,11 @@
 	export default {
 		data() {
 			return {
-				fileList:[],
-				ruleForm:{
-					onSitePhoto:[],
-				
-					status:'1'
+				fileList: [],
+				ruleForm: {
+					onSitePhoto: [],
+
+					status: '1'
 				},
 				list: [{
 						value: '物业投诉',
@@ -99,126 +103,126 @@
 						label: '违规投诉'
 					}
 				],
-				popup1:false
+				popup1: false
 			}
 		},
-		methods:{
+		methods: {
 			chooseLocation(val, item) {
 				this.popup1 = true
 			},
 			pops(val) {
-				this.ruleForm.complaintType =  val[0].label
+				this.ruleForm.complaintType = val[0].label
 
 			},
-			check(){
-						
-						if (!this.ruleForm.complaintType) {
-							uni.showToast({
-								icon: 'none',
-								title: '请选择投诉类型'
-							});
-							return false;
-						}
-						if (!this.ruleForm.problemDescription) {
-							uni.showToast({
-								icon: 'none',
-								title: '请输入问题描述'
-							});
-							return false;
-						}
-						if (this.ruleForm.onSitePhoto.length== 0) {
-							uni.showToast({
-								icon: 'none',
-								title: '请上传现场图片'
-							});
-							return false;
-						}
-						if (!this.ruleForm.remark) {
-							uni.showToast({
-								icon: 'none',
-								title: '请输入备注信息'
-							});
-							return false;
-						}
-				
-					return true;
+			check() {
+
+				if (!this.ruleForm.complaintType) {
+					uni.showToast({
+						icon: 'none',
+						title: '请选择投诉类型'
+					});
+					return false;
+				}
+				if (!this.ruleForm.problemDescription) {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入问题描述'
+					});
+					return false;
+				}
+				if (this.ruleForm.onSitePhoto.length == 0) {
+					uni.showToast({
+						icon: 'none',
+						title: '请上传现场图片'
+					});
+					return false;
+				}
+				if (!this.ruleForm.remark) {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入备注信息'
+					});
+					return false;
+				}
+
+				return true;
 			},
 			submit() {
 				let show = this.check()
-					if(show == false){
-						return
-					}
+				if (show == false) {
+					return
+				}
 				this.ruleForm.applicationTime = this.currentTime()
 				this.ruleForm.createUser = uni.getStorageSync('user').phone
-		this.ruleForm.onSitePhoto = this.ruleForm.onSitePhoto.map(item=>{
-					 return item.replace(this.$img,'');
+				this.ruleForm.onSitePhoto = this.ruleForm.onSitePhoto.map(item => {
+					return item.replace(this.$img, '');
 				})
-				
-						let info = {
-							...this.ruleForm,
-							onSitePhoto:this.ruleForm.onSitePhoto.join(','),
-						}
-			
-							this.$http.sendRequest('/cereComplaintsSuggestions/add', 'POST',info,1).then(res => {
-								uni.navigateTo({
-									url: '/pages/serve/serve'
-								})
-							}).catch(err => {
-								console.log(err)
-								//请求失败
-							})
-							
-						},
-						// 获取时间
-						currentTime() {
-						    let date = new Date();
-						    let year = date.getFullYear();
-						    let month = date.getMonth() + 1; // 月份从0~11，所以加一
-						    let day = date.getDate();
-						    let hours = date.getHours();
-						    let minutes = date.getMinutes();
-						    let seconds = date.getSeconds();
-						
-						    // 为月、日、时、分、秒添加前导零（如果需要）
-						    month = month < 10 ? '0' + month : month;
-						    day = day < 10 ? '0' + day : day;
-						    hours = hours < 10 ? '0' + hours : hours;
-						    minutes = minutes < 10 ? '0' + minutes : minutes;
-						    seconds = seconds < 10 ? '0' + seconds : seconds;
-						
-						    // 拼接日期和时间字符串
-						    let strDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-						    return strDate;
-						},
-						onsuccess1(e, file, fileList, ziduan) {
-							console.error(e, file, fileList, ziduan)
-							uni.uploadFile({
-								url: this.$upload, // 仅为示例，请替换为您的服务器上传接口
-								filePath: e[0].url,
-								name: 'file', // 后端接收的文件参数名
-								formData: {
-									filePath: 'xcx', // 其他表单数据
-								},
-								success: (uploadFileRes) => {
-										this.ruleForm.onSitePhoto.push(this.$img + JSON.parse(uploadFileRes.data).data)
-									uni.showToast({
-										title: '上传成功',
-										icon: 'success',
-									});
-								},
-								fail: (err) => {
-									console.error('上传失败', err);
-									uni.showToast({
-										title: '上传失败',
-										icon: 'none',
-									});
-								},
-							});
-						},
+
+				let info = {
+					...this.ruleForm,
+					onSitePhoto: this.ruleForm.onSitePhoto.join(','),
+				}
+
+				this.$http.sendRequest('/cereComplaintsSuggestions/add', 'POST', info, 1).then(res => {
+					uni.redirectTo({
+						url: '/pagesA/tishi/tishi'
+					})
+				}).catch(err => {
+					console.log(err)
+					//请求失败
+				})
+
+			},
+			// 获取时间
+			currentTime() {
+				let date = new Date();
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1; // 月份从0~11，所以加一
+				let day = date.getDate();
+				let hours = date.getHours();
+				let minutes = date.getMinutes();
+				let seconds = date.getSeconds();
+
+				// 为月、日、时、分、秒添加前导零（如果需要）
+				month = month < 10 ? '0' + month : month;
+				day = day < 10 ? '0' + day : day;
+				hours = hours < 10 ? '0' + hours : hours;
+				minutes = minutes < 10 ? '0' + minutes : minutes;
+				seconds = seconds < 10 ? '0' + seconds : seconds;
+
+				// 拼接日期和时间字符串
+				let strDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+				return strDate;
+			},
+			onsuccess1(e, file, fileList, ziduan) {
+				console.error(e, file, fileList, ziduan)
+				uni.uploadFile({
+					url: this.$upload, // 仅为示例，请替换为您的服务器上传接口
+					filePath: e[0].url,
+					name: 'file', // 后端接收的文件参数名
+					formData: {
+						filePath: 'xcx', // 其他表单数据
+					},
+					success: (uploadFileRes) => {
+						this.ruleForm.onSitePhoto.push(this.$img + JSON.parse(uploadFileRes.data).data)
+						uni.showToast({
+							title: '上传成功',
+							icon: 'success',
+						});
+					},
+					fail: (err) => {
+						console.error('上传失败', err);
+						uni.showToast({
+							title: '上传失败',
+							icon: 'none',
+						});
+					},
+				});
+			},
 		}
 	}
 </script>
 
 <style scoped lang="scss">
 	@import 'complaint.scss';
-</style>
+</style>
\ No newline at end of file
diff --git a/lvdao-miniapp/pages/my/my.scss b/lvdao-miniapp/pages/my/my.scss
index 0e93560..5354699 100644
--- a/lvdao-miniapp/pages/my/my.scss
+++ b/lvdao-miniapp/pages/my/my.scss
@@ -206,8 +206,8 @@
 				width: 40rpx;
 				height: 40rpx;
 				image{
-					width: 40rpx;
-					height: 40rpx;
+					// width: 40rpx;
+					height: 30rpx;
 				}
 			}
 			.data{
diff --git a/lvdao-miniapp/pages/my/my.vue b/lvdao-miniapp/pages/my/my.vue
index 1d13fd2..5ae286e 100644
--- a/lvdao-miniapp/pages/my/my.vue
+++ b/lvdao-miniapp/pages/my/my.vue
@@ -135,7 +135,7 @@
 				<view class="list" @click="isshop()" v-if="!isshopon">
 					<view class="icon-data">
 						<view class="icon">
-							<image :src="$imgUrl('/my-icon2.png')" mode=""></image>
+							<image src="@/static/icon/icon1.png" mode="heightFix"></image>
 						</view>
 						<view class="data">
 							<view class="title">
@@ -165,7 +165,7 @@
 				<view class="list" @click="toPage('/pagesA/myZiyuan/myZiyuan')">
 					<view class="icon-data">
 						<view class="icon">
-							<image :src="$imgUrl('/my-icon2.png')" mode=""></image>
+							<image src="@/static/icon/icon2.png" mode="heightFix"></image>
 						</view>
 						<view class="data">
 							<view class="title">
@@ -180,7 +180,7 @@
 				<view class="list" @click="toPage('/pages/record/record')">
 					<view class="icon-data">
 						<view class="icon">
-							<image :src="$imgUrl('/my-icon2.png')" mode=""></image>
+							<image src="@/static/icon/icon3.png" mode="heightFix"></image>
 						</view>
 						<view class="data">
 							<view class="title">
@@ -195,7 +195,7 @@
 				<view class="list" @click="toPage('/pages/serve/serve')">
 					<view class="icon-data">
 						<view class="icon">
-							<image :src="$imgUrl('/my-icon2.png')" mode=""></image>
+							<image src="@/static/icon/icon4.png"mode="heightFix"></image>
 						</view>
 						<view class="data">
 							<view class="title">
@@ -210,7 +210,7 @@
 				<view class="list" @click="repair">
 					<view class="icon-data">
 						<view class="icon">
-							<image :src="$imgUrl('/my-icon3.png')" mode=""></image>
+							<image src="@/static/icon/icon5.png" mode="heightFix"></image>
 						</view>
 						<view class="data">
 							<view class="title">
@@ -225,7 +225,7 @@
 				<view class="list" @click="complaint">
 					<view class="icon-data">
 						<view class="icon">
-							<image :src="$imgUrl('/my-icon2.png')" mode=""></image>
+							<image src="@/static/icon/icon6.png" mode="heightFix"></image>
 						</view>
 						<view class="data">
 							<view class="title">
diff --git a/lvdao-miniapp/pages/repair/repair.vue b/lvdao-miniapp/pages/repair/repair.vue
index 55abd1f..f04636c 100644
--- a/lvdao-miniapp/pages/repair/repair.vue
+++ b/lvdao-miniapp/pages/repair/repair.vue
@@ -6,7 +6,7 @@
 					<view>
 						<view class="title">
 							<text style="font-weight: bold;">*现场照片</text>
-							
+
 						</view>
 					</view>
 					<view class="voucher-img">
@@ -24,7 +24,7 @@
 					<view class="list">
 						<view class="title">
 							<text style="font-weight: bold;">*设备名称</text>
-							
+
 						</view>
 						<view class="content">
 							<input type="text" placeholder="请输入" v-model="ruleForm.deviceName">
@@ -33,9 +33,9 @@
 					<view class="list">
 						<view class="title">
 							<text style="font-weight: bold;">*设备类型</text>
-							
+
 						</view>
-						<view class="content"  @click="choose(1)" style="width: 25%;">
+						<view class="content" @click="choose(1)" style="width: 25%;">
 							<u-input v-model="ruleForm.deviceType" type="select" disabledColor="#ffffff"
 								placeholder="请选择" :border="false" suffixIcon="arrow-right" style="pointer-events:none">
 							</u-input>
@@ -44,7 +44,7 @@
 					<view class="list">
 						<view class="title">
 							<text style="font-weight: bold;">*保修问题</text>
-							
+
 						</view>
 						<view class="content" @click="chooseLocation(1)" style="width: 25%;">
 							<u-input v-model="ruleForm.warrantyIssue" type="select" disabledColor="#ffffff"
@@ -52,36 +52,41 @@
 							</u-input>
 						</view>
 					</view>
-					
-					
+
+
 				</view>
 			</view>
 		</view>
-		
-		
-		
+
+
+
 		<view class="item">
 			<view class="contents" style="background-color:#fff;padding:10px 20px;">
 				<view class="feedback-data">
 					<view>
 						<view class="title">
 							<text style="font-weight: bold;">*备注信息</text>
-							
+
 						</view>
 					</view>
 					<view class="voucher-img">
 						<view class="voucher-list" style="width: 100%;">
 							<view class="" style="background-color: #F0F0F0;border-radius: 20rpx;">
-								<textarea name="" id="" cols="30" rows="10" placeholder="请输入" style="font-size: 24rpx;background-color: #F0F0F0;border-radius: 20rpx;width: 96%;margin: 0 auto;padding: 20rpx;" v-model="ruleForm.memo"></textarea>
+								<textarea name="" id="" cols="30" rows="10" placeholder="请输入"
+									style="font-size: 24rpx;background-color: #F0F0F0;border-radius: 20rpx;width: 96%;margin: 0 auto;padding: 20rpx;"
+									v-model="ruleForm.memo"></textarea>
 							</view>
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
-			<u-select v-model="popup1" mode="mutil-column-auto" :list="list" @confirm="pops" label-name="label" value-name="value"></u-select>
-			<u-select v-model="popup2" mode="mutil-column-auto" :list="list1" @confirm="pops1" label-name="label" value-name="value"></u-select>
+		<u-select v-model="popup1" mode="mutil-column-auto" :list="list" @confirm="pops" label-name="label"
+			value-name="value"></u-select>
+		<u-select v-model="popup2" mode="mutil-column-auto" :list="list1" @confirm="pops1" label-name="label"
+			value-name="value"></u-select>
 		<!-- 保存按钮 -->
+		<view style="height: 140rpx;"></view>
 		<view class="page-footer">
 			<u-button type="success" style="flex: 1; margin: 0 10px;" @click="submit">提交</u-button>
 		</view>
@@ -92,18 +97,18 @@
 	export default {
 		data() {
 			return {
-				fileList:[],
-				ruleForm:{
-					onSitePhoto:[],
-					deviceName:'',
-					deviceType:'',
-					warrantyIssue:'',
-					memo:'',
-					applicationTime:'',
-					status:'1'
+				fileList: [],
+				ruleForm: {
+					onSitePhoto: [],
+					deviceName: '',
+					deviceType: '',
+					warrantyIssue: '',
+					memo: '',
+					applicationTime: '',
+					status: '1'
 				},
-				lableXian:'',
-				shelei:'',
+				lableXian: '',
+				shelei: '',
 				list: [{
 						value: '水管问题',
 						label: '水管问题'
@@ -121,12 +126,12 @@
 						value: '类型2',
 						label: '类型2'
 					}
-				],	
-				popup1:false,
-				popup2:false
+				],
+				popup1: false,
+				popup2: false
 			}
 		},
-		methods:{
+		methods: {
 			chooseLocation(val, item) {
 				this.popup1 = true
 			},
@@ -134,125 +139,125 @@
 				this.popup2 = true
 			},
 			pops(val) {
-				
-				this.ruleForm.warrantyIssue =   val[0].label
+
+				this.ruleForm.warrantyIssue = val[0].label
 			},
 			pops1(val) {
-				this.ruleForm.deviceType =  val[0].label
+				this.ruleForm.deviceType = val[0].label
 			},
-			check(){
-						if (this.ruleForm.onSitePhoto.length== 0) {
-							uni.showToast({
-								icon: 'none',
-								title: '请上传现场图片'
-							});
-							return false;
-						}
-						if (!this.ruleForm.deviceName) {
-							uni.showToast({
-								icon: 'none',
-								title: '请输入设备名称'
-							});
-							return false;
-						}
-						if (!this.ruleForm.deviceType) {
-							uni.showToast({
-								icon: 'none',
-								title: '请选择设备类型'
-							});
-							return false;
-						}
-						if (!this.ruleForm.warrantyIssue) {
-							uni.showToast({
-								icon: 'none',
-								title: '请选择保修问题'
-							});
-							return false;
-						}
-						if (!this.ruleForm.memo) {
-							uni.showToast({
-								icon: 'none',
-								title: '请输入备注信息'
-							});
-							return false;
-						}
-				
-					return true;
+			check() {
+				if (this.ruleForm.onSitePhoto.length == 0) {
+					uni.showToast({
+						icon: 'none',
+						title: '请上传现场图片'
+					});
+					return false;
+				}
+				if (!this.ruleForm.deviceName) {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入设备名称'
+					});
+					return false;
+				}
+				if (!this.ruleForm.deviceType) {
+					uni.showToast({
+						icon: 'none',
+						title: '请选择设备类型'
+					});
+					return false;
+				}
+				if (!this.ruleForm.warrantyIssue) {
+					uni.showToast({
+						icon: 'none',
+						title: '请选择保修问题'
+					});
+					return false;
+				}
+				if (!this.ruleForm.memo) {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入备注信息'
+					});
+					return false;
+				}
+
+				return true;
 			},
 			submit() {
-							let show = this.check()
-								if(show == false){
-									return
-								}
-							this.ruleForm.applicationTime = this.currentTime()
-							this.ruleForm.createUser = uni.getStorageSync('user').phone
-							this.ruleForm.onSitePhoto = this.ruleForm.onSitePhoto.map(item=>{
-										 return item.replace(this.$img,'');
-									})
-									let info = {
-										...this.ruleForm,
-										onSitePhoto:this.ruleForm.onSitePhoto.join(','),
-									}
-							this.$http.sendRequest('/cereReportIssuesRepairs/add', 'POST',info,1).then(res => {
-							     uni.navigateTo({
-							     	url: '/pages/serve/serve'
-							     })
-							}).catch(err => {
-								console.log(err)
-								//请求失败
-							})
-							
-						},
-						// 获取时间
-						currentTime() {
-						    let date = new Date();
-						    let year = date.getFullYear();
-						    let month = date.getMonth() + 1; // 月份从0~11，所以加一
-						    let day = date.getDate();
-						    let hours = date.getHours();
-						    let minutes = date.getMinutes();
-						    let seconds = date.getSeconds();
-						
-						    // 为月、日、时、分、秒添加前导零（如果需要）
-						    month = month < 10 ? '0' + month : month;
-						    day = day < 10 ? '0' + day : day;
-						    hours = hours < 10 ? '0' + hours : hours;
-						    minutes = minutes < 10 ? '0' + minutes : minutes;
-						    seconds = seconds < 10 ? '0' + seconds : seconds;
-						
-						    // 拼接日期和时间字符串
-						    let strDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-						    return strDate;
-						},
-						onsuccess1(e, file, fileList, ziduan) {
-							console.error(e, file, fileList, ziduan)
-							uni.uploadFile({
-								url: this.$upload, // 仅为示例，请替换为您的服务器上传接口
-								filePath: e[0].url,
-								name: 'file', // 后端接收的文件参数名
-								formData: {
-									filePath: 'xcx', // 其他表单数据
-								},
-								success: (uploadFileRes) => {
-										this.ruleForm.onSitePhoto.push(this.$img + JSON.parse(uploadFileRes.data).data)
-									uni.showToast({
-										title: '上传成功',
-										icon: 'success',
-									});
-								},
-								fail: (err) => {
-									console.error('上传失败', err);
-									uni.showToast({
-										title: '上传失败',
-										icon: 'none',
-									});
-								},
-							});
-						},
+				let show = this.check()
+				if (show == false) {
+					return
+				}
+				this.ruleForm.applicationTime = this.currentTime()
+				this.ruleForm.createUser = uni.getStorageSync('user').phone
+				this.ruleForm.onSitePhoto = this.ruleForm.onSitePhoto.map(item => {
+					return item.replace(this.$img, '');
+				})
+				let info = {
+					...this.ruleForm,
+					onSitePhoto: this.ruleForm.onSitePhoto.join(','),
+				}
+				this.$http.sendRequest('/cereReportIssuesRepairs/add', 'POST', info, 1).then(res => {
+					uni.redirectTo({
+						url: '/pagesA/tishi/tishi'
+					})
+				}).catch(err => {
+					console.log(err)
+					//请求失败
+				})
+
+			},
+			// 获取时间
+			currentTime() {
+				let date = new Date();
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1; // 月份从0~11，所以加一
+				let day = date.getDate();
+				let hours = date.getHours();
+				let minutes = date.getMinutes();
+				let seconds = date.getSeconds();
+
+				// 为月、日、时、分、秒添加前导零（如果需要）
+				month = month < 10 ? '0' + month : month;
+				day = day < 10 ? '0' + day : day;
+				hours = hours < 10 ? '0' + hours : hours;
+				minutes = minutes < 10 ? '0' + minutes : minutes;
+				seconds = seconds < 10 ? '0' + seconds : seconds;
+
+				// 拼接日期和时间字符串
+				let strDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+				return strDate;
+			},
+			onsuccess1(e, file, fileList, ziduan) {
+				console.error(e, file, fileList, ziduan)
+				uni.uploadFile({
+					url: this.$upload, // 仅为示例，请替换为您的服务器上传接口
+					filePath: e[0].url,
+					name: 'file', // 后端接收的文件参数名
+					formData: {
+						filePath: 'xcx', // 其他表单数据
+					},
+					success: (uploadFileRes) => {
+						this.ruleForm.onSitePhoto.push(this.$img + JSON.parse(uploadFileRes.data).data)
+						uni.showToast({
+							title: '上传成功',
+							icon: 'success',
+						});
+					},
+					fail: (err) => {
+						console.error('上传失败', err);
+						uni.showToast({
+							title: '上传失败',
+							icon: 'none',
+						});
+					},
+				});
+			},
 		}
 	}
 </script>
 
 <style scoped lang="scss">
 	@import 'repair.scss';
-</style>
+</style>
\ No newline at end of file
diff --git a/lvdao-miniapp/pages/serve/serve.vue b/lvdao-miniapp/pages/serve/serve.vue
index a9bac99..5c8f7c6 100644
--- a/lvdao-miniapp/pages/serve/serve.vue
+++ b/lvdao-miniapp/pages/serve/serve.vue
@@ -2,7 +2,7 @@
 	<view class="page">
 		<view class="screen-list">
 			<view class="list">
-				<u-input v-model="pageindex.start" type="select" @click="typeShow = true" placeholder='服务记录' />
+				<u-input type="select" @click="typeShow = true" :placeholder='pageindex.start' />
 			</view>
 		</view>
 		<!-- 记录列表 -->
@@ -14,9 +14,11 @@
 						<view class="right"><u-icon name="arrow-rightward"></u-icon></view>
 					</view>
 					<view class="info-item">申请时间：{{item.applicationTime}}</view>
-					<view class="info-item">状态：<span style="color: #0FBB59;">{{item.status=='1'?'受理中':'已完成'}}</span></view>
+					<view class="info-item">状态：<span style="color: #0FBB59;">{{item.status=='1'?'受理中':'已完成'}}</span>
+					</view>
 					<view style="margin-top: 10px;" v-if="item.status  == '2'">
-						<u-button type="success" style="width:30%;height: 28px;margin: 0 10px 0 0;" @click="baoShow(0,item.id)">评价</u-button>
+						<u-button type="success" style="width:30%;height: 28px;margin: 0 10px 0 0;"
+							@click="baoShow(0,item.id)">评价</u-button>
 					</view>
 				</view>
 			</view>
@@ -27,23 +29,27 @@
 						<view class="right"><u-icon name="arrow-rightward"></u-icon></view>
 					</view>
 					<view class="info-item">申请时间：{{item.applicationTime}}</view>
-					<view class="info-item">状态：<span style="color: #0FBB59;">{{item.status=='1'?'受理中':'已完成'}}</span></view>
+					<view class="info-item">状态：<span style="color: #0FBB59;">{{item.status=='1'?'受理中':'已完成'}}</span>
+					</view>
 					<view style="margin-top: 10px;" v-if="item.status  == '2'">
-						<u-button type="success" style="width:30%;height: 28px;margin: 0 10px 0 0;" @click="baoShow(1,item.id)">评价</u-button>
+						<u-button type="success" style="width:30%;height: 28px;margin: 0 10px 0 0;"
+							@click="baoShow(1,item.id)">评价</u-button>
 					</view>
 				</view>
 			</view>
 		</view>
 		<u-select v-model="typeShow" :list="activesType" @confirm="typeChange"></u-select>
-		<u-popup class="userForm" v-model="joinShow" mode="center"  border-radius="20" :closeable="true" width="90%" >
+		<u-popup class="userForm" v-model="joinShow" mode="center" border-radius="20" :closeable="true" width="90%">
 			<view style="padding: 30rpx;">
 				<view style="text-align: center;font-size: 16px;font-weight: 600;margin-bottom: 30rpx;">评价</view>
-			<view class="" style="background-color: #F0F0F0;border-radius: 20rpx;margin-bottom: 15px;">
-				<textarea  cols="30" rows="10" placeholder="请输入"  maxlength="150" style="font-size: 24rpx;background-color: #F0F0F0;border-radius: 20rpx;width: 96%;margin: 0 auto;padding: 20rpx;" v-model="form.estimate"></textarea>
-				<p style="text-align: right; font-size: 24rpx; color: #666;padding:0 20rpx 10rpx 0;">
-				      剩余 {{ remainingCharacters }} 字
-				    </p>
-			</view>
+				<view class="" style="background-color: #F0F0F0;border-radius: 20rpx;margin-bottom: 15px;">
+					<textarea cols="30" rows="10" placeholder="请输入" maxlength="150"
+						style="font-size: 24rpx;background-color: #F0F0F0;border-radius: 20rpx;width: 96%;margin: 0 auto;padding: 20rpx;"
+						v-model="form.estimate"></textarea>
+					<p style="text-align: right; font-size: 24rpx; color: #666;padding:0 20rpx 10rpx 0;">
+						剩余 {{ remainingCharacters }} 字
+					</p>
+				</view>
 				<u-button type="success" @click="submit">提交</u-button>
 			</view>
 		</u-popup>
@@ -54,104 +60,102 @@
 	export default {
 		data() {
 			return {
-				recordList:[
-					
+				recordList: [
+
 				],
-				toushu:[],
+				toushu: [],
 				pageindex: {
+					start:'投诉记录',
 					pageNumber: 0,
 					pageSize: 10
 				},
-				activesType: [
-					{
+				activesType: [{
 					value: 0,
 					label: '投诉记录'
-				},{
+				}, {
 					value: 1,
 					label: '报修记录'
-				}
-				],
-				typeShow:false,
-				joinShow:false,
-				form:{
-					estimate:'',
-					id:''
+				}],
+				typeShow: false,
+				joinShow: false,
+				form: {
+					estimate: '',
+					id: ''
 				},
-				indexMsg :0
+				indexMsg: 0
 			}
 		},
-		mounted(){
+		mounted() {
 			this.getALL()
 		},
-		  computed: {
-		    remainingCharacters() {
-		      const maxLength = 150;
-		      return maxLength - this.form.estimate.length;
-		    }
-		  },
+		computed: {
+			remainingCharacters() {
+				const maxLength = 150;
+				return maxLength - this.form.estimate.length;
+			}
+		},
 		methods: {
-			baoShow(val,ids){
-					  this.joinShow = true
-					  this.form.estimate = ''
-					  this.form.id = ids
-					  this.indexMsg = val
+			baoShow(val, ids) {
+				this.joinShow = true
+				this.form.estimate = ''
+				this.form.id = ids
+				this.indexMsg = val
 			},
-			getALL(){
-				this.pageindex.createUser =uni.getStorageSync('user').phone
-				this.$http.sendRequest('/cereComplaintsSuggestions/queryByPage', 'POST',this.pageindex,1).then(res => {
-						this.toushu = res.data.data.content
-				}).catch(err => {
-					console.log(err)
-					//请求失败
+			getALL() {
+				this.pageindex.createUser = uni.getStorageSync('user').phone
+				this.$http.sendRequest('/cereComplaintsSuggestions/queryByPage', 'POST', this.pageindex, 1).then(
+				res => {
+					this.toushu = res.data.data.content
+					this.recordList = []
 				})
 			},
-			recordXq(item){
-				 const encodedItem = encodeURIComponent(JSON.stringify(item));
+			recordXq(item) {
+				const encodedItem = encodeURIComponent(JSON.stringify(item));
 				uni.navigateTo({
-				 url: `/pages/serve/jiDed?item=${encodedItem}`,
-				 })
+					url: `/pages/serve/jiDed?item=${encodedItem}`,
+				})
 			},
 			typeChange(e) {
-				
-				this.pageindex.start = e[0].labels
-				if(e[0].value == 0){
-			
-				this.$http.sendRequest('/cereComplaintsSuggestions/queryByPage', 'POST',this.pageindex,1).then(res => {
+				this.pageindex.start = e[0].label
+				if (e[0].value == 0) {
+
+					this.$http.sendRequest('/cereComplaintsSuggestions/queryByPage', 'POST', this.pageindex, 1).then(
+					res => {
 						this.toushu = res.data.data.content
-						this.recordList =[]
-				})
-				}else{
-					this.$http.sendRequest('/cereReportIssuesRepairs/queryByPage', 'POST',this.pageindex,1).then(res => {
-							this.recordList = res.data.data.content
-							this.toushu = []
+						this.recordList = []
+					})
+				} else {
+					this.$http.sendRequest('/cereReportIssuesRepairs/queryByPage', 'POST', this.pageindex, 1).then(res => {
+						this.recordList = res.data.data.content
+						this.toushu = []
 					})
 				}
 			},
-			submit(){
-				 if (!this.form.estimate) {
-				 	uni.showToast({
-				 		icon: 'none',
-				 		title: '请输入评价信息'
-				 	});
-				 	return;
-				 }
-				 if(this.indexMsg == 1){
-					 this.$http.sendRequest('/cereComplaintsSuggestions/edit', 'POST',this.form,1).then(res => {
-					 		uni.showToast({
-					 			icon: 'success',
-					 			title: '评价成功'
-					 		});
-					 })
-					 this.joinShow = false
-				 }else{
-					 this.$http.sendRequest('/cereReportIssuesRepairs/edit', 'POST',this.form,1).then(res => {
-					 		uni.showToast({
-					 			icon: 'success',
-					 			title: '评价成功'
-					 		});
-					 })
-					 this.joinShow = false
-				 }
+			submit() {
+				if (!this.form.estimate) {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入评价信息'
+					});
+					return;
+				}
+				if (this.indexMsg == 1) {
+					this.$http.sendRequest('/cereComplaintsSuggestions/edit', 'POST', this.form, 1).then(res => {
+						uni.showToast({
+							icon: 'success',
+							title: '评价成功'
+						});
+					})
+					this.joinShow = false
+				} else {
+					this.$http.sendRequest('/cereReportIssuesRepairs/edit', 'POST', this.form, 1).then(res => {
+						uni.showToast({
+							icon: 'success',
+							title: '评价成功'
+						});
+					})
+					this.joinShow = false
+				}
 			}
 		}
 	}
@@ -159,4 +163,4 @@
 
 <style scoped lang="scss">
 	@import 'serve.scss';
-</style> 
+</style>
\ No newline at end of file
diff --git a/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue b/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
index 8d6d5df..7972b97 100644
--- a/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
+++ b/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
@@ -1,20 +1,20 @@
 <template>
 	<view class="page">
 		<view class="zhutu">
-		
-				 <swiper :indicator-dots="true" :autoplay="true" :interval="3000" :duration="500" style="height:100%">
-				      <!-- 使用 v-for 指令遍历图片链接数组 -->
-				      <swiper-item v-for="(imageUrl, index) in lunbo" :key="index">
-				        <!-- u-image 组件用于展示图片 -->
-				        <u-image :showLoading="true" :src="imgurl+imageUrl" width="100%" height="100%" border="20"></u-image>
-				      </swiper-item>
-				    </swiper>
-			
-			  <!-- <u-image width="100%" height="300rpx" :src="imgurl+record.appendicesContract" border-radius="10"></u-image> -->
-			  <!-- <u-image width="100%" height="300rpx" :src="record.cereBasicInformationShop&&record.cereBasicInformationShop.displayMainImage?imgurl + record.cereBasicInformationShop.displayMainImage:record.cereBasicInformationVenue&&record.cereBasicInformationVenue.displayImage?imgurl + record.cereBasicInformationVenue.displayImage:record.cereAdvertisingInformation&&record.cereAdvertisingInformation.locationDiagram?imgurl + record.cereAdvertisingInformation.locationDiagram:''"></u-image> -->
+			<swiper :indicator-dots="true" :autoplay="true" :interval="3000" :duration="500" style="height:100%">
+				<!-- 使用 v-for 指令遍历图片链接数组 -->
+				<swiper-item v-for="(imageUrl, index) in lunbo" :key="index">
+					<!-- u-image 组件用于展示图片 -->
+					<u-image :showLoading="true" :src="imgurl+imageUrl" width="100%" height="100%"
+						border="20"></u-image>
+				</swiper-item>
+			</swiper>
+
+			<!-- <u-image width="100%" height="300rpx" :src="imgurl+record.appendicesContract" border-radius="10"></u-image> -->
+			<!-- <u-image width="100%" height="300rpx" :src="record.cereBasicInformationShop&&record.cereBasicInformationShop.displayMainImage?imgurl + record.cereBasicInformationShop.displayMainImage:record.cereBasicInformationVenue&&record.cereBasicInformationVenue.displayImage?imgurl + record.cereBasicInformationVenue.displayImage:record.cereAdvertisingInformation&&record.cereAdvertisingInformation.locationDiagram?imgurl + record.cereAdvertisingInformation.locationDiagram:''"></u-image> -->
 		</view>
 		<view class="msglist">
-			
+
 			<view class="form-item">
 				<view class="label">租赁状态</view>
 				<text>{{record.auditStatus =='1'?'待审核':record.auditStatus =='2'?'待签约':record.auditStatus =='3'?'已驳回':record.auditStatus =='4'?'已签约':'已终止'}}</text>
@@ -34,260 +34,269 @@
 			<view class="form-item">
 				<view class="label">付款日</view>
 				<text>{{heData.paymentDay || '无'}}</text>
-			</view>	
+			</view>
 		</view>
 		<view class="msglist">
-		<u-read-more show-height="300" color="#3f9b6a" close-text="查看更多" text-indent="0em"  v-if="mapType == '商铺'">
+			<u-read-more show-height="300" color="#3f9b6a" close-text="查看更多" text-indent="0em" v-if="mapType == '商铺'">
+				<view class="form-item">
+					<view class="label">商铺名称</view>
+					<text>{{record.cereBasicInformationShop.shopName}}</text>
+				</view>
+				<view class="form-item">
+					<view class="label">商铺类型</view>
+					<text>{{record.cereBasicInformationShop.shopType=='1'?'移动铺位':record.cereBasicInformationShop.shopType=='2'?'固定铺位':'无'}}</text>
+				</view>
+
+				<view class="form-item">
+					<view class="label">实际使用面积</view>
+					<text>{{record.cereBasicInformationShop.actualUsableArea || '无'}}</text>
+				</view>
+				<view class="form-item">
+					<view class="label">产权面积</view>
+					<text>{{record.cereBasicInformationShop.propertyArea || '无' }}</text>
+				</view>
+				<view class="form-item">
+					<view class="label">所属区域</view>
+					<text>{{record.cereBasicInformationShop.belongingRegion}}</text>
+				</view>
+				<view class="form-item">
+					<view class="label">归属部门</view>
+					<text>{{record.cereBasicInformationShop.belongingDepartment || '无'}}</text>
+				</view>
+				<view class="form-item">
+					<view class="label">详细地址</view>
+					<text>{{record.cereBasicInformationShop.detailedLocation}}</text>
+				</view>
+			</u-read-more>
+		</view>
+
+		<view class="msglist" v-if="mapType == '广告位'">
+			<u-read-more show-height="300" color="#3f9b6a" close-text="查看更多" text-indent="0em">
+
+				<view class="form-item">
+					<view class="label">广告位名称</view>
+					<text>{{record.cereAdvertisingInformation.advertisingName}}</text>
+				</view>
+				<view class="form-item">
+					<view class="label">广告位类型</view>
+					<text>{{record.cereAdvertisingInformation.advertisingType}}</text>
+				</view>
+				<view class="form-item" v-if="record.cereAdvertisingInformation.advertisingType == '线上广告位'">
+					<view class="label">所属端</view>
+					<text>{{record.cereAdvertisingInformation.applicationTime}}</text>
+				</view>
+				<view class="form-item" v-if="record.cereAdvertisingInformation.advertisingType == '实体广告位'">
+					<view class="label">广告材质</view>
+					<text>{{record.cereAdvertisingInformation.advertisingMaterial}}</text>
+				</view>
+				<view class="form-item">
+					<view class="label">广告尺寸</view>
+					<text>{{record.cereAdvertisingInformation.dimensions}}</text>
+				</view>
+			</u-read-more>
+		</view>
+		<view class="msglist" v-if="mapType == '场地'">
+			<u-read-more show-height="300" color="#3f9b6a" close-text="查看更多" text-indent="0em">
+
+				<view class="form-item">
+					<view class="label">场地名称</view>
+					<text>{{record.cereBasicInformationVenue.venueName}}</text>
+				</view>
+				<view class="form-item">
+					<view class="label">场地类型</view>
+					<text>{{record.cereBasicInformationVenue.venueType}}</text>
+				</view>
+				<view class="form-item">
+					<view class="label">实际使用面积</view>
+					<text>{{record.cereBasicInformationVenue.actualArea}}</text>
+				</view>
+				<view class="form-item">
+					<view class="label">所属区域</view>
+					<text>{{record.cereBasicInformationVenue.district}}</text>
+				</view>
+				<view class="form-item">
+					<view class="label">详细位置</view>
+					<text>{{record.cereBasicInformationVenue.detailedLocation}}</text>
+				</view>
+			</u-read-more>
+		</view>
+
+		<view class="msglist" v-if="btnShow == false&&mapType == '商铺'" style="margin-bottom:80px;">
+
+
 			<view class="form-item">
-				<view class="label">商铺名称</view>
-				<text>{{record.cereBasicInformationShop.shopName}}</text>
+				<view class="label">店铺名称</view>
+				<text>{{myshopMsg.shopName}}</text>
 			</view>
 			<view class="form-item">
-				<view class="label">商铺类型</view>
-				<text>{{record.cereBasicInformationShop.shopType=='1'?'移动铺位':record.cereBasicInformationShop.shopType=='2'?'固定铺位':'无'}}</text>
+				<view class="label">店铺介绍</view>
+			</view>
+			<view class="" style="background-color: #F0F0F0;border-radius: 20rpx;">
+				<view style="padding:10px;">{{myshopMsg.shopDescription}}</view>
 			</view>
-			
 			<view class="form-item">
-				<view class="label">实际使用面积</view>
-				<text>{{record.cereBasicInformationShop.actualUsableArea || '无'}}</text>
+				<view class="label">营业时间</view>
+			</view>
+			<view class="" style="background-color: #F0F0F0;border-radius: 20rpx;">
+				<view style="padding:10px;">{{myshopMsg.businessHours}}</view>
 			</view>
 			<view class="form-item">
-				<view class="label">产权面积</view>
-				<text>{{record.cereBasicInformationShop.propertyArea || '无' }}</text>
+				<view class="label">联系电话</view>
+				<text>{{myshopMsg.contactNumber}}</text>
 			</view>
 			<view class="form-item">
-				<view class="label">所属区域</view>
-				<text>{{record.cereBasicInformationShop.belongingRegion}}</text>
+				<view class="label">位置描述</view>
+			</view>
+			<view class="" style="background-color: #F0F0F0;border-radius: 20rpx;">
+				<view style="padding:10px;">{{myshopMsg.locationDescription}}</view>
 			</view>
 			<view class="form-item">
-				<view class="label">归属部门</view>
-				<text>{{record.cereBasicInformationShop.belongingDepartment || '无'}}</text>
+				<view class="label">店内照片</view>
 			</view>
+			<view class="image-container">
+				<view style="width: 48%;" v-for="(item,index) in myshopMsg.shopPhotos" :key="index">
+					<u-image class="image-item" width="100%" height="180rpx" border-raduis="10"
+						:src="imgurl+item"></u-image>
+				</view>
+
+
+			</view>
+		</view>
+
+		<view class="msglist" v-if="mapType == '广告位'" style="margin-bottom:80px;">
 			<view class="form-item">
-				<view class="label">详细地址</view>
-				<text>{{record.cereBasicInformationShop.detailedLocation}}</text>
-			</view>	
-			</u-read-more>
+				<view class="label">投放内容</view>
 			</view>
-				
-				<view class="msglist" v-if="mapType == '广告位'">
-				<u-read-more show-height="300" color="#3f9b6a" close-text="查看更多" text-indent="0em">
-					
-					<view class="form-item">
-						<view class="label">广告位名称</view>
-						<text>{{record.cereAdvertisingInformation.advertisingName}}</text>
-					</view>
-					<view class="form-item">
-						<view class="label">广告位类型</view>
-						<text>{{record.cereAdvertisingInformation.advertisingType}}</text>
-					</view>
-					<view class="form-item" v-if="record.cereAdvertisingInformation.advertisingType == '线上广告位'">
-						<view class="label">所属端</view>
-						<text>{{record.cereAdvertisingInformation.applicationTime}}</text>
-					</view>
-					<view class="form-item" v-if="record.cereAdvertisingInformation.advertisingType == '实体广告位'">
-						<view class="label">广告材质</view>
-						<text>{{record.cereAdvertisingInformation.advertisingMaterial}}</text>
-					</view>
-					<view class="form-item">
-						<view class="label">广告尺寸</view>
-						<text>{{record.cereAdvertisingInformation.dimensions}}</text>
-					</view>
-					</u-read-more>
-						</view>
-						<view class="msglist" v-if="mapType == '场地'">
-						<u-read-more show-height="300" color="#3f9b6a" close-text="查看更多" text-indent="0em">
-							
-							<view class="form-item">
-								<view class="label">场地名称</view>
-								<text>{{record.cereBasicInformationVenue.venueName}}</text>
-							</view>
-							<view class="form-item">
-								<view class="label">场地类型</view>
-								<text>{{record.cereBasicInformationVenue.venueType}}</text>
-							</view>
-							<view class="form-item">
-								<view class="label">实际使用面积</view>
-								<text>{{record.cereBasicInformationVenue.actualArea}}</text>
-							</view>
-							<view class="form-item">
-								<view class="label">所属区域</view>
-								<text>{{record.cereBasicInformationVenue.district}}</text>
-							</view>
-							<view class="form-item">
-								<view class="label">详细位置</view>
-								<text>{{record.cereBasicInformationVenue.detailedLocation}}</text>
-							</view>	
-							</u-read-more>
-								</view>
-				
-				<view class="msglist"  v-if="btnShow == false&&mapType == '商铺'" style="margin-bottom:80px;">
-				
-					
-					<view class="form-item">
-						<view class="label">店铺名称</view>
-						<text>{{myshopMsg.shopName}}</text>
-					</view>
-					<view class="form-item">
-						<view class="label">店铺介绍</view>
-					</view>
-					<view class="" style="background-color: #F0F0F0;border-radius: 20rpx;">
-						<view style="padding:10px;">{{myshopMsg.shopDescription}}</view>
-					</view>
-					<view class="form-item">
-						<view class="label">营业时间</view>
-					</view>
-					<view class="" style="background-color: #F0F0F0;border-radius: 20rpx;">
-						<view style="padding:10px;">{{myshopMsg.businessHours}}</view>
-					</view>
-					<view class="form-item">
-						<view class="label">联系电话</view>
-						<text>{{myshopMsg.contactNumber}}</text>
-					</view>
-					<view class="form-item">
-						<view class="label">位置描述</view>
-					</view>	
-					<view class="" style="background-color: #F0F0F0;border-radius: 20rpx;">
-						<view style="padding:10px;">{{myshopMsg.locationDescription}}</view>
-					</view>
-					<view class="form-item">
-						<view class="label">店内照片</view>
-					</view>
-					<view class="image-container">
-						<view style="width: 48%;" v-for="(item,index) in myshopMsg.shopPhotos" :key="index">
-							<u-image  class="image-item" width="100%"   height="180rpx" border-raduis="10" :src="imgurl+item" ></u-image>
-						</view>
-						
-						
-					</view>
-						</view>
-						
-						<view class="msglist"  v-if="mapType == '广告位'"  style="margin-bottom:80px;">
-							<view class="form-item">
-								<view class="label">投放内容</view>
-							</view>
-
-							 <u-image    class="image-item" width="100%" border-raduis="10" mode="heightFix" height="300rpx" :src="imgurl+record.coverImage" ></u-image> 
-						
-
-								</view>
-								<view style="margin-bottom: 80px;" v-if="btnShow && mapType == '商铺'"><u-button @click="xiuMsg(1)" shape="circle" :custom-style="hoverStyle" hover-class="none" :plain="true">添加我的店铺信息</u-button></view>
-						<view class="page-footer" v-if="record.auditStatus =='4'">
-							<u-button style="background-color: #DFE0E4; flex: 1; margin: 0 10px;" @click="getQuit('/pagesA/myZiyuan/myZiyuanQuit')"
-								>申请退租</u-button>
-							<u-button type="success" style="flex: 1; margin: 0 10px;" @click="xuShow = true" >申请续租</u-button>
-							<u-button type="success" style="flex: 1; margin: 0 10px;" @click="xiuMsg(2)"  v-if="btnShow == false&&mapType == '商铺'">修改资料</u-button>
-						</view>
-							<u-modal v-model="xuShow" :content="contentxu" @confirm="xufirm" :show-cancel-button="true" ></u-modal>
-							<u-toast ref="uToast" />
+
+			<u-image class="image-item" width="100%" border-raduis="10" mode="heightFix" height="300rpx"
+				:src="imgurl+record.coverImage"></u-image>
+
+
+		</view>
+		<view style="margin-bottom: 80px;" v-if="btnShow && mapType == '商铺'"><u-button @click="xiuMsg(1)" shape="circle"
+				:custom-style="hoverStyle" hover-class="none" :plain="true">添加我的店铺信息</u-button></view>
+		<view class="page-footer" v-if="record.auditStatus =='4'">
+			<u-button style="background-color: #DFE0E4; flex: 1; margin: 0 10px;"
+				@click="getQuit('/pagesA/myZiyuan/myZiyuanQuit')">申请退租</u-button>
+			<u-button type="success" style="flex: 1; margin: 0 10px;" @click="xuShow = true">申请续租</u-button>
+			<u-button type="success" style="flex: 1; margin: 0 10px;" @click="xiuMsg(2)"
+				v-if="btnShow == false&&mapType == '商铺'">修改资料</u-button>
+		</view>
+		<u-modal v-model="xuShow" :content="contentxu" @confirm="xufirm" :show-cancel-button="true"></u-modal>
+		<u-toast ref="uToast" />
 	</view>
-	
+
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
-				imgurl:this.$img,
-				record:{},
-				btnShow:false,
-				hoverStyle:{
-					
-					color:'#3f9b6a'
+				imgurl: '',
+				record: {},
+				btnShow: false,
+				hoverStyle: {
+
+					color: '#3f9b6a'
 				},
-				mapType:'',
-				content:'',
-				xuShow:false,
-				contentxu:'您确定是否需要续租',
+				mapType: '',
+				content: '',
+				xuShow: false,
+				contentxu: '您确定是否需要续租',
 				pageindex: {
 					pageNumber: 0,
 					pageSize: 10,
-					contractId:''
+					contractId: ''
 				},
-				myshopMsg:{},
-				heData:{},
+				myshopMsg: {},
+				heData: {},
 				xuForm: {
-				reasonForApplication:'',
-				applicationTime:'',
-				contractId:0,
-				contractType:1,
-				createTime:'',
-				createUser:'',
-				lunbo:[]
-					},
+					reasonForApplication: '',
+					applicationTime: '',
+					contractId: 0,
+					contractType: 1,
+					createTime: '',
+					createUser: '',	
+				},
+				lunbo: []
 			}
 		},
-		 onLoad(options) {
-			   this.imgurl = this.$img
-		    const item = JSON.parse(decodeURIComponent(options.item));
-		     console.log(item,'1123123213')
+		onLoad(options) {
+			this.imgurl = this.$img
+			const item = JSON.parse(decodeURIComponent(options.item));
+			console.log(item, '1123123213')
 			this.record = item
-			 let imgsList  = item.cereBasicInformationShop&&item.cereBasicInformationShop.displayMainImage?item.cereBasicInformationShop.displayMainImage:item.cereBasicInformationVenue&&item.cereBasicInformationVenue.displayImage?item.cereBasicInformationVenue.displayImage:item.cereAdvertisingInformation&&item.cereAdvertisingInformation.locationDiagram?item.cereAdvertisingInformation.locationDiagram:''
-			  this.lunbo = imgsList.split(',')
-			  console.log(this.lunbo)
-			let pageHe={
+			let imgsList = item.cereBasicInformationShop && item.cereBasicInformationShop.displayMainImage ? item
+				.cereBasicInformationShop.displayMainImage : item.cereBasicInformationVenue && item
+				.cereBasicInformationVenue.displayImage ? item.cereBasicInformationVenue.displayImage : item
+				.cereAdvertisingInformation && item.cereAdvertisingInformation.locationDiagram ? item
+				.cereAdvertisingInformation.locationDiagram : ''
+			this.lunbo = imgsList.split(',')
+			console.log(this.lunbo)
+			let pageHe = {
 				pageNumber: 0,
 				pageSize: 10,
-				shopNumber:'',
-				dataStatus:1
+				shopNumber: '',
+				dataStatus: 1
 			}
-			if(item.cereBasicInformationShop && item.cereBasicInformationShop.shopName){
+			if (item.cereBasicInformationShop && item.cereBasicInformationShop.shopName) {
 				this.mapType = '商铺'
 				pageHe.shopNumber = `sp${item.cereBasicInformationShop.id}`
-			}else if( item.cereBasicInformationVenue && item.cereBasicInformationVenue.venueName){
+			} else if (item.cereBasicInformationVenue && item.cereBasicInformationVenue.venueName) {
 				this.mapType = '场地'
 				pageHe.shopNumber = `cd${item.cereBasicInformationVenue.id}`
-			}else if(item.cereAdvertisingInformation && item.cereAdvertisingInformation.advertisingName){
+			} else if (item.cereAdvertisingInformation && item.cereAdvertisingInformation.advertisingName) {
 				this.mapType = '广告位'
 				pageHe.shopNumber = `gg${item.cereAdvertisingInformation.id}`
 			}
-			
-			this.$http.sendRequest('/cereContractInformation/getPage', 'POST', pageHe,1).then(res => {
-				 if(res.data.data.content[0]){
-					 this.heData  = res.data.data.content[0] || {}
-					 this.pageindex.contractId = this.heData.id
-					 if(this.mapType == '商铺'){
-					 	this.$http.sendRequest('/cereAssetShopInformation/queryByPage', 'POST', this.pageindex,1).then(res => {
-					 			if(res.data.data.content.length == 0){
-					 				this.btnShow = true
-					 			}else{
-					 				this.btnShow = false
-					 				this.myshopMsg = res.data.data.content[0]
-					 				this.myshopMsg.shopPhotos = this.myshopMsg.shopPhotos.split(',')
-					 					console.log(this.myshopMsg.shopPhotos)
-					 				this.myshopMsg.shopPhotos.map(item=>{
-					 					item = this.imgurl + item
-					 				})
-					 				
-					 			}
-					 	})
-					 }
-				 }
-				
+
+			this.$http.sendRequest('/cereContractInformation/getPage', 'POST', pageHe, 1).then(res => {
+				if (res.data.data.content[0]) {
+					this.heData = res.data.data.content[0] || {}
+					this.pageindex.contractId = this.heData.id
+					if (this.mapType == '商铺') {
+						this.$http.sendRequest('/cereAssetShopInformation/queryByPage', 'POST', this.pageindex, 1)
+							.then(res => {
+								if (res.data.data.content.length == 0) {
+									this.btnShow = true
+								} else {
+									this.btnShow = false
+									this.myshopMsg = res.data.data.content[0]
+									this.myshopMsg.shopPhotos = this.myshopMsg.shopPhotos.split(',')
+									console.log(this.myshopMsg.shopPhotos)
+									this.myshopMsg.shopPhotos.map(item => {
+										item = this.imgurl + item
+									})
+
+								}
+							})
+					}
+				}
+
 			})
-		  },
-		  onShow() {
-		  	
-		  },
+		},
+		onShow() {
+
+		},
 		methods: {
-			getQuit(urls){
+			getQuit(urls) {
 				uni.navigateTo({
-					url: urls+`?ids=${this.heData.id}`
+					url: urls + `?ids=${this.heData.id}`
 				})
 			},
-			xufirm(){
-				
+			xufirm() {
+
 				this.xuForm.createUser = uni.getStorageSync('user').phone
 				this.xuForm.createTime = this.getCurrentTime()
 				this.xuForm.contractId = Number(this.heData.id)
-				this.$http.sendRequest('/changeContractInformation/add', 'POST',this.xuForm, 1).then(res => {
-			
-									this.$refs.uToast.show({
-										title: '续租申请已提交，请耐心等待',
-										icon: 'success',
-										url: '/pages/my/my'
-									})
-					
+				this.$http.sendRequest('/changeContractInformation/add', 'POST', this.xuForm, 1).then(res => {
+
+					this.$refs.uToast.show({
+						title: '续租申请已提交，请耐心等待',
+						icon: 'success',
+						url: '/pages/my/my'
+					})
+
 					// uni.switchTab({
 					// 	url: '/pages/my/my'
 					// })
@@ -295,15 +304,15 @@
 					// 	title: '续租申请已提交，请耐心等待',
 					// 	icon: 'success',
 					// })
-				
+
 				})
 			},
-			xiuMsg(val){
-				if(val == 1){
+			xiuMsg(val) {
+				if (val == 1) {
 					uni.navigateTo({
 						url: `/pagesA/myZiyuan/addMyshop?ids=${this.heData.id}`
 					})
-				}else{
+				} else {
 					let lists = JSON.stringify(this.myshopMsg)
 					uni.navigateTo({
 						url: `/pagesA/myZiyuan/addMyshop?ids=${this.heData.id}&msg=${lists}`
@@ -318,7 +327,7 @@
 				const hours = ('0' + now.getHours()).slice(-2);
 				const minutes = ('0' + now.getMinutes()).slice(-2);
 				const seconds = ('0' + now.getSeconds()).slice(-2);
-			
+
 				return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 			},
 		}
@@ -326,16 +335,17 @@
 </script>
 
 <style scoped lang="scss">
-	.page{
+	.page {
 		position: absolute;
 		left: 0;
 		top: 0;
 		width: 100%;
-		
+
 		padding: 0 24rpx;
-		
+
 	}
-	.zhutu{
+
+	.zhutu {
 		margin: 15px 0;
 		background-color: #fff;
 		width: 100%;
@@ -343,8 +353,9 @@
 	}
 
 	/* 记录列表 */
-	.record-list{
+	.record-list {
 		margin-top: 20rpx;
+
 		.good-item {
 			width: 100%;
 			display: flex;
@@ -352,39 +363,46 @@
 			padding: 16rpx;
 			border-radius: 14rpx;
 			margin-bottom: 26rpx;
+
 			.img {
 				width: 200rpx;
 				height: 200rpx;
 			}
+
 			.info {
 				width: calc(100% - 220rpx);
 				margin-left: 20rpx;
+
 				.title {
 					width: 100%;
 					font-size: 28rpx;
 					line-height: 44rpx;
 					font-weight: 700;
 					white-space: nowrap;
-					overflow : hidden;
+					overflow: hidden;
 					text-overflow: ellipsis;
 					margin-bottom: 20rpx;
 				}
+
 				.info-item {
 					display: flex;
 					line-height: 30rpx;
 					font-size: 26rpx;
 					color: #717981;
+
 					text {
 						white-space: nowrap;
-						overflow : hidden;
+						overflow: hidden;
 						text-overflow: ellipsis;
 						margin-left: 10rpx;
+
 						span {
 							font-size: 30rpx;
 							color: #000;
 							font-weight: 700;
 						}
 					}
+
 					.u-tag {
 						margin: 0 6rpx;
 						border: unset;
@@ -393,11 +411,13 @@
 			}
 		}
 	}
-	.msglist{
+
+	.msglist {
 		padding: 0 30rpx;
 		background-color: #Fff;
 		border-radius: 14rpx;
 		margin-bottom: 20rpx;
+
 		.form-item {
 			display: flex;
 			flex-direction: row;
@@ -406,18 +426,22 @@
 			line-height: 70rpx;
 			border-bottom: #eee solid 1rpx;
 			padding: 10rpx 0;
+
 			&[label-top] {
 				flex-direction: column;
 				justify-content: flex-start;
 				align-items: flex-start;
 			}
+
 			text {
 				font-size: 24rpx;
 				color: #3D3D3D;
 			}
+
 			.img {
 				padding-bottom: 18rpx;
 			}
+
 			.deom-box {
 				width: 100%;
 				display: flex !important;
@@ -426,6 +450,7 @@
 				border-radius: 9px;
 				// margin-top: 9px;
 				width: 100%;
+
 				// .u-upload {
 				// .u-add-wrap {
 				// 	width: 304rpx !important;
@@ -445,25 +470,29 @@
 					flex-direction: column;
 					align-items: center;
 					padding: 20rpx;
+
 					text {
 						margin-top: 18rpx;
 					}
 				}
 			}
 		}
+
 		:last-child {
 			border-bottom: unset;
 		}
 	}
-	.footbtn{
+
+	.footbtn {
 		position: fixed;
 		bottom: 0;
 		left: 0;
 		z-index: 10;
-		height:180rpx;
+		height: 180rpx;
 		width: 100%;
 		border-radius: 26rpx 26rpx 0 0;
 		background-color: #fff;
+
 		.info-total {
 			display: flex;
 			flex-direction: row;
@@ -472,19 +501,23 @@
 			margin: 24rpx 50rpx;
 			font-weight: 700;
 			font-size: 24rpx;
+
 			span {
 				color: #0FBB59;
 				font-size: 32rpx
 			}
 		}
+
 		.footer-btn {
 			display: flex;
+
 			.u-btn {
 				width: 40%;
 			}
 		}
 	}
-	.page-footer{
+
+	.page-footer {
 		position: fixed;
 		left: 0;
 		bottom: 0;
@@ -494,35 +527,42 @@
 		background-color: #FFFFFF;
 		z-index: 20;
 		padding: 15px 0;
-		.footer-buy{
+
+		.footer-buy {
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
 			width: 100%;
 			height: 100%;
-			.cart-add{
+
+			.cart-add {
 				display: flex;
 				align-items: center;
 				justify-content: center;
 				width: 100%;
 				height: 100rpx;
 				background-color: #3f9b6a;
-				text{
+
+				text {
 					font-size: 28rpx;
 					color: #FFFFFF;
 				}
 			}
 		}
 	}
+
 	.image-container {
 		padding: 10rpx 0;
-	  display: flex;
-	  flex-wrap: wrap; /* 启用换行 */
-	  justify-content: space-between; /* 图片之间均匀分布 */
+		display: flex;
+		flex-wrap: wrap;
+		/* 启用换行 */
+		justify-content: space-between;
+		/* 图片之间均匀分布 */
 	}
-	
+
 	.image-item {
-	  box-sizing: border-box;
-	  margin-bottom: 10rpx; /* 图片之间的垂直间距 */
+		box-sizing: border-box;
+		margin-bottom: 10rpx;
+		/* 图片之间的垂直间距 */
 	}
-</style> 
+</style>
\ No newline at end of file
diff --git a/lvdao-miniapp/pagesA/tishi/tishi.vue b/lvdao-miniapp/pagesA/tishi/tishi.vue
new file mode 100644
index 0000000..8d8eecf
--- /dev/null
+++ b/lvdao-miniapp/pagesA/tishi/tishi.vue
@@ -0,0 +1,22 @@
+<template>
+	<view style="height: 100vh;width: 100%;background: rgba(144, 144, 144, 0.8);display: flex;justify-content: center;">
+		<image src="@/static/icon/bg1.png" style="width: 55%;margin-top: 25vh;" mode="widthFix"></image>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/lvdao-miniapp/static/icon/bg1.png b/lvdao-miniapp/static/icon/bg1.png
new file mode 100644
index 0000000..3de4136
Binary files /dev/null and b/lvdao-miniapp/static/icon/bg1.png differ
diff --git a/lvdao-miniapp/static/icon/icon1.png b/lvdao-miniapp/static/icon/icon1.png
new file mode 100644
index 0000000..43a5851
Binary files /dev/null and b/lvdao-miniapp/static/icon/icon1.png differ
diff --git a/lvdao-miniapp/static/icon/icon2.png b/lvdao-miniapp/static/icon/icon2.png
new file mode 100644
index 0000000..f1465e4
Binary files /dev/null and b/lvdao-miniapp/static/icon/icon2.png differ
diff --git a/lvdao-miniapp/static/icon/icon3.png b/lvdao-miniapp/static/icon/icon3.png
new file mode 100644
index 0000000..36536dc
Binary files /dev/null and b/lvdao-miniapp/static/icon/icon3.png differ
diff --git a/lvdao-miniapp/static/icon/icon4.png b/lvdao-miniapp/static/icon/icon4.png
new file mode 100644
index 0000000..36bc74f
Binary files /dev/null and b/lvdao-miniapp/static/icon/icon4.png differ
diff --git a/lvdao-miniapp/static/icon/icon5.png b/lvdao-miniapp/static/icon/icon5.png
new file mode 100644
index 0000000..07a6aca
Binary files /dev/null and b/lvdao-miniapp/static/icon/icon5.png differ
diff --git a/lvdao-miniapp/static/icon/icon6.png b/lvdao-miniapp/static/icon/icon6.png
new file mode 100644
index 0000000..b9826a7
Binary files /dev/null and b/lvdao-miniapp/static/icon/icon6.png differ
--
libgit2 0.21.4