Skip to content

S
SuperMan
Commit c964cafa authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

修改不登录进入电子合同

parent fe5227b1
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 23 deletions
src/App.vue
View file @ c964cafa
......@@ -173,7 +173,7 @@ export default {
}
</script>
<style>
@import "//at.alicdn.com/t/font_635492_hjv41l1i5.css";
@import "//at.alicdn.com/t/font_635492_4ra0qfyvnej.css";
@import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css";
......
src/components/SignName.vue
View file @ c964cafa
......@@ -2,7 +2,7 @@
<style scoped>
.SignName .CanvasDiv{
width: 100%;
height: calc(100% - 100px);
height: calc(100% - 8rem);
padding-top: 5%;
}
.SignName .CanvasDiv #canvas{
......@@ -14,8 +14,9 @@
box-sizing: border-box;
border: 1px dashed #ccc;
width: 95%;
height: 95%;
height: 98%;
margin:0 auto;
overflow: hidden;
}
.SignName .bg{
display: inline-block;
......@@ -79,14 +80,16 @@
<el-row>
<el-col :span="12">
<div style="width:100%;" @click="handelClearEl()">
<span class="bg bg1"></span>
<!-- <span class="bg bg1"></span> -->
<span style="font-size:3rem;color:rgb(36, 173, 229)" class="iconfont icon-zhongzhi1"></span>
<span style="font-size:2rem">重置签名</span>
</div>
</el-col>
<el-col :span="12">
<div style="width:100%;" @click="handelSaveEl()">
<span class="bg bg2"></span>
<!-- <span class="bg bg2"></span> -->
<span style="font-size:3rem;color:rgb(36, 173, 229)" class="iconfont icon-wancheng1"></span>
<span style="font-size:2rem">完成签名</span>
</div>
</el-col>
......@@ -118,7 +121,7 @@ export default {
},
created(){
this.SignInfo = JSON.parse(sessionStorage.getItem("SignInfo"));
console.log("this.SignInfo",this.SignInfo)
// console.log("this.SignInfo",this.SignInfo)
},
mounted(){
this.msg.TCID = this.$route.query.TCID;
......@@ -176,7 +179,6 @@ export default {
//提交数据
SaveMsg(){
this.apiJavaPost("/api/contract/dosaveOrUpdate",this.SignInfo,res => {
console.log("233",res);
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.$router.push({ name: "clientConfirm",query: {TCID: this.msg.TCID,orderID: this.msg.orderID,str:1}})
......
src/components/clientConfirm.vue
View file @ c964cafa
......@@ -16,7 +16,7 @@
text-size-adjust : 100%;
}
.dic_content {width:100%;margin:auto;height:100%;}
.dic_content {width:100%;margin:auto;background-color: #fff;}
.dic_content .contractLeft {width:150px;display:block;border:0;float:left;position:fixed;}
.dic_content .contractRight {width:100%;height:100%;display:block;background-color: #fff;z-index:99;}
.dic_contenttable th{padding: 8px 0;}
......@@ -183,7 +183,7 @@
}
.dic_content .navHidden .Navul{
width: 112rem;
width: 113rem;
padding: 0;
display:flex;
height: 5rem;
......@@ -193,7 +193,7 @@
}
.dic_content .navHidden .Navul li{
display: inline-block;
margin-right:1rem;
margin-left:1rem;
box-sizing:border-box;
cursor: pointer;
font-size: 2rem;
......@@ -202,7 +202,7 @@
.dic_content .SignbgDiv{
position: relative;
width: 100%;
padding-bottom:8rem;
padding-bottom:10rem;
padding-top:10rem;
}
.dic_content .SignbgDiv .signContent{
......@@ -234,7 +234,7 @@
}
.dic_content .gzqzUl li{
border-bottom: 1px solid #ddd;
padding:10px;
padding:14px;
position: relative;
box-sizing: border-box;
}
......@@ -265,7 +265,8 @@
<!-- 签字 -->
<div class="signSpan">
<div @click="goUrl" class="sign">
<p><span class="sp1"></span></p>
<!-- <span><span class="sp1"></span></p> -->
<p><span style="font-size:3rem" class="iconfont icon-qianming"></span></p>
<span style="font-size:2rem">签字</span>
</div>
</div>
......@@ -309,7 +310,7 @@
<div class="SignbgDiv">
<div class="signContent" style="padding-top:10px;">
<!-- 使用说明 -->
<div style="line-height:1.8" v-show="ActiveTab==1" class="item_content">
<div style="line-height:1.8;padding:0 14px;box-sizing: border-box;" v-show="ActiveTab==1" class="item_content">
<p>1、本合同参照国家旅游局和国家工商行政管理总局示范文本（国家GF－2014－2402），结合《四川省旅游管理条例》、《成都市旅游业促进条例》制定本合同。</p>
<p>2、供中华人民共和国境内（不含港、澳、台地区）经营出境旅游业务或者边境旅游业务的旅行社（以下简称“出境社”）与出境旅游者（以下简称“旅游者”）之间签订团队出境包价旅游（不含赴台湾地区旅游）合同时使用。</p>
<p>3、双方当事人应当结合具体情况选择本合同协议条款中所提供的选择项，空格处应当以文字形式填写完整。</p>
......@@ -317,7 +318,7 @@
</div>
<!-- 合同信息 -->
<div v-show="ActiveTab==2" class="item_content">
<div style="padding:0 14px;box-sizing: border-box;" v-show="ActiveTab==2" class="item_content">
<p>
旅游者：<font>{{dataList.clientName}}</font> 等<font v-if="dataList.guestList">{{dataList.guestList.length}}</font>
人（名单可附页，需出境社和旅游者代表签字盖章确认）；
......@@ -773,8 +774,12 @@
<td>
{{item.TrifficType}}
</td>
<td>旅游酒店</td>
<td>双人间</td>
<td>
<span v-if="index!=tripList.length-1">旅游酒店</span>
</td>
<td>
<span v-if="index!=tripList.length-1">双人间</span>
</td>
</tr>
</table>
</div>
......@@ -1538,7 +1543,6 @@
this.apiJavaPost("/api/contract/getContractInfo",this.msg,res => {
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
console.log(this.dataList,'data');
} else {
this.Error(res.data.message);
}
......@@ -1668,7 +1672,6 @@
this.startCityName = res.data.data.startCityName;
this.returnArriveCityName = res.data.data.returnArriveCityName;
this.init();
console.log(res,'ressssss');
}
},
err => {}
......@@ -2021,7 +2024,6 @@
// this.tripList.forEach(y=>{
this.trifficList.forEach((x,index)=>{
console.log(x.airportPickUp==1||x.airportPickUp==2,'ssssss');
if(x.airportPickUp==1||x.airportPickUp==2){
if(x.isUseBus==1){
this.tripList[index].TrifficType='飞机+车'
......@@ -2043,7 +2045,6 @@
})
// })
console.log(this.tripList,'tripListssss');
//this.CtObj.travelContent = str;
},
//加一天返回
......
src/plug/index.js
View file @ c964cafa
......@@ -112,8 +112,12 @@ export default {
//域名管理对象
Vue.prototype.domainManager = function () {
let domainUrl = '';
let locationName = window.location.hostname;
// domainUrl = "http://testapi.oytour.com";
domainUrl = "http://192.168.2.214:8082";
// domainUrl = "http://192.168.2.16:8083";
let locationName = window.location.hostname;
if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com";
} else if (locationName.indexOf('viitto') !== -1) {
......@@ -147,6 +151,8 @@ export default {
//文件站点
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130',
javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",
// javaUrl:"http://192.168.2.215:9000",
};
return obj;
},
......@@ -222,13 +228,15 @@ export default {
//HTTP提交数据
Vue.prototype.apipost = function (cmd, msg, successCall, faildCall, isOnline) {
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('clientConfirm') === -1 && this.$route.name.indexOf('confirmationOrderDownLoad') === -1 && this.$route.name.indexOf('PrintPage') === -1) {
let previousPathInfo = {
path: this.$route.name,
query: this.$route.query
}
localStorage.previousPathInfo = JSON.stringify(previousPathInfo);
}
if (msg == null || msg == "") {
msg = {}
}
......@@ -243,6 +251,11 @@ export default {
this.$router.push({
path: '/signature'
})
}
else if (this.$route.path == "/clientConfirm") {
let TCID=this.$route.query.TCID;
let orderID=this.$route.query.orderID;
this.$router.push({ name: "clientConfirm",query: {TCID:TCID,orderID:orderID}})
} else {
if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
this.$router.push({
......@@ -335,6 +348,7 @@ export default {
//请求Java接口
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 && this.$route.name.indexOf('clientConfirm') === -1) {
let previousPathInfo = {
path: this.$route.name,
query: this.$route.query
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment