diff --git a/.env.development b/.env.development index 4cf5d04..669fcda 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ #调用后台地址 -VITE_APP_BASE_URL = 'http://118.186.13.120:31302' -# VITE_APP_BASE_URL = 'https://app-test.718yousheng.com' +# VITE_APP_BASE_URL = 'http://118.186.13.120:31302' +VITE_APP_BASE_URL = 'https://app-test.718yousheng.com' # VITE_APP_BASE_URL = "http://192.168.236.71:31302" # VITE_APP_BASE_URL = "http://123.57.20.168:3000" diff --git a/.env.production b/.env.production index 61fb560..7dc3840 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,6 @@ #调用后台地址 -VITE_APP_BASE_URL = 'http://118.186.13.120:31302' +VITE_APP_BASE_URL = 'https://app-test.718yousheng.com' +# VITE_APP_BASE_URL = 'http://118.186.13.120:31302' # VITE_APP_BASE_URL = "http://192.168.236.71:31302" # VITE_APP_BASE_URL = "http://123.57.20.168:3000" diff --git a/src/api/crm/activity/activity.js b/src/api/crm/activity/activity.js index db0612a..6d80b6d 100644 --- a/src/api/crm/activity/activity.js +++ b/src/api/crm/activity/activity.js @@ -3,7 +3,7 @@ import request from "@/utils/request"; //获取客户单位用户人员信息 export function crmCustomerUser(data) { return request.get({ - url: "/app/appCrmCusUserNewController/crmCustomerUser", + url: "/crm/app/appCrmCusUserNewController/crmCustomerUser", data, },{ isTransformResponse:false @@ -13,7 +13,7 @@ export function crmCustomerUser(data) { //获取我公司人员信息 export function myUserNameList(data) { return request.get({ - url: "/app/appVisistDetail/getCompanyPersonnerlName", + url: "/crm/app/appVisistDetail/getCompanyPersonnerlName", data, },{ isTransformResponse:false @@ -23,7 +23,7 @@ export function myUserNameList(data) { //保存走访报告明细 export function addVisistDetail(data) { return request.post({ - url: "/app/appVisistDetail/addVisistDetail", + url: "/crm/app/appVisistDetail/addVisistDetail", data, },{ isTransformResponse:false @@ -33,7 +33,7 @@ export function addVisistDetail(data) { //删除走访报告中的某一项（日常走访，业务招待） export function deleVisistDetailItem(data) { return request.get({ - url: "/app/appVisistDetail/deleVisistDetailItem", + url: "/crm/app/appVisistDetail/deleVisistDetailItem", data, },{ isTransformResponse:false @@ -43,7 +43,7 @@ export function deleVisistDetailItem(data) { //走访明细查询 export function getVisistDetailItem(data) { return request.get({ - url: "/app/appVisistDetail/queryList", + url: "/crm/app/appVisistDetail/queryList", data, },{ isTransformResponse:false @@ -53,7 +53,7 @@ export function getVisistDetailItem(data) { //删除整体的报告 export function removeVisist(data) { return request.get({ - url: "/app/appVisistReport/remove", + url: "/crm/app/appVisistReport/remove", data, },{ isTransformResponse:false @@ -63,7 +63,7 @@ export function removeVisist(data) { //走访报告列表查询 export function getYsVisistList(data) { return request.get({ - url: "/app/appVisistReport/list", + url: "/crm/app/appVisistReport/list", data },{ isTransformResponse:false @@ -73,7 +73,7 @@ export function getYsVisistList(data) { //更新一个报告的状态 export function updateStatus(data) { return request.post({ - url: "/app/appVisistReport/updateStatus", + url: "/crm/app/appVisistReport/updateStatus", data, },{ isTransformResponse:false @@ -83,7 +83,7 @@ export function updateStatus(data) { //获取客户信息列表 export function getYsCustomerList(data) { return request.get({ - url: "/app/appCustomerIfno/pageList", + url: "/crm/app/appCustomerIfno/pageList", data, },{ isTransformResponse:false @@ -93,7 +93,7 @@ export function getYsCustomerList(data) { //新增走访报告 export function addVisist(data) { return request.post({ - url: "/app/appVisistReport/add", + url: "/crm/app/appVisistReport/add", data, },{ isTransformResponse:false @@ -103,7 +103,7 @@ export function addVisist(data) { //走访报告查询 export function getQueryVisistList(data) { return request.get({ - url: "/app/appVisistReport/queryList", + url: "/crm/app/appVisistReport/queryList", data, },{ isTransformResponse:false @@ -113,7 +113,7 @@ export function getQueryVisistList(data) { //走访报告详细信息 export function getYsVisistInfo(data) { return request.get({ - url: "/app/appVisistReport/getDetail", + url: "/crm/app/appVisistReport/getDetail", data, },{ isTransformResponse:false @@ -123,7 +123,7 @@ export function getYsVisistInfo(data) { //一个走访报告下面关联的日常走访，业务招待等具体信息 export function getVisistDetailList(data) { return request.get({ - url: "/app/appVisistDetail/list", + url: "/crm/app/appVisistDetail/list", data, },{ isTransformResponse:false @@ -133,7 +133,7 @@ export function getVisistDetailList(data) { //新增点赞 export function insertUserLike(data) { return request.post({ - url: "/app/appUserLike/addVisistDetail", + url: "/crm/app/appUserLike/addVisistDetail", data, },{ isTransformResponse:false @@ -143,7 +143,7 @@ export function insertUserLike(data) { //查询是否已经点过赞 export function getUserLike(data) { return request.get({ - url: "/app/appUserLike/queryUserLikeStatus/" + data, + url: "/crm/app/appUserLike/queryUserLikeStatus/" + data, },{ isTransformResponse:false }); @@ -152,7 +152,7 @@ export function getUserLike(data) { //获取当前人的信息 export function getUserInfo(data) { return request.get({ - url: "/app/user/getUserInfo", + url: "/crm/app/user/getUserInfo", data, },{ isTransformResponse:false @@ -162,7 +162,7 @@ export function getUserInfo(data) { //查询没有经过信息管理员审批的单子 export function getApprovalList(data) { return request.get({ - url: "/app/appVisistReport/approvalList", + url: "/crm/app/appVisistReport/approvalList", data, },{ isTransformResponse:false @@ -172,7 +172,7 @@ export function getApprovalList(data) { //打开详情页设置成为已读 export function getUpdateApprovalForRead(data) { return request.post({ - url: "/app/appVisistReport/updateApprovalForRead", + url: "/crm/app/appVisistReport/updateApprovalForRead", data, },{ isTransformResponse:false @@ -182,7 +182,7 @@ export function getUpdateApprovalForRead(data) { //提交通过活动报告 export function auditActivityReport(data) { return request.post({ - url: "/app/activity/auditActivityReport", + url: "/crm/app/activity/auditActivityReport", data, header: { 'Content-Type': 'application/x-www-form-urlencoded' // 设置请求头，确保服务器正确解析 FormData @@ -195,7 +195,7 @@ export function auditActivityReport(data) { //更新驳回原因 export function getRejectReason(data) { return request.post({ - url: "/app/appVisistReport/updaterejectReason", + url: "/crm/app/appVisistReport/updaterejectReason", data, },{ isTransformResponse:false @@ -205,7 +205,7 @@ export function getRejectReason(data) { //查询签到打卡信息集合为了报告 export function addMapForReport(data) { return request.get({ - url: "/app/appVisistReport/addMapList", + url: "/crm/app/appVisistReport/addMapList", data, },{ isTransformResponse:false diff --git a/src/api/crm/activity/map.js b/src/api/crm/activity/map.js index 3a1611b..fe0c710 100644 --- a/src/api/crm/activity/map.js +++ b/src/api/crm/activity/map.js @@ -3,7 +3,7 @@ import request from "@/utils/request"; //新增地图开始签到接口 export function addStartMap(data) { return request.post({ - url: "/app/appVisistMap/Startadd", + url: "/crm/app/appVisistMap/Startadd", data, },{ isTransformResponse:false @@ -13,7 +13,7 @@ export function addStartMap(data) { //新增地图开始打卡接口 export function addStartMapForClockIn(data) { return request.post({ - url: "/app/appVisistMap/StartaddForClockIn", + url: "/crm/app/appVisistMap/StartaddForClockIn", data, },{ isTransformResponse:false @@ -23,7 +23,7 @@ export function addStartMapForClockIn(data) { //打卡信息查看 export function CheckInInformationViewing(data) { return request.get({ - url: "/app/appVisistMap/DKList", + url: "/crm/app/appVisistMap/DKList", data },{ isTransformResponse:false @@ -33,7 +33,7 @@ export function CheckInInformationViewing(data) { //签到统计 export function getSigninList(data) { return request.get({ - url: "/app/appVisistMap/QueryBased", + url: "/crm/app/appVisistMap/QueryBased", data },{ isTransformResponse:false @@ -43,7 +43,7 @@ export function getSigninList(data) { //不签到统计 export function getNoSigninList(data) { return request.get({ - url: "/app/appVisistMap/QueryBasedIsNull", + url: "/crm/app/appVisistMap/QueryBasedIsNull", data },{ isTransformResponse:false diff --git a/src/api/crm/api_ys.js b/src/api/crm/api_ys.js index 99ec5bc..5554635 100644 --- a/src/api/crm/api_ys.js +++ b/src/api/crm/api_ys.js @@ -3,70 +3,70 @@ import request from "@/utils/request" export function getYsVisistList(data) { return request.get({ - url: '/app/appVisistReport/list', + url: '/crm/app/appVisistReport/list', data: data }) } //市场信息列表接口 export function CrmMarketInformationList(data) { return request.get({ - url: '/app/informationMarketInformation/list', + url: '/crm/app/informationMarketInformation/list', data: data }) } //市场信息模块待审核改为提交 export function handleCrmMarketInfo(data) { return request.post({ - url: '/app/informationMarketInformation/handleCrmMarketInfo', + url: '/crm/app/informationMarketInformation/handleCrmMarketInfo', data }) } //获取客户名称 export function getYsCustomerList(data) { return request.get({ - url: '/app/appCustomerIfno/pageList', + url: '/crm/app/appCustomerIfno/pageList', data }) } //市场信息模块提交 export function crmMarketInformationAdd(data) { return request.post({ - url: '/app/informationMarketInformation/add', + url: '/crm/app/informationMarketInformation/add', data }) } //市场信息模块查询 export function crminformationItemForDetail(data) { return request.get({ - url: '/app/informationMarketInformation/getDetail', + url: '/crm/app/informationMarketInformation/getDetail', data }) } //客户人员信息查询 export function crmCustomerUser(data) { return request.get({ - url: '/app/appCrmCusUserNewController/crmCustomerUser', + url: '/crm/app/appCrmCusUserNewController/crmCustomerUser', data }) } //市场信息根据ID删除 export function crmMarketInformationDelete(data) { return request.get({ - url: '/app/informationMarketInformation/delete', + url: '/crm/app/informationMarketInformation/delete', data }) } //市场信息查询接口 export function viewingMarketInfForAllMembers(data) { return request.get({ - url: '/app/informationMarketInformation/viewList', + url: '/crm/app/informationMarketInformation/viewList', data }) } //市场信息详情查询接口 export function viewingMarketInfgetDetail(data) { return request.get({ - url: '/app/informationMarketInformation/getDetail', + url: '/crm/app/informationMarketInformation/getDetail', data }) } @@ -80,28 +80,28 @@ export function approvalMarketInfget(data) { //回款模块列表查询 export function getPaymentList(data) { return request.get({ - url: '/app/InformationReviewController/getPaymentList', + url: '/crm/app/InformationReviewController/getPaymentList', data }) } //回款新增接口 export function addPaymentCollection(data) { return request.post({ - url: '/app/InformationReviewController/addPaymentCollection', + url: '/crm/app/InformationReviewController/addPaymentCollection', data }) } //回款更新接口 export function updatePaymentDetail(data) { return request.post({ - url: '/app/InformationReviewController/updatePaymentDetail', + url: '/crm/app/InformationReviewController/updatePaymentDetail', data }) } //回款删除接口 export function deletePaymentDetail(data) { return request.post({ - url: '/app/InformationReviewController/deletePaymentDetail', + url: '/crm/app/InformationReviewController/deletePaymentDetail', data }) } @@ -109,14 +109,14 @@ export function deletePaymentDetail(data) { //全员查询回款接口 export function getFullStaffStatisticsViewingTable(data) { return request.get({ - url: '/app/InformationReviewController/getFullStaffStatisticsViewingTable', + url: '/crm/app/InformationReviewController/getFullStaffStatisticsViewingTable', data }) } //个人查询回款接口 export function getPersonalPaymentCollectionTable(data) { return request.get({ - url: '/app/InformationReviewController/getPersonalPaymentCollectionTable', + url: '/crm/app/InformationReviewController/getPersonalPaymentCollectionTable', data }) } @@ -124,14 +124,14 @@ export function getPersonalPaymentCollectionTable(data) { //市场信息审核通过接口 export function crmMarketInformationApprovalSuccess(data) { return request.get({ - url: '/app/informationMarketInformation/ApprovalSuccess', + url: '/crm/app/informationMarketInformation/ApprovalSuccess', data }) } //市场信息审核驳回接口 export function crmMarketInformationApprovalUnSuccess(data) { return request.get({ - url: '/app/informationMarketInformation/ApprovalUnSuccess', + url: '/crm/app/informationMarketInformation/ApprovalUnSuccess', data }) } diff --git a/src/api/crm/customer/getCustomer.js b/src/api/crm/customer/getCustomer.js index 76c59c5..333e9fc 100644 --- a/src/api/crm/customer/getCustomer.js +++ b/src/api/crm/customer/getCustomer.js @@ -3,7 +3,7 @@ import request from "@/utils/request" // 查询客户人员列表 export function getCustomerList(params){ return request.get({ - url: '/app/appCustomerIfno/pageList', + url: '/crm/app/appCustomerIfno/pageList', data: params },{isTransformResponse: false}) } @@ -11,14 +11,14 @@ export function getCustomerList(params){ // 查询系统推荐等级 export function getCustomerLevel(params){ return request.get({ - url: '/app/appCrmCusUserNewController/queryCustomerLevel', + url: '/crm/app/appCrmCusUserNewController/queryCustomerLevel', data: params },{isTransformResponse: false}) } // 客户人员新增 export function saveappCrmCusUserNew(params){ return request.get({ - url: '/app/appCrmCusUserNewController/add', + url: '/crm/app/appCrmCusUserNewController/add', data: params },{isTransformResponse: false}) } @@ -32,14 +32,14 @@ export function SearchForAllCustomersSalesperson(params){ // 客户人员归属审核详情 export function getCusUserApprovalListDetail(params){ return request.get({ - url: '/app/appCrmCusUserNewController/getCusUserApprovalListDetail', + url: '/crm/app/appCrmCusUserNewController/getCusUserApprovalListDetail', data: params },{isTransformResponse: false}) } // 查询主归属人列表 export function SearchForAllPerson(params){ return request.get({ - url: '/app/appCrmCusUserNewController/SearchForAllPerson', + url: '/crm/app/appCrmCusUserNewController/SearchForAllPerson', data: params },{isTransformResponse: false}) } @@ -47,7 +47,7 @@ export function SearchForAllPerson(params){ // 客户人员新增审核列表 export　function　getCusUserApprovalList(params) { return request.get({ - url: '/app/appCrmCusUserNewController/getCusUserApprovalList', + url: '/crm/app/appCrmCusUserNewController/getCusUserApprovalList', data: params }, {isTransformResponse: false} ) diff --git a/src/api/crm/customer/updateCustomer.js b/src/api/crm/customer/updateCustomer.js index 886e458..a4f66bc 100644 --- a/src/api/crm/customer/updateCustomer.js +++ b/src/api/crm/customer/updateCustomer.js @@ -2,35 +2,35 @@ import request from "@/utils/request" // 删除客户人员归属消息 export function removeVisit(params){ return request.get({ - url: '/app/appVisistReport/remove', + url: '/crm/app/appVisistReport/remove', data: params },{isTransformResponse: false}) } // 更新客户人员 export function upadateappCrmCusUserNew (data){ return request.post({ - url: '/app/appCrmCusUserNewController/update', + url: '/crm/app/appCrmCusUserNewController/update', data },{isTransformResponse: false}) } // 客户人员审核通过 export function clientPersonnelsApproval(data) { return request.get({ - url: '/app/appCrmCusUserNewController/clientPersonnelsApproval', + url: '/crm/app/appCrmCusUserNewController/clientPersonnelsApproval', data }, {isTransformResponse: false}); } //客户人员驳回 export function customerPersonnelsRejectio(data) { return request.get({ - url: '/app/appCrmCusUserNewController/customerPersonnelsRejectio', + url: '/crm/app/appCrmCusUserNewController/customerPersonnelsRejectio', data }, {isTransformResponse: false}); } //主归属人变更提交 export function submissionOfChangeOfMainOwner (data){ return request.get({ - url: '/app/appCrmCusUserNewController/submissionOfChangeOfMainOwner', + url: '/crm/app/appCrmCusUserNewController/submissionOfChangeOfMainOwner', data },{isTransformResponse: false}) } \ No newline at end of file diff --git a/src/api/crm/mainOwner/mainOwner.js b/src/api/crm/mainOwner/mainOwner.js index 9d4dbcb..4532b93 100644 --- a/src/api/crm/mainOwner/mainOwner.js +++ b/src/api/crm/mainOwner/mainOwner.js @@ -4,7 +4,7 @@ import request from "@/utils/request"; //主归属人变更信息查看（列表） export function queryViewMainOwnerList(params){ return request.get({ - url: '/app/appCrmCusUserNewController/viewInformationChangesInprimaryOwnership', + url: '/crm/app/appCrmCusUserNewController/viewInformationChangesInprimaryOwnership', data: params },{isTransformResponse: false}) } @@ -12,7 +12,7 @@ export function queryViewMainOwnerList(params){ //主归属人变更信息查看（详情） export function queryViewMainOwnerDetail(params){ return request.get({ - url: '/app/appCrmCusUserNewController/getCrmCusUserNewChangeOwnerList', + url: '/crm/app/appCrmCusUserNewController/getCrmCusUserNewChangeOwnerList', data: params },{isTransformResponse: false}) } @@ -20,7 +20,7 @@ export function queryViewMainOwnerDetail(params){ //查询主归属人变更人员的列表数据 export function personnelAwaitingReviewForChange(params){ return request.get({ - url: '/app/appCrmCusUserNewController/personnelAwaitingReviewForChange', + url: '/crm/app/appCrmCusUserNewController/personnelAwaitingReviewForChange', data: params },{isTransformResponse: false}) } @@ -28,14 +28,14 @@ export function personnelAwaitingReviewForChange(params){ //主归属人变更驳回 export function changeOfPrimaryOwnershipNoApproved(params) { return request.get({ - url:'/app/appCrmCusUserNewController/changeOfPrimaryOwnershipNoApproved', + url:'/crm/app/appCrmCusUserNewController/changeOfPrimaryOwnershipNoApproved', data: params }, {isTransformResponse: false}); } //主归属人变更通过 export function changeOfPrimaryOwnershipApproved (params) { return request.get({ - url: '/app/appCrmCusUserNewController/changeOfPrimaryOwnershipApproved', + url: '/crm/app/appCrmCusUserNewController/changeOfPrimaryOwnershipApproved', data: params }, {isTransformResponse: false}); } \ No newline at end of file diff --git a/src/api/crm/plan/getPlan.js b/src/api/crm/plan/getPlan.js index 92f54e8..fcac988 100644 --- a/src/api/crm/plan/getPlan.js +++ b/src/api/crm/plan/getPlan.js @@ -9,28 +9,28 @@ export function getPersonalPlanList(params) { export function getUserInfo(data) { return request.get({ - url: '/app/user/getUserInfo', + url: '/crm/app/user/getUserInfo', data }, {isTransformResponse: false}) } //获取所有人周计划列表 export function getAllWeekPlanList(params){ return request.get({ - url: '/app/appWeeklyPlan/list', + url: '/crm/app/appWeeklyPlan/list', data: params },{isTransformResponse: false}) } //获取个人周计划列表 export function getWeeklyPlanList(data) { return request.get({ - url: '/app/appWeeklyPlan/getWeeklyListByUser', + url: '/crm/app/appWeeklyPlan/getWeeklyListByUser', data }, {isTransformResponse: false}) } // 组合查询计划列表 export function getWeekPlanListByDate(params){ return request.get({ - url: '/app/appWeeklyPlan/weeklyListByDate', + url: '/crm/app/appWeeklyPlan/weeklyListByDate', data: params },{isTransformResponse: false}) } diff --git a/src/api/crm/plan/updatePlan.js b/src/api/crm/plan/updatePlan.js index 10183d6..f132adc 100644 --- a/src/api/crm/plan/updatePlan.js +++ b/src/api/crm/plan/updatePlan.js @@ -2,7 +2,7 @@ import request from "@/utils/request" export function updateWeekPlanList(data){ return request.post({ - url: '/app/appWeeklyPlan/updateWeekly', + url: '/crm/app/appWeeklyPlan/updateWeekly', data: data, header: { 'Content-Type': 'application/json;charset=UTF-8' @@ -12,7 +12,7 @@ export function updateWeekPlanList(data){ // 判断本周是否写过计划 export function judgeThisWeek (data){ return request.post({ - url: '/app/appWeeklyPlan/Judgethisweek', + url: '/crm/app/appWeeklyPlan/Judgethisweek', data, header: {'Content-Type': 'application/json;charset=UTF-8'} }) @@ -21,7 +21,7 @@ export function judgeThisWeek (data){ // 新增周计划 export function addPlan(data){ return request.post({ - url: '/app/appWeeklyPlan/addComment', + url: '/crm/app/appWeeklyPlan/addComment', data, header:{'Content-Type': 'application/json;charset=UTF-8'} }) diff --git a/src/pages.json b/src/pages.json index a80f999..52a36c1 100644 --- a/src/pages.json +++ b/src/pages.json @@ -421,13 +421,6 @@ }, //===================================活动报告==================== { - "path": "pages/business/CRM/mainOwner/view/viewMainOwner", //查看主归属人变更信息 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/marketActivity/visitReport", //市场信息管理 "style": { diff --git a/src/pages/business/CRM/paymentCollection/index.vue b/src/pages/business/CRM/paymentCollection/index.vue index 1ea7c6f..55ea079 100644 --- a/src/pages/business/CRM/paymentCollection/index.vue +++ b/src/pages/business/CRM/paymentCollection/index.vue @@ -117,7 +117,7 @@ const upOption = ref({ }); const downOption = ref({ - auto: true, + auto: false, textInOffset: '下拉刷新', textOutOffset: '释放更新', textLoading: '刷新中...' diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index 2966b12..bcf26bb 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -261,7 +261,7 @@ const submitForm = () => { // b6ffbbfb-5b2d-4640-af3a-e43d0158eaf9 // 679d5560-534f-4df8-815a-49227ba6ffd2 - param.uniqCode = 'b6ffbbfb-5b2d-4640-af3a-e43d0158eaf9';//h5测试用 内网-sn123456 外网-b6ffbbfb-5b2d-4640-af3a-e43d0158eaf9 + param.uniqCode = 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2';//h5测试用 内网-sn123456 外网-b6ffbbfb-5b2d-4640-af3a-e43d0158eaf9 let res = await login(param); userStore.login(res); uni.switchTab({ url: '/pages/home/home' }) diff --git a/src/static/common.css b/src/static/common.css index b09ea02..333ccb4 100644 --- a/src/static/common.css +++ b/src/static/common.css @@ -636,4 +636,5 @@ uni-button[type='primary'][plain] { .mescroll-empty .empty-tip{ color: #fff !important; + font-size:28rpx !important; } \ No newline at end of file