feat: 合并master 解决冲突

feat: 补充逻辑
部分修改
2025-06-23 16:11:08 +08:00 · 2025-06-23 16:07:33 +08:00 · 2025-06-23 16:02:11 +08:00 · 2025-06-20 18:27:30 +08:00
23 changed files with 604 additions and 83 deletions
--- a/packages/community/applyOwer/index.css
+++ b/packages/community/applyOwer/index.css
@ -18,7 +18,12 @@ page {
  margin-top: 30rpx;
  margin-left: 20rpx;
 }
-
+.item_right {
+  display: flex;
+}
+.right_input {
+  flex: 1;
+}


 .right_pic {
--- a/packages/community/applyOwer/index.vue
+++ b/packages/community/applyOwer/index.vue
@ -11,8 +11,10 @@
 				<view class="label">
 					<view class="item_desc">房产</view>
 				</view>
-
-				<input :value="communityName" @click="chooseMsg" class="right_input" disabled type="text" placeholder="请选择您要入驻的房产" />
+				<view class="item_right" @click="chooseMsg">
+					<input :value="communityName" class="right_input" disabled type="text" placeholder="请选择您要入驻的房产" />
+					<u-icon name="arrow-right"></u-icon>
+				</view>
 			</view>


@ -21,7 +23,7 @@
 					<view class="item_desc">姓名</view>
 				</view>

-				<input :value="communityName" class="right_input" type="text" placeholder="请输入您的姓名" />
+				<input :value="name" @input="headerInputClick" data-name="name" class="right_input" type="text" placeholder="请输入您的姓名" />
 			</view>

 			<view class="item">
@ -29,15 +31,17 @@
 					<view class="item_desc">手机</view>
 				</view>

-				<input :value="communityName" class="right_input" type="text" placeholder="请选择您的手机号" />
+				<input :value="mobile" @input="headerInputClick" data-name="mobile" class="right_input" type="text" placeholder="请选择您的手机号" />
 			</view>

 			<view class="item">
 				<view class="label">
 					<view class="item_desc">身份</view>
 				</view>
-
-				<input :value="communityName" class="right_input" type="text" placeholder="请输入您的身份" />
+				<view class="item_right" @click="changeShow" >
+					<input :value="identity.text" class="right_input" disabled type="text" placeholder="请输入您的身份"/>
+					<u-icon name="arrow-right"></u-icon>
+				</view>
 			</view>

 			<view class="tips ">
@ -50,6 +54,7 @@

 		<u-picker :show="show" :columns="columns" keyName="text" @confirm='confirm' @close='onClose' @cancel='onClose'
 			closeOnClickOverlay></u-picker>
+			
 	</view>
 </template>

@ -59,7 +64,10 @@ import { apiArr } from '../../../api/community';
 export default {
 	data() {
 		return {
-
+			communityName: '',
+			name: '',
+			mobile: '',
+			identity: {},
 			show: false, //弹出层
 			columns: [
 				[
@ -82,16 +90,21 @@ export default {

 		confirm(e) {
 			console.log('eee', e);
-			this.typeName = e.value[0].text;
-			this.type = e.value[0].type;
+			this.identity = e.value[0];
 			this.show = false;
 		},

-
+		headerInputClick(e) {
+			const { name } = e.currentTarget.dataset;
+			const { value } = e.detail;
+			this[name] = value;
+		},
 		chooseMsg(){
 			NavgateTo("../chooseMsg/index")
 		},
-
+		submit() {
+			console.log('111', this);
+		}

 	},

--- a/packages/community/chooseMsg/index.css
+++ b/packages/community/chooseMsg/index.css
@ -44,6 +44,7 @@ image {
  flex: 1;
  display: flex;
  align-items: center;
+  justify-content: space-between;
 }

 .communityItem_msg_title {
@ -61,11 +62,13 @@ image {
  -webkit-line-clamp: 2;
  margin-top: 20rpx;
 }
-
+.communityItem_msg_box{
+  flex: 1;
+}
 .communityItem_msg_more {
-  width: 16rpx;
-  height: 30rpx;
-  margin-left: 110rpx;
+  width: 28rpx;
+  height: 28rpx;
+  margin-left: 94rpx;
 }

 .addBtn {
--- a/packages/community/chooseMsg/index.vue
+++ b/packages/community/chooseMsg/index.vue
@ -12,7 +12,7 @@
 				</div>

 				<div class="communityItem_msg">
-					<div>
+					<div class="communityItem_msg_box">
 						<div class="communityItem_msg_title">岸芷汀兰(东区)</div>
 						<div class="communityItem_msg_addr">
 							河北省衡水市桃城区红旗大街与河
@ -21,7 +21,8 @@
 					</div>

 					<div class="communityItem_msg_more">
-						<img src="http://192.168.0.172:5500/com_communityMore.png" alt="" />
+						<img src="http://192.168.0.172:5500/com_check1.png" alt="" />
+						<!-- <img src="http://192.168.0.172:5500/com_check2.png" alt=""  /> -->
 					</div>

 				</div>
@ -33,7 +34,7 @@
 </template>

 <script>
-import { request,NavgateTo } from '../../../utils';
+import { request, NavgateTo } from '../../../utils';
 import { apiArr } from '../../../api/community';
 export default {
 	data() {
--- a/packages/community/chooseMsgInfo/index.css
+++ b/packages/community/chooseMsgInfo/index.css
@ -275,4 +275,44 @@ image {
  font-size: 30rpx;
  text-align: center;
  color: #FF370B;
-}
+}
+
+
+.popup_container {
+  margin: 0 55rpx;
+}
+.popup_title {
+  margin-top: 40rpx;
+  font-size: 30rpx;
+  color: #222222;
+  font-weight: 600;
+}
+.popup_community_name {
+  margin: 29rpx 0 8rpx;
+  text-align: center;
+  font-weight: 600;
+  font-size: 36rpx;
+  color: #FF370B;
+}
+.popup_desc {
+  font-weight: bold;
+  text-align: center;
+  font-size: 30rpx;
+  color: #FF370B;
+  margin-bottom: 40rpx;
+}
+.popup_btn_List {
+  display: flex;
+  justify-content: space-around;
+}
+.popup_btn {
+  width: 170rpx;
+  height: 52rpx;
+  line-height: 52rpx;
+  text-align: center;
+  background: #d9d9d9;
+  border-radius: 100rpx 100rpx 100rpx 100rpx;
+}
+.popup_btn1 {
+  background: #ff370b;
+}
--- a/packages/community/chooseMsgInfo/index.vue
+++ b/packages/community/chooseMsgInfo/index.vue
@ -31,11 +31,9 @@
 		<div v-if="step == '0' && type == '0'">
 			<div class="chooseTit">请选择楼栋</div>
 			<div class="communityInfoList">
-				<template v-for="(item, index) in 11">
-					<div :class="active == index ? 'communityInfo active' : 'communityInfo'" @click="choseTower">
-						1栋2单元
-					</div>
-				</template>
+				<div v-for="(item, index) in 11" :key="index" :class="active == index ? 'communityInfo active' : 'communityInfo'" @click="choseTower(item + 1)">
+					1栋{{index +1}}单元
+				</div>
 			</div>
 			<div class="addCommunityBtn" @click="addCommunity">
 				新建楼栋
@ -47,14 +45,14 @@
 				<view class="label">
 					<view class="item_desc">楼栋号</view>
 				</view>
-				<input class="right_input" type="text" placeholder="请输入楼栋号" />
+				<input class="right_input" type="text" @input="headerInputClick" data-name="addStorey" :value="addStorey" placeholder="请输入楼栋号" />
 			</view>

 			<view class="item">
 				<view class="label">
 					<view class="item_desc">单元号</view>
 				</view>
-				<input class="right_input" type="text" placeholder="请输入单元号" />
+				<input class="right_input" type="text" @input="headerInputClick" data-name="addUnit" :value="addUnit" placeholder="请输入单元号" />
 			</view>

 			<div class="tip">注意：新建的楼栋号需经物业或平台的核实后自动建 立。如核实未通过，将会创建失败！</div>
@ -65,13 +63,11 @@
 		</div>

 		<div v-if="step == '1' && type == '0'">
-			<div class="chooseTit">请选择楼层（1栋3单元）</div>
+			<div class="chooseTit">请选择楼层（1栋{{storey}}单元）</div>
 			<div class="communityInfoList">
-				<template v-for="(item, index) in 11">
-					<div :class="active == index ? 'communityInfo2 active' : 'communityInfo2'" @click="choseFloor">
-						{{ index + 1 }}层
-					</div>
-				</template>
+				<div  v-for="(item, index) in 11" :key="index" :class="active == index ? 'communityInfo2 active' : 'communityInfo2'" @click="choseFloor(item +1)">
+					{{ index + 1 }}层
+				</div>
 			</div>
 			<div class="addCommunityBtn" @click="addCommunity">
 				新建楼层
@ -83,7 +79,7 @@
 				<view class="label">
 					<view class="item_desc">楼层</view>
 				</view>
-				<input class="right_input" type="text" placeholder="请输入楼层(仅为数字)" />
+				<input class="right_input" type="text" @input="headerInputClick" data-name="addFloor" :value="addFloor" placeholder="请输入楼层(仅为数字)" />
 			</view>


@ -95,15 +91,13 @@
 		</div>

 		<div v-if="step == '2' && type == '0'">
-			<div class="chooseTit">请选择房间（1栋3单元/2层）</div>
+			<div class="chooseTit">请选择房间（1栋{{storey}}单元/{{unit}}层）</div>
 			<div class="communityInfoList">
-				<template v-for="(item, index) in 11">
-					<div :class="active == index ? 'communityInfo2 active' : 'communityInfo2'" @click="choseRoom">
-						201
+					<div v-for="(item, index) in 11" :key="index" :class="active == index ? 'communityInfo2 active' : 'communityInfo2'" @click="choseRoom(item)">
+						{{unit}}0{{ index +1 }}
 					</div>
-				</template>
 			</div>
-			<div class="addCommunityBtn" @click="addRoom">
+			<div class="addCommunityBtn" @click="addRoom1">
 				新建房间号
 			</div>
 		</div>
@ -114,11 +108,11 @@
 				<view class="label">
 					<view class="item_desc">房间号</view>
 				</view>
-				<input class="right_input" type="text" placeholder="请输入房间号" />
+				<input class="right_input" type="text" @input="headerInputClick" data-name="addRoom" :value="addRoom" placeholder="请输入房间号" />
 			</view>


-			<div class="tip">注意：新建的楼栋号需经物业或平台的核实后自动建 立。如核实未通过，将会创建失败！</div>
+			<div class="tip">注意：新建的房间号需经物业或平台的核实后自动建立。如核实未通过，将会创建失败！</div>

 			<div class="addCommunityBtn" @click="saveRoom">
 				确定
@ -192,7 +186,17 @@
 			</div>
 		</div>

-
+		<u-popup :show="selectShow" @close="close" mode="center" customStyle="width: 500rpx;" round="20rpx">
+			<view class="popup_container">
+					<view class="popup_title">请确认要入驻的房产：</view>
+					<view class="popup_community_name">岸芷汀兰(东区)</view>
+					<view class="popup_desc">1栋4单元2层208室</view>
+					<view class="popup_btn_List">
+						<view class="popup_btn" @click="headerCloseClick">取消</view>
+						<view class="popup_btn popup_btn1" @click="headerPopupSubmitClick">确定</view>
+					</view>
+			</view>
+		</u-popup>
 	</view>
 </template>

@ -214,16 +218,34 @@ export default {
 			active: "1",
 			step: "0",
 			type: "0", //1新建 0选择
-
 			createName: "8层",
+
+			addStorey: '', // 新增楼栋号
+			addUnit: '', // 新增单元楼号
+			addFloor: '', // 新增楼层
+			addRoom: '', // 新增房间号
+
+			storey: '', // xx号楼
+			unit: '', // 单元楼号
+			room: '', // 房间号
+
+
 			show1: false, //是否显示

 			show2: false,
 			show3: false,
-			show4: true,
+			show4: false,
+			selectShow: false, // 入驻房间号
 		}
 	},
 	methods: {
+
+		headerInputClick(e) {
+			const { name } = e.currentTarget.dataset;
+			const { value } = e.detail;
+			this[name] = value;
+		},
+		
 		//弹窗创建变成创建
 		addCommunity() {
 			this.type = "1"
@ -231,9 +253,25 @@ export default {

 		//保存楼栋
 		saveCommunity() {
-			let that = this
+			let that = this;
+			if(!this.addStorey) {
+				uni.showToast({
+					title: '请输入楼栋号',
+					icon: 'none',
+					mask: true
+				})
+				return
+			}
+			if(!this.addUnit) {
+				uni.showToast({
+					title: '请输入单元号',
+					icon: 'none',
+					mask: true
+				})
+				return
+			}
 			uni.showModal({
-				title: `您是要创建:${this.step}`,
+				title: `您是要创建:${this.addStorey}栋${this.addUnit}单元吗？`,
 				content: '新建的楼栋号需经物业或平台的核 实后才会创建成功。如核实未通过， 将会创建失败！',
 				success: function (res) {
 					if (res.confirm) {
@ -246,27 +284,88 @@ export default {
 			});
 		},
 		//选择楼栋
-		choseTower() {
+		choseTower(item) {
+			console.log('111', item);
+			this.storey = item;
 			this.step = "1"
 		},


 		//创建楼层
 		saveFloor() {
-			this.type = "0"
+			// this.type = "0"
+			let that = this;
+			if(!this.addFloor) {
+				uni.showToast({
+					title: '请输入楼层',
+					icon: 'none',
+					mask: true
+				})
+				return
+			}
+			
+			uni.showModal({
+				title: `您是要创建:${this.addFloor}层吗？`,
+				content: '新建的楼层需经物业或平台的核实后才会创建成功。如核实未通过，将会创建失败！',
+				success: function (res) {
+					if (res.confirm) {
+						console.log('用户点击确定');
+						that.type = "0"
+					} else if (res.cancel) {
+						console.log('用户点击取消');
+					}
+				}
+			});
 		},
 		//选择楼层
-		choseFloor() {
-			this.step = "2"
+		choseFloor(item) {
+			this.step = "2";
+			this.unit = item;
 		},


 		//选择房间
-		choseRoom() {
-			this.step = "3"
+		choseRoom(item) {
+			// this.step = "3"
+			console.log('1');
+			this.room = item;
+			this.selectShow = true
+		},
+
+		headerPopupSubmitClick () {
+			console.log('提交'); 
+			
+		},
+		headerCloseClick() {
+			this.selectShow = false;
+		},
+
+		addRoom1() {
+			this.type = '1'
 		},
 		saveRoom() {
-			this.type = "0"
+			// this.type = "0"
+			let that = this;
+			if(!this.addRoom) {
+				uni.showToast({
+					title: '请输入房间号',
+					icon: 'none',
+					mask: true
+				})
+				return
+			}
+			uni.showModal({
+				title: `您是要创建:${this.addRoom}房间吗？`,
+				content: '注意：新建的房间号需经物业或平台的核实后自动建立。如核实未通过，将会创建失败！',
+				success: function (res) {
+					if (res.confirm) {
+						console.log('用户点击确定');
+						that.type = "0"
+					} else if (res.cancel) {
+						console.log('用户点击取消');
+					}
+				}
+			});
 		},

 		back() {
--- a/packages/community/index/index.vue
+++ b/packages/community/index/index.vue
@ -86,6 +86,7 @@
 					</div>
 				</div>
 			</div>
+			<nav-footer />

 		</div>
 	</view>
--- a/packages/community/propertyPayment/index.css
+++ b/packages/community/propertyPayment/index.css
@ -370,4 +370,186 @@ image {
  margin-left: 49rpx;
  font-size: 32rpx;
  color: #222222;
+}
+
+
+
+.payTypeList {
+  margin-top: 20rpx;
+  background-color: #fff;
+  padding: 0 20rpx;
+}
+
+.PayTypeItem {
+  display: flex;
+  padding: 30rpx 0;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.PayTypeItem_left {
+  display: flex;
+}
+
+.PayTypeItem_img {
+  width: 50rpx;
+  height: 44rpx;
+  margin-right: 20rpx;
+}
+
+.PayTypeItem_con_tit {
+  font-size: 32rpx;
+  color: #000000;
+  font-weight: 600;
+}
+
+.PayTypeItem_con_msg {
+  font-size: 28rpx;
+  color: #000000;
+  margin-top: 10rpx;
+}
+
+.line3 {
+  height: 1rpx;
+  width: 100%;
+  background-color: #EBEBEB;
+}
+
+.boxshadowCon_subTit {
+  font-weight: bold;
+  font-size: 50rpx;
+  color: #FF370B;
+  text-align: center;
+  padding-bottom: 30rpx;
+}
+
+.boxshadowCon_subTit span {
+  font-size: 40rpx;
+}
+
+.BanlenceList {
+  padding: 0 20rpx;
+}
+
+.banlenceItem {
+  display: flex;
+  align-content: center;
+  justify-content: space-between;
+  padding: 30rpx 0;
+}
+
+.banlenceItem_left {
+  font-size: 32rpx;
+  color: #000000;
+  font-weight: 600;
+  display: flex;
+  align-items: center;
+}
+
+.banlenceItem_left image {
+  width: 50rpx;
+  height: 44rpx;
+  margin-right: 20rpx;
+}
+
+.boxshadowCon_subTit {
+  font-weight: bold;
+  font-size: 40rpx;
+  color: #FF370B;
+  display: flex;
+}
+
+.boxshadowCon_subTit span {
+  font-size: 32rpx;
+  color: #FF370B;
+}
+
+.btn {
+  width: 710rpx;
+  height: 90rpx;
+  background: linear-gradient(91deg, #FF7658 0%, #FF370B 100%);
+  border-radius: 100rpx 100rpx 100rpx 100rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 36rpx;
+  color: #FFFFFF;
+  margin: 0 auto;
+  margin-top: 25rpx;
+}
+
+.btn span {
+  font-size: 32rpx;
+}
+
+
+.payHisItem {
+  padding: 0 20rpx;
+  padding-top: 8rpx;
+  background-color: #fff;
+  margin-bottom: 20rpx;
+}
+
+.row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding-top: 20rpx;
+}
+
+.row_label {
+  font-size: 28rpx;
+  color: #999999;
+}
+
+.row_con1 {
+  font-size: 36rpx;
+  color: #222222;
+}
+
+.row_label2 {
+  font-size: 24rpx;
+  color: #999999;
+}
+
+.row_con2 {
+  font-size: 24rpx;
+  color: #999999;
+}
+
+.line4 {
+  width: 100%;
+  height: 1rpx;
+  background-color: #EBEBEB;
+  margin-top: 30rpx;
+}
+
+.row_con3 {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+}
+
+.row_con3_1 {
+  font-size: 28rpx;
+  color: #222222;
+}
+
+.row_con3_2 {
+  font-size: 24rpx;
+  color: #999999;
+  margin-top: 8rpx;
+}
+
+.row_con4 {
+  font-size: 28rpx;
+  color: #222222;
+}
+
+.Receipt {
+  font-size: 32rpx;
+  color: #222222;
+  text-align: center;
+  margin-top: 30rpx;
+  padding-bottom: 20rpx;
 }
--- a/packages/community/propertyPayment/index.vue
+++ b/packages/community/propertyPayment/index.vue
@ -15,7 +15,7 @@
 					<div class="community_right_text1">世纪名城1号楼1单元101室</div>
 					<div class="community_right_text2">衡水市上海公馆6A</div>
 				</div>
-				<div class="community_right_more" >
+				<div class="community_right_more">
 					<u-icon bold color="#999999" size="30" name="arrow-right" @click="back"></u-icon>
 				</div>
 			</div>
@ -27,7 +27,7 @@
 			<div class="tabItem" :class="active == 1 ? 'active' : ''" @click="changeTab(1)">缴费记录</div>
 		</div>

-		<div class="homeMoney">
+		<div class="homeMoney" v-if="active == 0">
 			<div class="homeMoney_box">
 				<div class="homeMoney_box_left">
 					<div class="homeMoney_box_left1">物业公积金</div>
@ -45,8 +45,8 @@
 			</div>
 		</div>

-		<div class="payList">
-			<div class="payItem" v-for="item in 3">
+		<div class="payList" v-if="active == 0">
+			<div class="payItem" v-for="item in 1">
 				<div class="payItem_tit">
 					<div class="payItem_left">
 						<checkbox value="1"></checkbox>
@ -63,7 +63,7 @@
 						</div>
 					</div>
 				</div>
-				<div class="payItem_List" v-for="item in 3">
+				<div class="payItem_List" v-for="item in 0">
 					<checkbox value="1"></checkbox>
 					<div class="Item_time">2025年</div>
 					<div class="Item_type">车位管理费</div>
@ -73,7 +73,42 @@
 			</div>
 		</div>

-		<div class="bottom">
+		<!-- 选择支付类型 -->
+		<div class="payTypeList" v-if="active == 0">
+			<div class="PayTypeItem">
+				<div class="PayTypeItem_left">
+					<div class="PayTypeItem_img">
+						<image mode="aspectFill" src="http://192.168.0.172:5500/com_wechat.png" alt="" />
+					</div>
+					<div class="PayTypeItem_con">
+						<div class="PayTypeItem_con_tit">微信支付</div>
+						<div class="PayTypeItem_con_msg">单笔支付限额：￥10000.00</div>
+					</div>
+				</div>
+
+				<div class="PayTypeItem_right">
+					<radio></radio>
+				</div>
+			</div>
+			<div class="line3"></div>
+			<div class="PayTypeItem">
+				<div class="PayTypeItem_left">
+					<div class="PayTypeItem_img">
+						<image mode="aspectFill" src="http://192.168.0.172:5500/com_homeMoney.png" alt="" />
+					</div>
+					<div class="PayTypeItem_con">
+						<div class="PayTypeItem_con_tit">物业公积金支付</div>
+						<div class="PayTypeItem_con_msg">单笔支付限额：￥10000.00</div>
+					</div>
+				</div>
+
+				<div class="PayTypeItem_right">
+					<radio></radio>
+				</div>
+			</div>
+		</div>
+
+		<div class="bottom" v-if="active == 0">
 			<div class="bottom_left">
 				<span>合计</span>
 				<p>￥</p>
@ -84,6 +119,47 @@
 			</div>
 		</div>

+
+		<div class="payHisList" v-if="active == 1">
+			<div class="payHisItem" v-for="item in 3">
+				<div class="row">
+					<div class="row_label">缴费金额</div>
+					<div class="row_con1">￥53.1</div>
+				</div>
+				<div class="row">
+					<div class="row_label2">刚刚</div>
+					<div class="row_con2">2025-06-06 18:10支付</div>
+				</div>
+				<div class="line4"></div>
+				<div class="row">
+					<div class="row_label">绑定房源</div>
+					<div class="row_con3">
+						<div class="row_con3_1">6个账单</div>
+						<div class="row_con3_2">明细可从收据查看</div>
+					</div>
+				</div>
+
+				<div class="row">
+					<div class="row_label">应缴费金额</div>
+					<div class="row_con4">￥4704.00</div>
+				</div>
+
+				<div class="row">
+					<div class="row_label">物业费公积金抵扣金额</div>
+					<div class="row_con4">-￥4704.00</div>
+				</div>
+
+				<div class="row">
+					<div class="row_label">缴费单号</div>
+					<div class="row_con4">25061700200003 </div>
+				</div>
+				<div class="line4"></div>
+				<div class="Receipt">收据</div>
+
+			</div>
+		</div>
+
+
 		<div class="boxshadow" v-if="show" @click="changeShow">
 			<div class="boxshadowCon">
 				<div class="boxshadowCon_Tit">
@ -102,6 +178,47 @@
 			</div>
 		</div>

+		<div class="boxshadow" v-if="show2" @click="changeShow2">
+			<div class="boxshadowCon">
+				<div class="boxshadowCon_Tit">
+					付款总金额
+					<div class="cancel">取消</div>
+				</div>
+				<div class="boxshadowCon_subTit">
+					<span>￥</span>4900.00
+				</div>
+				<div class="lines"></div>
+				
+				<div class="BanlenceList">
+					<div class="banlenceItem">
+						<div class="banlenceItem_left">
+							<image mode="aspectFill" src="http://192.168.0.172:5500/com_wechat.png" alt="" />
+							微信支付
+						</div>
+						<div class="banlenceItem_right">
+							<span>￥</span>4900.00
+						</div>
+					</div>
+					<div class="line3"></div>
+					<div class="banlenceItem">
+						<div class="banlenceItem_left">
+							<image mode="aspectFill" src="http://192.168.0.172:5500/com_homeMoney.png" alt="" />
+							物业公积金支付
+						</div>
+						<div class="banlenceItem_right">
+							<span>￥</span>4900.00
+						</div>
+					</div>
+
+				</div>
+
+				<div class="btn">
+					物业公积金+微信支付 <span>￥</span>4900.00
+				</div>
+
+			</div>
+		</div>
+
 	</div>

 </template>
@ -124,8 +241,9 @@ export default {
 		return {
 			top: "",
 			localHeight: "",
-			active: 0,
-			show:false
+			active: 1,
+			show: false,
+			show2: false,
 		}
 	},
 	onLoad(options) {
@ -145,10 +263,12 @@ export default {
 				delta: 1
 			});
 		},
-		changeShow(){
+		changeShow() {
 			this.show = !this.show
 		},
-
+		changeShow2() {
+			this.show2 = !this.show
+		},
 	},


--- a/pages/index/index.css
+++ b/pages/index/index.css
@ -9,8 +9,8 @@ page {
 	background-color: #FFFFFF;
 }
 .grid_Pic {
-	width: 54rpx;
-	height: 46rpx;
+	width: 61.5rpx;
+	height: 63.14rpx;
 	margin-bottom: 20rpx;
 }

@ -75,7 +75,7 @@ page {
 	align-items: center;
 	justify-content: space-between;
 	flex-wrap: wrap;
-	padding: 0 50rpx;
+	/* padding: 0 50rpx; */
 	margin-top: 40rpx;
 }

--- a/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/kitchen/index/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/kitchen/index/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/reservation/index/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/reservation/index/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js.map
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
@ -9,8 +9,8 @@ page {
 	background-color: #FFFFFF;
 }
 .grid_Pic {
-	width: 54rpx;
-	height: 46rpx;
+	width: 61.5rpx;
+	height: 63.14rpx;
 	margin-bottom: 20rpx;
 }
 .searchBox {
@ -67,7 +67,7 @@ page {
 	align-items: center;
 	justify-content: space-between;
 	flex-wrap: wrap;
-	padding: 0 50rpx;
+	/* padding: 0 50rpx; */
 	margin-top: 40rpx;
 }
 .tabItem {
--- a/unpackage/dist/dev/mp-weixin/project.private.config.json
+++ b/unpackage/dist/dev/mp-weixin/project.private.config.json
@ -3,18 +3,35 @@
  "projectname": "uniapp-ZHSQ",
  "setting": {
    "compileHotReLoad": true
+<<<<<<< HEAD
  },
  "condition": {
    "miniprogram": {
      "list": [
        {
-          "name": "packages/community/addCommunity/index",
-          "pathName": "packages/community/addCommunity/index",
+          "name": "packages/community/chooseMsgInfo/index",
+          "pathName": "packages/community/chooseMsgInfo/index",
          "query": "",
          "scene": null,
          "launchMode": "default"
+        },
+        {
+          "name": "packages/community/applyOwer/index",
+          "pathName": "packages/community/applyOwer/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "packages/community/applyOwer/index",
+          "pathName": "packages/community/applyOwer/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
        }
      ]
    }
+=======
+>>>>>>> 032411010769ebe19325dc229905812f47da6dc3
  }
 }
Author	SHA1	Message	Date
mayubo@gmail.com	715295952e	feat: 合并master 解决冲突	2025-06-23 16:11:08 +08:00
mayubo@gmail.com	22554a26da	feat: 补充逻辑	2025-06-23 16:07:33 +08:00
qiaojiale	0324110107	部分修改	2025-06-23 16:02:11 +08:00
qiaojiale	23438da397	物业缴费-v2	2025-06-20 18:27:30 +08:00