更新

pages/index/newindex.vue

@@ -50,20 +50,25 @@
 			</view>
 		</view>
 		<view class="domain">
-			<view class="item" v-for="item,index in menuList" :key="index">
-				<view class="title">{{item.name}}</view>
-				<view class="options-frame" >
-					<view class="option" v-for="optionItme,optionIndex in item.submenu" :key="optionIndex" @tap.stop="jump(optionItme)">
-						<view class="star" @tap.stop="collectionFn(optionItme)">
-							<uni-icons :color="iconFn(optionItme)" custom-prefix="iconfont" type="iconshoucang-yishoucang" size="18"></uni-icons>
-						</view>
-						<view class="wall">
-							<view class="name">{{optionItme.name}}</view>
-							<uni-icons color="#fff" custom-prefix="iconfont" :type="optionItme.icon" size="50"></uni-icons>
-						</view>
+			<template v-for="item,index in menuList">
+				<view class="item" v-if="isHaveAuth(item.submenu)"  :key="index">
+					<view class="title">{{item.name}}</view>
+					<view class="options-frame" >
+						<template v-for="optionItme,optionIndex in item.submenu">
+							<view class="option" v-if="user.authList.includes(optionItme.lable)" :key="optionIndex" @tap.stop="jump(optionItme)">
+								<view class="star" @tap.stop="collectionFn(optionItme)">
+									<uni-icons :color="iconFn(optionItme)" custom-prefix="iconfont" type="iconshoucang-yishoucang" size="18"></uni-icons>
+								</view>
+								<view class="wall">
+									<view class="name">{{optionItme.name}}</view>
+									<uni-icons color="#fff" custom-prefix="iconfont" :type="optionItme.icon" size="50"></uni-icons>
+								</view>
+							</view>
+						</template>
+				
 					</view>
 				</view>
-			</view>
+			</template>
 		</view>
 		
 		
@@ -136,6 +141,9 @@
 			}
 		},
 		methods: {
+			isHaveAuth(submenu) {
+				return submenu.some(item => this.user.authList.includes(item.lable))
+			},
 			close() {
 				uni.showModal({
 					title: '提示',
@@ -150,7 +158,6 @@
 						}
 					}
 				});
-
 			},
 			jump(e) {
 				if (this.user.authList.includes(e.lable)) {

utils/request.js

@@ -2,7 +2,7 @@ import axios from 'axios'
 import utils from '@/utils/encode'
 // const env = process.env.NODE_ENV
 // const env = 'test'
-const env = 'production'
+const env = 'test'
 const testUrl = 'http://192.168.110.10:38080'
 // const productUrl = 'https://www.xingoil.com/adminapi'
 // const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new 
@@ -36,7 +36,7 @@ service.interceptors.request.use(
 		config.headers['dataSources'] = 'MP'
 
 		if (env === 'production') {
-			console.log("这里是生产")
+			// console.log("这里是生产")
 			// 生产环境，加密，不输出任何东西
 			// 设置jsessionid和token
 			const JSESSIONID = utils.uuid()
@@ -50,13 +50,13 @@ service.interceptors.request.use(
 			}
 			// 要加密
 			data.params = utils.encrypt(JSON.stringify(config.data))
-			console.log('参数', config.url, '参数加密前', config.data, '加密：', data)
+			// console.log('参数', config.url, '参数加密前', config.data, '加密：', data)
 			config.data = data
 			// }
 		} else {
-			console.log("这里是测试")
-			console.log('\n\n-----------------------')
-			console.log('参数', config.url, '参数加密前', config.data)
+			// console.log("这里是测试")
+			// console.log('\n\n-----------------------')
+			// console.log('参数', config.url, '参数加密前', config.data)
 			url = config.url
 		}
 		return config
@@ -73,7 +73,7 @@ service.interceptors.request.use(
 
 service.interceptors.response.use(
 	response => {
-		console.log(response.data,'-------------------')
+		// console.log(response.data,'-------------------')
 		const res = response.data
 		if (env === 'production') {
 			// 生产环境，进行加密解密，不输出日志
@@ -81,17 +81,17 @@ service.interceptors.response.use(
 				// 加密的数据，需要解密
 				const dataParam = JSON.parse(utils.decrypt(res.data))
 				res.data = JSON.stringify(dataParam) === '{}' ? null : dataParam
-				console.log(res.data)
+				// console.log(res.data)
 				// console.log('返回', response.config.url, '返回结果',res)
 			}
 		} else {
-			console.log('返回', response.config.url, '返回结果未加密', res)
+			// console.log('返回', response.config.url, '返回结果未加密', res)
 			// console.log('-------------------------------------------\n\n')
 		}
 
 		uni.hideLoading()
 		if (response.config.url.indexOf('/oil-site/oilSiteOrderInfo/getOrderQrCode') === -1) {
-			console.log(res, '----------------------------------')
+			// console.log(res, '----------------------------------')
 			if (res.code != 20000 && res.msg != '令牌为空，不允许操作' && res.msg != '您的ip已经更改，请重新登录' && res.msg !=
 				'登录与操作设备不同') {
 				uni.showToast({
@@ -127,7 +127,7 @@ service.interceptors.response.use(
 		uni.hideLoading()
 		uni.getNetworkType({
 			success: function(res) {
-				console.log(res.networkType);
+				// console.log(res.networkType);
 				if (res.networkType === 'none') {
 					uni.showToast({
 						title: '没有网啦！',