阶段性提交

.env.development

@@ -3,4 +3,6 @@ ENV = 'development'
 
 # base api
 VUE_APP_BASE_API = ''
-VUE_APP_BASE_FILE = ''
+
+# upload image file
+# VUE_APP_BASE_FILE = ''

.env.production

@@ -4,4 +4,4 @@ ENV = 'production'
 # base api
 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://chtech.ncjti.edu.cn/hotelReservation/fileload'

package.json

@@ -4,11 +4,11 @@
 	"description": "A vue admin template with Element UI & axios & iconfont & permission control & lint",
 	"author": "Pan <panfree23@gmail.com>",
 	"scripts": {
-		"build": "vue-cli-service build",
+		"build": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service build",
 		"build:report": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service build --report",
 		"build:prod": "vue-cli-service build",
 		"build:stage": "vue-cli-service build --mode staging",
-		"dev": "vue-cli-service serve --mode staging",
+		"dev": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service serve",
 		"preview": "node build/index.js --preview",
 		"svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
 		"lint": "eslint --ext .js,.vue src",

src/views/complaintMgr/index.vue

@@ -34,11 +34,10 @@
 						</div>
 						<el-table ref="multipleTable" :data="tableData" height="510" style="width: 100%" :cell-style="cell_style" v-loading="loading"
 							:header-cell-style="header_cell_style">
-							<el-table-column type="selection" width="50">
-							</el-table-column>
 							<el-table-column label="状态" align="center">
 								<template slot-scope="scope">
-									<span>{{ scope.row.hotelTownshipName }}</span>
+									<span v-if="scope.row.status == 0" style="color: #F9273F;">处理中</span>
+									<span v-else style="color: #56AA2E;">处理完成</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="投诉单号" align="center">
@@ -48,7 +47,7 @@
 							</el-table-column>
 							<el-table-column label="民宿" align="center">
 								<template slot-scope="scope">
-									<span>{{ scope.row.orderNum }}</span>
+									<span>{{ scope.row.hotelName }}</span>
 								</template>
 							</el-table-column>
 
@@ -64,22 +63,22 @@
 							</el-table-column>
 							<el-table-column label="订单号" align="center">
 								<template slot-scope="scope">
-									<span>{{ scope.row.checkOutTime }}</span>
+									<span>{{ scope.row.id }}</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="标题" align="center">
 								<template slot-scope="scope">
-									<span>{{ scope.row.checkOutTime }}</span>
+									<span>{{ scope.row.title }}</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="问题表述" align="center">
 								<template slot-scope="scope">
-									<span>{{ scope.row.checkOutTime }}</span>
+									<span>{{ scope.row.content }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="投诉时间" align="center">
+							<el-table-column label="投诉时间" align="center" width="168">
 								<template slot-scope="scope">
-									<span>{{ scope.row.checkOutTime }}</span>
+									<span>{{ scope.row.createDate.substring(0, scope.row.createDate.length - 2) }}</span>
 								</template>
 							</el-table-column>
 							<el-table-column fixed="right" label="操作" width="100">
@@ -132,7 +131,7 @@
 		getTableData,
 		getTowns,
 		downloadExcel
-	} from '@/api/stdbookMgr'
+	} from '@/api/complaintMgr'
 
 	export default {
 		data() {
@@ -263,13 +262,13 @@
 				var that = this
 				// console.log(data);
 				getTableData(data).then((res) => {
-					// console.log(res);
+					console.log(res.data);
 					if (res.code === 200) {
 						var d = res.data
-						that.pagination.total = d.bookIPage.total
+						that.pagination.total = d.total
 						that.tableData = []
-						for (var i = 0; i < d.bookIPage.pageList.length; i++) {
-							that.tableData.push(d.bookIPage.pageList[i])
+						for (var i = 0; i < d.pageList.length; i++) {
+							that.tableData.push(d.pageList[i])
 						}
 					} else {
 						that.tableData = []

src/views/discountCouponMgr/index.vue

@@ -13,7 +13,7 @@
 							<el-form :inline="true" :model="formInline" class="demo-form-inline">
 								<el-form-item label="名称">
 									<el-input v-model="formInline.keyword" style="width: 200px;" prefix-icon="el-icon-search" clearable
-										placeholder="请输入关键字段"></el-input>
+										placeholder="请输入优惠券名称"></el-input>
 								</el-form-item>
 								<el-form-item label="类型">
 									<el-select v-model="formInline.id" clearable placeholder="全部">
@@ -106,7 +106,7 @@
 				</div>
 			</el-col>
 		</el-row>
-		<!-- 投诉详情 -->
+		<!-- 优惠劵详情 -->
 		<el-dialog title="优惠券详情" custom-class="add-account-class" :visible.sync="dialogComplaintVisible" :close-on-click-modal="false"
 			:close-on-press-escape="false" @close="dialogComplaintVisible = false">
 			<p><label class="lbl-cls">优惠券名称:</label>{{ coupon.name }}</p>
@@ -141,7 +141,7 @@
 		<!-- 新增代金券对话框 -->
 		<el-dialog title="新增代金券" custom-class="add-voucher-class" :visible.sync="dialogAddVoucherFormVisible" :close-on-click-modal="false"
 			:close-on-press-escape="false" @close="dialogAddVoucherFormVisible = false">
-			<el-form :model="formAddVoucher" ref="addHostelForm" :rules="addHostelFormRules">
+			<el-form :model="formAddVoucher" ref="addHostelForm" :rules="addVoucherFormRules">
 				<el-row>
 					<el-col :span="24">
 						<div style="font-size: 18px;font-weight: 700; color: rgba(0, 0, 0, 1); margin: -10px 0 20px 20px;">代金券<span
@@ -225,13 +225,13 @@
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button class="add-info-cancel-btn" @click="dialogAddVoucherFormVisible = false">取 消</el-button>
-				<el-button class="add-info-confirm-btn" @click="add_house_dialog_handler">确 认</el-button>
+				<el-button class="add-info-confirm-btn" @click="add_voucher_dialog_handler">确 认</el-button>
 			</div>
 		</el-dialog>
 		<!-- 新增折扣券对话框 -->
 		<el-dialog title="新增折扣券" custom-class="add-voucher-class" :visible.sync="dialogAddCouponFormVisible" :close-on-click-modal="false"
 			:close-on-press-escape="false" @close="dialogAddVoucherFormVisible = false">
-			<el-form :model="formAddCoupon" ref="addHostelForm" :rules="addHostelFormRules">
+			<el-form :model="formAddCoupon" ref="addHostelForm" :rules="addCouponFormRules">
 				<el-row>
 					<el-col :span="24">
 						<div style="font-size: 18px;font-weight: 700; color: rgba(0, 0, 0, 1); margin: -10px 0 20px 20px;">折扣券<span
@@ -323,7 +323,7 @@
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button class="add-info-cancel-btn" @click="dialogAddCouponFormVisible = false">取 消</el-button>
-				<el-button class="add-info-confirm-btn" @click="add_house_dialog_handler">确 认</el-button>
+				<el-button class="add-info-confirm-btn" @click="add_coupon_dialog_handler">确 认</el-button>
 			</div>
 		</el-dialog>
 	</div>
@@ -333,7 +333,7 @@
 	import {
 		getTableData,
 		getTowns
-	} from '@/api/stdbookMgr'
+	} from '@/api/discountCouponMgr'
 
 	const townOptions = ['靖安野塘隐夏民宿', '九岭山房民宿', '巧遇山庄', '大野山居','靖安野塘隐夏民宿', '九岭山房民宿', '巧遇山庄', '大野山居','靖安野塘隐夏民宿', '九岭山房民宿', '巧遇山庄', '大野山居'];
 	export default {
@@ -359,7 +359,7 @@
 					options: [],
 					id: '',
 					search_datatime: '',
-					keyword: ''
+					name: ''
 				},
 				tableData: [],
 				cond_data: {},
@@ -385,8 +385,14 @@
 				dialogAddVisible: false, // 新增优惠券界面
 				dialogAddVoucherFormVisible: false, // 新增代金券对话框
 				formAddVoucher: {},
+				addVoucherFormRules: {
+					
+				},
 				dialogAddCouponFormVisible: false, // 新增折扣券对话框
 				formAddCoupon: {},
+				addCouponFormRules: {
+					
+				},
 				checkAll: false,
 				checkedTowns: ['靖安野塘隐夏民宿', '九岭山房民宿'],
 				towns: townOptions,
@@ -426,11 +432,17 @@
 				// this.dialogAddVisible = false
 				this.dialogAddVoucherFormVisible = true
 			},
+			add_voucher_dialog_handler() {
+				
+			},
 			// 关闭当前对话框，打开增加折扣券
 			add_coupon() {
 				// this.dialogAddVisible = false
 				this.dialogAddCouponFormVisible = true
 			},
+			add_coupon_dialog_handler() {
+				
+			},
 			invalidate_batch() {
 
 			},
@@ -483,7 +495,7 @@
 				var that = this
 				// console.log(data);
 				getTableData(data).then((res) => {
-					// console.log(res);
+					console.log(res);
 					if (res.code === 200) {
 						var d = res.data
 						that.pagination.total = d.bookIPage.total
@@ -518,8 +530,8 @@
 					data.search_datatime = this.formInline.search_datatime
 				}
 
-				if (this.formInline.keyword !== '') {
-					data.keyword = this.formInline.keyword
+				if (this.formInline.name !== '') {
+					data.name = this.formInline.name
 				}
 
 				this.cond_data = data;

src/views/residentialhostelMgr/index.vue

@@ -65,22 +65,29 @@
 									<span>{{ scope.row.status === 1 ? '正常' : '已冻结' }}</span>
 								</template>
 							</el-table-column>
+							<el-table-column label="民宿等级" align="center" width="110">
+								<template slot-scope="scope">
+									<span v-if="scope.row.type == 1">银宿级</span>
+									<span v-else-if="scope.row.type == 2">金宿级</span>
+									<span v-else="scope.row.type == 3">白金级</span>
+								</template>
+							</el-table-column>
 							<el-table-column label="民宿名称" align="center">
 								<template slot-scope="scope">
 									<span>{{ scope.row.hotelName }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="联系人(法人)" align="center">
+							<el-table-column label="联系人(法人)" align="center" width="120">
 								<template slot-scope="scope">
 									<span>{{ scope.row.corpnName }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="联系电话" align="center">
+							<el-table-column label="联系电话" align="center" width="120">
 								<template slot-scope="scope">
 									<span>{{ scope.row.corpnPhone }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="所属乡镇" align="center">
+							<el-table-column label="所属乡镇" align="center" width="130">
 								<template slot-scope="scope">
 									<span>{{ scope.row.hotelTownshipName}}</span>
 								</template>
@@ -145,7 +152,7 @@
 						</el-form-item>
 						<div
 							style="font-size: 18px;font-weight: 400;letter-spacing: 0px;line-height: 26.06px;color: rgba(212, 48, 48, 1);text-align: left;vertical-align: top;">
-							注：账号解冻后，密码默认为Jams_123456</div>
+							注：密码默认为Jams_123456</div>
 					</el-col>
 					<el-col :span="12">
 						<div style="font-size: 16px;font-weight: 700; color: rgba(0, 0, 0, 1); margin: -10px 0 20px 20px;">提现信息</div>
@@ -221,7 +228,7 @@
 						</el-form-item>
 						<div
 							style="font-size: 18px;font-weight: 400;letter-spacing: 0px;line-height: 26.06px;color: rgba(212, 48, 48, 1);text-align: left;vertical-align: top;">
-							注：账号解冻后，密码默认为Jams_123456</div>
+							注：密码默认为Jams_123456</div>
 					</el-col>
 					<el-col :span="12">
 						<div style="font-size: 16px;font-weight: 700; color: rgba(0, 0, 0, 1); margin: -10px 0 20px 20px;">提现信息</div>
@@ -803,7 +810,7 @@
 			};
 			return {
 				currentUserLevel: this.$store.state.user.level, // 当前用户的权限
-				activeName: 'first', // 默认激活那个选项卡
+				activeName: 'first', // 默认激活第一个选项卡
 				dialogResidentialHostelConfigurationVisible: false, // 民宿配置对话框显示和隐藏变量
 				dialogAddHostelFormVisible: false, // 添加民宿对话框显示和隐藏变量
 				dialogModifyHostelFormVisible: false, // 修改对话框的显示和隐藏变量
@@ -870,15 +877,23 @@
 					bankCard: '',
 					cardName: '',
 					bankName: '',
-					jibie:[
-						{id:1,jibieName:'银宿级'},
-						{id:2,jibieName:'金宿级'},
-						{id:3,jibieName:'白金级'},
-					],//民宿级别
-					jibieId:'',
+					jibie: [{
+							id: 1,
+							jibieName: '银宿级'
+						},
+						{
+							id: 2,
+							jibieName: '金宿级'
+						},
+						{
+							id: 3,
+							jibieName: '白金级'
+						},
+					], //民宿级别
+					jibieId: '',
 					fileUrl: '', // 图片上传列表
 					url: '', // 上传的图片列表
-					linkproUrl:'',//720全景链接
+					linkproUrl: '', //720全景链接
 					level: this.$store.state.user.level
 				},
 				addHostelFormRules: {
@@ -928,15 +943,23 @@
 					bankCard: '',
 					cardName: '',
 					bankName: '',
-					jibie:[
-						{id:1,jibieName:'银宿级'},
-						{id:2,jibieName:'金宿级'},
-						{id:3,jibieName:'白金级'},
-					],//民宿级别
-					type:'',
+					jibie: [{
+							id: 1,
+							jibieName: '银宿级'
+						},
+						{
+							id: 2,
+							jibieName: '金宿级'
+						},
+						{
+							id: 3,
+							jibieName: '白金级'
+						},
+					], //民宿级别
+					type: '',
 					fileUrl: '', // 图片上传列表
 					url: '', // 上传的图片列表
-					linkProUrl:'',//720全景链接
+					linkProUrl: '', //720全景链接
 					level: this.$store.state.user.level
 				},
 				modifyHostelFormRules: {
@@ -1372,7 +1395,7 @@
 				this.formModifyHostel.id = row.id;
 				if (typeof t === 'number' && isNaN(t)) {
 					this.formModifyHostel.hotelTownship = "";
-				} else{
+				} else {
 					this.formModifyHostel.hotelTownship = t;
 				}
 				this.formModifyHostel.hotelName = row.hotelName;

vue.config.js

@@ -38,14 +38,14 @@ module.exports = {
 		},
 		proxy: {
 			[process.env.VUE_APP_BASE_API]: {
-				// target: 'http://52bun2.natappfree.cc/mhotel',
-				target: 'https://chtech.ncjti.edu.cn/hotelReservation/mhotel',
+				target: 'http://101.42.162.31:8088/mhotel',
+				// target: 'https://chtech.ncjti.edu.cn/hotelReservation/mhotel',
 				changeOrigin: true,
 				pathRewrite: {
 					['^' + process.env.VUE_APP_BASE_API]: ''
 				}
 			},
-			[process.env.VUE_APP_BASE_FILE]: {//图片上传
+			[process.env.VUE_APP_BASE_FILE]: { // 图片上传
 				target: 'https://chtech.ncjti.edu.cn/hotelReservation/fileload',
 				changeOrigin: true,
 				pathRewrite: {