commit -m 协销分配+订单

pages/seller/club/club-info.vue

@@ -286,6 +286,12 @@ page {
 				font-size: 24rpx;
 				color: #999999;
 				text-align: right;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				display: -webkit-box;
+				-webkit-line-clamp: 1;
+				line-clamp: 1;
+				-webkit-box-orient: vertical;
 			}
 		}
 		.info-main {

pages/seller/club/list.vue

@@ -398,7 +398,7 @@ export default {
 		orderHistory(club) {
 			//跳转机构历史订单
 			this.$api.setStorage('orderUserInfo', club)
-			if(this.tabSmallCurrentIndex === 1){// 查看组员机构历史订单
+			if(this.tabSmallCurrentIndex === 1 || this.tabSmallCurrentIndex === 2){// 查看组员机构历史订单
 				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`)

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

@@ -27,7 +27,7 @@
 					</scroll-view>
 				</view>
 				<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
-					<view class="tui-flex-1"> <view class="tui-button" @click="hidePopup">确定</view> </view>
+					<view class="tui-flex-1"> <view class="tui-button" @click="confirmSeller">确定</view> </view>
 				</view>
 			</view>
 		</tui-bottom-popup>
@@ -83,7 +83,10 @@ export default {
 				}
 			})
 		},
-		hidePopup() {
+		hidePopup(){
+			this.$parent.isSellerpopup = false
+		},
+		confirmSeller() {
 			let sellerData = null
 			let checkedData = false
 			this.dataList.forEach((el, index) => {
@@ -92,9 +95,11 @@ export default {
 					checkedData = true
 				}
 			})
-			if (checkedData) {
-				this.$emit('handleChoiceaSeller', sellerData)
+			if(!checkedData){
+				this.$util.msg('请选择一个协销进行分配~', 2000)
+				return
 			}
+			this.$emit('handleChoiceaSeller', sellerData)
 			this.$parent.isSellerpopup = false
 		}
 	}

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">【{{ information.serviceName ? information.serviceName : '' }}】</text>
+				<text class="bage-name" v-if="information.serviceName">【{{ information.serviceName ? information.serviceName : '' }}】</text>
 				<text class="bage-buss btn" v-if="information.orderSubmitType == 3 || information.orderSubmitType == 4"
 					>协销</text
 				>

pages/seller/order/order-historylist.vue

@@ -501,7 +501,7 @@ export default {
 		detail(order) {
 			//订单详情跳转
 			this.isModalLayer = true
-			if(this.authType === '1'){
+			if(this.authType === '1' || this.authType === '2'){
 				this.$api.navigateTo(
 					`/pages/seller/order/order-club-details?listType=${this.currentTab}&orderId=${order.orderId}&userId=${
 						order.userId