Browse Source

1. 优化

MONSTER-ygh 11 months ago
parent
commit
82cdc1c225

+ 41 - 18
src/views/officesale/ticketingSales.vue

@@ -123,7 +123,7 @@
                             >
                                 <div 
                                 class="seat-item-class" 
-                                :class="item.occupyStatus==0?item.occupyStatus==0&&item.isSelect?'occupy-status-select occupy-status':'occupy-status': item.occupyStatus==1?'occupy-status-no':item.isDisabled || item.status != 1 ? 'disabled-class' : item.isSelect ? 'select-class' : ''"
+                                :class="item.occupyStatus==0?item.occupyOrderId?'order-occupy-status':item.occupyStatus==0&&item.isSelect?'occupy-status-select occupy-status':'occupy-status': item.occupyStatus==1?'occupy-status-no':item.isDisabled || item.status != 1 ? 'disabled-class' : item.isSelect ? 'select-class' : ''"
                                 v-for="(item, index) in seatMapList[item1.key]" 
                                 :style="{backgroundColor: item.color ? item.color : 'none'}"
                                 @click.stop="seatClick(item)" 
@@ -412,7 +412,7 @@
                     listNum[index]['num'] = 0 
                 })
                 list.forEach(item => {
-                    item.isDisabled = item.occupyStatus == 1 ? true : false //(item.occupyStatus != null && (item.occupyStatus == 0 || item.occupyStatus == 1) ? true : false); // 座位是否已被选择
+                    item.isDisabled = item.occupyStatus == 1 || (item.occupyStatus==0 && item.occupyOrderId) ? true : false //(item.occupyStatus != null && (item.occupyStatus == 0 || item.occupyStatus == 1) ? true : false); // 座位是否已被选择
                     item.isSelect = this.setIsSelect(item);
                     if(item.rowNo){
                         listNum.forEach((item1,index)=>{
@@ -925,6 +925,8 @@
        // color: #eceaea !important;
        position: relative;
       }
+
+      /** 手动锁定  */
       .occupy-status:after{
         content:"";
         display:block;
@@ -944,9 +946,30 @@
       .occupy-status {
         //pointer-events: none;
       }
+      /**  锁定被选择  */
       .occupy-status-select {
         border: 5px solid #ff182f !important;
       }
+      /** 订单待支付锁定 */
+      .order-occupy-status {
+
+      }
+      .order-occupy-status:after{
+        content:"";
+        display:block;
+        position:absolute;
+        top:0;
+        left:0;
+        width:100%;
+        height:100%;
+        background-color:rgba(0,0,0,0.3);
+        z-index:-1;
+        background-image: url('../../assets/jinzhi.png');
+        background-size: 50% 50%;
+        background-position: 50% 50%;
+        background-repeat: no-repeat;
+        z-index: 99;
+    }
       .occupy-status-no {
         background-color: #f56c6c !important;
         user-select: none;
@@ -954,22 +977,22 @@
         cursor: not-allowed !important;
         position: relative;
       }
-    //   .occupy-status-no:after{
-    //         content:"";
-    //         display:block;
-    //         position:absolute;
-    //         top:0;
-    //         left:0;
-    //         width:100%;
-    //         height:100%;
-    //         background-color:rgba(0,0,0,0.3);
-    //         z-index:-1;
-    //         background-image: url('../../assets/jinzhi.png');
-    //         background-size: 50% 50%;
-    //         background-position: 50% 50%;
-    //         background-repeat: no-repeat;
-    //         z-index: 99;
-    //     }
+        /* .occupy-status-no:after{
+            content:"";
+            display:block;
+            position:absolute;
+            top:0;
+            left:0;
+            width:100%;
+            height:100%;
+            background-color:rgba(0,0,0,0.3);
+            z-index:-1;
+            background-image: url('../../assets/jinzhi_1.png');
+            background-size: 50% 50%;
+            background-position: 50% 50%;
+            background-repeat: no-repeat;
+            z-index: 99;
+        } */
       .seat-item-class-box {
         width: 100%;
         display: flex;

+ 23 - 2
src/views/order/groupBuyingMr/dialog/details.vue

@@ -414,7 +414,9 @@ export default {
     setSeatClass(item){
       let srt =
       this.setIsSelect(item)?'purchased-status':
-      item.occupyStatus == 0 ? 'occupy-status' : 
+      item.occupyStatus == 0 ? 
+      item.occupyOrderId?'order-occupy-status':
+      'occupy-status' : 
       item.occupyStatus == 1 ? 'occupy-status-no' : 
       item.isDisabled || item.status != 1 ? 'disabled-class' : 
       item.isSelect ? 'select-class' : ''
@@ -697,7 +699,7 @@ export default {
         height: 100%;
         background-color: rgba(0, 0, 0, 0.3);
         z-index: -1;
-        background-image: url('../../../../assets/jinzhi.png');
+        background-image: url('../../../../assets/jinzhi_1.png');
         background-size: 50% 50%;
         background-position: 50% 50%;
         background-repeat: no-repeat;
@@ -707,7 +709,26 @@ export default {
       .occupy-status {
         //pointer-events: none;
       }
+      /** 订单待支付锁定 */
+      .order-occupy-status {
 
+      }
+      .order-occupy-status:after{
+        content:"";
+        display:block;
+        position:absolute;
+        top:0;
+        left:0;
+        width:100%;
+        height:100%;
+        background-color:rgba(0,0,0,0.3);
+        z-index:-1;
+        background-image: url('../../../../assets/jinzhi.png');
+        background-size: 50% 50%;
+        background-position: 50% 50%;
+        background-repeat: no-repeat;
+        z-index: 99;
+      }
       .occupy-status-no {
         background-color: #f56c6c !important;
         user-select: none;

+ 23 - 2
src/views/order/orderMr/dialog/details.vue

@@ -367,7 +367,9 @@ export default {
     setSeatClass(item){
       let srt =
       this.setIsSelect(item)?'purchased-status':
-      item.occupyStatus == 0 ? 'occupy-status' : 
+      item.occupyStatus == 0 ? 
+      item.occupyOrderId?'order-occupy-status':
+      'occupy-status' : 
       item.occupyStatus == 1 ? 'occupy-status-no' : 
       item.isDisabled || item.status != 1 ? 'disabled-class' : 
       item.isSelect ? 'select-class' : ''
@@ -646,7 +648,7 @@ export default {
         height: 100%;
         background-color: rgba(0, 0, 0, 0.3);
         z-index: -1;
-        background-image: url('../../../../assets/jinzhi.png');
+        background-image: url('../../../../assets/jinzhi_1.png');
         background-size: 50% 50%;
         background-position: 50% 50%;
         background-repeat: no-repeat;
@@ -656,7 +658,26 @@ export default {
       .occupy-status {
         //pointer-events: none;
       }
+      /** 订单待支付锁定 */
+      .order-occupy-status {
 
+      }
+      .order-occupy-status:after{
+        content:"";
+        display:block;
+        position:absolute;
+        top:0;
+        left:0;
+        width:100%;
+        height:100%;
+        background-color:rgba(0,0,0,0.3);
+        z-index:-1;
+        background-image: url('../../../../assets/jinzhi.png');
+        background-size: 50% 50%;
+        background-position: 50% 50%;
+        background-repeat: no-repeat;
+        z-index: 99;
+      }
       .occupy-status-no {
         background-color: #f56c6c !important;
         user-select: none;

+ 24 - 2
src/views/team/applicationMr/dialog/applicationDetails.vue

@@ -704,7 +704,9 @@ export default {
      /** 座位状态 展示  */
      setSeatClass(item){
       let srt =
-      item.occupyStatus == 0 ? 'occupy-status' : 
+      item.occupyStatus == 0 ? 
+      item.occupyOrderId?'order-occupy-status':
+      'occupy-status' : 
       item.occupyStatus == 1 ? 'occupy-status-no' : 
       item.isDisabled || item.status != 1 ? 'disabled-class' : 
       item.isSelect ? 'select-class' : 
@@ -973,7 +975,7 @@ export default {
         height:100%;
         background-color:rgba(0,0,0,0.3);
         z-index:-1;
-        background-image: url('../../../../assets/jinzhi.png');
+        background-image: url('../../../../assets/jinzhi_1.png');
         background-size: 50% 50%;
         background-position: 50% 50%;
         background-repeat: no-repeat;
@@ -982,6 +984,26 @@ export default {
       .occupy-status {
         //pointer-events: none;
       }
+      /** 订单待支付锁定 */
+      .order-occupy-status {
+
+        }
+        .order-occupy-status:after{
+          content:"";
+          display:block;
+          position:absolute;
+          top:0;
+          left:0;
+          width:100%;
+          height:100%;
+          background-color:rgba(0,0,0,0.3);
+          z-index:-1;
+          background-image: url('../../../../assets/jinzhi.png');
+          background-size: 50% 50%;
+          background-position: 50% 50%;
+          background-repeat: no-repeat;
+          z-index: 99;
+        }
       .occupy-status-no {
         background-color: #f56c6c !important;
         user-select: none;

+ 26 - 3
src/views/windowTicketSales/ticketingSales.vue

@@ -123,7 +123,7 @@
                             >
                                 <div 
                                 class="seat-item-class" 
-                                :class="item.occupyStatus==0?item.occupyStatus==0&&item.isSelect?'occupy-status-select occupy-status':'occupy-status': item.occupyStatus==1?'occupy-status-no':item.isDisabled || item.status != 1 ? 'disabled-class' : item.isSelect ? 'select-class' : ''"
+                                :class="item.occupyStatus==0?item.occupyOrderId?'order-occupy-status':item.occupyStatus==0&&item.isSelect?'occupy-status-select occupy-status':'occupy-status': item.occupyStatus==1?'occupy-status-no':item.isDisabled || item.status != 1 ? 'disabled-class' : item.isSelect ? 'select-class' : ''"
                                 v-for="(item, index) in seatMapList[item1.key]" 
                                 :style="{backgroundColor: item.color ? item.color : 'none'}"
                                 @click.stop="seatClick(item)" 
@@ -412,7 +412,7 @@
                     listNum[index]['num'] = 0 
                 })
                 list.forEach(item => {
-                    item.isDisabled = item.occupyStatus == 1 ? true : false //(item.occupyStatus != null && (item.occupyStatus == 0 || item.occupyStatus == 1) ? true : false); // 座位是否已被选择
+                    item.isDisabled = item.occupyStatus == 1 || (item.occupyStatus==0 && item.occupyOrderId) ? true : false //(item.occupyStatus != null && (item.occupyStatus == 0 || item.occupyStatus == 1) ? true : false); // 座位是否已被选择
                     item.isSelect = this.setIsSelect(item);
                     if(item.rowNo){
                         listNum.forEach((item1,index)=>{
@@ -925,6 +925,8 @@
        // color: #eceaea !important;
        position: relative;
       }
+
+      /** 手动锁定  */
       .occupy-status:after{
         content:"";
         display:block;
@@ -935,7 +937,7 @@
         height:100%;
         background-color:rgba(0,0,0,0.3);
         z-index:-1;
-        background-image: url('../../assets/jinzhi.png');
+        background-image: url('../../assets/jinzhi_1.png');
         background-size: 50% 50%;
         background-position: 50% 50%;
         background-repeat: no-repeat;
@@ -944,9 +946,30 @@
       .occupy-status {
         //pointer-events: none;
       }
+      /**  锁定被选择  */
       .occupy-status-select {
         border: 5px solid #ff182f !important;
       }
+      /** 订单待支付锁定 */
+      .order-occupy-status {
+
+      }
+      .order-occupy-status:after{
+        content:"";
+        display:block;
+        position:absolute;
+        top:0;
+        left:0;
+        width:100%;
+        height:100%;
+        background-color:rgba(0,0,0,0.3);
+        z-index:-1;
+        background-image: url('../../assets/jinzhi.png');
+        background-size: 50% 50%;
+        background-position: 50% 50%;
+        background-repeat: no-repeat;
+        z-index: 99;
+    }
       .occupy-status-no {
         background-color: #f56c6c !important;
         user-select: none;