Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

src/pages/package/job/overPackageJobDetail.vue

@@ -533,7 +533,7 @@
 			showCommitSuccessMessage(hint, pointData) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
 					if (pointData.length > 0) {
-						uni.navigateTo({
+						uni.redirectTo({
 							url: `/pages/point/index?points=${JSON.stringify(pointData)}`
 						});
 					} else {

src/pages/package/record/overPackageRecord.vue

@@ -455,7 +455,7 @@
 					this.fromLocationCode = '';
 					this.dataContent = {}
 					if (pointData.length > 0) {
-						uni.navigateTo({
+						uni.redirectTo({
 							url: `/pages/point/index?points=${JSON.stringify(pointData)}`
 						});
 					}

src/pages/purchaseReceipt/job/receiptDetail.vue

@@ -528,7 +528,7 @@
 														item.masterId).join(',')
 												}
 												console.log(dataParams)
-												uni.navigateTo({
+												uni.redirectTo({
 													url: '/pages/pointPutawayJob/index?data=' +
 														encodeURIComponent(JSON
 															.stringify(dataParams))