From 3214461344aefb9249035602fa1ce3c4c9f6b9dc Mon Sep 17 00:00:00 2001
From: taiyuan <yvan.ni@yolipai.com>
Date: Fri, 6 Nov 2020 11:11:14 +0800
Subject: [PATCH] 流动资金转预存

---
 pages/user/deposit/prepaid/prepaid.wxml | 38 ++++++++++++++++++++++++++------------
 pages/user/deposit/prepaid/prepaid.wxss | 45 ++++++++++++++++++++++++++++++++++++---------
 2 files changed, 62 insertions(+), 21 deletions(-)

diff --git a/pages/user/deposit/prepaid/prepaid.wxml b/pages/user/deposit/prepaid/prepaid.wxml
index e2a6277..3c956e3 100644
--- a/pages/user/deposit/prepaid/prepaid.wxml
+++ b/pages/user/deposit/prepaid/prepaid.wxml
@@ -1,23 +1,37 @@
 <block wx:for="{{perpaid}}" wx:for-index="idx" wx:for-item="perpaid">
-	<view>
+	<view class="coupon-container">
 			<image wx:if="{{idx % 4 == 0}}" class="picture" src="{{iurl+'miniapp/images/usermoney/green.png'}}"></image>
 			<image wx:if="{{idx % 4 == 1}}" class="picture" src="{{iurl+'miniapp/images/usermoney/red.png'}}"></image>
 			<image wx:if="{{idx % 4 == 2}}" class="picture" src="{{iurl+'miniapp/images/usermoney/yellow.png'}}"></image>
 			<image wx:if="{{idx % 4 == 3}}" class="picture" src="{{iurl+'miniapp/images/usermoney/blue.png'}}"></image>
-		  <view class="wz">{{perpaid.ItemName}}</view>
-		  <view class="rim">
-		    <view class="con">充</view>
-		    <view class="qian">{{perpaid.BeginSum}}</view>
-		    <view class="q-one" wx:if="{{perpaid.ItemType==1}}">送{{perpaid.NewSum}}元</view>
-			<view class="give"  wx:if="{{perpaid.ItemType==2}}">充值送大礼 ></view>
-		  </view>
-		  <view class="bz">备注：
+		  <view class="info-container flex">
+				<view class="left">
+					<view>{{perpaid.ItemName}}</view>
+					<view class="pdv20">充{{perpaid.BeginSum}}<text>送{{perpaid.NewSum}}元</text></view>
+					<view wx:if="{{perpaid.ItemType==2}}">充值送大礼 ></view>
+				</view>
+				<view class="right">备注：
+				  <view class="">{{perpaid.ItemName}}</view>
+					<view wx:if="{{perpaid.ItemType==1}}" class="ljcz" bindtap="submit" data-name="{{perpaid.BeginSum}}"
+					    data-advance="{{perpaid.AdvanceItemId}}"data-money="{{perpaid.NewSum}}">立即充值</view>
+							
+					<view wx:if="{{perpaid.ItemType==2}}" class="ljcz" bindtap="go_detail" data-advance="{{perpaid.AdvanceItemId}}">立即充值</view>
+				</view>
+			</view>
+			
+		  <!-- <view class="rim"> -->
+		    <!-- <view class="con">充{{perpaid.BeginSum}}<text>送{{perpaid.NewSum}}元</text></view> -->
+		    <!-- <view class="qian">{{perpaid.BeginSum}}</view>
+		    <view class="q-one" wx:if="{{perpaid.ItemType==1}}">送{{perpaid.NewSum}}元</view> -->
+				<!-- <view class="give"  wx:if="{{perpaid.ItemType==2}}">充值送大礼 ></view> -->
+		  <!-- </view> -->
+		  <!-- <view class="bz">备注：
 		    <view class="yck">{{perpaid.ItemName}}</view>
-		  </view>
-		  <view wx:if="{{perpaid.ItemType==1}}" class="ljcz" bindtap="submit" data-name="{{perpaid.BeginSum}}" 
+		  </view> -->
+		  <!-- <view wx:if="{{perpaid.ItemType==1}}" class="ljcz" bindtap="submit" data-name="{{perpaid.BeginSum}}" 
 		      data-advance="{{perpaid.AdvanceItemId}}"data-money="{{perpaid.NewSum}}">立即充值</view>
 		
-		  <view wx:if="{{perpaid.ItemType==2}}" class="ljcz" bindtap="go_detail" data-advance="{{perpaid.AdvanceItemId}}">立即充值</view>	  
+		  <view wx:if="{{perpaid.ItemType==2}}" class="ljcz" bindtap="go_detail" data-advance="{{perpaid.AdvanceItemId}}">立即充值</view> -->	  
 	</view>
   
   
diff --git a/pages/user/deposit/prepaid/prepaid.wxss b/pages/user/deposit/prepaid/prepaid.wxss
index 41e20bf..d027d41 100644
--- a/pages/user/deposit/prepaid/prepaid.wxss
+++ b/pages/user/deposit/prepaid/prepaid.wxss
@@ -1,8 +1,9 @@
 /* 图片 */
 .picture{
-margin-top: 5rpx;
+/* margin-top: 5rpx; */
 width:100%;
 height:270rpx;
+display: block;
 }
 /* 预存款扣款情况 */
 .wz{
@@ -61,14 +62,15 @@ font-size:28rpx;
 }
 /* 立即充值 */
 .ljcz{
-   width: 2278rpx;
+   /* width: 2278rpx;
    height: 111rpx;
   font-size: 25rpx;
   line-height: 320%;
   color: #C4182E;
   margin-left: 463rpx;
- padding-left:66rpx;
-
+ padding-left:66rpx; */
+	padding-top: 20rpx;
+	color: red;
 }
 /* 弹出框的大边框 */
 .big-rim{
@@ -182,7 +184,7 @@ font-size:28rpx;
 
 .give {
 	position: absolute;
-	margin-top: 80rpx;
+	margin-top: 70rpx;
 	margin-left: 60rpx;
 }
 
@@ -217,15 +219,40 @@ font-size:28rpx;
 }
 
 .left {
-	background-color: skyblue;
-	flex: 1;
+	width: 464rpx;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	color: white;
 }
 
 .right {
-	border-left: 2rpx dashed white;
-	padding-left: 60rpx;
+	width: calc(100% - 464rpx);
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
 } 
 
+.coupon-container {
+	position: relative;
+	margin-bottom: 10rpx;
+	text-align: center;
+}
+
+.info-container {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	
+}
+
+.pdv20 {
+	padding-top: 20rpx;
+	padding-bottom: 20rpx;
+}
+
 
 
  
--
libgit2 0.21.4