收款工具

common/config/caimeiApi.js

@@ -160,25 +160,32 @@ const Tool = {
             })
         })
     },
-    navToListPage:function({type,value,id,lType} = {}){	
-        // 跳转到列表页
-        if(lType=='4'){
-            const pages = getCurrentPages()
-            const prevPage = pages[pages.length-2]
-            prevPage.refresh = true
-            prevPage.listData = {
-                type: type,
-                from: value,
-                id: id
-            }
-            uni.navigateBack({
-                delta: 1
+    navigateLinkJump:function(){// 统一处理根据用户类型跳转
+        const UserInfo = uni.getStorageSync('userInfo')
+        let Jump_URL = ''	
+        let UserTypeObj = {
+            1: '/pages/collection/list',
+            2: '/pages/collection/list',
+            3: '/pages/collection/sms',
+            4: '/pages/collection/sms',
+        }
+        if(UserInfo){
+            /**
+			 * 用户类型(userType) 1协销人员,2客服,3财务,4超级管理员
+			 * 1. 协销人员跳转到收款列表页面
+			 * 2. 客服跳转到收款列表页面
+			 * 3. 财务人员跳转到款项识别页面
+			 * 4. 超级管理员跳转到款项识别页面
+			 * */
+            Object.keys(UserTypeObj).forEach(function(key) {
+			    if (key == UserInfo.userType) {
+			        Jump_URL = UserTypeObj[key]
+			    }
             })
         }else{
-            uni.navigateTo({
-                url:`/pages/goods/goods?type=${type}&from=${value}&id=${id}`
-            })
+            Jump_URL = '/pages/login/login-account'
         }
+        Tool.navigateTo(Jump_URL)
     },
     navigateBack:function(page){
         uni.navigateBack({
@@ -327,5 +334,6 @@ module.exports = {
     getStorageAddressKey: Tool.getStorageAddressKey,
     regexSets: Tool.regexSets,
     timestampToTime: Tool.timestampToTime,
-    getNowFormatDate : Tool.getNowFormatDate 
+    getNowFormatDate : Tool.getNowFormatDate ,
+    navigateLinkJump: Tool.navigateLinkJump
 }

common/css/iconfont.scss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3182369 */
-  src: url('//at.alicdn.com/t/font_3182369_6m0y1etdt0p.woff2?t=1645257667824') format('woff2'),
-       url('//at.alicdn.com/t/font_3182369_6m0y1etdt0p.woff?t=1645257667824') format('woff'),
-       url('//at.alicdn.com/t/font_3182369_6m0y1etdt0p.ttf?t=1645257667824') format('truetype');
+  src: url('//at.alicdn.com/t/font_3182369_zhs0juivxw.woff2?t=1646290264992') format('woff2'),
+       url('//at.alicdn.com/t/font_3182369_zhs0juivxw.woff?t=1646290264992') format('woff'),
+       url('//at.alicdn.com/t/font_3182369_zhs0juivxw.ttf?t=1646290264992') format('truetype');
 }
 
 .iconfont {
@@ -13,16 +13,16 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-fenxiang3:before {
-  content: "\e65c";
+.icon-shouye21:before {
+  content: "\e6a8";
 }
 
-.icon-fenxiang4:before {
+.icon-shouye1:before {
   content: "\e61b";
 }
 
-.icon-fenxiang6:before {
-  content: "\e634";
+.icon-shouye2:before {
+  content: "\e61d";
 }
 
 .icon-fenxiang5:before {

common/json/data.json

@@ -1,75 +0,0 @@
-
-{
-	"list": [
-		{
-			"img":"https://g-search1.alicdn.com/img/bao/uploaded/i4/imgextra/i2/28908059/O1CN01shhO6Q29P4ULkmU4B_!!0-saturn_solar.jpg_250x250.jpg",
-			"name":"欧莱雅（LOREAL）奇焕光彩粉嫩透亮修颜霜 30ml（欧莱雅彩妆 BB霜 粉BB 遮瑕疵 隔离）",
-			"sale": 599,
-			"factory": 899,
-			"payNum": 2342
-		},
-		{
-			"img": "https://img.alicdn.com/imgextra/i3/504120084/O1CN01goXddL1CUVrUeMmdQ_!!0-saturn_solar.jpg_270x270.jpg",
-			"name": "德国DMK进口牛奶  欧德堡（Oldenburger）超高温处理全脂纯牛奶1L*12盒",
-			"sale": 29,
-			"factory": 69,
-			"payNum": 999
-		},
-		{
-			"img": "https://img.alicdn.com/bao/uploaded/i4/2958545741/O1CN01Lpo7661sHQP2d0G5f_!!0-item_pic.jpg",
-			"name": "【第2支1元】柔色尽情丝柔口红唇膏女士不易掉色保湿滋润防水 珊瑚红",
-			"sale": 299,
-			"factory": 699,
-			"payNum": 666
-		},
-		{
-			"img": "https://img.alicdn.com/bao/uploaded/i4/727249233/O1CN01yVULAv2I4lTJt8Jem_!!0-item_pic.jpg",
-			"name": "百雀羚套装女补水保湿护肤品",
-			"sale": 1599,
-			"factory": 2899,
-			"payNum": 236
-		},
-		{
-			"img": "https://img.alicdn.com/imgextra/i1/120950431/O1CN01W19nNO1F3RJ3F0au6_!!0-saturn_solar.jpg_270x270.jpg",
-			"name": "百草味 肉干肉脯 休闲零食 靖江精制猪肉脯200g/袋",
-			"sale": 599,
-			"factory": 899,
-			"payNum": 2399
-		},
-		{
-			"img": "https://img.alicdn.com/imgextra/i3/117024408/O1CN01LJn9Fv1iQuSHHSF4G_!!0-saturn_solar.jpg_270x270.jpg",
-			"name": "短袖睡衣女夏季薄款休闲家居服短裤套装女可爱韩版清新学生两件套 短袖粉色长颈鹿 M码75-95斤",
-			"sale": 599,
-			"factory": 899,
-			"payNum": 2399
-		},
-		{
-			"img": "https://img.alicdn.com/imgextra/i2/1164620054/O1CN01gOZkNF1CGlzSQHjzQ_!!0-saturn_solar.jpg_270x270.jpg",
-			"name": "欧莱雅（LOREAL）奇焕光彩粉嫩透亮修颜霜",
-			"sale": 599,
-			"factory": 899,
-			"payNum": 2342
-		},
-		{
-			"img": "https://img.alicdn.com/imgextra/i4/28267890/O1CN01Mgevid289fYlszG56_!!0-saturn_solar.jpg_270x270.jpg",
-			"name": "德国DMK进口牛奶",
-			"sale": 29,
-			"factory": 69,
-			"payNum": 999
-		},
-		{
-			"img": "https://img.alicdn.com/imgextra/i3/504120084/O1CN01vX4XF01CUVrZNpZDX_!!0-saturn_solar.jpg_270x270.jpg",
-			"name": "【第2支1元】柔色尽情丝柔口红唇膏女士不易掉色保湿滋润防水 珊瑚红",
-			"sale": 299,
-			"factory": 699,
-			"payNum": 666
-		},
-		{
-			"img": "https://img.alicdn.com/imgextra/i2/747370085/O1CN01sT5Nvm1CUyGQRiTp2_!!0-saturn_solar.jpg_250x250.jpg",
-			"name": "百雀羚套装女补水保湿护肤品",
-			"sale": 1599,
-			"factory": 2899,
-			"payNum": 236
-		}
-	]
-}

common/json/data.json.js

@@ -1,76 +0,0 @@
-const waterFillList = [
-			{
-				img: 'https://g-search1.alicdn.com/img/bao/uploaded/i4/imgextra/i2/28908059/O1CN01shhO6Q29P4ULkmU4B_!!0-saturn_solar.jpg_250x250.jpg',
-				name: "欧莱雅（LOREAL）奇焕光彩粉嫩透亮修颜霜 30ml（欧莱雅彩妆 BB霜 粉BB 遮瑕疵 隔离）",
-				sale: 599,
-				factory: 899,
-				payNum: 2342
-			},
-			{
-				img: 'https://img.alicdn.com/imgextra/i3/504120084/O1CN01goXddL1CUVrUeMmdQ_!!0-saturn_solar.jpg_270x270.jpg',
-				name: "德国DMK进口牛奶  欧德堡（Oldenburger）超高温处理全脂纯牛奶1L*12盒",
-				sale: 29,
-				factory: 69,
-				payNum: 999
-			},
-			{
-				img: 'https://img.alicdn.com/bao/uploaded/i4/2958545741/O1CN01Lpo7661sHQP2d0G5f_!!0-item_pic.jpg',
-				name: "【第2支1元】柔色尽情丝柔口红唇膏女士不易掉色保湿滋润防水 珊瑚红",
-				sale: 299,
-				factory: 699,
-				payNum: 666
-			},
-			{
-				img: 'https://img.alicdn.com/bao/uploaded/i4/727249233/O1CN01yVULAv2I4lTJt8Jem_!!0-item_pic.jpg',
-				name: "百雀羚套装女补水保湿护肤品",
-				sale: 1599,
-				factory: 2899,
-				payNum: 236
-			},
-			{
-				img: 'https://img.alicdn.com/imgextra/i1/120950431/O1CN01W19nNO1F3RJ3F0au6_!!0-saturn_solar.jpg_270x270.jpg',
-				name: "百草味 肉干肉脯 休闲零食 靖江精制猪肉脯200g/袋",
-				sale: 599,
-				factory: 899,
-				payNum: 2399
-			},
-			{
-				img: 'https://img.alicdn.com/imgextra/i3/117024408/O1CN01LJn9Fv1iQuSHHSF4G_!!0-saturn_solar.jpg_270x270.jpg',
-				name: "短袖睡衣女夏季薄款休闲家居服短裤套装女可爱韩版清新学生两件套 短袖粉色长颈鹿 M码75-95斤",
-				sale: 599,
-				factory: 899,
-				payNum: 2399
-			},
-			{
-				img: 'https://img.alicdn.com/imgextra/i2/1164620054/O1CN01gOZkNF1CGlzSQHjzQ_!!0-saturn_solar.jpg_270x270.jpg',
-				name: "欧莱雅（LOREAL）奇焕光彩粉嫩透亮修颜霜",
-				sale: 599,
-				factory: 899,
-				payNum: 2342
-			},
-			{
-				img: 'https://img.alicdn.com/imgextra/i4/28267890/O1CN01Mgevid289fYlszG56_!!0-saturn_solar.jpg_270x270.jpg',
-				name: "德国DMK进口牛奶",
-				sale: 29,
-				factory: 69,
-				payNum: 999
-			},
-			{
-				img: 'https://img.alicdn.com/imgextra/i3/504120084/O1CN01vX4XF01CUVrZNpZDX_!!0-saturn_solar.jpg_270x270.jpg',
-				name: "【第2支1元】柔色尽情丝柔口红唇膏女士不易掉色保湿滋润防水 珊瑚红",
-				sale: 299,
-				factory: 699,
-				payNum: 666
-			},
-			{
-				img: 'https://img.alicdn.com/imgextra/i2/747370085/O1CN01sT5Nvm1CUyGQRiTp2_!!0-saturn_solar.jpg_250x250.jpg',
-				name: "百雀羚套装女补水保湿护肤品",
-				sale: 1599,
-				factory: 2899,
-				payNum: 236
-			}
-]
-
-module.exports = {
-	waterFillList
-}

common/json/skuList.json

@@ -1,160 +0,0 @@
-{
-	"status": 1,
-	"difference": [
-		{
-			"id": "19",
-			"price": 333,
-			"stock": 2222,
-			"pic" :"http://mallservice-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20200711/af9421dbdefe47a2.jpg",
-			"difference": [
-				"白色",
-				"S"
-			]
-		},{
-			"id": "19",
-			"price": 111,
-			"stock": 11219,
-			"pic" :"http://mallservice-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20200711/af9421dbdefe47a2.jpg",
-			"difference": [
-				"白色",
-				"M"
-			]
-		},{
-			"id": "19",
-			"price": 222,
-			"stock": 132129,
-			"pic" :"http://mallservice-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20200711/af9421dbdefe47a2.jpg",
-			"difference": [
-				"白色",
-				"L"
-			]
-		},{
-			"id": "19",
-			"price": 444,
-			"stock": 32342,
-			"pic" :"http://mallservice-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20200711/af9421dbdefe47a2.jpg",
-			"difference": [
-				"白色",
-				"XL"
-			]
-		},
-		{
-			"id": "21",
-			"price": 666,
-			"stock": 6778,
-			"pic" :"http://mallservice-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20200711/c2413d39197b6fb3.jpg",
-			"difference": [
-				"黑色",
-				"S"
-			]
-		},{
-			"id": "21",
-			"price": 300,
-			"stock": 3453,
-			"pic" :"http://mallservice-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20200711/c2413d39197b6fb3.jpg",
-			"difference": [
-				"黑色",
-				"M"
-			]
-		},{
-			"id": "21",
-			"price": 123,
-			"stock": 5443,
-			"pic" :"http://mallservice-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20200711/c2413d39197b6fb3.jpg",
-			"difference": [
-				"黑色",
-				"L"
-			]
-		},{
-			"id": "21",
-			"price": 324,
-			"stock": 134530,
-			"pic" :"http://mallservice-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20200711/c2413d39197b6fb3.jpg",
-			"difference": [
-				"黑色",
-				"XL"
-			]
-		},
-		{
-			"id": "23",
-			"price": 500,
-			"stock": 48,
-			"pic" :"https://img11.360buyimg.com/n7/jfs/t1/108967/17/12168/563111/5e93fe7aEb6e92384/4f0d93d608a9c7c5.jpg",
-			"difference": [
-				"绿色",
-				"S"
-			]
-		},
-		{
-			"id": "20",
-			"price": 4444,
-			"stock": 12433,
-			"pic" :"https://img11.360buyimg.com/n7/jfs/t1/108967/17/12168/563111/5e93fe7aEb6e92384/4f0d93d608a9c7c5.jpg",
-			"difference": [
-				"绿色",
-				"M"
-			]
-		},
-		{
-			"id": "22",
-			"price": 2222,
-			"stock": 22121,
-			"pic" :"https://img11.360buyimg.com/n7/jfs/t1/108967/17/12168/563111/5e93fe7aEb6e92384/4f0d93d608a9c7c5.jpg",
-			"difference": [
-				"绿色",
-				"L"
-			]
-		},
-		{
-			"id": "22",
-			"price": 333,
-			"stock": 212122,
-			"pic" :"https://img11.360buyimg.com/n7/jfs/t1/108967/17/12168/563111/5e93fe7aEb6e92384/4f0d93d608a9c7c5.jpg",
-			"difference": [
-				"绿色",
-				"XL"
-			]
-		},
-		{
-			"id": "23",
-			"price": 500,
-			"stock": 48,
-			"pic" :"https://img11.360buyimg.com/n7/jfs/t20233/166/1129554805/699253/b3d0eb8d/5b20a113N1aedd774.jpg",
-			"difference": [
-				"果茶色",
-				"S"
-			]
-		},
-		{
-			"id": "20",
-			"price": 4444,
-			"stock": 12433,
-			"pic" :"https://img11.360buyimg.com/n7/jfs/t20233/166/1129554805/699253/b3d0eb8d/5b20a113N1aedd774.jpg",
-			"difference": [
-				"果茶色",
-				"M"
-			]
-		},
-		{
-			"id": "22",
-			"price": 2222,
-			"stock": 22121,
-			"pic" :"https://img11.360buyimg.com/n7/jfs/t20233/166/1129554805/699253/b3d0eb8d/5b20a113N1aedd774.jpg",
-			"difference": [
-				"果茶色",
-				"L"
-			]
-		},
-		{
-			"id": "22",
-			"price": 333,
-			"stock": 212122,
-			"pic" :"https://img11.360buyimg.com/n7/jfs/t20233/166/1129554805/699253/b3d0eb8d/5b20a113N1aedd774.jpg",
-			"difference": [
-				"果茶色",
-				"XL"
-			]
-		}
-	],
-	"msg": "提示信息"
-}

common/json/specList.json

@@ -1,37 +0,0 @@
-{
-	"status": 1,
-	"specifications": [{
-			"name": "颜色",
-			"item": [{
-					"name": "白色"
-				},
-				{
-					"name": "黑色"
-				},
-				{
-					"name": "绿色"
-				},
-				{
-					"name": "果茶色"
-				}
-			]
-		},
-		{
-			"name": "码数",
-			"item": [{
-					"name": "S"
-				},
-				{
-					"name": "M"
-				},
-				{
-					"name": "L"
-				},
-				{
-					"name": "XL"
-				}
-			]
-		}
-	],
-	"msg": "提示"
-}

components/empty.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="empty-content" :style="{backgroundColor:backgroundColor}">
-		<image class="empty-content-image" :src="StaticUrl + '/icon/icon-remarks-empty@2x.png'" mode="aspectFit"></image>
+		<image class="empty-content-image" :src="StaticUrl + '/image/icon-empty@2x.png'" mode="aspectFit"></image>
 		<text class="error-text">{{EmptyText}}</text>
 	</view>
 </template>
@@ -28,14 +28,14 @@
 		data() {
 			return {
 				StaticUrl: this.$Static,
-				EmptyText:'暂无数据~',
+				EmptyText:'暂无数据',
 			}
 		},
 		created(){
 			if(this.typeIndex==0){
-				this.EmptyText = '暂无数据~'
+				this.EmptyText = '暂无数据'
 			}else{
-				this.EmptyText = '暂无数据~'
+				this.EmptyText = '暂无数据'
 			}
 		},
 		computed: {
@@ -54,12 +54,12 @@
 		height: 700rpx;
 		z-index: 999;
 		&-image {
-			width: 200rpx;
-			height: 200rpx;
+			width: 100rpx;
+			height: 100rpx;
 		}
 		.error-text{
 			font-size: $font-size-28;
-			color: #666666;
+			color: #999999;
 			line-height: 88rpx;
 		}
 	}

components/thorui/tui-modal/tui-modal.vue

@@ -22,7 +22,7 @@
 
 <script>
 	export default {
-		name: "tuiModal",
+		name: 'tuiModal',
 		props: {
 			//是否显示
 			show: {
@@ -31,30 +31,30 @@
 			},
 			width: {
 				type: String,
-				default: "84%"
+				default: '84%'
 			},
 			padding: {
 				type: String,
-				default: "40rpx 64rpx"
+				default: '40rpx 64rpx'
 			},
 			radius: {
 				type: String,
-				default: "24rpx"
+				default: '24rpx'
 			},
 			//标题
 			title: {
 				type: String,
-				default: ""
+				default: ''
 			},
 			//内容
 			content: {
 				type: String,
-				default: ""
+				default: ''
 			},
 			//内容字体颜色
 			color: {
 				type: String,
-				default: "#999"
+				default: '#999'
 			},
 			//内容字体大小 rpx
 			size: {
@@ -70,12 +70,12 @@
 				type: Array,
 				default: function() {
 					return [{
-						text: "取消",
-						type: "primary",
+						text: '取消',
+						type: 'primary',
 						plain: true //是否空心
 					}, {
-						text: "确定",
-						type: "primary",
+						text: '确定',
+						type: 'primary',
 						plain: false
 					}]
 				}
@@ -99,19 +99,19 @@
 		data() {
 			return {
 
-			};
+			}
 		},
 		methods: {
 			handleClick(e) {
-				if (!this.show) return;
-				const dataset = e.currentTarget.dataset;
+				if (!this.show) return
+				const dataset = e.currentTarget.dataset
 				this.$emit('click', {
 					index: Number(dataset.index)
-				});
+				})
 			},
 			handleClickCancel() {
-				if (!this.maskClosable) return;
-				this.$emit('cancel');
+				if (!this.maskClosable) return
+				this.$emit('cancel')
 			}
 		}
 	}

main.js

@@ -23,7 +23,7 @@ Vue.prototype.$store = store
 Vue.prototype.$util = {msg,modal,json, prePage}
 Vue.prototype.$api = Api
 Vue.prototype.$reg = Regs
-Vue.prototype.$Static = 'https://static.caimei365.com/app/img/'
+Vue.prototype.$Static = 'https://static.caimei365.com/app/crm/'
 
 
 

pages/collection/detail.vue

@@ -132,7 +132,24 @@
 					.catch(err => {
 						this.$util.msg(err.msg, 2000)
 					})
-			}
+			},
+			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) {
 			//实时获取到滚动的值
@@ -151,12 +168,12 @@
 		onShareAppMessage(res) {
 			//分享收款详情
 			const receipt = res.target.dataset.receipt
-			console.log('receipt', receipt)
+			const receiptTypeText = this.formatReceiptType(receipt.receiptType)
 			if (res.from === 'button') {
 				// console.log('来自页面内转发按钮')
 				return {
-					title: `【待确认】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
-					path: `/pages/login/login-share?id=${receipt.id}&receiptType=${receipt.receiptType}`,
+					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'
 				}
 			}

pages/collection/list.vue

@@ -123,7 +123,7 @@
 					</view>
 					<view class="drawer-main-name">收款短信(全匹配)</view>
 					<view class="drawer-main-textarea">
-						<textarea class="textarea" placeholder="请输入收款备注..." v-model="listQuery.smsContent" />
+						<textarea class="textarea" placeholder="收款短信内容..." v-model="listQuery.smsContent" />
 					</view>
 				</view>
 				<view class="drawer-input btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
@@ -288,8 +288,7 @@
 				this.getOrderDatainit()
 			},
 			getOrderDatainit() {
-				this.payList =[]
-				this.listQuery.pageNum = 1
+				this.initListQuery()
 				this.OrderService.orderReceiptList(this.listQuery)
 					.then(response => {
 						let data = response.data
@@ -479,6 +478,10 @@
 						this.$util.msg(error.msg, 2000)
 					})
 			},
+			handSearchConfirm(){
+				this.getOrderDatainit()
+				this.rightDrawer = false
+			},
 			hideMobel() {
 				this.modal = false
 			},
@@ -518,12 +521,10 @@
 			},
 			bindStartDateChange(event) {
 				//开始时间
-				console.log('开始时间==>', event.detail.value)
 				this.listQuery.startDate = event.detail.value
 			},
 			bindEndDateChange(event) {
 				//结束时间
-				console.log('结束时间==>', event.detail.value)
 				this.listQuery.endDate = event.detail.value
 			},
 			rDrawer() {
@@ -532,7 +533,6 @@
 			},
 			closeDrawer(e) {
 				//关闭抽屉
-				this.leftDrawer = false
 				this.rightDrawer = false
 			},
 			tabClick(num, index, type) {
@@ -543,6 +543,8 @@
 						this.currents = index
 						this.listQuery.receiptType = type
 						this.listQuery.receiptStatus = 0
+						this.listQuery.startDate = ''
+						this.listQuery.endDate = ''
 						this.getOrderDatainit()
 						this.tabCurrents = 0
 						break
@@ -550,6 +552,8 @@
 						this.isEmpty = false
 						this.pullUpOn = true
 						this.tabCurrents = index
+						this.listQuery.startDate = ''
+						this.listQuery.endDate = ''
 						this.listQuery.receiptStatus = type
 						this.getOrderDatainit()
 				}
@@ -561,7 +565,30 @@
 				uni.navigateBack({
 					delta: 1
 				})
-			}
+			},
+			initListQuery(){// 初始化
+				this.payList =[]
+				this.loadding = true
+				this.pullUpOn = true
+				this.listQuery.pageNum = 1
+			},
+			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) {
 			//实时获取到滚动的值
@@ -575,10 +602,6 @@
 		},
 		onPullDownRefresh() {
 			setTimeout(() => {
-				this.listQuery.pageNum = 1
-				this.currents = 0
-				this.loadding = false
-				this.pullUpOn = false
 				this.getOrderDatainit()
 				uni.stopPullDownRefresh()
 			}, 200)
@@ -586,12 +609,12 @@
 		onShareAppMessage(res) {
 			//分享购买优惠券
 			const receipt = res.target.dataset.receipt
-			console.log('receipt', receipt)
+			const receiptTypeText = this.formatReceiptType(receipt.receiptType)
 			if (res.from === 'button') {
 				// console.log('来自页面内转发按钮')
 				return {
-					title: `【待确认】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
-					path: `/pages/login/login-share?id=${receipt.id}&receiptType=${receipt.receiptType}`,
+					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'
 				}
 			}
@@ -702,6 +725,17 @@
 					.text {
 						color: $btn-confirm;
 						font-size: $font-size-28;
+						position: relative;
+						&::before{
+							content: '';
+							width: 60rpx;
+							height: 4rpx;
+							background: $btn-confirm;
+							position: absolute;
+							left: 50%;
+							bottom: 0;
+							margin-left: -30rpx;
+						}
 					}
 				}
 

pages/collection/nosms.vue

@@ -387,7 +387,7 @@
 			float: left;
 			text-align: center;
 			line-height: 80rpx;
-			font-size: 42rpx;
+			font-size: 46rpx;
 		}
 	}	
 

pages/collection/sms.vue

@@ -301,19 +301,6 @@ export default {
 		}
 	},
 	methods: {
-		getOrderReceiptSave() {
-			// 收款保存
-			this.OrderService.orderReceiptSave(this.params)
-				.then(response => {
-					this.$util.msg('收款成功', 1500, true, 'success')
-					setTimeout(() => {
-						this.$api.navigateTo(`/pages/collection/detail?id=${response.data.id}`)
-					}, 1500)
-				})
-				.catch(err => {
-					this.$util.msg(err.msg, 2000)
-				})
-		},
 		getOrderReceiptType() {
 			// 获取收款类型列表
 			this.OrderService.orderReceiptType()
@@ -387,21 +374,30 @@ export default {
 				this.contentModalText = '确定供应商退款吗？' //操作文字提示语句
 			}
 			this.modal = true
-			console.log('收款')
 		},
-		
+		getOrderReceiptSave() {
+			// 收款保存
+			this.OrderService.orderReceiptSave(this.params)
+				.then(response => {
+					this.$util.msg('收款成功', 1500, true, 'success')
+					setTimeout(() => {
+						this.$api.navigateTo(`/pages/collection/detail?id=${response.data.id}&receiptType=${response.data.receiptType}`)
+					}, 1500)
+				})
+				.catch(err => {
+					this.$util.msg(err.msg, 2000)
+				})
+		},
 		bindPickerChange(type, e) {
 			// 选择选项
 			switch (type) {
 				case 1:
 					this.paymentTypeText = this.paymentActions[e.target.value].name
 					this.params.receiptType = this.paymentActions[e.target.value].value
-					console.log('款项类型', this.params.receiptType)
 					break
 				case 2:
 					this.banksTypeText = this.receiptTypeActions[e.target.value].name
 					this.params.payType = this.receiptTypeActions[e.target.value].value
-					console.log('收款类型', this.params.payType)
 					break
 			}
 		},
@@ -432,7 +428,6 @@ export default {
 		},
 		bindStartDateChange(event) {
 			//开始时间
-			console.log('开始时间==>', event.result)
 			this.params.receiptDate = event.result
 		},
 		checkedCharge() {

pages/login/login-share.vue

@@ -5,6 +5,12 @@
 			<view class="share-empty">
 				<view class="icon"><image :src="imagePath" mode="widthFix"></image></view>
 				<view class="text">暂无权限查看</view>
+				<text v-if="isNoAuthority"
+					  class="iconfont icon-shouye1" 
+					  :style="{ top: CustomBar/2 + 'px',left:'24rpx'}"
+					  @click.stop="this.$api.navigateLinkJump()"
+					  >
+				</text>
 			</view>
 		</template>
 	</view>
@@ -21,6 +27,7 @@ export default {
 		return {
 			CustomBar:this.CustomBar,// 顶部导航栏高度
 			imagePath:'https://static.caimei365.com/app/img/icon/icon-noremb.png',
+			isNoAuthority:false,
 			skeletonShow:true,
 			receiptId:0,
 			receiptType:1// 收款款项类型：1订单款，2非订单款，3返佣款 4订单款或者非订单款（因财务阶段无法区分订单非订单）, 5供应商退款
@@ -44,16 +51,17 @@ export default {
 				this.login(response.data)
 				this.$store.commit('updateStatus',response.data)
 				setTimeout(()=>{
-					this.getOrderReceiptDetailType(this.receiptId,response.data)
+					this.getOrderReceiptDetailType(this.receiptId)
 				},1000)
 			}).catch(error =>{
 				this.logout()
 				this.skeletonShow = false
+				this.isNoAuthority = true
 				this.$store.commit('updateStatus',error.data)
-				this.$api.navigateTo('/pages/login/login-account')
 			})
 		},
-		getOrderReceiptDetailType(id,data) {
+		getOrderReceiptDetailType(id) {
+			// 无权限查询收款详情，防止收款类型被更改
 			this.OrderService.orderReceiptDetailType({ id: id })
 				.then(response => {
 					/**
@@ -63,27 +71,76 @@ export default {
 					 * 3. 财务人员跳转到款项识别页面
 					 * 4. 超级管理员跳转到款项识别页面
 					 * */
+					 // switch(data.userType){
+					 // 	 case 1:// 协销
+					 // 		this.navigateLinkJump(receipt)
+					 // 		break
+					 // 	 case 2:// 客服
+					 // 		this.navigateLinkJump(receipt)
+					 // 		break
+					 // 	 case 3:// 财务
+					 // 		this.navigateLinkJump(receipt)
+					 // 		break
+					 // 	 case 4:// 超级管理员
+					 // 		this.navigateLinkJump(receipt)
+					 // 		break
+					 // }
 					const receipt = response.data
-					switch(data.userType){
-						 case 1:// 协销
-							this.navigateLinkJump(receipt)
-							break
-						 case 2:// 客服
-							this.navigateLinkJump(receipt)
-							break
-						 case 3:// 财务
-							this.$api.navigateTo('/pages/collection/list')
-							break
-						 case 4:// 超级管理员
-							this.navigateLinkJump(receipt)
-							break
-					}
+					this.checkedReceiptAdministration(receipt)
+
 				})
 				.catch(err => {
 					console.log('分享查询收款详情异常====>',err)
 				})
 		},
-		navigateLinkJump(receipt){// 收款详情查询跳转URL 收款款项类型：1订单款，2非订单款，3返佣款 4订单款或者非订单款（因财务阶段无法区分订单非订单）, 5供应商退款
+		checkedReceiptAdministration(receipt){
+			// 根据收款类型调用不同收款详情查看权限
+			if(receipt.receiptType == 1 || receipt.receiptType == 2 || receipt.receiptType == 4){// 订单 非订单
+				this.getOrderReceiptDetail(receipt)
+			}else if(receipt.receiptType == 3){
+				this.getOrderReceiptRebateDetail(receipt)
+			}else if(receipt.receiptType == 5){
+				this.getOrderReceiptRefundDetail(receipt)
+			}
+		},
+		getOrderReceiptDetail(receipt) {// 
+			// 订单&&非订单收款详情
+			this.OrderService.orderReceiptDetail({ id: receipt.id })
+				.then(response => {
+					this.navigateLinkJump(receipt)
+				})
+				.catch(err => {
+					setTimeout(()=>{
+						this.skeletonShow = false
+					},500)
+				})
+		},
+		getOrderReceiptRebateDetail(receipt) {
+			// 返佣收款详情
+			this.OrderService.orderReceiptRebateDetails({ id: receipt.id })
+				.then(response => {
+					this.navigateLinkJump(receipt)
+				})
+				.catch(err => {
+					setTimeout(()=>{
+						this.skeletonShow = false
+					},500)
+				})
+		},
+		getOrderReceiptRefundDetail(receipt) {
+			// 供应商退款收款详情
+			this.OrderService.orderReceiptRefundDetail({ id: receipt.id })
+				.then(response => {
+					this.navigateLinkJump(receipt)
+				})
+				.catch(err => {
+					setTimeout(()=>{
+						this.skeletonShow = false
+					},500)
+				})
+		},
+		navigateLinkJump(receipt){
+			// 收款详情查询跳转URL 收款款项类型：1订单款，2非订单款，3返佣款 4订单款或者非订单款（因财务阶段无法区分订单非订单）, 5供应商退款
 			switch(receipt.receiptType){
 				case 1:// 1:订单 1待确认、2已确认(待审核)、3审核通过、4审核未通过、5收款撤销【线上支付成功为审核通过】
 					if(receipt.receiptStatus == 1 || receipt.receiptStatus == 4 || receipt.receiptStatus == 5){// 订单待确认
@@ -149,6 +206,18 @@ export default {
 			color: $color-system;
 			text-align: center;
 		}
+		.icon-shouye1{
+			display: block;
+			width: 80rpx;
+			height: 80rpx;
+			float: left;
+			text-align: center;
+			line-height: 80rpx;
+			font-size: 48rpx;
+			position: absolute;
+			top: 0;
+			left: 0;
+		}
 	}
 }
 </style>

pages/relation/nonorder/detail.vue

@@ -318,11 +318,6 @@ page {
 		line-height: 80rpx;
 		font-size: 42rpx;
 	}
-
-	.icon-iconfonticonfontsousuo1 {
-		font-size: 42rpx;
-		margin-left: 30rpx;
-	}
 }
 
 .mine {

pages/relation/order/detail.vue

@@ -322,11 +322,6 @@ page {
 		line-height: 80rpx;
 		font-size: 42rpx;
 	}
-
-	.icon-iconfonticonfontsousuo1 {
-		font-size: 42rpx;
-		margin-left: 30rpx;
-	}
 }
 
 .mine {

pages/relation/ordinary/detail.vue

@@ -8,7 +8,8 @@
 		>
 			<view class="header-top" :style="{ paddingTop: top + 'px', lineHeight: CustomBar + 30 + 'px' }"></view>
 			<view class="header-sit">
-				<text class="iconfont icon-fanhui" @click.stop="this.$api.navigateBack(1)"></text>
+				<text class="iconfont icon-shouye1" v-if="isShareType" @click.stop="this.$api.navigateLinkJump()"></text>
+				<text class="iconfont icon-fanhui" v-else @click.stop="this.$api.navigateBack(1)"></text>
 				<text class="header-sit-text">审核详情</text>
 			</view>
 		</view>
@@ -73,7 +74,7 @@
 					<view class="list-title">
 						<view class="list-title-b"
 							>进度：<text :style="{ color: formatColor(receiptInfo.receiptStatus) }"
-								>{{ receiptInfo.receiptStatus | formatStateType }}</text
+								>{{ receiptInfo.receiptStatusText }}</text
 							>
 						</view>
 						<view class="list-title-b"
@@ -133,7 +134,8 @@ export default {
 				textColor: '#ffffff'
 			},
 			receiptInfo: {},
-			receiptId: 0
+			receiptId: 0,
+			isShareType:false
 		}
 	},
 	onLoad(option) {
@@ -155,6 +157,7 @@ export default {
 				this.scrollH = res.windowWidth * 0.6
 			}
 		})
+		if(option.type == 'share'){ this.isShareType = true }
 		this.receiptId = option.id
 		this.getOrderReceiptDetail(this.receiptId)
 	},
@@ -199,6 +202,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) {
 		//实时获取到滚动的值
@@ -214,6 +234,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/img/icon/icon-shareCoupon@2x.png'
+		}
+	},
 	onShow() {}
 }
 </script>
@@ -266,7 +299,7 @@ page {
 		font-family: '正楷';
 	}
 
-	.icon-fanhui {
+	.iconfont {
 		display: block;
 		width: 80rpx;
 		height: 80rpx;

pages/relation/ordinary/examine-detail.vue

@@ -6,7 +6,8 @@
 			:class="isCmcustomClass">
 			<view class="header-top" :style="{ paddingTop: top + 'px', lineHeight: CustomBar + 30 + 'px' }"></view>
 			<view class="header-sit">
-				<text class="iconfont icon-fanhui" @click.stop="this.$api.navigateBack(1)"></text>
+				<text class="iconfont icon-shouye1" v-if="isShareType" @click.stop="this.$api.navigateLinkJump()"></text>
+				<text class="iconfont icon-fanhui" v-else @click.stop="this.$api.navigateBack(1)"></text>
 				<text class="header-sit-text">审核详情</text>
 			</view>
 		</view>
@@ -80,7 +81,7 @@
 				<view class="section-mid">
 					<view class="list-title">
 						<view class="list-title-b">进度：<text
-								:style="{ color: formatColor(receiptInfo.receiptStatus) }">{{ receiptInfo.receiptStatus | formatStateType }}</text>
+								:style="{ color: formatColor(receiptInfo.receiptStatus) }">{{ receiptInfo.receiptStatusText }}</text>
 						</view>
 						<view class="list-title-b">确认人：<text class="text">正大单</text></view>
 						<view class="list-title-b">确认时间：<text class="text">{{ receiptInfo.confirmDate }}</text></view>
@@ -159,6 +160,7 @@
 				contentModalText: '确认通过审核？', //操作文字提示语句
 				modal: false,
 				modal1: false,
+				isShareType:false
 				
 			}
 		},
@@ -181,6 +183,7 @@
 					this.scrollH = res.windowWidth * 0.6
 				}
 			})
+			if(option.type == 'share'){ this.isShareType = true }
 			this.receiptId = this.params.id = option.id
 			this.getOrderReceiptDetail(this.receiptId)
 		},
@@ -287,6 +290,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
+			},
 		},
 		onPageScroll(e) {
 			//实时获取到滚动的值
@@ -302,6 +322,19 @@
 				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/img/icon/icon-shareCoupon@2x.png'
+			}
+		},
 		onShow() {
 			
 		}
@@ -355,8 +388,7 @@
 			font-weight: 600;
 			font-family: '正楷';
 		}
-
-		.icon-fanhui {
+		.iconfont {
 			display: block;
 			width: 80rpx;
 			height: 80rpx;
@@ -365,13 +397,7 @@
 			line-height: 80rpx;
 			font-size: 42rpx;
 		}
-
-		.icon-iconfonticonfontsousuo1 {
-			font-size: 42rpx;
-			margin-left: 30rpx;
-		}
 	}
-
 	.mine {
 		width: 100%;
 		height: 100%;

pages/relation/ordinary/index.vue

@@ -7,7 +7,8 @@
 		>
 			<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>
+				<text class="iconfont icon-shouye1" v-if="isShareType" @click.stop="this.$api.navigateLinkJump()"></text>
+				<text class="iconfont icon-fanhui" v-else @click.stop="this.$api.navigateBack(1)"></text>
 				<text class="header-sit-text">关联订单</text>
 			</view>
 		</view>
@@ -31,9 +32,9 @@
 							>
 								查看关联信息
 							</view>
-							<view class="button btn-confirm" @click="toNoSms('/pages/collection/list')">
+							<!-- <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">
@@ -322,11 +323,11 @@ export default {
 				payableAmount: 0, // 应收金额
 				paidAmount: 0, //  已收金额
 				surplusAmount: 0 // 剩余应收
-			} // 统计都选相同的订单数据
+			} ,// 统计都选相同的订单数据
+			isShareType:false
 		}
 	},
 	onLoad(option) {
-		console.log('option', option)
 		let obj = {}
 		uni.getSystemInfo({
 			success: res => {
@@ -336,6 +337,7 @@ export default {
 				this.scrollH = res.windowWidth * 0.6
 			}
 		})
+		if(option.type == 'share'){ this.isShareType = true }
 		this.listQuery.id = this.confirmParams.id = this.confirmRefundParams.id = option.id
 		this.getOrderReceiptDetail(this.listQuery.id)
 	},
@@ -356,6 +358,7 @@ export default {
 		},
 		getOrderReceiptOrders() {
 			// 收款详情-订单列表
+			this.initListQuery()
 			this.OrderService.orderReceiptOrders(this.listQuery)
 				.then(response => {
 					let data = response.data
@@ -491,7 +494,6 @@ export default {
 			// 确认搜索
 			switch (type) {
 				case 1: // 订单
-					this.listQuery.pageNum = 1
 					this.getOrderReceiptOrders()
 					break
 				case 2: // 订单
@@ -712,18 +714,15 @@ export default {
 					this.tabCurrents = 0
 					switch (this.currents) {
 						case 0: // 商品订单
-							this.listQuery.pageNum = 1
 							this.listQuery.organizeId = 0
 							this.getOrderReceiptOrders()
 							break
 						case 1:
 							this.listQuery.type = 1
-							this.listQuery.pageNum = 1
 							this.listQuery.organizeId = 0
 							this.getOrderReceiptOrders()
 							break
 						case 2:
-							this.listQuery.pageNum = 1
 							this.listQuery.organizeId = 3
 							this.getOrderReceiptOrders()
 							break
@@ -749,7 +748,6 @@ export default {
 						} else {
 							this.listQuery.orderReceiptStatus = '3'
 						}
-						this.listQuery.pageNum = 1
 						this.getOrderReceiptOrders()
 					}
 			}
@@ -760,6 +758,29 @@ export default {
 		showReceiptModel() {
 			//
 			this.modal2 = true
+		},
+		initListQuery(){// 初始化
+			this.loadding = true
+			this.pullUpOn = true
+			this.orderList = []
+			this.listQuery.pageNum = 1
+		},
+		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) {
@@ -784,20 +805,20 @@ export default {
 	},
 	onPullDownRefresh() {
 		setTimeout(() => {
-			this.listQuery.pageNum = 1
 			this.getOrderReceiptOrders()
 			uni.stopPullDownRefresh()
 		}, 200)
 	},
 	onShareAppMessage(res) {
 		//分享购买优惠券
-		console.log('receiptInfo', receiptInfo)
+		const receipt = this.receiptInfo
+		const receiptTypeText = this.formatReceiptType(receipt.receiptType)
 		if (res.from === 'button') {
 			// console.log('来自页面内转发按钮')
 		}
 		return {
-			title: `【待确认】收款金额${receiptInfo.receiptAmount.toFixed(2)}元,收款时间:${receiptInfo.receiptDate}`,
-			path: `pages/seller/cart/coupon-share?payment=${receiptInfo.id}`,
+			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'
 		}
 	},
@@ -858,7 +879,7 @@ page {
 		font-weight: 600;
 		font-family: '正楷';
 	}
-	.icon-fanhui {
+	.iconfont {
 		display: block;
 		width: 80rpx;
 		height: 80rpx;
@@ -1046,6 +1067,16 @@ page {
 				.text {
 					color: $btn-confirm;
 					font-size: $font-size-28;
+					position: relative;
+					&::before{
+						content: '';
+						width: 60rpx;
+						height: 4rpx;
+						background: $btn-confirm;
+						position: absolute;
+						left: 0;
+						bottom: 0;
+					}
 				}
 			}
 

pages/relation/refund/detail.vue

@@ -6,7 +6,8 @@
 			:class="isCmcustomClass">
 			<view class="header-top" :style="{ paddingTop: top + 'px', lineHeight: CustomBar + 30 + 'px' }"></view>
 			<view class="header-sit">
-				<text class="iconfont icon-fanhui" @click.stop="this.$api.navigateBack(1)"></text>
+				<text class="iconfont icon-shouye1" v-if="isShareType" @click.stop="this.$api.navigateLinkJump()"></text>
+				<text class="iconfont icon-fanhui" v-else @click.stop="this.$api.navigateBack(1)"></text>
 				<text class="header-sit-text">供应商退款详情</text>
 			</view>
 		</view>
@@ -106,7 +107,7 @@
 				<view class="section-mid">
 					<view class="list-title">
 						<view class="list-title-b">进度：<text
-								:style="{ color: formatColor(receiptInfo.receiptStatus) }">{{ receiptInfo.receiptStatus | formatStateType }}</text>
+								:style="{ color: formatColor(receiptInfo.receiptStatus) }">{{ receiptInfo.receiptStatusText }}</text>
 						</view>
 					</view>
 				</view>
@@ -156,7 +157,8 @@
 					textColor: '#ffffff'
 				},
 				receiptInfo: {},
-				receiptId: 0
+				receiptId: 0,
+				isShareType: false
 			}
 		},
 		onLoad(option) {
@@ -178,6 +180,7 @@
 					this.scrollH = res.windowWidth * 0.6
 				}
 			})
+			if(option.type == 'share'){ this.isShareType = true }
 			this.receiptId = this.listQuery.id = option.id
 			this.getOrderReceiptDetail(this.receiptId)
 			this.getOrderReceiptRebateOrders()
@@ -236,6 +239,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
+			},
 		},
 		onPageScroll(e) {
 			//实时获取到滚动的值
@@ -247,14 +267,25 @@
 		},
 		onPullDownRefresh() {
 			setTimeout(() => {
-				// this.initSsoMemberCollectionList()
+				this.getOrderReceiptDetail(this.receiptId)
 				uni.stopPullDownRefresh()
 			}, 200)
 		},
-		onShow() {
-			if (this.hasLogin) {
-				this.GetDataInfo()
+		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/img/icon/icon-shareCoupon@2x.png'
+			}
+		},
+		onShow() {
+			
 		}
 	}
 </script>
@@ -307,7 +338,7 @@
 			font-family: '正楷';
 		}
 
-		.icon-fanhui {
+		.iconfont {
 			display: block;
 			width: 80rpx;
 			height: 80rpx;

pages/relation/refund/index.vue

@@ -7,7 +7,8 @@
 		>
 			<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>
+				<text class="iconfont icon-shouye1" v-if="isShareType" @click.stop="this.$api.navigateLinkJump()"></text>
+				<text class="iconfont icon-fanhui" v-else @click.stop="this.$api.navigateBack(1)"></text>
 				<text class="header-sit-text">关联订单</text>
 			</view>
 		</view>
@@ -24,9 +25,9 @@
 					<view class="tui-header-top">
 						<view class="title"> 收款信息 </view>
 						<view class="tui-header-button">
-							<view class="button btn-confirm" @click="toNoSms('/pages/collection/list')">
+							<!-- <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">
@@ -77,7 +78,7 @@
 						type="text"
 						v-model="listQuery.keyword"
 						confirm-type="search"
-						@confirm="subMitSearch()"
+						@confirm="subMitSearch"
 						placeholder="请输入供应商名称"
 					/>
 					<text class="iconfont icon-sousuo"></text>
@@ -163,14 +164,17 @@
 				<view class="button" @click="confirmDistinguish">确认</view>
 			</view>
 		</view>	
-		<!-- 弹窗 -->
-		<tui-modal :show="modal" :padding="'40rpx 30rpx'" @cancel="hideMobel" :custom="true" fadeIn >
+		<!-- 确认关联弹窗 -->
+		<tui-modal :show="modal" @click="handleClick" @cancel="hideMobel(0)" :content="contentModalText" color="#333"
+			:size="32" shape="circle" :maskClosable="false"></tui-modal>
+		<!-- 提示弹窗 -->
+		<tui-modal :show="modal1" :padding="'40rpx 30rpx'" @cancel="hideMobel(1)" :custom="true" fadeIn >
 			<view class="tui-modal-custom">
 				<view class="tui-prompt-text">
 					{{ contentModalText }}
 				</view>
 				<view class="tui-prompt-flex">
-					<view class="btn btn-confirm" @click="hideMobel">知道了</view>
+					<view class="btn btn-confirm" @click="hideMobel(1)">知道了</view>
 				</view>
 			</view>
 		</tui-modal>	
@@ -210,6 +214,7 @@ export default {
 			nomoreText: '上拉显示更多',
 			contentModalText: '', //操作文字提示语句
 			modal: false,
+			modal1: false,
 			OperationType: '', //操作类型
 			isCmcustomClass: 'left',
 			isShowHeader: false,
@@ -225,7 +230,7 @@ export default {
 				id:0,
 			},
 			skeletonShow: true,
-			modelTpye:1,// 收款弹窗类型
+			isShareType: false
 		}
 	},
 	onLoad(option) {
@@ -238,6 +243,7 @@ export default {
 				this.scrollH = res.windowWidth * 0.6
 			}
 		})
+		if(option.type == 'share'){ this.isShareType = true }
 		this.confirmRefundParams.id = option.id
 		this.getOrderReceiptDetail(this.confirmRefundParams.id)
 	},
@@ -258,6 +264,7 @@ export default {
 		},
 		getOrderReceiptRefundOrders() {
 			// 收款详情-订单列表
+			this.initListQuery()
 			this.OrderService.orderReceiptRefundOrders(this.listQuery)
 				.then(response => {
 					let data = response.data
@@ -326,17 +333,8 @@ export default {
 		},
 		subMitSearch() {
 			// 确认搜索
-			this.listQuery.pageNum = 1
 			this.getOrderReceiptRefundOrders()
 		},
-		confirmDistinguish() {
-			// 点击确认
-			if (this.confirmRefundParams.shopOrderId == 0) {
-				this.$util.msg('请选择订单!', 2000)
-				return
-			}
-			this.orderReceiptConfirm(this.confirmRefundParams)
-		},
 		checkedOrder(order,index) {
 			// 勾选关联订单
 			this.checkedIndex = index
@@ -350,6 +348,22 @@ export default {
 			})
 			console.log('shopOrderId',this.confirmRefundParams.shopOrderId)
 		},
+		confirmDistinguish() {
+			// 点击确认
+			if (this.confirmRefundParams.shopOrderId == 0) {
+				this.$util.msg('请选择订单!', 2000)
+				return
+			}
+			this.contentModalText ='确认关联？'
+			this.modal = true
+		},
+		handleClick(e){// 确认关联返佣订单
+			// 通过审核
+			if (e.index == 1) { 
+				this.orderReceiptConfirm(this.confirmRefundParams)
+			}
+			this.modal = false
+		},
 		orderReceiptConfirm(params){
 			//确认关联退款子订单
 			this.OrderService.orderReceiptConfirmRefund(params)
@@ -360,12 +374,19 @@ export default {
 					},2000)
 				})
 				.catch(error => {
-					this.modal = true
+					this.modal1 = true
 					this.contentModalText = error.msg
 				})
 		},
-		hideMobel() {
-			this.modal = false
+		hideMobel(type) {
+			switch (type) {
+				case 0:
+					this.modal = false
+					break
+				case 1:
+					this.modal1 = false
+					break
+			}
 		},
 		formatColor(state) {
 			//设置颜色
@@ -390,7 +411,30 @@ export default {
 		},
 		toNoSms(url) {
 			this.$api.navigateTo(url)
-		}
+		},
+		initListQuery(){// 初始化
+			this.orderList =[]
+			this.loadding = true
+			this.pullUpOn = true
+			this.listQuery.pageNum = 1
+		},
+		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) {
 		//实时获取到滚动的值
@@ -414,22 +458,21 @@ export default {
 	},
 	onPullDownRefresh() {
 		setTimeout(() => {
-			this.listQuery.pageNum = 1
 			this.getOrderReceiptRefundOrders()
 			uni.stopPullDownRefresh()
 		}, 200)
 	},
 	onShareAppMessage(res) {
 		//分享购买优惠券
-		const payment = res.target.dataset.payment
-		console.log('payment', payment)
+		const receipt = this.receiptInfo
+		const receiptTypeText = this.formatReceiptType(receipt.receiptType)
 		if (res.from === 'button') {
 			// console.log('来自页面内转发按钮')
-			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'
-			}
+		}
+		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'
 		}
 	},
 	onShow() {
@@ -486,7 +529,7 @@ page {
 		font-weight: 600;
 		font-family: '正楷';
 	}
-	.icon-fanhui {
+	.iconfont {
 		display: block;
 		width: 80rpx;
 		height: 80rpx;

pages/relation/return/detail.vue

@@ -7,7 +7,8 @@
 			:class="isCmcustomClass">
 			<view class="header-top" :style="{ paddingTop: top + 'px', lineHeight: CustomBar + 30 + 'px' }"></view>
 			<view class="header-sit">
-				<text class="iconfont icon-fanhui" @click.stop="this.$api.navigateBack(1)"></text>
+				<text class="iconfont icon-shouye1" v-if="isShareType" @click.stop="this.$api.navigateLinkJump()"></text>
+				<text class="iconfont icon-fanhui" v-else @click.stop="this.$api.navigateBack(1)"></text>
 				<text class="header-sit-text">返佣详情</text>
 			</view>
 		</view>	
@@ -107,7 +108,7 @@
 				<view class="section-mid">
 					<view class="list-title">
 						<view class="list-title-b">进度：<text
-								:style="{ color: formatColor(receiptInfo.receiptStatus) }">{{ receiptInfo.receiptStatus | formatStateType }}</text>
+								:style="{ color: formatColor(receiptInfo.receiptStatus) }">{{ receiptInfo.receiptStatusText }}</text>
 						</view>
 					</view>
 				</view>
@@ -152,7 +153,8 @@
 					textColor: '#ffffff'
 				},
 				receiptInfo: {},
-				receiptId: 0
+				receiptId: 0,
+				isShareType:false
 			}
 		},
 		onLoad(option) {
@@ -174,6 +176,7 @@
 					this.scrollH = res.windowWidth * 0.6
 				}
 			})
+			if(option.type == 'share'){ this.isShareType = true }
 			this.receiptId = this.listQuery.id = option.id
 			this.getOrderReceiptDetail(this.receiptId)
 			this.getOrderReceiptRebateOrders()
@@ -231,6 +234,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
+			},
 		},
 		onPageScroll(e) {
 			//实时获取到滚动的值
@@ -242,14 +262,25 @@
 		},
 		onPullDownRefresh() {
 			setTimeout(() => {
-				// this.initSsoMemberCollectionList()
+				this.getOrderReceiptDetail(this.receiptId)
 				uni.stopPullDownRefresh()
 			}, 200)
 		},
-		onShow() {
-			if (this.hasLogin) {
-				this.GetDataInfo()
+		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/img/icon/icon-shareCoupon@2x.png'
+			}
+		},
+		onShow() {
+			
 		}
 	}
 </script>
@@ -302,7 +333,7 @@
 			font-family: '正楷';
 		}
 
-		.icon-fanhui {
+		.iconfont {
 			display: block;
 			width: 80rpx;
 			height: 80rpx;

pages/relation/return/index.vue

@@ -7,7 +7,8 @@
 		>
 			<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>
+				<text class="iconfont icon-shouye1" v-if="isShareType" @click.stop="this.$api.navigateLinkJump()"></text>
+				<text class="iconfont icon-fanhui" v-else @click.stop="this.$api.navigateBack(1)"></text>
 				<text class="header-sit-text">关联订单</text>
 			</view>
 		</view>
@@ -24,9 +25,9 @@
 					<view class="tui-header-top">
 						<view class="title"> 收款信息 </view>
 						<view class="tui-header-button">
-							<view class="button btn-confirm" @click="toNoSms('/pages/collection/list')">
+							<!-- <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">
@@ -39,10 +40,10 @@
 							}}</view>
 						</view>
 						<view class="list-title-b">
-							<view class="list-title-b-item "> 
+							<view class="list-title-b-item ">
 								收款金额：<text class="text">￥{{ receiptInfo.receiptAmount | NumFormat }}</text>
 							</view>
-							<view class="list-title-b-item "> 
+							<view class="list-title-b-item ">
 								收款类型：<text class="text">{{ receiptInfo.payTypeText }}</text>
 							</view>
 						</view>
@@ -97,24 +98,26 @@
 						<empty v-if="isEmpty" :typeIndex="currents" :navbarHeight="navbarHeight"></empty>
 						<!-- 列表 -->
 						<view v-else class="tui-order-content">
-							<view
-								class="tui-order-item"
-								v-for="(order, index) in orderList"
-								:key="index"
-							>
+							<view class="tui-order-item" v-for="(order, index) in orderList" :key="index">
 								<view class="list-title" @click.stop="orderDetail(order.mainOrder.orderId)">
 									<view class="list-title-t">
 										<view class="list-title-tip">
-											<text class="badges">{{ order.mainOrder.orderType | formatOrderType }}</text>
+											<text class="badges">{{
+												order.mainOrder.orderType | formatOrderType
+											}}</text>
 										</view>
 										<view class="list-title-tag" v-if="order.mainOrder.organizeId == 3">
 											<text class="badges">维沙</text>
 										</view>
-										<view class="list-title-num">{{ order.mainOrder.status | stateExpFormat }}</view>
+										<view class="list-title-num">{{
+											order.mainOrder.status | stateExpFormat
+										}}</view>
 									</view>
 									<view class="list-title-a">
 										<view class="list-title-a-text">
-											子订单编号：<text class="text">{{ order.shopOrderNo }} ( {{ order.shopOrderId }} )</text>
+											子订单编号：<text class="text"
+												>{{ order.shopOrderNo }} ( {{ order.shopOrderId }} )</text
+											>
 										</view>
 										<view class="list-title-a-text">
 											供应商名称：<text class="text">{{ order.shopName }}</text>
@@ -124,24 +127,32 @@
 										</view>
 									</view>
 									<view class="list-title-b">
-										客户名称：<text class="text">{{ order.mainOrder.userName ? order.mainOrder.userName : '无' }}</text>
+										客户名称：<text class="text">{{
+											order.mainOrder.userName ? order.mainOrder.userName : '无'
+										}}</text>
 									</view>
 									<view class="list-title-b">
-										订单编号：<text class="text">{{ order.mainOrder.orderNo }} ( {{ order.mainOrder.orderId }} )</text>
+										订单编号：<text class="text"
+											>{{ order.mainOrder.orderNo }} ( {{ order.mainOrder.orderId }} )</text
+										>
 									</view>
 									<view class="list-title-b">
 										下单日期：<text class="text">{{ order.mainOrder.orderTime }}</text>
 									</view>
 									<view class="list-title-b">
 										<view class="list-title-b-item ">
-											订单金额：<text class="text">￥{{ order.mainOrder.payTotalFee | NumFormat }}</text>
+											订单金额：<text class="text"
+												>￥{{ order.mainOrder.payTotalFee | NumFormat }}</text
+											>
 										</view>
 										<view class="list-title-b-item ">
-											已收金额：<text class="text">￥{{ order.mainOrder.paidAmount | NumFormat }}</text>
+											已收金额：<text class="text"
+												>￥{{ order.mainOrder.paidAmount | NumFormat }}</text
+											>
 										</view>
 									</view>
 								</view>
-								<view class="list-checked" @click="checkedOrder(order,index)">
+								<view class="list-checked" @click="checkedOrder(order, index)">
 									<text
 										class="iconfont"
 										:class="order.isChecked ? 'icon-yixuanze' : 'icon-weixuanze'"
@@ -162,40 +173,21 @@
 			<view class="distinguish-button" :style="{ paddingBottom: isIphoneX ? '68rpx' : '24rpx' }">
 				<view class="button" @click="confirmDistinguish">确认</view>
 			</view>
-		</view>	
-		<!-- 弹窗 -->
-		<tui-modal :show="modal1" :padding="'40rpx 30rpx'" @cancel="hideMobel(1)" :custom="true" fadeIn >
+		</view>
+		<!-- 确认关联弹窗 -->
+		<tui-modal :show="modal" @click="handleClick" @cancel="hideMobel(0)" :content="contentModalText" color="#333"
+			:size="32" shape="circle" :maskClosable="false"></tui-modal>
+		<!-- 金额不一致弹窗 -->
+		<tui-modal :show="modal1" :padding="'40rpx 30rpx'" @cancel="hideMobel(1)" :custom="true" fadeIn>
 			<view class="tui-modal-custom">
 				<view class="tui-prompt-text">
-					返佣金额为<text class="text">￥{{ confirmParams.verbalAmount  }}</text>,
-					订单根据成本计算得出的佣金为<text class="text">￥{{ returnBrokerage }}</text>,
-					金额不一致不能关联，请在后台修改成本使得子订单佣金等与返佣金额后在关联	
-				</view>
-				<view class="tui-prompt-flex">
-					<view class="btn btn-confirm" @click="handleClick1">知道了</view>
-				</view>
-			</view>
-		</tui-modal>	
-		<!--设非订单款项弹窗  -->
-		<tui-modal :show="modal" :padding="'40rpx 30rpx'" @cancel="hideMobel(0)" :custom="true" fadeIn >
-			<view class="tui-modal-custom">
-				<view class="tui-prompt-title">口头约定佣金</view>
-				<view class="tui-prompt-input">
-					<text class="text">￥</text>
-					<input 
-						class="input" 
-						type="number" 
-						placeholder="请输入口头约定佣金(必填)" 
-						@blur="changeNumber($event)" 
-						v-model="confirmParams.verbalAmount" 
-					/>
-				</view>
-				<view class="tui-prompt-flex">
-					<view class="btn btn-cancel" @click="hideMobel(0)">取消</view>
-					<view class="btn btn-confirm" @click="handleClick">确定</view>
+					返佣金额为<text class="text">￥{{ receiptInfo.receiptAmount }}</text
+					>, 订单根据成本计算得出的佣金为<text class="text">￥{{ returnBrokerage }}</text
+					>, 金额不一致不能关联，请在后台修改成本使得子订单佣金等与返佣金额后在关联
 				</view>
+				<view class="tui-prompt-flex"> <view class="btn btn-confirm" @click="hideMobel(1)">知道了</view> </view>
 			</view>
-		</tui-modal>	
+		</tui-modal>
 	</view>
 </template>
 <script>
@@ -208,7 +200,7 @@ const defaultListQuery = {
 	pageNum: 1, //页数
 	pageSize: 10, //条数
 	id: 0,
-	shopName: '',
+	shopName: ''
 }
 export default {
 	components: {
@@ -229,7 +221,7 @@ export default {
 			pullFlag: true,
 			navbarHeight: '',
 			nomoreText: '上拉显示更多',
-			contentModalText: '', //操作文字提示语句
+			contentModalText: '确认关联？', //操作文字提示语句
 			modal: false,
 			modal1: false,
 			isCmcustomClass: 'left',
@@ -239,23 +231,15 @@ export default {
 			scrollH: 0, //滚动总高度
 			opcity: 1,
 			checkedOrderList: [],
-			checkedIndex:'',
-			returnBrokerage:0,
-			confirmParams:{
-				shopOrderId:0,
-				verbalAmount:'',
-				rebateRemarks:''
+			checkedIndex: '',
+			returnBrokerage: 0,
+			confirmParams: {
+				id: 0,
+				shopOrderId: 0,
+				rebateRemarks: ''
 			},
 			skeletonShow: true,
-			modelTpye:1,// 收款弹窗类型
-			totalOrder: {
-				orderNums:1,
-				payTotalFee: 0, // 订单金额
-				balancePayFee: 0, // 余额抵扣
-				payableAmount: 0, // 应收金额
-				paidAmount: 0 ,//  已收金额
-				surplusAmount:0 // 剩余应收
-			} // 统计都选相同的订单数据
+			isShareType:false
 		}
 	},
 	onLoad(option) {
@@ -268,11 +252,12 @@ export default {
 				this.scrollH = res.windowWidth * 0.6
 			}
 		})
+		if(option.type == 'share'){ this.isShareType = true }
 		this.confirmParams.id = option.id
 		this.getOrderReceiptDetail(this.confirmParams.id)
 	},
 	computed: {
-		...mapState(['hasLogin']),
+		...mapState(['hasLogin'])
 	},
 	methods: {
 		getOrderReceiptDetail(id) {
@@ -286,13 +271,9 @@ export default {
 					this.$util.msg(err.msg, 2000)
 				})
 		},
-		subMitSearch() {
-			// 确认搜索
-			this.listQuery.pageNum = 1
-			this.getOrderReceiptRebateOrders()
-		},
 		getOrderReceiptRebateOrders() {
 			// 收款详情-订单列表
+			this.initListQuery()
 			this.OrderService.orderReceiptRebateOrders(this.listQuery)
 				.then(response => {
 					let data = response.data
@@ -359,22 +340,11 @@ export default {
 					this.$util.msg(error.msg, 2000)
 				})
 		},
-		confirmDistinguish() {
-			// 点击确认
-			const list = []
-			this.checkedOrderList.forEach(el => {
-				if (list.indexOf(el.userId) == -1) {
-					list.push(el.userId)
-				}
-			})
-			if (this.confirmParams.shopOrderId == 0) {
-				this.$util.msg('请选择订单!', 2000)
-				return
-			}
-			this.confirmParams.verbalAmount = ''
-			this.modal = true
+		subMitSearch() {
+			// 确认搜索
+			this.getOrderReceiptRebateOrders()
 		},
-		checkedOrder(order,index) {
+		checkedOrder(order, index) {
 			// 勾选关联订单
 			this.checkedIndex = index
 			this.orderList.forEach((el, index) => {
@@ -386,43 +356,50 @@ export default {
 					el.isChecked = false
 				}
 			})
-			console.log('shopOrderId',this.confirmParams.shopOrderId)
-			console.log('returnBrokerage',this.returnBrokerage)
+			console.log('shopOrderId', this.confirmParams.shopOrderId)
+			console.log('returnBrokerage', this.returnBrokerage)
 		},
-		handleClick() {
-			//用户操作订单
-			if(this.confirmParams.verbalAmount == 0){
-				this.$util.msg('请输入口头返佣金!', 2000)
+		confirmDistinguish() {
+			// 点击确认
+			const list = []
+			this.checkedOrderList.forEach(el => {
+				if (list.indexOf(el.userId) == -1) {
+					list.push(el.userId)
+				}
+			})
+			if (this.confirmParams.shopOrderId == 0) {
+				this.$util.msg('请选择订单!', 2000)
 				return
 			}
-			if(this.confirmParams.verbalAmount != this.returnBrokerage){
-				this.modal = false
+			if (this.receiptInfo.receiptAmount != this.returnBrokerage) {
 				this.modal1 = true
 				return
-			}else{
-				this.modal = false
-				this.orderReceiptConfirm(this.confirmParams)
+			} else {
+				this.modal = true
 			}
 		},
-		handleClick1() {
-			//隐藏弹窗
-			this.modal1 = false
+		handleClick(e){// 确认关联返佣订单
+			// 通过审核
+			if (e.index == 1) { 
+				this.orderReceiptConfirm(this.confirmParams)
+			}
+			this.modal = false
 		},
-		orderReceiptConfirm(params){
+		orderReceiptConfirm(params) {
 			//确认关联返佣
-			this.OrderService.orderReceiptConfirmRebateVerbal(params)
+			this.OrderService.orderReceiptConfirmRebate(params)
 				.then(response => {
 					this.$util.msg('关联成功~', 2000, true, 'success')
-					setTimeout(()=>{
-						this.$api.navigateTo(`/pages/relation/return/detail?id=${response.data}`)
-					},2000)
+					setTimeout(() => {
+						this.$api.navigateTo(`/pages/relation/return/detail?id=${params.id}`)
+					}, 2000)
 				})
 				.catch(error => {
 					this.$util.msg(error.msg, 2000)
 				})
 		},
 		hideMobel(type) {
-			switch(type){
+			switch (type) {
 				case 0:
 					this.modal = false
 					break
@@ -453,7 +430,8 @@ export default {
 			this.confirmParams.receiptAmount = this.toFixedFn(e.detail.value)
 			console.log('receiptAmount', this.confirmParams.receiptAmount)
 		},
-		toFixedFn(val){//处理小数点后两位数
+		toFixedFn(val) {
+			//处理小数点后两位数
 			return Number(Math.round(val * 100) / 100).toFixed(2)
 		},
 		orderDetail(id) {
@@ -462,6 +440,30 @@ export default {
 		},
 		toNoSms(url) {
 			this.$api.navigateTo(url)
+		},
+		initListQuery() {
+			// 初始化
+			this.orderList = []
+			this.loadding = true
+			this.pullUpOn = true
+			this.listQuery.pageNum = 1
+		},
+		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) {
@@ -486,27 +488,24 @@ export default {
 	},
 	onPullDownRefresh() {
 		setTimeout(() => {
-			this.listQuery.pageNum = 1
 			this.getOrderReceiptRebateOrders()
 			uni.stopPullDownRefresh()
 		}, 200)
 	},
 	onShareAppMessage(res) {
 		//分享购买优惠券
-		const payment = res.target.dataset.payment
-		console.log('payment', payment)
+		const receipt = this.receiptInfo
+		const receiptTypeText = this.formatReceiptType(receipt.receiptType)
 		if (res.from === 'button') {
 			// console.log('来自页面内转发按钮')
-			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'
-			}
+		}
+		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'
 		}
 	},
-	onShow() {
-		
-	}
+	onShow() {}
 }
 </script>
 
@@ -558,7 +557,7 @@ page {
 		font-weight: 600;
 		font-family: '正楷';
 	}
-	.icon-fanhui {
+	.iconfont {
 		display: block;
 		width: 80rpx;
 		height: 80rpx;
@@ -661,7 +660,7 @@ page {
 			line-height: 40rpx;
 			color: #666666;
 			text-align: left;
-			.text{
+			.text {
 				color: #999999;
 			}
 			.list-title-b-item {
@@ -684,7 +683,7 @@ page {
 			top: 0;
 			color: #dd524d;
 			z-index: 99;
-			.list-icon-image{
+			.list-icon-image {
 				width: 120rpx;
 				height: 120rpx;
 				display: block;
@@ -889,7 +888,7 @@ page {
 		border-radius: 4rpx;
 		background-color: rgba(247, 247, 247, 1);
 		margin-bottom: 10rpx;
-		.text{
+		.text {
 			color: #999999;
 		}
 		.list-title-a-text {
@@ -910,7 +909,7 @@ page {
 		line-height: 44rpx;
 		color: #666666;
 		text-align: left;
-		.text{
+		.text {
 			color: #999999;
 		}
 		.list-title-b-item {
@@ -923,21 +922,21 @@ page {
 		}
 	}
 }
-.tui-prompt-title{
+.tui-prompt-title {
 	line-height: 44rpx;
 	text-align: center;
 }
-.tui-prompt-input{
+.tui-prompt-input {
 	width: 100%;
 	height: 80rpx;
 	box-sizing: border-box;
 	background: #f7f7f7;
 	border-radius: 8rpx;
-	padding:15rpx 20rpx;
+	padding: 15rpx 20rpx;
 	padding-left: 50rpx;
 	margin: 20rpx 0;
 	position: relative;
-	.text{
+	.text {
 		display: block;
 		width: 50rpx;
 		height: 80rpx;
@@ -954,36 +953,38 @@ page {
 		line-height: 80rpx;
 		font-size: $font-size-26;
 		color: $color-system;
+		&.none {
+			display: none;
+		}
 	}
 }
-.tui-prompt-flex{
+.tui-prompt-flex {
 	width: 100%;
 	height: 70rpx;
 	display: flex;
 	margin-top: 20rpx;
-	.btn{
+	.btn {
 		flex: 1;
 		line-height: 70rpx;
 		font-size: $font-size-26;
 		text-align: center;
-		color: #FFFFFF;
+		color: #ffffff;
 		border-radius: 33rpx;
 		margin: 0 24rpx;
-		&.btn-cancel{
-			background: #F7F7F7;
+		&.btn-cancel {
+			background: #f7f7f7;
 			color: #999999;
 		}
-		&.btn-confirm{
+		&.btn-confirm {
 			background: $color-system;
 		}
 	}
-	
 }
-.tui-prompt-text{
+.tui-prompt-text {
 	line-height: 44rpx;
 	font-size: $font-size-26;
 	color: #333333;
-	.text{
+	.text {
 		color: $color-system;
 	}
 }

pages/relation/return/list.vue

@@ -126,6 +126,7 @@
 					<text class="text">￥</text>
 					<input 
 						class="input" 
+						:class="modal ? 'show' : 'none'"
 						type="number" 
 						placeholder="请输入口头约定佣金(必填)" 
 						@blur="changeNumber($event)" 
@@ -141,8 +142,6 @@
 	</view>
 </template>
 <script>
-import headerBack from '@/components/cm-module/headerNavbar/header-back' //自定义导航
-import modalLayer from '@/components/modal-layer'
 import empty from '@/components/empty'
 import wxLogin from '@/services/wxLogin.js'
 import { mapState, mapMutations } from 'vuex'
@@ -160,7 +159,7 @@ export default {
 		return {
 			CustomBar: this.CustomBar, // 顶部导航栏高度
 			isIphoneX: this.$store.state.isIphoneX,
-			skeletonShow:false,
+			skeletonShow:true,
 			listQuery: Object.assign({}, defaultListQuery),
 			orderList: [],
 			checkedOrderList: [],
@@ -208,6 +207,7 @@ export default {
 	methods: {
 		getOrderReceiptRebateOrders() {
 			// 收款详情-订单列表
+			this.initListQuery()
 			this.OrderService.orderReceiptRebateOrders(this.listQuery)
 				.then(response => {
 					let data = response.data
@@ -274,6 +274,10 @@ export default {
 					this.$util.msg(error.msg, 2000)
 				})
 		},
+		subMitSearch() {
+			// 确认搜索
+			this.getOrderReceiptRebateOrders()
+		},
 		confirmDistinguish() {
 			// 点击确认
 			const list = []
@@ -348,7 +352,6 @@ export default {
 		},
 		orderDetail(orderId) {
 			//订单详情跳转
-			this.isModalLayer = true
 			this.$api.navigateTo(`/pages/relation/order/detail?orderId=${orderId}`)
 		},
 		changeNumber(e) {
@@ -378,6 +381,12 @@ export default {
 		},
 		toNoSms(url) {
 			this.$api.navigateTo(url)
+		},
+		initListQuery(){// 初始化
+			this.orderList =[]
+			this.loadding = true
+			this.pullUpOn = true
+			this.listQuery.pageNum = 1
 		}
 	},
 	onPageScroll(e) {
@@ -402,9 +411,7 @@ export default {
 	},
 	onPullDownRefresh() {
 		setTimeout(() => {
-			this.listQuery.pageNum = 1
-			this.currents = 0
-			// this.getOrderDatainit(this.currents)
+			this.getOrderReceiptRebateOrders()
 			uni.stopPullDownRefresh()
 		}, 200)
 	},
@@ -751,6 +758,9 @@ page {
 		line-height: 80rpx;
 		font-size: $font-size-26;
 		color: $color-system;
+		&.none{
+			display: none;
+		}
 	}
 }
 .tui-prompt-flex{

services/order.service.js

@@ -134,8 +134,7 @@ export default class OrderService {
         return this.AjaxService.get({ 
             url:'/order/receipt/detail/orders', 
             data, 
-            isLoading: true ,
-            loadText: '请稍候...' 
+            isLoading: false
         })
     }
     /**
@@ -150,8 +149,7 @@ export default class OrderService {
         return this.AjaxService.get({ 
             url:'/order/receipt/refund/orders', 
             data, 
-            isLoading: true ,
-            loadText: '请稍候...' 
+            isLoading: false
         })
     }
     /**
@@ -205,8 +203,7 @@ export default class OrderService {
         return this.AjaxService.get({ 
             url:'/order/receipt/rebate/orders', 
             data, 
-            isLoading: true ,
-            loadText: '请稍候...' 
+            isLoading: false ,
         })
     }
     /**