Browse Source

修改了核销、退款、退房三个接口。

soft5566 3 years ago
parent
commit
696683ec28
6 changed files with 26 additions and 21 deletions
  1. 1 1
      .env.production
  2. 5 5
      src/styles/sidebar.scss
  3. 11 6
      src/styles/variables.scss
  4. 2 2
      src/utils/request.js
  5. 6 5
      src/views/order/index.vue
  6. 1 2
      vue.config.js

+ 1 - 1
.env.production

@@ -2,5 +2,5 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = 'https://chtech.ncjti.edu.cn/air-conditioner-control/'
+VUE_APP_BASE_API = 'https://chtech.ncjti.edu.cn/hotelReservation/'
 

+ 5 - 5
src/styles/sidebar.scss

@@ -88,15 +88,15 @@
     .submenu-title-noDropdown,
     .el-submenu__title {
       &:hover {
-        color: #2B4CFE !important;
+        color: $menuHoverText !important;
         background-color: $menuHover !important;
       }
     }
 
     .is-active>.el-submenu__title {
-      color: $subMenuActiveText !important;
-      border-radius: 10px !important;
-      background: linear-gradient(0deg, #2B4CFE, #3E6EFF) !important;
+      // color: $subMenuActiveText !important;
+      // border-radius: 10px !important;
+      // background: linear-gradient(0deg, #2B4CFE, #3E6EFF) !important;
     }
 
     & .nest-menu .el-submenu>.el-submenu__title,
@@ -111,7 +111,7 @@
     // 添加
     .router-link-exact-active.router-link-active {
       // border-radius: 10px !important;
-      background: linear-gradient(0deg, #FFFFFF, #FFFFFF) !important;
+      // background: linear-gradient(0deg, #FFFFFF, #FFFFFF) !important;
 
       .el-menu-item.is-active {
         // border-radius: 10px !important;

+ 11 - 6
src/styles/variables.scss

@@ -1,11 +1,14 @@
 // sidebar
-$menuText: #FFFFFF;
-$menuActiveText: #296DE4;
-$subMenuActiveText: #296DE4; //https://github.com/ElemeFE/element/issues/12951
+$menuText: #FFFFFF;  // 默认文本颜色
+$menuBg: #296DE4; // 默认背景
+$subMenuBg: #296DE4; // 默认子菜单背景
 
-$menuBg: #296DE4; // 菜单整体背景
-$menuHover: #FFFFFF; // 菜单悬浮变色
-$subMenuBg: #296DE4; // 子菜单背景
+$menuActiveText: #296DE4;  // 当前激活主菜单文本颜色
+$subMenuActiveText: #296DE4; // 当前激活子菜单文本颜色
+
+$menuHoverText: #296DE4; // 主菜单悬浮文本颜色
+$subMenuHoverText: #296DE4; // 子菜单悬浮文本颜色
+$menuHover: #FFFFFF; // 主菜单悬浮背景
 $subMenuHover: #FFFFFF; // 子菜单悬浮背景
 
 $sideBarWidth: 260px;
@@ -22,4 +25,6 @@ $sideBarWidth: 260px;
   subMenuBg: $subMenuBg;
   subMenuHover: $subMenuHover;
   sideBarWidth: $sideBarWidth;
+  menuHoverText: $menuHoverText;
+  subMenuHoverText: $subMenuHoverText;
 }

+ 2 - 2
src/utils/request.js

@@ -56,7 +56,7 @@ service.interceptors.response.use(
 		if (res.code !== 200) {
 			// 返回格式不规范,也只能如此了
 			return res
-			
+
 			Message({
 				message: res.message || '返回信息中无code,无法解析数据',
 				type: 'error',
@@ -77,7 +77,7 @@ service.interceptors.response.use(
 					})
 				})
 			}
-			
+
 			return Promise.reject(new Error(res.message || '未知错误'))
 		} else {
 			return res

+ 6 - 5
src/views/order/index.vue

@@ -156,11 +156,11 @@
        * 核销  退款  退房
        */
       collate_refund_checkout_handler(index, row, param) {
-        // console.log(index, row.id, row.status, param);
+        // console.log(index, row, row.status, param);
         var txt = '';
         if (param === 1) {
           txt = '核销';
-        } else if (param === 2){
+        } else if (param === 2) {
           txt = '退款';
         } else {
           txt = '退房';
@@ -173,7 +173,8 @@
         }).then(() => {
           let data = {
             id: row.id,
-            status: row.status
+            status: row.status,
+            dom: row.dom
           };
           // console.log(data);
           collate_refund_checkout(data).then((res) => {
@@ -212,7 +213,7 @@
 
           if (res.code == 200) {
             this.$message.success('下载成功!')
-            let xls = 'https://chtech.ncjti.edu.cn/air-conditioner-control/' + res.downurl
+            let xls = 'https://chtech.ncjti.edu.cn/hotelReservation/' + res.downurl
             window.open(xls)
           } else {
             this.$message.error(res.message)
@@ -546,4 +547,4 @@
       }
     }
   }
-</style>
+</style>

+ 1 - 2
vue.config.js

@@ -38,8 +38,7 @@ module.exports = {
     },
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
-        target: 'https://chtech.ncjti.edu.cn/air-conditioner-control/zhotel',
-        // target: 'https://chtech.ncjti.edu.cn/air-conditioner-control',
+        target: 'https://chtech.ncjti.edu.cn/hotelReservation/zhotel',
         // target: 'http://127.0.0.1:9999',
         changeOrigin: true,
         pathRewrite: {