Skip to content

J
jz_Travel
Commit 4351a5d2 authored by youjie's avatar youjie
Browse files
Options

修复

parent a8e85582
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 100 deletions
pages/jiuzhai/jz_LineDetail.vue
View file @ 4351a5d2
...@@ -1025,7 +1025,7 @@ ...@@ -1025,7 +1025,7 @@
"></text> "></text>
<view class="SaleNameTetx"> <view class="SaleNameTetx">
<view> <view>
<text v-if="SaleName">{{ SaleName }}</text> <text v-if="parametersMsg.SaleName">{{ parametersMsg.SaleName }}</text>
<text v-else style="color: #999"> <text v-else style="color: #999">
请选择 请选择
</text> </text>
...@@ -1134,36 +1134,7 @@ ...@@ -1134,36 +1134,7 @@
</view> </view>
</u-popup> </u-popup>
<u-popup v-model="showSalePreviwe" mode="bottom" border-radius="50" length="60%" :safe-area-inset-bottom="true"> <u-popup v-model="showSalePreviwe" mode="bottom" border-radius="50" length="60%" :safe-area-inset-bottom="true">
<view> <orderService :msg="parametersMsg" :list="SaleList" @goReserce="getService"></orderService>
<view style="font-size: 17px;text-align: center;padding: 20px 0;">
选择服务人员
</view>
<scroll-view scroll-x="true" style="width: 100%;height: 43vh;">
<view class="SaleBox">
<view v-for="(item,index) in SaleList"
:key="index"
class="SaleText"
@click="SelectSales(item)">
<view>{{ item.EmName }}</view>
<view>
<u-radio-group v-model="SaleId"
style="position: relative;top:10rpx;">
<u-radio shape="circle" :name="item.CreateBy" :icon-size="36"
:active-color="mc"></u-radio>
</u-radio-group>
</view>
</view>
</view>
</scroll-view>
<u-button size="80" :ripple="true" shape="circle" :custom-style="{
backgroundColor: '#333',
height: '80rpx',
color: '#fff',
fontSize: '14px',
margin: '0 auto',
width: '90vw',
}" @click="goReserce()">确定</u-button>
</view>
</u-popup> </u-popup>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth> <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</view> </view>
...@@ -1173,12 +1144,14 @@ ...@@ -1173,12 +1144,14 @@
import canlendar from "./components/sign/index.vue"; import canlendar from "./components/sign/index.vue";
import auth from "@/components/auth/index.vue"; import auth from "@/components/auth/index.vue";
import vip from "../../components/vip/vip.vue"; import vip from "../../components/vip/vip.vue";
import orderService from "@/components/serviceStaff/orderService";
export default { export default {
components: { components: {
canlendar, canlendar,
auth, auth,
vip vip,
orderService
}, },
data() { data() {
return { return {
...@@ -1232,8 +1205,6 @@ ...@@ -1232,8 +1205,6 @@
showSalePreviwe: false, showSalePreviwe: false,
SaleList: [], SaleList: [],
customer: {}, customer: {},
SaleName: '',
SaleId: 0,
mc: '', mc: '',
couponList:[], couponList:[],
numList: [{ numList: [{
...@@ -1286,7 +1257,11 @@ ...@@ -1286,7 +1257,11 @@
discountPrice: 0,//优惠后金额 discountPrice: 0,//优惠后金额
Discounts: 1,//福利项 Discounts: 1,//福利项
vipInfo:null, vipInfo:null,
userVipRights:null userVipRights:null,
parametersMsg:{
SaleName: '',
SaleId: 0,
}
}; };
}, },
computed:{ computed:{
...@@ -1406,10 +1381,6 @@ ...@@ -1406,10 +1381,6 @@
} }
}) })
}, },
SelectSales(item){
this.SaleName = item.EmName
this.SaleId = item.CreateBy
},
getUserCouponList() { getUserCouponList() {
if(!this.customer.accountId) return if(!this.customer.accountId) return
let couponParams = { let couponParams = {
...@@ -1465,12 +1436,12 @@ ...@@ -1465,12 +1436,12 @@
if(res.data.length>0){ if(res.data.length>0){
this.SaleList = res.data this.SaleList = res.data
if(res.data.length==1&&this.createBy==0){ if(res.data.length==1&&this.createBy==0){
this.SaleName = res.data[0].EmName this.parametersMsg.SaleName = res.data[0].EmName
this.SaleId = res.data[0].CreateBy this.parametersMsg.SaleId = res.data[0].CreateBy
} }
}else{ }else{
this.SaleName = '' this.parametersMsg.SaleName = ''
this.SaleId = 0 this.parametersMsg.SaleId = 0
} }
} else { } else {
...@@ -1846,6 +1817,11 @@ ...@@ -1846,6 +1817,11 @@
this.showDateChosen = true; this.showDateChosen = true;
} }
}, },
getService(item){
this.parametersMsg = item
this.showSalePreviwe = false;
this.goReserce()
},
//立即预定 //立即预定
goReserce() { goReserce() {
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
...@@ -1870,11 +1846,11 @@ ...@@ -1870,11 +1846,11 @@
return; return;
} }
// #ifdef MP-AG // #ifdef MP-AG
if (this.SaleList&&this.SaleList.length>1&&this.SaleId==0&&this.createBy==0) { if (this.SaleList&&this.SaleList.length>1&&this.parametersMsg.SaleId==0&&this.createBy==0) {
uni.showToast({ // uni.showToast({
title: "请选择服务人员", // title: "请选择服务人员",
icon: "none", // icon: "none",
}); // });
this.showSalePreviwe = true; this.showSalePreviwe = true;
return; return;
} }
...@@ -1912,9 +1888,9 @@ ...@@ -1912,9 +1888,9 @@
createBy = this.createBy>0?this.createBy:employeeId createBy = this.createBy>0?this.createBy:employeeId
// #endif // #endif
// #ifdef MP-AG // #ifdef MP-AG
if(this.createBy>0||this.SaleId) createBy = this.createBy>0?this.createBy:this.SaleId if(this.createBy>0||this.parametersMsg.SaleId) createBy = this.createBy>0?this.createBy:this.parametersMsg.SaleId
// #endif // #endif
console.log("createBy-------",createBy)
let tParams = "&tcid=" + let tParams = "&tcid=" +
this.delMsg.tcid + this.delMsg.tcid +
"&cityId=" + "&cityId=" +
......
pages/jiuzhai/jz_Reserve.vue
View file @ 4351a5d2
...@@ -663,8 +663,8 @@ ...@@ -663,8 +663,8 @@
} }
let startCityName = this.realCurrentPriceInfo.priceUnion && this.realCurrentPriceInfo.priceUnion.startCityName?this.realCurrentPriceInfo.priceUnion.startCityName:this.currentPriceInfo.startCityName let startCityName = this.realCurrentPriceInfo.priceUnion && this.realCurrentPriceInfo.priceUnion.startCityName?this.realCurrentPriceInfo.priceUnion.startCityName:this.currentPriceInfo.startCityName
let msg = { let msg = {
SurName: this.customer.SurName, SurName: this.orderMsg.SurName,
Name: this.customer.name, Name: this.orderMsg.Name,
ContactNumber: this.customer.contactNumber, ContactNumber: this.customer.contactNumber,
Mailbox: this.customer.Mailbox, Mailbox: this.customer.Mailbox,
GoodsId: this.currentPriceInfo.tcid, GoodsId: this.currentPriceInfo.tcid,
......
pages/visa/visaDetail.vue
View file @ 4351a5d2
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
"></text> "></text>
<view class="SaleNameTetx"> <view class="SaleNameTetx">
<view> <view>
<text v-if="SaleName">{{ SaleName }}</text> <text v-if="parametersMsg.SaleName">{{ parametersMsg.SaleName }}</text>
<text v-else style="color: #999"> <text v-else style="color: #999">
请选择 请选择
</text> </text>
...@@ -214,36 +214,7 @@ ...@@ -214,36 +214,7 @@
</view> </view>
<auth v-if="showAuth&&is_show_auth==1" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth> <auth v-if="showAuth&&is_show_auth==1" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
<u-popup v-model="showSalePreviwe" mode="bottom" border-radius="50" length="60%" :safe-area-inset-bottom="true"> <u-popup v-model="showSalePreviwe" mode="bottom" border-radius="50" length="60%" :safe-area-inset-bottom="true">
<view> <orderService :msg="parametersMsg" :list="SaleList" @goReserce="getService"></orderService>
<view style="font-size: 17px;text-align: center;padding: 20px 0;">
选择服务人员
</view>
<scroll-view scroll-x="true" style="width: 100%;height: 43vh;">
<view class="SaleBox">
<view v-for="(item,index) in SaleList"
:key="index"
class="SaleText"
@click="SelectSales(item)">
<view>{{ item.EmName }}</view>
<view>
<u-radio-group v-model="SaleId"
style="position: relative;top:10rpx;">
<u-radio shape="circle" :name="item.CreateBy" :icon-size="36"
:active-color="mc"></u-radio>
</u-radio-group>
</view>
</view>
</view>
</scroll-view>
<u-button size="80" :ripple="true" shape="circle" :custom-style="{
backgroundColor: '#333',
height: '80rpx',
color: '#fff',
fontSize: '14px',
margin: '0 auto',
width: '90vw',
}" @click="goReserce()">确定</u-button>
</view>
</u-popup> </u-popup>
<u-popup v-model="showDownload" mode="bottom" border-radius="50" length="60%" :safe-area-inset-bottom="true"> <u-popup v-model="showDownload" mode="bottom" border-radius="50" length="60%" :safe-area-inset-bottom="true">
<view> <view>
...@@ -283,9 +254,11 @@ ...@@ -283,9 +254,11 @@
import parseHtml from "@/plugin/htmlparse.js"; import parseHtml from "@/plugin/htmlparse.js";
// #endif // #endif
import auth from "@/components/auth/index.vue"; import auth from "@/components/auth/index.vue";
import orderService from "@/components/serviceStaff/orderService";
export default { export default {
components: { components: {
auth, auth,
orderService,
}, },
data() { data() {
return { return {
...@@ -333,8 +306,6 @@ ...@@ -333,8 +306,6 @@
showSalePreviwe: false, showSalePreviwe: false,
SaleList: [], SaleList: [],
customer: {}, customer: {},
SaleName: '',
SaleId: 0,
mc: '', mc: '',
couponList:[], couponList:[],
maxCouponDiscount:0, maxCouponDiscount:0,
...@@ -389,6 +360,10 @@ ...@@ -389,6 +360,10 @@
discountPrice: 0,//优惠后金额 discountPrice: 0,//优惠后金额
Discounts: 1,//福利项 Discounts: 1,//福利项
TotalDiscount: 0,//合计优惠金额 TotalDiscount: 0,//合计优惠金额
parametersMsg:{
SaleName: '',
SaleId: 0,
}
}; };
}, },
watch: { watch: {
...@@ -517,10 +492,6 @@ ...@@ -517,10 +492,6 @@
} }
}) })
}, },
SelectSales(item){
this.SaleName = item.EmName
this.SaleId = item.CreateBy
},
getUserCouponList() { getUserCouponList() {
let couponParams = { let couponParams = {
"lineId": '', //线路ID "lineId": '', //线路ID
...@@ -585,12 +556,12 @@ ...@@ -585,12 +556,12 @@
if(res.data.length>0){ if(res.data.length>0){
this.SaleList = res.data this.SaleList = res.data
if(res.data.length==1&&this.createBy==0){ if(res.data.length==1&&this.createBy==0){
this.SaleName = res.data[0].EmName this.parametersMsg.SaleName = res.data[0].EmName
this.SaleId = res.data[0].CreateBy this.parametersMsg.SaleId = res.data[0].CreateBy
} }
}else{ }else{
this.SaleName = '' this.parametersMsg.SaleName = ''
this.SaleId = 0 this.parametersMsg.SaleId = 0
} }
} else { } else {
...@@ -695,6 +666,11 @@ ...@@ -695,6 +666,11 @@
htmlstr = htmlstr.replace(regex2, "$2display:block;max-width:100%;height:auto;$3"); htmlstr = htmlstr.replace(regex2, "$2display:block;max-width:100%;height:auto;$3");
return htmlstr; return htmlstr;
}, },
getService(item){
this.parametersMsg = item
this.showSalePreviwe = false;
this.goReserce()
},
//立即预定 //立即预定
goReserce() { goReserce() {
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
...@@ -720,11 +696,11 @@ ...@@ -720,11 +696,11 @@
} }
// #ifdef MP-AG // #ifdef MP-AG
if (this.SaleList&&this.SaleList.length>1&&this.SaleId==0&&this.createBy==0) { if (this.SaleList&&this.SaleList.length>1&&this.parametersMsg.SaleId==0&&this.createBy==0) {
uni.showToast({ // uni.showToast({
title: "请选择服务人员", // title: "请选择服务人员",
icon: "none", // icon: "none",
}); // });
this.showSalePreviwe = true; this.showSalePreviwe = true;
return; return;
} }
...@@ -735,9 +711,8 @@ ...@@ -735,9 +711,8 @@
createBy = this.createBy>0?this.createBy:employeeId createBy = this.createBy>0?this.createBy:employeeId
// #endif // #endif
// #ifdef MP-AG // #ifdef MP-AG
if(this.createBy>0||this.SaleId) createBy = this.createBy>0?this.createBy:this.SaleId if(this.createBy>0||this.parametersMsg.SaleId) createBy = this.createBy>0?this.createBy:this.parametersMsg.SaleId
// #endif // #endif
uni.navigateTo({ uni.navigateTo({
url: "/pages/visa/visa_Reserve?id=" +this.delMsg.Pid+'&CreateBy=' +createBy, url: "/pages/visa/visa_Reserve?id=" +this.delMsg.Pid+'&CreateBy=' +createBy,
}); });
......
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