收款工具优化

pages/collection/detail.vue

@@ -171,7 +171,7 @@
 			if (res.from === 'button') {
 				// console.log('来自页面内转发按钮')
 				return {
-					title: `【${receipt.receiptStatusText}(${receiptTypeText})】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
+					title: `￥${receipt.receiptAmount.toFixed(2)} | ${receipt.receiptDate}  |  ${receipt.receiptStatusText}(${receiptTypeText})`,
 					path: `/pages/login/login-share?id=${receipt.id}`,
 					imageUrl: 'https://static.caimei365.com/app/crm/image/icon-share@2x.jpg'
 				}

pages/collection/list.vue

@@ -175,7 +175,7 @@
 			pageNum:1,	//页码
 			pageSize:10,	//每页数量
 			receiptStatus:0, //收款状态：0全部 1待确认、2已确认(待审核)、3审核通过、4审核未通过、5收款撤销【线上支付成功为审核通过】
-			receiptType:1,	//收款款项类型：1订单款，2非订单款，3返佣款 4订单款或者非订单款（因财务阶段无法区分订单非订单）, 5供应商退款
+			receiptType:1,	//收款款项类型：1订单款，2非订单款，3返佣款 , 5供应商退款
 			smsContent:'',	//收款短信
 			startDate:''//筛选开始时间
 	}
@@ -238,7 +238,7 @@
 			})
 		},
 		computed: {
-			...mapState(['USER_TYPE','handlebBtnVisible','returnBtnVisible']),
+			...mapState(['USER_TYPE','handlebBtnVisible','returnBtnVisible','handleListTabs']),
 			startDate() {
 				return this.getDate('start')
 			},
@@ -249,11 +249,7 @@
 		},
 		methods: {
 			async initGetStotage() {
-				if(this.USER_TYPE === 2){
-					this.listTabs = defaultServiceTabs
-				}else{
-					this.listTabs = defaultAllTabs
-				}
+				this.listTabs = this.handleListTabs
 				this.getOrderDatainit()
 			},
 			getOrderDatainit() {
@@ -555,7 +551,7 @@
 					}
 				})
 				return HtmlStateText
-			},
+			}
 		},
 		onPageScroll(e) {
 			//实时获取到滚动的值
@@ -580,7 +576,7 @@
 			if (res.from === 'button') {
 				// console.log('来自页面内转发按钮')
 				return {
-					title: `【${receipt.receiptStatusText}(${receiptTypeText})】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
+					title: `￥${receipt.receiptAmount.toFixed(2)} | ${receipt.receiptDate}  |  ${receipt.receiptStatusText}(${receiptTypeText})`,
 					path: `/pages/login/login-share?id=${receipt.id}`,
 					imageUrl: 'https://static.caimei365.com/app/crm/image/icon-share@2x.jpg'
 				}

pages/relation/nonorder/detail.vue

@@ -284,7 +284,7 @@ export default {
 			// console.log('来自页面内转发按钮')
 		}
 		return {
-			title: `【${receipt.receiptStatusText}[${receiptTypeText}]】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
+			title: `￥${receipt.receiptAmount.toFixed(2)} | ${receipt.receiptDate}  |  ${receipt.receiptStatusText}(${receiptTypeText})`,
 			path: `/pages/login/login-share?id=${receipt.id}`,
 			imageUrl: 'https://static.caimei365.com/app/crm/image/icon-share@2x.jpg'
 		}
@@ -451,7 +451,7 @@ page {
 				float: left;
 			}
 			&.sms {
-				height: 120rpx;
+				height: auto;
 				padding: 10rpx;
 				border-radius: 4rpx;
 				background: #f7f7f7;

pages/relation/ordinary/detail.vue

@@ -242,7 +242,7 @@ export default {
 			// console.log('来自页面内转发按钮')
 		}
 		return {
-			title: `【${receipt.receiptStatusText}[${receiptTypeText}]】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
+			title: `￥${receipt.receiptAmount.toFixed(2)} | ${receipt.receiptDate}  |  ${receipt.receiptStatusText}(${receiptTypeText})`,
 			path: `/pages/login/login-share?id=${receipt.id}`,
 			imageUrl: 'https://static.caimei365.com/app/crm/image/icon-share@2x.jpg'
 		}

pages/relation/ordinary/examine-detail.vue

@@ -334,7 +334,7 @@
 				// console.log('来自页面内转发按钮')
 			}
 			return {
-				title: `【${receipt.receiptStatusText}[${receiptTypeText}]】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
+				title: `￥${receipt.receiptAmount.toFixed(2)} | ${receipt.receiptDate}  |  ${receipt.receiptStatusText}(${receiptTypeText})`,
 				path: `/pages/login/login-share?id=${receipt.id}`,
 				imageUrl: 'https://static.caimei365.com/app/crm/image/icon-share@2x.jpg'
 			}

pages/relation/ordinary/index.vue

@@ -678,27 +678,29 @@ export default {
 		},
 		tabClick(type, index) {
 			this.pullUpOn = true //切换时隐藏
-			this.loadding = false //切换时隐藏
-			this.listQuery.type = 0 //切换是设置订单类型
+			this.loadding = false //切换时隐藏		
 			switch (type) {
 				case 1: // 切换订单类型
 					this.currents = index
 					this.tabCurrents = 0
 					switch (this.currents) {
 						case 0: // 商品订单
+							this.listQuery.type = 0
 							this.listQuery.organizeId = 0
 							this.getOrderReceiptOrders()
 							break
-						case 1:
+						case 1:// 定金订单
 							this.listQuery.type = 1
 							this.listQuery.organizeId = 0
 							this.getOrderReceiptOrders()
 							break
-						case 2:
+						case 2:// 维沙订单
+							this.listQuery.type = 0 
 							this.listQuery.organizeId = 3
 							this.getOrderReceiptOrders()
 							break
-						case 3:
+						case 3: // 供应商退款 （暂时停用,后续可视情况废除）
+							this.listQuery.type = 0 
 							this.refundListQuery.pageNum = 1
 							this.orderReceiptRefundOrders()
 							break
@@ -791,16 +793,13 @@ export default {
 			// console.log('来自页面内转发按钮')
 		}
 		return {
-			title: `【${receipt.receiptStatusText}[${receiptTypeText}]】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
+			title: `￥${receipt.receiptAmount.toFixed(2)} | ${receipt.receiptDate}  |  ${receipt.receiptStatusText}(${receiptTypeText})`,
 			path: `/pages/login/login-share?id=${receipt.id}`,
 			imageUrl: 'https://static.caimei365.com/app/crm/image/icon-share@2x.jpg'
 		}
 	},
 	onShow() {
-		this.$api.getComStorage('userInfo').then(resolve => {
-			this.listQuery.merchantId = resolve.id
-			// this.getOrderDatainit(this.currents)
-		})
+		
 	}
 }
 </script>

pages/relation/refund/detail.vue

@@ -278,7 +278,7 @@
 				// console.log('来自页面内转发按钮')
 			}
 			return {
-				title: `【${receipt.receiptStatusText}[${receiptTypeText}]】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
+				title: `￥${receipt.receiptAmount.toFixed(2)} | ${receipt.receiptDate}  |  ${receipt.receiptStatusText}(${receiptTypeText})`,
 				path: `/pages/login/login-share?id=${receipt.id}`,
 				imageUrl: 'https://static.caimei365.com/app/crm/image/icon-share@2x.jpg'
 			}

pages/relation/refund/index.vue

@@ -470,7 +470,7 @@ export default {
 			// console.log('来自页面内转发按钮')
 		}
 		return {
-			title: `【${receipt.receiptStatusText}[${receiptTypeText}]】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
+			title: `￥${receipt.receiptAmount.toFixed(2)} | ${receipt.receiptDate}  |  ${receipt.receiptStatusText}(${receiptTypeText})`,
 			path: `/pages/login/login-share?id=${receipt.id}`,
 			imageUrl: 'https://static.caimei365.com/app/crm/image/icon-share@2x.jpg'
 		}

pages/relation/return/detail.vue

@@ -273,7 +273,7 @@
 				// console.log('来自页面内转发按钮')
 			}
 			return {
-				title: `【${receipt.receiptStatusText}[${receiptTypeText}]】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
+				title: `￥${receipt.receiptAmount.toFixed(2)} | ${receipt.receiptDate}  |  ${receipt.receiptStatusText}(${receiptTypeText})`,
 				path: `/pages/login/login-share?id=${receipt.id}`,
 				imageUrl: 'https://static.caimei365.com/app/crm/image/icon-share@2x.jpg'
 			}

pages/relation/return/index.vue

@@ -500,7 +500,7 @@ export default {
 			// console.log('来自页面内转发按钮')
 		}
 		return {
-			title: `【${receipt.receiptStatusText}[${receiptTypeText}]】收款金额${receipt.receiptAmount.toFixed(2)}元,收款时间:${receipt.receiptDate}`,
+			title: `￥${receipt.receiptAmount.toFixed(2)} | ${receipt.receiptDate}  |  ${receipt.receiptStatusText}(${receiptTypeText})`,
 			path: `/pages/login/login-share?id=${receipt.id}`,
 			imageUrl: 'https://static.caimei365.com/app/crm/image/icon-share@2x.jpg'
 		}

pages/relation/return/list.vue

@@ -414,19 +414,6 @@ export default {
 			uni.stopPullDownRefresh()
 		}, 200)
 	},
-	onShareAppMessage(res) {
-		//分享购买优惠券
-		const payment = res.target.dataset.payment
-		console.log('payment', payment)
-		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/crm/image/icon-share@2x.jpg'
-			}
-		}
-	},
 	onShow() {
 		this.getOrderReceiptRebateOrders()
 	}

store/index.js

@@ -2,6 +2,12 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 import api from '../common/config/caimeiApi.js'
 import authorize from '../common/config/authorize.js'
+import { 
+    defaultAllTabs,
+    defaultServiceTabs ,
+    defaultReturnTabs,
+    defaultListTabsArr
+} from '../utils/config.tabs.js'
 
 Vue.use(Vuex)
 const handlebVisible = function(arr,val){
@@ -14,6 +20,7 @@ const store = new Vuex.Store({
         userInfo: {},
         USER_TYPE:4,
         isIphoneX: false,
+        handleListTabs:[],
         handlebBtnVisible:false, // 收款列表操作按钮显示控制
         returnBtnVisible:false,  // 收款列表口头返佣按钮显示控制
         examineBtnVisible:false, // 审核详情审核操作按钮显示控制
@@ -21,21 +28,39 @@ const store = new Vuex.Store({
     mutations: {
         login(state, provider) { 
             //用户身份 1协销人员,2客服,3财务,4超级管理员
-            //用户权限列表: permissions 1收款列表访问，2收款详情分享，3收款录入，4收款关联订单，5收款关联返佣，6收款关联供应商退款，7收款审核
+            /**
+			 * @用户权限:permissions
+			 * @1录入收款，2收款列表操作，3关联订单款，4关联返佣款，5口头返佣，6关联供应商退款，7审核订单款
+			 * @8收款详情分享，9非订单款查看(全部)，10订单款查看(全部),11返佣款查看(全部)，12供应商退款查看(全部)
+			 * @13订单款查看(协销自己机构)，14返佣款查看(协销自己机构)，15供应商退款查看(协销自己机构)
+			 **/
             state.hasLogin = true
             state.userInfo = provider
             state.USER_TYPE = provider.userType
-            if(handlebVisible(provider.permissions,2)){
+            if(handlebVisible(provider.permissions,4)){// 控制口头返佣按钮显示
+			    state.returnBtnVisible = true
+			    console.log('returnBtnVisible',state.returnBtnVisible)
+            }
+            if(handlebVisible(provider.permissions,7)){// 控制审核按钮显示
+			    state.examineBtnVisible = true
+			    console.log('examineBtnVisible',state.examineBtnVisible)
+            }
+            if(handlebVisible(provider.permissions,2)){// 控制操作按钮显示
                 state.handlebBtnVisible = true
                 console.log('handlebBtnVisible',state.handlebBtnVisible)
             }
-            if(handlebVisible(provider.permissions,5)){
-                state.returnBtnVisible = true
-                console.log('returnBtnVisible',state.returnBtnVisible)
-            }
-            if(handlebVisible(provider.permissions,7)){
-                state.examineBtnVisible = true
-                console.log('examineBtnVisible',state.examineBtnVisible)
+            if(provider.tabMenus){
+                state.handleListTabs = provider.tabMenus.map(tab => {
+				    let name
+				    switch(tab){
+				    case 1: name = '订单'; break
+				    case 2: name = '非订单'; break
+				    case 3: name = '返佣'; break
+				    case 5: name = '供应商退款'; break
+				    }
+				    return { name : name, type : tab }
+                })
+                console.log('handleListTabs',state.handleListTabs)
             }
             uni.setStorage({ //缓存用户登陆状态
                 key: 'userInfo',