Skip to content

J
jz_Travel
Commit 4dcf79c6 authored by 罗超's avatar 罗超
Browse files
Options

部分内容修改

parent 99a52289
Hide whitespace changes
Inline Side-by-side
Showing with 327 additions and 31 deletions
pages/jiuzhai/jz_LineDetail.vue
View file @ 4dcf79c6
...@@ -835,6 +835,79 @@ ...@@ -835,6 +835,79 @@
<rich-text :nodes="dataList.feature.feeNonInclude"></rich-text> <rich-text :nodes="dataList.feature.feeNonInclude"></rich-text>
</view> </view>
</view> </view>
<view
class="jz_TripDays"
v-if="dataList.selfpayingList && dataList.selfpayingList.length>0"
>
<span
style="
display: inline-block;
position: relative;
margin-bottom: 40rpx;
"
>
<text
style="
position: relative;
z-index: 2;
color: #1f1f1f;
font-size: 36rpx;
font-weight: bold;
"
>自费安排</text
>
<span
style="
width: 40px;
background-color: #dfbe6e;
height: 6px;
bottom: 2px;
left: 0;
right: 0;
position: absolute;
z-index: 1;
"
></span>
</span>
<view class="jz_TripMain">
<scroll-view scroll-x="true" style="width: 100%;">
<view style="display: flex;font-size: 12px;min-width: 100%;">
<view style="position: sticky;left: 0;top: 0;z-index: 2;">
<view style="padding:10px;background-color: #eaeaea;">
自费项目
</view>
<view v-for="(x,i) in dataList.selfpayingList" :key="i" style="white-space: nowrap;padding:10px;border-bottom:1px solid #eaeaea;background: #FFF;">
{{x.itemName}}
</view>
</view>
<view>
<view style="padding:10px;background-color: #eaeaea;">
城市
</view>
<view v-for="(x,i) in dataList.selfpayingList" :key="i" style="white-space: nowrap;padding:10px;border-bottom:1px solid #eaeaea;">
{{x.cityName}}
</view>
</view>
<view style="min-width: 25%;">
<view style="padding:10px;background-color: #eaeaea;">
预估费用
</view>
<view v-for="(x,i) in dataList.selfpayingList" :key="i" style="white-space: nowrap;padding:10px;border-bottom:1px solid #eaeaea;">
{{x.estimatedCost}}
</view>
</view>
<view style="flex:1;">
<view style="padding:10px;background-color: #eaeaea;">
说明
</view>
<view v-for="(x,i) in dataList.selfpayingList" :key="i" style="white-space: nowrap;padding:10px;border-bottom:1px solid #eaeaea;">
{{x.explain}}
</view>
</view>
</view>
</scroll-view>
</view>
</view>
<view <view
class="jz_TripDays" class="jz_TripDays"
v-if="dataList.feature && dataList.feature.importantTip" v-if="dataList.feature && dataList.feature.importantTip"
...@@ -854,7 +927,7 @@ ...@@ -854,7 +927,7 @@
font-size: 36rpx; font-size: 36rpx;
font-weight: bold; font-weight: bold;
" "
>预定须知</text >重要提示</text
> >
<span <span
style=" style="
...@@ -911,6 +984,147 @@ ...@@ -911,6 +984,147 @@
<rich-text :nodes="dataList.feature.warmTip"></rich-text> <rich-text :nodes="dataList.feature.warmTip"></rich-text>
</view> </view>
</view> </view>
<view
class="jz_TripDays"
v-if="dataList.shopList && dataList.shopList.length>0"
>
<span
style="
display: inline-block;
position: relative;
margin-bottom: 40rpx;
"
>
<text
style="
position: relative;
z-index: 2;
color: #1f1f1f;
font-size: 36rpx;
font-weight: bold;
"
>购物店安排</text
>
<span
style="
width: 40px;
background-color: #dfbe6e;
height: 6px;
bottom: 2px;
left: 0;
right: 0;
position: absolute;
z-index: 1;
"
></span>
</span>
<view class="jz_TripMain">
<scroll-view scroll-x="true" style="width: 100%;">
<view style="display: flex;font-size: 12px;min-width: 100%;">
<view style="position: sticky;left: 0;top: 0;z-index: 2; flex:1;">
<view style="padding:10px;background-color: #eaeaea;">
购物店名称
</view>
<view v-for="(x,i) in dataList.shopList" :key="i" style="white-space: nowrap;padding:10px;border-bottom:1px solid #eaeaea;background: #FFF;">
{{x.shopName}}
</view>
</view>
<view style="flex:1;">
<view style="padding:10px;background-color: #eaeaea;">
城市
</view>
<view v-for="(x,i) in dataList.shopList" :key="i" style="white-space: nowrap;padding:10px;border-bottom:1px solid #eaeaea;">
{{x.cityName}}
</view>
</view>
<view>
<view style="padding:10px;background-color: #eaeaea;">
参观时长
</view>
<view v-for="(x,i) in dataList.shopList" :key="i" style="white-space: nowrap;padding:10px;border-bottom:1px solid #eaeaea;">
{{x.visitTime}}
</view>
</view>
</view>
</scroll-view>
</view>
</view>
<view
class="jz_TripDays"
v-if="dataList.feature && dataList.feature.shopRemark"
>
<span
style="
display: inline-block;
position: relative;
margin-bottom: 40rpx;
"
>
<text
style="
position: relative;
z-index: 2;
color: #1f1f1f;
font-size: 36rpx;
font-weight: bold;
"
>购物店（补充协议书）</text
>
<span
style="
width: 40px;
background-color: #dfbe6e;
height: 6px;
bottom: 2px;
left: 0;
right: 0;
position: absolute;
z-index: 1;
"
></span>
</span>
<view class="jz_TripMain">
<rich-text :nodes="dataList.feature.shopRemark"></rich-text>
</view>
</view>
<view
class="jz_TripDays"
v-if="dataList.feature && dataList.feature.b2BRemark && $utils.getretailer()"
>
<span
style="
display: inline-block;
position: relative;
margin-bottom: 40rpx;
"
>
<text
style="
position: relative;
z-index: 2;
color: #1f1f1f;
font-size: 36rpx;
font-weight: bold;
"
>同行备注</text
>
<span
style="
width: 40px;
background-color: #dfbe6e;
height: 6px;
bottom: 2px;
left: 0;
right: 0;
position: absolute;
z-index: 1;
"
></span>
</span>
<view class="jz_TripMain">
<rich-text :nodes="dataList.feature.b2BRemark"></rich-text>
</view>
</view>
<view <view
class="jz_TripDays" class="jz_TripDays"
v-if="dataList.feature && dataList.feature.visaRemark" v-if="dataList.feature && dataList.feature.visaRemark"
...@@ -930,7 +1144,7 @@ ...@@ -930,7 +1144,7 @@
font-size: 36rpx; font-size: 36rpx;
font-weight: bold; font-weight: bold;
" "
>证照说明</text >签证说明</text
> >
<span <span
style=" style="
......
pages/jiuzhai/jz_MyOrder.vue
View file @ 4dcf79c6
...@@ -80,10 +80,8 @@ ...@@ -80,10 +80,8 @@
} }
.jz_BtnContent { .jz_BtnContent {
margin-top: 15px; margin-top: 15px;
right: 40rpx;
bottom: 20rpx;
display: flex; display: flex;
justify-content: flex-end; align-items: center;
} }
</style> </style>
<template> <template>
...@@ -155,7 +153,9 @@ ...@@ -155,7 +153,9 @@
<view class="jz_XiaDan"> <view class="jz_XiaDan">
<view>下单时间：{{ item.createDate }}</view> <view>下单时间：{{ item.createDate }}</view>
<view style="margin-top: 22rpx" <view style="margin-top: 22rpx"
>付款总额：¥{{ item.preferPrice }}</view >订单总额：¥{{ item.preferPrice }},
<text style="margin-left: 15px;">已付款金额：￥<text style="color:indianred">{{item.customerPayMoney?item.customerPayMoney:0}}</text></text>
</view
> >
</view> </view>
</view> </view>
...@@ -165,6 +165,10 @@ ...@@ -165,6 +165,10 @@
>订单取消，正在确认中！</view >订单取消，正在确认中！</view
> >
<view class="jz_BtnContent"> <view class="jz_BtnContent">
<view style="width: 1px;flex: 1;">
<u-tag mode="plain" border-color="#DFBE6E" color="#DFBE6E" text="待发放优惠券" size="mini" v-if="item.autoCouponId==0"></u-tag>
<u-tag mode="plain" border-color="#1d1d1d" color="#1d1d1d" text="已发放优惠券" size="mini" v-else-if="item.autoCouponId==1"></u-tag>
</view>
<view <view
class="jz_Zailai" class="jz_Zailai"
style="margin-right: 10rpx" style="margin-right: 10rpx"
...@@ -198,7 +202,7 @@ ...@@ -198,7 +202,7 @@
> >
<!-- #endif --> <!-- #endif -->
<view <view
v-if="item.isApplyForCancel != 1 && item.orderState != 4" v-if="item.isApplyForCancel != 1 && item.orderState != 4 && item.customerPayMoney==0"
class="jz_Zailai" class="jz_Zailai"
style="width: 110rpx" style="width: 110rpx"
@click.stop="goCancel(item)" @click.stop="goCancel(item)"
...@@ -441,9 +445,16 @@ export default { ...@@ -441,9 +445,16 @@ export default {
}, },
}, },
(res) => { (res) => {
let orderInfo = JSON.parse(res.data); try{
// this.goPay(orderInfo); let orderInfo = JSON.parse(res.data);
this.subscribeMsg(orderInfo); // this.goPay(orderInfo);
this.subscribeMsg(orderInfo);
}catch(e){
uni.showToast({
title:'无法正常拉取微信支付，你可以稍后重试或联系销售人员线下转款',
icon:'none'
})
}
} }
); );
}, },
......
pages/jiuzhai/jz_Reserve.vue
View file @ 4dcf79c6
...@@ -514,7 +514,7 @@ ...@@ -514,7 +514,7 @@
>{{ orderMsg.ManNum + orderMsg.ChirdNum, }}人 × ¥{{currentPriceInfo.visaPrice}}</view >{{ orderMsg.ManNum + orderMsg.ChirdNum, }}人 × ¥{{currentPriceInfo.visaPrice}}</view
> >
</view> </view>
<view <!-- <view
class="flex f12 grey" class="flex f12 grey"
style="margin-bottom: 40rpx" style="margin-bottom: 40rpx"
v-if="currentPriceInfo.safeMoney > 0" v-if="currentPriceInfo.safeMoney > 0"
...@@ -525,7 +525,7 @@ ...@@ -525,7 +525,7 @@
<view style="text-align: right" <view style="text-align: right"
>{{ orderMsg.ManNum + orderMsg.ChirdNum }}人 × ¥{{currentPriceInfo.safeMoney}}</view >{{ orderMsg.ManNum + orderMsg.ChirdNum }}人 × ¥{{currentPriceInfo.safeMoney}}</view
> >
</view> </view> -->
<view <view
class="flex f12 grey" class="flex f12 grey"
style="margin-bottom: 40rpx" style="margin-bottom: 40rpx"
...@@ -548,12 +548,16 @@ ...@@ -548,12 +548,16 @@
<view style="text-align: right"> <view style="text-align: right">
¥{{parseFloat((price-currentCoupon.discountMoney)).toFixed(2)}}</view> ¥{{parseFloat((price-currentCoupon.discountMoney)).toFixed(2)}}</view>
</view> </view>
<view class="f12" style="color:#ff3166;margin-bottom: 40rpx" v-if="activity && activity.Id">
注意：本单以满足活动 "{{activity.CouponsName}}" 活动，出团后系统将自动发放优惠券到你的账户
</view>
</view> </view>
<view class="empty-block"></view> <view class="empty-block"></view>
<coupon v-if="couponList.length > 0 && showCoupon" :list="couponList" :current="useCouponId" @close="closeCouponHandler"></coupon> <coupon v-if="couponList.length > 0 && showCoupon" :list="couponList" :current="useCouponId" @close="closeCouponHandler"></coupon>
<view style="padding: 50rpx 40rpx" v-if="tips != ''"> <view style="padding: 50rpx 40rpx" v-if="tips != ''">
<view class="big-title"> <view class="big-title">
<text>重要提醒</text> <text>重要提示</text>
</view> </view>
<view class="sheshi"> <view class="sheshi">
<view class="she-content"> <view class="she-content">
...@@ -606,6 +610,7 @@ export default { ...@@ -606,6 +610,7 @@ export default {
BabyNum: 0, //婴儿 BabyNum: 0, //婴儿
ChirdNum: 0, //儿童数量 ChirdNum: 0, //儿童数量
}, },
activity:{},
price: 0, price: 0,
currentPriceInfo: {}, currentPriceInfo: {},
total: 0, total: 0,
...@@ -712,13 +717,37 @@ export default { ...@@ -712,13 +717,37 @@ export default {
this.tips = res.data.feature.importantTipText; this.tips = res.data.feature.importantTipText;
this.ltName = res.data.ltName; this.ltName = res.data.ltName;
this.currentPriceInfo.visaPrice = res.data.currentPriceInfo.visaPrice this.currentPriceInfo.visaPrice = res.data.currentPriceInfo.visaPrice
this.currentPriceInfo.safeMoney = res.data.currentPriceInfo.safeMoney //this.currentPriceInfo.safeMoney = res.data.currentPriceInfo.safeMoney
this.calcMoney() this.calcMoney()
this.getCouponActivityHandler(res.data)
} }
}, },
null (err)=>{
uni.hideLoading()
}
); );
}, },
getCouponActivityHandler(d){
uni.hideLoading();
var customer=uni.getStorageSync("b2b_user")
let msg={
TCID:d.currentPriceInfo.tcid,
CustomerId:customer.customerId,
OrderId:0,
StratDate:d.currentPriceInfo.startDate,
OrderGuest:this.total,
lineId:d.lineId
}
this.apipost("coupon_post_GetAutoCouponOrder",msg,(res) => {
if (res.resultCode == 1) {
this.activity = res.data
}
},
(err)=>{
uni.hideLoading()
}
);
},
updateUser() { updateUser() {
uni.navigateBack({ uni.navigateBack({
delta: 1, delta: 1,
...@@ -793,8 +822,8 @@ export default { ...@@ -793,8 +822,8 @@ export default {
? this.currentPriceInfo.childNoNeedPrice ? this.currentPriceInfo.childNoNeedPrice
: 0) * this.orderMsg.ChirdNoBedNum; : 0) * this.orderMsg.ChirdNoBedNum;
} }
if(this.currentPriceInfo.visaPrice || this.currentPriceInfo.safeMoney){ if(this.currentPriceInfo.visaPrice){
money+=(this.orderMsg.ManNum + this.orderMsg.ChirdNum)*this.currentPriceInfo.safeMoney //money+=(this.orderMsg.ManNum + this.orderMsg.ChirdNum)*this.currentPriceInfo.safeMoney
money+=(this.orderMsg.ManNum + this.orderMsg.ChirdNum)*this.currentPriceInfo.visaPrice money+=(this.orderMsg.ManNum + this.orderMsg.ChirdNum)*this.currentPriceInfo.visaPrice
} }
...@@ -928,6 +957,10 @@ export default { ...@@ -928,6 +957,10 @@ export default {
msg, msg,
(res) => { (res) => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
uni.showToast({
title:'订单创建成功，正在拉取微信支付',
icon:'none'
})
let data = res.data; let data = res.data;
data.CoverImg = this.currentPriceInfo.CoverImg; data.CoverImg = this.currentPriceInfo.CoverImg;
let myData = JSON.stringify(data); let myData = JSON.stringify(data);
...@@ -964,10 +997,25 @@ export default { ...@@ -964,10 +997,25 @@ export default {
}, },
}, },
(res) => { (res) => {
this.orderInfo = JSON.parse(res.data); try{
// this.Pay(OrderId); this.orderInfo = JSON.parse(res.data);
this.subscribeMsg(OrderId); // this.Pay(OrderId);
} this.subscribeMsg(OrderId);
}catch(e){
uni.showToast({
title:'无法正常拉取微信支付，你可以稍后重试或联系销售人员线下转款',
icon:'none'
})
setTimeout(() => {
uni.redirectTo({
url: "/pages/jiuzhai/jz_SureOrder?orderId=" + OrderId
});
}, 1000);
}
},
(err) => {
console.log(err)
}
); );
}, },
subscribeMsg(OrderId) { subscribeMsg(OrderId) {
......
pages/jiuzhai/jz_SureOrder.vue
View file @ 4dcf79c6
...@@ -829,9 +829,20 @@ export default { ...@@ -829,9 +829,20 @@ export default {
}, },
}, },
(res) => { (res) => {
let orderInfo = JSON.parse(res.data); try{
console.log(orderInfo); let orderInfo = JSON.parse(res.data);
this.goPay(orderInfo); console.log(orderInfo);
this.goPay(orderInfo);
}catch(e){
uni.showToast({
title:'无法正常拉取微信支付，你可以稍后重试或联系销售人员线下转款',
icon:'none'
})
setTimeout(()=>{
this.submit = false;
}, 2000);
}
} }
); );
}, },
......
plugin/api.js
View file @ 4dcf79c6
...@@ -110,12 +110,18 @@ export default { ...@@ -110,12 +110,18 @@ export default {
}, },
data: postData, data: postData,
success: res => { success: res => {
if (res.data.resultCode == 10000) { if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
let u = uni.getStorageSync("mall_UserInfo"); uni.removeStorageSync('b2b_user')
if (u) { uni.removeStorageSync('mall_UserInfo')
this.getLogin_t(u) uni.redirectTo({
typeof failed == "function" && failed(res.data); url:'/pages/jiuzhai/login'
} })
// let u = uni.getStorageSync("mall_UserInfo");
// if (u) {
// this.getLogin_t(u)
// typeof failed == "function" && failed(res.data);
// }
} else if (res.data.resultCode != 1) { } else if (res.data.resultCode != 1) {
if (res.data.message != '') { if (res.data.message != '') {
uni.showToast({ uni.showToast({
...@@ -167,7 +173,13 @@ export default { ...@@ -167,7 +173,13 @@ export default {
}, },
data: postData, data: postData,
success: res => { success: res => {
if (res.data.resultCode != 1) { if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
uni.removeStorageSync('b2b_user')
uni.removeStorageSync('mall_UserInfo')
uni.redirectTo({
url:'/pages/jiuzhai/login'
})
} else if (res.data.resultCode != 1) {
if (res.data.message != '') { if (res.data.message != '') {
uni.showToast({ uni.showToast({
title: res.data.message, title: res.data.message,
......
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