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 0000000..4eec463 Binary files /dev/null and b/src/assets/expressBrandLogo/cutLine.png differ diff --git a/src/assets/expressBrandLogo/delivery.png b/src/assets/expressBrandLogo/delivery.png new file mode 100644 index 0000000..d75cc20 Binary files /dev/null and b/src/assets/expressBrandLogo/delivery.png differ diff --git a/src/assets/expressBrandLogo/downArrow.png b/src/assets/expressBrandLogo/downArrow.png new file mode 100644 index 0000000..ff5d5a3 Binary files /dev/null and b/src/assets/expressBrandLogo/downArrow.png differ diff --git a/src/assets/expressBrandLogo/ems.png b/src/assets/expressBrandLogo/ems.png new file mode 100644 index 0000000..15291fa Binary files /dev/null and b/src/assets/expressBrandLogo/ems.png differ diff --git a/src/assets/expressBrandLogo/received-finish.png b/src/assets/expressBrandLogo/received-finish.png new file mode 100644 index 0000000..2050d1c Binary files /dev/null and b/src/assets/expressBrandLogo/received-finish.png differ diff --git a/src/assets/expressBrandLogo/received.png b/src/assets/expressBrandLogo/received.png new file mode 100644 index 0000000..973f196 Binary files /dev/null and b/src/assets/expressBrandLogo/received.png differ diff --git a/src/assets/expressBrandLogo/search.png b/src/assets/expressBrandLogo/search.png new file mode 100644 index 0000000..f797940 Binary files /dev/null and b/src/assets/expressBrandLogo/search.png differ diff --git a/src/assets/expressBrandLogo/shunfeng.png b/src/assets/expressBrandLogo/shunfeng.png new file mode 100644 index 0000000..6e1add1 Binary files /dev/null and b/src/assets/expressBrandLogo/shunfeng.png differ diff --git a/src/assets/expressBrandLogo/signed.png b/src/assets/expressBrandLogo/signed.png new file mode 100644 index 0000000..b8298a5 Binary files /dev/null and b/src/assets/expressBrandLogo/signed.png differ diff --git a/src/assets/expressBrandLogo/transit.png b/src/assets/expressBrandLogo/transit.png new file mode 100644 index 0000000..b5ad99b Binary files /dev/null and b/src/assets/expressBrandLogo/transit.png differ 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获取文件的相关信息