fix

apis/request.js

@@ -1,16 +1,7 @@
 import config from '@/config/request'
-let HTTP_COUNT = 0 // loading次数
+let logouted = 0
 
 const request = options => {
-	HTTP_COUNT++
-	if (config.showLoading) {
-		// 请求数据时的loading
-		// uni.showToast({
-		// 	title: '加载中',
-		// 	duration: 200,
-		// 	icon: 'loading'
-		// })
-	}
 	const header = Object.assign({}, config.headers, {
 		token: uni.getStorageSync('token')
 	})
@@ -29,18 +20,22 @@ const request = options => {
 				if (status === 200) {
 					resolve(data)
 				} else if (status == 401) {
-					// 登录过期
-					uni.clearStorageSync()
-					uni.showToast({
-						title: message,
-						icon: 'none'
-					})
-					setTimeout(() => {
-						uni.navigateTo({
-							url: '../login/login'
+					if (!logouted) {
+						// 登录过期
+						uni.clearStorageSync()
+						uni.showToast({
+							title: message,
+							icon: 'none'
 						})
-					}, 1500)
-					reject(data)
+						setTimeout(() => {
+							logouted = 0
+							uni.reLaunch({
+								url: '/pages/index/index'
+							})
+						}, 1500)
+						reject(data)
+						logouted = 1
+					}
 				} else if (!status) {
 					resolve(data)
 				} else {
@@ -58,12 +53,6 @@ const request = options => {
 				})
 				reject(err)
 			},
-			complete: () => {
-				if (config.showLoading) {
-					// HTTP_COUNT--
-					// HTTP_COUNT || uni.hideLoading()
-				}
-			}
 		})
 	})
 }

config/request.js

@@ -6,7 +6,7 @@
 
 export default {
   baseURL: 'https://www.occupationlab.com/',
-  // baseURL: 'http://192.168.31.151:9000/',
+  // baseURL: 'http://192.168.31.51:9000/',
   // baseURL: 'http://121.37.12.51/',
   headers: {
     'Content-Type': 'application/json;charset=UTF-8'

order/orderDetail/orderDetail.vue

@@ -194,7 +194,7 @@
 						<uni-icons class="icon" custom-prefix="iconfont" type="icon-edit" size="30" color="#959595"></uni-icons>
 						<view class="text">修改</view>
 					</view>
-					<view class="item" v-if="auth('订单管理:续费')" @click="toAction(`../orderDetail/orderDetail?orderId=${orderId}&action=renew`)">
+					<view class="item" @click="toAction(`../orderDetail/orderDetail?orderId=${orderId}&action=renew`)">
 						<uni-icons class="icon" custom-prefix="iconfont" type="icon-product" size="30" color="#959595"></uni-icons>
 						<view class="text">续费</view>
 					</view>

order/orders/orders.vue

@@ -215,7 +215,7 @@
 			},
 			// 跳转详情
 			toDetail(item) {
-				if(!this.auth('订单管理:查看')) return
+				// if(!this.auth('订单管理:查看')) return
 				this.$util.to(`../orderDetail/orderDetail?orderId=${item.orderId}&show=1`)
 			},
 			// 删除

pages/index/index.vue

@@ -19,7 +19,7 @@
 				<image class="icon" src="@/static/image/index/index4.png" mode="widthFix"></image>
 				<view class="text">方案</view>
 			</li>
-			<li v-if="auth('订单管理')" @click="$util.to('/order/orders/orders')">
+			<li @click="$util.to('/order/orders/orders')">
 				<image class="icon" src="@/static/image/index/index5.png" mode="widthFix"></image>
 				<view class="text">订单</view>
 			</li>