Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Hotel/roomQuery.vue

@@ -167,8 +167,9 @@
                       class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;">
                       {{childItem.NewHotelName}}
                       <span class="colorE95252">
-                        <template v-if="childItem.OPState==1">[OP选房-OK]</template>
-                        <template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[未操作]":"[暂定]")}}
+                        <template v-if="childItem.OPState==1">[OP-OK]</template>
+                        <template v-else-if="childItem.OPState==2&&childItem.DMCState==0">[OP-暂定]</template>
+                        <template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[地接-未操作]":"[地接-暂定]")}}
                         </template>
                       </span>
                     </p>

src/components/Supplier/HotelQueryList.vue

@@ -89,7 +89,7 @@
         <el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading' :height="tableHeight">
           <el-table-column fixed label="酒店名称" min-width="180">
             <template slot-scope="scope">
-              <div style="text-decoration: underline;cursor:pointer">
+              <div>
                 {{scope.row.HotelName}}</div>
               <div>{{scope.row.TotalInventory}}</div>
               <input type="button" class="normalBtn" style="margin-left:0;height:22px;padding:0 10px;" @click="getLogsList(scope.row.HotelId)" value="操作日志"/>
@@ -116,7 +116,7 @@
                   <div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div>
                 </template>
               </div>
-              <div class="Hotel_kong Com_hoteldiv Hq_duoge"
+              <div class="Hotel_kong Com_hoteldiv"
                 >
                 {{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}}
               </div>
@@ -653,11 +653,6 @@
 </script>
 
 <style>
-  .Hq_duoge {
-    cursor: pointer;
-    text-decoration: underline;
-  }
-
   .HqCom_bottom .ql-container {
     min-height: 100px;
   }

src/components/Supplier/roomQuery.vue

@@ -148,9 +148,9 @@
               <td>
                 <span style="color:red;">
                   <template v-if="childItem.SupplierId==UserInfo.SupplierId">
-                  <template v-if="childItem.OPState==1">[OP选房-OK]</template>
-                  <template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[未操作]":"[暂定]")}}
-                  </template>
+                    <template v-if="childItem.OPState==1">[OP选房-OK]</template>
+                    <template v-else-if="childItem.OPState==2&&childItem.DMCState==0">[OP-暂定]</template>
+                    <template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[地接-未操作]":"[地接-暂定]")}}</template>
                   </template>
                 </span>
               </td>

src/components/SupplierIndex.vue

@@ -4,7 +4,7 @@
       <div class="nav-left">
         <img class="GroupPic" src="../assets/img/daxiang.png" />
       </div>
-      <div class="nav-middle">
+      <div class="nav-middle SupplierIndex_Nav">
         <ul class="clearfix" :style="{width:`${allWindowWidth}px`}">
           <li v-for="(item,index) in menuList" v-if="item.URL!=''" :class="{active:item.Id==chosenIndex}"
             @click="goUrl(item.URL,item.Id,index)">
@@ -136,7 +136,7 @@
 
           <div style="width: 100%;min-height:200px;  overflow-x: auto;padding:0 20px; " class="HotelQueryList"
             v-loading="loading">
-            <div class="hotelProductManage2_tableBox">
+            <div style="margin:20px 0">
               <span style="color:#fff;background-color: #ff3737;padding:2px 4px;border-radius:5px">红日</span>
               <span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">旺季</span>
               <span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">平季</span>
@@ -148,7 +148,7 @@
                 :height="tableHeight">
                 <el-table-column fixed label="酒店名称" min-width="180">
                   <template slot-scope="scope">
-                    <div style="text-decoration: underline;cursor:pointer">
+                    <div>
                       {{scope.row.HotelName}}</div>
                     <div>{{scope.row.TotalInventory}}</div>
                   </template>
@@ -175,7 +175,7 @@
                         <div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div>
                       </template>
                     </div>
-                    <div class="Hotel_kong Com_hoteldiv Hq_duoge">
+                    <div class="Hotel_kong Com_hoteldiv">
                       {{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}}
                     </div>
                     <div class="Hotel_kong Com_hoteldiv">
@@ -907,7 +907,9 @@
     float: left;
     z-index: 2019128;
   }
-
+  .SupplierIndex_Nav ul li{
+    margin-left:20px;
+  }
   .nav-middle ul li i {
     font-size: 16px;
     color: #a6adb4;
@@ -1058,12 +1060,6 @@
     top: 50px !important;
   }
 
-
-  .Hq_duoge {
-    cursor: pointer;
-    text-decoration: underline;
-  }
-
   .HqCom_bottom .ql-container {
     min-height: 100px;
   }

src/components/SupplierLogin.vue

@@ -34,7 +34,7 @@
   .Supplier_Login .login_back{
     position: absolute!important;
     width:100%;
-    height:50%;
+    height:60%;
     top:0;
     left:0;
   }
@@ -119,8 +119,8 @@
     },
     mounted() {
       new Particle(document.querySelector('.login_back'),{
-          dotColor: '#031940',
-          lineColor: '#031940'
+          dotColor: '#19294C',
+          lineColor: '#19294C'
       })
       this.init();
       let that = this;