修复跳转问题

manifest.json

@@ -2,8 +2,8 @@
     "name" : "货无忧",
     "appid" : "__UNI__EB22F37",
     "description" : "",
-    "versionName" : "1.0.39",
-    "versionCode" : 1039,
+    "versionName" : "1.0.40",
+    "versionCode" : 1040,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/index/index.vue

@@ -463,8 +463,7 @@
 			versionType: version.pkName.indexOf('test') != -1 ? '1' : version.pkName.indexOf('bate') != -1 ? '2' : '3',
 		}
 		console.log('data', data);
-		let response = await AppPdaversiondetail(data)
-		console.log('response :>> ', response);
+		let response = await AppPdaversiondetail(data, {isShowLoading: false})
 		if (response.code == 200 && response.data) {
 			console.log(response.data);
 			console.log('有可更新包');

pagesHome/pages/DownGoods/DownGoods.vue

@@ -422,6 +422,9 @@
 		console.log('111 :>> ', 111);
 		details.scandataList.push(_scancode)
 		try {
+			uni.showLoading({
+				mask:true
+			})
 			let res = null
 			let data = null;
 			switch (Number(details.pageType)) {
@@ -497,6 +500,7 @@
 			console.log('err :>> ', err);
 			//TODO handle the exception
 		} finally {
+			uni.hideLoading()
 			// 请求完成, 清除阻止项
 			details.scandataList.splice(details.scandataList.indexOf(_scancode), 1)
 		}

pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue

@@ -612,11 +612,11 @@
 		console.log('res', res);
 		if (Number(res.data.isHasData) === 0) {
 			uni.setStorageSync('trayCodeType', res.data.data)
-			uni.navigateTo({
+			uni.redirectTo({
 				url: '/pagesHome/pages/ScanSortingType/ScanSortingType?trayCode=' + details.scancode
 			})
 		} else {
-			uni.navigateTo({
+			uni.redirectTo({
 				url: '/pagesHome/pages/OrderSortingDetail/OrderSortingDetail?trayCode='
 					+ res.data.data.trayCode + '&trayType='
 					+ res.data.data.trayType

pagesHome/pages/PickingScanList/PickingScanList.vue

@@ -278,9 +278,7 @@
 
 	// 返回上一级页面
 	function backPreviousPage() {
-		uni.redirectTo({
-			url: '/pagesHome/pages/pickingScan/pickingScan'
-		})
+		uni.navigateBack()
 	}
 </script>
 

pagesHome/pages/ScanUp/ScanUp.vue

@@ -273,95 +273,104 @@
 	})
 
 	async function scandata() {
-		//是否有库位id，有库位ID就扫描包条码否则只能扫描库位码
-		if (!details.allocationId) {
-			console.log('details.scancode[0] :>> ', details.scancode[0]);
-			if (details.scancode[0] === 'T') {
-				uni.showToast({
-					title: '请扫描库位码',
-					icon: 'none'
-				})
-				// #ifdef APP
-				utils.ttsspke('请扫描库位码')
-				// #endif
-				return
-			}
-			console.log('111 :>> ', 111);
-			let data = {
-				allocationId: details.scancode,
-			}
-			let res = await warehouseUpdownTypeupShelfScanAllocation(data)
-			console.log(res);
-			if (res.code == 200) {
-				details.reqobj = res.data
-				const _positionArr = details.reqobj.allocationTitle.split('-')
-				details.reqobj.positionInfo = _positionArr[0] + '层' + _positionArr[1] + '列'
-				details.allocationId = res.data.allocationId
-				details.datalist = (res.data?.list) || []
-				if (details.checkstate === 2) return details.renderList = details.datalist
-				// if (details.upshelfScanType === '4') return utils.ttsspke('请扫描托盘码')
-				// utils.ttsspke('请扫描包条码')
-			}
-		} else {
-			if (Number(details.upshelfScanType) == 4 && details.reqobj.trayCode) {
-				// #ifdef APP
-				utils.ttsspke('该库位已绑托盘')
-				// #endif
-				return
-			}
-
-			if (details.upshelfScanType === '3') {
-				const flag = details.uplistarr.findIndex(val => val.orderPackageCode === details.scancode)
-				if (flag !== -1) {
+		try{
+			uni.showLoading({
+				mask: true
+			})
+			// 是否有库位id，有库位ID就扫描包条码否则只能扫描库位码
+			if (!details.allocationId) {
+				console.log('details.scancode[0] :>> ', details.scancode[0]);
+				if (details.scancode[0] === 'T') {
+					uni.showToast({
+						title: '请扫描库位码',
+						icon: 'none'
+					})
 					// #ifdef APP
-					utils.ttsspke('包件重复扫描')
+					utils.ttsspke('请扫描库位码')
 					// #endif
 					return
 				}
-			}
-
-			let data = {
-				upshelfScanType: details.upshelfScanType,
-				code: details.scancode,
-			}
-			let res = await warehouseUpdownTypeupShelfScanGoods(data)
-			console.log('res>>>>>', res);
-			if (res.code == 200) {
-				if (Number(details.upshelfScanType) !== 3) {
-					const _uplistarr = details.uplistarr
-					const _orderCodeArr = details.orderCodeArr
-					const _flag = res.data.every(val => {
-						if (details.orderCodeArr.includes(val.orderCode)) {
-							uni.showToast({
-								title: '订单已存在, 勿重复扫码',
-								icon: 'none'
-							})
-							return false
-						}
-						_uplistarr.push(val)
-						_orderCodeArr.push(val.orderCode)
-						return true
-					})
-					if (!_flag) return
-					details.uplistarr = _uplistarr
-					details.orderCodeArr = _orderCodeArr
+				console.log('111 :>> ', 111);
+				let data = {
+					allocationId: details.scancode,
 				}
-				else {
-					details.uplistarr = details.uplistarr.concat(res.data)
+				let res = await warehouseUpdownTypeupShelfScanAllocation(data)
+				console.log(res);
+				if (res.code == 200) {
+					details.reqobj = res.data
+					const _positionArr = details.reqobj.allocationTitle.split('-')
+					details.reqobj.positionInfo = _positionArr[0] + '层' + _positionArr[1] + '列'
+					details.allocationId = res.data.allocationId
+					details.datalist = (res.data?.list) || []
+					if (details.checkstate === 2) return details.renderList = details.datalist
+					// if (details.upshelfScanType === '4') return utils.ttsspke('请扫描托盘码')
+					// utils.ttsspke('请扫描包条码')
+				}
+			} else {
+				if (Number(details.upshelfScanType) == 4 && details.reqobj.trayCode) {
+					// #ifdef APP
+					utils.ttsspke('该库位已绑托盘')
+					// #endif
+					return
+				}
+			
+				if (details.upshelfScanType === '3') {
+					const flag = details.uplistarr.findIndex(val => val.orderPackageCode === details.scancode)
+					if (flag !== -1) {
+						// #ifdef APP
+						utils.ttsspke('包件重复扫描')
+						// #endif
+						return
+					}
+				}
+			
+				let data = {
+					upshelfScanType: details.upshelfScanType,
+					code: details.scancode,
+				}
+				let res = await warehouseUpdownTypeupShelfScanGoods(data)
+				console.log('res>>>>>', res);
+				if (res.code == 200) {
+					if (Number(details.upshelfScanType) !== 3) {
+						const _uplistarr = details.uplistarr
+						const _orderCodeArr = details.orderCodeArr
+						const _flag = res.data.every(val => {
+							if (details.orderCodeArr.includes(val.orderCode)) {
+								uni.showToast({
+									title: '订单已存在, 勿重复扫码',
+									icon: 'none'
+								})
+								return false
+							}
+							_uplistarr.push(val)
+							_orderCodeArr.push(val.orderCode)
+							return true
+						})
+						if (!_flag) return
+						details.uplistarr = _uplistarr
+						details.orderCodeArr = _orderCodeArr
+					}
+					else {
+						details.uplistarr = details.uplistarr.concat(res.data)
+					}
+					// 语音   
+					let _content = ''
+					if (details.upshelfScanType !== '3') _content = details.uplistarr.reduce((curr, item) => curr + item.shelfNum, 0) + '件'
+					else _content = details.uplistarr.length + '件'
+					utils.ttsspke(_content)
+			
+					if (details.checkstate === 1) return details.renderList = details.uplistarr
+			
+				} else if (res.code === 3001 && res.audio) {
+					utils.ttsspke(res.audio)
 				}
-				// 语音   
-				let _content = ''
-				if (details.upshelfScanType !== '3') _content = details.uplistarr.reduce((curr, item) => curr + item.shelfNum, 0) + '件'
-				else _content = details.uplistarr.length + '件'
-				utils.ttsspke(_content)
-
-				if (details.checkstate === 1) return details.renderList = details.uplistarr
-
-			} else if (res.code === 3001 && res.audio) {
-				utils.ttsspke(res.audio)
 			}
+		}catch(err){
+			console.log('err :>> ', err);
+			//TODO handle the exception
+		}finally{
+			uni.hideLoading()
 		}
-
 	}
 	function goorderdetail(item, type) {
 		// 当type 不是 

pagesHome/pages/SearchTray/SearchTray.vue

@@ -87,6 +87,7 @@
 				<!-- 底部站位 -->
 				<view class="footer"></view>
 				<view class="submitBtn" @click="handleSubmit">提交同步</view>
+				<button type="default" @click="moni">moni</button>
 			</scroll-view>
 
 		</template>
@@ -168,10 +169,11 @@
 	})
 
 	async function scandata() {
+		// uni.showLoading({
+		// 	mask: true,
+		// 	// duration: 30000
+		// })
 		try {
-			uni.showLoading({
-				mask: true
-			})
 			// 表格不显示复选框
 			details.isShowSelect = false
 			const res = await postFindSyncTrayData({ trayCode: details.scancode })
@@ -179,11 +181,13 @@
 			if (code !== 200 || !data) return
 			details.detauser = data
 			details.datelist = data.packageList ? data.packageList : []
+			
 		} catch (err) {
 			console.log('err :>> ', err);
 			//TODO handle the exception
 		} finally {
-			uni.hideLoading()
+			// await nextTick()
+			// uni.hideLoading()
 		}
 	}
 
@@ -205,10 +209,10 @@
 			return
 		}
 
+			// uni.showLoading({
+			// 	mask: true
+			// })
 		try {
-			uni.showLoading({
-				mask: true
-			})
 
 			const res = await postFindSyncOldTrayData({ trayCode: details.detauser.trayCode })
 			const { code, data } = res
@@ -217,15 +221,16 @@
 			details.datelist = data.packageList ? data.packageList : []
 			// 表格显示复选框
 			details.isShowSelect = true
-			await nextTick()
-			// 开启全选
-			uniTable1.value.selectionAll()
 		} catch (err) {
 			console.log('err :>> ', err);
 			//TODO handle the exception
 		} finally {
+			await nextTick()
+			// 开启全选
+			uniTable1.value.selectionAll()
+			console.log('111 :>> ', 111);
 			// 关闭loading
-			uni.hideLoading()
+			// uni.hideLoading()
 		}
 	}
 
@@ -271,6 +276,11 @@
 			uni.hideLoading()
 		}
 	}
+	
+	function moni(){
+		details.scancode = 'T2966'
+		scandata()
+	}
 	const { datelist, detauser } = toRefs(details)
 </script>
 

pagesHome/pages/orderInquiry/orderInquiry.vue

@@ -8,30 +8,13 @@
 		<view class="header-search">
 			<view class="search">
 				<input class="searchInput" v-model="scancode" type="text">
-
-				<!-- 搜索结果列表 -->
-				<!-- 		<view class="searchResultList" v-if="isShowOrderList">
-					<view v-for="item in distributionOrderList" :key="item" @click="handleSearchOrder(item)">
-						{{item}}
-					</view>
-				</view> -->
 			</view>
 
 			<view class="search">
 				<view class="searchType" @click="scandata">
 					搜索
 				</view>
-				<!-- <view class="searchType" @click="showTypeList">
-					{{searchForm.searchTypeList.find((item)=> item.type === searchForm.type).label}}
-				</view> -->
-
-				<!-- 搜索类型列表 -->
-				<!-- 		<view class="searchResultList" v-if="isShowTypeList">
-					<view>
-						<view v-for="value in searchForm.searchTypeList" :key="value.label"
-							@click="handleSearchFormType(value.type)">{{value.label}}</view>
-					</view>
-				</view> -->
+
 			</view>
 
 		</view>
@@ -90,11 +73,10 @@
 					{{dataInfo.completeSet === 1 ? '齐套' : '未齐套'}}
 				</text>
 			</view>
-			<view class="dataInfo__item">
+			<view class="dataInfo__item w100">
 				<view class="label">收货地址:</view>
 				<view>{{dataInfo.customerAddress || ''}}</view>
 			</view>
-
 		</view>
 
 		<view class="orderInfo">
@@ -276,13 +258,7 @@
 		})
 		// #endif
 
-		// await nextTick()
-		// console.log('MaterialReplenishment :>> ', MaterialReplenishment);
-		// MaterialReplenishment.value.setDetails
-		// 	({
-		// 		title: '物料补录',
-		// 		showPopUp: true
-		// 	})
+
 	})
 
 	// 关闭扫描监听
@@ -464,9 +440,10 @@
 </script>
 
 <style lang="scss" scoped>
-	// 主题颜色
-	$themeColors: #d3832a;
-
+	.w100{
+		width:100%;
+	}
+	
 	// 最外层容器
 	.container {
 		padding: 20upx;
@@ -476,8 +453,8 @@
 	// 顶部搜索栏
 	.header-search {
 		height: 60upx;
-		padding: 30upx 0 30upx;
-		border-bottom: 1upx solid #aaa;
+		padding: 0 0 20upx;
+		// border-bottom: 1upx solid #aaa;
 		display: flex;
 		justify-content: space-between;
 
@@ -502,10 +479,11 @@
 
 	// 搜索输入框
 	.searchInput {
+		background: #fff;
 		width: 500upx;
 		height: 100%;
 		padding-left: 20upx;
-		border: 1upx solid $themeColors;
+		border: 1upx solid var(--subjectColor);
 		border-radius: 30upx;
 	}
 
@@ -516,16 +494,17 @@
 		align-items: center;
 		padding: 0 40upx;
 		background: #fff;
-		border: 1upx solid $themeColors;
+		border: 1upx solid var(--subjectColor);
 		border-radius: 10upx;
-		color: $themeColors;
+		color: var(--subjectColor);
 	}
 
 	// 数据详情
 	.dataInfo {
 		display: flex;
 		flex-wrap: wrap;
-		border-bottom: 1upx solid #aaa;
+		// border-bottom: 1upx solid #aaa;
+		background: #fff;
 	}
 
 	.dataInfo__item {
@@ -544,17 +523,19 @@
 
 	// 订单列表信息
 	.orderInfo {
+		background: #fff;
 		margin-top: 10upx;
 
 		// 头部统计
 		.title {
 			display: flex;
 			justify-content: space-around;
-			font-size: 40upx;
+			font-size: 32upx;
 			font-weight: bold;
 			margin-bottom: 20upx;
 
 			&>view {
+				padding: 15upx 0 ;
 				flex: 1;
 				text-align: center;
 				position: relative;
@@ -565,8 +546,8 @@
 					position: absolute;
 					height: 4upx;
 					width: 0;
-					background: $themeColors;
-					top: 110%;
+					background: var(--subjectColor);
+					top: 100%;
 					left: 50%;
 					transition: all 0.5s;
 				}
@@ -579,15 +560,15 @@
 		}
 
 		.title__number {
-			color: #f00;
+			color: var(--subjectColor);
 		}
 
 		// 批量操作按钮
 		.batchOperationBtn {
-			border: 1upx solid $themeColors;
+			border: 1upx solid var(--subjectColor);
 			text-align: center;
 			padding: 10upx 0;
-			color: $themeColors;
+			color: var(--subjectColor);
 			border-radius: 10upx;
 			width: 200upx;
 			font-size: 28upx;

pagesHome/pages/pickingScan/pickingScan.vue

@@ -252,7 +252,7 @@
 		// 	url: '/pagesHome/pages/PickingScanList/PickingScanList?id=' + item.id + '&stockupArea=' + item.stockupArea,
 
 		// })
-		uni.reLaunch({
+		uni.navigateTo({
 			url: '/pagesHome/pages/PickingScanList/PickingScanList?id=' + item.id + '&stockupArea=' + item.stockupArea,
 		})
 	}

utils/request.js

@@ -9,6 +9,7 @@ import base64 from '@/utils/base64.js';
 import {
 	hexMD5
 } from '@/utils/md5.js'
+import { nextTick } from 'vue';
 
 /**
  * 刷新token
@@ -91,7 +92,7 @@ const HandleRefreshToken = (header, urlhd, refresh_token, user) => {
 /**
  * 请求函数
  */
-const HandleRequest = (params, key) => {
+const HandleRequest = (params, key, loadingObj) => {
 	return new Promise(async (relove, reject) => {
 		let refresh_token = uni.getStorageSync('refresh_token')
 		let token = uni.getStorageSync('access_token')
@@ -117,10 +118,14 @@ const HandleRequest = (params, key) => {
 			// 登录请求时, 加密密码
 			if (params.data.password) params.data.password = hexMD5(params.data.password)
 		}
-		// uni.showLoading({
-		// 	title:'请求中',
-		// 	mask:true
-		// })
+		let content = ''
+		if (loadingObj.title) content = loadingObj.title
+
+		// 开启loading
+		if (loadingObj.isShowLoading !== false) uni.showLoading({
+			title: content,
+			mask:true
+		})
 		let urlhd = ''
 		if (uni.getStorageSync('setip')) {
 			urlhd = uni.getStorageSync('setip')
@@ -161,7 +166,6 @@ const HandleRequest = (params, key) => {
 		request.then(res => {
 			// console.log(res);
 			console.log('请求res :>> ', res);
-			uni.hideLoading()
 			if (res.statusCode == 200) {
 
 				let data = res.data;
@@ -248,7 +252,7 @@ const HandleRequest = (params, key) => {
 					// #endif
 				}
 			}
-		}).catch(err => {
+		}).catch(async err => {
 			console.log(err);
 			// uni.reLaunch({
 			// 	url: '/pages/index/index'
@@ -258,8 +262,10 @@ const HandleRequest = (params, key) => {
 			// #ifdef APP
 			utils.ttsspke('请检查是否连接到无线网络')
 			// #endif
+		}).finally(async res => {
+			await nextTick()
 			uni.hideLoading()
-		}).finally()
+		})
 
 	})
 }
@@ -278,7 +284,7 @@ let _isRefreshToken = {
 
 let isLogin = false
 
-const service = async (params) => {
+const service = async (params, loadingObj) => {
 	if (params.data.isLogin) {
 		isLogin = true
 		delete params.data.isLogin
@@ -295,8 +301,8 @@ const service = async (params) => {
 	console.log('_isRefreshToken :>> ', _isRefreshToken);
 	if (_isRefreshToken._isRefreshToken) {
 		await _isRefreshToken._isRefreshToken
-		return HandleRequest(params, _key)
+		return HandleRequest(params, _key, loadingObj)
 
-	} else return HandleRequest(params, _key)
+	} else return HandleRequest(params, _key, loadingObj)
 }
 export default service;