From 53c1431a31a5f12d9b417c094a95601c863b2326 Mon Sep 17 00:00:00 2001
From: wesley88 <9519127+wesley88@user.noreply.gitee.com>
Date: Mon, 17 Mar 2025 14:27:28 +0800
Subject: [PATCH] 1

---
 admin-web-master/src/views/shopRental/manage/index.vue |   2 +-
 lvdao-miniapp/pages.json                               |   7 +++++++
 lvdao-miniapp/pages/orderList/inventory.vue            |   6 +++---
 lvdao-miniapp/pages/orderList/inventorydetails.vue     | 305 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------
 lvdao-miniapp/pages/workbench/workbench.vue            |   2 +-
 lvdao-miniapp/pagesA/myZiyuan/myZiDetailsnew.vue       | 564 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 lvdao-miniapp/pagesA/myZiyuan/myZiyuan - 副本.vue    | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue             | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------
 lvdao-miniapp/utils/request.js                         |   2 +-
 9 files changed, 962 insertions(+), 146 deletions(-)
 create mode 100644 lvdao-miniapp/pagesA/myZiyuan/myZiDetailsnew.vue
 create mode 100644 lvdao-miniapp/pagesA/myZiyuan/myZiyuan - 副本.vue

diff --git a/admin-web-master/src/views/shopRental/manage/index.vue b/admin-web-master/src/views/shopRental/manage/index.vue
index d8e74b7..921793b 100644
--- a/admin-web-master/src/views/shopRental/manage/index.vue
+++ b/admin-web-master/src/views/shopRental/manage/index.vue
@@ -98,7 +98,7 @@
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
               <!--  -->
-              <div v-if='scope.row.dataStatus == 4'  @click="openOAitem(scope.row)" class="tableBtn greens">OA</div>
+              <div v-if='scope.row.dataStatus == 4'  @click="openOAitem(scope.row)" class="tableBtn greens">OA审核</div>
               <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同变更')" class="tableBtn greens">合同变更</div>
               <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同续约')" class="tableBtn greens">合同续约</div>
               <div v-if='scope.row.dataStatus == 1' @click="removeinfozz(scope.row,'合同终止')" class="tableBtn greens">合同终止</div>
diff --git a/lvdao-miniapp/pages.json b/lvdao-miniapp/pages.json
index e968a3f..4ee1bd8 100644
--- a/lvdao-miniapp/pages.json
+++ b/lvdao-miniapp/pages.json
@@ -420,6 +420,13 @@
 		"name": "pagesA",
 		"pages": [
 			{
+				"path": "myZiyuan/myZiDetailsnew",
+				"style": {
+					"navigationBarBackgroundColor": "#FFFFFF",
+					"navigationBarTitleText": "资产详情"
+				}
+			},
+			{
 				"path": "payweb/payweb",
 				"style": {
 					"navigationBarBackgroundColor": "#FFFFFF",
diff --git a/lvdao-miniapp/pages/orderList/inventory.vue b/lvdao-miniapp/pages/orderList/inventory.vue
index 6bc21d5..643afee 100644
--- a/lvdao-miniapp/pages/orderList/inventory.vue
+++ b/lvdao-miniapp/pages/orderList/inventory.vue
@@ -3,7 +3,7 @@
 		<view v-if="alllist.length == 0" style="text-align: center;margin-top: 50rpx;" class="tit1">暂无数据</view>
 		<!-- <u-tabs active-color="#26c570" :list="list" :current="current" @change="change"></u-tabs> -->
 		<view style="padding: 0 20rpx;">
-			<view v-for="(item,index) in alllist" :key="index"   @click="gopath('/pages/orderList/inventorydetails',item.orderId)"
+			<view v-for="(item,index) in alllist" :key="index"   @click="gopath('/pages/orderList/inventorydetails',item.productId)"
 				style="background: #fff;margin-top: 40rpx;padding: 30rpx;border-radius: 18rpx;">
 					<view style="display: flex;">
 						<view>
@@ -17,7 +17,7 @@
 							<view  class="t1">积分兑换：{{item.ifCredit=='1'?'允许':item.ifCredit=='0'?'不允许':'-'}}</view>
 						</view>	
 					</view>
-					<view style="display: flex;justify-content: space-between;">
+<!-- 					<view style="display: flex;justify-content: space-between;">
 						<view  class="t1">库存：{{ item.stockNumber }}</view>
 						<view  class="t1">销量：{{ item.volume }}</view>
 					</view>
@@ -25,7 +25,7 @@
 						<view  class="t1">上架状态：{{item.shelveState=='0'?'未上架':item.shelveState=='1'?'已上架':item.shelveState=='2'?'待审核':item.shelveState=='3'?'审核失败':'-'}}</view>	
 						<view  class="t1">登记状态：{{item.registrationStatus=='1'?'已入库':'未入库'}}</view>
 					</view>
-					<view  class="t1">驳回原因：{{ item.reject || '-'}}</view>
+					<view  class="t1">驳回原因：{{ item.reject || '-'}}</view> -->
 				</view>
 			</view>
 		</view>
diff --git a/lvdao-miniapp/pages/orderList/inventorydetails.vue b/lvdao-miniapp/pages/orderList/inventorydetails.vue
index b1c833b..f360888 100644
--- a/lvdao-miniapp/pages/orderList/inventorydetails.vue
+++ b/lvdao-miniapp/pages/orderList/inventorydetails.vue
@@ -1,102 +1,90 @@
 <!-- 订单详情 -->
 <template>
 	<view>
-		<view>
-			<view class="content" style="padding-bottom:200upx;">
-				<view class="order-details-info-box">
-
-					<view class="order-list-box">
-						<view class="item">
-							<view class="order-list-top">
-								<view class="top-l" >
-									<image
-										src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/orderStoreIcon.png"
-										class="shop-img"></image>
-									<text class="shop-name">{{ dataList.shopName }}</text>
-								</view>
-
-							</view>
-							<view class="order-info-box">
-								<view class="order-info">
-									<view class="order-info-item" v-for="proItem in dataList.products"
-										:key="proItem.productId">
-										<image :src="imgurl+proItem.image" class="product-img default-img"></image>
-										<view class="info-box">
-											<text class="product-name">{{ proItem.productName }}</text>
-											<view class="price-sku-box">
-												<view class="product-sku">
-													<view class="mar-left-20" v-for="vItem in proItem.values">
-														<text>规格：{{ vItem }}</text>
-													</view>
-												</view>
-												<view class="product-num">x {{ proItem.number }}</view>
-											</view>
-										</view>
-									</view>
-									<view class="delivery-way-box">
-										<view class="item">
-											<text class="way">商品总价</text>
-											<text class="way">¥{{ dataList.orderPrice }}</text>
-										</view>
-										<view class="item">
-											<text class="way">快递运费</text>
-											<text class="way">¥{{ dataList.logisticsPrice }}</text>
-										</view>
-									</view>
-								</view>
-								<!-- 待发货 待收货 已完成 -->
-								<view class="order-total-box"
-									v-if='dataList.state==2||dataList.state==3||dataList.state==4'>
-									<text>实付款</text>
-									<text class="way-color">¥{{ dataList.price }}</text>
-								</view>
-								<!-- 待付款 价格是橙色-->
-								<view class="order-total-box" v-else-if="dataList.state==1">
-									<text>需付款</text>
-									<text class="way-color">¥{{ dataList.price }}</text>
-								</view>
-								<!-- 退款成功 交易关闭 -->
-								<view class="order-total-box"
-									v-else-if="(dataList.returnType==1 && dataList.moneyReturnList.status==4) || (dataList.returnType==2 && dataList.goodsReturn.status==6) || (dataList.state==5)">
-									<text>需付款</text>
-									<text>¥{{ dataList.price }}</text>
-								</view>
-							</view>
-						</view>
+		<view class="banner-img">
+			<swiper :indicator-dots="true" :autoplay="false" :interval="3000" :duration="500" style="height: 30vh;" indicator-active-color="#fff">
+				<swiper-item v-for="(item, index) in dataList.images" :key="index">
+					<view style="width: 100%;height: 100%;" @click="openimg2(index)">
+						<u-image :showLoading="true" :src="imgurl+item.imgPath" width="100%" height="100%"></u-image>
 					</view>
+				</swiper-item>
+			</swiper>
+		</view>
+		<view class="banner">
+			<view class="banner-item info">
+				<view class="info-title">
+					{{dataList.productName}}
+		
 				</view>
-				<view class="order-details-information padd">
-					<view class="order-title">
-						<text>订单信息</text>
-					</view>
-					<view class="info-box">
-						<!--都有  但是：待付款  待发货  退款成功 交易关闭  只有前两个item-->
-						<view class="item">
-							<text>订单编号：{{ dataList.orderFormid }}</text>
-							<text class="copy-color" :data-clipboard-text="dataList.orderFormid" @click="copy">复制</text>
-						</view>
-						<view class="item">
-							<text>创建时间：{{ dataList.createTime }}</text>
-						</view>
-						<!-- 待收货  有付款时间和发货时间 -->
-						<view class="item" v-if="dataList.state==3">
-							<text>付款时间：{{ dataList.paymentTime }}</text>
-						</view>
-					<!-- 	<view class="item" v-if="dataList.state == 3 || dataList.state == 4">
-							<text>发货时间：{{ dataList.dileveryTime }}</text>
-						</view> -->
-						<!-- 交易成功 有成交时间-->
-					<!-- 	<view class="item" v-if="dataList.state == 4">
-							<text>成交时间：{{ dataList.receiveTime }}</text>
-						</view> -->
-					</view>
+				<view  style="font-size: 24upx;color: #6b6b6b;margin-top: 14rpx;">
+					{{dataList.productBrief}}
+						
+				</view>
+			</view>
+			<view class="banner-item field">
+				<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>{{dataList.section || '0'}}</text>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">会员价：</view>
+								<text>{{dataList.memberSection || '0'}}</text>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">积分兑换：</view>
+								<text>{{dataList.ifCredit=='1'?'允许':dataList.ifCredit=='0'?'不允许':'无'}}</text>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">库存：</view>
+								<text>{{dataList.stockNumber || '0'}}</text>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">销量：</view>
+								<text>{{dataList.volume || '0'}}</text>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">上架状态：</view>
+								<text>{{dataList.shelveState=='0'?'未上架':dataList.shelveState=='1'?'已上架':dataList.shelveState=='2'?'待审核':dataList.shelveState=='3'?'审核失败':'无'}}</text>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">登记状态：</view>
+								<text>{{dataList.registrationStatus=='1'?'已入库':'未入库'}}</text>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">驳回原因：</view>
+								<text>{{dataList.reject || '无'}}</text>
+							</view>
+						</u-col>
+						<u-col span="12">
+							<view class="form-item">
+								<view class="label">简介：</view>
+								
+								<text v-if="!dataList.productText">无</text>
+							</view>
+							<u-parse v-if="dataList.productText" :html="dataList.productText"></u-parse>
+							<!-- <view v-if="dataList.productText" v-html="dataList.productText"></view> -->
+						</u-col>
+					</u-row>
 				</view>
-
-
 			</view>
-
-
-
 		</view>
 	</view>
 </template>
@@ -128,9 +116,10 @@
 			this.imgurl = this.$img
 			console.log(options)
 			this.$http.sendRequest('/product/getById', 'POST', {
-				orderId: options.id
+				productId: options.id
 			}, 2).then(res => {
 				this.dataList = res.data.data
+				console.log(this.dataList)
 			})
 			return
 
@@ -175,6 +164,136 @@
 </script>
 
 <style lang="scss" scoped>
+	// 商铺信息
+	.banner {
+		position: absolute;
+		top: calc(30vh - 30rpx);
+		width: 100%;
+		// margin-top: -20rpx;
+		border-radius: 30rpx;
+		background-color: #fff;
+		padding: 26rpx 34rpx 100rpx;
+		.banner-item {
+			border-bottom: 2rpx solid #EBEBEB;
+			padding-bottom: 32rpx;
+			.banner-item-title {
+				font-size: 28rpx;
+				font-weight: 700;
+				line-height: 48rpx;
+				margin-top: 30rpx;
+			}
+			.banner-item-form {
+				.form-item {
+					line-height: 30rpx;
+					font-size: 24rpx;
+					display: flex;
+					justify-content: flex-start;
+					align-items: top;
+					padding: 14rpx 0;
+				}
+			}
+			&:last-child {
+				border-bottom: unset;
+			}
+		}
+		// 基础信息
+		.info {
+			.info-title {
+				font-weight: bold;
+				font-size: 32rpx;
+				// margin-bottom: 24rpx;
+				span {
+					display: inline-block;
+					padding: 0 8rpx;
+				}
+			}
+			.info-text {
+				margin-bottom: 30rpx;
+			}
+			.info-racord {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				.info-price {
+					color: #31AA6A;
+					span {
+						font-size: 40rpx;
+						font-weight: 700;
+						margin-right: 4rpx;
+					}
+				}
+			}
+		}
+		// 场地信息
+		// 位置信息
+		.position {
+			.position-info {
+				display: flex;
+				align-items: center;
+				flex-direction: row;
+				margin: 53rpx 22rpx;
+				background-color: #fff;
+				font-size: 24rpx;
+				padding: 20rpx 16rpx;
+				line-height: 30rpx;
+				border-radius: 14rpx;
+				text {
+					margin-left: 10rpx;
+				}
+			}
+		}
+		// 周边商铺
+		.other-business {
+			.scroll-view_H {
+				white-space: nowrap;
+				width: 100%;
+			}
+			.scroll-view-item_H {
+				display: inline-block;
+				width: 210rpx;
+				margin-right: 22rpx;
+				&:last-child {
+					margin-right: 0;
+				}
+				.business-card {
+					width: 100%;
+					.u-image {
+						overflow: hidden !important;
+						border-radius: 20rpx !important;
+					}
+					.business-card-title {
+						width: 100%;
+						overflow : hidden;/*必须结合的属性,当内容溢出元素框时发生的事情*/
+						text-overflow: ellipsis;/*可以用来多行文本的情况下，用省略号“…”隐藏超出范围的文本 。*/
+						// display: -webkit-box;/*必须结合的属性 ，将对象作为弹性伸缩盒子模型显示 。*/
+						// -webkit-line-clamp: 2;/*用来限制在一个块元素显示的文本的行数。*/
+						// -webkit-box-orient: vertical;/*必须结合的属性 ，设置或检索伸缩盒对象的子元素的排*/
+						line-height: 30rpx;
+						margin: 10rpx 0;
+						padding: 0 10rpx;
+					}
+					.business-card-item {
+						padding: 0 10rpx;
+						font-weight: 400;
+						font-size: 20rpx;
+						color: #676767;
+						line-height: 1.5;
+						span {
+							font-weight: 700;
+							font-size: 30rpx;
+							color: #000000;
+						}
+					}
+				}
+			}
+		}
+	}
+	// 图片
+	.banner-img {
+		width: 100%;
+		height: 30vh;
+		line-height: 80rpx;
+	}
 	page {
 		background: #f7f7f7;
 	}
diff --git a/lvdao-miniapp/pages/workbench/workbench.vue b/lvdao-miniapp/pages/workbench/workbench.vue
index 9857ffb..0bf4afc 100644
--- a/lvdao-miniapp/pages/workbench/workbench.vue
+++ b/lvdao-miniapp/pages/workbench/workbench.vue
@@ -116,8 +116,8 @@
 				</view>
 			</view>
 		</view>
-		<!-- <view style="height: 100rpx;"></view> -->
 		<!-- tabbar -->
+		<view style="height: 300rpx;"></view>
 		<tabbar :tabBarShow="1"></tabbar>
 	</view>
 </template>
diff --git a/lvdao-miniapp/pagesA/myZiyuan/myZiDetailsnew.vue b/lvdao-miniapp/pagesA/myZiyuan/myZiDetailsnew.vue
new file mode 100644
index 0000000..fce7a6d
--- /dev/null
+++ b/lvdao-miniapp/pagesA/myZiyuan/myZiDetailsnew.vue
@@ -0,0 +1,564 @@
+<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> -->
+		</view>
+		<view class="msglist">
+
+			<view class="form-item">
+				<view class="label">租赁状态</view>
+				<text>{{record.dataStatus =='1'?'租赁中':record.dataStatus =='3'?'已终止':'-'}}</text>
+			</view>
+			<view class="form-item" v-if="!record.advertisingSpaceType && false">
+				<view class="label">经营用途</view>
+				<text>{{record.businessPurpose}}</text>
+			</view>
+			<view class="form-item">
+				<view class="label">租赁期限</view>
+				<text>{{record.leaseStartDate}} 至 {{record.contractTerminationDate}}</text>
+			</view>
+			<view class="form-item">
+				<view class="label">租金</view>
+				<text>{{heData.contractAmount || '无'}}</text>
+			</view>
+			<view class="form-item">
+				<view class="label">付款日</view>
+				<text>{{heData.paymentDay || '无'}}</text>
+			</view>
+		</view>
+		<view class="msglist">
+			<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>{{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 == '广告位' && false" 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 == '商铺' && record.dataStatus =='1'"><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.dataStatus =='1' ">
+			<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: '',
+				record: {},
+				btnShow: false,
+				hoverStyle: {
+
+					color: '#3f9b6a'
+				},
+				mapType: '商铺',
+				content: '',
+				xuShow: false,
+				contentxu: '您确定是否需要续租',
+				pageindex: {
+					pageNumber: 0,
+					pageSize: 10,
+					contractId: ''
+				},
+				myshopMsg: {},
+				heData: {},
+				xuForm: {
+					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)
+			this.heData = item || {}
+			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.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 = {
+				pageNumber: 0,
+				pageSize: 10,
+				shopNumber: '',
+				dataStatus: 1
+			}
+			if (item.cereBasicInformationShop && item.cereBasicInformationShop.shopName) {
+				this.mapType = '商铺'
+				pageHe.shopNumber = `sp${item.cereBasicInformationShop.id}`
+			} else if (item.cereBasicInformationVenue && item.cereBasicInformationVenue.venueName) {
+				this.mapType = '场地'
+				pageHe.shopNumber = `cd${item.cereBasicInformationVenue.id}`
+			} else if (item.cereAdvertisingInformation && item.cereAdvertisingInformation.advertisingName) {
+				this.mapType = '广告位'
+				pageHe.shopNumber = `gg${item.cereAdvertisingInformation.id}`
+			}
+
+			
+		},
+		onShow() {
+
+		},
+		methods: {
+			getQuit(urls) {
+				uni.navigateTo({
+					url: urls + `?ids=${this.heData.id}`
+				})
+			},
+			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'
+					})
+
+					// uni.switchTab({
+					// 	url: '/pages/my/my'
+					// })
+					// uni.showToast({
+					// 	title: '续租申请已提交，请耐心等待',
+					// 	icon: 'success',
+					// })
+
+				})
+			},
+			xiuMsg(val) {
+				if (val == 1) {
+					uni.navigateTo({
+						url: `/pagesA/myZiyuan/addMyshop?ids=${this.heData.id}&phone=${uni.getStorageSync('user').phone}`
+					})
+				} else {
+					let lists = JSON.stringify(this.myshopMsg)
+					uni.navigateTo({
+						url: `/pagesA/myZiyuan/addMyshop?ids=${this.heData.id}&msg=${lists}&phone=${uni.getStorageSync('user').phone}`
+					})
+				}
+			},
+			getCurrentTime() {
+				const now = new Date();
+				const year = now.getFullYear();
+				const month = ('0' + (now.getMonth() + 1)).slice(-2);
+				const day = ('0' + now.getDate()).slice(-2);
+				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}`;
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.page {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+
+		padding: 0 24rpx;
+
+	}
+
+	.zhutu {
+		margin: 15px 0;
+		background-color: #fff;
+		width: 100%;
+		height: 20vh;
+	}
+
+	/* 记录列表 */
+	.record-list {
+		margin-top: 20rpx;
+
+		.good-item {
+			width: 100%;
+			display: flex;
+			background-color: #fff;
+			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;
+					text-overflow: ellipsis;
+					margin-bottom: 20rpx;
+				}
+
+				.info-item {
+					display: flex;
+					line-height: 30rpx;
+					font-size: 26rpx;
+					color: #717981;
+
+					text {
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						margin-left: 10rpx;
+
+						span {
+							font-size: 30rpx;
+							color: #000;
+							font-weight: 700;
+						}
+					}
+
+					.u-tag {
+						margin: 0 6rpx;
+						border: unset;
+					}
+				}
+			}
+		}
+	}
+
+	.msglist {
+		padding: 0 30rpx;
+		background-color: #Fff;
+		border-radius: 14rpx;
+		margin-bottom: 20rpx;
+
+		.form-item {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			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;
+				margin: 0 -20rpx;
+				background-color: #FFFFFF;
+				border-radius: 9px;
+				// margin-top: 9px;
+				width: 100%;
+
+				// .u-upload {
+				// .u-add-wrap {
+				// 	width: 304rpx !important;
+				// 	height: 182rpx !important;
+				// }
+				// }
+				// .u-upload {
+				// 	height: 88px;
+				// 	width: 155px;
+				// 	background: url(/static/images/uploadID1.png);
+				// 	background-size:134rpx 188rpx;
+				// 	background-repeat:no-repeat;
+				// }
+				.img-deom {
+					flex: 1;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					padding: 20rpx;
+
+					text {
+						margin-top: 18rpx;
+					}
+				}
+			}
+		}
+
+		:last-child {
+			border-bottom: unset;
+		}
+	}
+
+	.footbtn {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		z-index: 10;
+		height: 180rpx;
+		width: 100%;
+		border-radius: 26rpx 26rpx 0 0;
+		background-color: #fff;
+
+		.info-total {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			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 {
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		display: flex;
+		align-items: center;
+		width: 100%;
+		background-color: #FFFFFF;
+		z-index: 20;
+		padding: 15px 0;
+
+		.footer-buy {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			width: 100%;
+			height: 100%;
+
+			.cart-add {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 100%;
+				height: 100rpx;
+				background-color: #3f9b6a;
+
+				text {
+					font-size: 28rpx;
+					color: #FFFFFF;
+				}
+			}
+		}
+	}
+
+	.image-container {
+		padding: 10rpx 0;
+		display: flex;
+		flex-wrap: wrap;
+		/* 启用换行 */
+		justify-content: space-between;
+		/* 图片之间均匀分布 */
+	}
+
+	.image-item {
+		box-sizing: border-box;
+		margin-bottom: 10rpx;
+		/* 图片之间的垂直间距 */
+	}
+</style>
\ No newline at end of file
diff --git a/lvdao-miniapp/pagesA/myZiyuan/myZiyuan - 副本.vue b/lvdao-miniapp/pagesA/myZiyuan/myZiyuan - 副本.vue
new file mode 100644
index 0000000..3aaca99
--- /dev/null
+++ b/lvdao-miniapp/pagesA/myZiyuan/myZiyuan - 副本.vue
@@ -0,0 +1,100 @@
+<template>
+	<view class="page">
+		<view class="screen-list">
+			<view class="list">
+				<u-input  type="select" @click="typeShow = true" :placeholder="pageindex.auditStatus == '1'?'申请中':pageindex.auditStatus == '4'?'租赁中':pageindex.auditStatus == '7'?'已终止':'状态筛选'" />
+			</view>
+		</view>
+		<!-- 记录列表 -->
+		<view class="record-list">
+			<view class="record-list-box" v-for="(item,index) in recordList" :key="index" @click="item.auditStatus =='4' || item.auditStatus =='7'?recordXq(item):''">
+				<view class="list">
+					<view class="title" style="padding-bottom: 20rpx;">
+						<view class="left">{{item.cereBasicInformationShop&&item.cereBasicInformationShop.shopName?item.cereBasicInformationShop.shopName:item.cereBasicInformationVenue&&item.cereBasicInformationVenue.venueName?item.cereBasicInformationVenue.venueName:item.cereAdvertisingInformation&&item.cereAdvertisingInformation.advertisingName?item.cereAdvertisingInformation.advertisingName:''}}</view>
+						<view class="right" v-if="item.auditStatus =='4' || item.auditStatus =='7'"><u-icon name="arrow-right"></u-icon></view>
+					</view>
+					<view class="info-item">申请时间：{{item.applicationTime}}</view>
+					<view class="info-item">租赁时间 ：{{item.intendedLeaseTerm?item.intendedLeaseTerm:item.scheduleTime}}</view>
+					<view class="info-item" v-if="item.auditStatus =='1'">状态：<span style="color: #0FBB59;">{{item.auditStatus =='1'?'待审核':item.auditStatus =='2'?'待签约':item.auditStatus =='3'?'已驳回':item.auditStatus =='4'?'租赁中':'已终止'}}</span></view>
+				</view>
+			</view>
+		</view>
+		<view v-if="recordList.length == 0" style="text-align: center;margin-top: 60rpx;color:#808080;">暂无数据</view>
+		<u-select v-model="typeShow" :list="activesType" @confirm="typeChange"></u-select>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				activesType: [	
+				// {
+				// 	value: 1,
+				// 	label: '申请中'
+				// },
+				{
+					value: 4,
+					label: '租赁中'
+				},
+				{
+					value: 7,
+					label: '已终止'
+				},
+				],
+				typeShow:false,
+				recordList:[],
+				pageindex: {
+					auditStatus:4,
+					pageNumber: 0,
+					pageSize: 10
+				},
+			}
+		},
+		mounted(){
+			this.getALL()
+		},
+		methods: {
+			getALL(){
+				this.pageindex.applicant =uni.getStorageSync('user').phone
+				this.$http.sendRequest('/cereBusinessInfo/queryByPage', 'POST', this.pageindex,1).then(res => {
+					//成功回调
+					 this.recordList = res.data.data.records
+					this.$http.sendRequest('/cereAdvertiserInfo/queryByPage', 'POST', this.pageindex, 1).then(item => {
+						
+					 if(item.data.data.records !=undefined &&item.data.data.records.length !=0){
+						 item.data.data.records.map(val=>{
+							  this.recordList.push(val)
+						 })
+					 } 
+					
+					 
+					})
+				})
+				
+			},
+			recordXq(item){
+				
+				const encodedItem = encodeURIComponent(JSON.stringify(item));
+				uni.navigateTo({
+					url: `/pagesA/myZiyuan/myZiDetails?item=${encodedItem}`,
+				})
+			},
+			contractdetail(){
+				// uni.navigateTo({
+				
+				// })
+			},
+			typeChange(e) {
+				
+				this.pageindex.start = e[0].labels
+			this.pageindex.auditStatus = e[0].value
+				this.getALL()
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'myZiyuan.scss';
+</style> 
diff --git a/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue b/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
index 3aaca99..c3e07a8 100644
--- a/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
+++ b/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
@@ -2,20 +2,28 @@
 	<view class="page">
 		<view class="screen-list">
 			<view class="list">
-				<u-input  type="select" @click="typeShow = true" :placeholder="pageindex.auditStatus == '1'?'申请中':pageindex.auditStatus == '4'?'租赁中':pageindex.auditStatus == '7'?'已终止':'状态筛选'" />
+				<u-input type="select" @click="typeShow = true"
+					:placeholder="pageindex.dataStatus == '1'?'申请中':pageindex.dataStatus == '3'?'已终止':'状态筛选'" />
 			</view>
 		</view>
 		<!-- 记录列表 -->
 		<view class="record-list">
-			<view class="record-list-box" v-for="(item,index) in recordList" :key="index" @click="item.auditStatus =='4' || item.auditStatus =='7'?recordXq(item):''">
+			<view class="record-list-box" v-for="(item,index) in recordList" :key="index"
+				@click="item.dataStatus =='1' || item.dataStatus =='3'?recordXq(item):''">
 				<view class="list">
 					<view class="title" style="padding-bottom: 20rpx;">
-						<view class="left">{{item.cereBasicInformationShop&&item.cereBasicInformationShop.shopName?item.cereBasicInformationShop.shopName:item.cereBasicInformationVenue&&item.cereBasicInformationVenue.venueName?item.cereBasicInformationVenue.venueName:item.cereAdvertisingInformation&&item.cereAdvertisingInformation.advertisingName?item.cereAdvertisingInformation.advertisingName:''}}</view>
-						<view class="right" v-if="item.auditStatus =='4' || item.auditStatus =='7'"><u-icon name="arrow-right"></u-icon></view>
+						<view class="left">
+							<!-- {{item.contractName}} -->
+							{{item.cereBasicInformationShop&&item.cereBasicInformationShop.shopName?item.cereBasicInformationShop.shopName:item.cereBasicInformationVenue&&item.cereBasicInformationVenue.venueName?item.cereBasicInformationVenue.venueName:item.cereAdvertisingInformation&&item.cereAdvertisingInformation.advertisingName?item.cereAdvertisingInformation.advertisingName:''}}
+						</view>
+						<view class="right" v-if="item.dataStatus =='1' || item.dataStatus =='3'"><u-icon
+								name="arrow-right"></u-icon></view>
+					</view>
+					<!-- <view class="info-item">申请时间：{{item.applicationTime}}</view> -->
+					<view class="info-item">租赁时间 ：{{item.leaseStartDate}} 至 {{item.contractTerminationDate}}</view>
+					<view class="info-item" v-if="item.dataStatus =='1'">状态：<span
+							style="color: #0FBB59;">{{item.dataStatus =='1'?'租赁中':item.dataStatus =='3'?'已终止':'-'}}</span>
 					</view>
-					<view class="info-item">申请时间：{{item.applicationTime}}</view>
-					<view class="info-item">租赁时间 ：{{item.intendedLeaseTerm?item.intendedLeaseTerm:item.scheduleTime}}</view>
-					<view class="info-item" v-if="item.auditStatus =='1'">状态：<span style="color: #0FBB59;">{{item.auditStatus =='1'?'待审核':item.auditStatus =='2'?'待签约':item.auditStatus =='3'?'已驳回':item.auditStatus =='4'?'租赁中':'已终止'}}</span></view>
 				</view>
 			</view>
 		</view>
@@ -28,67 +36,85 @@
 	export default {
 		data() {
 			return {
-				activesType: [	
-				// {
-				// 	value: 1,
-				// 	label: '申请中'
-				// },
-				{
-					value: 4,
-					label: '租赁中'
-				},
-				{
-					value: 7,
-					label: '已终止'
-				},
+				activesType: [
+					// {
+					// 	value: 1,
+					// 	label: '申请中'
+					// },
+					{
+						value: '1',
+						label: '租赁中'
+					},
+					{
+						value: '3',
+						label: '已终止'
+					},
 				],
-				typeShow:false,
-				recordList:[],
+				typeShow: false,
+				recordList: [],
 				pageindex: {
-					auditStatus:4,
+					dataStatus: '1',
 					pageNumber: 0,
 					pageSize: 10
 				},
+				total: 0
 			}
 		},
-		mounted(){
+		mounted() {
 			this.getALL()
 		},
+		onReachBottom(e) {
+			console.error(e)
+			if (this.recordList.length < this.total) {
+				this.pageindex.pageNumber++
+				this.gain()
+			}
+		},
 		methods: {
-			getALL(){
-				this.pageindex.applicant =uni.getStorageSync('user').phone
-				this.$http.sendRequest('/cereBusinessInfo/queryByPage', 'POST', this.pageindex,1).then(res => {
+			getALL() {
+				this.pageindex.applicant = uni.getStorageSync('user').phone
+				this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', {
+					pageSize: 1,
+					pageNumber: 0,
+					phone: uni.getStorageSync('user').phone
+				}, 1).then(res => {
+					if (res.data.data.content.length > 0) {
+						let c1 = res.data.data.content[0]
+						console.error({
+							...c1
+						})
+						if (c1.checkState == '2') {
+							this.pageindex.relatedMerchants = c1.id
+							this.gain()
+						}
+					}
+				})
+			},
+			gain() {
+				this.$http.sendRequest('/cereContractInformation/getPage', 'POST', this.pageindex, 1).then(res1 => {
 					//成功回调
-					 this.recordList = res.data.data.records
-					this.$http.sendRequest('/cereAdvertiserInfo/queryByPage', 'POST', this.pageindex, 1).then(item => {
-						
-					 if(item.data.data.records !=undefined &&item.data.data.records.length !=0){
-						 item.data.data.records.map(val=>{
-							  this.recordList.push(val)
-						 })
-					 } 
-					
-					 
-					})
+					console.error(res1)
+					this.recordList = [...this.recordList,...res1.data.data.content]
+					this.total = res1.data.data.totalElements
 				})
-				
 			},
-			recordXq(item){
-				
+			recordXq(item) {
+
 				const encodedItem = encodeURIComponent(JSON.stringify(item));
 				uni.navigateTo({
-					url: `/pagesA/myZiyuan/myZiDetails?item=${encodedItem}`,
+					url: `/pagesA/myZiyuan/myZiDetailsnew?item=${encodedItem}`,
 				})
 			},
-			contractdetail(){
+			contractdetail() {
 				// uni.navigateTo({
-				
+
 				// })
 			},
 			typeChange(e) {
-				
+				this.pageindex.pageNumber = 0
 				this.pageindex.start = e[0].labels
-			this.pageindex.auditStatus = e[0].value
+				this.pageindex.dataStatus = e[0].value
+				this.recordList = []
 				this.getALL()
 			},
 		}
@@ -97,4 +123,4 @@
 
 <style scoped lang="scss">
 	@import 'myZiyuan.scss';
-</style> 
+</style>
\ No newline at end of file
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index a210110..ddb3a5b 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -21,7 +21,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
 		
-		// bases = 'http://128.10.249.46:9003'+ url;
+		// bases = 'http://128.10.249.23:9003'+ url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
 		
 		bases = c1 + 'cdwlMall/meserver/admin-server' + url;
--
libgit2 0.21.4