收款工具

common/config/caimeiApi.js

@@ -185,7 +185,7 @@ const Tool = {
         }else{
             Jump_URL = '/pages/login/login-account'
         }
-        Tool.navigateTo(Jump_URL)
+        Tool.redirectTo(Jump_URL)
     },
     navigateBack:function(page){
         uni.navigateBack({

pages/collection/detail.vue

@@ -61,7 +61,7 @@
 		data() {
 			return {
 				receipt:{},
-				payDetailsId:0,
+				receiptId:0,
 				nvabarData: {
 					//顶部自定义导航
 					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
@@ -118,13 +118,13 @@
 					this.scrollH = res.windowWidth * 0.6
 				}
 			})
-			this.payDetailsId = option.id
-			this.getOrderReceiptDetail(option.id)
+			this.receiptId = option.id
+			this.getOrderReceiptShareDetail(option.id)
 		},
 		methods: {
-			getOrderReceiptDetail(id){
+			getOrderReceiptShareDetail(id){
 				// 收款详情
-				this.OrderService.orderReceiptDetail({ id : id})
+				this.OrderService.orderReceiptShareDetail({ id : id})
 					.then(response => {
 						this.receipt = response.data
 						this.skeletonShow = false
@@ -137,9 +137,9 @@
 				//订单状态文字和颜色
 				var HtmlStateText = '',
 					stateTextObject = {
-						1: '订单',
-						2: '非订单',
-						3: '返佣',
+						1: '订单款',
+						2: '非订单款',
+						3: '返佣款',
 						4: '订单款或者非订单款',
 						5: '供应商退款'
 					}
@@ -161,7 +161,7 @@
 		},
 		onPullDownRefresh() {
 			setTimeout(() => {
-				this.getOrderReceiptDetail(this.payDetailsId)
+				this.getOrderReceiptShareDetail(this.receiptId)
 				uni.stopPullDownRefresh()
 			}, 200)
 		},
@@ -174,7 +174,7 @@
 				return {
 					title: `【${receipt.receiptStatusText}(${receiptTypeText})】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
 					path: `/pages/login/login-share?id=${receipt.id}`,
-					imageUrl: 'https://static.caimei365.com/app/img/icon/icon-shareCoupon@2x.png'
+					imageUrl: 'https://static.caimei365.com/app/crm/image/icon-share@2x.jpg'
 				}
 			}
 		},

pages/collection/list.vue

@@ -576,9 +576,9 @@
 				//订单状态文字和颜色
 				var HtmlStateText = '',
 					stateTextObject = {
-						1: '订单',
-						2: '非订单',
-						3: '返佣',
+						1: '订单款',
+						2: '非订单款',
+						3: '返佣款',
 						4: '订单款或者非订单款',
 						5: '供应商退款'
 					}
@@ -615,7 +615,7 @@
 				return {
 					title: `【${receipt.receiptStatusText}(${receiptTypeText})】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
 					path: `/pages/login/login-share?id=${receipt.id}`,
-					imageUrl: 'https://static.caimei365.com/app/img/icon/icon-shareCoupon@2x.png'
+					imageUrl: 'https://static.caimei365.com/app/crm/image/icon-share@2x.jpg'
 				}
 			}
 		},

pages/collection/sms.vue

@@ -238,6 +238,7 @@ export default {
 			paymentTypeText: '普通款项', // 款项类型显示文案
 			banksTypeText: '', // 款项类型显示文案
 			params: {
+				orderFlag:null,
 				smsContent:'', // 收款短信
 				payType: null, //付款类型
 				receiptType: 1, // 收款款项类型：1订单款，2非订单款，3返佣款 4订单款或者非订单款（因财务阶段无法区分订单非订单）, 5供应商退款
@@ -317,11 +318,11 @@ export default {
 		},
 		orderReceiptReadSms() {
 			// 识别收款短信
-			this.OrderService.orderReceiptReadSms({smsContent:this.params.smsContent,openid:this.openid})
+			this.OrderService.orderReceiptReadSms({smsContent:this.params.smsContent})
 				.then(response => {
 					const data = response.data
-					this.params.openid = this.openid
 					this.params.payType = data.payType
+					this.params.orderFlag = data.orderFlag
 					this.params.receiptAmount = data.receiptAmount
 					this.params.receiptDate = data.receiptDate
 					this.handleCharge = this.params.handlingFee = data.handlingFee

pages/login/login-share.vue

@@ -3,7 +3,7 @@
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="7"></tui-skeleton>
 		<template v-else>
 			<view class="share-empty">
-				<view class="icon"><image :src="imagePath" mode="widthFix"></image></view>
+				<view class="icon"><image :src="StaticUrl + '/image/icon-noaccess@2x.png'" mode="widthFix"></image></view>
 				<view class="text">暂无权限查看</view>
 				<text v-if="isNoAuthority"
 					  class="iconfont icon-shouye1" 
@@ -25,8 +25,8 @@ export default {
 	},
 	data() {
 		return {
+			StaticUrl: this.$Static,
 			CustomBar:this.CustomBar,// 顶部导航栏高度
-			imagePath:'https://static.caimei365.com/app/img/icon/icon-noremb.png',
 			isNoAuthority:false,
 			skeletonShow:true,
 			receiptId:0,
@@ -111,6 +111,7 @@ export default {
 				})
 				.catch(err => {
 					setTimeout(()=>{
+						this.isNoAuthority = true
 						this.skeletonShow = false
 					},500)
 				})
@@ -123,6 +124,7 @@ export default {
 				})
 				.catch(err => {
 					setTimeout(()=>{
+						this.isNoAuthority = true
 						this.skeletonShow = false
 					},500)
 				})
@@ -135,6 +137,7 @@ export default {
 				})
 				.catch(err => {
 					setTimeout(()=>{
+						this.isNoAuthority = true
 						this.skeletonShow = false
 					},500)
 				})
@@ -192,8 +195,9 @@ export default {
 		width: 260rpx;
 		height: 412rpx;
 		.icon{
-			width: 260rpx;
-			height: 260rpx;
+			width: 150rpx;
+			height: 150rpx;
+			margin: 0 auto;
 			image{
 				width: 100%;
 				height: 100%;
@@ -203,7 +207,7 @@ export default {
 		.text{
 			font-size: $font-size-28;
 			line-height: 60rpx;
-			color: $color-system;
+			color: rgba(70,136,250,0.7);
 			text-align: center;
 		}
 		.icon-shouye1{

pages/relation/nonorder/detail.vue

@@ -24,9 +24,6 @@
 			<view class="distinguish-section-conten">
 				<view class="section-top">
 					<view class="title">
-						<view class="list-title-tip">
-							<text class="badges">{{ receiptInfo.receiptType | formatSourceType }}款</text>
-						</view>
 						<view class="title-text">收款信息</view>
 					</view>
 					<view class="button" @click="toNoSms('/pages/collection/list')">
@@ -34,6 +31,11 @@
 					</view>
 				</view>
 				<view class="section-top-item">
+					<view class="list-title-t">
+						<view class="list-title-tip">
+							<text class="badges">{{ receiptInfo.receiptType | formatReceiptType }}</text>
+						</view>
+					</view>
 					<view class="list-title-b">
 						<view class="list-title-b-item ">
 							收款金额：<text class="text">￥{{ receiptInfo.receiptAmount | NumFormat }}</text>
@@ -241,6 +243,23 @@ export default {
 				}
 			})
 			return stateColor
+		},
+		formatReceiptType(value) {
+			//订单状态文字和颜色
+			var HtmlStateText = '',
+				stateTextObject = {
+					1: '订单款',
+					2: '非订单款',
+					3: '返佣款',
+					4: '订单款或者非订单款',
+					5: '供应商退款'
+				}
+			Object.keys(stateTextObject).forEach(function(key) {
+				if (key == value) {
+					HtmlStateText = stateTextObject[key]
+				}
+			})
+			return HtmlStateText
 		}
 	},
 	onPageScroll(e) {
@@ -257,6 +276,19 @@ export default {
 			uni.stopPullDownRefresh()
 		}, 200)
 	},
+	onShareAppMessage(res) {
+		//分享购买优惠券
+		const receipt = this.receiptInfo
+		const receiptTypeText = this.formatReceiptType(receipt.receiptType)
+		if (res.from === 'button') {
+			// console.log('来自页面内转发按钮')
+		}
+		return {
+			title: `【${receipt.receiptStatusText}(${receiptTypeText})】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
+			path: `/pages/login/login-share?id=${receipt.id}`,
+			imageUrl: 'https://static.caimei365.com/app/crm/image/icon-share@2x.jpg'
+		}
+	},
 	onShow() {}
 }
 </script>
@@ -350,22 +382,6 @@ page {
 			float: left;
 			height: 66rpx;
 			padding: 13rpx 0;
-			.list-title-tip {
-				float: left;
-				margin-right: 15rpx;
-				.badges {
-					display: block;
-					float: left;
-					padding: 0 15rpx;
-					height: 40rpx;
-					line-height: 40rpx;
-					border-radius: 4rpx;
-					background: $btn-confirm;
-					font-size: $font-size-24;
-					text-align: center;
-					color: #ffffff;
-				}
-			}
 			.title-text {
 				float: left;
 				line-height: 40rpx;
@@ -373,6 +389,7 @@ page {
 				color: #333333;
 				text-align: left;
 				font-weight: 600;
+				font-size: $font-size-30;
 			}
 		}
 
@@ -395,6 +412,28 @@ page {
 		margin-top: 10rpx;
 		position: relative;
 		float: left;
+		.list-title-t {
+			width: 100%;
+			height: 50rpx;
+			float: left;
+			font-size: $font-size-28;
+			padding-bottom: 10rpx;
+			.list-title-tip {
+				float: left;
+				.badges {
+					display: block;
+					float: left;
+					padding: 0 15rpx;
+					height: 40rpx;
+					line-height: 40rpx;
+					border-radius: 4rpx;
+					background: $btn-confirm;
+					font-size: $font-size-24;
+					text-align: center;
+					color: #ffffff;
+				}
+			}
+		}
 		.list-title-b {
 			width: 100%;
 			height: 44rpx;

pages/relation/ordinary/detail.vue

@@ -32,9 +32,6 @@
 			<view class="distinguish-section-conten">
 				<view class="section-top">
 					<view class="title">
-						<view class="list-title-tip">
-							<text class="badges">{{ receiptInfo.receiptType | formatReceiptType }}款</text>
-						</view>
 						<view class="title-text">收款信息</view>
 					</view>
 					<view class="button" @click="toNoSms('/pages/collection/list')">
@@ -42,6 +39,11 @@
 					</view>
 				</view>
 				<view class="section-top-item">
+					<view class="list-title-t">
+						<view class="list-title-tip">
+							<text class="badges">{{ receiptInfo.receiptType | formatReceiptType }}款</text>
+						</view>
+					</view>
 					<view class="list-title-b">
 						<view class="list-title-b-item ">
 							收款金额：<text class="text">￥{{ receiptInfo.receiptAmount | NumFormat }}</text>
@@ -203,22 +205,23 @@ export default {
 			return stateColor
 		},
 		formatReceiptType(value) {
-			//订单状态文字和颜色
-			var HtmlStateText = '',
-				stateTextObject = {
-					1: '订单',
-					2: '非订单',
-					3: '返佣',
-					4: '订单款或者非订单款',
-					5: '供应商退款'
-				}
-			Object.keys(stateTextObject).forEach(function(key) {
-				if (key == value) {
-					HtmlStateText = stateTextObject[key]
-				}
-			})
-			return HtmlStateText
-		},
+				//订单状态文字和颜色
+				var HtmlStateText = '',
+					stateTextObject = {
+						1: '订单款',
+						2: '非订单款',
+						3: '返佣款',
+						4: '订单款或者非订单款',
+						5: '供应商退款'
+					}
+				Object.keys(stateTextObject).forEach(function(key) {
+					if (key == value) {
+						HtmlStateText = stateTextObject[key]
+					}
+				})
+				return HtmlStateText
+			},
+		
 	},
 	onPageScroll(e) {
 		//实时获取到滚动的值
@@ -242,9 +245,9 @@ export default {
 			// console.log('来自页面内转发按钮')
 		}
 		return {
-			title: `【${receipt.receiptStatusText}(${receiptTypeText}款)】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
+			title: `【${receipt.receiptStatusText}(${receiptTypeText})】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
 			path: `/pages/login/login-share?id=${receipt.id}`,
-			imageUrl: 'https://static.caimei365.com/app/img/icon/icon-shareCoupon@2x.png'
+			imageUrl: 'https://static.caimei365.com/app/crm/image/icon-share@2x.jpg'
 		}
 	},
 	onShow() {}
@@ -345,22 +348,6 @@ page {
 			float: left;
 			height: 66rpx;
 			padding: 13rpx 0;
-			.list-title-tip {
-				float: left;
-				margin-right: 15rpx;
-				.badges {
-					display: block;
-					float: left;
-					padding: 0 15rpx;
-					height: 40rpx;
-					line-height: 40rpx;
-					border-radius: 4rpx;
-					background: $btn-confirm;
-					font-size: $font-size-24;
-					text-align: center;
-					color: #ffffff;
-				}
-			}
 			.title-text {
 				float: left;
 				line-height: 40rpx;
@@ -368,9 +355,9 @@ page {
 				color: #333333;
 				text-align: left;
 				font-weight: 600;
+				font-size: $font-size-30;
 			}
 		}
-
 		.button {
 			float: right;
 			box-sizing: border-box;
@@ -390,6 +377,28 @@ page {
 		margin-top: 10rpx;
 		position: relative;
 		float: left;
+		.list-title-t {
+			width: 100%;
+			height: 50rpx;
+			float: left;
+			font-size: $font-size-28;
+			padding-bottom: 10rpx;
+			.list-title-tip {
+				float: left;
+				.badges {
+					display: block;
+					float: left;
+					padding: 0 15rpx;
+					height: 40rpx;
+					line-height: 40rpx;
+					border-radius: 4rpx;
+					background: $btn-confirm;
+					font-size: $font-size-24;
+					text-align: center;
+					color: #ffffff;
+				}
+			}
+		}
 		.list-title-b {
 			width: 100%;
 			height: 44rpx;

pages/relation/ordinary/examine-detail.vue

@@ -25,9 +25,6 @@
 			<view class="distinguish-section-conten">
 				<view class="section-top">
 					<view class="title">
-						<view class="list-title-tip">
-							<text class="badges">{{ receiptInfo.receiptType | formatReceiptType }}款</text>
-						</view>
 						<view class="title-text">收款信息</view>
 					</view>
 					<view class="button" @click="toNoSms('/pages/collection/list')">
@@ -36,6 +33,11 @@
 					</view>
 				</view>
 				<view class="section-top-item">
+					<view class="list-title-t">
+						<view class="list-title-tip">
+							<text class="badges">{{ receiptInfo.receiptType | formatReceiptType }}款</text>
+						</view>
+					</view>
 					<view class="list-title-b">
 						<view class="list-title-b-item "> 
 							收款金额：<text class="text">￥{{ receiptInfo.receiptAmount | NumFormat }} </text>
@@ -291,22 +293,23 @@
 				return stateColor
 			},
 			formatReceiptType(value) {
-				//订单状态文字和颜色
-				var HtmlStateText = '',
-					stateTextObject = {
-						1: '订单',
-						2: '非订单',
-						3: '返佣',
-						4: '订单款或者非订单款',
-						5: '供应商退款'
-					}
-				Object.keys(stateTextObject).forEach(function(key) {
-					if (key == value) {
-						HtmlStateText = stateTextObject[key]
-					}
-				})
-				return HtmlStateText
-			},
+					//订单状态文字和颜色
+					var HtmlStateText = '',
+						stateTextObject = {
+							1: '订单款',
+							2: '非订单款',
+							3: '返佣款',
+							4: '订单款或者非订单款',
+							5: '供应商退款'
+						}
+					Object.keys(stateTextObject).forEach(function(key) {
+						if (key == value) {
+							HtmlStateText = stateTextObject[key]
+						}
+					})
+					return HtmlStateText
+				},
+			
 		},
 		onPageScroll(e) {
 			//实时获取到滚动的值
@@ -330,9 +333,9 @@
 				// console.log('来自页面内转发按钮')
 			}
 			return {
-				title: `【${receipt.receiptStatusText}(${receiptTypeText}款)】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
+				title: `【${receipt.receiptStatusText}(${receiptTypeText})】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
 				path: `/pages/login/login-share?id=${receipt.id}`,
-				imageUrl: 'https://static.caimei365.com/app/img/icon/icon-shareCoupon@2x.png'
+				imageUrl: 'https://static.caimei365.com/app/crm/image/icon-share@2x.jpg'
 			}
 		},
 		onShow() {
@@ -428,22 +431,6 @@
 				float: left;
 				height: 66rpx;
 				padding: 13rpx 0;
-				.list-title-tip {
-					float: left;
-					margin-right: 15rpx;
-					.badges {
-						display: block;
-						float: left;
-						padding: 0 15rpx;
-						height: 40rpx;
-						line-height: 40rpx;
-						border-radius: 4rpx;
-						background: $btn-confirm;
-						font-size: $font-size-24;
-						text-align: center;
-						color: #ffffff;
-					}
-				}
 				.title-text{
 					float: left;
 					line-height: 40rpx;
@@ -451,6 +438,7 @@
 					color: #333333;
 					text-align: left;
 					font-weight: 600;
+					font-size: $font-size-30;
 				}
 			}
 
@@ -473,6 +461,28 @@
 			margin-top: 10rpx;
 			position: relative;
 			float: left;
+			.list-title-t {
+				width: 100%;
+				height: 50rpx;
+				float: left;
+				font-size: $font-size-28;
+				padding-bottom: 10rpx;
+				.list-title-tip {
+					float: left;
+					.badges {
+						display: block;
+						float: left;
+						padding: 0 15rpx;
+						height: 40rpx;
+						line-height: 40rpx;
+						border-radius: 4rpx;
+						background: $btn-confirm;
+						font-size: $font-size-24;
+						text-align: center;
+						color: #ffffff;
+					}
+				}
+			}
 			.list-title-b {
 				width: 100%;
 				height: 44rpx;

pages/relation/ordinary/index.vue

@@ -769,9 +769,9 @@ export default {
 			//订单状态文字和颜色
 			var HtmlStateText = '',
 				stateTextObject = {
-					1: '订单',
-					2: '非订单',
-					3: '返佣',
+					1: '订单款',
+					2: '非订单款',
+					3: '返佣款',
 					4: '订单款或者非订单款',
 					5: '供应商退款'
 				}
@@ -781,7 +781,8 @@ export default {
 				}
 			})
 			return HtmlStateText
-		}
+		},
+		
 	},
 	onPageScroll(e) {
 		//实时获取到滚动的值
@@ -817,9 +818,9 @@ export default {
 			// console.log('来自页面内转发按钮')
 		}
 		return {
-			title: `【${receipt.receiptStatusText}(${receiptTypeText}款)】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
+			title: `【${receipt.receiptStatusText}(${receiptTypeText})】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
 			path: `/pages/login/login-share?id=${receipt.id}`,
-			imageUrl: 'https://static.caimei365.com/app/img/icon/icon-shareCoupon@2x.png'
+			imageUrl: 'https://static.caimei365.com/app/crm/image/icon-share@2x.jpg'
 		}
 	},
 	onShow() {

pages/relation/refund/detail.vue

@@ -25,9 +25,6 @@
 			<view class="distinguish-section-conten">
 				<view class="section-top">
 					<view class="title">
-						<view class="list-title-tip">
-							<text class="badges">{{ receiptInfo.receiptType | formatReceiptType }}</text>
-						</view>
 						<view class="title-text">收款信息</view>
 					</view>
 					<view class="button" @click="toNoSms('/pages/collection/list')">
@@ -36,6 +33,11 @@
 					</view>
 				</view>
 				<view class="section-top-item">
+					<view class="list-title-t">
+						<view class="list-title-tip">
+							<text class="badges">{{ receiptInfo.receiptType | formatReceiptType }}</text>
+						</view>
+					</view>
 					<view class="list-title-b">
 						<view class="list-title-b-item ">
 							收款金额：<text class="text">￥{{ receiptInfo.receiptAmount | NumFormat }}</text>
@@ -243,9 +245,9 @@
 				//订单状态文字和颜色
 				var HtmlStateText = '',
 					stateTextObject = {
-						1: '订单',
-						2: '非订单',
-						3: '返佣',
+						1: '订单款',
+						2: '非订单款',
+						3: '返佣款',
 						4: '订单款或者非订单款',
 						5: '供应商退款'
 					}
@@ -279,9 +281,9 @@
 				// console.log('来自页面内转发按钮')
 			}
 			return {
-				title: `【${receipt.receiptStatusText}(${receiptTypeText}款)】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
+				title: `【${receipt.receiptStatusText}(${receiptTypeText})】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
 				path: `/pages/login/login-share?id=${receipt.id}`,
-				imageUrl: 'https://static.caimei365.com/app/img/icon/icon-shareCoupon@2x.png'
+				imageUrl: 'https://static.caimei365.com/app/crm/image/icon-share@2x.jpg'
 			}
 		},
 		onShow() {
@@ -384,22 +386,6 @@
 				float: left;
 				height: 66rpx;
 				padding: 13rpx 0;
-				.list-title-tip {
-					float: left;
-					margin-right: 15rpx;
-					.badges {
-						display: block;
-						float: left;
-						padding: 0 15rpx;
-						height: 40rpx;
-						line-height: 40rpx;
-						border-radius: 4rpx;
-						background: $btn-confirm;
-						font-size: $font-size-24;
-						text-align: center;
-						color: #ffffff;
-					}
-				}
 				.title-text{
 					float: left;
 					line-height: 40rpx;
@@ -407,6 +393,7 @@
 					color: #333333;
 					text-align: left;
 					font-weight: 600;
+					font-size: $font-size-30;
 				}
 			}
 
@@ -429,6 +416,28 @@
 			margin-top: 10rpx;
 			position: relative;
 			float: left;
+			.list-title-t {
+				width: 100%;
+				height: 50rpx;
+				float: left;
+				font-size: $font-size-28;
+				padding-bottom: 10rpx;
+				.list-title-tip {
+					float: left;
+					.badges {
+						display: block;
+						float: left;
+						padding: 0 15rpx;
+						height: 40rpx;
+						line-height: 40rpx;
+						border-radius: 4rpx;
+						background: $btn-confirm;
+						font-size: $font-size-24;
+						text-align: center;
+						color: #ffffff;
+					}
+				}
+			}
 			.list-title-b {
 				width: 100%;
 				height: 44rpx;

pages/relation/refund/index.vue

@@ -422,9 +422,9 @@ export default {
 			//订单状态文字和颜色
 			var HtmlStateText = '',
 				stateTextObject = {
-					1: '订单',
-					2: '非订单',
-					3: '返佣',
+					1: '订单款',
+					2: '非订单款',
+					3: '返佣款',
 					4: '订单款或者非订单款',
 					5: '供应商退款'
 				}
@@ -470,9 +470,9 @@ export default {
 			// console.log('来自页面内转发按钮')
 		}
 		return {
-			title: `【${receipt.receiptStatusText}(${receiptTypeText}款)】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
+			title: `【${receipt.receiptStatusText}(${receiptTypeText})】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
 			path: `/pages/login/login-share?id=${receipt.id}`,
-			imageUrl: 'https://static.caimei365.com/app/img/icon/icon-shareCoupon@2x.png'
+			imageUrl: 'https://static.caimei365.com/app/crm/image/icon-share@2x.jpg'
 		}
 	},
 	onShow() {

pages/relation/return/detail.vue

@@ -26,9 +26,6 @@
 			<view class="distinguish-section-conten">
 				<view class="section-top">
 					<view class="title">
-						<view class="list-title-tip">
-							<text class="badges">{{ receiptInfo.receiptType | formatReceiptType }}款</text>
-						</view>
 						<view class="title-text">收款信息</view>
 					</view>
 					<view class="button" @click="toNoSms('/pages/collection/list')">
@@ -37,6 +34,11 @@
 					</view>
 				</view>
 				<view class="section-top-item">
+					<view class="list-title-t">
+						<view class="list-title-tip">
+							<text class="badges">{{ receiptInfo.receiptType | formatReceiptType }}款</text>
+						</view>
+					</view>
 					<view class="list-title-b">
 						<view class="list-title-b-item ">
 							收款金额：<text class="text">￥{{ receiptInfo.receiptAmount | NumFormat }}</text>
@@ -238,9 +240,9 @@
 				//订单状态文字和颜色
 				var HtmlStateText = '',
 					stateTextObject = {
-						1: '订单',
-						2: '非订单',
-						3: '返佣',
+						1: '订单款',
+						2: '非订单款',
+						3: '返佣款',
 						4: '订单款或者非订单款',
 						5: '供应商退款'
 					}
@@ -274,9 +276,9 @@
 				// console.log('来自页面内转发按钮')
 			}
 			return {
-				title: `【${receipt.receiptStatusText}(${receiptTypeText}款)】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
+				title: `【${receipt.receiptStatusText}(${receiptTypeText})】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
 				path: `/pages/login/login-share?id=${receipt.id}`,
-				imageUrl: 'https://static.caimei365.com/app/img/icon/icon-shareCoupon@2x.png'
+				imageUrl: 'https://static.caimei365.com/app/crm/image/icon-share@2x.jpg'
 			}
 		},
 		onShow() {
@@ -379,22 +381,6 @@
 				float: left;
 				height: 66rpx;
 				padding: 13rpx 0;
-				.list-title-tip {
-					float: left;
-					margin-right: 15rpx;
-					.badges {
-						display: block;
-						float: left;
-						padding: 0 15rpx;
-						height: 40rpx;
-						line-height: 40rpx;
-						border-radius: 4rpx;
-						background: $btn-confirm;
-						font-size: $font-size-24;
-						text-align: center;
-						color: #ffffff;
-					}
-				}
 				.title-text{
 					float: left;
 					line-height: 40rpx;
@@ -402,9 +388,9 @@
 					color: #333333;
 					text-align: left;
 					font-weight: 600;
+					font-size: $font-size-30;
 				}
 			}
-
 			.button {
 				float: right;
 				box-sizing: border-box;
@@ -424,6 +410,28 @@
 			margin-top: 10rpx;
 			position: relative;
 			float: left;
+			.list-title-t {
+				width: 100%;
+				height: 50rpx;
+				float: left;
+				font-size: $font-size-28;
+				padding-bottom: 10rpx;
+				.list-title-tip {
+					float: left;
+					.badges {
+						display: block;
+						float: left;
+						padding: 0 15rpx;
+						height: 40rpx;
+						line-height: 40rpx;
+						border-radius: 4rpx;
+						background: $btn-confirm;
+						font-size: $font-size-24;
+						text-align: center;
+						color: #ffffff;
+					}
+				}
+			}
 			.list-title-b {
 				width: 100%;
 				height: 44rpx;

pages/relation/return/index.vue

@@ -452,9 +452,9 @@ export default {
 			//订单状态文字和颜色
 			var HtmlStateText = '',
 				stateTextObject = {
-					1: '订单',
-					2: '非订单',
-					3: '返佣',
+					1: '订单款',
+					2: '非订单款',
+					3: '返佣款',
 					4: '订单款或者非订单款',
 					5: '供应商退款'
 				}
@@ -464,7 +464,7 @@ export default {
 				}
 			})
 			return HtmlStateText
-		}
+		},
 	},
 	onPageScroll(e) {
 		//实时获取到滚动的值
@@ -500,9 +500,9 @@ export default {
 			// console.log('来自页面内转发按钮')
 		}
 		return {
-			title: `【${receipt.receiptStatusText}(${receiptTypeText}款)】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
+			title: `【${receipt.receiptStatusText}(${receiptTypeText})】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
 			path: `/pages/login/login-share?id=${receipt.id}`,
-			imageUrl: 'https://static.caimei365.com/app/img/icon/icon-shareCoupon@2x.png'
+			imageUrl: 'https://static.caimei365.com/app/crm/image/icon-share@2x.jpg'
 		}
 	},
 	onShow() {}

pages/relation/return/list.vue

@@ -424,7 +424,7 @@ export default {
 			return {
 				title: `【待确认】收款金额${payment.receiptAmount.toFixed(2)}元,收款时间:${payment.receiptDate}`,
 				path: `pages/seller/cart/coupon-share?payment=${payment.id}`,
-				imageUrl: 'https://static.caimei365.com/app/img/icon/icon-shareCoupon@2x.png'
+				imageUrl: 'https://static.caimei365.com/app/crm/image/icon-share@2x.jpg'
 			}
 		}
 	},

services/order.service.js

@@ -107,6 +107,17 @@ export default class OrderService {
             isLoading: false ,
         })
     }
+    /**
+	 *获取收款详情分享
+	 * @param id 款项Id
+	/**/
+    orderReceiptShareDetail(data = {}) {
+        return this.AjaxService.get({ 
+            url:'/order/receipt/detail/share', 
+            data, 
+            isLoading: false ,
+        })
+    }
     /**
 	 *操作收款信息（作废，设为返佣-普通-供应商退款-非订单款）
 	 * @param id 款项Id