Skip to content

B
bigwood
Commit 36bf4b35 authored by youjie's avatar youjie
Browse files
Options

no message

parent d30354f5
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 44 deletions
src/api/axios.ts
View file @ 36bf4b35
import { Data } from './../../node_modules/_vite@2.9.15@vite/dist/node/index.d';
import Axios, { AxiosResponse, AxiosRequestConfig, AxiosError } from 'axios'
import message from '../utils/message'
......
src/api/axiosJava.ts
View file @ 36bf4b35
import { Data } from './../../node_modules/_vite@2.9.15@vite/dist/node/index.d';
import Axios, { AxiosResponse, AxiosRequestConfig, AxiosError } from 'axios'
import message from '../utils/message'
import { i18n } from '../boot/i18n'
import router from '../router'
// import { message } from 'ant-design-vue'
// import Store from '../store'
// import { Notify } from 'quasar'
import * as OpenCC from 'opencc-js'
import { ApiResult } from 'src/@types/enumHelper';
import { dispatchAction } from 'src/store/utils';
import { UserActionsType } from 'src/store/modules/user/actions';
import { currentRouter } from 'src/router'
let {locale,t} =i18n.global
let converterTW = OpenCC.Converter({ from: 'cn', to: 'tw' }) //转繁
let datas: AxiosResponse // 接收需要转繁数据
......@@ -76,8 +69,8 @@ const service = Axios.create({
baseURL: process.env.JAVA_URL_API,
timeout: 20000,
headers: {
'Content-Type': 'application/json',
'Referer-Viitto': window.history.state.current
'User-Type': 'bus',
'Content-Type': 'application/json;charset=UTF-8'
}
})
......
src/api/request.ts
View file @ 36bf4b35
......@@ -36,7 +36,7 @@ const request = (cmd:string,msg:any,isTrans:boolean=true): Promise<HttpResponse>
let timestamp = (new Date()).valueOf();
if (Store.state && Store.state.user?.token) {
token = Store.state.user?.token?.access_token
key = Store.state.user?.secretKey
key = Store.state.user?.userDetail?.secretKey
}
if (Store.state && Store.state.user?.userDetail) {
groupId = Store.state.user?.userDetail?.groupId
......
src/api/requestJava.ts
View file @ 36bf4b35
......@@ -33,7 +33,7 @@ const request = (cmd:string,msg:any): Promise<HttpResponse>=>{
let timestamp = (new Date()).valueOf();
if (Store.state.user?.token) {
token = Store.state.user?.token?.access_token
//key = Store.state.user?.secretKey
key = Store.state.user?.userDetail?.secretKey
}
if (Store.state.user?.userDetail) {
groupId = Store.state.user?.userDetail?.groupId
......@@ -43,12 +43,9 @@ const request = (cmd:string,msg:any): Promise<HttpResponse>=>{
var postData = {
"groupId": groupId,
"msg": msg,
// "cmd": cmd,
"timestamp": timestamp,
"token": token,
"sign": md5Str,
// "locale": language,
// "currencyCode": currencyCode
}
return service.post(process.env.JAVA_URL_API+cmd, postData)
}
......
src/api/scheduledTrip.ts
View file @ 36bf4b35
......@@ -11,9 +11,6 @@ class scheduledTripService {
static async GetWaitDealOrderPageList(param:any):Promise<HttpResponse>{
return request('b2b_get_GetWaitDealOrderPageList',param)
}
// static async GetTravelOneDayOrderList(param:any):Promise<HttpResponse>{
// return request('sellorder_post_GetTravelOneDayOrderList',param)
// }
// 跟团订单提交
static async SetOrderInfoForB2B(param:any):Promise<HttpResponse>{
return request('sellorder_post_SetOrderInfoForB2B',param)
......
src/components/searchdata/rightList.vue
View file @ 36bf4b35
......@@ -147,7 +147,7 @@
>{{ x.dayNum }} {{$t('v103.scheduledTrip.day')}}</span
>
</div>
<div class="text-h6 product-price">CNY：{{ x.b2CPrice }}</div>
<div class="text-h6 product-price">CNY：{{ x.b2BPrice }}</div>
</div>
</div>
</div>
......
src/components/trip/calendar.vue
View file @ 36bf4b35
......@@ -67,7 +67,7 @@
}"
>
{{
x.price ? x.price.originalB2CPrice : "&nbsp;"
x.price ? x.price.originalB2BPrice : "&nbsp;"
}}
</div>
</div>
......
src/components/trip/orderPreview.vue
View file @ 36bf4b35
......@@ -19,13 +19,13 @@
</div>
<div v-if="$q.platform.is.mobile">
<span class="text-grey-7 product-price" style="font-size: 13px">
CNY {{ p.originalB2CPrice }} /每人
CNY {{ p.originalB2BPrice }} /每人
</span>
</div>
</div>
<div class="row items-end">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
CNY {{ p.originalB2CPrice }} /每人
CNY {{ p.originalB2BPrice }} /每人
</span>
<q-input
style="width: 150px"
......@@ -75,14 +75,14 @@
<div v-if="$q.platform.is.mobile">
<span class="text-grey-7 product-price" style="font-size: 13px">
CNY
{{ p.originalB2CPrice - p.childNoNeedPrice }} /每人
{{ p.originalB2BPrice - p.childNoNeedPrice }} /每人
</span>
</div>
</div>
<div class="row items-end">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
CNY
{{ p.originalB2CPrice - p.childNoNeedPrice }} /每人
{{ p.originalB2BPrice - p.childNoNeedPrice }} /每人
</span>
<q-input
style="width: 150px"
......@@ -132,7 +132,7 @@
<div v-if="$q.platform.is.mobile">
<span class="text-grey-7 product-price" style="font-size: 13px">
CNY
{{ p.childNeedPrice + p.originalB2CPrice }} /每人
{{ p.childNeedPrice + p.originalB2BPrice }} /每人
</span>
</div>
</div>
......@@ -143,7 +143,7 @@
style="font-size: 13px"
>
CNY
{{ p.childNeedPrice + p.originalB2CPrice }} /每人
{{ p.childNeedPrice + p.originalB2BPrice }} /每人
</span>
<q-input
style="width: 150px"
......@@ -354,6 +354,7 @@ export default defineComponent({
data.p = n;
data.chosenObj.startDate = n.startDate;
methods.calcMoney()
console.log(data.p,'====-----')
},{deep: true}
)
const methods = {
......@@ -456,12 +457,12 @@ export default defineComponent({
methods.calcMoney()
},
calcMoney() {
if (!data.p || !data.p.originalB2CPrice) return data.sumPrice=0;
if (!data.p || !data.p.originalB2BPrice) return data.sumPrice=0;
data.chosenObj.etCount = data.chosenObj.etbzcCount + data.chosenObj.etzcCount
let money =
data.p.originalB2CPrice * data.chosenObj.crCount;
data.p.originalB2BPrice * data.chosenObj.crCount;
money +=
(data.p.originalB2CPrice-data.p.childNoNeedPrice+data.p.babyChargePrice) * data.chosenObj.etCount;
(data.p.originalB2BPrice-data.p.childNoNeedPrice+data.p.babyChargePrice) * data.chosenObj.etCount;
money += data.p.babyPrice * data.chosenObj.yeCount;
money += data.p.singleRoomPrice * data.chosenObj.df;
......
src/pages/CharteredBus/CharteredBusPreview.vue
View file @ 36bf4b35
......@@ -498,7 +498,6 @@ export default defineComponent({
menu.value = 5
const methods = {
changeKeyword(val: String) {
console.log(val,'====')
if(data.typeMap==1){
data.msg.GetonAddress = data.Address+val
}if(data.typeMap==2){
......
src/pages/scheduledTrip/TripOrderPreview.vue
View file @ 36bf4b35
......@@ -118,14 +118,14 @@
<div class="text-grey-900 text-subtitle2 text-weight-bold">{{ $t('v102.ticket.ms') }}</div>
<div class="row q-my-sm" v-if="chosenObj.crCount > 0">
<div class="col"><q-badge color="grey-3" style="padding: 5px 8px" text-color="info" label="成人佔床" /> x {{ chosenObj.crCount }}</div>
<div>CNY {{ price.originalB2CPrice }}</div>
<div>CNY {{ price.originalB2BPrice }}</div>
</div>
<div class="row q-my-sm" v-if="chosenObj.etzcCount > 0">
<div class="col"><q-badge color="grey-3" style="padding: 5px 8px" text-color="info" label="兒童佔床" /> x {{ chosenObj.etzcCount }}</div>
<div>
CNY
{{
price.originalB2CPrice + price.childNeedPrice
price.originalB2BPrice + price.childNeedPrice
}}
</div>
</div>
......@@ -134,7 +134,7 @@
<div>
CNY
{{
price.originalB2CPrice - price.childNoNeedPrice
price.originalB2BPrice - price.childNoNeedPrice
}}
</div>
</div>
......@@ -368,6 +368,7 @@ export default defineComponent({
.then(r => {
if (r.data.resultCode == ApiResult.SUCCESS) {
data.customer = r.data.data
methods.initia()
} else {
message.errorMsg(r.data.message)
}
......@@ -403,17 +404,17 @@ export default defineComponent({
},
// 计算总金额
calcMoney() {
let money = data.price.originalB2CPrice * data.chosenObj.crCount;
let money = data.price.originalB2BPrice * data.chosenObj.crCount;
data.price.discountPrice = data.price.discountPrice
? data.price.discountPrice
: 0;
money +=
(data.price.originalB2CPrice -
(data.price.originalB2BPrice -
data.price.childNoNeedPrice +
data.price.babyChargePrice) *
data.chosenObj.etbzcCount;
money +=
(data.price.originalB2CPrice +
(data.price.originalB2BPrice +
data.price.childNeedPrice +
data.price.babyChargePrice) *
data.chosenObj.etzcCount;
......@@ -482,8 +483,8 @@ export default defineComponent({
CustomerId: data.customer.customerId,//客户id
DepartureCityId: data.chosenObj.unicoDep.city&&data.chosenObj.unicoDep.city.length>0?data.chosenObj.unicoDep.city[data.chosenObj.unicoDep.city.length-1]:data.detailsObj.startCityId,//出发城市
IsIntermodal: (data.chosenObj.unicoDep.city&&data.chosenObj.unicoDep.city.length>0&&data.chosenObj.unicoDep.date)?1:2,
Unit_Price: data.detailsObj.currentPriceInfo.b2BMemberPrice,//单价
TC_Price: data.detailsObj.currentPriceInfo.b2BMemberPrice,//价格、单价
Unit_Price: data.detailsObj.currentPriceInfo.b2BPrice,//成交单价
TC_Price: data.detailsObj.currentPriceInfo.b2BMemberPrice,//团本来的价格、单价
ManNum: data.chosenObj.crCount,//成人数
ChirdNum: data.chosenObj.etCount,//儿童数不占床
ChirdNeedBedNum: data.chosenObj.etzc,//儿童数占床
......@@ -524,6 +525,7 @@ export default defineComponent({
OrderSource:2,
RedEnvelopeMoney: 0,//使用红包
}
console.log(data.parameters,'------parameters')
},
getInfo(){
let param = Object.assign(data.msg)
......@@ -537,6 +539,7 @@ export default defineComponent({
methods.calcMoney()
methods.changeStartDate()
methods.getB2BSellByCustomerId()
} else {
message.errorMsg(r.data.message)
}
......@@ -547,7 +550,6 @@ export default defineComponent({
},
submit(){
methods.initia()
if(!data.isCheck) return
// let flag = false
if(data.loading) return
......
src/pages/scheduledTrip/detailsNew.vue
View file @ 36bf4b35
......@@ -6,7 +6,7 @@
:style="{ transform: stickyHeight }">
<div style="max-width: 1200px; margin-left: auto; margin-right: auto" :class="{ 'q-px-md': $q.screen.width < 1220 }" class="q-py-sm row items-center">
<span class="col product-price text-subtitle1 text-weight-bold" style="text-align: left">
<span>CNY {{ dataList.priceList[0].originalB2CPrice }}</span>
<span>CNY {{ dataList.priceList[0].originalB2BPrice }}</span>
<span class="q-ml-sm f12 text-grey-7">{{$t('v103.details.since')}}</span>
</span>
<q-btn color="primary" unelevated class="q-px-xl" :label="$t('v103.details.selectionscheme')" @click="goScrollHandler(priceListHeight)" />
......@@ -109,7 +109,7 @@
class="product-price text-h6"
v-if="dataList.priceList.length > 0"
>
CNY：{{ dataList.priceList[0].originalB2CPrice }}
CNY：{{ dataList.priceList[0].originalB2BPrice }}
<span class="f12 text-grey-6">{{$t('v103.details.since')}}</span>
</div>
<div v-else class="text-subtitle1 text-grey-6">{{$t('v103.details.nooffer')}}</div>
......@@ -169,7 +169,7 @@
</div>
<div class="" v-if="$q.platform.is.desktop">
<div class="row items-center">
<span class="product-price text-h6 q-mr-md">CNY {{ dataList.priceList[0].originalB2CPrice }}</span>
<span class="product-price text-h6 q-mr-md">CNY {{ dataList.priceList[0].originalB2BPrice }}</span>
<q-btn color="primary" outline :label="showOrderPreview ? $t('v103.details.deselect') : $t('v103.details.choose')" @click="showOrderPreview = !showOrderPreview" class="q-px-lg" />
</div>
<div class="text-info q-mt-md text-right">{{$t('v103.details.earliest')}}：{{ dataList.priceList[0].startDate }}</div>
......@@ -522,7 +522,6 @@ export default defineComponent({
})
}
}
console.log(data.dataList,'----')
data.dataList.imgCover = JSON.parse(data.dataList.imgCover)
data.dayList = data.dataList.dayList
data.isShow = true
......
src/pages/scheduledTrip/scheduledTripList.vue
View file @ 36bf4b35
......@@ -703,6 +703,7 @@ import { date,useQuasar } from "quasar";
import { provide,inject, reactive, toRefs, defineComponent,ref,watch, getCurrentInstance } from 'vue';
import { useI18n } from 'vue-i18n'
import { DirtionmaryHelper } from 'src/config/dictionary'
import useMetaModule from '../../module/meta/metaModule'
import search from 'src/components/searchdata/search.vue'
import rightList from 'src/components/searchdata/rightList.vue'
export default defineComponent({
......@@ -712,7 +713,10 @@ export default defineComponent({
const { t } = useI18n()
const $q = useQuasar()
let {ctx:that, proxy} = getCurrentInstance()
let { setTitle } = useMetaModule()
const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any
pageTitle.value = '預訂行程'
setTitle(pageTitle.value)
const data= reactive({
})
......
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