1. 调整滚动条大小

.env.staging

@@ -10,7 +10,7 @@ ENV = 'staging'
 VUE_APP_BASE_API = '/scenicstage-api'
 
 # 开发环境文件上传
-VUE_APP_UPLOAD_FILE_API = 'http://fileupload.dev.dazesoft.cn'
+VUE_APP_UPLOAD_FILE_API = 'https://fileupload.dev.dazesoft.cn'
 
 # 大屏地址
 VUE_APP_DIG_DATA_URL = 'https://greatbigdata.dev.dazesoft.cn'

src/App.vue

@@ -26,18 +26,20 @@ export default {
   display: none;
 }
 // 滚动条样式
-// ::v-deep .el-table__body-wrapper::-webkit-scrollbar {
-//   width: 10px !important;
-// }
+::v-deep .el-table__body-wrapper::-webkit-scrollbar {
+  width: 15x !important;
+  height: 15px !important;
+}
 // ::v-deep .el-table__body-wrapper::-webkit-scrollbar-track {
 //   background-color: #063570;
 // }
-// ::v-deep .el-table__body-wrapper::-webkit-scrollbar {
-//   width: 10px;
-//   opacity: 0.5;
-// }
-// ::v-deep .el-table__body-wrapper::-webkit-scrollbar-thumb {
-//   border-radius: 15px;
-//   background-color: #0257aa;
-// }
+::v-deep .el-table__body-wrapper::-webkit-scrollbar {
+  width: 15px;
+  height: 15px;
+  opacity: 0.5;
+}
+::v-deep .el-table__body-wrapper::-webkit-scrollbar-thumb {
+  border-radius: 15px;
+  //background-color: #0257aa;
+}
 </style>

src/views/statisticalReport/sessionInventory.vue

@@ -30,7 +30,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table ref="tables" v-loading="loading" :data="dataList" border>
+    <el-table ref="tables" v-loading="loading" :data="dataList" border show-summary>
       <el-table-column label="序号" align="center" type="index" width="60"></el-table-column>
       <el-table-column label="日期" align="center" prop="performDate" />
       <el-table-column label="场次" align="center">
@@ -38,11 +38,7 @@
           <span>{{ scope.row.performTimeStart }} -- {{ scope.row.performTimeEnd }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="座位可售总数" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.total }}张</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="座位可售总数(张)" align="center" prop="total" />
       <el-table-column label="自营渠道" align="center">
         <el-table-column
           prop="microAppTotal"

src/views/windowTicketSales/model/increaseViewersNew.vue

@@ -215,6 +215,7 @@
                     payStatus==7 ? '用户支付失败或未支付,请重新连接支付!!!' :
                     payStatus==8 ? '用户支付成功,请点击打印票!!!' :
                     payStatus==9 ? '支付超时!!!' :
+                    payStatus==10 ? '订单已关闭，请重新选择座位，再购买!!!' :
                     payStatus==3 ? '现金支付记录入库失败,请重新提交' : '未知状态' }}
                 </span>
                 <!-- 重新生成订单 1  -->
@@ -243,6 +244,11 @@
                     <!-- <el-button @click="print" type="danger">取消支付</el-button> -->
                     <el-button @click="orderInfoSubmitFun()" type="primary">重新扫码</el-button>
                 </div>
+                <!-- 订单被关闭 10  -->
+                <div v-if="payStatus==10">
+                    <!-- <el-button @click="print" type="danger">取消支付</el-button> -->
+                    <el-button @click="handleClose()" type="primary">关闭</el-button>
+                </div>
             </div>
         </div>
     </div>
@@ -908,9 +914,15 @@ import {
                                 this.loading = false
                                 this.payStatus = 3
                             }else {
-                                this.$message.error('用户未支付!!!');
-                                this.loading = false
-                                this.payStatus = 7
+                                if(res.data.orderStatus == 9){
+                                    this.$message.error('订单已关闭，请重新选择座位，再购买!!!');
+                                    this.loading = false
+                                    this.payStatus = 10
+                                }else {
+                                    this.$message.error('用户未支付!!!');
+                                    this.loading = false
+                                    this.payStatus = 7
+                                }
                             }
                             
                         }else if(res.data.payStatus == 1) {
@@ -951,9 +963,15 @@ import {
                                 this.loading = false
                                 this.payStatus = 3
                             }else {
-                                this.$message.error('用户支付失败!!!');
-                                this.loading = false
-                                this.payStatus = 7
+                                if(res.data.orderStatus == 9){
+                                    this.$message.error('订单已关闭，请重新选择座位，再购买!!!');
+                                    this.loading = false
+                                    this.payStatus = 10
+                                }else {
+                                    this.$message.error('用户支付失败!!!');
+                                    this.loading = false
+                                    this.payStatus = 7
+                                }
                             }
                         }else if(res.data.payStatus == 4) {
                             if(this.payTime){
@@ -965,9 +983,15 @@ import {
                                 this.loading = false
                                 this.payStatus = 3
                             }else {
-                                this.$message.error('支付退款!!!');
-                                this.loading = false
-                                this.payStatus = 7
+                                if(res.data.orderStatus == 9){
+                                    this.$message.error('订单已关闭，请重新选择座位，再购买!!!');
+                                    this.loading = false
+                                    this.payStatus = 10
+                                }else {
+                                    this.$message.error('支付退款!!!');
+                                    this.loading = false
+                                    this.payStatus = 7
+                                }
                             }
                             
                         }

src/views/windowTicketSales/ticketingSales.vue

@@ -1080,7 +1080,19 @@
         font-size: 24px;
     }
   }
-
+  .dialog::-webkit-scrollbar {
+            width: 10x !important;
+            height: 10px !important;
+    }
+    .dialog::-webkit-scrollbar {
+        width: 10px;
+        height: 10px;
+        opacity: 0.5;
+    }
+    .dialog::-webkit-scrollbar-thumb {
+        border-radius: 15px;
+        //background-color: #0257aa;
+    }
   #moveSelected{
     position:absolute;
     background-color: blue;