修改api地址

common/config/api.js

@@ -3,26 +3,26 @@ const {
 } = uni.$u
 
 // 获取用户信息
-export const getUserInfoUrl = (data) => http.get('/dev-api/api/wechat/getInfo', data);
+export const getUserInfoUrl = (data) => http.get('/prod-api/api/wechat/getInfo', data);
 // 登录
-export const loginUrl = (data) => http.get('/dev-api/api/wechat/login', data);
+export const loginUrl = (data) => http.get('/prod-api/api/wechat/login', data);
 // 绑定信息
-export const bindInfoUrl = (data) => http.get('/dev-api/api/wechat/bindPhone', data);
+export const bindInfoUrl = (data) => http.get('/prod-api/api/wechat/bindPhone', data);
 // 提交
-export const applyUrl = (params, config = {}) => http.post('/dev-api/care/applications', params, config);
+export const applyUrl = (params, config = {}) => http.post('/prod-api/care/applications', params, config);
 // 修改
-export const applyModifyUrl = (params, config = {}) => http.put('/dev-api/care/applications', params, config);
+export const applyModifyUrl = (params, config = {}) => http.put('/prod-api/care/applications', params, config);
 // 获取申请人列表
-export const getPersonListUrl = (data) => http.get('/dev-api/care/persons/list', data);
+export const getPersonListUrl = (data) => http.get('/prod-api/care/persons/list', data);
 // 获取所在医院列表
-export const getHospitalListUrl = (data) => http.get('/dev-api/care/hospital/list', data);
+export const getHospitalListUrl = (data) => http.get('/prod-api/care/hospital/list', data);
 // 上传
-export const uploadAvatarUrl = (params, config = {}) => http.upload('/dev-api/system/user/profile/avatar', params,
+export const uploadAvatarUrl = (params, config = {}) => http.upload('/prod-api/system/user/profile/avatar', params,
 	config);
 // 获取未读消息数
-export const getMsgCountUrl = (data) => http.get('/dev-api/system/notice/myNoticeList', data);
+export const getMsgCountUrl = (data) => http.get('/prod-api/system/notice/myNoticeList', data);
 // 修改消息
-export const modifyMsgUrl = (params, config = {}) => http.post('/dev-api/system/notice/setIsRead', params, config);
+export const modifyMsgUrl = (params, config = {}) => http.post('/prod-api/system/notice/setIsRead', params, config);
 
 
 

common/config/application-api.js

@@ -3,77 +3,77 @@ const {
 } = uni.$u
 
 //获取用户协议列表
-export const getProtocolList = (data) => http.get('/dev-api/care/protocol/list', data);
+export const getProtocolList = (data) => http.get('/prod-api/care/protocol/list', data);
 //获取用户协议详情
-export const getProtocolInfo = (data) => http.get(`/dev-api/care/protocol/${data.id??0}`, data);
+export const getProtocolInfo = (data) => http.get(`/prod-api/care/protocol/${data.id??0}`, data);
 //查询护理人员列表
-export const getNursesList = (data) => http.get(`/dev-api/care/nurses/list`, data);
+export const getNursesList = (data) => http.get(`/prod-api/care/nurses/list`, data);
 //查询护理人员详情
-export const getNursesInfo = (data) => http.get(`/dev-api/care/nurses/${data.id??0}`, data);
+export const getNursesInfo = (data) => http.get(`/prod-api/care/nurses/${data.id??0}`, data);
 //编辑护理人员
-export const editNurses = (data) => http.get(`/dev-api/care/nurses/${data.id??0}`, data);
+export const editNurses = (data) => http.get(`/prod-api/care/nurses/${data.id??0}`, data);
 
 //护理申请列表
-export const getCareList = (data) => http.get(`/dev-api/care/applications/list`, data);
+export const getCareList = (data) => http.get(`/prod-api/care/applications/list`, data);
 //护理详情
-export const getCareInfo = (data) => http.get(`/dev-api/care/applications/${data.id??0}`, data);
+export const getCareInfo = (data) => http.get(`/prod-api/care/applications/${data.id??0}`, data);
 
 
 //护理送审
-export const postCareStart = (params, config = {}) => http.post('/dev-api/care/applications/start', params, config);
+export const postCareStart = (params, config = {}) => http.post('/prod-api/care/applications/start', params, config);
 
 //流程记录列表
-export const getCareRecords = (data) => http.get('/dev-api/care/careRecords/list', data);
+export const getCareRecords = (data) => http.get('/prod-api/care/careRecords/list', data);
 //删除审批单
-export const delCareApp = (params, config = {}) => http.delete(`/dev-api/care/applications/${params.id??0}`, params,
+export const delCareApp = (params, config = {}) => http.delete(`/prod-api/care/applications/${params.id??0}`, params,
 	config);
 //护理指派
-export const postCareAssign = (parmas, config = {}) => http.post('/dev-api/care/applications/assign', parmas, config)
+export const postCareAssign = (parmas, config = {}) => http.post('/prod-api/care/applications/assign', parmas, config)
 //护理审核
-export const postCareCheck = (parmas, config = {}) => http.post('/dev-api/care/applications/check', parmas, config)
+export const postCareCheck = (parmas, config = {}) => http.post('/prod-api/care/applications/check', parmas, config)
 //完成护理申请
-export const postCareComplete = (parmas, config = {}) => http.post('/dev-api/care/applications/complete', parmas,
+export const postCareComplete = (parmas, config = {}) => http.post('/prod-api/care/applications/complete', parmas,
 	config)
 //查询全部公司 
-export const getCompanyList = (data) => http.get('/dev-api/care/companies/listAll', data)
+export const getCompanyList = (data) => http.get('/prod-api/care/companies/listAll', data)
 //查询公司的护理人员
-export const getCompanyNursesList = (data) => http.get('/dev-api/care/nurses/listCompanyNurses', data)
+export const getCompanyNursesList = (data) => http.get('/prod-api/care/nurses/listCompanyNurses', data)
 
 //图片上传
-export const uploadImg = (params, config = {}) => http.upload(`/dev-api/care/clocks/upload`, params, config);
+export const uploadImg = (params, config = {}) => http.upload(`/prod-api/care/clocks/upload`, params, config);
 
-export const uploadImgUrl = `/dev-api/care/clocks/upload`;
+export const uploadImgUrl = `/prod-api/care/clocks/upload`;
 
 
 //获取图片上传的数量
-export const getImgNumber = (data) => http.get(`/dev-api/system/workConfig/type/${data.key??'need_img_num'}`, data);
+export const getImgNumber = (data) => http.get(`/prod-api/system/workConfig/type/${data.key??'need_img_num'}`, data);
 
 
-// export const getClockList = (data) => http.get(`/dev-api/care/applications/clockList`, data);
+// export const getClockList = (data) => http.get(`/prod-api/care/applications/clockList`, data);
 
 
 //添加护理打卡记录
-export const addCareClocks = (params, config = {}) => http.post(`/dev-api/care/clocks`, params, config);
+export const addCareClocks = (params, config = {}) => http.post(`/prod-api/care/clocks`, params, config);
 //添加死亡记录
-export const addDieRecord = (params, config = {}) => http.post(`/dev-api/care/clocks/die`, params, config);
+export const addDieRecord = (params, config = {}) => http.post(`/prod-api/care/clocks/die`, params, config);
 //修改护理打卡记录
-export const updateCareClocks = (params, config = {}) => http.put(`/dev-api/care/clocks`, params, config);
+export const updateCareClocks = (params, config = {}) => http.put(`/prod-api/care/clocks`, params, config);
 //删除护理打卡记录
-export const delCareClocks = (data) => http.delete(`/dev-api/care/clocks/${data.id}`);
+export const delCareClocks = (data) => http.delete(`/prod-api/care/clocks/${data.id}`);
 
 //护理记录列表-护理人员
 //pageNum=1&pageSize=10&status=assigned
-export const getAppClockList = (data) => http.get(`/dev-api/care/applications/clockList`, data);
+export const getAppClockList = (data) => http.get(`/prod-api/care/applications/clockList`, data);
 //护理记录列表-护理公司
 //pageNumAssign=1&pageSizeAssign=10&status=wait_assign_nurse&pageNum=1
-export const getAssignList = (data) => http.get(`/dev-api/care/applications/assignList`, data);
+export const getAssignList = (data) => http.get(`/prod-api/care/applications/assignList`, data);
 
 //得到当前护理打卡记录
-export const getClockList = (data) => http.get(`/dev-api/care/clocks/list`, data);
+export const getClockList = (data) => http.get(`/prod-api/care/clocks/list`, data);
 
 
 //完成护理任务
-export const completeTask = (params, config = {}) => http.post(`/dev-api/care/applications/complete`, params, config);
+export const completeTask = (params, config = {}) => http.post(`/prod-api/care/applications/complete`, params, config);
 
 //评分
-export const rateRequest = (params, config = {}) => http.post(`/dev-api/care/scores`, params, config);
+export const rateRequest = (params, config = {}) => http.post(`/prod-api/care/scores`, params, config);

pages/subpack/pages/application/componenets/page4.vue

@@ -125,7 +125,7 @@
 				const imgs = v.imgPaths.split(",").filter(item => item.trim() !== "");
 				let fileList = []
 				imgs.forEach(function(item) {
-					let url = uni.$u.http.config.baseURL + '/dev-api/' + item;
+					let url = uni.$u.http.config.baseURL + '/prod-api/' + item;
 					fileList.push(url);
 				})
 				//截取前三张图片

pages/tabbar/application/application.vue

@@ -67,6 +67,9 @@
 				return uni.$u.sys().windowHeight + 'px'
 			},
 			computeHandleDesc() {
+				if (!this.vuex_user.roles) {
+					return '请先登录'
+				}
 				// 民政所
 				if (this.vuex_user.roles.includes('village')) {
 					return '护理申请'
@@ -160,7 +163,7 @@
 						url: '/pages/subpack/pages/application/list'
 					})
 				}
-				
+
 				// 护理人员
 				if (this.vuex_user.roles.includes('nurse')) {
 					return uni.navigateTo({

utils/request/index.js

@@ -10,8 +10,8 @@ import {
 //  初始化请求配置
 const initRequest = (vm) => {
 	http.setConfig((defaultConfig) => {
-		// defaultConfig.baseURL = 'http://133.46.159.99' /* 根域名 */
-		defaultConfig.baseURL = 'http://tkhtest.natapp1.cc' /* 根域名 */
+		defaultConfig.baseURL = 'http://8.155.45.217' /* 根域名 */
+		// defaultConfig.baseURL = 'http://tkhtest.natapp1.cc' /* 根域名 */
 		// defaultConfig.baseURL = 'http://127.0.0.1' /* 根域名 */
 		defaultConfig = {
 			...defaultConfig,