修改样式

pages/referral/extractList.vue

@@ -19,7 +19,12 @@
 	 </view>
 	 <view class="linetop" v-if="type==2">
 		 <view class="name">提现金额：{{item.applyMoney}}</view>
-		 <view class="lineTIme" style="color: rgb(255,102,0);font-size: 28rpx;">{{jkstateMap[~~item.applyState]}}</view>
+		 <view class="lineTIme" :style="[
+			  item.applyState === 2 && { color: 'rgb(7, 183, 91)' },
+			  item.applyState === 0 && { color: 'rgb(255, 102, 0)' },
+			  item.applyState === 1 && { color: 'red' }
+			]"
+		>{{jkstateMap[~~item.applyState]}}</view>
 	 </view>
 	 
 	 <view class="lineCOnt" v-if="type==2">
@@ -59,7 +64,7 @@
 				userInfo:'',
 				type:0,
 				stateMap: ['待审核', '审核通过', '审核拒绝'],
-				jkstateMap: ['待审核', '审核拒绝', '审核通过'],
+				jkstateMap: ['未审核', '审核拒绝', '审核通过'],
 				outBatchNo:'',
 				packageInfo:'',
 				state:'',
@@ -280,6 +285,9 @@
 .lineContLeft{
 	display: flex;
 }
+.lineTIme{
+	font-size: 28rpx;
+}
 .name{
 	font-weight: 500;
 	color: #3C3C3C;

pages/subPack/promotion.vue

@@ -1,28 +1,31 @@
 <template>
 <view class="box">
   <view class="contBox">
-  	<view class="top ">
-		<view class="topLeft">
-			<view class="topLeftTitle">未提现返利</view>
-			<view class="topLeftNum">{{canMoney}}</view>
+  	<view class="top">
+		<view class="top-row">
+			<view class="topLeft">
+				<view class="topLeftTitle">未提现收益</view>
+				<view class="topLeftNum">{{canMoney.toFixed(2)}}</view>
+			</view>
+			<view class="topRight" @click="goRouter('promotionExtract')">提现</view>
+		</view>
+		<view class="top-row" style="border-top: solid 3rpx #FFA68A;">
+			<view class="numLine">总收益：{{sumMoney.toFixed(2)}}</view>
+			<!-- <view class="numLine">提现中：{{inMoney}}</view> -->
+			<view class="numLine">已到账：{{alreadyMoney.toFixed(2)}}</view>
 		</view>
-		<view class="topRight" @click="goRouter('promotionExtract')">提现</view>
-	</view>
-	<view class="numBox">
-		<view class="numLine">总收益：{{sumMoney}}</view>
-		<view class="numLine">提现中：{{inMoney}}</view>
-		<view class="numLine">已到账：{{alreadyMoney}}</view>
 	</view>
 	
 	
+	
 	<view class="jlLine" v-for="item in records" :key="item.id">
 		<view class="lineTop">
-			<view class="lineMs">集客活动名称</view>
-			<view class="lineNum">收益：<span class="spanNum">{{item.money}}</span></view>
+			<view class="lineMs">{{item.activityName}}</view>
+			<view class="lineNum"><span class="spanNum">{{item.money.toFixed(2)}}</span></view>
 		</view>
 		<view class="lineBottom">
 			<view class="time">{{item.createTime}}</view>
-			<view class="nickName">微信昵称:{{item.customerName}}</view>
+			<view class="nickName">{{item.customerName}}</view>
 		</view>
 	</view>
 	<!-- <view class="jlLine">
@@ -109,16 +112,13 @@
 </script>
 
 <style scoped lang="less">
-.numBox{
-	display: flex;
-	color: #666666;
-	padding: 20rpx 0 30rpx 0;
-	font-size: 26rpx;
-}
+
 .numLine{
 	padding-right: 20rpx;
-	color: black;
-	font-weight: bold;
+	color: #ffffff;
+	width: 40%;
+	padding-top: 20rpx;
+	font-size: 28rpx;
 }
 .box {
 	width: 100vw;
@@ -129,42 +129,45 @@
 	padding: 20rpx 24rpx;
 }
 .top{
-	background: rgb(255,102,0);
+	background: linear-gradient(to bottom left,#FF6C5A,#FD865F);
 	border-radius: 10rpx;
 	padding: 24rpx 20rpx;
-	display: flex;
-	justify-content: space-between;
+	.top-row{
+		display: flex;
+		justify-content: space-between;
+		font-family: fantasy;
+	}
+	
+}
+
+.numBox{
+	//color: #ffffff;
+	padding: 20rpx 0 30rpx 0;
+	font-size: 26rpx;
 }
 .fontColor{
 	color: #ffffff;
 }
 .topLeftTitle{
-	font-size: 30rpx;
-	font-family: PingFangSC-Medium, PingFang SC;
-	font-weight: 500;
+	font-size: 35rpx;
+	font-family: ;
+	font-weight: 300;
 	color: #ffffff;
 }
 .topLeftNum{
-	font-size: 40rpx;
+	font-size: 50rpx;
 	font-family: PingFangSC-Semibold, PingFang SC;
-	font-weight: 600;
+	font-weight: 300;
 	color: #ffffff;
 	padding-top: 24rpx;
 }
 .topRight{
-	// width: 138rpx;
-	// height: 64rpx;
-	//background: #EC0F0A;
-	//border-radius: 10rpx;
-	// line-height: 152rpx;
-	// padding-right: 10rpx;
-	// text-align: center;
-	// color: #FFFFFF;
-	// font-size: 28rpx;
+	
 	color: #FFFFFF;
-	padding: 70rpx 20rpx 20rpx 0;
+	padding: 70rpx 20rpx 40rpx 0;
 	
 }
+
 .jlLine{
 	margin: 15rpx 0;
 	display: flex;
@@ -177,12 +180,24 @@
 		height: 70rpx;
 		line-height: 70rpx;
 		padding: 0 50rpx 0 20rpx;
-		border-bottom: solid 3rpx #666666;
+	
 		color: #666666;
+		.lineMs{
+			font-size: 30rpx;
+			font-weight: 700;
+			color: black;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			padding-top: 10rpx;
+		}
 		.lineNum{
-			width: 228rpx;
+			width: 10%;
+			padding-top: 10rpx;
 			.spanNum{
-				color:rgb(255,102,0)
+				color:red;
+				font-weight: 700;
+				text-align: center;
 			}
 		}
 	}
@@ -193,8 +208,7 @@
 		line-height: 70rpx;
 		padding: 0 50rpx 0 20rpx;
 		.time{
-			color: black;
-			font-weight: 500;
+			color: #999999;
 		}
 		.nickName{
 			width: 228rpx;

pages/subPack/promotionExtract.vue

@@ -7,12 +7,12 @@
 		<view class="header">
 			<view class="title">提现金额</view>
 			<view class="moneyView">
-				<text class="icon"></text>
+				<text class="icon">￥</text>
 				<input type="digit" class="moneyInput" placeholder-style="color:#999999; font-size:30rpx"
-					placeholder="请输入" v-model="money"  @input="inputValue" />
+					 v-model="money"  @input="inputValue" />
 				<view class="allBtn" @click="allBtn">全部提现</view>
 			</view>
-			<view class="zongMoney">可提现金额: <span style="color: rgb(255,102,  0);padding-right: 10rpx;">￥{{canMoney}}  </span> </view>
+			<view class="zongMoney">可提现金额: <span style="padding:  0 10rpx;">{{canMoney}} 元 </span> </view>
 
 			
 		</view>
@@ -20,15 +20,16 @@
 		<view class="sureBtn" @click="sure">申请提现</view>
 
 		<view class="tishi" style="padding:20rpx 20rpx 100rpx 20rpx ; ">
-			<view class="tishi-title" style="color: rgb(255,102,  0);padding-left: 18rpx;">
+			<view class="tishi-title" style="color: #999999;padding-left: 18rpx;">
 				提现说明:
 			</view>
-			<view class="tishiLine">
+			 <rich-text class="tishiText" :nodes="description"></rich-text>
+			<!-- <view class="tishiLine">
 				<view class="tishiTxt">1.最小提现金额：<span class="tishiTxtColor">{{minCash}}</span>元</view>
 			</view>
 			<view class="tishiLine">
 				<view class="tishiTxt">2.只允许一笔提现在途</view>
-			</view>
+			</view> -->
 			<!-- <view class="tishiLine">
 				<view class="tishiTxt">1.提现冻结天数：<span class="tishiTxtColor">{{detail.explain&&detail.explain.freezeDay}}</span>天</view>
 			</view>
@@ -52,7 +53,7 @@
 		data() {
 			return {
 				okMoney: '',
-				money: '',
+				money: 0,
 				name: '',
 				account: '',
 				detail: {},
@@ -70,6 +71,8 @@
 				packageInfo:'',
 				state:'',
 				jkcashid:'',
+				maxCash:0,
+				description:'',
 			}
 		},
 		onLoad() {
@@ -94,7 +97,8 @@
 					this.sumMoney = res.data.SumMoney
 					this.minCash = res.data.MinCash
 					this.cashState = res.data.CashState
-
+					this.maxCash = res.data.MaxCash
+					this.description = res.data.description
 				})
 			},
 			inputValue(event) {
@@ -139,6 +143,14 @@
 				 	});
 				 	return;
 				 }
+				 if (this.money > this.maxCash) {
+				 	uni.showToast({
+				 		title: '提现金额最高为'+this.maxCash,
+				 		icon: 'none',
+				 		duration: 3000,
+				 	});
+				 	return;
+				 }
 				this.postData();
 			},
 			postData() {
@@ -271,6 +283,7 @@
 	}
 	.tishiLine{
 		display: flex;padding-top: 20rpx;
+		color: #999999;
 	}
 	.tishiY{
 		width: 10rpx;
@@ -281,7 +294,7 @@
 	}
 	.tishiTxt{
 		padding-left: 18rpx;
-		color: #222222;
+		color: #999999;
 	}
 .tixiancs{
 	display: flex;
@@ -295,10 +308,10 @@
 	color: #999999;
 }
 .tixiancsRight{
-	 color:rgb(255,102,  0);
+	 color:#596999;
 }
 .tishiTxtColor{
-	color: rgb(255,102,  0);
+	color: #999999;
 }
 	.header {
 		background-color: #FFFFFF;
@@ -330,7 +343,6 @@
 	.moneyInput {
 		font-size: 70rpx;
 		color: #222222;
-		font-weight: bold;
 		/* flex-grow: 1; */
 		height: 98rpx;
 		width: 100%;
@@ -338,7 +350,7 @@
 
 	.allBtn {
 		font-size: 30rpx;
-		color: rgb(255,102,  0);
+		color: #596999;
 		width: 200rpx;
 		height: 50rpx;
 		line-height: 50rpx;
@@ -347,10 +359,10 @@
 	}
 
 	.zongMoney {
-		font-size: 26rpx;
-		color: #222222;
-		border-top: solid 3rpx #999999;
-		padding-top: 15rpx;
+		font-size: 25rpx;
+		color: #999999;
+		border-top: solid 3rpx #F4F4F4;
+		padding-top: 25rpx;
 	}
 
 	.line {
@@ -390,7 +402,7 @@
 		margin: 20rpx 30rpx;
 		border-radius: 15rpx;
 		height: 74rpx;
-        background: rgb(255,102,  0);
+        background: #EB0F0A;
 		color: #FFFFFF;
 		font-size: 25rpx;
 		text-align: center;