chenrui 3 лет назад
Родитель
Сommit
b086e700d2
2 измененных файлов с 14 добавлено и 19 удалено
  1. 11 11
      libs/axios.js
  2. 3 8
      pages/replenishmentManage/replenishmentList.vue

+ 11 - 11
libs/axios.js

@@ -48,33 +48,33 @@ const request = (opts, hasToken) => {
 				}else{
 					if(ret.status == '401'){  //  未登录或登录过期
 					    // 除过查询未完成订单的请求
-						if(opts.url.indexOf("order/unFinishedOrderRunStatus")<0){
+						// if(opts.url.indexOf("order/unFinishedOrderRunStatus")<0){
 							uni.showToast({
 								icon:'none',
 								title: '未登录或登录已过期,请重新登录',
 								duration: 5000 
 							})
 							setTimeout(function() {
-							  const currentRoute = getRoutePath();
-							  const url = `/pages/login/pwLogin?lanuch=${currentRoute.lanuch}&path=` + encodeURIComponent(currentRoute.url);
-							  uni.redirectTo({ url });
-							}, 1000);
-						}
+								const currentRoute = getRoutePath();
+								const url = `/pages/login/login`
+								uni.redirectTo({ url })
+							}, 1000)
+						// }
 					}
 					else{
 						console.log(opts.url,'opts.url')
 						if(ret.status == 500){
-							if(
-							opts.url.indexOf("store/validateStoreAndDevice")<0&&
-							opts.url.indexOf("couponReceives/findUsableCoupon")<0&&
-							opts.url.indexOf("shelfReplenish/detail/queryByProductQrCode")<0){
+							// if(
+							// opts.url.indexOf("store/validateStoreAndDevice")<0&&
+							// opts.url.indexOf("couponReceives/findUsableCoupon")<0&&
+							// opts.url.indexOf("shelfReplenish/detail/queryByProductQrCode")<0){
 								uni.showToast({
 									icon:'none',
 									title: ret.message,
 									mask: true,
 									duration: 3000 
 								})
-							}
+							// }
 						}
 					}
 					resolve(ret)

+ 3 - 8
pages/replenishmentManage/replenishmentList.vue

@@ -45,8 +45,7 @@
 				tabList: [
 					{
 						dispName: '全部',
-						status: 'ALL',
-						count: 0
+						status: 'ALL'
 					},
 					{
 						dispName: '待确认',
@@ -65,13 +64,11 @@
 					},
 					{
 						dispName: '已完成',
-						status: 'FINISH',
-						count: 0
+						status: 'FINISH'
 					},
 					{
 						dispName: '已取消',
-						status: 'CANCEL',
-						count: 0
+						status: 'CANCEL'
 					},
 				],
 				current: 0,
@@ -202,8 +199,6 @@
 						this.tabList[1].count = res.data.WAIT_CONFIRM || 0
 						this.tabList[2].count = res.data.WAIT_OUT_STOCK || 0
 						this.tabList[3].count = res.data.WAIT_CHECK || 0
-						this.tabList[4].count = res.data.FINISH || 0
-						this.tabList[5].count = res.data.CANCEL || 0
 						this.getRow(1)
 					}
 				})