Skip to content

M
million
Commit ce68ca22 authored by 黄奎's avatar 黄奎
Browse files
Options

临时提交

parent c997b6dc
Expand all Show whitespace changes
Inline Side-by-side
Showing with 713 additions and 724 deletions
src/boot/utils.js
View file @ ce68ca22
import Vue from 'vue' import Vue from 'vue'
import axios from 'axios' import axios from 'axios'
import md5 from 'js-md5' import md5 from 'js-md5'
// import {eventBus} from './eventBus'
import VueCoreVideoPlayer from 'vue-core-video-players' import VueCoreVideoPlayer from 'vue-core-video-players'
import 'viewerjs/dist/viewer.css' import 'viewerjs/dist/viewer.css'
import user from './user' import user from './user'
import message from './message' import message from './message'
import product from './product' import product from './product'
import VueViewer from 'v-viewer' import VueViewer from 'v-viewer'
// import VueCoreVideoPlayer from 'vue-core-video-player'
Vue.prototype.$EventBus = new Vue() Vue.prototype.$EventBus = new Vue()
Vue.use(VueCoreVideoPlayer) Vue.use(VueCoreVideoPlayer)
Vue.use(VueViewer) Vue.use(VueViewer)
Vue.prototype.$md5 = md5; Vue.prototype.$md5 = md5;
Vue.prototype.$message = message Vue.prototype.$message = message
Vue.prototype.$product = product Vue.prototype.$product = product
//域名管理对象 //域名管理对象
Vue.prototype.domainManager = function() { Vue.prototype.domainManager = function () {
let domainUrl = ''; let domainUrl = 'http://192.168.5.214';
domainUrl = "http://192.168.2.214:8082"; domainUrl = "http://192.168.5.46:8501";
domainUrl = "http://127.0.0.1"; var domainNameUrl = window.location.hostname;
let domainNameUrl = this.GetDomain(); if (domainNameUrl.indexOf('oytour') !== -1) {
domainNameUrl = "http://tmb2b.oytour.com/" domainUrl = 'http://reborn.oytour.com'
if (domainNameUrl.indexOf('testerp.oytour') !== -1) {
domainUrl = "http://testapi.oytour.com";
} else if (domainNameUrl.indexOf('oytour') !== -1) {
// domainUrl = "http://reborn.oytour.com";
domainUrl = 'http://192.168.10.226:8015' //'http://192.168.10.226:8015' ''http://192.168.10.9:8083' '
} }
var obj = { var obj = {
//主地址 DomainUrl: domainUrl, //ERP接口地址
DomainUrl: domainUrl, PostUrl: domainUrl + "/api/common/post", //常用提交数据URL
//常用提交数据URL
PostUrl: domainUrl + "/api/common/post",
javaUrl: 'http://efficient.oytour.com' javaUrl: 'http://efficient.oytour.com'
}; };
return obj; return obj;
} }
//获取当前域名 //获取当前域名
Vue.prototype.GetDomain = function() { Vue.prototype.GetDomain = function () {
var domainNameUrl = window.location.hostname; var domainNameUrl = window.location.hostname;
domainNameUrl = "www.oytour.com"; domainNameUrl = "www.oytour.com";
return domainNameUrl; return domainNameUrl;
} }
Vue.prototype.groupBy = function(array, f) { Vue.prototype.groupBy = function (array, f) {
const groups = {}; const groups = {};
array.forEach((item) => { array.forEach((item) => {
const group = JSON.stringify(f(item)); const group = JSON.stringify(f(item));
...@@ -58,7 +50,8 @@ Vue.prototype.groupBy = function(array, f) { ...@@ -58,7 +50,8 @@ Vue.prototype.groupBy = function(array, f) {
}; };
}); });
} }
Vue.prototype.moneyFormat = function(num, decimal = 2, split = ',') {
Vue.prototype.moneyFormat = function (num, decimal = 2, split = ',') {
function thousandFormat(num) { function thousandFormat(num) {
const len = num.length const len = num.length
return len <= 3 ? num : thousandFormat(num.substr(0, len - 3)) + split + num.substr(len - 3, 3) return len <= 3 ? num : thousandFormat(num.substr(0, len - 3)) + split + num.substr(len - 3, 3)
...@@ -82,9 +75,9 @@ Vue.prototype.moneyFormat = function(num, decimal = 2, split = ',') { ...@@ -82,9 +75,9 @@ Vue.prototype.moneyFormat = function(num, decimal = 2, split = ',') {
} else { } else {
return '--' return '--'
} }
} }
//HTTP提交数据 //HTTP提交数据
Vue.prototype.apipost = function(cmd, msg, successCall, faildCall) { Vue.prototype.apipost = function (cmd, msg, successCall, faildCall) {
if (msg == null || msg == "") { if (msg == null || msg == "") {
msg = {} msg = {}
} }
...@@ -122,10 +115,12 @@ Vue.prototype.apipost = function(cmd, msg, successCall, faildCall) { ...@@ -122,10 +115,12 @@ Vue.prototype.apipost = function(cmd, msg, successCall, faildCall) {
} }
}) })
.then(res => { .then(res => {
if(res.data.resultCode === 10000) { if (res.data.resultCode === 10000) {
this.$router.replace({ this.$router.replace({
path: '/login', path: '/login',
query: {path: path} query: {
path: path
}
}); });
return return
} }
...@@ -134,7 +129,7 @@ Vue.prototype.apipost = function(cmd, msg, successCall, faildCall) { ...@@ -134,7 +129,7 @@ Vue.prototype.apipost = function(cmd, msg, successCall, faildCall) {
}, faildCall) }, faildCall)
} }
Vue.prototype.apiJavaPost = function(cmd, msg, successCall, faildCall) { Vue.prototype.apiJavaPost = function (cmd, msg, successCall, faildCall) {
if (msg == null || msg == "") { if (msg == null || msg == "") {
msg = {} msg = {}
} }
...@@ -146,7 +141,7 @@ Vue.prototype.apiJavaPost = function(cmd, msg, successCall, faildCall) { ...@@ -146,7 +141,7 @@ Vue.prototype.apiJavaPost = function(cmd, msg, successCall, faildCall) {
var GroupId = 0; var GroupId = 0;
if (this.getLocalStorage() != null) { if (this.getLocalStorage() != null) {
token = this.getLocalStorage().token; token = this.getLocalStorage().token;
key = '' //this.getLocalStorage().secretKey; key = '';
} }
if (localStorage.groupinfo && localStorage.groupinfo != 'undefined') { if (localStorage.groupinfo && localStorage.groupinfo != 'undefined') {
var groupJson = JSON.parse(localStorage.groupinfo); var groupJson = JSON.parse(localStorage.groupinfo);
...@@ -175,7 +170,7 @@ Vue.prototype.apiJavaPost = function(cmd, msg, successCall, faildCall) { ...@@ -175,7 +170,7 @@ Vue.prototype.apiJavaPost = function(cmd, msg, successCall, faildCall) {
//获取缓存 //获取缓存
Vue.prototype.getLocalStorage = function() { Vue.prototype.getLocalStorage = function () {
try { try {
var localStorageData = window.localStorage["b2bUser"]; var localStorageData = window.localStorage["b2bUser"];
if (localStorageData !== undefined && localStorageData != 'undefined') { if (localStorageData !== undefined && localStorageData != 'undefined') {
...@@ -190,7 +185,7 @@ Vue.prototype.apiJavaPost = function(cmd, msg, successCall, faildCall) { ...@@ -190,7 +185,7 @@ Vue.prototype.apiJavaPost = function(cmd, msg, successCall, faildCall) {
} }
//向外跳转 //向外跳转
Vue.prototype.OpenNewUrl = function(URL) { Vue.prototype.OpenNewUrl = function (URL) {
if (URL && URL != '') { if (URL && URL != '') {
if (URL.indexOf("https") != -1) { if (URL.indexOf("https") != -1) {
var str = 'http://' + URL.substring(8); var str = 'http://' + URL.substring(8);
...@@ -205,8 +200,8 @@ Vue.prototype.OpenNewUrl = function(URL) { ...@@ -205,8 +200,8 @@ Vue.prototype.OpenNewUrl = function(URL) {
} }
//公用跳转 //公用跳转
Vue.prototype.CommonJump = function(path, obj, type = 'push') { Vue.prototype.CommonJump = function (path, obj, type = 'push') {
let p = typeof(path) == 'string' ? path : this.$product.genernalUrl(path) let p = typeof (path) == 'string' ? path : this.$product.genernalUrl(path)
if (type === 'blank') { // 新窗口打开 if (type === 'blank') { // 新窗口打开
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
path: p, path: p,
...@@ -225,8 +220,9 @@ Vue.prototype.CommonJump = function(path, obj, type = 'push') { ...@@ -225,8 +220,9 @@ Vue.prototype.CommonJump = function(path, obj, type = 'push') {
}); });
} }
} }
Vue.prototype.$user = user Vue.prototype.$user = user
Vue.prototype.createCalendar = function(dateStr) { Vue.prototype.createCalendar = function (dateStr) {
var days = []; var days = [];
var date; var date;
if (dateStr) { if (dateStr) {
...@@ -279,9 +275,9 @@ Vue.prototype.createCalendar = function(dateStr) { ...@@ -279,9 +275,9 @@ Vue.prototype.createCalendar = function(dateStr) {
CurrentYear: currentYear, CurrentYear: currentYear,
CurrentWeek: currentWeek CurrentWeek: currentWeek
}; };
} }
//格式化日期 //格式化日期
Vue.prototype.formatDate = function(year, month, day) { Vue.prototype.formatDate = function (year, month, day) {
var y = year; var y = year;
var m = month; var m = month;
if (m < 10) m = "0" + m; if (m < 10) m = "0" + m;
...@@ -291,7 +287,7 @@ Vue.prototype.formatDate = function(year, month, day) { ...@@ -291,7 +287,7 @@ Vue.prototype.formatDate = function(year, month, day) {
} }
//格式化日期二 //格式化日期二
Vue.prototype.formatDate2 = function(dateStr) { Vue.prototype.formatDate2 = function (dateStr) {
var date = new Date(dateStr); var date = new Date(dateStr);
return { return {
CYear: date.getFullYear(), CYear: date.getFullYear(),
...@@ -301,7 +297,7 @@ Vue.prototype.formatDate2 = function(dateStr) { ...@@ -301,7 +297,7 @@ Vue.prototype.formatDate2 = function(dateStr) {
} }
//添加月份 //添加月份
Vue.prototype.AddMonth = function(dateStr, month) { Vue.prototype.AddMonth = function (dateStr, month) {
var v = new Date(dateStr); var v = new Date(dateStr);
if (v) { if (v) {
var t = new Date(v.getFullYear(), v.getMonth(), v.getDate(), v.getHours(), v.getMinutes(), v.getSeconds(), v.getMilliseconds()); var t = new Date(v.getFullYear(), v.getMonth(), v.getDate(), v.getHours(), v.getMinutes(), v.getSeconds(), v.getMilliseconds());
...@@ -314,10 +310,10 @@ Vue.prototype.AddMonth = function(dateStr, month) { ...@@ -314,10 +310,10 @@ Vue.prototype.AddMonth = function(dateStr, month) {
} }
//获取URL中参数 //获取URL中参数
Vue.prototype.getUrlKey = function(name, url) { Vue.prototype.getUrlKey = function (name, url) {
return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(url) || [, ""])[1].replace(/\+/g, '%20')) || null return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(url) || [, ""])[1].replace(/\+/g, '%20')) || null
} }
Vue.prototype.GetHtml = function(str) { Vue.prototype.GetHtml = function (str) {
if (str && str != "") { if (str && str != "") {
return str.replace(/&lt;/g, '<').replace(/&gt;/g, '>') return str.replace(/&lt;/g, '<').replace(/&gt;/g, '>')
.replace(/&amp;/g, '&').replace(/&quot;/g, '"').replace(/&apos;/g, "'"); .replace(/&amp;/g, '&').replace(/&quot;/g, '"').replace(/&apos;/g, "'");
......
src/components/navs/hor-big-one.vue
View file @ ce68ca22
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
.category-btn { .category-btn {
width: 100px; width: 100px;
} }
.mobile-logo{ .mobile-logo {
max-height: 35px; max-height: 35px;
max-width: 120px; max-width: 120px;
object-fit: contain; object-fit: contain;
...@@ -178,8 +178,9 @@ ...@@ -178,8 +178,9 @@
class="zk_toolbar flex justify-between" class="zk_toolbar flex justify-between"
:class="{ 'q-px-none': $q.platform.is.desktop }" :class="{ 'q-px-none': $q.platform.is.desktop }"
> >
<div class="flex"><div class="f24" v-if="$q.platform.is.mobile && isHome" @click="handleShowDialog"> <div class="flex">
<i class="iconfont iconmore1" style="font-size: 24px;"></i> <div class="f24" v-if="$q.platform.is.mobile && isHome" @click="handleShowDialog">
<i class="iconfont iconmore1" style="font-size: 24px"></i>
</div> </div>
<img <img
:src="baseData.logo" :src="baseData.logo"
...@@ -189,12 +190,13 @@ ...@@ -189,12 +190,13 @@
filter: drop-shadow(0px 0px var(--q-color-primary)); filter: drop-shadow(0px 0px var(--q-color-primary));
" "
class="q-mr-lg q-ml-sm" class="q-mr-lg q-ml-sm"
:class="{'mobile-logo':$q.platform.is.mobile}" :class="{ 'mobile-logo': $q.platform.is.mobile }"
@click="CommonJump('/index', {})" @click="CommonJump('/index', {})"
/></div> />
<!-- <div style="transform:scale(0.6,0.6)"> --> </div>
<!--HK 2024-11-22 去掉 搜索接口有调整-->
<searchSf2 v-if="!isHome" :plugData="plugData"></searchSf2> <searchSf2 v-if="!isHome" :plugData="plugData"></searchSf2>
<!-- </div> -->
<!-- pc --> <!-- pc -->
<div v-if="$q.platform.is.desktop"> <div v-if="$q.platform.is.desktop">
<q-btn label="繁體中文" flat> <q-btn label="繁體中文" flat>
...@@ -215,11 +217,7 @@ ...@@ -215,11 +217,7 @@
unelevated unelevated
> >
<template v-slot:label> <template v-slot:label>
<img <img class="avatar" v-if="LoginUser.photo" :src="LoginUser.photo" />
class="avatar"
v-if="LoginUser.photo"
:src="LoginUser.photo"
/>
<img class="avatar" v-else src="../../assets/img/avatar.png" /> <img class="avatar" v-else src="../../assets/img/avatar.png" />
<!-- <span>{{LoginUser.name || LoginUser.mailbox}}</span> --> <!-- <span>{{LoginUser.name || LoginUser.mailbox}}</span> -->
...@@ -229,7 +227,7 @@ ...@@ -229,7 +227,7 @@
<q-list class="text-grey-8" dense> <q-list class="text-grey-8" dense>
<q-item clickable v-close-popup to="/setUserInfo"> <q-item clickable v-close-popup to="/setUserInfo">
<q-item-section avatar> <q-item-section avatar>
<q-avatar icon="iconfont iconpeople1"/> <q-avatar icon="iconfont iconpeople1" />
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<q-item-label>個人信息</q-item-label> <q-item-label>個人信息</q-item-label>
...@@ -237,7 +235,7 @@ ...@@ -237,7 +235,7 @@
</q-item> </q-item>
<q-item clickable v-close-popup to="/coupon"> <q-item clickable v-close-popup to="/coupon">
<q-item-section avatar> <q-item-section avatar>
<q-avatar icon="iconfont iconqianbao"/> <q-avatar icon="iconfont iconqianbao" />
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<q-item-label>優惠券</q-item-label> <q-item-label>優惠券</q-item-label>
...@@ -245,7 +243,7 @@ ...@@ -245,7 +243,7 @@
</q-item> </q-item>
<q-item clickable v-close-popup to="/order"> <q-item clickable v-close-popup to="/order">
<q-item-section avatar> <q-item-section avatar>
<q-avatar icon="iconfont iconorder"/> <q-avatar icon="iconfont iconorder" />
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<q-item-label>訂單</q-item-label> <q-item-label>訂單</q-item-label>
...@@ -254,7 +252,7 @@ ...@@ -254,7 +252,7 @@
<q-separator inset class="q-mx-lg" /> <q-separator inset class="q-mx-lg" />
<q-item clickable v-close-popup to="/setUsersList"> <q-item clickable v-close-popup to="/setUsersList">
<q-item-section avatar> <q-item-section avatar>
<q-avatar icon="iconfont iconpeople"/> <q-avatar icon="iconfont iconpeople" />
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<q-item-label>出行人信息管理</q-item-label> <q-item-label>出行人信息管理</q-item-label>
...@@ -262,7 +260,7 @@ ...@@ -262,7 +260,7 @@
</q-item> </q-item>
<q-item clickable v-close-popup to="/setAddress"> <q-item clickable v-close-popup to="/setAddress">
<q-item-section avatar> <q-item-section avatar>
<q-avatar icon="iconfont iconemail"/> <q-avatar icon="iconfont iconemail" />
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<q-item-label>管理邮寄地址</q-item-label> <q-item-label>管理邮寄地址</q-item-label>
...@@ -270,7 +268,7 @@ ...@@ -270,7 +268,7 @@
</q-item> </q-item>
<q-item clickable v-close-popup to="/setInfo"> <q-item clickable v-close-popup to="/setInfo">
<q-item-section avatar> <q-item-section avatar>
<q-avatar icon="iconfont iconset"/> <q-avatar icon="iconfont iconset" />
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<q-item-label>賬戶設置</q-item-label> <q-item-label>賬戶設置</q-item-label>
...@@ -278,7 +276,7 @@ ...@@ -278,7 +276,7 @@
</q-item> </q-item>
<q-item clickable v-close-popup @click="loginOut"> <q-item clickable v-close-popup @click="loginOut">
<q-item-section avatar> <q-item-section avatar>
<q-avatar icon="iconfont iconlog-in"/> <q-avatar icon="iconfont iconlog-in" />
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<q-item-label>登出</q-item-label> <q-item-label>登出</q-item-label>
...@@ -337,8 +335,15 @@ ...@@ -337,8 +335,15 @@
:baseData="baseData" :baseData="baseData"
:dataList="dataList" :dataList="dataList"
></city-category> ></city-category>
<popup @mousemove.prevent id="city-category" v-model="showDialog" mode="bottom" @close="handleDialogClose"> <popup
<city-category-mobile @close="showDialog = false" @mousemove.prevent
id="city-category"
v-model="showDialog"
mode="bottom"
@close="handleDialogClose"
>
<city-category-mobile
@close="showDialog = false"
:baseData="baseData" :baseData="baseData"
:dataList="dataList" :dataList="dataList"
></city-category-mobile ></city-category-mobile
...@@ -350,9 +355,9 @@ ...@@ -350,9 +355,9 @@
import popup from "../props/index"; import popup from "../props/index";
import CityCategoryMobile from "./city-category-mobile.vue"; import CityCategoryMobile from "./city-category-mobile.vue";
import cityCategory from "./city-category.vue"; import cityCategory from "./city-category.vue";
import searchSf2 from '../search_sf/search-top.vue' import searchSf2 from "../search_sf/search-top.vue";
export default { export default {
components: { cityCategory, CityCategoryMobile, popup,searchSf2 }, components: { cityCategory, CityCategoryMobile, popup, searchSf2 },
props: { props: {
baseData: { baseData: {
type: Object, type: Object,
...@@ -369,7 +374,7 @@ export default { ...@@ -369,7 +374,7 @@ export default {
}, },
data() { data() {
return { return {
plugData: {details: [], Title: ''}, plugData: { details: [], Title: "" },
showDialog: false, showDialog: false,
searchDate: "", searchDate: "",
searchEndDate: "", searchEndDate: "",
...@@ -401,7 +406,7 @@ export default { ...@@ -401,7 +406,7 @@ export default {
}, },
$route: { $route: {
handler: function (val, oldVal) { handler: function (val, oldVal) {
console.log('val', val, oldVal) console.log("val", val, oldVal);
this.isHome = val.path === "/" || val.path === "/index"; this.isHome = val.path === "/" || val.path === "/index";
// this.isSearch = val.path === "/search"; // this.isSearch = val.path === "/search";
}, },
...@@ -448,19 +453,18 @@ export default { ...@@ -448,19 +453,18 @@ export default {
// this.getCategoryList(); // this.getCategoryList();
}, },
methods: { methods: {
handler(event) {event.preventDefault();}, handler(event) {
event.preventDefault();
},
handleShowDialog() { handleShowDialog() {
this.showDialog = true; this.showDialog = true;
this.scrollTop = document.querySelector('body').scrollTop; this.scrollTop = document.querySelector("body").scrollTop;
document.querySelector( document.querySelector("body").style = `position: fixed; top: -${this.scrollTop}px`;
"body"
).style = `position: fixed; top: -${this.scrollTop}px`;
}, },
handleDialogClose() { handleDialogClose() {
document.querySelector( document.querySelector("body").style = "";
"body" },
).style = '';},
avatarClick() { avatarClick() {
if (this.LoginUser.token) { if (this.LoginUser.token) {
this.CommonJump("/userCenter"); this.CommonJump("/userCenter");
......
src/components/searchProductdata/kkday.vue
View file @ ce68ca22
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
standout standout
placeholder="蒐索關鍵字" placeholder="蒐索關鍵字"
class="q-ma-md" class="q-ma-md"
@blur="changeAddrSearchHandler" @blur="handleSearchKey"
/> />
<!-- <q-tree <!-- <q-tree
ref="area" ref="area"
...@@ -505,8 +505,6 @@ export default { ...@@ -505,8 +505,6 @@ export default {
}, },
created() { created() {
this.msg = this.qMsg; this.msg = this.qMsg;
// this.msg.teamType = [];
//this.initAreaList();
this.initGoods(); this.initGoods();
this.msg.priceRange = { this.msg.priceRange = {
min: 1, min: 1,
...@@ -524,11 +522,11 @@ export default { ...@@ -524,11 +522,11 @@ export default {
mounted() { mounted() {
let LineIdList = []; let LineIdList = [];
if (this.msg.LineIds && this.msg.LineIds.length > 0) { if (this.msg.LineIds && this.msg.LineIds.length > 0) {
LineIdList = this.msg.LineIds.split(";"); LineIdList = this.msg.LineIds.split(",");
} }
let SeriesIdList = []; let SeriesIdList = [];
if (this.msg.SeriesIds && this.msg.SeriesIds.length > 0) { if (this.msg.SeriesIds && this.msg.SeriesIds.length > 0) {
SeriesIdList = this.msg.SeriesIds.split(";"); SeriesIdList = this.msg.SeriesIds.split(",");
} }
if ( if (
(LineIdList && LineIdList.length > 0) || (LineIdList && LineIdList.length > 0) ||
...@@ -536,7 +534,12 @@ export default { ...@@ -536,7 +534,12 @@ export default {
) { ) {
let arr = []; let arr = [];
this.goodsType.forEach((x) => { this.goodsType.forEach((x) => {
let lineIdIndex = LineIdList.findIndex((yId) => x.Id.slice(2) == yId); var tempLineId = 0;
var tempLineIdArray = x.Id.split("|");
if (tempLineIdArray && tempLineIdArray.length == 2) {
tempLineId = tempLineIdArray[0];
}
let lineIdIndex = LineIdList.findIndex((yId) => tempLineId == yId);
if (lineIdIndex != -1) { if (lineIdIndex != -1) {
arr.push(x.Id); arr.push(x.Id);
} }
...@@ -544,8 +547,12 @@ export default { ...@@ -544,8 +547,12 @@ export default {
if (lineIdIndex != -1) { if (lineIdIndex != -1) {
arr.push(y.Id); arr.push(y.Id);
} else { } else {
let seriesIdIndex = SeriesIdList.findIndex((yId) => y.Id.slice(2) == yId); var tempLtId = 0;
var tempLtIdArray = y.Id.split("|");
if (tempLtIdArray && tempLtIdArray.length == 2) {
tempLtId = tempLtIdArray[0];
}
let seriesIdIndex = SeriesIdList.findIndex((yId) => tempLtId == yId);
if (seriesIdIndex != -1) { if (seriesIdIndex != -1) {
arr.push(y.Id); arr.push(y.Id);
} }
...@@ -556,15 +563,11 @@ export default { ...@@ -556,15 +563,11 @@ export default {
} }
}, },
methods: { methods: {
handleSelected(target) {
console.log("handleSelected", target);
},
handleTicked(target) { handleTicked(target) {
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.ticked = target; this.ticked = target;
this.goSearchHandler(); this.goSearchHandler();
}, },
handleSearchKey(target) { handleSearchKey(target) {
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.goSearchHandler(); this.goSearchHandler();
...@@ -635,11 +638,11 @@ export default { ...@@ -635,11 +638,11 @@ export default {
let arr = []; let arr = [];
let LineIdList = []; let LineIdList = [];
if (this.msg.LineIds && this.msg.LineIds.length > 0) { if (this.msg.LineIds && this.msg.LineIds.length > 0) {
LineIdList = this.msg.LineIds.split(";"); LineIdList = this.msg.LineIds.split(",");
} }
let SeriesIdList = []; let SeriesIdList = [];
if (this.msg.SeriesIds && this.msg.SeriesIds.length > 0) { if (this.msg.SeriesIds && this.msg.SeriesIds.length > 0) {
SeriesIdList = this.msg.SeriesIds.split(";"); SeriesIdList = this.msg.SeriesIds.split(",");
} }
this.apipost( this.apipost(
"b2c_get_GetB2CQueryCondition", "b2c_get_GetB2CQueryCondition",
...@@ -652,7 +655,13 @@ export default { ...@@ -652,7 +655,13 @@ export default {
x.explsed = false; x.explsed = false;
x.isShow = true; x.isShow = true;
x.children = x.SubList; x.children = x.SubList;
let lineIdIndex = LineIdList.findIndex((yId) => x.Id.slice(2) == yId); var tempLineId = 0;
var tempLineIdArray = x.Id.split("|");
if (tempLineIdArray && tempLineIdArray.length == 2) {
tempLineId = tempLineIdArray[0];
}
let lineIdIndex = LineIdList.findIndex((yId) => tempLineId == yId);
x.children.forEach((y) => { x.children.forEach((y) => {
y.checked = false; y.checked = false;
y.explsed = false; y.explsed = false;
...@@ -661,9 +670,12 @@ export default { ...@@ -661,9 +670,12 @@ export default {
arr.push(y.Id); arr.push(y.Id);
this.ticked.push(y.Id); this.ticked.push(y.Id);
} else { } else {
let seriesIdIndex = SeriesIdList.findIndex( var tempLtId = 0;
(yId) => y.Id.slice(2) == yId var tempLtIdArray = y.Id.split("|");
); if (tempLtIdArray && tempLtIdArray.length == 2) {
tempLtId = tempLtIdArray[0];
}
let seriesIdIndex = SeriesIdList.findIndex((yId) => tempLtId == yId);
if (seriesIdIndex != -1) { if (seriesIdIndex != -1) {
arr.push(y.Id); arr.push(y.Id);
this.ticked.push(y.Id); this.ticked.push(y.Id);
...@@ -758,7 +770,6 @@ export default { ...@@ -758,7 +770,6 @@ export default {
this.msg, this.msg,
(res) => { (res) => {
this.$q.loading.hide(); this.$q.loading.hide();
console.log("b2c_get_GetB2C2024TravelProductPage", res);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.PageCount = res.data.data.pageCount; this.PageCount = res.data.data.pageCount;
this.TotalCount = res.data.data.count; this.TotalCount = res.data.data.count;
......
src/components/search_sf/search-top.vue
View file @ ce68ca22
This diff is collapsed.
src/components/searchdata/kkday.vue
View file @ ce68ca22
...@@ -676,6 +676,7 @@ export default { ...@@ -676,6 +676,7 @@ export default {
let arr = []; let arr = [];
let jObj = JSON.parse(window.localStorage.getItem("baseifo")); let jObj = JSON.parse(window.localStorage.getItem("baseifo"));
jObj.CategoryList.forEach((x) => { jObj.CategoryList.forEach((x) => {
x.checked = false; x.checked = false;
x.explsed = false; x.explsed = false;
x.isShow = true; x.isShow = true;
......
src/pages/Search.vue
View file @ ce68ca22
This diff is collapsed.
src/pages/SearchProduct.vue
View file @ ce68ca22
This diff is collapsed.
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