Skip to content

A
Athena
Commit 42694ead authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

parents f87ad1ab 61971d32
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 43 deletions
src/components/LocalTour/Appointment.vue
View file @ 42694ead
...@@ -263,14 +263,14 @@ export default { ...@@ -263,14 +263,14 @@ export default {
}) })
this.CouponIds = CouponIds this.CouponIds = CouponIds
if (type === 1) { if (type === 1) {
this.SettlementPrice = this.price - CouponMoney this.SettlementPrice = Math.round((this.price - CouponMoney) * 100) / 100
} else if (type === 2) { } else if (type === 2) {
this.SettlementPrice = this.price * CouponSale this.SettlementPrice = Math.round((this.price * CouponSale) * 100) / 100
} else if (type === 0) { } else if (type === 0) {
this.SettlementPrice = this.price this.SettlementPrice = Math.round(this.price * 100) / 100
} }
} else { } else {
this.SettlementPrice = this.price this.SettlementPrice = Math.round(this.price * 100) / 100
} }
// this.SettlementPrice=parseInt(this.SettlementPrice).toFixed(2); // this.SettlementPrice=parseInt(this.SettlementPrice).toFixed(2);
// let allmonney=this.price - this.SettlementPrice; // let allmonney=this.price - this.SettlementPrice;
......
src/components/LocalTour/LocalCuisineDetails.vue
View file @ 42694ead
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
} }
.OrderCon ._coupon_box ._coupon_item{ .LocalCuisine ._coupon_box ._coupon_item{
width: 224px; width: 224px;
padding: 12px 20px 12px 25px; padding: 12px 20px 12px 25px;
margin:0 26px 20px 0; margin:0 26px 20px 0;
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
font-size: 16px !important; font-size: 16px !important;
margin: 0 margin: 0
} }
.OrderCon ._coupon_box ._coupon_item ._coupon_info p._coupon_name{ .LocalCuisine ._coupon_box ._coupon_item ._coupon_info p._coupon_name{
font-size: 14px !important; font-size: 14px !important;
margin-bottom: 10px; margin-bottom: 10px;
max-width: 190px; max-width: 190px;
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
._coupon_box ._coupon_item ._coupon_info p span._sale{ ._coupon_box ._coupon_item ._coupon_info p span._sale{
font-size: 24px; font-size: 24px;
} }
.OrderCon ._coupon_box ._coupon_item ._coupon_info p._repeat{ .LocalCuisine ._coupon_box ._coupon_item ._coupon_info p._repeat{
padding: 0 5px; padding: 0 5px;
color: #7C6F01; color: #7C6F01;
position: absolute; position: absolute;
...@@ -503,14 +503,14 @@ export default { ...@@ -503,14 +503,14 @@ export default {
}) })
this.CouponIds = CouponIds this.CouponIds = CouponIds
if (type === 1) { if (type === 1) {
this.SettlementPrice = this.freeMsg.MySelfTotalPrice - CouponMoney this.SettlementPrice = CouponMoney
} else if (type === 2) { } else if (type === 2) {
this.SettlementPrice = this.freeMsg.MySelfTotalPrice * CouponSale this.SettlementPrice = (this.SignelPrice * (this.msg.adultNum + this.msg.childNum)) - (this.SignelPrice * (this.msg.adultNum + this.msg.childNum)) * CouponSale
} else if (type === 0) { } else if (type === 0) {
this.SettlementPrice = this.freeMsg.MySelfTotalPrice this.SettlementPrice = 0
} }
} else { } else {
this.SettlementPrice = this.freeMsg.MySelfTotalPrice this.SettlementPrice = 0
} }
// 计算幸福存折 // 计算幸福存折
// this.SettlementPrice = this.SettlementPrice - this.RedEnvelopeMoney // this.SettlementPrice = this.SettlementPrice - this.RedEnvelopeMoney
......
src/components/newPersonalCenter/block/model/OrderInfoModel/FoodTable.vue
View file @ 42694ead
...@@ -193,7 +193,6 @@ ...@@ -193,7 +193,6 @@
<td colspan="6"> <td colspan="6">
<span class="time">{{item.createDate}}</span> <span class="time">{{item.createDate}}</span>
<span class="num">订单号：<span>{{item.id}}</span></span> <span class="num">订单号：<span>{{item.id}}</span></span>
<!-- <span class="contacts"><i class="iconfont icon-dianhua"></i> <span>{{item.salesName}} {{item.salesMobile}}</span></span> -->
</td> </td>
</tr> </tr>
<tr class="info" @mouseenter="enter(index)" :key="index+100" @mouseleave="enter()" :class="{hover_bg: activeRow === index}"> <tr class="info" @mouseenter="enter(index)" :key="index+100" @mouseleave="enter()" :class="{hover_bg: activeRow === index}">
...@@ -205,7 +204,6 @@ ...@@ -205,7 +204,6 @@
<div class="_right"> <div class="_right">
<p class="color333 font-size14">{{item.diningName}}</p> <p class="color333 font-size14">{{item.diningName}}</p>
<p>{{item.mealName}}</p> <p>{{item.mealName}}</p>
<!-- <p>团号：{{item.tcid}}</p> -->
</div> </div>
</div> </div>
</td> </td>
...@@ -218,7 +216,6 @@ ...@@ -218,7 +216,6 @@
<p>总金额：{{item.preferPrice | priceFormat}}</p> <p>总金额：{{item.preferPrice | priceFormat}}</p>
<p>实付款：{{item.customerPayMoney | priceFormat}}</p> <p>实付款：{{item.customerPayMoney | priceFormat}}</p>
<p>优惠金额：{{item.discountMoney | priceFormat}}</p> <p>优惠金额：{{item.discountMoney | priceFormat}}</p>
</td> </td>
<td class="color333 font-size12"> <td class="color333 font-size12">
<span v-if="item.status === 1">正常</span> <span v-if="item.status === 1">正常</span>
...@@ -228,15 +225,10 @@ ...@@ -228,15 +225,10 @@
<td> <td>
<p v-if="item.status === 3" style="margin-bottom:10px;"> <p v-if="item.status === 3" style="margin-bottom:10px;">
<el-button @click="Pay(item)" size="mini" type="danger">立即付款</el-button> <el-button @click="Pay(item)" size="mini" type="danger">立即付款</el-button>
</p> </p>
<!-- <p v-if="item.status === 3" style="margin-bottom:10px;">
<el-button @click="Pay(item)" size="mini" type="danger">查看详情</el-button>
</p> -->
<p v-if="item.status === 1 || item.status === 3" style="margin-bottom:10px;"> <p v-if="item.status === 1 || item.status === 3" style="margin-bottom:10px;">
<el-button @click="Exit(item)" size="mini">取消订单</el-button> <el-button @click="Exit(item)" size="mini">取消订单</el-button>
</p> </p>
</td> </td>
</tr> </tr>
</template> </template>
...@@ -298,12 +290,12 @@ export default { ...@@ -298,12 +290,12 @@ export default {
}); });
}, },
Pay(item){ Pay(item){
console.log(item)
let data={}; let data={};
data=item.payInfo; data=item.payInfo;
data.AirOrderId=item.payInfo.airOrderId; data.AirOrderId=item.payInfo.airOrderId;
item.payInfo.preferPrice = item.payInfo.preferPrice - item.discountMoney
sessionStorage.Visainfo=JSON.stringify(item.payInfo) sessionStorage.Visainfo=JSON.stringify(item.payInfo)
this.$router.push({ this.$router.push({
name: "Pay", name: "Pay",
query: { query: {
......
src/plugins/index.js
View file @ 42694ead
...@@ -15,13 +15,13 @@ export default { ...@@ -15,13 +15,13 @@ export default {
//var domainUrl = "http://reborn.oytour.com"; //主域名 //var domainUrl = "http://reborn.oytour.com"; //主域名
// var domainUrl = "http://192.168.2.65:8025"//主域名 // var domainUrl = "http://192.168.2.65:8025"//主域名
// let domainUrl = "https://reborn.oytour.com"; // let domainUrl = "https://reborn.oytour.com";
let domainUrl = "http://test.viitto.com" let domainUrl = "http://testapi.oytour.com"
// let domainUrl = "http://192.168.2.214:8082" // let domainUrl = "http://192.168.2.214:8082"
// var domainUrl = "http://reborn.oytour.com"; // var domainUrl = "http://reborn.oytour.com";
let locationName = window.location.hostname; let locationName = window.location.hostname;
if (this.isOnline()) { if (this.isOnline()) {
if (window.location.host.indexOf('viitto.com') != -1) if (window.location.host.indexOf('testb2b.oytour.com') != -1)
domainUrl = "http://test.viitto.com" domainUrl = "http://testapi.oytour.com"
else if (window.location.host.indexOf('oytour.com') != -1) else if (window.location.host.indexOf('oytour.com') != -1)
domainUrl = "https://reborn.oytour.com" domainUrl = "https://reborn.oytour.com"
} }
...@@ -30,26 +30,14 @@ export default { ...@@ -30,26 +30,14 @@ export default {
DomainUrl: domainUrl, DomainUrl: domainUrl,
//常用提交数据URL //常用提交数据URL
PostUrl: domainUrl + "/api/common/post", PostUrl: domainUrl + "/api/common/post",
// 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: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",
javaUrl: locationName.indexOf('testb2b') == -1 ? "http://efficient.oytour.com" : locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://47.96.12.235:9001" : "http://192.168.2.215:9000",
// javaUrl: "http://efficient.oytour.com", // javaUrl: "http://efficient.oytour.com",
javaUrl: "http://47.96.12.235:9001", // javaUrl: "http://47.96.12.235:9001",
// javaUrl: locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : locationName.indexOf('viitto') !== -1 ? "http://47.96.12.235:9001" : "http://192.168.2.215:9000", ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130',
javaUrl: "http://efficient.oytour.com", UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130',
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi", LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
}; };
// domainUrl = "https://reborn.oytour.com"
// var obj = {
// //主地址
// DomainUrl: domainUrl,
// //常用提交数据URL
// PostUrl: domainUrl + "/api/common/post",
// javaUrl: "http://efficient.oytour.com",
// ViittoFileUrl:"http://imgfile.oytour.com",
// UploadUrl: "http://upload.oytour.com",
// LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
// };
return obj; return obj;
}, },
Vue.prototype.GetLocalFile = function (cmd, msg, fileName, successCall) { Vue.prototype.GetLocalFile = function (cmd, msg, fileName, successCall) {
......
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