feat:权限、销售线索加趋势图，趋势图加列表

components/custom-table/index.scss

@@ -27,9 +27,7 @@
   }
 }
 
-::v-deep .uni-scroll-view{
-  height: calc(100vh - 260rpx);
-}
+
 
 ::v-deep .uni-table {
   width: 100%;

components/custom-table/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <scroll-view class="custom-table" scroll-y="true" @scrolltolower="handleScrollLower">
+  <scroll-view class="custom-table" scroll-y="true" :style="{ height: height }" @scrolltolower="handleScrollLower">
     <uni-table
       ref="tableRef"
       :border="border"
@@ -137,6 +137,11 @@ export default {
     index: {
       type: Number,
       default: 1
+    },
+    // 表格高度
+    height: {
+      type: [String, Number],
+      default: 'calc(100vh - 260rpx)'
     }
   },
   data() {

pages/clue/mixins/clue.js

@@ -183,6 +183,12 @@ export default {
 			maxPrice: [],
 			minPrice: [],
 			chartShow: false,
+			tableData: [],
+			date:'',
+			columns: [
+				{ label: '型号', prop: 'model'},
+				{ label: '价格(元)', prop: 'price' },
+			],
 		}
 	},
 	onPullDownRefresh() {
@@ -213,6 +219,8 @@ export default {
 			},
 			handleTrendConfirm() {
 				this.model = ""
+				this.date = ""
+				this.tableData = []
 				this.chartShow = false
 				this.trendModal = false;
 			},
@@ -274,6 +282,26 @@ export default {
 					})
 				}
 			},
+			handleChartClick(event) {
+				console.log(event);
+				const  index  = event.currentIndex.index;
+				// 获取点击的日期
+				const date = this.chartData.categories[index];
+				this.date = date;
+				
+				// 构建该日期的所有型号价格数据
+				const tableData = [];
+				this.chartData.series.forEach(series => {
+					const price = series.data[index];
+					if (price !== null) {
+						tableData.push({
+							model: series.name,
+							price: price
+						});
+					}
+				});
+				this.tableData = tableData;
+			},
 			getRandomColor(){
 				var letters = '0123456789ABCDEF';
 				var color = '#';

pages/privateClue/index.vue

@@ -48,8 +48,23 @@
 			groupChild="clueTagDataList" label-key="name" value-key="id" placeholder="请选择线索标签"
 			v-model="queryParams.allTagList" multiple clearable ref="clueTag"
 			@confirm="handleClueTagConfirm"></group-select>
+		<u-modal :show="trendModal" title="价格趋势" @confirm="handleTrendConfirm" confirmText="关闭弹窗">
+			<view class="trend_modal">
+				<u-search placeholder="请输入型号" v-model="model" @blur="searchTrend" @custom="searchTrend"></u-search>
+				<view class="charts_box" v-if="chartShow">
+					<u--text type="primary" :text="`最大价格：${Math.max(...maxPrice)}元`"></u--text>
+					<u--text type="warning" :text="`最小价格：${Math.min(...minPrice)}元`"></u--text>
+					<qiun-data-charts type="line" :chartData="chartData" canvasId="trendChart" :opts="opts" :ontouch="true" tooltipFormat="tooltipFormatPrice"
+						width="700rpx" height="500rpx" backgroundColor="#ffffff" @getIndex="handleChartClick" />
+				</view>
+				<u--text v-if="tableData.length > 0" :text="'日期：' + date"></u--text>
+				<Table ref="customTable" v-if="tableData.length > 0" :tableData="tableData" height="100px" :columns="columns" stripe></Table>
+			</view>
+		</u-modal>
 			
-			
+		<view class="suspension_button trend" @click="handleTrend">
+			趋势
+		</view>
 		<view class="suspension_button" @click="handleAddClue">
 			新增
 		</view>
@@ -62,6 +77,7 @@
 	import post from "@/pages/clue/post/index.vue";
 	import sort from "@/pages/clue/components/sort.vue";
 	import filterQuery from "@/pages/clue/components/filterQuery.vue";
+	import Table from '@/components/custom-table/index.vue'
 	export default {
 		onPullDownRefresh() {
 			uni.stopPullDownRefresh();
@@ -71,6 +87,7 @@
 			post,
 			sort,
 			filterQuery,
+			Table,
 		},
 		mixins: [clue],
 		onLoad(option) {

pages/publicClue/index.vue

@@ -55,7 +55,7 @@
 					<u--text type="primary" :text="`最大价格：${Math.max(...maxPrice)}元`"></u--text>
 					<u--text type="warning" :text="`最小价格：${Math.min(...minPrice)}元`"></u--text>
 					<qiun-data-charts type="line" :chartData="chartData" canvasId="trendChart" :opts="opts" :ontouch="true" tooltipFormat="tooltipFormatPrice"
-						width="700rpx" height="500rpx" backgroundColor="#ffffff" />
+						width="700rpx" height="500rpx" backgroundColor="#ffffff" @getIndex="handleChartClick" />
 				</view>
 			</view>
 		</u-modal>

pages/setting/index.vue

@@ -72,29 +72,47 @@
 		methods: {
 			handleSwitchRole(){
 					this.columns = [];
-					let availableRoles = this.$store.state.user.availableRoles;
+					let roles = this.$store.state.user.availableRoles;
 					let roleOptions = [];
-					
-					if (availableRoles.includes('admin')) {
+					const hasAdminRole = roles.some(role => role == 'admin');
+					const hasCrmRole = roles.some(role => role.includes('CRM'));
+					const hasWarehouser = roles.some(role => role == 'WAREHOUSER');
+					const hasSalesman = roles.some(role => role == 'SALESMAN');
+
+					if(hasAdminRole){
 						roleOptions.push(
 							{ label: 'CRM权限', value: 'CRM' },
 							{ label: '仓库权限', value: 'WAREHOUSER' },
 							{ label: '销售权限', value: 'SALESMAN' },
 						);
-					} else {
-						availableRoles.forEach(role => {
-							switch (role) {
-								case 'SALESMAN':
-									roleOptions.push({ label: '销售权限', value: 'SALESMAN' });
-									break;
-								case 'WAREHOUSER':
-									roleOptions.push({ label: '仓库权限', value: 'WAREHOUSER' });
-									break;
-								case 'CRM':
-									roleOptions.push({ label: 'CRM权限', value: 'CRM' });
-									break;
-							}
-						});
+					}else if(hasWarehouser && hasSalesman && hasCrmRole){
+						roleOptions.push(
+							{ label: 'CRM权限', value: 'CRM' },
+							{ label: '仓库权限', value: 'WAREHOUSER' },
+							{ label: '销售权限', value: 'SALESMAN' }
+						);
+					}else if(hasCrmRole && hasWarehouser){
+						roleOptions.push(
+							{ label: 'CRM权限', value: 'CRM' },
+							{ label: '仓库权限', value: 'WAREHOUSER' }
+						);
+					}else if(hasCrmRole && hasSalesman){
+						roleOptions.push(
+							{ label: 'CRM权限', value: 'CRM' },
+							{ label: '仓库权限', value: 'WAREHOUSER' },
+							{ label: '销售权限', value: 'SALESMAN' }
+						);
+					}else if(hasWarehouser && hasSalesman){
+						roleOptions.push(
+							{ label: '仓库权限', value: 'WAREHOUSER' },
+							{ label: '销售权限', value: 'SALESMAN' }
+						);
+					}else if(hasCrmRole){
+						roleOptions.push({ label: 'CRM权限', value: 'CRM' });
+					}else if(hasWarehouser){
+						roleOptions.push({ label: '仓库权限', value: 'WAREHOUSER' });
+					}else if(hasSalesman){
+						roleOptions.push({ label: '销售权限', value: 'SALESMAN' },{ label: '仓库权限', value: 'WAREHOUSER' });
 					}
 					
 					this.columns = [roleOptions];
@@ -115,9 +133,11 @@
 			},
 			confirm() {
 				// 停止电话监听
-				this.$store.dispatch("call/stopPhoneListener").catch(error => {
+				//#ifdef APP-PLUS
+				this.$store.dispatch("call/stopPhoneListener", null, { root: true }).catch(error => {
 					console.error('退出登录时停止电话监听失败:', error);
 				});
+				//#endif
 				
 				this.$store.dispatch("user/logout").then(()=>{
 					uni.$u.toast("退出成功");

pages/wareHouse/components/orderList/index.vue

@@ -17,7 +17,7 @@
                         <jtimePickerPopup :isShowShortTimeList="true" shortTimeTitle="快捷时间" :shortTimeList="shortTimeList"
                             :isShowSeletTimeTitle="true" seletTimeTitle="时间选择" cancelText="取消" confirmText="确认"
                             :endSelectMonth="-1" :endSelectDay="-1" beginTimePlaceHolder='开始时间' endTimePlaceHolder="结束时间"
-                            :isDateTypeRange="true" :isShowSelectedTimeEcho="true" @confirm="getSelectTime"
+                            :isDateTypeRange="true" :isShowSelectedTimeEcho="true" @confirm="getSelectTime" :defaultSelect="0"
                             ref="jtimePickerPopupRef">
 					    </jtimePickerPopup>
                     </u-form-item>
@@ -42,16 +42,18 @@
                 <view class="order_item" v-for="(item, index) in orderList" :key="index">
                     <u-swipe-action>
                         <u-swipe-action-item :options="swipeOptions" @click="(e) => handleSwipeClick(e, item)">
+                             <view class="order_col_1">
+                                <view class="order_info title">品牌：{{ item.dictLabel || '-' }}</view>
+                             </view>
                             <view class="order_col_2">
-                                <view class="order_info">品牌：{{ item.dictLabel || '-' }}</view>
                                 <view class="order_info">付款方式：{{ payTypeFormatter(item.payType) || '-' }}</view>
                                 <view class="order_info">开单人：{{ item.recyclePerson || '-' }}</view>
                                 <view class="order_info">开单数量：{{ item.quantity || '-' }}</view>
                                 <view class="order_info">开单日期：{{ orderDateFormatter(item.orderDate) || '-' }}</view>
                                 <view class="order_info">订单类型：{{ orderTypeFormatter(item.orderType) || '-' }}</view>
                                 <view class="order_info">商品分类：{{ typeFormatter(item.type) || '-' }}</view>
-                                <view class="order_info">成交金额：{{ item.dealPrice || '-' }}元</view>
-                                <view class="order_info">实收总计：{{ item.amountReceived || '-' }}元</view>
+                                <view class="order_info money">成交金额：{{ item.dealPrice || '-' }}元</view>
+                                <view class="order_info money">实收总计：{{ item.amountReceived || '-' }}元</view>
                             </view>
                             <view class="order_col_1">
                                 <view class="order_info">开单备注：{{ item.orderRemark || '-' }}</view>

pages/wareHouse/components/searchFilter.vue

@@ -13,10 +13,14 @@
             <u-form-item label="位置" labelWidth="70">
                 <u-input v-model="formData.location" fontSize="14" clearable border="bottom"></u-input>
             </u-form-item>
-            <u-form-item label="回收时间" labelWidth="70" @click="recycleTimeShow = true">
-                <Cell :val="formData.recycleTime" :isDelete="true" :border="true" @handleClear="clear('recycleTime')">  </Cell>
-                <u-datetime-picker  :show="recycleTimeShow" v-model="recycleTimeDefault" mode="date"  @confirm="confirmRecycleTime" @close="recycleTimeShow = false"
-                            @cancel="recycleTimeShow = false"></u-datetime-picker>
+            <u-form-item label="回收时间" labelWidth="70" @click="openTimePicker">
+                <Cell :val="time" :isDelete="true" :border="true" @handleClear="clear('time')">  </Cell>
+                <jtimePickerPopup :isShowShortTimeList="true" shortTimeTitle="快捷时间" :shortTimeList="shortTimeList"
+                    :isShowSeletTimeTitle="true" seletTimeTitle="时间选择" cancelText="取消" confirmText="确认"
+                    :endSelectMonth="-1" :endSelectDay="-1" beginTimePlaceHolder='开始时间' endTimePlaceHolder="结束时间"
+                    :isDateTypeRange="true" :isShowSelectedTimeEcho="true" @confirm="getSelectTime" :defaultSelect="0"
+                    ref="jtimePickerPopupRef">
+                </jtimePickerPopup>
             </u-form-item>
             <u-form-item label="回收人员" labelWidth="70" @click="recyclePersonClick">
                 <Cell :val="formData.recyclePerson" :isDelete="true" :border="true" @handleClear="clear('recyclePerson')"></Cell>
@@ -45,13 +49,15 @@ import Cell from '@/components/custom-cell/index.vue'
 import BrandList from '@/components/brand-list/index.vue'
 import PersonPicker from '@/components/person-picker/index.vue'
 import TabSelect from '@/components/custom-tab-select/index.vue'
-import { productAttributeList, stockStatusListAll } from '../js/public.js'
+import { productAttributeList, stockStatusListAll,shortTimeList } from '../js/public.js'
+import jtimePickerPopup from '@/uni_modules/jtime-picker-popup/components/JTimePicker/JTimePicker.vue';
 export default {
     components: {
         Cell,
         BrandList,
         PersonPicker,
         TabSelect,
+        jtimePickerPopup,
     },
     name: 'searchFilter',
     emits: ['confirm'],
@@ -64,7 +70,8 @@ export default {
                 minPrice: '',
                 maxPrice: '',
                 location: '',
-                recycleTime: '',
+                startTime: '',
+                endTime: '',
                 recyclePerson:'',
                 recyclePersonId: '',
                 identifyingPerson:'',
@@ -72,8 +79,8 @@ export default {
                 productAttribute: [],
                 stockStatus: '',
             },
-            recycleTimeDefault: new Date().getTime(),
-            recycleTimeShow: false,
+            time:'',
+            shortTimeList: shortTimeList,
             recyclePersonList: [],
             // 将导入的变量在data中重新定义，确保模板能够访问
             productAttributeList: productAttributeList,
@@ -85,6 +92,7 @@ export default {
     },
     emits: [],
     methods: {
+        
         handleSearch() {
             this.$emit('confirm', this.formData);
             this.close();
@@ -96,7 +104,8 @@ export default {
                 minPrice: '',
                 maxPrice: '',
                 location: '',
-                recycleTime: '',
+                startTime: '',
+                endTime: '',
                 recyclePerson:'',
                 recyclePersonId: '',
                 identifyingPerson:'',
@@ -104,11 +113,15 @@ export default {
                 productAttribute: [],
                 stockStatus: '',
             };
-            this.recycleTimeDefault = new Date().getTime();
         },
         open() {
             this.show = true
-            
+            this.$nextTick(() => {
+                this.$refs.jtimePickerPopupRef.handleInit();
+            })
+        },
+        openTimePicker() {
+            this.$refs.jtimePickerPopupRef.pickerShow();
         },
         close() {
             this.show = false
@@ -140,13 +153,19 @@ export default {
                 this.formData.identifyingPersonId = '';
                 return;
             }
+            // 回收时间
+            if(field == 'time'){
+                this.time = '';
+                this.formData.startTime = '';
+                this.formData.endTime = '';
+                return;
+            }
             this.formData[field] = '';
         },
-        confirmRecycleTime(val) {
-            this.$nextTick(()=>{
-                this.formData.recycleTime = this.$dayjs(val.value).format('YYYY-MM-DD');
-            })
-            this.recycleTimeShow = false;
+        getSelectTime(val) {
+            this.formData.startTime = this.$dayjs(val.beginTime).format('YYYY-MM-DD');
+            this.formData.endTime = this.$dayjs(val.endTime).format('YYYY-MM-DD');
+            this.time = this.$dayjs(val.beginTime).format('YYYY-MM-DD') + ' 至 ' + this.$dayjs(val.endTime).format('YYYY-MM-DD');
         },
         recyclePersonClick() {
             this.$refs.recyclePersonPickerRef.open();

pages/wareHouse/styles/orderList/index.scss

@@ -3,46 +3,240 @@
 }
 ::v-deep .order_list{
     overflow: hidden;
-    padding:0 20rpx;
+    padding: 0 20rpx;
     font-size: 28rpx;
+    color: #333333;
+    background-color: #f5f7fa;
+    min-height: 100vh;
+    font-family: 'PingFang SC', 'Helvetica Neue', Arial, sans-serif;
+    
     .search_form{
         display: flex;
         align-items: center;
         justify-content: space-between;
-        gap: 10rpx;
+        gap: 15rpx;
+        margin-top: 20rpx;
+        background-color: #ffffff;
+        border-radius: 16rpx;
+        padding: 20rpx;
+        box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.05);
+        transition: all 0.3s ease;
     }
+    
     .btns{
         display: flex;
-        gap:20rpx;
-        padding: 20rpx;
+        gap: 16rpx;
+        padding: 24rpx 20rpx;
+        background-color: #ffffff;
+        border-top: 1rpx solid #f0f2f5;
+        border-radius: 16rpx 16rpx 0 0;
+        margin-top: 20rpx;
+        
+        button{
+            flex: 1;
+            border-radius: 12rpx;
+            height: 88rpx;
+            font-size: 30rpx;
+            font-weight: 500;
+            transition: all 0.3s ease;
+            
+            &:hover{
+                transform: translateY(-2rpx);
+                box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.1);
+            }
+        }
     }
+    
     .list_wrap{
         margin-top: 20rpx;
         overflow: auto;
-        height: calc(100vh - 200rpx);
+        height: calc(100vh - 280rpx);
         width: 100%;
+        
         .order_item{
             background-color: #ffffff;
             border-radius: 20rpx;
-            padding: 20rpx;
+            padding: 32rpx;
             margin-bottom: 20rpx;
-            border: 1px solid #f7f6f6;
-            box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
-            line-height: 44rpx;
+            box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.06);
+            line-height: 52rpx;
+            transition: all 0.3s ease;
+            position: relative;
+            overflow: hidden;
+            
+            &::before{
+                content: '';
+                position: absolute;
+                top: 0;
+                left: 0;
+                width: 6rpx;
+                height: 100%;
+                background: linear-gradient(180deg, #1a7cec 0%, #5FB8FF 100%);
+                border-radius: 20rpx 0 0 20rpx;
+            }
+            
+            
             .order_col_1{
                 display: grid;
-                flex:1;
+                flex: 1;
+                margin-top: 24rpx;
+                padding-top: 24rpx;
+                border-top: 1rpx solid #f0f2f5;
+                
+                &:first-child{
+                    margin-top: 0;
+                    padding-top: 0;
+                    border-top: none;
+                }
             }
+            
             .order_col_2{
                 display: grid;
                 grid-template-columns: repeat(2, 1fr);
             }
+            
+            .order_info{
+                font-size: 26rpx;
+                display: flex;
+                align-items: center;
+                color: #666666;
+                
+                &::before{
+                    content: '';
+                    width: 6rpx;
+                    height: 6rpx;
+                    border-radius: 50%;
+                    background-color: #4A90E2;
+                    margin-right: 12rpx;
+                }
+            }
+            
+            .title{
+                font-weight: 600;
+                font-size: 30rpx;
+                color: #1a1a1a;
+            }
+            
+            .money{
+                font-size: 30rpx;
+                font-weight: 700;
+                color: #f13939;
+                background: linear-gradient(135deg, #FF6B6B 0%, #f7a071 100%);
+                -webkit-background-clip: text;
+                -webkit-text-fill-color: transparent;
+                background-clip: text;
+            }
+            
             .scroll_img{
-                width: calc(100vw - 80rpx);
+                width: calc(100vw - 112rpx);
+                border-radius: 12rpx;
+                overflow: hidden;
+                box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.08);
             }
         }
     }
+    
     .search_pop{
-        padding: 40rpx 20rpx;
+        padding: 48rpx 24rpx;
+        background-color: #ffffff;
+        border-radius: 20rpx 20rpx 0 0;
+        
+        .u-form-item{
+            margin-bottom: 36rpx;
+            
+            &:last-child{
+                margin-bottom: 0;
+            }
+        }
+        
+        .u-form-item__label{
+            font-size: 28rpx;
+            font-weight: 500;
+            color: #333333;
+            margin-bottom: 12rpx;
+            display: block;
+        }
+        
+        .u-input{
+            border-radius: 12rpx;
+            border: 2rpx solid #f0f2f5;
+            transition: all 0.3s ease;
+            
+            &:focus{
+                border-color: #4A90E2;
+                box-shadow: 0 0 0 4rpx rgba(74, 144, 226, 0.1);
+            }
+        }
+    }
+    
+    // 美化滑动操作按钮
+    .u-swipe-action__item{
+        border-radius: 0 20rpx 20rpx 0;
+        overflow: hidden;
+        
+        .u-swipe-action__content{
+            border-radius: 20rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size: 28rpx;
+            font-weight: 500;
+            transition: all 0.3s ease;
+            
+            &:hover{
+                opacity: 0.9;
+            }
+        }
+    }
+    
+    // 美化空状态
+    .u-empty{
+        margin-top: 120rpx;
+        
+        .u-empty__text{
+            font-size: 28rpx;
+            color: #999999;
+            margin-top: 20rpx;
+        }
+        
+        .u-empty__icon{
+            width: 160rpx;
+            height: 160rpx;
+        }
+    }
+    
+    // 自定义滚动条
+    ::-webkit-scrollbar{
+        width: 6rpx;
+        height: 6rpx;
+    }
+    
+    ::-webkit-scrollbar-track{
+        background: #f1f1f1;
+        border-radius: 3rpx;
+    }
+    
+    ::-webkit-scrollbar-thumb{
+        background: #c1c1c1;
+        border-radius: 3rpx;
+    }
+    
+    ::-webkit-scrollbar-thumb:hover{
+        background: #a8a8a8;
+    }
+}
+
+// 响应式设计
+@media (max-width: 375px) {
+    ::v-deep .order_list{
+        .list_wrap{
+            .order_item{
+                padding: 28rpx;
+                
+                .order_col_2{
+                    grid-template-columns: 1fr;
+                }
+            }
+        }
     }
 }

store/modules/call.js

@@ -450,13 +450,21 @@ export default {
 			commit
 		}) {
 			try {
-				stopPhoneListener(res => {
+				// #ifdef APP-PLUS
+				if (typeof stopPhoneListener === 'function') {
+					stopPhoneListener(res => {
+						commit('SET_PHONE_LISTENING_STATUS', false);
+					});
+				} else {
 					commit('SET_PHONE_LISTENING_STATUS', false);
-				});
+				}
+				// #endif
+				// #ifndef APP-PLUS
+				commit('SET_PHONE_LISTENING_STATUS', false);
+				// #endif
 			} catch (error) {
 				console.error('停止电话监听失败:', error);
 				commit('SET_PHONE_LISTENING_STATUS', false);
-				throw error;
 			}
 		},
 

store/modules/user.js

@@ -60,28 +60,48 @@ export default {
 			
 			const validRoles = [];
 			
+			const hasAdminRole = roles.some(role => role.roleKey === 'admin');
+			const hasCrmRole = roles.some(role => role.roleKey && role.roleKey.includes('CRM'));
 			const hasWarehouser = roles.some(role => role.roleKey === 'WAREHOUSER');
-			if (hasWarehouser) {
-				validRoles.push('WAREHOUSER');
-			}
-			
 			const hasSalesman = roles.some(role => role.roleKey === 'SALESMAN');
-			if (hasSalesman) {
+
+			if (hasAdminRole) {//管理员
+				if (hasCrmRole) validRoles.push('CRM');
+				if (hasWarehouser) validRoles.push('WAREHOUSER');
+				if (hasSalesman) validRoles.push('SALESMAN');
+				validRoles.push('admin');
+				state.showRoleSwitch = true;
+			} else if(hasWarehouser && hasSalesman && hasCrmRole) {//仓库和销售和crm
+				validRoles.push('CRM');
+				validRoles.push('WAREHOUSER');
 				validRoles.push('SALESMAN');
+				state.showRoleSwitch = true;
+			} else if (hasCrmRole && hasWarehouser) {//crm和仓库
+				validRoles.push('CRM');
+				validRoles.push('WAREHOUSER');
+				state.showRoleSwitch = true;
+			} else if ((hasCrmRole && hasSalesman)) {//crm和销售
+				validRoles.push('CRM');
+				validRoles.push('WAREHOUSER');
+				validRoles.push('SALESMAN');
+				state.showRoleSwitch = true;
+			}else if(hasWarehouser && hasSalesman) {//只有仓库和销售
+				validRoles.push('WAREHOUSER');
+				validRoles.push('SALESMAN');
+				state.showRoleSwitch = true;
 			}
-			
-			const hasCrmRole = roles.some(role => role.roleKey && role.roleKey.includes('CRM'));
-			if (hasCrmRole) {
+			else if (hasCrmRole) {//只有crm
 				validRoles.push('CRM');
+				state.showRoleSwitch = false;
+			} else if(hasWarehouser){//只有仓库
+				validRoles.push('WAREHOUSER');
+				state.showRoleSwitch = false;
+			}else if (hasSalesman) {//只有销售
+				if (hasWarehouser) validRoles.push('WAREHOUSER');
+				if (hasSalesman) validRoles.push('SALESMAN');
+				state.showRoleSwitch = true;
 			}
 
-			const hasAdminRole = roles.some(role => role.roleKey === 'admin');
-			if (hasAdminRole) {
-				validRoles.push('admin');
-			}
-			
-			const showSwitch = validRoles.length >= 2 || roles.some(role => role.roleKey == 'admin');
-			state.showRoleSwitch = showSwitch;
 			state.availableRoles = validRoles;
 			state.currentRoleIndex = 0;