diff --git a/src/jmapNew/config/skinCode/ningbo_03.js b/src/jmapNew/config/skinCode/ningbo_03.js
index 567d59da0..c54ca328a 100644
--- a/src/jmapNew/config/skinCode/ningbo_03.js
+++ b/src/jmapNew/config/skinCode/ningbo_03.js
@@ -180,6 +180,7 @@ class SkinCode extends defaultStyle {
             },
             lamp: {
                 bgShow: false, // 是否被选中
+                logicDisplayNone: true,
                 guidName: 'half',							// 默认引导类型
                 borderVariable: false,						// 信号灯边框可变
                 stopWidth: 2,								// 禁止线宽度
diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index 1db5748ca..7435511a4 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -543,10 +543,12 @@ class Jlmap {
                         status.atsControl = status.atsControl && elem.atsControl;
                         status.fleetMode = status.fleetMode || elem.fleetMode;
                         status.ciControl = status.ciControl || elem.ciControl;
+                        status.lock = status.lock || elem.lock;
                     } else {
                         status.atsControl = elem.atsControl;
                         status.fleetMode = elem.fleetMode;
                         status.ciControl = elem.ciControl;
+                        status.lock = elem.lock;
                     }
                     status.canSetCi = status.arc || elem.arc;
                 });
diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js
index 2108cd6c2..66ed85060 100644
--- a/src/jmapNew/shape/Section/index.js
+++ b/src/jmapNew/shape/Section/index.js
@@ -154,7 +154,6 @@ export default class Section extends Group {
 
     /** 非通信车占用状态 03*/
     unCommunicationOccupied() {
-		console.log(this.style.Section.preAxleIgnoreFault);
 		if (this.style.Section.preAxleIgnoreFault && this.model.preReset) {
 			return ;
 		}
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
index 84efd92b4..69f759f60 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
@@ -119,7 +119,7 @@
         class="haerbin-01__systerm __menuButton"
         style="pointer-events: none"
         title="Dialog"
-		z-index="2008"
+        z-index="2008"
         :visible.sync="dialogVisible"
         :modal="false"
         :close-on-click-modal="false"
@@ -177,10 +177,10 @@
         class="haerbin-01__systerm __menuButton"
         style="pointer-events: none"
         title="IBP"
-		z-index="2008"
+        z-index="2008"
         :visible.sync="stationDialogVisible"
         :modal="false"
-		append-to-body
+        append-to-body
         :close-on-click-modal="false"
         width="30%"
         :before-close="handleStationClose"
@@ -570,6 +570,7 @@ export default {
         handleSectionMenu() {
             this.deviceHighLight(this.oldDevice, false);
             this.deviceHighLight(this.selectedObj, true);
+            this.oldDevice = this.selectedObj;
             this.oldClickObj = deepAssign({}, this.selectedObj);
 
             this.initCentralizedStationList(this.sectionParamList);
@@ -712,14 +713,14 @@ export default {
             }
         },
         clickCommand(row, index) {
-			const step = {};
+            const step = {};
 
             this.rightClickDialogVisible = false;
             this.paramIndex = row.next ? index : -1;
 
             if (row.commandTip) {
                 EventBus.$emit('sendMsg', {message: row.name});
-			}
+            }
 
             if (this.tempData.length) {
                 this.operate = row.operate.operation;
@@ -729,7 +730,7 @@ export default {
                 if (row.param) {
                     this.param = row.param;
                 }
-				step.param = this.param;
+                step.param = this.param;
                 this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                     if (valid) {
                         this.checkConfirmParam();
@@ -1014,10 +1015,10 @@ export default {
                 { name: '解封区段', commandTip: '允许通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }
             ];
             this.switchParamList = [
-                { name: '岔区设限',  cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED, operate: OperationEvent.Switch.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch},
-                { name: '岔区消限', commandTip: '取消对道岔区段的限速',cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED, operate: OperationEvent.Switch.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
+                { name: '岔区设限', cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED, operate: OperationEvent.Switch.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch},
+                { name: '岔区消限', commandTip: '取消对道岔区段的限速', cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED, operate: OperationEvent.Switch.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '转换道岔', commandTip: '转换道岔', cmdType: CMD.Switch.CMD_SWITCH_TURN, operate: OperationEvent.Switch.turnout.menuButton, disabledCb: (stationControl) => !this.modeMatch },
-                { name: '强行转岔', commandTip: '强制操作道岔',cmdType: CMD.Switch.CMD_SWITCH_FORCE_TURN, operate: OperationEvent.Switch.turnoutForce.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
+                { name: '强行转岔', commandTip: '强制操作道岔', cmdType: CMD.Switch.CMD_SWITCH_FORCE_TURN, operate: OperationEvent.Switch.turnoutForce.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '强解道岔', commandTip: '强解道岔', cmdType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK, operate: OperationEvent.Switch.fault.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '挤岔恢复', commandTip: '取消挤岔逻辑标志', cmdType: CMD.Switch.CMD_SWITCH_SQUEEZE_RECOVERY, operate: OperationEvent.Switch.squeezeRecovery.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '单独锁定', commandTip: '锁定道岔，阻止转换', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK, operate: OperationEvent.Switch.lock.menuButton, disabledCb: (stationControl) => !this.modeMatch },
@@ -1026,7 +1027,7 @@ export default {
                 { name: '封锁道岔', commandTip: '禁止通过道岔区段排列进路', cmdType: CMD.Switch.CMD_SWITCH_BLOCK, operate: OperationEvent.Switch.block.menuButton, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '解封道岔', commandTip: '允许通过道岔区段排列进路', cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK, operate: OperationEvent.Switch.unblock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '强行消限', commandTip: '强行取消对轨道区段的限速', cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED, operate: OperationEvent.Switch.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }
-			];
+            ];
 
             this.signalParamList = this.$store.state.training.prdType === '01' ? [
                 { name: '关闭信号', commandTip: '设置信号机为关闭状态', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menuButton, disabledCb: (stationControl) => !this.modeMatch },
diff --git a/src/jmapNew/theme/xian_02/menus/menuSection.vue b/src/jmapNew/theme/xian_02/menus/menuSection.vue
index 0ee2b4a75..bdd90d3c4 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSection.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSection.vue
@@ -83,11 +83,13 @@ export default {
                 Center: [
                     {
                         label: '区段封锁',
-                        handler: this.lock
+                        handler: this.lock,
+                        cmdType: CMD.Section.CMD_SECTION_BLOCK
                     },
                     {
                         label: '区段解封',
-                        handler: this.unlock
+                        handler: this.unlock,
+                        cmdType: CMD.Section.CMD_SECTION_UNBLOCK
                     },
                     {
                         label: '设备标签',
@@ -112,7 +114,8 @@ export default {
                     },
                     {
                         label: '设置临时限速',
-                        handler: this.setSpeed
+                        handler: this.setSpeed,
+                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
                     },
                     {
                         label: '帮助',
diff --git a/src/jmapNew/theme/xian_02/menus/menuSignal.vue b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
index a49963f42..1786e3230 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
@@ -17,6 +17,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
     name: 'SignalMenu',
@@ -240,8 +241,8 @@ export default {
             };
         },
         initMenu() {
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
-            this.menu = this.menuNormal.Center;
+            this.menu = MenuContextHandler.covert2(this.menuNormal);
+            // this.menu = this.menuNormal.Center;
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
diff --git a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
index 8d9587e64..308891ef0 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
@@ -24,6 +24,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
     name: 'SwitchMenu',
@@ -192,8 +193,7 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
-            this.menu = this.menuNormal.Center;
+            this.menu = MenuContextHandler.covert2(this.menuNormal);
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 if (!this.$store.state.scriptRecord.bgSet) {
diff --git a/src/views/newMap/displayNew/demon/payPage.vue b/src/views/newMap/displayNew/demon/payPage.vue
index 8f1acf740..9c401e9f8 100644
--- a/src/views/newMap/displayNew/demon/payPage.vue
+++ b/src/views/newMap/displayNew/demon/payPage.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="购买详情"
+    title="订单"
     :visible.sync="dialogVisible"
     width="30%"
     center
@@ -42,7 +42,7 @@
             element-loading-background="rgba(255, 255, 255, 0.9)"
           />
         </div>
-        <div v-if="paySuccess" style="position: relative; top: -50px;color: #0B840B;z-index: 8888;font-size: 18px;text-align: center;width: 150px;">
+        <div v-if="paySuccess" style="position: relative; top: -50px;color: #0B840B;z-index: 8888;font-size: 18px;text-align: center;width: 150px;font-weight: bold;">
           <div>订单支付成功!</div>
           <div>{{ `将在${countdown}后自动关闭` }}</div>
         </div>
@@ -73,8 +73,9 @@ export default {
     },
     watch: {
         '$store.state.socket.payOrder':function (val) {
-            if (this.payOrder === val) {
+            if (this.orderCode == val) {
                 this.paySuccess = true;
+                this.loading = true;
                 this.url = '';
                 this.timer = setInterval(() => {
                     this.countdown--;
diff --git a/src/views/newMap/displayNew/demonMenu.vue b/src/views/newMap/displayNew/demonMenu.vue
index 1b99abcfe..53143e38d 100644
--- a/src/views/newMap/displayNew/demonMenu.vue
+++ b/src/views/newMap/displayNew/demonMenu.vue
@@ -26,7 +26,6 @@
         <el-button v-if="messageBoard" size="small" @click="messageBoardShow">留言板</el-button>
         <!-- v-if="isContest"  -->
         <el-button v-if="!isLocal" size="small" @click="contectUs">联系方式</el-button>
-        <!--<el-button size="small" @click="goToPay">购买</el-button>-->
       </el-button-group>
     </div>
     <Jl3d-Device
@@ -40,7 +39,6 @@
     <scheduling v-if="scheduleLoadShow" ref="scheduling" :group="group" />
     <scheduling-view v-if="schedulePreviewShow" ref="schedulingView" :group="group" />
     <contect-us ref="contectUs" />
-    <pay-page ref="payPage" />
   </div>
 </template>
 <script>
@@ -50,7 +48,6 @@ import { getToken } from '@/utils/auth';
 import { getSessionStorage } from '@/utils/auth';
 import Scheduling from '@/views/newMap/displayNew/demon/scheduling';
 import SchedulingView from '@/views/newMap/displayNew/demon/schedulingView';
-import PayPage from '@/views/newMap/displayNew/demon/payPage';
 import { EventBus } from '@/scripts/event-bus';
 import ContectUs from '@/views/newMap/displayNew/dispatherContest/contectUs';
 import { getPostByProjectCode } from '@/api/learn';
@@ -62,8 +59,7 @@ export default {
         Jl3dDrive,
         Scheduling,
         SchedulingView,
-        ContectUs,
-        PayPage
+        ContectUs
     },
     props:{
         isAllShow:{
@@ -293,10 +289,8 @@ export default {
         },
         contectUs() {
             this.$refs.contectUs.doShow();
-        },
-        goToPay() {
-            this.$refs.payPage.doShow();
         }
+
     }
 };
 </script>
diff --git a/src/views/newMap/displayNew/dispatherContest/index.vue b/src/views/newMap/displayNew/dispatherContest/index.vue
index 43184651e..2c5fba104 100644
--- a/src/views/newMap/displayNew/dispatherContest/index.vue
+++ b/src/views/newMap/displayNew/dispatherContest/index.vue
@@ -61,7 +61,7 @@
       @switchMode="switchMode" -->
 
     <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
-    <scene-list ref="sceneList" @selectScript="selectScript" />
+    <scene-list ref="sceneList" @selectScript="selectScript" @goToPay="goToPay" />
     <theory-exam-select ref="theoryExamSelect" @startTheoryExam="startTheoryExam" />
     <theory-exam ref="theoryExam" />
     <select-role ref="selectRole" :member-list="currentPlayList" @selectRole="selectRole" />
@@ -69,6 +69,7 @@
     <operational-statistic ref="operationalStatistic" @finishTraining="finishTraining" />
 
     <test-result ref="testResult" />
+    <pay-page ref="payPage" />
 
   </div>
 
@@ -83,6 +84,7 @@ import SceneList from './sceneList';
 import MenuSchema from '@/views/newMap/displayNew/menuSchema';
 import TheoryExamSelect from './theoryExamSelect';
 import TheoryExam from './theoryExam';
+import PayPage from '@/views/newMap/displayNew/demon/payPage';
 // import { getGoodsTryUse } from '@/api/management/goods';
 import {clearSimulation, getSimulationInfoNew } from '@/api/simulation';
 // import { PermissionType } from '@/scripts/ConstDic';
@@ -111,7 +113,8 @@ export default {
         TheoryExam,
         OperationalStatistic,
         TestResult,
-        SelectRole
+        SelectRole,
+        PayPage
     },
     props: {
         offset: {
@@ -492,6 +495,9 @@ export default {
             getEmptyOperationalStatistics(this.group).then(res=>{
                 this.$refs.operationalStatistic.doShow(res.data);
             });
+        },
+        goToPay() {
+            this.$refs.payPage.doShow();
         }
     }
 };
diff --git a/src/views/newMap/displayNew/dispatherContest/sceneList.vue b/src/views/newMap/displayNew/dispatherContest/sceneList.vue
index 7dd2d8128..a11e183a2 100644
--- a/src/views/newMap/displayNew/dispatherContest/sceneList.vue
+++ b/src/views/newMap/displayNew/dispatherContest/sceneList.vue
@@ -3,7 +3,14 @@
     <el-dialog v-dialogDrag title="场景列表" :visible.sync="dialogVisible" width="920px" center>
       <el-tabs v-model="activeName" type="card" style="height:550px">
         <el-tab-pane label="主场景列表" name="first">
-          <div v-if="!hasPermission" style="margin-bottom: 10px;color: #f00;width: 100%;text-align: center;">尊敬的用户,您好：由于您暂无场景权限，现仅提供场景1试用，如需使用其他场景请通过左上角‘菜单=》联系方式’联系我们开放权限！</div>
+          <div v-if="!hasPermission" style="margin-bottom: 10px;color: #f00;width: 100%;text-align: center;">
+            尊敬的用户，您好：由于您暂无场景权限，现仅提供场景1试用，如需使用其他场景请
+            <el-button type="text" style="text-decoration: underline" @click="goToPay">购买权限</el-button>
+          </div>
+          <div v-if="permisson.endTime" style="margin-bottom: 10px;color: #f00;width: 100%;text-align: center;">
+            {{ `您的场景权限截止时间：${permisson.endTime || '永久'}。` }}
+            <el-button type="text" style="text-decoration: underline" @click="goToPay">立即续费</el-button>
+          </div>
           <el-table :data="mainSceneData" border :span-method="objectSpanMethod" height="465" stripe :cell-style="{padding: '8px 0'}">
             <el-table-column type="index" width="50" label="序号" />
             <el-table-column prop="type" width="200" label="类别" />
@@ -37,6 +44,7 @@ export default {
             dialogVisible: false,
             selectMapId:'',
             hasPermission: false,
+            permisson: {},
             form: {
                 type: ''
             },
@@ -102,8 +110,10 @@ export default {
             this.dialogVisible = false;
         },
         queryPermission() {
+            this.permisson = {};
             queryCompetitionPracticalPermissions({mapId:this.$route.query.mapId}).then(res => {
                 this.hasPermission = !!res.data;
+                if (res.data) { this.permisson = res.data; }
             }).catch(() => {
                 this.$message.error('获取场景权限异常！');
             });
@@ -203,6 +213,10 @@ export default {
             this.$emit('selectScript', {playerList:playerList, mapLocation:this.mapLocation});
             this.doClose();
         },
+        goToPay() {
+            this.$emit('goToPay');
+            this.doClose();
+        },
         objectSpanMethod({ row, column, rowIndex, columnIndex }) {
             if (rowIndex === 1 && columnIndex === 1) {
                 return {