From 71106e081e965dcdbce1ff1a0c8aaa85581a73a7 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Tue, 25 Apr 2023 18:56:34 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E7=89=A9=E6=B5=81=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=94=B9=E4=B8=BA=E5=90=8E=E7=AB=AF=E6=9F=A5?= =?UTF-8?q?=EF=BC=8C=E4=B9=8B=E5=89=8D=E6=98=AF=E7=9B=B4=E6=8E=A5=E8=B7=B3?= =?UTF-8?q?=E5=BF=AB=E9=80=92100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/development_address_config.js | 3 + public/local_production_address_config.js | 3 + public/production_address_config.js | 3 + src/assets/expressBrandLogo/cutLine.png | Bin 0 -> 587 bytes src/assets/expressBrandLogo/delivery.png | Bin 0 -> 4152 bytes src/assets/expressBrandLogo/downArrow.png | Bin 0 -> 218 bytes src/assets/expressBrandLogo/ems.png | Bin 0 -> 4445 bytes .../expressBrandLogo/received-finish.png | Bin 0 -> 1531 bytes src/assets/expressBrandLogo/received.png | Bin 0 -> 4144 bytes src/assets/expressBrandLogo/search.png | Bin 0 -> 796 bytes src/assets/expressBrandLogo/shunfeng.png | Bin 0 -> 4824 bytes src/assets/expressBrandLogo/signed.png | Bin 0 -> 4267 bytes src/assets/expressBrandLogo/transit.png | Bin 0 -> 4410 bytes src/config/router.config.js | 9 +- src/permission.js | 2 +- src/views/MessagePage/MeetingDetailModal.vue | 9 +- src/views/MessagePage/ProjectDetailModal.vue | 9 +- src/views/expressInfo/LookExpressInfo.vue | 387 ++++++++++++++++++ .../components/InputPhoneModal.vue | 86 ++++ .../modules/MineContractModule.vue | 9 +- .../PaymentInfo/modules/BillingInfoModal.vue | 9 +- src/views/workTeam/WorkTeamDetail.vue | 9 +- 22 files changed, 530 insertions(+), 8 deletions(-) create mode 100644 src/assets/expressBrandLogo/cutLine.png create mode 100644 src/assets/expressBrandLogo/delivery.png create mode 100644 src/assets/expressBrandLogo/downArrow.png create mode 100644 src/assets/expressBrandLogo/ems.png create mode 100644 src/assets/expressBrandLogo/received-finish.png create mode 100644 src/assets/expressBrandLogo/received.png create mode 100644 src/assets/expressBrandLogo/search.png create mode 100644 src/assets/expressBrandLogo/shunfeng.png create mode 100644 src/assets/expressBrandLogo/signed.png create mode 100644 src/assets/expressBrandLogo/transit.png create mode 100644 src/views/expressInfo/LookExpressInfo.vue create mode 100644 src/views/expressInfo/components/InputPhoneModal.vue diff --git a/public/development_address_config.js b/public/development_address_config.js index c3ef998..2f0c060 100644 --- a/public/development_address_config.js +++ b/public/development_address_config.js @@ -23,3 +23,6 @@ window._CONFIG["memberURL"] = "/memberApi"; // 会员系统的静态文件的地址 window._CONFIG["memberStaticDomainURL"] = window._CONFIG["memberURL"] + "/sys/common/static"; window._CONFIG["memberDomianWebSocketURL"] = "http://10.0.1.9:9000/api"; + +// 查看物流信息 +window._CONFIG["lookExpressDomainURL"] = "http://localhost:3001/lookExpressInfo"; diff --git a/public/local_production_address_config.js b/public/local_production_address_config.js index d7d4e11..4101560 100644 --- a/public/local_production_address_config.js +++ b/public/local_production_address_config.js @@ -22,3 +22,6 @@ window._CONFIG["memberURL"] = "/memberApi"; // 会员系统的静态文件的地址 window._CONFIG["memberStaticDomainURL"] = window._CONFIG["memberURL"] + "/sys/common/static"; window._CONFIG["memberDomianWebSocketURL"] = "http://139.9.235.66/memberApi"; + +// 查看物流信息 +window._CONFIG["lookExpressDomainURL"] = "http://bxxt.hzwlsoft.com/lookexpressinfo"; \ No newline at end of file diff --git a/public/production_address_config.js b/public/production_address_config.js index 791dcfd..a1dd7e3 100644 --- a/public/production_address_config.js +++ b/public/production_address_config.js @@ -23,3 +23,6 @@ window._CONFIG["memberURL"] = "/memberApi"; // 会员系统的静态文件的地址 window._CONFIG["memberStaticDomainURL"] = window._CONFIG["memberURL"] + "/sys/common/static"; window._CONFIG["memberDomianWebSocketURL"] = "http://cwp.catarc.org.cn/memberApi"; + +// 查看物流信息 +window._CONFIG["lookExpressDomainURL"] = "http://cwp.catarc.org.cn/lookexpressinfo"; diff --git a/src/assets/expressBrandLogo/cutLine.png b/src/assets/expressBrandLogo/cutLine.png new file mode 100644 index 0000000000000000000000000000000000000000..4eec463748c834e69b9e1b493157b40126342a80 GIT binary patch literal 587 zcmeAS@N?(olHy`uVBq!ia0y~yU|#`bvvIHi$-1-yD}fYaage(c!@6@aFBuq^SUp`F zLn`9l-Z|*Y^ZC>HWVH=9 z_sO42UOWHujrwU%Nm5*bRHx{b}*Xzdha{{rqeE`v=vp zC&mA--&dp0a;7~;=EtYMstNznm=8{0|5tZ5g)nfO?zt<3F2&RKLyN%3~3u7xbDxG6$%) z9c0PX^I4J?&Uan;b$HQ@yWCmb+h08TTWPSbX6k;BZ0Ndd$$)j;SAIE*%|_T6#r9=0 z4*%)&-QB%lTSd42yoZxjpMo54-7a-AFkpYqKFbil@7wkyHkor*H+*f^F^%8%%h`;% t=I5*QqdYItO>_P#dP72&;r^cY{Oh-QFj!mWG67QugQu&X%Q~loCICm$F-HIZ literal 0 HcmV?d00001 diff --git a/src/assets/expressBrandLogo/delivery.png b/src/assets/expressBrandLogo/delivery.png new file mode 100644 index 0000000000000000000000000000000000000000..d75cc208bb4ee3f25f821f3c002ba3b2014c5f4a GIT binary patch literal 4152 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 literal 0 HcmV?d00001 diff --git a/src/assets/expressBrandLogo/ems.png b/src/assets/expressBrandLogo/ems.png new file mode 100644 index 0000000000000000000000000000000000000000..15291faa6777e0e8ec043a1d1166126715fb4e9d GIT binary patch literal 4445 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 literal 0 HcmV?d00001 diff --git a/src/assets/expressBrandLogo/received-finish.png b/src/assets/expressBrandLogo/received-finish.png new file mode 100644 index 0000000000000000000000000000000000000000..2050d1c9c424ba03464337952c7a6ba730120de4 GIT binary patch literal 1531 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 N002ovPDHLkV1g`0Df9pU literal 0 HcmV?d00001 diff --git a/src/assets/expressBrandLogo/transit.png b/src/assets/expressBrandLogo/transit.png new file mode 100644 index 0000000000000000000000000000000000000000..b5ad99b80198f729958f6add08e4e5df573f7825 GIT binary patch literal 4410 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 AEdT%j literal 0 HcmV?d00001 diff --git a/src/config/router.config.js b/src/config/router.config.js index de821bd..6e35e7a 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -2,6 +2,7 @@ import { UserLayout, TabLayout } from '@/components/layouts' import SignUpEntrance from "@views/signUp/SignUpEntrance" import SignUpPage from "@views/signUp/SignUpPage" +import LookExpressInfo from "@views/expressInfo/LookExpressInfo" /** * 走菜单,走权限控制 @@ -66,7 +67,7 @@ export const constantRouterMap = [ path: 'member-register-result', name: 'MemberRegisterResult', component: () => import(/* webpackChunkName: "user" */ '@/views/standardsAssociation/register/RegisterResult') - }, + } ] }, { @@ -79,7 +80,11 @@ export const constantRouterMap = [ component: SignUpPage, hidden: true, }, - + { + path: "/lookExpressInfo", + component: LookExpressInfo, + hidden: true + } ] /** diff --git a/src/permission.js b/src/permission.js index a9dfe5c..1a35453 100644 --- a/src/permission.js +++ b/src/permission.js @@ -9,7 +9,7 @@ import { generateIndexRouter } from '@/utils/util' NProgress.configure({ showSpinner: false }) // NProgress Configuration -const whiteList = ['/user/login', '/user/manageLogin', '/user/register', '/user/register-result', '/user/member-register', '/user/member-register-result', '/user/alteration','/signupentrance','/signUpPage'] // no redirect whitelist +const whiteList = ['/user/login', '/user/manageLogin', '/user/register', '/user/register-result', '/user/member-register', '/user/member-register-result', '/user/alteration','/signupentrance','/signUpPage','/lookExpressInfo'] // no redirect whitelist const ThirdLoginFunc = (token) => { return new Promise(resolve => { diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue index 572cfa6..c8f063d 100644 --- a/src/views/MessagePage/MeetingDetailModal.vue +++ b/src/views/MessagePage/MeetingDetailModal.vue @@ -913,7 +913,14 @@ export default { * */ lookLogistics(record) { const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng' - window.open(`https://www.kuaidi100.com/chaxun?com=${com}&nu=${record.postNo}`) + // window.open(`https://www.kuaidi100.com/chaxun?com=${com}&nu=${record.postNo}`) + let url = '' + if (com === 'shunfeng' && record.contactMobile) { + url = `${window._CONFIG['lookExpressDomainURL']}?com=${ com }&nu=${ record.postNo }&phone=${ record.contactMobile }` + } else { + url = `${window._CONFIG['lookExpressDomainURL']}?com=${ com }&nu=${ record.postNo }` + } + window.open(url, '_blank') }, /* * 当前时间是否超过会议报名时间 diff --git a/src/views/MessagePage/ProjectDetailModal.vue b/src/views/MessagePage/ProjectDetailModal.vue index ab63691..a9e2001 100644 --- a/src/views/MessagePage/ProjectDetailModal.vue +++ b/src/views/MessagePage/ProjectDetailModal.vue @@ -291,7 +291,14 @@ export default { * */ lookLogistics(record) { const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng' - window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`) + // window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`) + let url = '' + if (com === 'shunfeng' && record.mobile) { + url = `${window._CONFIG['lookExpressDomainURL']}?com=${ com }&nu=${ record.postNo }&phone=${ record.mobile }` + } else { + url = `${window._CONFIG['lookExpressDomainURL']}?com=${ com }&nu=${ record.postNo }` + } + window.open(url, '_blank') }, /* * 去合同详情 传入合同id diff --git a/src/views/expressInfo/LookExpressInfo.vue b/src/views/expressInfo/LookExpressInfo.vue new file mode 100644 index 0000000..267aa0f --- /dev/null +++ b/src/views/expressInfo/LookExpressInfo.vue @@ -0,0 +1,387 @@ + + + + + \ No newline at end of file diff --git a/src/views/expressInfo/components/InputPhoneModal.vue b/src/views/expressInfo/components/InputPhoneModal.vue new file mode 100644 index 0000000..cf858a6 --- /dev/null +++ b/src/views/expressInfo/components/InputPhoneModal.vue @@ -0,0 +1,86 @@ + + + + + \ No newline at end of file diff --git a/src/views/mineContract/modules/MineContractModule.vue b/src/views/mineContract/modules/MineContractModule.vue index 106b044..4c74bfe 100644 --- a/src/views/mineContract/modules/MineContractModule.vue +++ b/src/views/mineContract/modules/MineContractModule.vue @@ -176,7 +176,14 @@ export default { }, lookLogistics(record) { const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng' - window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`) + // window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`) + let url = '' + if (com === 'shunfeng' && record.principalPhone) { + url = `${window._CONFIG['lookExpressDomainURL']}?com=${ com }&nu=${ record.postNo }&phone=${ record.principalPhone }` + } else { + url = `${window._CONFIG['lookExpressDomainURL']}?com=${ com }&nu=${ record.postNo }` + } + window.open(url, '_blank') }, handleCancel() { this.close() diff --git a/src/views/standardsAssociation/PaymentInfo/modules/BillingInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/BillingInfoModal.vue index 55ccbd0..e3e44fa 100644 --- a/src/views/standardsAssociation/PaymentInfo/modules/BillingInfoModal.vue +++ b/src/views/standardsAssociation/PaymentInfo/modules/BillingInfoModal.vue @@ -419,7 +419,14 @@ export default { // this.model.sendMethod 1是ems 2是顺丰 // https://www.kuaidi100.com/chaxun?com=[]&nu=[] const com = Number(this.model.sendMethod) === 1 && 'ems' || 'shunfeng' - window.open(`https://www.kuaidi100.com/chaxun?com=${com}&nu=${this.model.postNo}`) + // window.open(`https://www.kuaidi100.com/chaxun?com=${com}&nu=${this.model.postNo}`) + let url = '' + if (com === 'shunfeng' && this.model.mobile) { + url = `${window._CONFIG['lookExpressDomainURL']}?com=${ com }&nu=${ this.model.postNo }&phone=${ this.model.mobile }` + } else { + url = `${window._CONFIG['lookExpressDomainURL']}?com=${ com }&nu=${ this.model.postNo }` + } + window.open(url, '_blank') } } diff --git a/src/views/workTeam/WorkTeamDetail.vue b/src/views/workTeam/WorkTeamDetail.vue index 39ca64f..2d4310e 100644 --- a/src/views/workTeam/WorkTeamDetail.vue +++ b/src/views/workTeam/WorkTeamDetail.vue @@ -370,7 +370,14 @@ export default { * */ lookLogistics(record) { const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng' - window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`) + // window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`) + let url = '' + if (com === 'shunfeng' && record.contactMobile) { + url = `${window._CONFIG['lookExpressDomainURL']}?com=${ com }&nu=${ record.postNo }&phone=${ record.contactMobile }` + } else { + url = `${window._CONFIG['lookExpressDomainURL']}?com=${ com }&nu=${ record.postNo }` + } + window.open(url, '_blank') }, /* * 通过文件id获取文件的相关信息