合并代码

src/App.vue

@@ -117,6 +117,11 @@ export default {
         path: '/login'
       })
     }else{
+      if(document.URL.indexOf("clientConfirm")!=-1){
+          localStorage.openMode=0
+      }else{
+        
+      }
       this.timekeeper()
       this.listeneruser()
     }

src/components/SalesModule/groupTourOrder.vue

@@ -1820,8 +1820,8 @@
                     </span>
 
               </div>
-              <span v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" style="display:none">领取合同</span>
-              <span v-else class="GO_Contract" @click="goContract(item)" style="display:none">{{item.contractNum}}</span>
+              <span v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" >领取合同</span>
+              <span v-else class="GO_Contract" @click="goContract(item)">{{item.contractNum}}</span>
             </td>
           </tr>
           <tr>
@@ -3827,6 +3827,7 @@
               this.loading = false
               this.total = res.data.data.count
               this.list = res.data.data.pageData;
+              console.log(this.list,'list');
             } else {
               this.$message.error(res.data.message)
             }

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2142,8 +2142,8 @@
                     <span @click="gourlTip('FinancialDocumentsDetail',id)" style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in item.tipFrId" :key="i">{{id}}</span>
 
                     </span>
-                    <div v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" style="display:none">领取合同</div>
-                    <div v-else class="GO_Contract" @click="goContract(item)" style="display:none">{{item.contractNum}}</div>
+                    <div v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" style="display:none;">领取合同</div>
+                    <div v-else class="GO_Contract" @click="goContract(item)" style="display:none;">{{item.contractNum}}</div>
               </div>
 
               </td>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1777,8 +1777,8 @@
               <!--                <span>暂无名单</span>-->
               <!--              </p>-->
               <span>房间信息：{{item.OrderGuestHouseStr}}</span>
-              <span v-if="item.ContractNum==''" class="GO_Contract" @click="goContract(item)" style="display:none">领取合同</span>
-              <span v-else class="GO_Contract" @click="goContract(item)" style="display:none">{{item.ContractNum}}</span>
+              <span v-if="item.ContractNum==''" class="GO_Contract" @click="goContract(item)">领取合同</span>
+              <span v-else class="GO_Contract" @click="goContract(item)">{{item.ContractNum}}</span>
             </td>
           </tr>
           <tr>
@@ -2094,8 +2094,8 @@
                     <span>单据：</span>
                     <span @click="gourlTip('FinancialDocumentsDetail',id)" style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in childItem.TipFrId" :key="i">{{id}}</span>
                     </span>
-                    <span v-if="childItem.ContractNum==''" class="GO_Contract" @click="goContract(childItem)" style="display:none">领取合同</span>
-                    <span v-else class="GO_Contract" @click="goContract(childItem)" style="display:none">{{childItem.ContractNum}}</span>
+                    <span v-if="childItem.ContractNum==''" class="GO_Contract" @click="goContract(childItem)">领取合同</span>
+                    <span v-else class="GO_Contract" @click="goContract(childItem)">{{childItem.ContractNum}}</span>
               </div>
               </td>
             </tr>

src/components/clientConfirm.vue

@@ -27,7 +27,7 @@
 .dic_content .item_content .title {width:100%;text-align:center;margin-top:20px;}
 .dic_content .item_content>label {width:100%;text-align:left;font-weight:bold;background-color:#F2F2F2;margin:30px 0;padding:8px 0;text-indent:20px;display:inline-block;font-size:16px;}
 .dic_content .item_content>span{font-size:13px;line-height:26px;margin-left:10px;}
-.dic_content .item_content .content_table {border:0;margin-top:10px;width:100%;}
+.dic_content .item_content .content_table {border:1px solid #d1d1d1;margin-top:10px;width:100%;}
 .dic_content .item_content .content_table th {background-color:#F2F2F2;}
 .dic_content .item_content .content_table th,.dic_content .item_content .content_table th td {border:1px solid #808080;text-align:center;padding:10px;}
 .dic_content .item_content font {color:blue;display:inline-block;padding:0 10px; font-size: 13px;}
@@ -58,7 +58,7 @@
 .dic_content .zhangOne{position:absolute;width:200px;top:-83px;left:160px;}
 .dic_content .zhangTwo{position:absolute;width:200px;top:-60px;left:80px;}
 .dic_content .comonTb td{padding:15px 0;}
-.dic_content .remindInfo{position:absolute;top:42%;left:25%;font-size:60px;color:#FF7F7F;letter-spacing:20px;}
+.dic_content .remindInfo{position:absolute;top:42%;left:35%;font-size:60px;color:#FF7F7F;letter-spacing:20px;}
 .dic_content .signName{position:relative;top:10px;width:140px;}
 .dic_content .LRTB td:nth-child(odd){text-align:right;padding-right:20px;}
 .dic_content .LRTB td:nth-child(even){text-align:left;padding-left:20px;}
@@ -69,7 +69,7 @@
 #canvas {
   width: 100%;
   height: 100%;
-  position: relative;
+  /* position: relative; */
 }
 #canvas canvas {
   display: block;
@@ -90,9 +90,9 @@
 }
 .CV_Btn{
     color: #fff;
-    padding: 0 15px;
-    height: 30px;
+    padding: 10px 30px;
     background: #E95252;
+    font-size:30px;
     border: 1px solid #E95252;
     cursor: pointer;
     border-radius: 15px;
@@ -106,7 +106,9 @@
 }
 .CliConfirmBtn{
     color: #fff;
-    height: 30px;
+    height: 60px;
+    width:150px;
+    font-size:27px;
     background: #E95252;
     border: 1px solid #E95252;
     border-radius: 15px;
@@ -747,7 +749,7 @@
                 </div>
             </div>
         </div>
-        <div class="CliSignDiv" :class="dialogVisible?'isShowSign':''">
+        <div class="CliSignDiv" :class="dialogVisible?'isShowSign':''" @touchmove.prevent>
             <div id="canvas">
             </div>
             <div style="text-align:center;margin-top:20px;">
@@ -783,7 +785,7 @@
     methods: {
      //获取数据
       getList(){
-        this.apiJavaPost("/api/contract/getContractInfoForCode",this.msg,res => {
+        this.apiJavaPost("/api/contract/getContractInfo",this.msg,res => {
             console.log(res,'resss');
             if (res.data.resultCode === 1) {
                   this.dataList = res.data.data;
@@ -898,7 +900,7 @@
         this.msg.orderID = this.$route.query.orderID;
         var h = window.screen.height;
         var cHeight=document.getElementsByClassName("CliSignDiv")[0];
-        cHeight.style.height=600+'px';
+        cHeight.style.height=700+'px';
         this.getList();
         this.getCanvas();
     }

src/components/public/leftNav.vue

@@ -202,11 +202,28 @@
         })
       },
       goUrl(path) {
-        this.$router.push({
-          path: path
-        })
-      },
-    },
+        if(path=='/JapanHotel'){
+            let userInfo = this.getLocalStorage();
+            let msg = {
+              id:userInfo.EmployeeId
+            }
+            this.apipost("sellorder_post_GetDesEncrypt",msg,res => {
+              if (res.data.resultCode == 1) {
+                  this.EnCodeWord=res.data.data;
+                  window.open("http://www.oytour.com/#/hotelHome?uid="+encodeURIComponent(this.EnCodeWord), "_blank");
+              } else {
+                  this.Error(res.data.message);
+              }
+              },
+              err => {}
+            );
+          }else{
+            this.$router.push({
+              path: path
+            })
+          }
+        }
+      }
   }
 
 </script>

src/plug/index.js

@@ -118,9 +118,10 @@ export default {
             Vue.prototype.domainManager = function() {
                 let domainUrl = '';
                 let locationName = window.location.hostname;
-                domainUrl = "http://192.168.2.214:8082";
-                domainUrl = "http://192.168.2.65:8025";
-                // domainUrl = "http://192.168.2.16:8083";
+                 //domainUrl = "http://192.168.2.214:8082";
+                 domainUrl = "http://192.168.2.65:8025";
+                //domainUrl = "http://192.168.2.16:8083";
+                //domainUrl = "http://192.168.0.110";
 
                 if (locationName.indexOf('oytour') !== -1) {
                     domainUrl = "http://reborn.oytour.com";
@@ -354,7 +355,7 @@ export default {
             },
 
             Vue.prototype.apiJavaPost = function(cmd, msg, successCall, faildCall) {
-                if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('confirmationOrderDownLoad') === -1 && this.$route.name.indexOf('PrintPage') === -1) {
+                if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('confirmationOrderDownLoad') === -1 && this.$route.name.indexOf('PrintPage') === -1 && this.$route.name.indexOf('clientConfirm') === -1) {
                     let previousPathInfo = {
                         path: this.$route.name,
                         query: this.$route.query