Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

wesley88
2 parents 09d4e1dc ab1ffdd3
Showing 43 changed files with 884 additions and 199 deletions
admin-web-master/dist.zip
admin-web-master/src/App.vue
admin-web-master/src/utils/request.js
admin-web-master/src/views/customer/icManagement/index.vue
admin-web-master/src/views/customer/rsaManagement/index.vue
admin-web-master/src/views/serve/MarkActivity/index.vue
admin-web-master/src/views/serve/Merchant/index.vue
lvdao-miniapp/manifest.json
lvdao-miniapp/pages.json
lvdao-miniapp/pages/advertisement/advertisement.scss
lvdao-miniapp/pages/advertisement/advertisement.vue
lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
lvdao-miniapp/pages/complaint/complaint.scss
lvdao-miniapp/pages/complaint/complaint.vue
lvdao-miniapp/pages/details/details.scss
lvdao-miniapp/pages/details/details.vue
lvdao-miniapp/pages/field/field.scss
lvdao-miniapp/pages/field/field.vue
lvdao-miniapp/pages/home/home.scss
lvdao-miniapp/pages/home/home.vue
@@ -583,7 +583,7 @@ export default {
       }
     }
     .el-table__body tr.current-row>td.el-table__cell, .el-table__body tr.selection-row>td.el-table__cell{
-      background-color: #DEEBE2 !important;
+      background-color: transparent;
     }
     .el-checkbox__input.is-checked+.el-checkbox__label{
       color:#3F9B6A;
@@ -17,10 +17,10 @@ let baseURL =  &#39;&#39;
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
-  // baseURL = 'https://jy.scjysm.asia:18086/meserver/admin-server';
+  baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
   // baseURL = 'http://172.16.61.125:9003';
   // baseURL = 'http://10.0.0.51:9003';
-  baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
+  // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
   // baseURL = 'http://192.168.2.225:9003';
 } else {
@@ -2,7 +2,7 @@
   <div style="background-color:#f7f7f7;padding:10px 10px;">
     <div class="zhuti" v-if="ggXin==false && detbox==false">
       <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>商户寻租管理</span> <span style="padding:0 5px;">></span> <span
+        <div style="color:#0006"> <span>商户意向管理</span> <span style="padding:0 5px;">></span> <span
             style="color:#000000e6">意向客户管理</span></div>
       </div>
       <div>
@@ -2,8 +2,8 @@
   <div style="background-color:#f7f7f7;padding:10px 10px;">
     <div class="zhuti" v-if="ggXin == false && detbox==false && genjinShow==false && tanpanShow ==false">
       <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>商户寻租管理</span> <span style="padding:0 5px;">></span> <span
-            style="color:#000000e6">寻租申请管理</span></div>
+        <div style="color:#0006"> <span>商户意向管理</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">意向申请管理</span></div>
       </div>
       <div>
         <!-- 搜索 -->
@@ -313,9 +313,21 @@
             </div>
             <div style="padding: 15px;">
               <div style="padding: 0px 20px 0px 0px">
-                <el-table :data="ziyuanData" highlight-current-row @current-change="handleSelectionChange"
-                  :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+                <el-table
+                :data="ziyuanData"
+                 highlight-current-row
+                 ref="multipleTable"
+                  :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                  @row-click="handleRowClick"
+                  >
+     <el-table-column
+          label="选择"
+          width="55">
+          <template slot-scope="scope">
+            <el-radio v-model="selectedRow" inert :label="scope.row" >&nbsp;</el-radio>
+          </template>
+        </el-table-column>
                   <el-table-column label="序号" min-width="8%">
                     <template slot-scope="scope">
                       {{scope.$index + 1}}
@@ -497,7 +509,8 @@
           }],
         },
         mingtotal:0,
-        mingPage:1
+        mingPage:1,
+        selectedRow:null
       }
     },
     created() {
@@ -565,7 +578,7 @@
                   this.getAll()
                 })
               }
-
+              this.selectedRow = null
            }else {
             this.$message({
               message: '请填写完整信息',
@@ -608,7 +621,7 @@
           ids.map(res => {
             changAlls({
               id: res,
-              pageNumber: 1,
+              pageNumber: 0,
               pageSize: 10,
             }).then(item => {
@@ -636,12 +649,13 @@
          ids.map(res => {
            changAlls({
              id: res,
-             pageNumber: 1,
+             pageNumber: 0,
              pageSize: 10,
            }).then(item => {
              item.data.content.map(ids => {
                this.addziyuanData.push(ids)
+               this.selectedRow = ids
              })
            })
@@ -663,7 +677,11 @@
         this.mingPage = val
       },
       closeFn(val) {
+        this.getAll()
   this.ggXin = false
+  this.addziyuanData =[]
+  this.selectedRow = null
+
       },
       // 查询按钮
@@ -684,25 +702,24 @@
       },
       minSev() {
-        if(this.addziyuanData.length == 1){
-          this.$message({
-            message: '场地只能添加一个',
-          })
-        }else{
-          this.addziyuanData = this.multipleSelection
-        }
+         this.addziyuanData = []
+         this.addziyuanData.push(this.selectedRow)
         this.addziyuan = false
         this.multipleSelection = []
+this.selectedRow = null
       },
       mingClose() {
+
         this.multipleSelection = []
         this.addziyuan = false
-      },
-      handleSelectionChange(val) {
+         this.selectedRow = null
+
-        this.multipleSelection.push(val)
       },
+      handleRowClick(row) {
+            this.selectedRow = row; // 点击行时选中对应的单选框
+          },
       deltab(item) {
         const h = this.$createElement;
         this.$msgbox({
@@ -784,7 +801,10 @@
       },
       addziDel(index){
-              this.addziyuanData.splice(index, 1);
+
+              this.addziyuanData.splice(index, 1)
+              this.selectedRow = null
+
       }
     }
@@ -792,6 +812,9 @@
 </script>
 <style scoped>
+/deep/ .el-table__body tr.current-row {
+  background-color: transparent !important;
+}
   .zhuti {
     padding: 0 20px 20px 20px;
     min-height: calc(100vh - 50px - 20px);
@@ -342,10 +342,16 @@
               <div style="padding: 0px 20px 0px 0px">
                 <el-table :data="ziyuanData"
                 highlight-current-row
-                    @current-change="handleSelectionChange"
+                      @row-click="handleRowClick"
                   :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
                   >
-
+<el-table-column
+          label="选择"
+          width="55">
+          <template slot-scope="scope">
+            <el-radio v-model="selectedRow" inert :label="scope.row" >&nbsp;</el-radio>
+          </template>
+        </el-table-column>
                   <el-table-column label="序号"  min-width="8%" >
                     <template slot-scope="scope">
                       {{scope.$index + 1}}
@@ -483,6 +489,7 @@
             trigger: 'change'
           }, ],
         },
+        selectedRow:null
       }
     },
     created() {
@@ -553,6 +560,7 @@
                   this.getAll()
                 })
               }
+              this.selectedRow = null
            }else {
             this.$message({
               message: '请填写完整信息',
@@ -599,7 +607,7 @@
        ids.map(res => {
          changAlls({
            id: res,
-           pageNumber: 1,
+           pageNumber: 0,
            pageSize: 10,
          }).then(item => {
@@ -630,7 +638,10 @@
       closeFn(val) {
         this.addziyuanData =[]
+        this.getAll()
    this.ggXin = false
+   this.selectedRow = null
+
       },
       //查看合同
       lookHetong(val) {
@@ -663,12 +674,13 @@
        ids.map(res => {
          changAlls({
            id: res,
-           pageNumber: 1,
+           pageNumber: 0,
            pageSize: 10,
          }).then(item => {
            item.data.content.map(ids => {
              this.addziyuanData.push(ids)
+             this.selectedRow = ids
            })
          })
@@ -679,27 +691,20 @@
       },
   minSev() {
-
-      if(this.addziyuanData.length == 1){
-        this.$message({
-          message: '场地只能添加一个',
-        })
-      }else{
-        this.addziyuanData = this.multipleSelection
-      }
+this.addziyuanData = []
+this.addziyuanData.push(this.selectedRow)
       this.addziyuan = false
       this.multipleSelection = []
+      this.selectedRow = null
       },
       mingClose(){
         this.multipleSelection =[]
         this.addziyuan = false
+        this.selectedRow = null
       },
-      handleSelectionChange(val) {
-
-        this.multipleSelection.push(val)
-      },
-
-
+      handleRowClick(row) {
+            this.selectedRow = row; // 点击行时选中对应的单选框
+          },
       deltab(item){
             const h = this.$createElement;
                     this.$msgbox({
@@ -751,6 +756,7 @@
       },
       handleDelete(index){
           this.addziyuanData.splice(index, 1)
+          this.selectedRow = null
       }
     }
   }
 {
     "name" : "绿道",
-    "appid" : "__UNI__189D96A",
+    "appid" : "__UNI__F034047",
     "description" : "",
     "versionName" : "1.0.2",
     "versionCode" : "100",
@@ -431,6 +431,27 @@
 				"navigationBarBackgroundColor": "#FFFFFF",
 				"navigationBarTitleText": "店铺信息"
 			}
+		},
+		{
+			"path": "rentPay/rentPay",
+			"style": {
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"navigationBarTitleText": "租金缴费"
+			}
+		},
+		{
+			"path": "rentPay/rentPayDetails",
+			"style": {
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"navigationBarTitleText": "缴费记录"
+			}
+		},
+		{
+			"path": "rentPay/goPay",
+			"style": {
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"navigationBarTitleText": "支付"
+			}
 		}
 		]	
 	}],
@@ -6,16 +6,11 @@
 	height: 100%;
 }
 .head-search{
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	position: relative;
-	margin: 20rpx 0;
-	background-color: #FFFFFF;
-	border-radius: 35rpx;
-	padding: 0 10rpx;
-	border: 2rpx solid #E8E8E8;
-	margin: 22rpx 24rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		position: relative;
+		padding: 20rpx;
 	.u-search {
 		position: relative;
 	}
@@ -33,7 +28,7 @@
 		display: flex;
 		align-items: center;
 		width: 100%;
-		margin: 40rpx 0;
+		margin: 20rpx 0;
 		.list {
 			display: flex;
 			justify-content: center;
@@ -7,7 +7,7 @@
 		</view> -->
 		<!-- 搜索 -->
 		<view style="margin: 20rpx 0;background-color: #FFFFFF;border-radius: 18rpx;border: 2rpx solid #E8E8E8;	margin: 22rpx 24rpx;overflow: hidden;" >
-			<u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="pagesize.title" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
+			<u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="query.advertisingName" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
 		</view>
 		<view class="screen-list">
 			<view class="list" @click="typeshow = true">
@@ -172,8 +172,6 @@
 				this.show = true
 			},
 			handleCompanyConfirm(val){
-				console.log(val)
-				
 				let page = {
 					pageNumber: 1,
 					pageSize: 10,
@@ -130,10 +130,15 @@ export default {
 	  leaseAdd(url){
 		  	this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => {
-		  		//成功回调
+		  		if(res.data.code == '20004' || res.data.code == '20003'){
+		  								 uni.navigateTo({
+		  								 	url: '/pages/login/login'
+		  								 })
+										 
+		  		}
 		  		if(res.data.data.content.length>0) {
 		  			let c1 = res.data.data.content[0]
-		  			console.error({...c1})
+		  			
 		  			if(c1.checkState == '1') {
 		  				uni.showToast({
 		  					icon:'none',
@@ -3,7 +3,6 @@
 	left: 0;
 	top: 0;
 	width: 100%;
-	height: 100%;
 	background-color: #f6f6f6;
 }
@@ -63,28 +62,23 @@
 	left: 0;
 	bottom: 0;
 	display: flex;
+	align-items: center;
+	justify-content: center;
 	width: 100%;
-	height: 100rpx;
+	height: 60px;
 	background-color: #FFFFFF;
-	padding-bottom: constant(safe-area-inset-bottom);
-	padding-bottom: env(safe-area-inset-bottom);
-	.footer-buy{
+
+	.footer-btn {
+		display: flex;
+		width: 90%;
+	}
+	.footer-service {
 		display: flex;
+		flex-direction: column;
 		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;
-			}
+		text {
+			margin-top: 6rpx;
+			line-height: 32rpx;
 		}
 	}
 }
@@ -68,8 +68,14 @@
 		</view>
 			<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 class="page-footer">
-			<u-button type="success" style="flex: 1; margin: 0 10px;" @click="submit">提交</u-button>
+			<view class="footer-btn">
+				<u-button type="success" style="width: 100%;border-radius: 10px;" @click="submit">提交</u-button>
+			</view>
 		</view>
 	</view>
 </template>
@@ -105,24 +111,25 @@
 			},
 			check(){
-						if (this.ruleForm.onSitePhoto.length== 0) {
+						
+						if (!this.ruleForm.complaintType) {
 							uni.showToast({
 								icon: 'none',
-								title: '请上传现场图片'
+								title: '请选择投诉类型'
 							});
 							return false;
 						}
-						if (!this.ruleForm.complaintType) {
+						if (!this.ruleForm.problemDescription) {
 							uni.showToast({
 								icon: 'none',
-								title: '请选择投诉类型'
+								title: '请输入问题描述'
 							});
 							return false;
 						}
-						if (!this.ruleForm.problemDescription) {
+						if (this.ruleForm.onSitePhoto.length== 0) {
 							uni.showToast({
 								icon: 'none',
-								title: '请输入问题描述'
+								title: '请上传现场图片'
 							});
 							return false;
 						}
@@ -144,10 +144,9 @@
 	align-items: center;
 	justify-content: center;
 	width: 100%;
-	height: 125rpx;
+	height: 60px;
 	background-color: #FFFFFF;
-	padding-bottom: constant(safe-area-inset-bottom);
-	padding-bottom: env(safe-area-inset-bottom);
+
 	.footer-btn {
 		display: flex;
 		width: 90%;
@@ -173,10 +173,13 @@ export default {
   methods: {
 		leaseAdd(url){
 			this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => {
-				//成功回调
+				if(res.data.code == '20004' || res.data.code == '20003'){
+										 uni.navigateTo({
+										 	url: '/pages/login/login'
+										 })
+				}
 				if(res.data.data.content.length>0) {
 					let c1 = res.data.data.content[0]
-					console.error({...c1})
 					if(c1.checkState == '1') {
 						uni.showToast({
 							icon:'none',
@@ -10,7 +10,7 @@
 		align-items: center;
 		justify-content: space-between;
 		position: relative;
-		margin: 20rpx;
+		padding: 20rpx;
 		.search{
 			display: flex;
 			width:100%;
@@ -40,7 +40,7 @@
 		display: flex;
 		align-items: center;
 		width: 100%;
-		margin: 40rpx 0;
+		margin: 20rpx 0;
 		.list {
 			display: flex;
 			justify-content: center;
@@ -7,8 +7,8 @@
 				<u-search bg-color="#fff" placeholder="请输入" v-model="query.venueName" :show-action="false" @search="search" @clear="clearGet"></u-search>
 				<u-button type="success" @click="search">搜索</u-button>
 			</view> -->
-			<view style="margin: 20rpx 0;background-color: #FFFFFF;border-radius: 18rpx;border: 2rpx solid #E8E8E8;	margin: 22rpx 24rpx;overflow: hidden;" >
-				<u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="pagesize.title" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
+			<view style="background-color: #FFFFFF;border-radius: 18rpx;border: 2rpx solid #E8E8E8;overflow: hidden;width: 100%;" >
+				<u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="query.venueName" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
 			</view>
 		</view>
 		<view class="screen-list">
@@ -7,6 +7,7 @@
 	// overflow-x: hidden;
 	// overflow-y: auto;
 	position: absolute;
+	
 }
 .top-img {
 	width: 750rpx;
@@ -362,6 +363,9 @@
 		color: #232323;
 	}
 }
+.cardHome:last-child {
+    margin-bottom: 20px;
+}
 .other-business {
 		.scroll-view_H {
 			white-space: nowrap;
@@ -229,7 +229,7 @@
 					<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120" >
 						<view v-for="(item, index) in tableData" :key="index" class="scroll-view-item_H" @click="details(item)">
 							<view class="business-card">
-								<u-image :showLoading="true" :src="imgurl + (item.displayMainImage || item.locationDiagram || item.displayImage) | getimgurl" width="100%" height="210rpx"></u-image>
+								<u-image :showLoading="true" :src="imgurl + (item.displayMainImage || item.locationDiagram || item.displayImage) | getimgurl" width="100%" height="210rpx"   border-radius="20"></u-image>
 								<view class="business-card-title">
 									{{ item.shopName || item.advertisingName || item.venueName}}
 								</view>
@@ -258,7 +258,7 @@
 					<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120" >
 						<view v-for="(item, index) in activity" :key="index" class="scroll-view-item_H" @click="toDetail(item.id, '/pages/activityDetail/activityDetail')" >
 							<view class="business-card">
-								<u-image :showLoading="true" :src="imgurl+item.coverImage" width="100%" height="210rpx"></u-image>
+								<u-image :showLoading="true" :src="imgurl+item.coverImage" width="100%" height="210rpx" border-radius="20"></u-image>
 								<view class="business-card-title">
 									{{item.activityName || '标题'}}
 								</view>
@@ -281,7 +281,7 @@
 					<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120" >
 						<view v-for="(item, index) in yingxiaoData" :key="item.id" class="scroll-view-item_H" @click="toDetail(item.id, '/pages/marketing/marketingDetail/marketingDetail')">
 							<view class="business-card">
-								<u-image :showLoading="true" :src="imgurl+item.coverImage" width="100%" height="210rpx"></u-image>
+								<u-image :showLoading="true" :src="imgurl+item.coverImage" width="100%" height="210rpx" border-radius="20"></u-image>
 								<view class="business-card-title">
 									{{item.title}}
 								</view>
@@ -303,7 +303,7 @@
 					<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120" >
 						<view v-for="(item, index) in shangwuData" :key="item.id" class="scroll-view-item_H" @click="toDetailTwo(item, '/pages/business/businessDetail/businessDetail')">
 							<view class="business-card">
-								<u-image :showLoading="true" :src="imgurl+item.coverImage" width="100%" height="210rpx"></u-image>
+								<u-image :showLoading="true" :src="imgurl+item.coverImage" width="100%" height="210rpx" border-radius="20"></u-image>
 								<view class="business-card-title">
 									{{item.title}}
 								</view>
@@ -69,7 +69,7 @@
 	padding-bottom: constant(safe-area-inset-bottom);
 	padding-bottom: env(safe-area-inset-bottom);
 	.footer-btn {
-	 // padding: 0 10%;
+	 padding: 0 20px;
 		margin-top: 20rpx;
 	}
 	.footer-service {
@@ -26,13 +26,13 @@
     <!-- 底部 -->
 	<view style="height: 125rpx;"></view>
-    <view class="page-footer">
+    <view class="page-footer" v-if="tableData.activeState == 1">
 		<!-- <view class="footer-service">
 				<u-image :showLoading="true" :src="$imgUrl('/sevice-icon.png')"  width="30rpx" height="30rpx"></u-image>
 				<text>客服</text>
 			</view> -->
 		<view class="footer-btn">
-			<u-button type="success" style="width:90%"  @click="baoShow">报名参加</u-button>
+			<u-button type="success" @click="baoShow">报名参加</u-button>
 		</view>
 			<!-- <view class="footer-service">
 				<u-image :showLoading="true"  :src="$imgUrl('/share-icon.png')"  width="30rpx" height="30rpx"></u-image>
@@ -48,7 +48,7 @@
 				</view>
 				<view class="my-service">
 					<view class="service-list">
-						<view class="service-list-list">
+						<!-- <view class="service-list-list">
 							<view class="thumb">
 								<text v-if="Islogin">0</text>
 								<text v-else>{{wenjuanNum}}</text>
@@ -56,7 +56,7 @@
 							<view class="name" @click="questionnaire">
 								<text>我的问卷</text>
 							</view>
-						</view>
+						</view> -->
 						<view class="service-list-list">
 							<view class="thumb">
 								<text v-if="Islogin">0</text>
@@ -64,6 +64,7 @@
 			margin-bottom: 24rpx;
 			.body {
 				display: flex;
+				justify-content: space-between;
 				width: 100%;
 				height: calc(100% - 70rpx);
 				padding: 15rpx 18rpx;
@@ -10,13 +10,15 @@
 			<u-button type="success" @click="search">搜索</u-button>
 		</view> -->
 		<view style="margin: 20rpx 0;background-color: #FFFFFF;border-radius: 18rpx;border: 2rpx solid #E8E8E8;	margin: 22rpx 24rpx;overflow: hidden;" >
-			<u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="pagesize.title" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
+			<u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="pageIndex.activityName" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
 		</view>
 		<view class="goods-data">
 			<view class="goods-list">
 				<view class="good-item" v-for="(v, i) in datalist" :key="i">
 					<view class="body">
-						  <u-image  width="40%" :src="$img+v.coverImage" border-radius="10" mode="widthFix" style="margin-top:8px;margin-right:8px;" ></u-image>
+			
+							  <u-image  width="260rpx" height="180rpx" :src="imgurl+v.coverImage" borderRadius="10" mode="heightFix" style="margin-top:3px;margin-right:8px;" ></u-image>
+				
 						<!-- <image :src="$img+v.coverImage"  style="border-raidus"></image> -->
 						<view class="info">
 							<view class="title">{{v.activityName}}</view>
@@ -79,12 +81,14 @@
 					pageNumber: 0,
 					pageSize: 10,
 					createUser:uni.getStorageSync('user').phone
-				}
+				},
+				imgurl:''
 			};
 		},
 		onLoad(option) {
 			this.num = option.id;
 			this.statuslist = 'nomore';
+			this.imgurl = this.$img
 		},
 		// onPullDownRefresh(e) {
@@ -14,7 +14,7 @@
 			<u-button type="success" @click="search">搜索</u-button>
 		</view> -->
 		<view style="margin: 20rpx 0;background-color: #FFFFFF;border-radius: 18rpx;border: 2rpx solid #E8E8E8;	margin: 22rpx 24rpx;overflow: hidden;" >
-			<u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="pagesize.title" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
+			<u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="pageIndex.activityName" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
 		</view>
 		<view class="screen-list">
 			<u-dropdown menu-icon="arrow-down-fill" :title-size="24" :height="40">
@@ -5,7 +5,7 @@
 			<u-button type="success" @click="search">搜索</u-button>
 		</view> -->
 		<view style="margin: 20rpx 0;background-color: #FFFFFF;border-radius: 18rpx;border: 2rpx solid #E8E8E8;	margin: 22rpx 24rpx;overflow: hidden;" >
-			<u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="pagesize.title" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
+			<u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="query.title" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
 		</view>
 		<view class="screen-list">
 			<view class="list" @click="show = true">
@@ -26,7 +26,7 @@
 			justify-content: center;
 			align-items: center;
 			// width: 30%;
-			height: 100%;
+			height: 32px;
 			background-color: #fff;
 			padding: 10rpx 16rpx;
 			border-radius: 18rpx;
@@ -23,7 +23,10 @@
 			<view style="padding: 10px 0;	border-bottom: #eee solid 1rpx;">{{record.estimate || '无'}}</view>
 				<view style="padding: 5px 0;line-height: 36px;">现场照片</view>
 			<view class="imgList">
-				<u-image width="48%" height="280" border-radius="10" :src="$img+item" v-for="(item,index) in this.record.onSitePhoto"></u-image>
+				<view style="width: 48%;" v-for="(item,index) in record.onSitePhoto" :key="index">
+					<u-image width="100%" height="280" border-radius="10" :src="srcUrl+item" ></u-image>
+				</view>
+				
 			</view>
 		</view>
@@ -36,11 +39,12 @@
 		data() {
 			return {
 				record:{},
+				srcUrl:''
 			}
 		},
 		 onLoad(options) {
+			 this.srcUrl = this.$img
 		    const item = JSON.parse(decodeURIComponent(options.item));
-		    console.log('Received item:', item);
 			this.record = item
 			if(typeof this.record.onSitePhoto == 'string'){
 				this.record.onSitePhoto = 	this.record.onSitePhoto.split(',')
@@ -58,7 +62,6 @@
 		left: 0;
 		top: 0;
 		width: 100%;
-		height: 100%;
 		padding: 0 24rpx;
 	}
 	/* 记录列表 */
@@ -26,7 +26,7 @@
 			justify-content: center;
 			align-items: center;
 			// width: 30%;
-			height: 100%;
+			height: 32px;
 			background-color: #fff;
 			padding: 10rpx 16rpx;
 			border-radius: 18rpx;
@@ -137,7 +137,7 @@
 					.retail-price {
 						display: flex;
 						align-items: flex-end;
-						width: 100%;
+						width: 50%;
 						color: #676767;
 						font-size: 24rpx;
 						.min {
@@ -6,7 +6,7 @@
 			<u-button type="success" @click="search" style="height:32px;">搜索</u-button>
 		</view> -->
 		<view style="margin: 20rpx 0;background-color: #FFFFFF;border-radius: 18rpx;border: 2rpx solid #E8E8E8;	margin: 22rpx 24rpx;overflow: hidden;" >
-			<u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="pagesize.title" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
+			<u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="query.shopName" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
 		</view>
 		<view class="screen-list">
 			<view class="list" @click="show = true">
@@ -49,7 +49,11 @@
 							<text class="one-omit">{{item.detailedLocation}}</text>
 						</view>
 						<view class="like-goods">
-							<view class="retail-price" v-if="item.actualUsableArea">
+							<view class="retail-price" v-if="item.belongingRegion">
+									<text>所属区域:</text>
+									<text class="max">{{item.belongingRegion}}</text>
+								</view>
+							<view class="retail-price" >
 						<!-- 		<text>租金:</text>
 								<text class="min">￥</text>
 								<text class="max">{{item.id * 10}}</text>
@@ -57,7 +61,7 @@
 								<text class="line"></text> -->
 								<text>面积:</text>
 								<text class="max">{{item.actualUsableArea}}</text>
-								<text class="min">/m²</text>
+								<text class="min" >/m²</text>
 							</view>
 						</view>
 					</view>
@@ -67,13 +71,6 @@
 		<u-popup v-model="zidongS" mode="center" width="90%" border-radius="20" :mask-close-able="false" :closeable="true" close-icon-pos="top-right">
 			<view class="zulinY">
 				<view style="font-size: 32rpx;font-weight: 600;margin-bottom: 20rpx;">请填写您的租赁意向</view>
-					<view class="" style="display: flex;justify-content: space-between;border-bottom:1px solid #F6F9FA;padding: 20rpx 0;">
-						<text class="sc" style="color: #979797;font-size: 30rpx;">意向租赁管理</text>
-						<view @click="showS(1)">
-							<text class="mc" style="margin-right: 10rpx;"> {{formList.zulei ==''?'请选择':formList.zulei}}</text>
-							<u-icon name="arrow-down"></u-icon>
-						</view>
-				</view>
 				<view class="" style="display: flex;justify-content: space-between;border-bottom:1px solid #F6F9FA;padding: 20rpx 0;">
 						<text class="sc" style="color: #979797;font-size: 30rpx;">意向区域</text>
 						<view @click="showS(2)">
@@ -81,20 +78,13 @@
 							<u-icon name="arrow-down"></u-icon>
 						</view>
 				</view>
-				<view class="" style="display: flex;justify-content: space-between;border-bottom:1px solid #F6F9FA;padding: 20rpx 0;">
-						<text class="sc" style="color: #979797;font-size: 30rpx;">意向租期</text>
-						<view @click="showS(3)">
-							<text class="mc" style="margin-right: 10rpx;"> {{formList.zuqi ==''?'请选择':formList.zuqi}}</text>
-							<u-icon name="arrow-down"></u-icon>
-						</view>
-				</view>
-				<view class="" style="display: flex;justify-content: space-between;border-bottom:1px solid #F6F9FA;padding: 20rpx 0;">
-						<text class="sc" style="color: #979797;font-size: 30rpx;">意向租金</text>
+				<!-- <view class="" style="display: flex;justify-content: space-between;border-bottom:1px solid #F6F9FA;padding: 20rpx 0;">
+						<text class="sc" style="color: #979797;font-size: 30rpx;">意向租金(月)</text>
 						<view @click="showS(4)">
 							<text class="mc" style="margin-right: 10rpx;"> {{formList.zujin ==''?'请选择':formList.zujin}}</text>
 							<u-icon name="arrow-down"></u-icon>
 						</view>
-				</view>
+				</view> -->
 				<view class="" style="display: flex;justify-content: space-between;border-bottom:1px solid #F6F9FA;padding: 20rpx 0;">
 						<text class="sc" style="color: #979797;font-size: 30rpx;">意向面积</text>
 						<view @click="showS(5)">
@@ -118,7 +108,7 @@
 					确定
 				</view>
 			</view>
-			<u-select v-model="show" :list="companys" @confirm="handleCompanyConfirm" mini borderless></u-select>
+			<u-select v-model="showList" :list="companys" @confirm="handleCompanyConfirm" mini borderless></u-select>
 		</u-popup>
@@ -153,7 +143,7 @@
 					{value: '温江区', label: '温江区'},
 				], // 区域列表
-				
+				showList:false,
 				zidongS: false,
 				formList: {
 					zulei: '',
@@ -163,17 +153,13 @@
 					mianji:'',
 					name:'',
 					phone:'',
-					pageNumber: 1,
+					pageNumber: 0,
 					pageSize: 10,
+					publishStatus:2
 				},
 				showSex: false,
 				show:false,
 				index:1,
-				zujinList:[
-					{price:'4800'},
-					{price:'3400'},
-					{price:'3000'}
-				],
 				companys: [
 					{
 						value: '1',
@@ -330,7 +316,7 @@
 				   	}
 				   ]
 			   }
-			   this.show = true
+			   this.showList = true
 			},
 		handleCompanyConfirm(e){
 			if(this.index == 1){
@@ -368,7 +354,7 @@
 		},
 		confirm(val){
 			let page = {
-				pageNumber: 1,
+				pageNumber: 0,
 				pageSize: 10,
 				belongingRegion:val[0].label
 			}
@@ -396,8 +382,9 @@
 					mianji:'',
 					name:'',
 					phone:'',
-					pageNumber: 1,
+					pageNumber: 0,
 					pageSize: 10,
+					publishStatus:2
 			}
 			this.zidongS = false
@@ -3,7 +3,7 @@
 	left: 0;
 	top: 0;
 	width: 100%;
-	height: 100%;
+	min-height: 100vh;
 }
 .my-top{
 	position: absolute;
@@ -74,13 +74,14 @@
 .main {
 	position: relative;
 	top: 90rpx;
-	padding-bottom: 20px;
+	
 	/* #ifdef MP */
 	top: 170rpx;
-	padding-bottom: 20px;
+	
 	/* #endif */
 	margin: 0 20rpx;
 }
+
 .banner {
 	height: 330rpx;
 	image {
@@ -13,7 +13,7 @@
 				<view class="setting-mess"></view>
 			</view>
 		</view>
-		<view class="main">
+		<!-- <view class="main">
 			<view class="bg-white" v-for="item in pageList1" :key="item.id">
 				<view class="bidding-title"><view class="bidding-title-line"></view>{{item.title}}</view>
 				<view class="wallet-info">
@@ -27,7 +27,7 @@
 					</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="main">
 			<view class="bg-white" v-for="item in pageList2" :key="item.id">
 				<view class="bidding-title"><view class="bidding-title-line"></view>{{item.title}}</view>
@@ -58,6 +58,21 @@
 				</view>
 			</view>
 		</view>
+		<view class="main">
+			<view class="bg-white" v-for="item in pageList4" :key="item.id">
+				<view class="bidding-title"><view class="bidding-title-line"></view>{{item.title}}</view>
+				<view class="wallet-info">
+					<view class="list" v-for="v in item.children" :key="v.name" @click="toPath(v.path)">
+						<view class="icon">
+							<image :src="$imgUrl(`${v.img}`)"></image>
+						</view>
+						<view class="title">
+							<text>{{v.name}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
 		<!-- tabbar -->
 		<tabbar :tabBarShow="1"></tabbar>
 	</view>
@@ -72,17 +87,14 @@
 		data() {
 			return {
 				pageList1: [
-					{
-						id: 1,
-						title: '招商服务',
-						children: [
-							{ name: '问卷调查', img: '/workbench1.png', path: '/pages/questionnaire/questionnaire' },
-							{ name: '意向申请', img: '/workbench5.png', path: '/pages/rsaManagement/rsaManagement' },
-							// { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' },
-							// { name: '活动参与', img: '/workbench3.png', path: '/pages/participation/participation' },
-							// { name: '我的活动申请', img: '/workbench4.png', path: '/pages/mycreated/mycreated' },
-						]
-					},
+					// {
+					// 	id: 1,
+					// 	title: '招商服务',
+					// 	children: [
+					// 		{ name: '问卷调查', img: '/workbench1.png', path: '/pages/questionnaire/questionnaire' },
+					// 		{ name: '意向申请', img: '/workbench5.png', path: '/pages/rsaManagement/rsaManagement' },
+					// 	]
+					// },
 					// {
 					// 	id: 2,
 					// 	title: '推广策划',
@@ -117,13 +129,13 @@
 				pageList2: [
 					{
 						id: 1,
-						title: '活动管理',
+						title: '活动与意向申请',
 						children: [
 							// { name: '文件调查', img: '/workbench1.png', path: '/pages/questionnaire/questionnaire' },
 							// { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' },
 							{ name: '我的活动', img: '/workbench3.png', path: '/pages/participation/participation' },
 							{ name: '活动申请', img: '/workbench4.png', path: '/pages/mycreated/mycreated' },
-							// { name: '销售上报', img: '/workbench5.png', path: '/pages/salesReporting/salesReporting' },
+							{ name: '意向申请', img: '/workbench5.png', path: '/pages/rsaManagement/rsaManagement' },
 						]
 					},
 				],
@@ -141,6 +153,19 @@
 						]
 					},
 				],
+				pageList4: [
+					{
+						id: 1,
+						title: '商铺缴费',
+						children: [
+							// { name: '文件调查', img: '/workbench1.png', path: '/pages/questionnaire/questionnaire' },
+							// { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' },
+							// { name: '我的活动', img: '/workbench3.png', path: '/pages/participation/participation' },
+							// { name: '活动申请', img: '/workbench4.png', path: '/pages/mycreated/mycreated' },
+							{ name: '租金缴费', img: '/workbench1.png', path: '/pagesA/rentPay/rentPay' },
+						]
+					},
+				],
 				scrollTop: 0,
 			};
 		},
@@ -86,7 +86,7 @@
-		<view class="item">
+		<view class="item" style="margin-bottom: 60px;">
 			<view class="contents" style="background-color:#fff;padding:10px 20px;">
 				<view class="feedback-data">
 					<view>
@@ -138,7 +138,7 @@
 			// this.ruleForm.shopPhotos = shopPhotos
 			this.ruleForm.shopPhotos.map((item,index)=>{
 				let obj = {
-					url:item
+					url:this.$img+item
 				}
 				this.fist.push(obj)
@@ -147,7 +147,7 @@
 			// this.fileList = this.ruleForm.shopPhotos
 			this.edit =true
 		 }
-		 console.log(this.ruleForm,this.fist)
+		 
 		 if(options.ids){
 			 this.ruleForm.contractId = options.ids
 		 }
@@ -219,11 +219,11 @@
 							if(show == false){
 								return
 							}
-						this.ruleForm.shopPhotos.map(item=>{
-							  	item = item.replace(this.$img,'')
-							})
+							this.ruleForm.shopPhotos = this.ruleForm.shopPhotos.map(item=>{
+										 return item.replace(this.$img,'');
+									})
+	
-							// return
 							this.ruleForm.applicationTime = this.currentTime()
 							let info = {
 								...this.ruleForm,
@@ -282,28 +282,32 @@
 						    return strDate;
 						},
 						onsuccess1(e, file, fileList, ziduan) {
-							console.error(e, file, fileList, ziduan)
+	
+							let index = 0
+							if(this.ruleForm.shopPhotos.length !=0){
+								index = this.ruleForm.shopPhotos.length
+							}
+							
 							uni.uploadFile({
 								url: this.$upload, // 仅为示例，请替换为您的服务器上传接口
-								filePath: e[0].url,
+								filePath: e[index].url,
 								name: 'file', // 后端接收的文件参数名
 								formData: {
 									filePath: 'xcx', // 其他表单数据
 								},
 								success: (uploadFileRes) => {
-									console.log(this.fist)
+									
+									
 										this.ruleForm.shopPhotos.push(this.$img + JSON.parse(uploadFileRes.data).data)
-										// let obj ={
-										// 	url:this.$img + JSON.parse(uploadFileRes.data).data
-										// }
-										// this.fist.push(obj)
+				
 									uni.showToast({
 										title: '上传成功',
 										icon: 'success',
 									});
 								},
 								fail: (err) => {
-									console.error('上传失败', err);
+									console.log('上传失败',this.fist)
+				
 									uni.showToast({
 										title: '上传失败',
 										icon: 'none',
@@ -325,7 +329,6 @@
 		left: 0;
 		top: 0;
 		width: 100%;
-		height: 100%;
 		background-color: #f6f6f6;
 	}
@@ -112,7 +112,7 @@
 							</u-read-more>
 								</view>
-				<view class="msglist"  v-if="btnShow == false&&mapType == '商铺'" style="margin-bottom:65px;">
+				<view class="msglist"  v-if="btnShow == false&&mapType == '商铺'" style="margin-bottom:80px;">
 					<view class="form-item">
@@ -145,24 +145,24 @@
 						<view class="label">店内照片</view>
 					</view>
 					<view class="image-container">
-						<u-image    class="image-item" width="48%" mode="heightFix" height="300rpx" :src="item" v-for="(item,index) in myshopMsg.shopPhotos" :key="index"></u-image>
+						<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:65px;">
+						<view class="msglist"  v-if="mapType == '广告位'"  style="margin-bottom:80px;">
 							<view class="form-item">
 								<view class="label">投放内容</view>
 							</view>
-							<!-- <view class="" style="background-color: #F0F0F0;border-radius: 20rpx;padding:10px;">
-								<u-parse :html="content"></u-parse>
-										
-							</view> -->
-							 <u-image    class="image-item" width="100%" mode="heightFix" height="300rpx" :src="imgurl+record.coverImage" ></u-image> 
+
+							 <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: 65px;" v-if="btnShow && mapType == '商铺'"><u-button @click="xiuMsg(1)" shape="circle" :custom-style="hoverStyle" hover-class="none" :plain="true">添加我的店铺信息</u-button></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">
 							<u-button style="background-color: #DFE0E4; flex: 1; margin: 0 10px;" @click="getQuit('/pagesA/myZiyuan/myZiyuanQuit')"
 								>申请退租</u-button>
@@ -209,7 +209,7 @@
 		 onLoad(options) {
 			   this.imgurl = this.$img
 		    const item = JSON.parse(decodeURIComponent(options.item));
-		    console.log('Received item:', item);
+		    
 			this.record = item
 			let pageHe={
 				pageNumber: 0,
@@ -243,8 +243,8 @@
 							this.btnShow = false
 							this.myshopMsg = res.data.data.content[0]
 							this.myshopMsg.shopPhotos = this.myshopMsg.shopPhotos.split(',')
-							
-							this.myshopMimgurlhopPhotos.map(item=>{
+								console.log(this.myshopMsg.shopPhotos)
+							this.myshopMsg.shopPhotos.map(item=>{
 								item = this.imgurl + item
 							})
@@ -259,7 +259,7 @@
 				})
 			},
 			xufirm(){
-				console.log('11111s')
+				
 				this.xuForm.createUser = uni.getStorageSync('user').phone
 				this.xuForm.createTime = this.getCurrentTime()
 				this.xuForm.contractId = Number(this.heData.id)
@@ -465,11 +465,9 @@
 		display: flex;
 		align-items: center;
 		width: 100%;
-		height: 125rpx;
 		background-color: #FFFFFF;
-		padding-bottom: constant(safe-area-inset-bottom);
-		padding-bottom: env(safe-area-inset-bottom);
 		z-index: 20;
+		padding: 15px 0;
 		.footer-buy{
 			display: flex;
 			align-items: center;
@@ -491,6 +489,7 @@
 		}
 	}
 	.image-container {
+		padding: 10rpx 0;
 	  display: flex;
 	  flex-wrap: wrap; /* 启用换行 */
 	  justify-content: space-between; /* 图片之间均匀分布 */
@@ -3,7 +3,6 @@
 	left: 0;
 	top: 0;
 	width: 100%;
-	height: 100%;
 }
 .screen-list {
 		display: flex;
@@ -25,7 +24,7 @@
 			justify-content: center;
 			align-items: center;
 			width: 30%;
-			height: 100%;
+			height: 32px;
 			background-color: #fff;
 			padding: 0rpx 15px;
 			border-radius: 18rpx;
@@ -54,12 +54,12 @@
 					//成功回调
 					 this.recordList = res.data.data.content
 					this.$http.sendRequest('/cereAdvertiserInfo/queryByPage', 'POST', this.pageindex, 1).then(item => {
-						console.log(item.data.data.content.length)
-					 if(item.data.data.content.length !=0){
+						
+					 if(item.data.data.content !=undefined &&item.data.data.content.length !=0){
 						 item.data.data.content.map(val=>{
 							  this.recordList.push(val)
 						 })
-					 }
+					 } 
 					})
+<template>
+	<view class="page">
+		<view class="timsg">
+			<view class="msgtitle">您正在成都锦江绿道有限公司支付金额</view>
+			<view class="price">
+				<u-icon name="rmb" style="font-size: 24rpx;" />
+				800
+			</view>
+		</view>
+		<view style="height: 120rpx;"></view>
+		<view class="page-footer">
+			<u-button style="width: 100%;border-radius: 15px;" type="success"  @click="submit">支付</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				}
+		},
+		onShow() {
+				const isLogin = uni.getStorageSync('token');
+				if (isLogin == '') {
+					// 如果未登录，跳转到登录页面
+					uni.navigateTo({
+						url: '/pages/login/login'
+					})
+				} else {
+		
+					this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => {
+						 if(res.data.code == '20004' || res.data.code == '20003'){
+							 uni.navigateTo({
+							 	url: '/pages/login/login'
+							 })
+						 }
+					})
+				}
+		
+			},
+				methods: {
+					submit(){
+						
+					}
+				}
+}				
+	
+</script>
+
+<style scoped lang="scss">
+	.page{
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		padding: 0 20rpx;
+	}
+	.timsg{
+		height:20vh;
+		text-align: center;
+		padding: 50px 0;
+		.msgtitle{
+			margin-bottom: 20px;
+			font-size: 30rpx;
+			color: #A4A4A4;
+		}
+		.price {
+			color: #0FBB59;
+			font-size: 50rpx;
+			font-weight: 700;
+		}
+	}
+	.page-footer{
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		
+		background-color: #FFFFFF;
+		padding: 20rpx 20rpx;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+		z-index: 999;
+		
+			}
+</style>
 \ No newline at end of file
+.page{
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	padding: 0 20rpx;
+}
+.search-box {
+	background-color: #FFFFFF;
+	border-radius: 20rpx;
+	padding: 20rpx 30rpx;
+	margin-top: 26rpx;
+	
+}
+.search-total {
+	background-color: #FFFFFF;
+	border-radius: 20rpx;
+	padding: 40rpx;
+	margin-top: 26rpx;
+		display: flex;
+		flex-direction: row;
+		align-items: flex-end;
+		justify-content: space-between;
+		font-size: 24rpx;
+	
+		.left {
+			color: #757575;
+			.price-total {
+				color: #0FBB59;
+				font-size: 50rpx;
+				font-weight: 700;
+				margin-bottom: 10rpx;
+			}
+		}
+		.right {
+			width: 30vw;
+			text-align: right;
+		}
+	}
+.price {
+	color: #0FBB59;
+	font-size: 32rpx;
+	font-weight: 700;
+}
+/* 记录列表 */
+.record-list{
+	margin-top: 20rpx;
+	// margin: 0 20rpx;
+	.record-list-box {
+		background-color: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 20rpx 30rpx;
+		margin-bottom: 20rpx;
+		width: 100%;
+		.list {
+			width: 100%;
+			display: flex;
+			padding: 20rpx 30rpx;
+			border-bottom: #f6f6f6 solid 1rpx;
+			align-items: center;
+			.list-item {
+				flex: 1;
+			}
+			
+			.list-info {
+				display: flex;
+				align-items: center;
+				.img {
+					width: 72rpx;
+					height: 72rpx;
+					border-radius: 50%;
+					overflow: hidden;
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+				.info-items {
+					margin-left: 20rpx;
+					.info-title {
+						font-size: 30rpx;
+						line-height: 40rpx;
+							margin-bottom: 20rpx;
+					}
+
+				}
+			}
+			
+		}
+	}
+}
+.page-footer{
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	width: 100%;
+	background-color: #FFFFFF;
+	padding: 10rpx 20rpx;
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
+	z-index: 999;
+	.footer-buy{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		width: 100%;
+		height: 100%;
+		.cart-add{
+			align-items: center;
+			display: flex;
+			min-width: 20%;
+			height: 70rpx;
+		}
+ .buttons{
+	font-size: 30rpx;
+
+		margin: 0 10rpx !important;
+		height: 32px !important;
+		border-radius: 10rpx !important;
+		margin-top: 20rpx !important;
+}
+.u-size-default.data-v-3bf2dba7 {
+  font-size: 30rpx;
+	    height: 100% !important;
+	    line-height: 200% !important;
+}
+
+	}
+}
+<template>
+	<view class="page">
+		<view class="search-box">
+			<view>
+				<u-input v-model="value" type="select" @click="show = true" style="background-color: #fff;" placeholder="-"  :border="false"/>
+				<u-select v-model="show" :list="list1" @confirm="confirm"></u-select>
+			</view>
+			
+		</view>
+		<view class="search-total">
+				<view class="left">
+					<view class="price-total"><u-icon name="rmb" style="font-size: 24rpx;" />100.00</view>
+					<view>（当前租金欠费金额)</view>
+				</view>
+				<div class="right" @click='toDetail'>
+					<view>缴费记录 <u-icon name="arrow-right"  size="28" /></view>
+				</div> 
+	
+		</view>
+		<view style="text-align: center;color:#0EBB5A;padding: 30rpx 0;">每月1日为付款日</view>
+		<!-- 记录列表 -->
+		<view class="record-list">
+			<view class="record-list-box" v-for="(item,index) in recordList" :key="index">
+				<u-checkbox-group class="list-group" style="width: 100%;" >
+						<view class="list">
+							<u-checkbox v-model="recordList[index].gouxuan" shape="circle" :label-disabled="false" active-color="#0EBB5A" 	@change="xuanAll(item,$event)"/>
+								
+							<view class="list-item">
+								<view class="list-info">
+									<view class="info-items">
+										<view class="info-title">{{item.name}}：</view>
+										<view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{item.price}}</view>
+									</view>
+								</view>
+							</view>
+						</view>
+			
+				</u-checkbox-group>
+			</view>
+		</view>
+		<view style="height: 120rpx;"></view>
+		<view class="page-footer">
+			<view class="footer-buy">
+					<u-checkbox-group >
+							<u-checkbox 
+							shape="circle"
+								@change="quanxuan" 
+								v-model="showAll"
+								active-color="#0EBB5A"
+							>全选</u-checkbox>
+						</u-checkbox-group>
+				<view class="cart-add">
+					合计：<view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{payAll}}</view>
+				</view>
+				<u-button type="success" class="buttons" @click="joinShow" size="mini">去支付</u-button>
+			</view>
+		</view>
+		<!-- <u-loading :show="true" size="60" style="position: absolute; top:80%;left: ;" color="red"></u-loading> -->
+	</view>
+	
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				show: false,
+				payAll:0,
+				value: '',
+				list1: [{ value: '0', label: '全部' },{ value: '1', label: '物业费' }, { value: '2', label: '水费' },{ value: '3', label: '卫生费' }, { value: '4', label: '燃气费' },{ value: '5', label: '电费' }	],
+				checked: [],
+				recordList:[
+					{
+						img: '',
+						name: '物业费',
+						price: 1500,
+						rate: '100%',
+						chilren: [],
+						showItem: false,
+						gouxuan:false
+					},
+					{
+						img: '',
+						name: '卫生费',
+						price: 5000,
+						rate: '100%',
+						chilren: [],
+						showItem: false,
+						gouxuan:false
+					},
+					{
+						img: '',
+						name: '水费',
+						price: 2000,
+						rate: '100%',
+						chilren: [],
+						showItem: false,
+						gouxuan:false
+					}
+				],
+				recordList1:[
+					{
+						img: '',
+						name: '物业费',
+						price: 15,
+						rate: '100%',
+						chilren: [],
+						showItem: false,
+						gouxuan:false
+					},
+					{
+						img: '',
+						name: '卫生费',
+						price: 15,
+						rate: '100%',
+						chilren: [],
+						showItem: false,
+						gouxuan:false
+					},
+					{
+						img: '',
+						name: '水费',
+						price: 15,
+						rate: '100%',
+						chilren: [],
+						showItem: false,
+						gouxuan:false
+					},
+					{
+						img: '',
+						name: '电费',
+						price: 15,
+						rate: '100%',
+						chilren: [],
+						showItem: false,
+						gouxuan:false
+					},
+					{
+						img: '',
+						name: '燃气费',
+						price: 15,
+						rate: '100%',
+						chilren: [],
+						showItem: false,
+						gouxuan:false
+					},
+				],
+							
+							loadShow:false,
+							showAll:false,
+							
+			};
+		},
+		watch:{
+			recordList:{
+				deep:true,
+				handler(newVal){ 
+					 const allTrue = this.recordList.every(item => item.gouxuan)
+					 this.showAll = allTrue
+				}
+			}
+		},
+		onShow() {
+			const isLogin = uni.getStorageSync('token');
+			if (isLogin == '') {
+				// 如果未登录，跳转到登录页面
+				uni.navigateTo({
+					url: '/pages/login/login'
+				})
+			} else {
+
+				this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => {
+					 if(res.data.code == '20004' || res.data.code == '20003'){
+						 uni.navigateTo({
+						 	url: '/pages/login/login'
+						 })
+					 }
+				})
+			}
+
+		},
+		methods: {
+			quanxuan(e){	
+				
+			  const allTrue = this.recordList.every(item => item.gouxuan)
+			  if(allTrue){
+				  this.payAll= 0
+				  this.showAll = !this.showAll
+				  this.recordList.forEach(item => {
+				    item.gouxuan = !allTrue;
+					
+				  });
+			  }else{
+				 this.showAll = true
+				 
+				  this.recordList.forEach(item => {
+				    item.gouxuan = !allTrue;
+					this.payAll += item.price
+				  });
+			  }
+	
+				
+			},
+			xuanAll(item,e){
+				
+				if(e.value){
+					this.payAll += item.price
+				}else{
+					this.payAll -= item.price
+				}
+			},
+			recordXq(item){
+				 const encodedItem = encodeURIComponent(JSON.stringify(item));
+				uni.navigateTo({
+				 url: `/pages/accepting/accepting?item=${encodedItem}`,
+				 })
+			},
+			toDetail() {
+				uni.navigateTo({
+					url: '/pagesA/rentPay/rentPayDetails'
+				})
+			},
+			joinShow(){
+				 if(this.payAll == 0){
+					 uni.showToast({
+					 	icon: 'error',
+					 	title: '请选择支付订单'
+					 })
+				 }else{
+					 uni.navigateTo({
+					 	url: '/pagesA/rentPay/goPay'
+					 })
+				 }
+			},
+			confirm(e){
+				console.log(e)
+				let arr =[]
+				if(e[0].label == '全部'){
+					this.recordList  = this.recordList1
+				}else{
+					this.recordList1.map(item =>{
+						if(item.name == e[0].label){
+							arr.push(item)
+						}
+					})
+					this.recordList = arr 
+				}
+				this.value = e[0].label
+				
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'rentPay.scss';
+</style> 
+.page{
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	padding: 0 30rpx;
+}
+.title-top {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin: 40rpx 0 16rpx;
+	.right {
+		font-size: 32rpx;
+		font-weight: 700;
+	}
+}
+.record-list {
+	width: 100%;
+	.record-item {
+		background-color: #fff;
+		padding: 34rpx;
+		border-radius: 14rpx;
+		margin-bottom: 20rpx;
+		.info-title {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			padding-bottom: 20rpx;
+			border-bottom: #f6f6f6 solid 1rpx;
+			.title {
+				font-weight: 700;
+			}
+			.price {
+				font-size: 32rpx;
+				font-weight: 700;
+				color: #0FBB59;
+			}
+		}
+		.info-items {
+			border-bottom: #f6f6f6 solid 1rpx;
+			margin-top: 16rpx;
+			padding-bottom: 16rpx;
+			.info-item {
+				width: 100%;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				// line-height: 50rpx;
+				padding: 8rpx 10rpx;
+				.title {
+					font-weight: 700;
+				}
+				.price {
+					font-size: 28rpx;
+					font-weight: 700;
+					color: #0FBB59;
+				}
+			}
+		}
+		:last-child {
+			border-bottom: unset;
+		}
+	}
+}
 \ No newline at end of file
+<template>
+	<view class="page">
+		<view class="title-top">
+			<div class="left">
+				<view @click="show = true">{{pageIndex.time}}年<u-icon name="arrow-down"></u-icon></view>
+				<u-picker v-model="show" mode="time" :params="{year: true}" @confirm="confirm"></u-picker>
+			</div>
+			<div class="right"><view class="price" style="font-size: 40rpx;"><u-icon name="rmb" style="font-size: 24rpx;" />6451.00</view></div>
+		</view>
+		<view class="record-list">
+			<view class="record-item" v-for="(item, index) in dataList" :key="index" >
+				<view class="info-title">
+					<view class="title">7月</view>
+					<view class="right"><view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />6451.00</view></view>
+				</view>
+				<view class="info-items" v-for="(v, i) in item.children" :key="i">
+					<view class="info-item">
+						<view class="left title">支付订单编号</view>
+						<view class="right"><view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />500.00</view></view>
+					</view>
+					<view class="info-item">
+						<view class="left" style="color: #0FBB59;">支付成功</view>
+						<view class="right" style="color: #8A8A8A;">07.11 15:21</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				show: false,
+				dataList: [
+					{
+						children: [{}, {}]
+					}
+					
+				],
+				pageIndex:{
+					time:''
+				}
+			}
+		},
+			onShow() {
+			this.pageIndex.time = this.getCurrentYear()
+			},
+		methods: {
+			getCurrentYear() {
+			    const year = new Date().getFullYear();
+			    return `${year}`;
+			},
+			confirm(e){
+				
+				this.pageIndex.time =  e.year
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'rentPayDetails.scss';
+</style> 
 \ No newline at end of file