收款工具修复测试

components/cm-module/receipt/receipt-details.vue

@@ -12,7 +12,7 @@
 				<view class="list-title-num">{{ order.status | stateExpFormat }}</view>
 			</view>
 			<view class="list-title-b">
-				客户名称：<text class="text">{{ order.userName }}</text>
+				客户名称：<text class="text">{{ order.userName ? order.userName : '无' }}</text>
 			</view>
 			<view class="list-title-b">
 				订单编号：<text class="text">{{ order.orderNo }} ( {{ order.orderId }} )</text>

components/cm-module/receipt/receipt-modal.vue

@@ -22,7 +22,7 @@
 					</view>
 					<view class="tui-prompt-text">
 						剩余应收：<text class="text"
-							>￥{{ (amount - hanldOrder.surplusAmount) | NumFormat }}({{
+							>￥{{ (hanldOrder.surplusAmount - amount ) | NumFormat }}({{
 								hanldOrder.orderNums
 							}}个订单)</text
 						>

components/cm-module/receipt/receipt-orderDetails.vue

@@ -140,11 +140,11 @@ export default {
 			//设置邀请码状态亚瑟
 			let stateColor = '',
 				stateColorObject = {
-					1: '#FEAC20',
+					1: '#ff7900',
 					2: '#4cd964',
-					3: '#34CC8C',
-					4: '#F94B4B',
-					5: '#007aff'
+					3: '#19be6b',
+					4: '#ed3f14',
+					5: '#F74D54'
 				}
 			Object.keys(stateColorObject).forEach(function(key) {
 				if (key == state) {
@@ -199,6 +199,9 @@ export default {
 		padding: 12rpx 0;
 		&.item{
 			border-bottom: 1px solid #E1E1E1;
+			&:last-child{
+				border: none;
+			}
 		}
 		.list-title-t {
 			width: 100%;

pages.json

@@ -14,6 +14,13 @@
 				"navigationStyle":"custom"
 			}
 		},
+		{
+			"path": "pages/login/login-error",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle":"custom"
+			}
+		},
 		{
 			"path": "pages/collection/sms",
 			"style": {

pages/collection/detail.vue

@@ -324,14 +324,13 @@
 
 		.section-textarea {
 			width: 100%;
-			height: 180rpx;
+			height: 220rpx;
 			box-sizing: border-box;
 			padding: 20rpx;
 			background: #f7f7f7;
 			border-radius: 8rpx;
-
 			&.msg {
-				height: 180rpx;
+				height: 220rpx;
 				margin-bottom: 10rpx;
 			}
 

pages/collection/list.vue

@@ -78,12 +78,12 @@
 							<button class="list-shaore" 
 									open-type="share" 
 									:data-receipt="receipt" 
-									v-if="receipt.receiptType !=3 "
+									v-if="USER_TYPE!=1 && receipt.receiptType !=3 "
 								>
 								<text class="iconfont icon-fenxiang"></text>
 							</button>
 							<!-- 底部button -->
-							<list-button ref="listButton" :status="receipt.receiptStatus" :dataInfo="receipt"
+							<list-button ref="listButton" :status="receipt.receiptStatus" :dataInfo="receipt" v-if="USER_TYPE!=1"
 								@buttonConfirm="handButtonConfirm">
 							</list-button>
 						</view>
@@ -272,10 +272,9 @@
 					this.scrollH = res.windowWidth * 0.6
 				}
 			})
-			this.initGetStotage()
 		},
 		computed: {
-			...mapState(['hasLogin']),
+			...mapState(['hasLogin','USER_TYPE']),
 			startDate() {
 				return this.getDate('start')
 			},
@@ -285,6 +284,7 @@
 		},
 		methods: {
 			async initGetStotage() {
+				console.log('USER_TYPE',this.USER_TYPE)
 				this.getOrderDatainit()
 			},
 			getOrderDatainit() {
@@ -492,11 +492,11 @@
 				//设置邀请码状态亚瑟
 				let stateColor = '',
 					stateColorObject = {
-						1: '#FEAC20',
+						1: '#ff7900',
 						2: '#4cd964',
-						3: '#34CC8C',
-						4: '#F94B4B',
-						5: '#007aff'
+						3: '#19be6b',
+						4: '#ed3f14',
+						5: '#F74D54'
 					}
 				Object.keys(stateColorObject).forEach(function(key) {
 					if (key == state) {
@@ -620,7 +620,7 @@
 			}
 		},
 		onShow() {
-			
+			this.initGetStotage()
 		}
 	}
 </script>

pages/collection/sms.vue

@@ -101,7 +101,7 @@
 								class="input"
 								v-model="params.receiptAmount"
 								@blur="changeNumber($event)"
-								type="number"
+								type="text"
 								placeholder="请输入收款金额"
 							/>
 						</view>
@@ -182,7 +182,6 @@ const defaultParams = {
 	smsContent: '', // 收款短信
 	payType: null,
 	receiptType: 1, // 收款款项类型：1订单款，2非订单款，3返佣款 4订单款或者非订单款（因财务阶段无法区分订单非订单）, 5供应商退款
-	openid: null, // 微信openid
 	receiptAmount: '', //收款金额
 	handlingFee: '', //手续费
 	receiptDate: null // 收款时间
@@ -238,7 +237,6 @@ export default {
 			paymentTypeText: '普通款项', // 款项类型显示文案
 			banksTypeText: '', // 款项类型显示文案
 			params: {
-				orderFlag:null,
 				smsContent:'', // 收款短信
 				payType: null, //付款类型
 				receiptType: 1, // 收款款项类型：1订单款，2非订单款，3返佣款 4订单款或者非订单款（因财务阶段无法区分订单非订单）, 5供应商退款
@@ -247,6 +245,7 @@ export default {
 				receiptDate: null // 收款时间
 			},
 			handleCharge: 0,
+			handleReceiptAmount: 0,
 			isCheckedCharge: false,
 			isReceiptType: false,
 			contentModalTitle: '',
@@ -323,7 +322,7 @@ export default {
 					const data = response.data
 					this.params.payType = data.payType
 					this.params.orderFlag = data.orderFlag
-					this.params.receiptAmount = data.receiptAmount
+					this.params.receiptAmount = this.handleReceiptAmount = data.receiptAmount
 					this.params.receiptDate = data.receiptDate
 					this.handleCharge = this.params.handlingFee = data.handlingFee
 					this.receiptTypeActions.forEach(el => {
@@ -407,11 +406,11 @@ export default {
 			this.receiptType = 2
 			this.isConfirm = true
 			this.isReceiptType = false
+			this.isCheckedCharge = false
 			this.params = Object.assign(this.params, defaultParams)
 			this.params.receiptDate = this.$api.getNowFormatDate()
 			this.params.payType = this.receiptTypeActions[0].value
 			this.banksTypeText = this.receiptTypeActions[0].name
-			this.params.openid = this.openid
 		},
 		checkedSms() {
 			// 切换款项识别
@@ -437,24 +436,29 @@ export default {
 			if (this.receiptType == 1) {
 				// 短信收款处理勾选手续费
 				if (!this.isCheckedCharge) {
+					//未勾选手续费
 					this.params.handlingFee = 0
-					this.params.receiptAmount = this.params.receiptAmount - this.handleCharge
+					this.params.receiptAmount =(this.handleReceiptAmount*100 - this.handleCharge*100)/100
 				} else {
+					//已勾选手续费
 					this.params.handlingFee = this.handleCharge
-					this.params.receiptAmount = this.params.receiptAmount + this.params.handlingFee
+					this.params.receiptAmount =(this.params.receiptAmount*100 + this.params.handlingFee*100)/100
 				}
 			} else {
 				// 无短信收款处理勾选手续费计算
 				if (!this.isCheckedCharge) {
-					this.params.receiptAmount = this.params.receiptAmount - this.params.handlingFee
+					//未勾选手续费
+					console.log('未勾选手续费')
+					this.params.receiptAmount =(this.params.receiptAmount*100 - this.params.handlingFee*100)/100
 					this.params.handlingFee = ''
 				} else {
-					this.params.receiptAmount = this.params.receiptAmount + this.params.handlingFee
+					//已勾选手续费
+					console.log('已勾选手续费')
+					this.params.receiptAmount =(this.params.receiptAmount*100 + this.params.handlingFee*100)/100
 				}
 			}
 		},
 		handleClick(e) {
-			// 确认收款
 			// 确认收款
 			if (e.index == 1) {
 				this.getOrderReceiptSave()
@@ -467,14 +471,14 @@ export default {
 		},
 		changeNumber(e) {
 			// 校验输入为数字
-			this.params.receiptAmount = this.checkedNumberVal(e.detail.value)
+			this.params.receiptAmount = this.handleReceiptAmount = this.checkedNumberVal(e.detail.value)
 			console.log('receiptAmount', this.params.receiptAmount)
 		},
 		handlingFeeNumber(e) {
 			// 校验输入为数字
 			this.params.handlingFee = Number(this.checkedNumberVal(e.detail.value))
 			if (this.isCheckedCharge) {
-				this.params.receiptAmount = Number(this.params.receiptAmount) + this.params.handlingFee
+				this.params.receiptAmount = (Number(this.params.receiptAmount)*100 + this.params.handlingFee*100)/100
 			}
 		},
 		checkedNumberVal(val) {
@@ -669,7 +673,7 @@ page {
 	}
 	.section-textarea {
 		width: 100%;
-		height: 200rpx;
+		height: 220rpx;
 		box-sizing: border-box;
 		padding: 20rpx;
 		background: #f7f7f7;

pages/login/login-error.vue

@@ -0,0 +1,161 @@
+<template>
+	<view class="container">
+		<view
+			class="tui-header-box first"
+			:style="{ height: isCmcustomClass == 'fiexd' ? CustomBar + 6 + 'px' : CustomBar + 6 + 'px' }"
+			:class="isCmcustomClass"
+		>
+			<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(2)"></text>
+				<text class="header-sit-text"></text>
+			</view>
+		</view>
+		<view class="share-empty">
+			<view class="icon"><image :src="StaticUrl + '/image/icon-noaccess@2x.png'" mode="widthFix"></image></view>
+			<view class="text">暂无权限查看</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { mapMutations } from 'vuex'
+import authorize from '@/common/config/authorize.js' 
+export default {
+	computed: {
+		
+	},
+	data() {
+		return {
+			StaticUrl: this.$Static,
+			isIphoneX: this.$store.state.isIphoneX,
+			CustomBar: this.CustomBar, // 顶部导航栏高度
+			height: 64, //header高度
+			top: 0, //标题图标距离顶部距离
+			scrollH: 0, //滚动总高度
+			opcity: 1,
+			isCmcustomClass: 'left',
+		} 
+	},
+	onLoad(option) {
+		let obj = {}
+		// #ifdef MP-WEIXIN
+		obj = wx.getMenuButtonBoundingClientRect()
+		// #endif
+		// #ifdef MP-BAIDU
+		obj = swan.getMenuButtonBoundingClientRect()
+		// #endif
+		// #ifdef MP-ALIPAY
+		my.hideAddToDesktopMenu()
+		// #endif
+		uni.getSystemInfo({
+			success: res => {
+				this.width = obj.left || res.windowWidth
+				this.height = obj.top ? obj.top + obj.height + 8 : res.statusBarHeight + 44
+				this.top = obj.top ? obj.top + (obj.height - 32) / 2 : res.statusBarHeight + 6
+				this.scrollH = res.windowWidth * 0.6
+			}
+		})
+	},
+	methods: {
+		...mapMutations(['login', 'logout']),
+	},
+	onShow() {
+	}
+}
+</script>
+
+<style lang="scss">
+.container {
+	width: 100%;
+	height:100%;
+	background: #FFFFFF;
+	display: flex;
+	align-items: center;
+	justify-content:center;
+	.share-empty{
+		width: 260rpx;
+		height: 412rpx;
+		.icon{
+			width: 150rpx;
+			height: 150rpx;
+			margin: 0 auto;
+			image{
+				width: 100%;
+				height: 100%;
+				display: block;
+			}
+		}
+		.text{
+			font-size: $font-size-28;
+			line-height: 60rpx;
+			color: rgba(70,136,250,0.7);
+			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;
+		}
+	}
+}
+.tui-header-box {
+	width: 100%;
+	background: #ffffff;
+	z-index: 999;
+	position: fixed;
+	top: 0;
+	left: 0;
+	background-size: cover;
+	background-image: url(https://static.caimei365.com/app/crm/image/statistic_bg2.png);
+
+	&.fiexd {
+	}
+
+	&.first {
+	}
+}
+.header-top {
+	width: 100%;
+	font-size: 16px;
+	font-weight: 500;
+	height: 32px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	position: relative;
+	padding: 0 40rpx;
+}
+
+.header-sit {
+	width: 100%;
+	box-sizing: border-box;
+	height: 80rpx;
+	line-height: 80rpx;
+	box-sizing: border-box;
+	color: #ffffff;
+	.header-sit-text {
+		text-align: left;
+		font-size: $font-size-40;
+		font-weight: 600;
+		font-family: '正楷';
+	}
+	.iconfont {
+		display: block;
+		width: 80rpx;
+		height: 80rpx;
+		float: left;
+		text-align: center;
+		line-height: 80rpx;
+		font-size: 46rpx;
+	}
+}
+
+</style>

pages/login/login-share.vue

@@ -2,15 +2,25 @@
 	<view class="container">
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="7"></tui-skeleton>
 		<template v-else>
+			<view
+				class="tui-header-box first"
+				:style="{ height: isCmcustomClass == 'fiexd' ? CustomBar + 6 + 'px' : CustomBar + 6 + 'px' }"
+				:class="isCmcustomClass"
+			>
+				<view class="header-top" :style="{ paddingTop: top + 'px', lineHeight: CustomBar + 20 + 'px' }"></view>
+				<view class="header-sit">
+					<text v-if="isNoAuthority"
+						  class="iconfont icon-shouye1" 
+						  :style="{ top: CustomBar/2 + 'px',left:'24rpx'}"
+						  @click.stop="this.$api.navigateLinkJump()"
+						  >
+					</text>
+					<text class="header-sit-text"></text>
+				</view>
+			</view>
 			<view class="share-empty">
 				<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" 
-					  :style="{ top: CustomBar/2 + 'px',left:'24rpx'}"
-					  @click.stop="this.$api.navigateLinkJump()"
-					  >
-				</text>
 			</view>
 		</template>
 	</view>
@@ -27,6 +37,13 @@ export default {
 		return {
 			StaticUrl: this.$Static,
 			CustomBar:this.CustomBar,// 顶部导航栏高度
+			isIphoneX: this.$store.state.isIphoneX,
+			CustomBar: this.CustomBar, // 顶部导航栏高度
+			height: 64, //header高度
+			top: 0, //标题图标距离顶部距离
+			scrollH: 0, //滚动总高度
+			opcity: 1,
+			isCmcustomClass: 'left',
 			isNoAuthority:false,
 			skeletonShow:true,
 			receiptId:0,
@@ -35,6 +52,24 @@ export default {
 	},
 	onLoad(option) {
 		this.receiptId = option.id
+		let obj = {}
+		// #ifdef MP-WEIXIN
+		obj = wx.getMenuButtonBoundingClientRect()
+		// #endif
+		// #ifdef MP-BAIDU
+		obj = swan.getMenuButtonBoundingClientRect()
+		// #endif
+		// #ifdef MP-ALIPAY
+		my.hideAddToDesktopMenu()
+		// #endif
+		uni.getSystemInfo({
+			success: res => {
+				this.width = obj.left || res.windowWidth
+				this.height = obj.top ? obj.top + obj.height + 8 : res.statusBarHeight + 44
+				this.top = obj.top ? obj.top + (obj.height - 32) / 2 : res.statusBarHeight + 6
+				this.scrollH = res.windowWidth * 0.6
+			}
+		})
 	},
 	methods: {
 		...mapMutations(['login', 'logout']),
@@ -210,18 +245,57 @@ export default {
 			color: rgba(70,136,250,0.7);
 			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;
-		}
+	}
+}
+.tui-header-box {
+	width: 100%;
+	background: #ffffff;
+	z-index: 999;
+	position: fixed;
+	top: 0;
+	left: 0;
+	background-size: cover;
+	background-image: url(https://static.caimei365.com/app/crm/image/statistic_bg2.png);
+
+	&.fiexd {
+	}
+
+	&.first {
+	}
+}
+.header-top {
+	width: 100%;
+	font-size: 16px;
+	font-weight: 500;
+	height: 32px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	position: relative;
+	padding: 0 40rpx;
+}
+
+.header-sit {
+	width: 100%;
+	box-sizing: border-box;
+	height: 80rpx;
+	line-height: 80rpx;
+	box-sizing: border-box;
+	color: #ffffff;
+	.header-sit-text {
+		text-align: left;
+		font-size: $font-size-40;
+		font-weight: 600;
+		font-family: '正楷';
+	}
+	.icon-shouye1{
+		display: block;
+		width: 80rpx;
+		height: 80rpx;
+		float: left;
+		text-align: center;
+		line-height: 80rpx;
+		font-size: 48rpx;
 	}
 }
 </style>

pages/relation/nonorder/detail.vue

@@ -222,7 +222,7 @@ export default {
 					this.skeletonShow = false
 				})
 				.catch(err => {
-					this.$util.msg(err.msg, 2000)
+					this.$api.navigateTo('/pages/login/login-error')
 				})
 		},
 		toNoSms(url) {
@@ -232,10 +232,11 @@ export default {
 			//设置邀请码状态亚瑟
 			let stateColor = '',
 				stateColorObject = {
-					0: '#4cd964',
-					1: '#4cd964',
+					1: '#ff7900',
 					2: '#4cd964',
-					3: '#007aff'
+					3: '#19be6b',
+					4: '#ed3f14',
+					5: '#F74D54'
 				}
 			Object.keys(stateColorObject).forEach(function(key) {
 				if (key == state) {

pages/relation/order/detail.vue

@@ -231,14 +231,14 @@ export default {
 			this.$api.navigateTo(url)
 		},
 		formatColor(state) {
-			//设置颜色
+			//设置邀请码状态亚瑟
 			let stateColor = '',
 				stateColorObject = {
-					1: '#FEAC20',
+					1: '#ff7900',
 					2: '#4cd964',
-					3: '#34CC8C',
-					4: '#F94B4B',
-					5: '#007aff'
+					3: '#19be6b',
+					4: '#ed3f14',
+					5: '#F74D54'
 				}
 			Object.keys(stateColorObject).forEach(function(key) {
 				if (key == state) {

pages/relation/ordinary/detail.vue

@@ -34,9 +34,9 @@
 					<view class="title">
 						<view class="title-text">收款信息</view>
 					</view>
-					<view class="button" @click="toNoSms('/pages/collection/list')">
+<!-- 					<view class="button" @click="toNoSms('/pages/collection/list')">
 						<text class="iconfont icon-wodedingdan"></text> 收款列表
-					</view>
+					</view> -->
 				</view>
 				<view class="section-top-item">
 					<view class="list-title-t">
@@ -45,15 +45,13 @@
 						</view>
 					</view>
 					<view class="list-title-b">
-						<view class="list-title-b-item ">
-							收款金额：<text class="text">￥{{ receiptInfo.receiptAmount | NumFormat }}</text>
-						</view>
-						<view class="list-title-b-item ">
-							收款类型：<text class="text">{{ receiptInfo.payTypeText }}</text>
-						</view>
+						收款金额：<text class="text">￥{{ receiptInfo.receiptAmount | NumFormat }}</text>
+					</view>
+					<view class="list-title-b">
+						收款类型：<text class="text">{{ receiptInfo.payTypeText }}</text>
 					</view>
 					<view class="list-title-b">
-						款时间：<text class="text">{{ receiptInfo.receiptDate }}</text>
+						收款时间：<text class="text">{{ receiptInfo.receiptDate }}</text>
 					</view>
 					<template v-if="receiptInfo.smsContent">
 						<view class="list-title-b">收款短信：</view>
@@ -177,7 +175,7 @@ export default {
 					},1000)
 				})
 				.catch(err => {
-					this.$util.msg(err.msg, 2000)
+					this.$api.navigateTo('/pages/login/login-error')
 				})
 		},
 		orderDetail(orderId) {
@@ -188,14 +186,14 @@ export default {
 			this.$api.navigateTo(url)
 		},
 		formatColor(state) {
-			//设置颜色
+			//设置邀请码状态亚瑟
 			let stateColor = '',
 				stateColorObject = {
-					1: '#FEAC20',
+					1: '#ff7900',
 					2: '#4cd964',
-					3: '#34CC8C',
-					4: '#F94B4B',
-					5: '#007aff'
+					3: '#19be6b',
+					4: '#ed3f14',
+					5: '#F74D54'
 				}
 			Object.keys(stateColorObject).forEach(function(key) {
 				if (key == state) {
@@ -416,7 +414,7 @@ page {
 				float: left;
 			}
 			&.sms {
-				height: 120rpx;
+				height: auto;
 				padding: 10rpx;
 				border-radius: 4rpx;
 				background: #f7f7f7;

pages/relation/ordinary/examine-detail.vue

@@ -21,16 +21,16 @@
 			:isLoading="true"
 			:loadingType="7"
 		></tui-skeleton>
-		<view class="distinguish-section" v-else :style="{ top: CustomBar - 4 + 'px', left: 0 + 'px' }">
+		<view class="distinguish-section" v-else :style="{ top: CustomBar - 4 + 'px', left: 0 + 'px', paddingBottom: isIphoneX ? '148rpx' : '104rpx'  }">
 			<view class="distinguish-section-conten">
 				<view class="section-top">
 					<view class="title">
 						<view class="title-text">收款信息</view>
 					</view>
-					<view class="button" @click="toNoSms('/pages/collection/list')">
+<!-- 					<view class="button" @click="toNoSms('/pages/collection/list')">
 						<text class="iconfont icon-wodedingdan"></text>
 						收款列表
-					</view>
+					</view> -->
 				</view>
 				<view class="section-top-item">
 					<view class="list-title-t">
@@ -39,12 +39,10 @@
 						</view>
 					</view>
 					<view class="list-title-b">
-						<view class="list-title-b-item "> 
-							收款金额：<text class="text">￥{{ receiptInfo.receiptAmount | NumFormat }} </text>
-						</view>
-						<view class="list-title-b-item "> 
-							收款类型：<text class="text">{{ receiptInfo.payTypeText }} </text>
-						</view>
+						收款金额：<text class="text">￥{{ receiptInfo.receiptAmount | NumFormat }}</text>
+					</view>
+					<view class="list-title-b">
+						收款类型：<text class="text">{{ receiptInfo.payTypeText }}</text>
 					</view>
 					<view class="list-title-b">
 						收款时间：<text class="text">{{ receiptInfo.receiptDate }}</text>
@@ -206,7 +204,7 @@
 						},1000)
 					})
 					.catch(err => {
-						this.$util.msg(err.msg, 2000)
+						this.$api.navigateTo('/pages/login/login-error')
 					})
 			},
 			orderReceiptAudit(params){
@@ -216,7 +214,7 @@
 					this.$util.msg('操作成功~', 2000, true, 'success')
 					setTimeout(()=>{
 						if(this.params.receiptStatus == 3){//通过审核跳转
-							this.$api.navigateTo(`/pages/relation/ordinary/detail?id=${this.params.id}`)
+							this.$api.redirectTo(`/pages/relation/ordinary/detail?id=${this.params.id}`)
 						}else{//不通过审核跳转
 							this.$api.navigateTo(`/pages/relation/ordinary/index?id=${this.params.id}`)
 						}
@@ -500,7 +498,7 @@
 					float: left;
 				}
 				&.sms {
-					height: 120rpx;
+					height: auto;
 					padding: 10rpx;
 					border-radius: 4rpx;
 					background: #F7F7F7;

pages/relation/ordinary/index.vue

@@ -94,7 +94,7 @@
 						v-model="listQuery.keyword"
 						confirm-type="search"
 						@confirm="subMitSearch(1)"
-						placeholder="搜索关键词(客户名称/订单号)"
+						placeholder="搜索关键词(客户名称/订单ID)"
 					/>
 					<text class="iconfont icon-sousuo"></text>
 				</view>
@@ -353,7 +353,7 @@ export default {
 					this.getOrderReceiptOrders()
 				})
 				.catch(err => {
-					this.$util.msg(err.msg, 2000)
+					this.$api.navigateTo('/pages/login/login-error')
 				})
 		},
 		getOrderReceiptOrders() {
@@ -456,8 +456,8 @@ export default {
 						}
 					}
 				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
+				.catch(err => {
+					this.$util.msg(err.msg, 2000)
 				})
 		},
 		orderReceiptOrdersBottom() {
@@ -486,8 +486,8 @@ export default {
 						}
 					}
 				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
+				.catch(err => {
+					this.$util.msg(err.msg, 2000)
 				})
 		},
 		subMitSearch(type) {
@@ -630,22 +630,22 @@ export default {
 				.then(response => {
 					this.$util.msg('关联成功~', 2000, true, 'success')
 					setTimeout(() => {
-						this.$api.navigateTo(`/pages/relation/refund/detail?id=${this.confirmRefundParams.id}`)
+						this.$api.redirectTo(`/pages/relation/refund/detail?id=${this.confirmRefundParams.id}`)
 					}, 2000)
 				})
-				.catch(error => {
+				.catch(err => {
 					this.modal3 = true
-					this.contentModalText = error.msg
+					this.contentModalText = err.msg
 				})
 		},
 		orderReceiptConfirm() {
 			//确认关联订单或抹平或退款余额
 			this.OrderService.orderReceiptConfirm(this.confirmParams)
 				.then(response => {
-					this.$api.navigateTo(`/pages/relation/ordinary/examine-detail?id=${this.confirmParams.id}`)
+					this.$api.redirectTo(`/pages/relation/ordinary/examine-detail?id=${this.confirmParams.id}`)
 				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
+				.catch(err => {
+					this.$util.msg(err.msg, 2000)
 				})
 		},
 		checkedOrder(order) {
@@ -656,6 +656,7 @@ export default {
 			} else {
 				this.checkedOrderList.splice(this.checkedOrderList.indexOf(order), 1)
 			}
+			console.log('checkedOrderList',this.checkedOrderList)
 		},
 		checkedRefundOrder(order, index) {
 			// 勾选退款子订单
@@ -688,14 +689,14 @@ export default {
 			}
 		},
 		formatColor(state) {
-			//设置颜色
+			//设置邀请码状态亚瑟
 			let stateColor = '',
 				stateColorObject = {
-					1: '#FEAC20',
+					1: '#ff7900',
 					2: '#4cd964',
-					3: '#34CC8C',
-					4: '#F94B4B',
-					5: '#007aff'
+					3: '#19be6b',
+					4: '#ed3f14',
+					5: '#F74D54'
 				}
 			Object.keys(stateColorObject).forEach(function(key) {
 				if (key == state) {
@@ -763,6 +764,7 @@ export default {
 			this.loadding = true
 			this.pullUpOn = true
 			this.orderList = []
+			this.checkedOrderList=[]
 			this.listQuery.pageNum = 1
 		},
 		formatReceiptType(value) {
@@ -996,6 +998,15 @@ page {
 				height: 100rpx;
 				padding: 10rpx;
 				border-radius: 4rpx;
+				.text{
+					height: 100%;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					line-clamp: 2;
+					-webkit-box-orient: vertical;
+				}
 			}
 		}
 		.list-icon {

pages/relation/refund/detail.vue

@@ -27,10 +27,10 @@
 					<view class="title">
 						<view class="title-text">收款信息</view>
 					</view>
-					<view class="button" @click="toNoSms('/pages/collection/list')">
+<!-- 					<view class="button" @click="toNoSms('/pages/collection/list')">
 						<text class="iconfont icon-wodedingdan"></text>
 						收款列表
-					</view>
+					</view> -->
 				</view>
 				<view class="section-top-item">
 					<view class="list-title-t">
@@ -39,12 +39,10 @@
 						</view>
 					</view>
 					<view class="list-title-b">
-						<view class="list-title-b-item ">
-							收款金额：<text class="text">￥{{ receiptInfo.receiptAmount | NumFormat }}</text>
-						</view>
-						<view class="list-title-b-item ">
-							收款类型：<text class="text">{{ receiptInfo.payTypeText }}</text>
-						</view>
+						收款金额：<text class="text">￥{{ receiptInfo.receiptAmount | NumFormat }}</text>
+					</view>
+					<view class="list-title-b">
+						收款类型：<text class="text">{{ receiptInfo.payTypeText }}</text>
 					</view>
 					<view class="list-title-b">
 						款时间：<text class="text">{{ receiptInfo.receiptDate }}</text>
@@ -198,7 +196,7 @@
 						this.receiptInfo = response.data
 					})
 					.catch(err => {
-						this.$util.msg(err.msg, 2000)
+						this.$api.navigateTo('/pages/login/login-error')
 					})
 			},
 			getOrderReceiptRebateOrders() {// 收款详情-订单列表
@@ -225,14 +223,14 @@
 				this.$api.navigateTo(url)
 			},
 			formatColor(state) {
-				//设置颜色
+				//设置邀请码状态亚瑟
 				let stateColor = '',
 					stateColorObject = {
-						1: '#FEAC20',
+						1: '#ff7900',
 						2: '#4cd964',
-						3: '#34CC8C',
-						4: '#F94B4B',
-						5: '#007aff'
+						3: '#19be6b',
+						4: '#ed3f14',
+						5: '#F74D54'
 					}
 				Object.keys(stateColorObject).forEach(function(key) {
 					if (key == state) {
@@ -455,7 +453,7 @@
 					float: left;
 				}
 				&.sms {
-					height: 120rpx;
+					height: auto;
 					padding: 10rpx;
 					border-radius: 4rpx;
 					background: #F7F7F7;

pages/relation/refund/index.vue

@@ -259,7 +259,7 @@ export default {
 					this.getOrderReceiptRefundOrders()
 				})
 				.catch(err => {
-					this.$util.msg(err.msg, 2000)
+					this.$api.navigateTo('/pages/login/login-error')
 				})
 		},
 		getOrderReceiptRefundOrders() {
@@ -296,8 +296,8 @@ export default {
 					}
 					this.skeletonShow = false
 				})
-				.catch(err => {
-					this.$util.msg(err.msg, 2000)
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
 				})
 		},
 		getOnReachBottomData(index) {
@@ -370,7 +370,7 @@ export default {
 				.then(response => {
 					this.$util.msg('关联成功~', 2000, true, 'success')
 					setTimeout(()=>{
-						this.$api.navigateTo(`/pages/relation/refund/detail?id=${this.confirmRefundParams.id}`)
+						this.$api.redirectTo(`/pages/relation/refund/detail?id=${this.confirmRefundParams.id}`)
 					},2000)
 				})
 				.catch(error => {
@@ -389,14 +389,14 @@ export default {
 			}
 		},
 		formatColor(state) {
-			//设置颜色
+			//设置邀请码状态亚瑟
 			let stateColor = '',
 				stateColorObject = {
-					1: '#FEAC20',
+					1: '#ff7900',
 					2: '#4cd964',
-					3: '#34CC8C',
-					4: '#F94B4B',
-					5: '#007aff'
+					3: '#19be6b',
+					4: '#ed3f14',
+					5: '#F74D54'
 				}
 			Object.keys(stateColorObject).forEach(function(key) {
 				if (key == state) {
@@ -644,6 +644,15 @@ page {
 				height: 100rpx;
 				padding: 10rpx;
 				border-radius: 4rpx;
+				.text{
+					height: 100%;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					line-clamp: 2;
+					-webkit-box-orient: vertical;
+				}
 			}
 		}
 		.list-icon {

pages/relation/return/detail.vue

@@ -28,10 +28,10 @@
 					<view class="title">
 						<view class="title-text">收款信息</view>
 					</view>
-					<view class="button" @click="toNoSms('/pages/collection/list')">
+<!-- 					<view class="button" @click="toNoSms('/pages/collection/list')">
 						<text class="iconfont icon-wodedingdan"></text>
 						收款列表
-					</view>
+					</view> -->
 				</view>
 				<view class="section-top-item">
 					<view class="list-title-t">
@@ -40,12 +40,10 @@
 						</view>
 					</view>
 					<view class="list-title-b">
-						<view class="list-title-b-item ">
-							收款金额：<text class="text">￥{{ receiptInfo.receiptAmount | NumFormat }}</text>
-						</view>
-						<view class="list-title-b-item ">
-							收款类型：<text class="text">{{ receiptInfo.payTypeText }}</text>
-						</view>
+						收款金额：<text class="text">￥{{ receiptInfo.receiptAmount | NumFormat }}</text>
+					</view>
+					<view class="list-title-b">
+						收款类型：<text class="text">{{ receiptInfo.payTypeText }}</text>
 					</view>
 					<view class="list-title-b">
 						款时间：<text class="text">{{ receiptInfo.receiptDate }}</text>
@@ -194,7 +192,7 @@
 						this.receiptInfo = response.data
 					})
 					.catch(err => {
-						this.$util.msg(err.msg, 2000)
+						this.$api.navigateTo('/pages/login/login-error')
 					})
 			},
 			getOrderReceiptRebateOrders() {// 收款详情-订单列表
@@ -220,14 +218,14 @@
 				this.$api.navigateTo(url)
 			},
 			formatColor(state) {
-				//设置颜色
+				//设置邀请码状态亚瑟
 				let stateColor = '',
 					stateColorObject = {
-						1: '#FEAC20',
+						1: '#ff7900',
 						2: '#4cd964',
-						3: '#34CC8C',
-						4: '#F94B4B',
-						5: '#007aff'
+						3: '#19be6b',
+						4: '#ed3f14',
+						5: '#F74D54'
 					}
 				Object.keys(stateColorObject).forEach(function(key) {
 					if (key == state) {
@@ -449,7 +447,7 @@
 					float: left;
 				}
 				&.sms {
-					height: 120rpx;
+					height: auto;
 					padding: 10rpx;
 					border-radius: 4rpx;
 					background: #F7F7F7;

pages/relation/return/index.vue

@@ -268,7 +268,7 @@ export default {
 					this.getOrderReceiptRebateOrders()
 				})
 				.catch(err => {
-					this.$util.msg(err.msg, 2000)
+					this.$api.navigateTo('/pages/login/login-error')
 				})
 		},
 		getOrderReceiptRebateOrders() {
@@ -305,8 +305,8 @@ export default {
 					}
 					this.skeletonShow = false
 				})
-				.catch(err => {
-					this.$util.msg(err.msg, 2000)
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
 				})
 		},
 		getOnReachBottomData(index) {
@@ -391,7 +391,7 @@ export default {
 				.then(response => {
 					this.$util.msg('关联成功~', 2000, true, 'success')
 					setTimeout(() => {
-						this.$api.navigateTo(`/pages/relation/return/detail?id=${params.id}`)
+						this.$api.redirectTo(`/pages/relation/return/detail?id=${params.id}`)
 					}, 2000)
 				})
 				.catch(error => {
@@ -409,14 +409,14 @@ export default {
 			}
 		},
 		formatColor(state) {
-			//设置颜色
+			//设置邀请码状态亚瑟
 			let stateColor = '',
 				stateColorObject = {
-					1: '#FEAC20',
+					1: '#ff7900',
 					2: '#4cd964',
-					3: '#34CC8C',
-					4: '#F94B4B',
-					5: '#007aff'
+					3: '#19be6b',
+					4: '#ed3f14',
+					5: '#F74D54'
 				}
 			Object.keys(stateColorObject).forEach(function(key) {
 				if (key == state) {
@@ -672,6 +672,15 @@ page {
 				height: 100rpx;
 				padding: 10rpx;
 				border-radius: 4rpx;
+				.text{
+					height: 100%;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					line-clamp: 2;
+					-webkit-box-orient: vertical;
+				}
 			}
 		}
 		.list-icon {

pages/relation/return/list.vue

@@ -363,14 +363,14 @@ export default {
 			return Number(Math.round(val * 100) / 100).toFixed(2)
 		},
 		formatColor(state) {
-			//设置颜色
+			//设置邀请码状态亚瑟
 			let stateColor = '',
 				stateColorObject = {
-					1: '#FEAC20',
+					1: '#ff7900',
 					2: '#4cd964',
-					3: '#34CC8C',
-					4: '#F94B4B',
-					5: '#007aff'
+					3: '#19be6b',
+					4: '#ed3f14',
+					5: '#F74D54'
 				}
 			Object.keys(stateColorObject).forEach(function(key) {
 				if (key == state) {

store/index.js

@@ -9,6 +9,7 @@ const store = new Vuex.Store({
         isWxAuthorize: false,
         hasLogin: false,
         userInfo: {},
+        USER_TYPE:4,
         wechatUserInfo: {},
         isIphoneX: false,
         isActivity: false,
@@ -16,9 +17,10 @@ const store = new Vuex.Store({
         isLoginProductId: 0
     },
     mutations: {
-        login(state, provider) { //用户身份 1、协销 2、资质机构 3、供应商 4.个人机构
+        login(state, provider) { //用户身份 1协销人员,2客服,3财务,4超级管理员
             state.hasLogin = true
             state.userInfo = provider
+            state.USER_TYPE = provider.userType
             uni.setStorage({ //缓存用户登陆状态
                 key: 'userInfo',
                 data: provider