阶段性提交

.env.development

@@ -2,9 +2,10 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = '/mhotel'
+VUE_APP_BASE_API = ''
 # VUE_APP_BASE_API = 'https://www.靖安人家.com/hotelReservation/mhotel'
 # VUE_APP_BASE_API = 'https://chtech.ncjti.edu.cn/hotelReservation/mhotel'
 
 
-VUE_APP_BASE_FILE = 'https://chtech.ncjti.edu.cn/hotelReservation/fileload'
+VUE_APP_BASE_FILE = ''
+# VUE_APP_BASE_FILE = 'https://chtech.ncjti.edu.cn/hotelReservation/fileload'

.env.production

@@ -2,7 +2,9 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = 'https://chtech.ncjti.edu.cn/hotelReservation/mhotel'
+VUE_APP_BASE_API = 'https://www.靖安人家.com/hotelReservation/mhotel'
+# VUE_APP_BASE_API = 'https://chtech.ncjti.edu.cn/hotelReservation/mhotel'
 
 
-VUE_APP_BASE_FILE = 'https://chtech.ncjti.edu.cn/hotelReservation/fileload'
+VUE_APP_BASE_FILE = 'https://www.靖安人家.com/hotelReservation/mhotel'
+# VUE_APP_BASE_FILE = 'https://chtech.ncjti.edu.cn/hotelReservation/fileload'

package.json

@@ -26,6 +26,7 @@
 		"path-to-regexp": "2.4.0",
 		"v-viewer": "^1.6.4",
 		"vue": "2.6.10",
+		"vue-baidu-map": "^0.21.22",
 		"vue-router": "3.0.6",
 		"vue-video-player": "^5.0.1",
 		"vuex": "3.1.0"

src/api/accountMgr.js

@@ -9,7 +9,7 @@ export function getTableData(forData) {
 	}
 
 	return request({
-		url: '/adminqueryPage.action' + query,
+		url: '/api/mhotel/adminqueryPage.action' + query,
 		method: 'get'
 	});
 };
@@ -26,7 +26,7 @@ export function addAccount(param) {
 	data.append('adminPower', '1,2,3');
 	
 	return request({
-		url: '/admininsertAdmin.action',
+		url: '/api/mhotel/admininsertAdmin.action',
 		method: 'post',
 		data
 	});
@@ -45,7 +45,7 @@ export function modifyAccount(param) {
 	data.append('adminPower', '1,2,3');
 	
 	return request({
-		url: '/adminupdateAdmin.action',
+		url: '/api/mhotel/adminupdateAdmin.action',
 		method: 'post',
 		data
 	});
@@ -57,7 +57,7 @@ export function deleteAccount(param) {
 	data.append('id', param);
 	
 	return request({
-		url: '/admindelAdmin.action',
+		url: '/api/mhotel/admindelAdmin.action',
 		method: 'post',
 		data
 	});
@@ -69,7 +69,7 @@ export function resetAccountPassword(param) {
 	data.append('id', param);
 	
 	return request({
-		url: '/adminremovePwd.action',
+		url: '/api/mhotel/adminremovePwd.action',
 		method: 'post',
 		data
 	});

src/api/audited.js

@@ -5,7 +5,7 @@ export function getTableData(param) {
 	var pg = '?page=' + param.currentPage + '&pageSize=' + param.pageSize
 	
 	return request({
-		url: '/workflowqueryApprovedWorkflow.action' + pg,
+		url: '/api/mhotel/workflowqueryApprovedWorkflow.action' + pg,
 		method: 'get'
 	})
 }

src/api/complaintMgr.js

@@ -17,7 +17,7 @@ export function getTableData(forData) {
 	}
 
 	return request({
-		url: '/ComplainqueryPage.action' + data,
+		url: '/api/mhotel/ComplainqueryPage.action' + data,
 		method: 'get',
 		data
 	})
@@ -28,7 +28,7 @@ export function getXiang(row) {
 	let query = '?id=' + row.id
 
 	return request({
-		url: '/ComplaingetById.action' + query,
+		url: '/api/mhotel/ComplaingetById.action' + query,
 		method: 'get'
 	});
 };
@@ -50,7 +50,7 @@ export function downloadExcel(forData) {
 	}
 
 	return request({
-		url: '/ComplaintoComplainExcel.action',
+		url: '/api/mhotel/ComplaintoComplainExcel.action',
 		method: 'get',
 		data
 	})

src/api/data.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取订单数据 订单状态占比
 export function getOrderData() {
 	return request({
-		url: '/idcgetBookStatusData.action',
+		url: '/api/mhotel/idcgetBookStatusData.action',
 		method: 'get'
 	})
 }
@@ -11,7 +11,7 @@ export function getOrderData() {
 // 查询各县民宿数量 民宿统计
 export function getHomestayStatistics() {
 	return request({
-		url: '/idcgetHotelData.action',
+		url: '/api/mhotel/idcgetHotelData.action',
 		method: 'get'
 	})
 }
@@ -19,7 +19,7 @@ export function getHomestayStatistics() {
 // 订单量排行
 export function getOrderVolumeRanking(param) {
 	return request({
-		url: '/idcgetRankBookNumData.action?type=' + param,
+		url: '/api/mhotel/idcgetRankBookNumData.action?type=' + param,
 		method: 'get'
 	})
 }
@@ -27,7 +27,7 @@ export function getOrderVolumeRanking(param) {
 // 查询销售额排行
 export function getQuerySalesRankings(param) {
 	return request({
-		url: '/idcgetRankSalesAmountData.action?type=' + param,
+		url: '/api/mhotel/idcgetRankSalesAmountData.action?type=' + param,
 		method: 'get'
 	})
 }
@@ -35,7 +35,7 @@ export function getQuerySalesRankings(param) {
 // 查询经营概况
 export function getManagementProfile() {
 	return request({
-		url: '/idcgetSumData.action',
+		url: '/api/mhotel/idcgetSumData.action',
 		method: 'get'
 	})
 }
@@ -43,7 +43,7 @@ export function getManagementProfile() {
 // 今日访问量
 export function getIdcvisitsToday() {
 	return request({
-		url: '/idcvisitsToday.action',
+		url: '/api/mhotel/idcvisitsToday.action',
 		method: 'post'
 	})
 }
@@ -58,7 +58,7 @@ export function getIdcvisitsDiyQuery(param) {
 	}
 
 	return request({
-		url: '/idcvisitsDiyQuery.action',
+		url: '/api/mhotel/idcvisitsDiyQuery.action',
 		method: 'post',
 		data
 	})

src/api/discountCouponMgr.js

@@ -20,7 +20,7 @@ export function getTableData(forData) {
 	}
 
 	return request({
-		url: '/CoupomqueryPage.action' + data,
+		url: '/api/mhotel/CoupomqueryPage.action' + data,
 		method: 'get',
 		data
 	})
@@ -35,7 +35,7 @@ export function coupomsaveBatchLapse(forData) {
 	}
 
 	return request({
-		url: '/CoupomsaveBatchLapse.action',
+		url: '/api/mhotel/CoupomsaveBatchLapse.action',
 		method: 'post',
 		data
 	})
@@ -70,7 +70,7 @@ export function coupominsterVoucher(forData) {
 	data.append('status', forData.status)
 
 	return request({
-		url: '/Coupominster.action',
+		url: '/api/mhotel/Coupominster.action',
 		method: 'post',
 		data
 	})
@@ -106,7 +106,7 @@ export function coupominsterCoupon(forData) {
 	data.append('status', forData.status)
 
 	return request({
-		url: '/Coupominster.action',
+		url: '/api/mhotel/Coupominster.action',
 		method: 'post',
 		data
 	})
@@ -142,7 +142,7 @@ export function coupominsterCoupon(forData) {
 // 	data.append('id', forData.id)
 
 // 	return request({
-// 		url: '/Coupomupdate.action',
+// 		url: '/api/mhotel/Coupomupdate.action',
 // 		method: 'post',
 // 		data
 // 	})
@@ -179,7 +179,7 @@ export function coupominsterCoupon(forData) {
 // 	data.append('id', forData.id)
 
 // 	return request({
-// 		url: '/Coupomupdate.action',
+// 		url: '/api/mhotel/Coupomupdate.action',
 // 		method: 'post',
 // 		data
 // 	})
@@ -189,7 +189,7 @@ export function coupominsterCoupon(forData) {
 export function hotelqueryAllHotel() {
 
 	return request({
-		url: '/hotelqueryListhotel.action',
+		url: '/api/mhotel/hotelqueryListhotel.action',
 		method: 'get'
 	})
 }

src/api/fileInfo.js

@@ -5,7 +5,7 @@ export function getFileList(linkId) {
 	const query = '?linkId=' + linkId
 
 	return request({
-		url: '/uploadgetByLinkId.action' + query,
+		url: '/api/mhotel/uploadgetByLinkId.action' + query,
 		method: 'get'
 	})
 }
@@ -16,7 +16,7 @@ export function uploadhimage(forData) {
 	data.append('myFile', forData.file)
 
 	return request2({//https://chtech.ncjti.edu.cn/hotelReservation/fileload
-		url: '/loadhimage.action', 
+		url: '/api/mhotel/loadhimage.action', 
 		method: 'post',
 		data
 	})

src/api/myAgent.js

@@ -5,7 +5,7 @@ export function getTableData(param) {
 	var pg = '?page=' + param.currentPage + '&pageSize=' + param.pageSize
 
 	return request({
-		url: '/workflowqueryWorkflow.action' + pg,
+		url: '/api/mhotel/workflowqueryWorkflow.action' + pg,
 		method: 'get'
 	})
 }
@@ -16,7 +16,7 @@ export function approved(param) {
 
 	// ?id=0f8d5f3d-2261-47a2-bc5e-40251cabc55d&type=2&status=2&workflowRemark=同意
 	return request({
-		url: '/workflowworkflow.action' + qp,
+		url: '/api/mhotel/workflowworkflow.action' + qp,
 		method: 'post'
 	})
 }

src/api/perimeterMgr.js

@@ -0,0 +1,92 @@
+import request from '@/utils/request'
+
+// 获取表格分页数据
+export function getTableData(forData) {
+	let data = new FormData()
+	if (typeof forData.page !== 'undefined') {
+		data.append('page', forData.page)
+	}
+	if (typeof forData.rows !== 'undefined') {
+		data.append('rows', forData.rows)
+	}
+	if (typeof forData.key !== 'undefined') {
+		data.append('key', forData.key)
+	}
+	if (typeof forData.rtown !== 'undefined') {
+		data.append('rtown', forData.rtown)
+	}
+	if (typeof forData.rtype !== 'undefined') {
+		data.append('rtype', forData.rtype)
+	}
+
+	return request({
+		url: '/api/mhotel/applistAround.action',
+		method: 'post',
+		data
+	})
+}
+
+// 获取乡镇配置列表
+export function getTowns() {
+	let query = '?code=10'
+
+	return request({
+		url: '/api/mhotel/hotelqueryList.action' + query,
+		method: 'get'
+	});
+};
+
+// 添加周边
+export function appinsertArounds(forData) {
+	let data = new FormData()
+	if (typeof forData.rtype !== 'undefined' && forData.rtype !== '') {
+		data.append('rtype', forData.rtype)
+	}
+	if (typeof forData.rtown !== 'undefined' && forData.rtown !== '') {
+		data.append('rtown', forData.rtown)
+	}
+	if (typeof forData.rname !== 'undefined' && forData.rname !== '') {
+		data.append('rname', forData.rname)
+	}
+	if (typeof forData.rphone !== 'undefined' && forData.rphone !== '') {
+		data.append('rphone', forData.rphone)
+	}
+	if (typeof forData.radress !== 'undefined' && forData.radress !== '') {
+		data.append('radress', forData.radress)
+	}
+	if (typeof forData.detail !== 'undefined' && forData.detail !== '') {
+		data.append('detail', forData.detail)
+	}
+	if (typeof forData.first_img !== 'undefined' && forData.first_img !== '') {
+		data.append('first_img', forData.first_img)
+	}
+	if (typeof forData.show_video !== 'undefined' && forData.show_video !== '') {
+		data.append('show_video', forData.show_video)
+	}
+	if (typeof forData.detail_img !== 'undefined' && forData.detail_img !== '') {
+		data.append('detail_img', forData.detail_img)
+	}
+	if (typeof forData.jingwei !== 'undefined' && forData.jingwei !== '') {
+		data.append('jingwei', forData.jingwei)
+	}
+	
+	return request({
+		url: '/api/mhotel/appinsertArounds.action',
+		method: 'post',
+		data
+	})
+}
+
+// 上传文件
+export function uploadFiles(file) {
+	let data = new FormData()
+	if (typeof file !== 'undefined') {
+		data.append('files', file)
+	}
+	
+	return request({
+		url: '/api/file/cos/upload',
+		method: 'post',
+		data
+	})
+}

src/api/residentialhostelMgr.js

@@ -17,7 +17,7 @@ export function getTableData(forData) {
 	}
 
 	return request({
-		url: '/managerAdminqueryPage.action' + query,
+		url: '/api/mhotel/managerAdminqueryPage.action' + query,
 		method: 'get'
 	});
 };
@@ -27,7 +27,7 @@ export function getTowns() {
 	let query = '?code=10'
 
 	return request({
-		url: '/hotelqueryList.action' + query,
+		url: '/api/mhotel/hotelqueryList.action' + query,
 		method: 'get'
 	});
 };
@@ -50,7 +50,7 @@ export function addHostel(param) {
 	data.append('linkProUrl', param.linkproUrl);
 
 	return request({
-		url: '/managerAdmininsertAdmin.action',
+		url: '/api/mhotel/managerAdmininsertAdmin.action',
 		method: 'post',
 		data
 	});
@@ -75,7 +75,7 @@ export function modifyHostel(param) {
 	data.append('linkProUrl', param.linkProUrl);
 
 	return request({
-		url: '/managerAdminupdateAdmin.action',
+		url: '/api/mhotel/managerAdminupdateAdmin.action',
 		method: 'post',
 		data
 	});
@@ -87,7 +87,7 @@ export function delHostelAccount(param) {
 	data.append('id', param);
 
 	return request({
-		url: '/managerAdmindelAdmin.action',
+		url: '/api/mhotel/managerAdmindelAdmin.action',
 		method: 'post',
 		data
 	});
@@ -99,7 +99,7 @@ export function resetHostelAccountPassword(param) {
 	data.append('id', param);
 
 	return request({
-		url: '/managerAdminremovePwd.action',
+		url: '/api/mhotel/managerAdminremovePwd.action',
 		method: 'post',
 		data
 	});
@@ -111,7 +111,7 @@ export function frozenHostelAccount(param) {
 	data.append('id', param);
 
 	return request({
-		url: '/managerAdminfreezeAdmin.action',
+		url: '/api/mhotel/managerAdminfreezeAdmin.action',
 		method: 'post',
 		data
 	});
@@ -123,7 +123,7 @@ export function thawHostelAccount(param) {
 	data.append('id', param);
 
 	return request({
-		url: '/managerAdminthawAdmin.action',
+		url: '/api/mhotel/managerAdminthawAdmin.action',
 		method: 'post',
 		data
 	});
@@ -136,7 +136,7 @@ export function listHomestayDictionary(param) {
 	data.append('code', param);
 
 	return request({
-		url: '/hotelqueryList.action',
+		url: '/api/mhotel/hotelqueryList.action',
 		method: 'post',
 		data
 	});
@@ -152,7 +152,7 @@ export function addHomestayDictionary(param) {
 	}
 
 	return request({
-		url: '/hotelinsterHotelDict.action',
+		url: '/api/mhotel/hotelinsterHotelDict.action',
 		method: 'post',
 		data
 	});
@@ -169,7 +169,7 @@ export function modifyHomestayDictionary(param) {
 	}
 
 	return request({
-		url: '/hotelupdateHotelDict.action',
+		url: '/api/mhotel/hotelupdateHotelDict.action',
 		method: 'post',
 		data
 	});
@@ -181,7 +181,7 @@ export function delHomestayDictionary(param) {
 	data.append('id', param);
 
 	return request({
-		url: '/hoteldelHotelDict.action',
+		url: '/api/mhotel/hoteldelHotelDict.action',
 		method: 'post',
 		data
 	});
@@ -190,7 +190,7 @@ export function delHomestayDictionary(param) {
 // 获取民宿其他配置
 export function otherConfig(param) {
 	return request({
-		url: '/hotelqueryTakeOrderDict.action',
+		url: '/api/mhotel/hotelqueryTakeOrderDict.action',
 		method: 'get'
 	});
 };
@@ -215,7 +215,7 @@ export function modifyOtherConfig(param) {
 	};
 	
 	return request({
-		url: '/hotelupdateTakeOrderDict.action',
+		url: '/api/mhotel/hotelupdateTakeOrderDict.action',
 		method: 'post',
 		data
 	});

src/api/stdbookMgr.js

@@ -24,7 +24,7 @@ export function getTableData(forData) {
 	}
 	
 	return request({
-		url: '/bookquearyLedgerPage.action',
+		url: '/api/mhotel/bookquearyLedgerPage.action',
 		method: 'post',
 		data
 	})
@@ -36,7 +36,7 @@ export function getTowns() {
 	let query = '?code=10'
 
 	return request({
-		url: '/hotelqueryList.action' + query,
+		url: '/api/mhotel/hotelqueryList.action' + query,
 		method: 'get'
 	});
 };
@@ -62,7 +62,7 @@ export function downloadExcel(forData) {
 	}
 	
 	return request({
-		url: '/booktoLedgerAdmimnExcel.action',
+		url: '/api/mhotel/booktoLedgerAdmimnExcel.action',
 		method: 'post',
 		data
 	})

src/api/systemSet.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function updateSet(data) {
 	return request({
-		url: '/configupdate.action',
+		url: '/api/mhotel/configupdate.action',
 		method: 'post',
 		data
 	})
@@ -10,7 +10,7 @@ export function updateSet(data) {
 
 export function getSet() {
 	return request({
-		url: '/configlist.action',
+		url: '/api/mhotel/configlist.action',
 		method: 'post'
 	})
 }

src/api/user.js

@@ -6,7 +6,7 @@ export function login(forData) {
 	data.append('password', forData.password.trim())
 	
 	return request({
-		url: '/adminloginAdmin.action',
+		url: '/api/mhotel/adminloginAdmin.action',
 		method: 'post',
 		data
 	})
@@ -14,7 +14,7 @@ export function login(forData) {
 
 // export function getInfo(token) {
 // 	return request({
-// 		url: '/airManage/info',
+// 		url: '/api/mhotel/info',
 // 		method: 'get',
 // 		params: {
 // 			token
@@ -24,7 +24,7 @@ export function login(forData) {
 
 // export function logout() {
 // 	return request({
-// 		url: '/airManage/adminloginout.action',
+// 		url: '/api/mhotel/adminloginout.action',
 // 		method: 'post'
 // 	})
 // }

src/main.js

@@ -16,6 +16,11 @@ Vue.use(VueVideoPlayer)
 import 'viewerjs/dist/viewer.css'
 import Viewer from 'v-viewer'
 
+import BaiduMap from 'vue-baidu-map'
+Vue.use(BaiduMap, {
+  ak: 't4Yu0Y2LTGbvMsjSQhtmuRa5Dwbpbq2P' // 替换为您自己的百度地图AK密钥
+})
+
 import App from './App'
 import store from './store'
 import router from './router'

vue.config.js

@@ -37,20 +37,22 @@ module.exports = {
 			errors: true
 		},
 		proxy: {
-			[process.env.VUE_APP_BASE_API]: {
-				// target: 'https://www.靖安人家.com/hotelReservation/mhotel',
-				target: 'https://chtech.ncjti.edu.cn/hotelReservation/mhotel',
+			['^/api']: {
+				target: 'https://www.xn--gmq052a5d255v.com/hotelReservation',
+				// target: 'https://chtech.ncjti.edu.cn/hotelReservation/mhotel',
 				// target: 'http://101.42.162.31/mhotel',
 				changeOrigin: true,
 				pathRewrite: {
-					['^' + process.env.VUE_APP_BASE_API]: ''
+					// ['^' + process.env.VUE_APP_BASE_API]: ''
+					['^/api']: ''
 				}
 			},
-			[process.env.VUE_APP_BASE_FILE]: { // 图片上传
-				target: 'https://chtech.ncjti.edu.cn/hotelReservation/fileload',
+			['^/api']: { // 图片上传
+				target: 'https://www.xn--gmq052a5d255v.com/hotelReservation',
+				// target: 'https://chtech.ncjti.edu.cn/hotelReservation/fileload',
 				changeOrigin: true,
 				pathRewrite: {
-					['^' + process.env.VUE_APP_BASE_FILE]: ''
+					['^/api']: ''
 				}
 			}
 		}