From ce78b6f1d33c2ec65ecc0914d8a120561c0aeb47 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Thu, 29 Feb 2024 14:05:33 +0800
Subject: [PATCH] uu

---
 pages/tabBar/deal/deal.vue   | 67 +++++++++++++++++-------------------
 pages/tabBar/home/home.vue   | 32 ++++++++---------
 pages/tabBar/mine/mine.vue   | 14 +++-----
 pages/tabBar/order/order.vue | 15 ++++----
 4 files changed, 57 insertions(+), 71 deletions(-)

diff --git a/pages/tabBar/deal/deal.vue b/pages/tabBar/deal/deal.vue
index 28b83b0..1b823e1 100644
--- a/pages/tabBar/deal/deal.vue
+++ b/pages/tabBar/deal/deal.vue
@@ -46,8 +46,7 @@
 	</view>
 </template>
 <script>
-	import getCdnUrl from "@/common/getCdnUrl"
-	import { goto } from "@/common/untool"
+	
 	export default {
 		props: {
 			// hasLeftWin: {
@@ -58,41 +57,41 @@
 			return {
 				
 				faBtnlist: [
-					{  title: '运单录入', subTitle: "", icon: getCdnUrl(`home/ydluru.png`), url: 'post/openorder' },
-					{  title: '揽收扫描', subTitle: "", icon: getCdnUrl(`home/lshsm.png`), url: 'deliveryDeal/pickUp' },
-					{  title: '发件扫描', subTitle: "", icon: getCdnUrl(`home/fajiansm.png`), url: 'deliveryDeal/qutgoingScanning' },
-					{  title: '分拨发件', subTitle: "", icon: getCdnUrl(`home/fajiansm.png`), url: 'deliveryDeal/distributeOutgoing' },
-					{  title: '合包扫描', subTitle: "", icon: getCdnUrl(`home/hebaosm.png`), url: 'tms/coPackingScanning' },
-					{  title: '运单修改', subTitle: "", icon: getCdnUrl(`home/ydxiugai.png`), url: '' },
-					{  title: '收货入库', subTitle: "", icon: getCdnUrl(`home/shhruku.png`), url: 'deliveryDeal/storage' },
-					{  title: '装柜扫描', subTitle: "", icon: getCdnUrl(`home/zhuangchesm.png`), url: 'deliveryDeal/shipping' },
-					{  title: '发件清单', subTitle: "", icon: getCdnUrl(`home/fjqingdan.png`), url: 'deliveryDeal/sendList' },
-					{  title: '拆包扫描', subTitle: "", icon: getCdnUrl(`home/chaibsm.png`), url: 'tms/unpackingScanning' },
-					{  title: '报关扫描', subTitle: "", icon: getCdnUrl(`home/baogsm.png`), url: 'tms/customsDeclarationScanning' },
-					{  title: '清关扫描', subTitle: "", icon: getCdnUrl(`home/qinggsm.png`), url: 'tms/customsClearanceScanning' },
-					{  title: '装车扫描', subTitle: "", icon: getCdnUrl(`home/zhuangchesm.png`), url: 'tms/entruckingScanning' },
-					{  title: '整车扫描', subTitle: "", icon: getCdnUrl(`home/zhuangchesm.png`), url: 'tms/allCartScanning' },
-					{  title: '面单补打', subTitle: "", icon: getCdnUrl(`home/mdbuda.png`), url: '' }
+					{  title: '运单录入', subTitle: "", icon: this.getCdnUrl(`home/ydluru.png`), url: 'post/openorder' },
+					{  title: '揽收扫描', subTitle: "", icon: this.getCdnUrl(`home/lshsm.png`), url: 'deliveryDeal/pickUp' },
+					{  title: '发件扫描', subTitle: "", icon: this.getCdnUrl(`home/fajiansm.png`), url: 'deliveryDeal/qutgoingScanning' },
+					{  title: '分拨发件', subTitle: "", icon: this.getCdnUrl(`home/fajiansm.png`), url: 'deliveryDeal/distributeOutgoing' },
+					{  title: '合包扫描', subTitle: "", icon: this.getCdnUrl(`home/hebaosm.png`), url: 'tms/coPackingScanning' },
+					{  title: '运单修改', subTitle: "", icon: this.getCdnUrl(`home/ydxiugai.png`), url: '' },
+					{  title: '收货入库', subTitle: "", icon: this.getCdnUrl(`home/shhruku.png`), url: 'deliveryDeal/storage' },
+					{  title: '装柜扫描', subTitle: "", icon: this.getCdnUrl(`home/zhuangchesm.png`), url: 'deliveryDeal/shipping' },
+					{  title: '发件清单', subTitle: "", icon: this.getCdnUrl(`home/fjqingdan.png`), url: 'deliveryDeal/sendList' },
+					{  title: '拆包扫描', subTitle: "", icon: this.getCdnUrl(`home/chaibsm.png`), url: 'tms/unpackingScanning' },
+					{  title: '报关扫描', subTitle: "", icon: this.getCdnUrl(`home/baogsm.png`), url: 'tms/customsDeclarationScanning' },
+					{  title: '清关扫描', subTitle: "", icon: this.getCdnUrl(`home/qinggsm.png`), url: 'tms/customsClearanceScanning' },
+					{  title: '装车扫描', subTitle: "", icon: this.getCdnUrl(`home/zhuangchesm.png`), url: 'tms/entruckingScanning' },
+					{  title: '整车扫描', subTitle: "", icon: this.getCdnUrl(`home/zhuangchesm.png`), url: 'tms/allCartScanning' },
+					{  title: '面单补打', subTitle: "", icon: this.getCdnUrl(`home/mdbuda.png`), url: '' }
 				], 
 				daoBtnlist: [
-					{  title: '到件扫描', subTitle: "", icon: getCdnUrl(`home/daohsm.png`), url: 'deliveryDeal/arriveScanning' },
-					{  title: '派件扫描', subTitle: "", icon: getCdnUrl(`home/paijsm.png`), url: 'deliveryDeal/deliveryScanning' },
-					{  title: '签收扫描', subTitle: "", icon: getCdnUrl(`home/qianshsm.png`), url: 'deliveryDeal/signedScanning' },
-					{  title: '到派扫描', subTitle: "", icon: getCdnUrl(`home/daojsm.png`), url: 'deliveryDeal/arriveDeliveryScanning' },
-					{  title: '卸车扫描', subTitle: "", icon: getCdnUrl(`home/xiechesm.png`), url: 'tms/untruckingScanning' },
-					{  title: '到件清单', subTitle: "", icon: getCdnUrl(`home/daojqd.png`), url: 'deliveryDeal/arriveList' },
-					{  title: '派件清单', subTitle: "", icon: getCdnUrl(`home/paijqd.png`), url: 'deliveryDeal/paiList' },
-					{  title: '留仓扫描', subTitle: "", icon: getCdnUrl(`home/licsm.png`), url: 'deliveryDeal/stayScanning' },
-					{  title: '转件扫描', subTitle: "", icon: getCdnUrl(`home/zhuanjsm.png`), url: 'deliveryDeal/translateScanning' },
-					{  title: '进仓查询', subTitle: "", icon: getCdnUrl(`home/jincchx.png`), url: '' }
+					{  title: '到件扫描', subTitle: "", icon: this.getCdnUrl(`home/daohsm.png`), url: 'deliveryDeal/arriveScanning' },
+					{  title: '派件扫描', subTitle: "", icon: this.getCdnUrl(`home/paijsm.png`), url: 'deliveryDeal/deliveryScanning' },
+					{  title: '签收扫描', subTitle: "", icon: this.getCdnUrl(`home/qianshsm.png`), url: 'deliveryDeal/signedScanning' },
+					{  title: '到派扫描', subTitle: "", icon: this.getCdnUrl(`home/daojsm.png`), url: 'deliveryDeal/arriveDeliveryScanning' },
+					{  title: '卸车扫描', subTitle: "", icon: this.getCdnUrl(`home/xiechesm.png`), url: 'tms/untruckingScanning' },
+					{  title: '到件清单', subTitle: "", icon: this.getCdnUrl(`home/daojqd.png`), url: 'deliveryDeal/arriveList' },
+					{  title: '派件清单', subTitle: "", icon: this.getCdnUrl(`home/paijqd.png`), url: 'deliveryDeal/paiList' },
+					{  title: '留仓扫描', subTitle: "", icon: this.getCdnUrl(`home/licsm.png`), url: 'deliveryDeal/stayScanning' },
+					{  title: '转件扫描', subTitle: "", icon: this.getCdnUrl(`home/zhuanjsm.png`), url: 'deliveryDeal/translateScanning' },
+					{  title: '进仓查询', subTitle: "", icon: this.getCdnUrl(`home/jincchx.png`), url: '' }
 				],
 				otherBtnlist: [
-					{  title: '运单查询', subTitle: "", icon: getCdnUrl(`home/kdchxun.png`), url: 'post/query' },
-					{  title: '我的二维码', subTitle: "", icon: getCdnUrl(`home/woderwm.png`), url: 'user/exclusiveQrcode' },
-					{  title: '报价试算', subTitle: "", icon: getCdnUrl(`home/baojshs.png`), url: 'post/freightCalculate' },
-					{  title: '问题件', subTitle: "", icon: getCdnUrl(`home/wentijian.png`), url: 'deliveryDeal/problemsRegisteScanning' },
-					{  title: '面单补打', subTitle: "", icon: getCdnUrl(`home/mdbuda.png`), url: '' },
-					{  title: '税费预估', subTitle: "", icon: getCdnUrl(`home/shfgs.png`), url: '' }
+					{  title: '运单查询', subTitle: "", icon: this.getCdnUrl(`home/kdchxun.png`), url: 'post/query' },
+					{  title: '我的二维码', subTitle: "", icon: this.getCdnUrl(`home/woderwm.png`), url: 'user/exclusiveQrcode' },
+					{  title: '报价试算', subTitle: "", icon: this.getCdnUrl(`home/baojshs.png`), url: 'post/freightCalculate' },
+					{  title: '问题件', subTitle: "", icon: this.getCdnUrl(`home/wentijian.png`), url: 'deliveryDeal/problemsRegisteScanning' },
+					{  title: '面单补打', subTitle: "", icon: this.getCdnUrl(`home/mdbuda.png`), url: '' },
+					{  title: '税费预估', subTitle: "", icon: this.getCdnUrl(`home/shfgs.png`), url: '' }
 				]
 			}
 		},
@@ -103,8 +102,6 @@
 			}
 		},
 		methods: {
-			getCdnUrl,
-			goto,
 		}
 	}
 </script>
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 03bf2f3..63eccef 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -91,8 +91,6 @@
 	</view>
 </template>
 <script>
-	import getCdnUrl from "@/common/getCdnUrl"
-	import { goto } from "@/common/untool"
 	export default {
 		computed: {
 		    userInfo() {
@@ -113,22 +111,22 @@
 					{ title: '已签收', value: "56", key: "" }
 				],
 				mainBtnlist: [
-					{  title: '计提预估', subTitle: "2888.80", icon: getCdnUrl(`home/jityugu.png`), url: '' },
-					{  title: '待回款', subTitle: "12888.80", icon: getCdnUrl(`home/daihuikuan.png`), url: '' }
+					{  title: '计提预估', subTitle: "2888.80", icon: this.getCdnUrl(`home/jityugu.png`), url: '' },
+					{  title: '待回款', subTitle: "12888.80", icon: this.getCdnUrl(`home/daihuikuan.png`), url: '' }
 				],
 				toolBtnlist: [
-					{  title: '运单录入', subTitle: "", icon: getCdnUrl(`home/ydluru.png`), url: 'post/openorder' },
-					{  title: '问题件', subTitle: "", icon: getCdnUrl(`home/wentijian.png`), url: 'deliveryDeal/problemsRegisteScanning' },
-					{  title: '货物图片', subTitle: "", icon: getCdnUrl(`home/hwtup.png`), url: '' },
-					{  title: '发件扫描', subTitle: "", icon: getCdnUrl(`home/fajiansm.png`), url: 'deliveryDeal/qutgoingScanning' },
-					{  title: '到件扫描', subTitle: "", icon: getCdnUrl(`home/daojsm.png`), url: 'deliveryDeal/arriveScanning' },
-					{  title: '派件扫描', subTitle: "", icon: getCdnUrl(`home/paijsm.png`), url: 'deliveryDeal/deliveryScanning' },
-					{  title: '签收扫描', subTitle: "", icon: getCdnUrl(`home/qianshsm.png`), url: 'deliveryDeal/signedScanning' },
-					{  title: '到派扫描', subTitle: "", icon: getCdnUrl(`home/daohsm.png`), url: 'deliveryDeal/arriveDeliveryScanning' },
-					{  title: '快件查询', subTitle: "", icon: getCdnUrl(`home/kdchxun.png`), url: '' },
-					{  title: '面单补打', subTitle: "", icon: getCdnUrl(`home/mdbuda.png`), url: 'print/courierNote' },
-					{  title: '收货入库', subTitle: "", icon: getCdnUrl(`home/shhruku.png`), url: 'deliveryDeal/storage' },
-					{  title: '运单修改', subTitle: "", icon: getCdnUrl(`home/ydxiugai.png`), url: 'post/post' }
+					{  title: '运单录入', subTitle: "", icon: this.getCdnUrl(`home/ydluru.png`), url: 'post/openorder' },
+					{  title: '问题件', subTitle: "", icon: this.getCdnUrl(`home/wentijian.png`), url: 'deliveryDeal/problemsRegisteScanning' },
+					{  title: '货物图片', subTitle: "", icon: this.getCdnUrl(`home/hwtup.png`), url: '' },
+					{  title: '发件扫描', subTitle: "", icon: this.getCdnUrl(`home/fajiansm.png`), url: 'deliveryDeal/qutgoingScanning' },
+					{  title: '到件扫描', subTitle: "", icon: this.getCdnUrl(`home/daojsm.png`), url: 'deliveryDeal/arriveScanning' },
+					{  title: '派件扫描', subTitle: "", icon: this.getCdnUrl(`home/paijsm.png`), url: 'deliveryDeal/deliveryScanning' },
+					{  title: '签收扫描', subTitle: "", icon: this.getCdnUrl(`home/qianshsm.png`), url: 'deliveryDeal/signedScanning' },
+					{  title: '到派扫描', subTitle: "", icon: this.getCdnUrl(`home/daohsm.png`), url: 'deliveryDeal/arriveDeliveryScanning' },
+					{  title: '快件查询', subTitle: "", icon: this.getCdnUrl(`home/kdchxun.png`), url: '' },
+					{  title: '面单补打', subTitle: "", icon: this.getCdnUrl(`home/mdbuda.png`), url: 'print/courierNote' },
+					{  title: '收货入库', subTitle: "", icon: this.getCdnUrl(`home/shhruku.png`), url: 'deliveryDeal/storage' },
+					{  title: '运单修改', subTitle: "", icon: this.getCdnUrl(`home/ydxiugai.png`), url: 'post/post' }
 				]
 			}
 		},
@@ -142,8 +140,6 @@
 			
 		},
 		methods: {
-			getCdnUrl,
-			goto,
 		}
 	}
 </script>
diff --git a/pages/tabBar/mine/mine.vue b/pages/tabBar/mine/mine.vue
index 6cc3cf2..279e42f 100644
--- a/pages/tabBar/mine/mine.vue
+++ b/pages/tabBar/mine/mine.vue
@@ -117,8 +117,6 @@
 	</view>
 </template>
 <script>
-	import getCdnUrl from "@/common/getCdnUrl"
-	import { goto } from "@/common/untool"
 	import { USERKEY } from "@/store/actionKey"
 	export default {
 		computed: {
@@ -135,10 +133,10 @@
 			return {
 				saomiao: true,
 				mainBtnlist: [
-					{  title: '服务客户',  icon: getCdnUrl(`mine/kehu.png`), url: '' },
-					{  title: '计提明细',  icon: getCdnUrl(`mine/jitmx.png`), url: 'user/withdraw' },
-					{  title: '专属二维码', icon: getCdnUrl(`mine/zhshu.png`), url: 'user/exclusiveQrcode' },
-					{  title: '我的收件',  icon: getCdnUrl(`mine/shj.png`), url: 'user/bunsStatic' }
+					{  title: '服务客户',  icon: this.getCdnUrl(`mine/kehu.png`), url: '' },
+					{  title: '计提明细',  icon: this.getCdnUrl(`mine/jitmx.png`), url: 'user/withdraw' },
+					{  title: '专属二维码', icon: this.getCdnUrl(`mine/zhshu.png`), url: 'user/exclusiveQrcode' },
+					{  title: '我的收件',  icon: this.getCdnUrl(`mine/shj.png`), url: 'user/bunsStatic' }
 				],
 				
 			}
@@ -150,11 +148,9 @@
 			}
 		},
 		methods: {
-			getCdnUrl,
-			goto,
 			async handleUnlogin() {
 				await this.$store.dispatch(USERKEY.LOGOUT)
-				goto(`login/login`, 2)
+				this.goto(`login/login`, 2)
 			}
 		}
 	}
diff --git a/pages/tabBar/order/order.vue b/pages/tabBar/order/order.vue
index 8ff89eb..73b4b38 100644
--- a/pages/tabBar/order/order.vue
+++ b/pages/tabBar/order/order.vue
@@ -137,9 +137,8 @@
 	
 </template>
 <script>
-	import getCdnUrl from "@/common/getCdnUrl"
 	import { ordStaEnum, dateRangeList, ordStatusList, payTypeEnum, payTypeList, dlvTypeEnum, dlvTypeList, dateTypeEnum, dateTypeList } from "@/common/enum"
-	import { goto, setClipboardData, confirmModal, showLoading } from "@/common/untool"
+	
 	export default {
 		props: {
 			// hasLeftWin: {
@@ -187,10 +186,8 @@
 		onUnload() {
 		},
 		methods: {
-			getCdnUrl,
-			goto,
 			initData(){
-				// showLoading()
+				// this.showLoading()
 				setTimeout(() => {
 					uni.stopPullDownRefresh();
 				}, 300);
@@ -227,16 +224,16 @@
 			async handleDealItem(item, deal = { type: '1' }) {
 				switch (deal.type){
 					case 1: // 跳转
-						goto(`post/detail?id=${item.id}`)
+						this.goto(`post/detail?id=${item.id}`)
 						break;
 					case 2: // 复制订单号
-						setClipboardData('xxxxxxx')
+						this.setClipboardData('xxxxxxx')
 						break;
 					case 3: // 删除
-						await confirmModal('确认要删除吗?')
+						await this.confirmModal('确认要删除吗?')
 						break;
 					case 4: // 取消
-						await confirmModal('确认要取消吗?')
+						await this.confirmModal('确认要取消吗?')
 						break;
 					default:
 						break;