diff --git a/app.js b/app.js
index f99f461b3..137f52056 100755
--- a/app.js
+++ b/app.js
@@ -48,13 +48,7 @@ app.use('/ws', createProxyMiddleware({
     ws: true
 }));
 
-// app.use('/callComponent', proxy('http://ynwyht.dk55.com:8008', opts));
-// app.use('/app', proxy('http://ynwyht.dk55.com:8008', opts));
-// app.use('/ws', createProxyMiddleware({
-//     target: 'http://ynwyht.dk55.com:8008',
-//     changeOrigin: true,
-//     ws: true
-// }));
+
 
 // app.use('/callComponent', proxy('http://127.0.0.1:8008', opts));
 // app.use('/app', proxy('http://127.0.0.1:8008', opts));
diff --git a/public/components/property/parkingAreaControlCustomCarInout/parkingAreaControlCustomCarInout.js b/public/components/property/parkingAreaControlCustomCarInout/parkingAreaControlCustomCarInout.js
index fea9e9134..171209d06 100644
--- a/public/components/property/parkingAreaControlCustomCarInout/parkingAreaControlCustomCarInout.js
+++ b/public/components/property/parkingAreaControlCustomCarInout/parkingAreaControlCustomCarInout.js
@@ -142,7 +142,7 @@
             _loadOutMachinesByPaId: function () {
                 let param = {
                     params: {
-                        paId: $that.parkingAreaTotalControlVideoInfo.paId,
+                        paId: $that.parkingAreaControlCustomCarInoutInfo.paId,
                         page: 1,
                         row: 100,
                         direction: '3307',
@@ -165,11 +165,11 @@
             _loadOutCoupons: function () {
                 let param = {
                     params: {
-                        paId: $that.parkingAreaTotalControlVideoInfo.paId,
+                        paId: $that.parkingAreaControlCustomCarInoutInfo.paId,
                         page: 1,
                         row: 30,
                         state: '1001',
-                        carNum: $that.parkingAreaTotalControlVideoInfo.carNum
+                        carNum: $that.parkingAreaControlCustomCarInoutInfo.carNum
                     }
                 }
                 //发送get请求
@@ -186,16 +186,17 @@
                 );
             },
             _computeCouponMoney: function () {
-                let _pccIds = $that.parkingAreaTotalControlVideoInfo.pccIds;
+                let _pccIds = $that.parkingAreaControlCustomCarInoutInfo.pccIds;
 
                 if(!_pccIds || _pccIds.length<1){
+                    $that._queryCustomCarMoney();
                     return;
                 }
                 let param = {
                     params: {
-                        paId: $that.parkingAreaTotalControlVideoInfo.paId,
-                        pccIds: $that.parkingAreaTotalControlVideoInfo.pccIds.join(","),
-                        carNum: $that.parkingAreaTotalControlVideoInfo.carNum
+                        paId: $that.parkingAreaControlCustomCarInoutInfo.paId,
+                        pccIds: $that.parkingAreaControlCustomCarInoutInfo.pccIds.join(","),
+                        carNum: $that.parkingAreaControlCustomCarInoutInfo.carNum
                     }
                 }
                 //发送get请求
diff --git a/public/components/property/parkingAreaTotalControlVideo/parkingAreaTotalControlVideo.js b/public/components/property/parkingAreaTotalControlVideo/parkingAreaTotalControlVideo.js
index f699fce54..ec2d46aeb 100644
--- a/public/components/property/parkingAreaTotalControlVideo/parkingAreaTotalControlVideo.js
+++ b/public/components/property/parkingAreaTotalControlVideo/parkingAreaTotalControlVideo.js
@@ -222,7 +222,8 @@
                 vc.emit('parkingAreaControlCustomCarInout', 'open', {
                     type: _type,
                     machineId: _machine.machineId,
-                    boxId: _machine.locationObjId
+                    boxId: _machine.locationObjId,
+                    paId:$that.parkingAreaTotalControlVideoInfo.paId
                 })
             },
         }
diff --git a/public/pages/property/scheduleClassesPage/scheduleClassesPage.html b/public/pages/property/scheduleClassesPage/scheduleClassesPage.html
index 827b50ecb..6b4daa469 100755
--- a/public/pages/property/scheduleClassesPage/scheduleClassesPage.html
+++ b/public/pages/property/scheduleClassesPage/scheduleClassesPage.html
@@ -99,7 +99,7 @@
                                     <td class="text-center" v-for="(day,index) in staff.days">
                                         <div class=" text-center border padding-lg labeling-strip"
                                             style="border-radius: 5px;cursor:pointer">
-                                            <div>{{day.workdayName}}</div>
+                                            <div>{{day.workdayName?day.workdayName:'休息'}}</div>
                                             <div v-for="(time,index) in day.times">{{time.startTime}}-{{time.endTime}}
                                             </div>
                                         </div>