fix:趋势输入框失焦触发、权限增加admin权限判断

pages/clue/mixins/clue.js

@@ -223,6 +223,9 @@ export default {
 					}).then(res => {
 						if(res.data.length == 0){
 							uni.$u.toast("暂无数据")
+							this.minPrice = []
+							this.maxPrice = []
+							this.chartShow = false
 							return
 						}
 						const response = res.data

pages/publicClue/index.vue

@@ -50,7 +50,7 @@
 			@confirm="handleClueTagConfirm"></group-select>
 		<u-modal :show="trendModal" title="价格趋势" @confirm="handleTrendConfirm" confirmText="关闭弹窗">
 			<view class="trend_modal">
-				<u-search placeholder="请输入型号" v-model="model" @custom="searchTrend"></u-search>
+				<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>

pages/setting/index.vue

@@ -71,25 +71,35 @@
 		},
 		methods: {
 			handleSwitchRole(){
-				this.columns = [];
-				const availableRoles = this.$store.state.user.availableRoles;
-				const roleOptions = [];
-				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;
+					this.columns = [];
+					let availableRoles = this.$store.state.user.availableRoles;
+					let roleOptions = [];
+					
+					if (availableRoles.includes('admin')) {
+						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;
+							}
+						});
 					}
-				});
-				this.columns = [roleOptions];
-				this.showSwitchRole = true;
-			},
+					
+					this.columns = [roleOptions];
+					this.showSwitchRole = true;
+				},
 			handleEditPassword(){
 				uni.navigateTo({
 					url : "/pages/changePw/index"
@@ -127,7 +137,7 @@
 					this.$store.commit('user/SET_CURRENT_ROLE_INDEX', e.indexs[0]);
 					setTimeout(()=>{
 						this.$store.commit('user/SWITCH_ROLE', e.value[0]);
-					},100)
+					},50)
 				})
 			}
 		}

store/modules/user.js

@@ -29,8 +29,8 @@ export default {
 		netConfig: {
 			// http://59.42.9.166:9520/proxy
 			// http://10.0.7.100:9500
-			ip: "https://crm.nanjingshiyu.com/prod-api", // ip
-			// ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
+			// ip: "https://crm.nanjingshiyu.com/prod-api", // ip
+			ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
 			// ip : "/api", // 测试环境ip
 			// ip : "http://47.113.184.101", // 测试环境ip
 			// ip: "http://172.16.7.200", // ip
@@ -74,8 +74,13 @@ export default {
 			if (hasCrmRole) {
 				validRoles.push('CRM');
 			}
+
+			const hasAdminRole = roles.some(role => role.roleKey === 'admin');
+			if (hasAdminRole) {
+				validRoles.push('admin');
+			}
 			
-			const showSwitch = validRoles.length >= 2;
+			const showSwitch = validRoles.length >= 2 || roles.some(role => role.roleKey == 'admin');
 			state.showRoleSwitch = showSwitch;
 			state.availableRoles = validRoles;
 			state.currentRoleIndex = 0;