协销组员订单查看

pages/seller/club/list.vue

@@ -398,7 +398,11 @@ export default {
 		orderHistory(club) {
 			//跳转机构历史订单
 			this.$api.setStorage('orderUserInfo', club)
-			this.$api.navigateTo(`/pages/seller/order/order-historylist?clubId=${club.clubId}&listType=0`)
+			if(this.tabSmallCurrentIndex === 1){// 查看组员机构历史订单
+				this.$api.navigateTo(`/pages/seller/order/order-historylist?clubId=${club.clubId}&listType=0&authType=${this.tabSmallCurrentIndex}`)
+			}else{
+				this.$api.navigateTo(`/pages/seller/order/order-historylist?clubId=${club.clubId}&listType=0`)
+			}
 		},
 		handleClubinfo(club) {
 			//跳转机构信息

pages/seller/components/cm-seller-address.vue

@@ -0,0 +1,164 @@
+<template name="address">
+	<view class="address-template">
+		 <!-- 地址信息 -->
+		 <view class="address-section">
+		 	<view class="address-content">
+				<view class="address-cen">
+					<view class="address">
+						<view class="address-icon">
+							<text class="iconfont icon-shouhuodizhi"></text>
+						</view>
+						<view class="address-text">
+							{{addressData.province ? addressData.province : ''}}
+							{{addressData.city ? addressData.city : ''}}
+							{{addressData.town ? addressData.town : ''}}
+							{{addressData.address ? addressData.address : ''}}
+						</view>
+					</view>
+				</view>
+		 	</view>
+		 </view>
+		 <image  src="../../../static/temp/line@3x.png" mode=""></image>
+	</view>
+</template>
+
+<script>
+	import { mapState, mapMutations } from 'vuex'	
+	export default{
+		name:"address",
+		props:{
+			addressData:{
+				type:Object
+			}
+		},
+		data() {
+			return{
+				initData:''
+			}
+		},
+		created(){
+			this.initData = this.addressData;
+		},
+		computed: {
+			...mapState(['isManage'])
+		},
+		methods:{
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.address-template{
+		width: 100%;
+		height: auto;
+		background: #FFFFFF;
+		// border-top: 1px solid #F8F8F8;
+		image{
+			float: left;
+			width: 100%;
+			height: 6rpx;
+		}
+	}
+	.address-section {
+		width: 100%;
+		height: auto;
+		float: left;
+		position: relative;
+		
+		.address-empty{
+			width: 100%;
+			height: 84rpx;
+			line-height: 84rpx;
+			color: $color-system;
+			text-align: center;
+			font-size: $font-size-26;
+			font-weight: bold;
+			background: #fff;
+			float: left;
+			.icon-tianjiadizhi{
+				font-size: 30rpx;
+				margin: 0 8rpx;
+			}
+		}
+		.address-content {
+			display: flex;
+			align-items: center;
+			padding:20rpx 24rpx;
+			background: #fff;
+		}
+		
+		.icon-shouhuodizhi {
+			flex-shrink: 0;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 40rpx;
+			color: $color-system;
+			font-size: 46rpx;
+			margin-right: 10rpx;
+		}	
+		.address-cen {
+			width: 100%;
+			height: auto;
+			position: relative;
+			.top{
+				padding-left: 50rpx;
+				height: 42rpx;
+				line-height: 42rpx;
+				text-align: left;
+				font-size: $font-size-30;
+				color: $text-color;
+				padding-bottom: 8rpx;
+				display: flex;
+				float: left;
+				.name{
+					margin-right: 48rpx;
+				}
+				.mobile{
+					margin-right: 40rpx;
+				}
+			}
+			.address {
+				width: 100%;
+				height: auto;
+				float: left;
+				.address-icon{
+					width: 40rpx;
+					height: auto;
+					float: left;
+					line-height: 40rpx;
+				}
+				.address-text{
+					width: 650rpx;
+					padding-left: 10rpx;
+					float: left;
+					line-height: 40rpx;
+					font-size: $font-size-28;
+					color: #666666;
+					text-align: left;
+					-o-text-overflow: ellipsis;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					word-break: break-all;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 2;
+					overflow: hidden;
+				}
+			}
+		}
+		.icon-xiayibu {
+			font-size: 32rpx;
+			color: $text-color;
+			margin-right: 30rpx;
+		}
+		.a-bg {
+			position: absolute;
+			left: 0;
+			bottom: 0;
+			display: block;
+			width: 100%;
+			height: 5rpx;
+		}
+	}
+</style>

pages/seller/order/order-club-details.vue

@@ -12,7 +12,7 @@
 				<view class="view-type">{{ information.status | TextFormat }}</view>
 				<view class="status-visible"> {{ information.orderSeen == 2 ? '订单对机构不可见' : '订单对机构可见' }} </view>
 				<view class="Rebate " v-if="information.rebateFlag == 1">返佣</view>
-				<text class="bage-name">【高琳琳】</text>
+				<text class="bage-name">【{{ information.serviceName ? information.serviceName : '' }}】</text>
 				<text class="bage-buss btn" v-if="information.orderSubmitType == 3 || information.orderSubmitType == 4"
 					>协销</text
 				>
@@ -54,7 +54,7 @@
 			<!-- 退款记录 -->
 			<refund-record
 				ref="refund"
-				v-if="isRequest"
+				v-if="!isManage"
 				:returnedPurchaseList="returnedPurchaseList"
 				:returnedPurchaseFee="returnedPurchaseFee"
 			></refund-record>
@@ -69,7 +69,7 @@
 				}}</label>
 			</view>
 			<!-- 底部button -->
-			<order-button
+<!-- 			<order-button
 				ref="orderButton"
 				v-if="isRequest"
 				:status="btnStatus"
@@ -81,7 +81,7 @@
 				:secondHandOrderFlag="information.secondHandOrderFlag"
 				@buttonConfirm="handButtonConfirm"
 			>
-			</order-button>
+			</order-button> -->
 		</view>
 		<!-- 付款弹窗 -->
 		<order-model
@@ -118,8 +118,9 @@
 </template>
 
 <script>
+import { mapState, mapMutations } from 'vuex'
 import headerBack from '@/components/cm-module/headerNavbar/header-back' //自定义导航
-import orderAddress from '@/components/cm-module/orderDetails/orderAddress' //地址信息
+import orderAddress from '../components/cm-seller-address.vue' //地址信息
 import goodsList from '@/components/cm-module/orderDetails/goodsList' //商品列表
 import invoiceTent from '@/components/cm-module/orderDetails/invoiceTent' //发票信息
 import orderInformation from '@/components/cm-module/orderDetails/orderInformation' //订单信息
@@ -243,6 +244,9 @@ export default {
 			return HtmlText
 		}
 	},
+	computed: {
+		...mapState(['isManage'])
+	},
 	methods: {
 		openclauseConten(id) {
 			this.$api.navigateTo(`/pages/service/sellconten?clauseId=${id}`)

pages/seller/order/order-historylist.vue

@@ -326,12 +326,14 @@ export default {
 			showAgan: false,
 			failList: [], // 再来一单可购买商品
 			promptitle: '',
-			aganOrderId: 0
+			aganOrderId: 0,
+			authType:0,
 		}
 	},
 	onLoad(option) {
 		let self = this
 		this.currentTab = option.listType
+		this.authType = option.authType
 		this.initDataInfo()
 		uni.getSystemInfo({
 			//  高度自适应
@@ -499,11 +501,20 @@ export default {
 		detail(order) {
 			//订单详情跳转
 			this.isModalLayer = true
-			this.$api.navigateTo(
-				`/pages/seller/order/order-club-details?listType=${this.currentTab}&orderId=${order.orderId}&userId=${
-					order.userId
-				}`
-			)
+			if(this.authType === '1'){
+				this.$api.navigateTo(
+					`/pages/seller/order/order-club-details?listType=${this.currentTab}&orderId=${order.orderId}&userId=${
+						order.userId
+					}`
+				)
+			}else{
+				this.$api.navigateTo(
+					`/pages/seller/order/order-details?listType=${this.currentTab}&orderId=${order.orderId}&userId=${
+						order.userId
+					}`
+				)
+			}
+			
 		},
 		handButtonConfirm(data) {
 			//获取点击

pages/seller/order/order-list.vue

@@ -87,7 +87,7 @@
 											>VIP</text
 										>
 										<text class="tags sv" v-if="order.svipUserFlag == 1">SVIP</text>
-										<view class="name" v-if="screenTab === 3"> {{ order.serviceName }} </view>
+										<view class="name" v-if="screenTab === 3">【 {{ order.serviceName ? order.serviceName : '' }} 】</view>
 									</view>
 									<view class="order-title-t">
 										<view class="Rebate " v-if="order.rebateFlag == 1">返佣</view>
@@ -391,7 +391,6 @@ export default {
 				self.winHeight = calc - self.CustomBar - 82
 			}
 		})
-		console.log('isManage', this.isManage)
 	},
 	filters: {
 		NumFormat(value) {
@@ -553,11 +552,19 @@ export default {
 		detail(order) {
 			//订单详情跳转
 			this.isModalLayer = true
-			this.$api.navigateTo(
-				`/pages/seller/order/order-details?listType=${this.currentTab}&orderId=${order.orderId}&userId=${
-					order.userId
-				}`
-			)
+			if(this.screenTab === 3){
+				this.$api.navigateTo(
+					`/pages/seller/order/order-club-details?listType=${this.currentTab}&orderId=${order.orderId}&userId=${
+						order.userId
+					}`
+				)
+			}else{
+				this.$api.navigateTo(
+					`/pages/seller/order/order-details?listType=${this.currentTab}&orderId=${order.orderId}&userId=${
+						order.userId
+					}`
+				)
+			}
 		},
 		handButtonConfirm(data) {
 			//获取点击