Commit 6b0c29f5 authored by 黄奎's avatar 黄奎

11

parent 1a65fbc4
...@@ -384,8 +384,6 @@ export default { ...@@ -384,8 +384,6 @@ export default {
}, },
playVideo(formName){ playVideo(formName){
let i = this.slide-1 let i = this.slide-1
// console.log(this.FileUrlList[i],'----')
// return
if(this.FileUrlList[i].FileType==2){ if(this.FileUrlList[i].FileType==2){
let video = this.$refs[formName] let video = this.$refs[formName]
if(video){ if(video){
...@@ -393,10 +391,8 @@ export default { ...@@ -393,10 +391,8 @@ export default {
if(this.FileUrlList[i].currentTime){ if(this.FileUrlList[i].currentTime){
video.currentTime = this.FileUrlList[i].currentTime video.currentTime = this.FileUrlList[i].currentTime
} }
// console.log('继续播放')
video.play() video.play()
}else { }else {
// console.log('暂停')
video.pause() video.pause()
} }
} }
...@@ -406,7 +402,6 @@ export default { ...@@ -406,7 +402,6 @@ export default {
let URL = '' let URL = ''
if(this.LinkUrl) { if(this.LinkUrl) {
URL = `${this.LinkUrl.indexOf('/#/searchProduct')!=-1?this.LinkUrl:this.LinkUrl+'?'}${this.searchKey?'&qsearchKey='+this.searchKey:''}${this.searchDate?'&qsearchDate='+this.searchDate:''}${this.searchEndDate?'&qsearchEndDate='+this.searchEndDate:''}${this.type1&&this.type2?'&categoryId='+this.type2:this.type1&&!this.type2?'&categoryId='+this.type1:''}` URL = `${this.LinkUrl.indexOf('/#/searchProduct')!=-1?this.LinkUrl:this.LinkUrl+'?'}${this.searchKey?'&qsearchKey='+this.searchKey:''}${this.searchDate?'&qsearchDate='+this.searchDate:''}${this.searchEndDate?'&qsearchEndDate='+this.searchEndDate:''}${this.type1&&this.type2?'&categoryId='+this.type2:this.type1&&!this.type2?'&categoryId='+this.type1:''}`
// console.log(URL,'----')
this.OpenNewUrl(URL) this.OpenNewUrl(URL)
} }
else { else {
...@@ -414,11 +409,10 @@ export default { ...@@ -414,11 +409,10 @@ export default {
} }
}, },
getType2(e){ getType2(e){
// console.log(this.type2,'----type2222222')
}, },
getType1(e){ getType1(e){
this.optionsList = [] this.optionsList = []
// console.log(this.type1,'----type111111')
let list = this.CategoryList.filter(x=>{ let list = this.CategoryList.filter(x=>{
if(x.Id==e){ if(x.Id==e){
this.lineUrl = x.LinkUrl this.lineUrl = x.LinkUrl
......
This diff is collapsed.
This diff is collapsed.
...@@ -682,7 +682,6 @@ export default { ...@@ -682,7 +682,6 @@ export default {
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(",");
} }
console.log("SeriesIdList=====",SeriesIdList);
this.apipost( this.apipost(
"b2c_get_GetB2CQueryCondition", "b2c_get_GetB2CQueryCondition",
this.msg, this.msg,
...@@ -807,12 +806,10 @@ export default { ...@@ -807,12 +806,10 @@ 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;
var tempArray = res.data.data.pageData.list; var tempArray = res.data.data.pageData.list;
if (tempArray && tempArray.length > 0) { if (tempArray && tempArray.length > 0) {
this.DataList = tempArray; this.DataList = tempArray;
this.renderSearchInfo(res.data.data.pageData.condition); this.renderSearchInfo(res.data.data.pageData.condition);
......
...@@ -333,7 +333,6 @@ export default { ...@@ -333,7 +333,6 @@ export default {
this.initAreaList() this.initAreaList()
var jObj = JSON.parse(window.localStorage.getItem('baseifo')); var jObj = JSON.parse(window.localStorage.getItem('baseifo'));
const hotList = this.getHotList(jObj.AreaList) const hotList = this.getHotList(jObj.AreaList)
console.log('hotList mounted', jObj, hotList)
this.hotList = hotList this.hotList = hotList
this.getHistory() this.getHistory()
var newStartDate = new Date(); var newStartDate = new Date();
......
...@@ -474,7 +474,6 @@ export default { ...@@ -474,7 +474,6 @@ export default {
mounted() { mounted() {
var jObj = JSON.parse(window.localStorage.getItem('baseifo')); var jObj = JSON.parse(window.localStorage.getItem('baseifo'));
const hotList = this.getHotList(jObj.AreaList) const hotList = this.getHotList(jObj.AreaList)
console.log('hotList mounted', jObj, hotList)
this.hotList = hotList this.hotList = hotList
this.getHistory() this.getHistory()
var newStartDate = new Date(); var newStartDate = new Date();
......
...@@ -495,7 +495,6 @@ export default { ...@@ -495,7 +495,6 @@ export default {
}, },
created() { created() {
this.msg = this.qMsg; this.msg = this.qMsg;
// this.msg.teamType = [];
this.initAreaList(); this.initAreaList();
this.initGoods(); this.initGoods();
this.msg.priceRange = { this.msg.priceRange = {
...@@ -591,14 +590,7 @@ export default { ...@@ -591,14 +590,7 @@ export default {
if (x.SubList) { if (x.SubList) {
} }
}, },
// changeGoodTypeHandler(x) {
// if (x.checked && this.msg.teamType.indexOf(x.Id) == -1) {
// this.msg.teamType.push(x.Id);
// } else if (!x.checked && this.msg.teamType.indexOf(x.Id) != -1) {
// let i = this.msg.teamType.findIndex(item => item == x.Id);
// this.msg.teamType.splice(i, 1);
// }
// },
chosenSortHandler(x) { chosenSortHandler(x) {
this.msg.orderBy = x.value; this.msg.orderBy = x.value;
this.msg.pageIndex = 1 this.msg.pageIndex = 1
......
...@@ -28,10 +28,12 @@ ...@@ -28,10 +28,12 @@
</style> </style>
<template> <template>
<q-layout view="hHh lpr fFf"> <q-layout view="hHh lpr fFf">
<hor-big-one v-if="isSearch&&windowWidth>=768" :base-data="baseinfo" :dataList="dataList" ref="webhead"></hor-big-one> <hor-big-one v-if="isSearch&&windowWidth>=768" :base-data="baseinfo" :dataList="dataList" ref="webhead">
</hor-big-one>
<!-- <hor-big-two v-if="headType==2" :base-data="baseinfo" ref="webhead"></hor-big-two> --> <!-- <hor-big-two v-if="headType==2" :base-data="baseinfo" ref="webhead"></hor-big-two> -->
<q-page-container> <q-page-container>
<div class="flex justify-between" v-if="showUserInfo" :style="$q.platform.is.desktop ? 'width: 1200px; margin: 0 auto' : ''"> <div class="flex justify-between" v-if="showUserInfo"
:style="$q.platform.is.desktop ? 'width: 1200px; margin: 0 auto' : ''">
<navs v-if="$q.platform.is.desktop"></navs> <navs v-if="$q.platform.is.desktop"></navs>
<router-view /> <router-view />
</div> </div>
...@@ -54,7 +56,7 @@ ...@@ -54,7 +56,7 @@
import horBtm from "../components/navs/hor-btm"; import horBtm from "../components/navs/hor-btm";
import newHorBtm from "../components/navs/newHor-btm"; import newHorBtm from "../components/navs/newHor-btm";
import subscriber from "../components/navs/subscriber"; import subscriber from "../components/navs/subscriber";
import Navs from 'src/pages/usercenter/components/navs.vue'; import Navs from 'src/pages/usercenter/components/navs.vue';
export default { export default {
components: { components: {
horBigOne, horBigOne,
...@@ -90,9 +92,9 @@ import Navs from 'src/pages/usercenter/components/navs.vue'; ...@@ -90,9 +92,9 @@ import Navs from 'src/pages/usercenter/components/navs.vue';
}; };
}, },
watch: { watch: {
'$route': function() { '$route': function () {
this.showUserInfo = Boolean(this.$route.meta.isUserCenter) this.showUserInfo = Boolean(this.$route.meta.isUserCenter)
this.isSearch = this.$router.history.current.path != "/"&&this.$router.history.current.path != "/index" this.isSearch = this.$router.history.current.path != "/" && this.$router.history.current.path != "/index"
} }
}, },
destroyed() { destroyed() {
...@@ -108,7 +110,7 @@ import Navs from 'src/pages/usercenter/components/navs.vue'; ...@@ -108,7 +110,7 @@ import Navs from 'src/pages/usercenter/components/navs.vue';
}) })
}, },
mounted() { mounted() {
this.isSearch = this.$router.history.current.path != "/"&&this.$router.history.current.path != "/index" this.isSearch = this.$router.history.current.path != "/" && this.$router.history.current.path != "/index"
window.addEventListener('scroll', this.getScrollHeight, false); window.addEventListener('scroll', this.getScrollHeight, false);
//判断是不是同一天 //判断是不是同一天
if (localStorage.ToDay) { if (localStorage.ToDay) {
...@@ -133,6 +135,7 @@ import Navs from 'src/pages/usercenter/components/navs.vue'; ...@@ -133,6 +135,7 @@ import Navs from 'src/pages/usercenter/components/navs.vue';
//获取网站基础配置 //获取网站基础配置
if (localStorage.baseifo) { if (localStorage.baseifo) {
var jObj = JSON.parse(window.localStorage.getItem('baseifo')); var jObj = JSON.parse(window.localStorage.getItem('baseifo'));
console.log("layout",jObj);
this.baseinfo.logo = jObj.Config.Logo; this.baseinfo.logo = jObj.Config.Logo;
this.baseinfo.name = jObj.Config.Name; this.baseinfo.name = jObj.Config.Name;
this.baseinfo.nav.navs = jObj.HeaderList; this.baseinfo.nav.navs = jObj.HeaderList;
...@@ -173,7 +176,7 @@ import Navs from 'src/pages/usercenter/components/navs.vue'; ...@@ -173,7 +176,7 @@ import Navs from 'src/pages/usercenter/components/navs.vue';
var msg = { var msg = {
GroupId: 0, GroupId: 0,
B2BDomain: locationName, B2BDomain: locationName,
IsGetConfigSite:1, IsGetConfigSite: 1,
}; };
this.apipost( this.apipost(
"admin_get_GetGroupDomain", msg, "admin_get_GetGroupDomain", msg,
...@@ -189,7 +192,7 @@ import Navs from 'src/pages/usercenter/components/navs.vue'; ...@@ -189,7 +192,7 @@ import Navs from 'src/pages/usercenter/components/navs.vue';
}, },
//获取网站配置数据 //获取网站配置数据
getConfigData() { getConfigData() {
let locationName =this.GetDomain(); let locationName = this.GetDomain();
this.apipost( this.apipost(
"ws_get_GetWebSiteConfig", { "ws_get_GetWebSiteConfig", {
RB_Group_Id: this.RB_Group_Id, RB_Group_Id: this.RB_Group_Id,
......
...@@ -1263,7 +1263,6 @@ ...@@ -1263,7 +1263,6 @@
var seriesIds = this.getUrlKey("SeriesIds", window.location.href); var seriesIds = this.getUrlKey("SeriesIds", window.location.href);
var lineIds = this.getUrlKey("LineIds", window.location.href); var lineIds = this.getUrlKey("LineIds", window.location.href);
var TeamType = this.getUrlKey("TeamType", window.location.href); var TeamType = this.getUrlKey("TeamType", window.location.href);
console.log("TeamType", TeamType);
if (qsearchKey) { if (qsearchKey) {
this.qMsg.searchKey = qsearchKey; this.qMsg.searchKey = qsearchKey;
} }
......
...@@ -312,7 +312,6 @@ export default { ...@@ -312,7 +312,6 @@ export default {
}, },
methods: { methods: {
pageChange(value) { pageChange(value) {
console.log("pageChange", value);
this.current = value; this.current = value;
this.getUsersList(); this.getUsersList();
}, },
......
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