协销管理员订单权限

pages/seller/club/club-info.vue

@@ -34,8 +34,20 @@
 						>手机号：<text>{{ clubInfo.contractMobile }}</text></view
 					>
 				</view>
-				<view class="info-main" v-if="clubInfo.userIdentity === 2">
-					<view class="info-h1">升级信息</view>
+				<view class="info-main" v-if="clubInfo.userIdentity === 2 || (clubInfo.userIdentity === 4 && (clubInfo.status == 1 || clubInfo.status == 92))">
+					<view class="info-h1"
+						>升级信息
+						<text
+							class="info-h1-tag"
+							:class="{
+								orange: clubInfo.status == 1,
+								grey: clubInfo.status == 90,
+								warn: clubInfo.status == 92
+							}"
+						>
+							{{ clubInfo.status | statusFilters }}
+						</text>
+					</view>
 					<view class="info-p"
 						>机构名称：<text>{{ clubInfo.name }}</text></view
 					>
@@ -53,14 +65,14 @@
 					>
 					<view class="info-p">营业执照:</view>
 					<view class="info-img"><image :src="clubInfo.businessLicense" alt=""/></view>
-					<view class="info-p">门头照:</view>
-					<view class="info-img"><image :src="clubInfo.shopPhoto" alt=""/></view>
+					<view class="info-p" v-if="clubInfo.shopPhoto">门头照:</view>
+					<view class="info-img" v-if="clubInfo.shopPhoto"><image :src="clubInfo.shopPhoto" alt=""/></view>
 					<view class="info-p"
 						>机构类型：<text>{{ clubInfo.firstClubType | FirstFormat }}</text></view
 					>
-					<view class="info-p">医疗许可证：</view>
-					<view class="info-img"><image :src="clubInfo.medicalPracticeLicense" alt=""/></view>
-					<view class="info-p"
+					<view class="info-p" v-if="clubInfo.medicalPracticeLicense">医疗许可证：</view>
+					<view class="info-img" v-if="clubInfo.medicalPracticeLicense"><image :src="clubInfo.medicalPracticeLicense" alt=""/></view>
+					<view class="info-p" v-if="clubInfo.secondClubType" 
 						>科室：<text>{{ clubInfo.secondClubType | TwoFormat }}</text></view
 					>
 					<view class="info-p"
@@ -85,7 +97,10 @@
 		<template v-if="clubInfo.spType === 0 && isManage">
 			<tui-bottom-popup :radius="false" :mask="false" :show="true">
 				<view class="tui-popup-box clearfix">
-					<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
+					<view
+						class="tui-right-flex tui-popup-btn"
+						:style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }"
+					>
 						<view class="tui-flex-1">
 							<view class="tui-button" @click="handleShowSellerpopup">分配销售</view>
 						</view>
@@ -106,8 +121,8 @@
 
 <script>
 import { mapState, mapMutations } from 'vuex'
-import authorize from '@/common/config/authorize.js' 
-import wxLogin from "@/common/config/wxLogin.js"
+import authorize from '@/common/config/authorize.js'
+import wxLogin from '@/common/config/wxLogin.js'
 import cmSellerPopup from '../components/cm-seller-popup'
 
 export default {
@@ -127,7 +142,6 @@ export default {
 			}
 		}
 	},
-	filters: {},
 	onLoad(option) {
 		wxLogin.wxLoginAuthorize()
 		this.salesParams.clubId = option.clubId
@@ -171,6 +185,15 @@ export default {
 					break
 			}
 			return text
+		},
+		statusFilters(value) {
+			// 状态
+			const map = {
+				1: '待审核',
+				90: '审核通过',
+				92: '审核未通过'
+			}
+			return map[value]
 		}
 	},
 	computed: {
@@ -179,7 +202,6 @@ export default {
 	methods: {
 		async userClubRecordLinkage(param) {
 			//查询机构信息
-			console.log('=========<查询机构信息>===========')
 			this.SellerService.userClubRecordLinkage(param)
 				.then(response => {
 					this.clubInfo = response.data.club
@@ -215,9 +237,7 @@ export default {
 			this.isSellerpopup = true
 		}
 	},
-	onShow() {
-		
-	}
+	onShow() {}
 }
 </script>
 
@@ -317,6 +337,27 @@ page {
 					left: 0;
 					top: 30rpx;
 				}
+				.info-h1-tag {
+					display: inline-block;
+					padding: 0 16rpx;
+					line-height: 40rpx; 
+					background-color: #fff2d5;
+					font-size: 24rpx;
+					border-radius: 20rpx;
+					color: #ffffff;
+					text-align: center;
+					margin-left: 16rpx;
+					&.orange{
+						background-color: #FFF2D5;
+						color: #E4AA43;
+					}
+					&.grey{
+						background-color: #0DB26D;
+					}
+					&.warn{
+						background-color: #F94B4B;
+					}
+				}
 			}
 			.info-p {
 				width: 100%;

pages/seller/order/order-list.vue

@@ -485,7 +485,7 @@ export default {
 									return item
 								})
 								orderItem.orderList = []
-								orderList.forEach(item => {
+								orderList.forEach(item => { 
 									orderItem.orderList.push(item)
 								})
 								//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
@@ -502,6 +502,8 @@ export default {
 										this.nomoreText = '已至底部'
 									}
 								}
+							}else{
+								orderItem.orderList = []
 							}
 						})
 						.catch(error => {