Merge branch 'master' of http://47.92.161.104:10080/zkx/jp-housekeep-hall

pages/billingRules/billingRules.vue

@@ -11,71 +11,75 @@
 					{{companyInfo.fullName}}
 				</view>
 			</view>
-		</view>
-		<!-- 规则 -->
-		<view class="rules">
-			<view class="tabs" v-if="false">
-				<u-tabs font-size="24" :gutter="30" :item-width="100" :list="list" :is-scroll="false" :current="current"
-					@change="change"></u-tabs>
-			</view>
-
-			<view class="content" v-for="(item,i) in queryList" :key="i">
-				<view class="name-title">
-					承租方：
-				
-				</view>
-				<view class="name">
-					{{tenantInfo.fullName}}
-
-				</view>
-				<view class="address">
-					地址：{{item.address}}
-				</view>
-				<view class="address">
-					租赁期：{{thisparseUnixTime(item.contractStartTime)}} 至 {{thisparseUnixTime(item.contractEndTime)}}
+			
+			<view class="rules">
+				<view class="tabs" v-if="false">
+					<u-tabs font-size="24" :gutter="30" :item-width="100" :list="list" :is-scroll="false" :current="current"
+						@change="change"></u-tabs>
 				</view>
-				<view class="contentRule1">
-					
-					<u-table>
-						<u-th>
-							<u-tr>
-								<u-td>名称</u-td>
-							<!-- 	<u-td>类型</u-td> -->
-								<u-td>价格</u-td>
-								<u-td>单位</u-td>
-							</u-tr>
-						</u-th>
-						<u-tr v-for="(it,j) in item.contractItemList" :key="j">
-							<u-td>{{it.name}}</u-td>
-						<!-- 	<u-td>{{it.paymentMethodN}}</u-td> -->
-							<u-td>{{it.price}}</u-td>
-							<u-td>元/{{it.unit}}</u-td>
-						</u-tr>
-					</u-table> 
-					
+			
+				<view class="content" v-for="(item,i) in queryList" :key="i">
+					<view class="name-title">
+						承租方：
 					
-				</view>
-
-
-			</view>
+					</view>
+					<view class="name">
+						{{tenantInfo.fullName}}
+			
+					</view>
+					<view class="address">
+						地址：{{item.address}}
+					</view>
+					<view class="address">
+						租赁期：{{thisparseUnixTime(item.contractStartTime)}} 至 {{thisparseUnixTime(item.contractEndTime)}}
+					</view>
+					<view class="contentRule1">
+						
+						<u-table>
+							<u-th>
+								<u-tr>
+									<u-td>名称</u-td>
+								<!-- 	<u-td>类型</u-td> -->
+									<u-td>价格</u-td>
+									<u-td>单位</u-td>
+								</u-tr>
+							</u-th>
+							<u-tr v-for="(it,j) in item.contractItemList" :key="j">
+								<u-td>{{it.name}}</u-td>
+							<!-- 	<u-td>{{it.paymentMethodN}}</u-td> -->
+								<u-td>{{it.price}}</u-td>
+								<u-td>元/{{it.unit}}</u-td>
+							</u-tr>
+						</u-table> 
+						
+						
+					</view>
+			
 			
-			<!-- 备注 -->
-			<view class="remark" v-if="false">
-				<view class="title">
-					备注说明：
 				</view>
-				<view class="value">
-					<view class="item">
-						1.居民生活用电价格含农网还贷资金2分钱、大中型水库移民后期扶持几斤0.62分钱、可再生能源店家附加0.1分钱，共2.72分钱。
+				
+				<!-- 备注 -->
+				<view class="remark" v-if="false">
+					<view class="title">
+						备注说明：
 					</view>
+					<view class="value">
+						<view class="item">
+1.计费规则仅展示租赁合同中的计算方式，最终扣费金额以账单中的实际扣费金额为准。
+
+
 
-					<view class="item">
-						2.抗灾救灾用电价格含按表列分类电价降低2分钱执行。
-						店加一句湖北省发展和改革委员委颁布的《湖北省发改委关于湖北电网2020-2022年输配电价和销售电价有关事项的通知》（鄂发改价管[2020]439号）标准执行。
+						</view>
+			
+						<view class="item">
+2.本次租约有效期：2024年2月1日至2024年7月31日
+						</view>
 					</view>
 				</view>
 			</view>
 		</view>
+		<!-- 规则 -->
+		
 
 
 	</view>
@@ -143,16 +147,13 @@ import {
 
 <style lang="scss" scoped>
 	.background {
-		background-color: rgba(61, 134, 255, 1);
-		position: relative;
-		height: 160rpx;
+		background: linear-gradient(180deg, rgba(22,119,255,1) 0%,rgba(22,119,255,0) 100%);
+		padding: 32rpx 0;
+		height: 720rpx;
 
 		.unit {
 			background-color: #fff;
-			position: absolute;
-			top: 24rpx;
-			left: 32rpx;
-			right: 32rpx;
+			margin: 0 32rpx;
 			border-radius: 8px;
 			padding: 32rpx;
 
@@ -170,7 +171,7 @@ import {
 
 	// 规则
 	.rules {
-		margin: 68rpx 32rpx 40rpx;
+		margin: 24rpx 32rpx;
 		background-color: #fff;
 		padding-bottom: 24rpx;
 		border-radius: 8px;

pages/index/index.vue

@@ -221,6 +221,7 @@
 				.title {
 					color: rgba(51, 51, 51, 1);
 					font-size: 36rpx;
+					font-weight: bold;
 				}
 
 				.infos {
@@ -241,6 +242,7 @@
 		.title {
 			font-size: 36rpx;
 			color: #333333;
+			font-weight: bold;
 		}
 
 		.grid-text {

pages/mine/mine.vue

@@ -19,7 +19,7 @@
 				</view>
 			</view>
 			<!-- 地址 -->
-			<view class="address-box" v-if="false">
+			<view class="address-box" >
 				<view class="address">
 					<view class="address-title">
 						荆鹏软件园
@@ -28,8 +28,11 @@
 						<u-icon name="map"></u-icon>荆州市沙市区江津东路附155号
 					</view>
 				</view>
-				
-				<view class="image">
+				<!-- 切换 -->
+				<view class="change">
+					切换
+				</view>
+				<view class="image" v-if="false">
 					<image class="img" src="@/assets/img/mineBackground.svg" mode=""></image>
 				</view>
 			</view>
@@ -216,6 +219,7 @@
 				.name{
 					color: rgb(16,16,16);
 					font-size: 36rpx;
+					font-weight: bold;
 				}
 				.company{
 					color: rgba(16,16,16,1);
@@ -243,7 +247,17 @@
 				}
 			}
 			
-			
+			// 切换
+			.change{
+				border: 1px solid rgba(255,255,255,1);
+				width: 128rpx;
+				height: 64rpx;
+				line-height: 64rpx;
+				border-radius: 50px;
+				color: rgba(255,255,255,1);
+				text-align: center;
+				margin-left: auto;
+			}
 			.image {
 				width: 174rpx;
 				height: 174rpx;

pages/mine/tenantInformation.vue

@@ -11,7 +11,11 @@
 					<u-icon name="map"></u-icon>荆州市沙市区江津东路附155号
 				</view>
 			</view>
-			<view class="image">
+			<!-- 切换 -->
+			<view class="change">
+				切换
+			</view>
+			<view class="image" v-if="false" >
 				<image class="img" src="@/assets/img/mineBackground.svg" mode=""></image>
 			</view>
 		</view>
@@ -142,6 +146,17 @@
 				margin-top: 8rpx;
 			}
 		}
+		// 切换
+		.change{
+			border: 1px solid rgba(255,255,255,1);
+			width: 128rpx;
+			height: 64rpx;
+			line-height: 64rpx;
+			border-radius: 50px;
+			color: rgba(255,255,255,1);
+			text-align: center;
+			margin-left: auto;
+		}
 		.image {
 			width: 174rpx;
 			height: 174rpx;

pages/recharge/accountRecharge.vue

@@ -107,7 +107,9 @@
 					<view class="symbol">
 						￥
 					</view>
-					<input class="input"  @input="ckInput" @focus="focus" type="text" v-model="otherNum" placeholder="点击输入缴费金额">
+					
+						<input class="input"  @input="ckInput" @focus="focus" type="text" v-model="otherNum" placeholder="点击输入充值金额">
+					
 				</view>
 				<!-- 支付方式 -->
 				<view class="payment-way">
@@ -137,7 +139,7 @@
 						<view class="way-item"  v-if="companyInfo.paymentMethod.indexOf('1')>-1" >
 							<view class="way-name">
 								<view class="icon">
-									<image class="img" src="@/assets/img/antOutline-alipay-circle bQiHn7m.svg" mode="">
+									<image class="img2" src="@/assets/img/antOutline-alipay-circle bQiHn7m.svg" mode="">
 									</image>
 								</view>
 								<view class="text">
@@ -154,8 +156,8 @@
 						<view class="way-item"  v-if="companyInfo.paymentMethod.indexOf('3')>-1"  >
 							<view class="way-name">
 								<view class="icon">
-									<image style="width: 40rpx;height: 40rpx; border-radius: 999px;" class="img"
-										src="@/assets/img/modalIcon.svg" mode=""></image>
+									<image   class="img3"
+										src="@/assets/img/riFill-exchange-cny-fill@1x.png" mode=""></image>
 								</view>
 								<view class="text">
 									对公转账
@@ -480,7 +482,7 @@
 			justify-content: space-between;
 			align-items: center;
 			padding: 24rpx;
-
+            border-radius: 8px;
 			.title-left {
 				display: flex;
 				align-items: center;
@@ -610,16 +612,16 @@
 				font-size: 48rpx;
 				height: 100rpx;
 				line-height: 100rpx;
-
+border-bottom: 1px solid rgba(242,242,242,1);
 				.symbol {
 					margin-right: 32rpx;
 				}
-
+               
 				.input {
 					height: 100rpx;
-					font-size: 48rpx;
-					    border-bottom: 1px solid;
-					//color: rgba(204, 204, 204, 1);
+					font-size: 40rpx;
+					 
+					 
 				}
 
 				/deep/.uni-input-placeholder {
@@ -650,12 +652,27 @@
 							display: flex;
 							align-items: center;
 							color: rgb(51, 51, 51);
-
+                            
 							.img {
 								width: 48rpx;
 								height: 48rpx;
 								vertical-align: middle;
-								margin-right: 16rpx;
+								margin-right: 16rpx;
+								margin-left: -3rpx;
+							}
+							.img2{
+								width: 40rpx;
+								height: 40rpx;
+								vertical-align: middle;
+								margin-right: 20rpx;
+							}
+							.img3{
+								background-color: #1677FF;
+								 width: 40rpx;
+								 height: 40rpx;
+								 vertical-align: middle;
+								 margin-right: 20rpx;
+								 border-radius: 999px;
 							}
 						}