Skip to content

M
million
Commit 0f92e232 authored by 吴春's avatar 吴春
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/viitto/million

parents df15a353 03f3b4a6
Hide whitespace changes
Inline Side-by-side
Showing with 347 additions and 70 deletions
src/boot/utils.js
View file @ 0f92e232
......@@ -135,7 +135,7 @@ Vue.prototype.apiJavaPost = function(cmd, msg, successCall, faildCall) {
var GroupId = 0;
if (this.getLocalStorage() != null) {
token = this.getLocalStorage().token;
key = this.getLocalStorage().secretKey;
key = '' //this.getLocalStorage().secretKey;
}
if (localStorage.groupinfo && localStorage.groupinfo != 'undefined') {
var groupJson = JSON.parse(localStorage.groupinfo);
......
src/components/base-switch.vue
View file @ 0f92e232
......@@ -33,7 +33,7 @@
left:0px;
}
.wrapper input:checked + label {
background:green;
background:#66D344;
}
.wrapper input:checked + label::before {
left: calc(100%);
......
src/components/common/coupon.vue
View file @ 0f92e232
<template>
<q-card flat class="q-pa-md q-mt-lg">
<q-card flat class="q-pa-md q-mt-lg" v-if="coupons">
<div class="row items-center">
<div class="text-subtitle1 text-weight-bolder q-mb-md col">
<span>優惠券</span>
<span class="text-weight-regular q-ml-sm text-body2">（可用優惠券 0 張）</span>
<span class="text-weight-regular q-ml-sm text-body2">（可用優惠券 {{ coupons.length }} 張）</span>
</div>
<q-toggle v-model="showDisable" label="顯示不可用優惠券" style="zoom:0.8;margin-top: -24px;" v-if="isExplends"/>
<!-- <q-toggle v-model="showDisable" label="顯示不可用優惠券" style="zoom:0.8;margin-top: -24px;" v-if="isExplends"/> -->
<q-icon :name="isExplends?'keyboard_arrow_up':'keyboard_arrow_down'" @click="$event=>isExplends=!isExplends" size="32px" color="grey-9" class="q-ml-md cursor-pointer" style="margin-top:-10px;"/>
</div>
<div v-if="isExplends">
<div class="row q-col-gutter-md">
<div :class="filedWidth">
<div class="cursor-pointer">
<div :class="filedWidth" v-for="(x,i) in coupons" :key="i">
<div class="cursor-pointer" :class="{'unUsed':currentPrice<x.useCondition}">
<div class="coupon-head">
<div class="check-tools">
<q-checkbox v-model="chosenCouponId" :value="1" dense color="teal" />
<div class="check-tools" v-if="currentPrice>=x.useCondition">
{{ x.couponId }}
<q-checkbox v-model="chosenCouponId" :val="x.couponId" label="" dense color="teal" />
{{ chosenCouponId }}
</div>
<div class="q-pa-lg q-mt-lg">
<div class="row items-center">
<div class="text-h4 text-weight-bold text-white col">
{{ moneyFormat(500,2) }}
<div class="text-h4 text-weight-bold text-white col" v-if="x.couponsType==1">
{{ moneyFormat(x.denomination,2) }}
</div>
<div class=" f12 text-white">滿 2000 可用</div>
<div class="text-h4 text-weight-bold text-white col" v-if="x.couponsType==2">
{{ x.denomination }}
<span class="q-ml-sm text-weight-thin text-subtitle1">折</span>
</div>
<div class=" f12 text-white">滿 {{ x.useCondition }} 可用</div>
</div>
<div class="q-mt-sm f12" style="color:#195954">有效期至：2023.02.30</div>
<div class="q-mt-sm f12" style="color:#195954">有效期至：{{ x.expirationDate}}</div>
</div>
</div>
<div class="q-px-lg q-py-md coupon-content">
......@@ -34,12 +40,12 @@
</div>
<div class="row q-mt-sm">
<div class="col-5">使用品類：</div>
<div class="">多日遊行程適用</div>
<div class="">{{ x.rangeName }}</div>
</div>
</div>
</div>
</div>
<div :class="filedWidth">
<!-- <div :class="filedWidth">
<div class="unUsed">
<div class="coupon-head">
<div class="q-pa-lg q-mt-lg">
......@@ -63,9 +69,9 @@
</div>
</div>
</div>
</div>
</div> -->
</div>
<div class="text-center q-mt-lg" v-if="1==2">
<div class="text-center q-mt-lg" v-if="coupons.length==0">
<p>
<img src="~assets/sad.svg" style="width: 50px" />
</p>
......@@ -76,8 +82,21 @@
</template>
<script>
import EnumHelper from 'src/utils/enumhelper';
import ProductTypeEnum from 'src/utils/producttypeenum';
import {date} from 'quasar'
export default {
props:["goodsInfo"],
props:{
productType:{
type:Number,
required:true
},
currentPrice:{
type:Number,
required:false,
default:0
}
},
computed: {
filedWidth() {
return {
......@@ -90,13 +109,43 @@ export default {
return {
showDisable:false,
isExplends:false,
chosenCouponId:false
chosenCouponId:[],
couponsUseScope:1,
coupons:null
};
},
created() {
this.couponsUseScope = this.productType+1
this.getProductCouponHandler()
},
methods: {
changeDiscountHandler(){
changeDiscountHandler(x){
}
},
getProductCouponHandler(){
this.apiJavaPost(
"/api/b2b/user/getUserCanUseCouponList",
{
lineId:0,
lineteamId:0,
CouponsUseScope:this.couponsUseScope
},
res => {
this.coupons = res.data.data
if(this.coupons && this.coupons.length>0){
this.coupons.forEach(x=>{
x.rangeName = EnumHelper.ParseToEnum(ProductTypeEnum,this.couponsUseScope,'value').desc
x.expirationDate = date.formatDate(x.expirationDate,'YYYY.MM.DD')
})
this.isExplends = this.coupons.length>0
}else{
this.coupons = []
}
},
null
);
},
},
}
</script>
......
src/components/navs/hor-big-one.vue
View file @ 0f92e232
......@@ -266,7 +266,7 @@ color: #EE4454;
</q-btn>
<q-btn label="帮助中心" flat></q-btn>
<q-btn v-if="LoginUser.id <= 0" label="注册" flat></q-btn>
<template v-if="LoginUser.id > 0">
<template v-if="LoginUser.token">
<q-btn-dropdown
style="color: #444; font-weight: bold"
class="q-ml-lg"
......@@ -703,7 +703,7 @@ export default {
this.$nextTick(() => {
this.isPic =
document.URL.indexOf("localhost") != -1 ||
document.URL.indexOf("t.oytour.com") != -1;
document.URL.indexOf("www.oytour.com") != -1;
});
},
err => {}
......
src/components/trip/calendar.vue
View file @ 0f92e232
......@@ -117,15 +117,18 @@ export default {
},
created() {
this.prices = this.priceList;
console.log(this.prices)
this.init();
},
methods: {
init() {
this.createChosenDateHandler();
let firstMonth = date.formatDate(
new Date(this.prices[0].startDate),
"YYYY/MM"
);
console.log(firstMonth)
let current = this.months.findIndex((x) => x.monthValue == firstMonth)
this.currentMonth = current>-1?current:0;
this.changeMonthHandler();
......
src/components/trip/orderPreview.vue
View file @ 0f92e232
......@@ -504,9 +504,10 @@ export default {
let order = {
configId:this.travel.id,
tcid:this.p.tcid,
startCityId:this.currentUnionCity?this.currentUnionCity.cityId:this.travel.startCityId,
startCityId:this.currentUnionCity && this.currentUnionCity.cityId ?this.currentUnionCity.cityId:this.travel.startCityId,
orderInfo:this.chosenObj
}
let key = this.$md5(JSON.stringify(order))
let lineCars = localStorage.getItem('lineCars')
lineCars = lineCars?JSON.parse(lineCars):[]
......
src/css/app.scss
View file @ 0f92e232
......@@ -99,6 +99,9 @@
.f20 {
font-size: 20px;
}
.f22 {
font-size: 22px;
}
.f26 {
font-size: 26px;
}
......
src/pages/Index.vue
View file @ 0f92e232
......@@ -439,7 +439,7 @@ export default {
}
}
this.$nextTick(()=>{
this.isPic = document.URL.indexOf("localhost")!=-1||document.URL.indexOf("t.oytour.com")!=-1
this.isPic = document.URL.indexOf("localhost")!=-1||document.URL.indexOf("www.oytour.com")!=-1
});
},
(err) => {}
......
src/pages/line/orderPreview.vue
View file @ 0f92e232
......@@ -306,7 +306,7 @@
/>
</q-card>
<coupon></coupon>
<coupon v-if="price && price.tcid" :product-type="productType" :current-price="sumPrice"></coupon>
</div>
<div
class="relative-position"
......@@ -458,6 +458,8 @@ import coupon from "../../components/common/coupon.vue";
import NoneData from "src/components/common/noneData.vue";
import auth from "src/components/common/auth.vue";
import {date} from 'quasar'
import ProductTypeEnum from '../../utils/producttypeenum'
import EnumHelper from '../../utils/enumhelper'
export default {
components: {
coupon,
......@@ -546,7 +548,8 @@ export default {
unionCity: null,
sumPrice:0,
submiting:false,
CouponIds:[]
CouponIds:[],
productType:0
};
},
computed: {
......@@ -564,6 +567,7 @@ export default {
}
},
created() {
if (this.checkParamsHandler()) {
this.initGuestHandler();
this.getTripData();
......@@ -594,6 +598,8 @@ export default {
}
this.submiting=false
},
submitOrderHandler(){
let msg={
OrderId:0,
......@@ -702,7 +708,7 @@ export default {
GoodsId:this.order.order.tcid,
GoodsName:this.trip.title,
GoodsPic:this.trip.imgCover[0].Url,
GoodsType:this.price.teamType==0?2:(this.price.teamType==2?1:3),
GoodsType:this.productType,
OrderMake:`${ this.unionCity && this.unionCity.goFlight? this.unionCity.goFlight.startDate :this.price.startDate}從${this.unionCity?this.unionCity.cityName:this.trip.startCityName }出發 ${guestInfo}`,
TotalPrice:this.sumPrice,
PreferentialPrice:this.chosenObj.discountPrice,
......@@ -721,6 +727,9 @@ export default {
}
})
},
getProductTypeHandler(){
return (this.price.teamType==0?ProductTypeEnum.TEAM_TRIP:(this.price.teamType==2?ProductTypeEnum.ONE_DAY:ProductTypeEnum.UNIT_TRIP)).value
},
goPayHandler(pay){
let key = this.$md5(JSON.stringify(pay))
let pays = localStorage.getItem('pays')
......@@ -886,6 +895,7 @@ export default {
},
getTripData() {
this.$q.loading.show();
let msg = {
cityId: this.order.order.startCityId,
......@@ -904,8 +914,8 @@ export default {
this.trip = r.data.data;
this.trip.imgCover = JSON.parse(this.trip.imgCover);
this.price = this.trip.priceList[0];
if(this.order.order.startCityId!=this.trip.startCityId){
this.price = this.trip.currentPriceInfo;
if(this.order.order.startCityId && this.order.order.startCityId!=this.trip.startCityId){
this.unionCity = this.price.unionCityList.find(x=>x.cityId == this.order.order.startCityId)
if(this.unionCity.backFlight && this.unionCity.backFlight.addPrice){
this.price.originalB2CPrice+=this.unionCity.backFlight.addPrice
......@@ -915,8 +925,8 @@ export default {
}
}
this.calcMoney()
this.productType=this.getProductTypeHandler()
} else {
this.$q.notify({
type: "negative",
......
src/pages/usercenter/setAddress.vue
View file @ 0f92e232
......@@ -98,14 +98,13 @@
color="blue"
unelevated
outline
@click="isShowDialog = true"
label="添加郵寄地址"
></q-btn>
@click="addAddress"
><img class="q-mr-sm" style="width: 28px;" src="../../assets/img/address-add.png" />添加郵寄地址</q-btn>
</div>
</div>
<q-dialog content-style="width: 900px" v-model="isShowDialog">
<div class="bg-white dialog-box" style="width: 800px; padding: 20px">
<div>添加邮寄地址</div>
<div class="f22 bold">{{form.Id ? '编辑': '添加'}}邮寄地址</div>
<form @submit.prevent.stop="submit" class="q-gutter-md">
<div>
<div class="row">
......@@ -126,6 +125,8 @@
<div class="title">選擇手機區號</div>
<q-select
ref="AreaCode"
emit-value
map-options
square
outlined
option-value="ID"
......@@ -154,6 +155,8 @@
<div class="col">
<div class="title">國家/地區</div>
<q-select
emit-value
map-options
ref="CountryId"
square
outlined
......@@ -244,6 +247,12 @@ export default {
this.getCountryInfo();
},
methods: {
addAddress() {
this.isShowDialog = true
this.form = {
Name: "",
Mobile: "",}
},
getCountryInfo() {
this.apipost(
"GetCountryInfo_post",
......@@ -322,6 +331,7 @@ export default {
editUser(item) {
console.log("editUser", item);
this.form = {...item};
this.form.AreaCode = Number(this.form.AreaCode)
this.form.IsDefault = this.form.IsDefault === 1
this.isShowDialog = true;
},
......@@ -355,8 +365,8 @@ export default {
},
submitUserInfo() {
let params = { ...this.form };
params.AreaCode = params.AreaCode.ID;
params.CountryId = params.CountryId.ID;
// params.AreaCode = params.AreaCode.ID;
// params.CountryId = params.CountryId.ID;
params.IsDefault = params.IsDefault ? 1 : 2;
this.apipost(
"b2c_post_SetMailingAddressInfo",
......
src/pages/usercenter/setUserInfo.vue
View file @ 0f92e232
......@@ -93,6 +93,8 @@
<div class="col">
<div class="title">居住國家/地區</div>
<q-select
emit-value
map-options
ref="Country"
square
outlined
......@@ -108,6 +110,8 @@
<div class="col">
<div class="title">稱謂</div>
<q-select
emit-value
map-options
ref="Appellation"
square
outlined
......@@ -126,6 +130,8 @@
<div class="col">
<div class="title">國家/地區代碼</div>
<q-select
emit-value
map-options
ref="PhoneCountry"
square
outlined
......
src/pages/usercenter/setUsersList.vue
View file @ 0f92e232
......@@ -8,8 +8,7 @@
width: 900px;
}
.title {
margin-top: 20px;
margin-bottom: 10px;
margin: 20px 10px 10px 10px;
}
.card {
margin: 10px;
......@@ -75,6 +74,12 @@
background-color: $primary;
margin: -8px auto 0 auto;
}
.card-info {
height: 20px;
padding: 0 4px;
background: #DDDDDD;
border-radius: 8px;
}
</style>
<template>
<div class="content q-ma-lg bg-white">
......@@ -98,17 +103,32 @@
</div>
</div>
</div>
<q-btn
<div class="q-pa-sm full-width">
<q-btn class="full-width"
color="primary"
unelevated
outline
@click="isShowDialog = true"
label="添加出行人"
></q-btn>
@click="addUser"
><img class="q-mr-sm" style="width: 28px;" src="../../assets/img/add.png" />添加出行人</q-btn>
</div>
<div class="mt flex justify-end">
<q-pagination
v-model="current"
:max="pageCount"
direction-links
color="primary"
active-color="primary"
:max-pages="5"
@input="pageChange"
/>
</div>
<q-dialog content-style="width: 900px" v-model="isShowDialog">
<div class="bg-white dialog-box" style="width: 800px; padding: 20px">
<div>添加邮寄地址</div>
<div class="f22 bold">{{form.Id ? '编辑': '新增'}}出行人信息</div>
<form @submit.prevent.stop="submit" class="q-gutter-md">
<div>
<div class="row">
......@@ -164,43 +184,53 @@
<div class="col">
<div class="title">國家/地區代碼</div>
<q-select
ref="PhoneCountry"
emit-value
map-options
ref="AreaCode"
square
outlined
option-value="ID"
option-label="PhoneCode"
class="form-item"
v-model="form.PhoneCountry"
v-model="form.AreaCode"
:options="phoneCountList"
placeholder="Filled"
placeholder="请选择國家/地區代碼"
:rules="[(val) => Boolean(val) || '请选择國家/地區代碼']"
/>
</div>
<div class="col">
<div class="title">電話（首次需驗證）</div>
<div class="title">手機號</div>
<q-input
ref="Mobile"
class="form-item"
placeholder="電話（首次需驗證）"
placeholder="手機號"
v-model="form.Mobile"
outlined
:rules="[(val) => !!val || '请输入電話（首次需驗證）']"
:rules="[(val) => !!val || '请输入手機號']"
></q-input>
</div>
</div>
<div
<div
v-for="(item, index) in form.CardList"
:key="item.id"
:key="item.id">
<div class="flex justify-between ml mr q-mt-lg" style="margin-bottom: -10px"><span class="card-info">证件信息#{{index+ 1}}</span>
<div v-if="index > 0" @click="deleteCardItem(item)">
<i class="iconfont iconline"></i>
<i class="iconfont icondelete"></i>
</div>
</div>
<div
class="row"
>
<div class="col">
<div class="title">证件类型</div>
<q-select
emit-value
map-options
ref="card"
square
outlined
option-value="ID"
option-value="Id"
option-label="Name"
class="form-item"
v-model="item.Type"
......@@ -212,25 +242,23 @@
<div class="col">
<div class="title flex justify-between items-center">
<div>证件号码</div>
<div v-if="index > 0" @click="deleteCardItem(item)">删除</div>
</div>
<q-input
class="form-item"
placeholder="電話（首次需驗證）"
placeholder="证件号码"
v-model="item.CardNo"
outlined
:rules="[(val) => !!val || '请输入電話（首次需驗證）']"
:rules="[(val) => !!val || '请输入证件号码']"
></q-input>
</div>
</div>
<q-btn
</div></div>
<q-btn class="ml"
color="primary"
@click="addCard"
unelevated
outline
label="新增证件"
/>
<div>
><img class="q-mr-sm" style="width: 28px;" src="../../assets/img/add.png" />新增证件</q-btn>
<div class="mt flex flex-center">
<q-btn color="primary" type="submit" unelevated label="保存" />
</div>
</div>
......@@ -243,6 +271,8 @@
export default {
data() {
return {
current: 1,
pageCount: 0,
isShowDialog: false,
selectedKey: "全部",
form: {
......@@ -270,6 +300,22 @@ export default {
this.getCardTypeList();
},
methods: {
pageChange(value) {
console.log('pageChange', value)
this.current = value
this.getUsersList()
},
addUser() {
this.isShowDialog = true
this.form = {
SurName: "",
Name: "",
EnName: "",
EnSurName: "",
Mobile: "",
CardList: [],}
this.addCard()
},
getCardTypeList() {
this.apipost(
"b2c_post_GetTripCardEnumList",
......@@ -277,6 +323,8 @@ export default {
(res) => {
if (res.data.resultCode == 1) {
this.cardList = res.data.data;
this.cardList.forEach(item => item.Id = Number(item.Id));
console.log('this.cardList', this.cardList)
} else {
// this.$notify(res.data.message);
this.$q.notify({
......@@ -298,7 +346,7 @@ export default {
if (res.data.resultCode == 1) {
const { phoneCountList, countList } = res.data.data;
this.countList = countList;
this.phoneCountList = phoneCountList;
this.phoneCountList = phoneCountList
} else {
// this.$notify(res.data.message);
this.$q.notify({
......@@ -319,6 +367,7 @@ export default {
this.id++;
this.form.CardList.push({
id: this.id,
Type: '',
});
},
deleteCardItem(card) {
......@@ -333,6 +382,7 @@ export default {
"EnName",
"EnSurName",
"Mobile",
"AreaCode",
];
verifyArr.forEach((item) => {
console.log("this.$refs[item]", this, item, this.$refs[item]);
......@@ -349,16 +399,31 @@ export default {
if (this.formHasError) {
return;
}
for(let i = 0; i < this.form.CardList.length; i++) {
let item = this.form.CardList[i]
if(!item.Type || !item.CardNo) {
// this.$notify(res.data.message);
this.$q.notify({
type: "negative",
message: '证件信息不完善,请补充',
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
return
}
}
this.submitUserInfo();
},
getUsersList() {
this.apipost(
"b2c_post_GetTripGuestPageList",
{pageIndex: 1, pageSize: 20},
{pageIndex: this.current, pageSize: 10},
(res) => {
if (res.data.resultCode == 1) {
const { count, pageData } = res.data.data;
const { count, pageData, pageCount } = res.data.data;
this.count = count;
this.pageCount = pageCount
this.pageData = pageData;
} else {
// this.$notify(res.data.message);
......@@ -375,7 +440,8 @@ export default {
},
editUser(item) {
console.log('editUser', item)
this.form = item
this.form = {...item}
this.form.AreaCode = Number(this.form.AreaCode)
this.isShowDialog = true
},
deleteUser(item) {
......@@ -392,6 +458,7 @@ export default {
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
this.current = 1
this.getUsersList();
} else {
// this.$notify(res.data.message);
......@@ -408,10 +475,9 @@ export default {
},
submitUserInfo() {
let params = { ...this.form };
params.PhoneCountry = params.PhoneCountry.ID;
params.CardList.forEach(item => {
item.Type = item.Type.Id
})
// params.CardList.forEach(item => {
// item.Type = item.Type.Id
// })
this.apipost(
"b2c_post_SetTripGuestInfo",
params,
......
src/utils/enumhelper.js 0 → 100644
View file @ 0f92e232
const EnumHelper = {
ParseToEnum(TEnum, value, comparison = '') {
if (Object.isFrozen) {
let t = Object.values(TEnum)
console.log(t, Symbol(1) == 1)
let r = t.find(x => (comparison != '' && x[comparison] == value) || (comparison == '' && x == value))
return r
} else {
throw new Error("这不是一个枚举类型");
}
}
}
export default EnumHelper
\ No newline at end of file
src/utils/producttypeenum.js 0 → 100644
View file @ 0f92e232
const ProductTypeEnum = Object.freeze({
/**
* 一日游
*/
ONE_DAY: {
value: 1,
desc: '一日游产品'
},
/**
* 多日游
*/
TEAM_TRIP: {
value: 2,
desc: '多日游产品'
},
/**
* 小包团
*/
UNIT_TRIP: {
value: 3,
desc: '小包团产品'
},
/**
* 景点门票
*/
SCENIC_SPOT: {
value: 4,
desc: '景点门票产品'
},
/**
* 主题乐园
*/
THEME_PART: {
value: 5,
desc: '主题乐园门票'
},
/**
* 博物馆
*/
MUSEUM: {
value: 6,
desc: '博物馆门票'
},
/**
* 历史景点
*/
HISTORY: {
value: 7,
desc: '历史景点门票'
},
/**
* 温泉酒店
*/
HOT_SPRING: {
value: 8,
desc: '温泉酒店产品'
},
/**
* 星级酒店
*/
STAR_HOTEL: {
value: 9,
desc: '星级酒店产品'
},
/**
* 度假酒店
*/
RESORT_HOTEL: {
value: 10,
desc: '度假酒店产品'
},
/**
* 民宿
*/
HOMESTAY: {
value: 11,
desc: '民宿产品'
},
/**
* 包车
*/
CHARTER: {
value: 12,
desc: '包车产品'
},
/**
* 接机
*/
PICK_UP: {
value: 13,
desc: '接机产品'
},
/**
* 送机
*/
DROP_OFF: {
value: 14,
desc: '送机产品'
}
})
export default ProductTypeEnum
\ No newline at end of file
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