Admin 3 rokov pred
rodič
commit
253c53fc83

+ 1 - 1
pages.json

@@ -1,7 +1,7 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
 		{
-			"path": "pages/collection/index",
+			"path": "pages/collection/sms",
 			"style": {
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh":true,

+ 1 - 8
pages/collection/detail.vue

@@ -347,21 +347,14 @@
 		width: 100%;
 		background: #ffffff;
 		z-index: 999;
+		background-image: url(https://static.caimei365.com/app/crm/image/statistic_bg2.png);
 		background-size: cover;
-
 		&.fiexd {
 			position: fixed;
 			top: 0;
 			left: 0;
-			background: #4688fa;
-			border-radius: 0 0 30rpx 30rpx;
-		}
-
-		&.first {
-			background-image: url(https://static.caimei365.com/app/crm/image/statistic_bg2.png);
 		}
 	}
-
 	.header-top {
 		width: 100%;
 		font-size: 16px;

+ 8 - 22
pages/collection/list.vue

@@ -1,8 +1,7 @@
 <template>
 	<view class="container mine clearfix">
 		<view class="tui-header-box first"
-			:style="{ height: isCmcustomClass == 'fiexd' ? CustomBar + 6 + 'px' : CustomBar + 6 + 'px' }"
-			:class="isCmcustomClass">
+			:style="{ height: CustomBar + 6 + 'px' }">
 			<view class="header-top" :style="{ paddingTop: top + 'px', lineHeight: CustomBar + 20 + 'px' }"></view>
 			<view class="header-sit">
 				<text class="iconfont icon-fanhui" @click.stop="this.$api.navigateBack(1)"></text>
@@ -40,9 +39,8 @@
 					<empty v-if="isEmpty" :typeIndex="currents" :navbarHeight="navbarHeight"></empty>
 					<!-- 列表 -->
 					<view v-else class="tui-order-content">
-						<view class="tui-order-item" v-for="(payment, payIndex) in payList" :key="payIndex"
-							@click.stop="paymentDetail(payment)">
-							<view class="list-title">
+						<view class="tui-order-item" v-for="(payment, payIndex) in payList" :key="payIndex">
+							<view class="list-title" @click.stop="paymentDetail(payment)">
 								<view class="list-title-t">
 									<view class="list-title-tip">
 										<text class="badges">{{ payment.sourceType | formatSourceType }}</text>
@@ -293,7 +291,6 @@
 				rightDrawer: false,
 				hanldOrder: '', //储存监听订单信息
 				OperationType: '', //操作类型
-				isCmcustomClass: 'left',
 				height: 64, //header高度
 				top: 0, //标题图标距离顶部距离
 				scrollH: 0, //滚动总高度
@@ -765,11 +762,6 @@
 		},
 		onPageScroll(e) {
 			//实时获取到滚动的值
-			if (e.scrollTop > 30) {
-				this.isCmcustomClass = 'fiexd'
-			} else {
-				this.isCmcustomClass = 'left'
-			}
 		},
 		onReachBottom() {
 			if (this.total > this.orderData.length) {
@@ -824,12 +816,7 @@
 		left: 0;
 		background-size: cover;
 		background-image: url(https://static.caimei365.com/app/crm/image/statistic_bg2.png);
-
-		&.fiexd {}
-
-		&.first {}
 	}
-
 	.tui-header-tabs {
 		width: 100%;
 		height: auto;
@@ -1082,14 +1069,13 @@
 		}
 
 		.list-shaore {
-			width: 50rpx;
-			height: 50rpx;
-			line-height: 50rpx;
+			width: 80rpx;
+			height: 80rpx;
+			line-height: 80rpx;
 			text-align: center;
 			position: absolute;
-			right: 18rpx;
-			top: 18rpx;
-
+			right: 0;
+			top: 0;
 			.icon-fenxiang {
 				font-size: 48rpx;
 				color: $color-system;

+ 21 - 18
pages/collection/nosms.vue

@@ -5,7 +5,10 @@
 			:style="{ height: isCmcustomClass == 'fiexd' ? CustomBar + 10 + 'px' : CustomBar + 30 + 'px' }"
 			:class="isCmcustomClass">
 			<view class="header-top" :style="{ paddingTop: top + 'px', lineHeight: CustomBar + 30 + 'px' }"></view>
-			<view class="header-sit"> <text>无短信收款</text> </view>
+			<view class="header-sit">
+				<text class="iconfont icon-fanhui" @click.stop="this.$api.navigateBack(1)"></text>
+				<text class="header-sit-text">无短信收款</text>
+			</view>
 		</view>
 		<view class="tui-header-box"
 			:style="{ height: CustomBar + 30 + 'px', backgroundImage: 'url(https://static.caimei365.com/app/crm/image/statistic_bg1.png)' }">
@@ -13,7 +16,6 @@
 		<view class="distinguish-section" :style="{ top: CustomBar + 'px', left: 0 + 'px' }">
 			<view class="distinguish-section-conten">
 				<view class="section-top">
-					<view class="title" @click.stop="this.$api.navigateBack(1)"> <text class="iconfont icon-fanhui"></text> </view>
 					<view class="button" @click="toNoSms('/pages/collection/list')"> <text
 							class="iconfont icon-wodedingdan"></text> 收款列表 </view>
 				</view>
@@ -346,18 +348,12 @@
 		width: 100%;
 		background: #ffffff;
 		z-index: 999;
+		background-image: url(https://static.caimei365.com/app/crm/image/statistic_bg2.png);
 		background-size: cover;
-
 		&.fiexd {
 			position: fixed;
 			top: 0;
 			left: 0;
-			background: #4688fa;
-			border-radius: 0 0 20rpx 20rpx;
-		}
-
-		&.first {
-			background-image: url(https://static.caimei365.com/app/crm/image/statistic_bg2.png);
 		}
 	}
 
@@ -374,17 +370,24 @@
 	}
 
 	.header-sit {
-		width: 400rpx;
+		width: 100%;
+		box-sizing: border-box;
 		height: 80rpx;
 		line-height: 80rpx;
 		box-sizing: border-box;
-		padding-left: 40rpx;
-		text-align: left;
-		font-size: $font-size-40;
+		padding: 0 24rpx;
 		color: #ffffff;
-		font-weight: 600;
-		font-family: '正楷';
-	}
+		.header-sit-text {
+			text-align: left;
+			font-size: $font-size-40;
+			font-weight: 600;
+			font-family: '正楷';
+		}
+		.icon-fanhui {
+			font-size: 42rpx;
+			margin-right: 20rpx;
+		}
+	}	
 
 	.mine {
 		width: 100%;
@@ -410,9 +413,9 @@
 
 		.section-top {
 			width: 100%;
-			height: 106rpx;
+			height: 86rpx;
 			box-sizing: border-box;
-			padding: 20rpx 0;
+			padding-bottom: 20rpx;
 
 			.title {
 				float: left;

+ 3 - 11
pages/collection/index.vue → pages/collection/sms.vue

@@ -379,21 +379,14 @@
 		width: 100%;
 		background: #FFFFFF;
 		z-index: 999;
+		background-image: url(https://static.caimei365.com/app/crm/image/statistic_bg2.png);
 		background-size: cover;
-
 		&.fiexd {
 			position: fixed;
 			top: 0;
 			left: 0;
-			background: #4688fa;
-			border-radius: 0 0 20rpx 20rpx;
-		}
-
-		&.first {
-			background-image: url(https://static.caimei365.com/app/crm/image/statistic_bg2.png);
 		}
 	}
-
 	.header-top {
 		width: 100%;
 		font-size: 16px;
@@ -442,10 +435,9 @@
 		box-shadow: 0 10rpx 14rpx 0 rgba(86, 119, 252, 0.2);
 		.section-top {
 			width: 100%;
-			height: 106rpx;
+			height: 86rpx;
 			box-sizing: border-box;
-			padding: 20rpx 0;
-
+			padding-bottom: 20rpx;
 			.title {
 				float: left;
 				line-height: 66rpx;

+ 171 - 61
pages/relation/order/detail.vue

@@ -60,11 +60,31 @@
 						<view class="list-title-b">退货退款:¥{{ payment.receiptAmount }}(原¥0.00,折扣取消¥0.00)</view>
 					</view>
 				</view>
+				<view class="section-mid supper">
+					<view class="list-title supper">
+						<view class="list-title-b">子订单号(标识):{{ payment.number }} ( {{ payment.id }} )</view>
+						<view class="list-title-b">供应商:{{ payment.userName }}</view>
+						<view class="list-title-b">订单金额:¥{{ payment.receiptAmount | NumFormat }}</view>
+					</view>	
+					<view class="list-goods">
+						<view class="list-goods-item" v-for="(product, index) in payment.productList" :key="index">
+							<view class="list-goods-image">
+								<image class="list-image" :src="product.image" mode=""></image>
+								<view class="list-tags" v-if="product.productType == 1">赠品</view>
+							</view>
+							<view class="list-goods-mains">
+								<view class="list-name">{{ product.name }}</view>
+								<view class="list-text">
+									<view class="list-text-item">单价:¥{{ product.price | NumFormat }}</view>
+									<view class="list-text-item">数量:{{ product.productNum }}</view>
+								</view>
+								<view class="list-text">合计:¥{{ product.totalPrice | NumFormat }}</view>
+							</view>
+						</view>
+					</view>
+				</view>
 			</view>
 		</view>
-		<view class="distinguish-button" :style="{paddingBottom :isIphoneX ? '68rpx' : '24rpx'}">
-			<view class="button" @click="confirmDistinguish">确认</view>
-		</view>
 		<!-- 弹窗提示 -->
 		<tui-modal :show="modal" @click="handleClick" @cancel="hideMobel" :title="contentModalTitle"
 			:content="contentModalText" :button="modalButton" color="#333" :size="32" shape="circle"
@@ -108,7 +128,73 @@
 					userName: '采美网络信息有限公司',
 					sourceType: 2,
 					state: 1,
-					isChecked: false
+					isChecked: false,
+					productList:[
+						{
+							image:'https://img.caimei365.com/group1/M00/00/38/rB-lGGGbNPCAXPlfAAbfLUx_7cE227.png',
+							name:'Skin 2 Skin Med 颜层面部皮肤注射泵 禾雅堂AI水光注射仪 含底座',
+							productType:0,
+							price:1000000,
+							productNum:1,
+							totalPrice:1000000
+						},
+						{
+							image:'https://img.caimei365.com/group1/M00/00/38/rB-lGGGbNPCAXPlfAAbfLUx_7cE227.png',
+							name:'Skin 2 Skin Med 颜层面部皮肤注射泵 禾雅堂AI水光注射仪 含底座',
+							productType:1,
+							price:1000000,
+							productNum:1,
+							totalPrice:1000000
+						},
+						{
+							image:'https://img.caimei365.com/group1/M00/00/38/rB-lGGGbNPCAXPlfAAbfLUx_7cE227.png',
+							name:'Skin 2 Skin Med 颜层面部皮肤注射泵 禾雅堂AI水光注射仪 含底座',
+							productType:0,
+							price:1000000,
+							productNum:1,
+							totalPrice:1000000
+						},
+						{
+							image:'https://img.caimei365.com/group1/M00/00/38/rB-lGGGbNPCAXPlfAAbfLUx_7cE227.png',
+							name:'Skin 2 Skin Med 颜层面部皮肤注射泵 禾雅堂AI水光注射仪 含底座',
+							productType:1,
+							price:1000000,
+							productNum:1,
+							totalPrice:1000000
+						},
+						{
+							image:'https://img.caimei365.com/group1/M00/00/38/rB-lGGGbNPCAXPlfAAbfLUx_7cE227.png',
+							name:'Skin 2 Skin Med 颜层面部皮肤注射泵 禾雅堂AI水光注射仪 含底座',
+							productType:0,
+							price:1000000,
+							productNum:1,
+							totalPrice:1000000
+						},
+						{
+							image:'https://img.caimei365.com/group1/M00/00/38/rB-lGGGbNPCAXPlfAAbfLUx_7cE227.png',
+							name:'Skin 2 Skin Med 颜层面部皮肤注射泵 禾雅堂AI水光注射仪 含底座',
+							productType:1,
+							price:1000000,
+							productNum:1,
+							totalPrice:1000000
+						},
+						{
+							image:'https://img.caimei365.com/group1/M00/00/38/rB-lGGGbNPCAXPlfAAbfLUx_7cE227.png',
+							name:'Skin 2 Skin Med 颜层面部皮肤注射泵 禾雅堂AI水光注射仪 含底座',
+							productType:0,
+							price:1000000,
+							productNum:1,
+							totalPrice:1000000
+						},
+						{
+							image:'https://img.caimei365.com/group1/M00/00/38/rB-lGGGbNPCAXPlfAAbfLUx_7cE227.png',
+							name:'Skin 2 Skin Med 颜层面部皮肤注射泵 禾雅堂AI水光注射仪 含底座',
+							productType:1,
+							price:1000000,
+							productNum:1,
+							totalPrice:1000000
+						},
+					]
 				},
 				modalButton: [{
 						text: '取消',
@@ -339,17 +425,11 @@
 		background: #ffffff;
 		z-index: 999;
 		background-size: cover;
-
+		background-image: url(https://static.caimei365.com/app/crm/image/statistic_bg2.png);
 		&.fiexd {
 			position: fixed;
 			top: 0;
 			left: 0;
-			background: #4688fa;
-			border-radius: 0 0 20rpx 20rpx;
-		}
-
-		&.first {
-			background-image: url(https://static.caimei365.com/app/crm/image/statistic_bg2.png);
 		}
 	}
 
@@ -461,11 +541,89 @@
 			height: auto;
 			display: flex;
 			flex-direction: column;
-			margin: 20rpx 0;
+			padding: 15rpx 0;
 			position: relative;
+			border-radius:0 0 20rpx 20rpx;
+			&.supper{
+				padding: 0;
+				.list-goods{
+					width: 100%;
+					height: auto;
+					margin-top: 20rpx;
+					.list-goods-item{
+						width: 100%;
+						height: 180rpx;
+						margin-bottom: 20rpx;
+						.list-goods-image{
+							width: 180rpx;
+							height: 180rpx;
+							border-radius: 8rpx;
+							float: left;
+							position: relative;
+							.list-image{
+								width: 180rpx;
+								height: 180rpx;
+								border-radius: 8rpx;
+								display: block;
+							}
+							.list-tags{
+								padding: 0 15rpx;
+								height: 40rpx;
+								text-align: center;
+								line-height: 40rpx;
+								font-size: 22rpx;
+								border-radius: 8rpx 20rpx 0 20rpx;
+								color: #FFFFFF;
+								background-color: #dd524d;
+								position: absolute;
+								top: 0;
+								left: 0;
+							}
+						}
+						.list-goods-mains{
+							width: 480rpx;
+							height: 100%;
+							float: left;
+							padding:10rpx 0;
+							padding-left: 24rpx;
+							.list-name{
+								width: 100%;
+								line-height: 40rpx;
+								font-size: $font-size-24;
+								color: #999999;
+								text-align: left;
+								text-overflow: ellipsis;
+								overflow: hidden;
+								display: -webkit-box;
+								-webkit-line-clamp: 2;
+								line-clamp: 2;
+								-webkit-box-orient: vertical;
+							}
+							.list-text{
+								width: 100%;
+								height: 40rpx;
+								float: left;
+								font-size: $font-size-24;
+								line-height: 40rpx;
+								color: #999999;
+								text-align: left;
+								.list-text-item {
+									width: 50%;
+									height: 100%;
+									float: left;
+								}
+							}
+						}
+					}
+				}
+			}
 			.list-title {
 				width: 100%;
-				height: auto;					
+				height: auto;
+				&.supper{
+					background-color: #F7F7F7;
+					padding:0 10rpx;
+				}
 				.list-title-b {
 					width: 100%;
 					height: 50rpx;
@@ -483,52 +641,4 @@
 			}
 		}
 	}
-
-	.distinguish-button {
-		width: 100%;
-		padding-top: 20rpx;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		background-color: #FFFFFF;
-		padding: 0 50rpx;
-		.button {
-			width: 100%;
-			height: 80rpx;
-			background: $btn-confirm;
-			border-radius: 40rpx;
-			text-align: center;
-			color: #ffffff;
-			line-height: 80rpx;
-			font-size: $font-size-28;
-			box-shadow: 0 10rpx 14rpx 0 rgba(86, 119, 252, 0.2);
-		}
-	}
-
-	.uni-badge--small {
-		-webkit-transform: scale(0.8);
-		-ms-transform: scale(0.8);
-		transform: scale(0.8);
-		-webkit-transform-origin: center center;
-		-ms-transform-origin: center center;
-		transform-origin: center center;
-	}
-
-	.uni-badge {
-		font-family: 'Helvetica Neue', Helvetica, sans-serif;
-		-webkit-box-sizing: border-box;
-		box-sizing: border-box;
-		font-size: 12px;
-		line-height: 1;
-		display: inline-block;
-		padding: 3px 6px;
-		color: #333;
-		border-radius: 100px;
-		background-color: #f1f1f1;
-	}
-
-	.uni-badge-error {
-		color: #fff;
-		background-color: #dd524d;
-	}
 </style>

+ 117 - 29
pages/relation/ordinary/index.vue

@@ -12,34 +12,36 @@
 			</view>
 		</view>
 		<view class="tui-header-tabs day clearfix" :style="{ top: CustomBar + 6 + 'px' }">
-			<view class="tui-header-top">
-				<view class="title"> 收款信息 </view>
-				<view class="tui-header-button">
-					<view class="button btn-error" @click.stop="btnConfirm"> 设为非订单款项 </view>
-					<view class="button btn-confirm" @click="toNoSms('/pages/collection/list')">
-						<text class="iconfont icon-wodedingdan"></text> 收款列表
+			<view v-if="!isShowHeader">
+				<view class="tui-header-top">
+					<view class="title"> 收款信息 </view>
+					<view class="tui-header-button">
+						<view class="button btn-error" @click.stop="btnConfirm"> 设为非订单款项 </view>
+						<view class="button btn-confirm" @click="toNoSms('/pages/collection/list')">
+							<text class="iconfont icon-wodedingdan"></text> 收款列表
+						</view>
 					</view>
 				</view>
-			</view>
-			<view class="tui-header-item">
-				<view class="list-title-t">
-					<view class="list-title-tip">
-						<text class="badges">{{ paymentInfo.sourceType | formatSourceType }}</text>
+				<view class="tui-header-item">
+					<view class="list-title-t">
+						<view class="list-title-tip">
+							<text class="badges">{{ paymentInfo.sourceType | formatSourceType }}</text>
+						</view>
+						<view class="list-title-num" :style="{ color: formatColor(paymentInfo.confirmType) }">{{
+							paymentInfo.confirmType | formatStateType
+						}}</view>
 					</view>
-					<view class="list-title-num" :style="{ color: formatColor(paymentInfo.confirmType) }">{{
-						paymentInfo.confirmType | formatStateType
-					}}</view>
-				</view>
-				<view class="list-title-b">
-					<view class="list-title-b-item "> 收款金额:¥{{ paymentInfo.receiptAmount | NumFormat }} </view>
-					<view class="list-title-b-item "> 收款类型:{{ paymentInfo.payType }} </view>
+					<view class="list-title-b">
+						<view class="list-title-b-item "> 收款金额:¥{{ paymentInfo.receiptAmount | NumFormat }} </view>
+						<view class="list-title-b-item "> 收款类型:{{ paymentInfo.payType }} </view>
+					</view>
+					<view class="list-title-b">收款时间:{{ paymentInfo.receiptDate }}</view>
+					<template v-if="paymentInfo.smsContent">
+						<view class="list-title-b">收款短信:</view>
+						<view class="list-title-b sms">{{ paymentInfo.smsContent }}</view>
+					</template>
+					<view class="list-icon">无人确认</view>
 				</view>
-				<view class="list-title-b">收款时间:{{ paymentInfo.receiptDate }}</view>
-				<template v-if="paymentInfo.smsContent">
-					<view class="list-title-b">收款短信:</view>
-					<view class="list-title-b sms">{{ paymentInfo.smsContent }}</view>
-				</template>
-				<view class="list-icon">无人确认</view>
 			</view>
 			<view class="tui-header-tabmain">
 				<input
@@ -342,6 +344,86 @@ export default {
 					state: 2,
 					isChecked: false
 				},
+				{
+					id: 6092,
+					number: 'W164488903271223',
+					receiptAmount: 5000, //收款金额
+					associateAmount: 5000, //关联金额
+					orderType: 2, //收款类型
+					receiptDate: '2022-02-15 10:58:25', // 收款时间
+					reviewDate: '2022-02-15 10:58:25', // 审核时间
+					smsContent:
+						'【中信银行】您尾号0897的中信卡于05月29日14:42,二代支付存入人民币99.00元,当前余额为人民币13871.67元。',
+					confirmType: 11,
+					userName: '采美网络信息有限公司',
+					sourceType: 3,
+					state: 2,
+					isChecked: false
+				},
+				{
+					id: 6092,
+					number: 'W164488903271223',
+					receiptAmount: 5000, //收款金额
+					associateAmount: 5000, //关联金额
+					orderType: 2, //收款类型
+					receiptDate: '2022-02-15 10:58:25', // 收款时间
+					reviewDate: '2022-02-15 10:58:25', // 审核时间
+					smsContent:
+						'【中信银行】您尾号0897的中信卡于05月29日14:42,二代支付存入人民币99.00元,当前余额为人民币13871.67元。',
+					confirmType: 11,
+					userName: '采美网络信息有限公司',
+					sourceType: 3,
+					state: 2,
+					isChecked: false
+				},
+				{
+					id: 6092,
+					number: 'W164488903271223',
+					receiptAmount: 5000, //收款金额
+					associateAmount: 5000, //关联金额
+					orderType: 2, //收款类型
+					receiptDate: '2022-02-15 10:58:25', // 收款时间
+					reviewDate: '2022-02-15 10:58:25', // 审核时间
+					smsContent:
+						'【中信银行】您尾号0897的中信卡于05月29日14:42,二代支付存入人民币99.00元,当前余额为人民币13871.67元。',
+					confirmType: 11,
+					userName: '采美网络信息有限公司',
+					sourceType: 3,
+					state: 2,
+					isChecked: false
+				},
+				{
+					id: 6092,
+					number: 'W164488903271223',
+					receiptAmount: 5000, //收款金额
+					associateAmount: 5000, //关联金额
+					orderType: 2, //收款类型
+					receiptDate: '2022-02-15 10:58:25', // 收款时间
+					reviewDate: '2022-02-15 10:58:25', // 审核时间
+					smsContent:
+						'【中信银行】您尾号0897的中信卡于05月29日14:42,二代支付存入人民币99.00元,当前余额为人民币13871.67元。',
+					confirmType: 11,
+					userName: '采美网络信息有限公司',
+					sourceType: 3,
+					state: 2,
+					isChecked: false
+				},
+				{
+					id: 6092,
+					number: 'W164488903271223',
+					receiptAmount: 5000, //收款金额
+					associateAmount: 5000, //关联金额
+					orderType: 2, //收款类型
+					receiptDate: '2022-02-15 10:58:25', // 收款时间
+					reviewDate: '2022-02-15 10:58:25', // 审核时间
+					smsContent:
+						'【中信银行】您尾号0897的中信卡于05月29日14:42,二代支付存入人民币99.00元,当前余额为人民币13871.67元。',
+					confirmType: 11,
+					userName: '采美网络信息有限公司',
+					sourceType: 3,
+					state: 2,
+					isChecked: false
+				},
 				{
 					id: 6092,
 					number: 'W164488903271223',
@@ -378,6 +460,7 @@ export default {
 			hanldOrder: '', //储存监听订单信息
 			OperationType: '', //操作类型
 			isCmcustomClass: 'left',
+			isShowHeader:false,
 			height: 64, //header高度
 			top: 0, //标题图标距离顶部距离
 			scrollH: 0, //滚动总高度
@@ -788,6 +871,11 @@ export default {
 		} else {
 			this.isCmcustomClass = 'left'
 		}
+		if (e.scrollTop > 180) {
+			this.isShowHeader = true
+		} else {
+			this.isShowHeader = false
+		}
 	},
 	onReachBottom() {
 		if (this.total > this.orderData.length) {
@@ -1075,20 +1163,20 @@ page {
 			height: 70rpx;
 			box-sizing: border-box;
 			padding: 0 20rpx;
-			padding-right: 100rpx;
+			padding-left: 70rpx;
 			background: #f7f7f7;
 			border-radius: 8rpx;
 		}
 		.icon-sousuo {
-			width: 100rpx;
+			width: 80rpx;
 			height: 70rpx;
 			display: block;
 			line-height: 70rpx;
 			text-align: center;
-			color: $color-system;
-			font-size: $font-size-36;
+			color: #999999;
+			font-size: $font-size-40;
 			position: absolute;
-			right: 0;
+			left: 0;
 			top: 0;
 		}
 	}

+ 36 - 28
pages/relation/refund/index.vue

@@ -12,33 +12,35 @@
 			</view>
 		</view>
 		<view class="tui-header-tabs day clearfix" :style="{ top: CustomBar + 6 + 'px' }">
-			<view class="tui-header-top">
-				<view class="title"> 收款信息 </view>
-				<view class="tui-header-button">
-					<view class="button btn-confirm" @click="toNoSms('/pages/collection/list')">
-						<text class="iconfont icon-wodedingdan"></text> 收款列表
+			<view v-if="!isShowHeader">
+				<view class="tui-header-top">
+					<view class="title"> 收款信息 </view>
+					<view class="tui-header-button">
+						<view class="button btn-confirm" @click="toNoSms('/pages/collection/list')">
+							<text class="iconfont icon-wodedingdan"></text> 收款列表
+						</view>
 					</view>
 				</view>
-			</view>
-			<view class="tui-header-item">
-				<view class="list-title-t">
-					<view class="list-title-tip">
-						<text class="badges">{{ paymentInfo.sourceType | formatSourceType }}</text>
+				<view class="tui-header-item">
+					<view class="list-title-t">
+						<view class="list-title-tip">
+							<text class="badges">{{ paymentInfo.sourceType | formatSourceType }}</text>
+						</view>
+						<view class="list-title-num" :style="{ color: formatColor(paymentInfo.confirmType) }">{{
+							paymentInfo.confirmType | formatStateType
+						}}</view>
 					</view>
-					<view class="list-title-num" :style="{ color: formatColor(paymentInfo.confirmType) }">{{
-						paymentInfo.confirmType | formatStateType
-					}}</view>
-				</view>
-				<view class="list-title-b">
-					<view class="list-title-b-item "> 收款金额:¥{{ paymentInfo.receiptAmount | NumFormat }} </view>
-					<view class="list-title-b-item "> 收款类型:{{ paymentInfo.payType }} </view>
+					<view class="list-title-b">
+						<view class="list-title-b-item "> 收款金额:¥{{ paymentInfo.receiptAmount | NumFormat }} </view>
+						<view class="list-title-b-item "> 收款类型:{{ paymentInfo.payType }} </view>
+					</view>
+					<view class="list-title-b">收款时间:{{ paymentInfo.receiptDate }}</view>
+					<template v-if="paymentInfo.smsContent">
+						<view class="list-title-b">收款短信:</view>
+						<view class="list-title-b sms">{{ paymentInfo.smsContent }}</view>
+					</template>
+					<view class="list-icon">无人确认</view>
 				</view>
-				<view class="list-title-b">收款时间:{{ paymentInfo.receiptDate }}</view>
-				<template v-if="paymentInfo.smsContent">
-					<view class="list-title-b">收款短信:</view>
-					<view class="list-title-b sms">{{ paymentInfo.smsContent }}</view>
-				</template>
-				<view class="list-icon">无人确认</view>
 			</view>
 			<view class="tui-header-tabmain">
 				<input
@@ -277,6 +279,7 @@ export default {
 			hanldOrder: '', //储存监听订单信息
 			OperationType: '', //操作类型
 			isCmcustomClass: 'left',
+			isShowHeader:false,
 			height: 64, //header高度
 			top: 0, //标题图标距离顶部距离
 			scrollH: 0, //滚动总高度
@@ -687,6 +690,11 @@ export default {
 		} else {
 			this.isCmcustomClass = 'left'
 		}
+		if (e.scrollTop > 180) {
+			this.isShowHeader = true
+		} else {
+			this.isShowHeader = false
+		}
 	},
 	onReachBottom() {
 		if (this.total > this.orderData.length) {
@@ -913,20 +921,20 @@ page {
 			height: 70rpx;
 			box-sizing: border-box;
 			padding: 0 20rpx;
-			padding-right: 100rpx;
+			padding-left: 70rpx;
 			background: #f7f7f7;
 			border-radius: 8rpx;
 		}
 		.icon-sousuo {
-			width: 100rpx;
+			width: 80rpx;
 			height: 70rpx;
 			display: block;
 			line-height: 70rpx;
 			text-align: center;
-			color: $color-system;
-			font-size: $font-size-36;
+			color: #999999;
+			font-size: $font-size-40;
 			position: absolute;
-			right: 0;
+			left: 0;
 			top: 0;
 		}
 	}

+ 37 - 30
pages/relation/return/index.vue

@@ -12,33 +12,35 @@
 			</view>
 		</view>
 		<view class="tui-header-tabs day clearfix" :style="{ top: CustomBar + 6 + 'px' }">
-			<view class="tui-header-top">
-				<view class="title"> 收款信息 </view>
-				<view class="tui-header-button">
-					<view class="button btn-confirm" @click="toNoSms('/pages/collection/list')">
-						<text class="iconfont icon-wodedingdan"></text> 收款列表
+			<view v-if="!isShowHeader">
+				<view class="tui-header-top">
+					<view class="title"> 收款信息 </view>
+					<view class="tui-header-button">
+						<view class="button btn-confirm" @click="toNoSms('/pages/collection/list')">
+							<text class="iconfont icon-wodedingdan"></text> 收款列表
+						</view>
 					</view>
 				</view>
-			</view>
-			<view class="tui-header-item">
-				<view class="list-title-t">
-					<view class="list-title-tip">
-						<text class="badges">{{ paymentInfo.sourceType | formatSourceType }}</text>
+				<view class="tui-header-item">
+					<view class="list-title-t">
+						<view class="list-title-tip">
+							<text class="badges">{{ paymentInfo.sourceType | formatSourceType }}</text>
+						</view>
+						<view class="list-title-num" :style="{ color: formatColor(paymentInfo.confirmType) }">{{
+							paymentInfo.confirmType | formatStateType
+						}}</view>
 					</view>
-					<view class="list-title-num" :style="{ color: formatColor(paymentInfo.confirmType) }">{{
-						paymentInfo.confirmType | formatStateType
-					}}</view>
-				</view>
-				<view class="list-title-b">
-					<view class="list-title-b-item "> 收款金额:¥{{ paymentInfo.receiptAmount | NumFormat }} </view>
-					<view class="list-title-b-item "> 收款类型:{{ paymentInfo.payType }} </view>
+					<view class="list-title-b">
+						<view class="list-title-b-item "> 收款金额:¥{{ paymentInfo.receiptAmount | NumFormat }} </view>
+						<view class="list-title-b-item "> 收款类型:{{ paymentInfo.payType }} </view>
+					</view>
+					<view class="list-title-b">收款时间:{{ paymentInfo.receiptDate }}</view>
+					<template v-if="paymentInfo.smsContent">
+						<view class="list-title-b">收款短信:</view>
+						<view class="list-title-b sms">{{ paymentInfo.smsContent }}</view>
+					</template>
+					<view class="list-icon">无人确认</view>
 				</view>
-				<view class="list-title-b">收款时间:{{ paymentInfo.receiptDate }}</view>
-				<template v-if="paymentInfo.smsContent">
-					<view class="list-title-b">收款短信:</view>
-					<view class="list-title-b sms">{{ paymentInfo.smsContent }}</view>
-				</template>
-				<view class="list-icon">无人确认</view>
 			</view>
 			<view class="tui-header-tabmain">
 				<input
@@ -269,6 +271,7 @@ export default {
 			hanldOrder: '', //储存监听订单信息
 			OperationType: '', //操作类型
 			isCmcustomClass: 'left',
+			isShowHeader:false,
 			height: 64, //header高度
 			top: 0, //标题图标距离顶部距离
 			scrollH: 0, //滚动总高度
@@ -679,6 +682,11 @@ export default {
 		} else {
 			this.isCmcustomClass = 'left'
 		}
+		if (e.scrollTop > 180) {
+			this.isShowHeader = true
+		} else {
+			this.isShowHeader = false
+		}
 	},
 	onReachBottom() {
 		if (this.total > this.orderData.length) {
@@ -820,7 +828,7 @@ page {
 	.tui-header-item {
 		width: 100%;
 		height: auto;
-		margin-top: 10rpx;
+		margin: 10rpx 0;
 		position: relative;
 		float: left;
 		.list-title-t {
@@ -899,26 +907,25 @@ page {
 		height: 70rpx;
 		float: left;
 		position: relative;
-		margin-top: 10rpx;
 		.input {
 			width: 100%;
 			height: 70rpx;
 			box-sizing: border-box;
 			padding: 0 20rpx;
-			padding-right: 100rpx;
+			padding-left: 70rpx;
 			background: #f7f7f7;
 			border-radius: 8rpx;
 		}
 		.icon-sousuo {
-			width: 100rpx;
+			width: 80rpx;
 			height: 70rpx;
 			display: block;
 			line-height: 70rpx;
 			text-align: center;
-			color: $color-system;
-			font-size: $font-size-36;
+			color: #999999;
+			font-size: $font-size-40;
 			position: absolute;
-			right: 0;
+			left: 0;
 			top: 0;
 		}
 	}