From 216e8f0f1994580aaf4e6cf097f682de6a717e0f Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 29 Jan 2021 16:15:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E8=B5=9B=E8=B4=AD=E4=B9=B0=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayNew/demon/payPage.vue              | 7 ++++---
 src/views/newMap/displayNew/dispatherContest/sceneList.vue | 7 +++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

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/dispatherContest/sceneList.vue b/src/views/newMap/displayNew/dispatherContest/sceneList.vue
index 61ce42728..12e871304 100644
--- a/src/views/newMap/displayNew/dispatherContest/sceneList.vue
+++ b/src/views/newMap/displayNew/dispatherContest/sceneList.vue
@@ -7,6 +7,10 @@
             尊敬的用户，您好：由于您暂无场景权限，现仅提供场景1试用，如需使用其他场景请
             <el-button type="text" style="text-decoration: underline" @click="goToPay">购买权限</el-button>
           </div>
+          <div v-else style="margin-bottom: 10px;color: #f00;width: 100%;text-align: center;">
+            {{ `您的场景权限截止日期：${permisson.endTime || '永久'}。` }}
+            <el-button v-if="permisson.endTime" 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="类别" />
@@ -40,6 +44,7 @@ export default {
             dialogVisible: false,
             selectMapId:'',
             hasPermission: false,
+            permisson: {},
             form: {
                 type: ''
             },
@@ -105,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('获取场景权限异常！');
             });