Commit 7d84f2fe authored by 黄奎's avatar 黄奎

11

parent bc963964
...@@ -20,12 +20,13 @@ Vue.prototype.$message = message ...@@ -20,12 +20,13 @@ Vue.prototype.$message = message
Vue.prototype.$product = product Vue.prototype.$product = product
//域名管理对象 //域名管理对象
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
let domainUrl = "http://192.168.5.214"; let domainUrl = "http://192.168.5.46";
let domainNameUrl = this.GetDomain(); let domainNameUrl = this.GetDomain();
if (domainNameUrl.indexOf('oytour') !== -1) { if (domainNameUrl.indexOf('oytour') !== -1) {
domainUrl = "https://reborn.oytour.com"; domainUrl = "https://reborn.oytour.com";
} }
domainUrl = "https://reborn.oytour.com"; domainUrl = "https://reborn.oytour.com";
var obj = { var obj = {
//主地址 //主地址
DomainUrl: domainUrl, DomainUrl: domainUrl,
...@@ -224,6 +225,8 @@ Vue.prototype.CommonJump = function (path, obj, type = 'push') { ...@@ -224,6 +225,8 @@ 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 = [];
......
...@@ -346,7 +346,7 @@ ...@@ -346,7 +346,7 @@
</q-menu> </q-menu>
</q-btn>--> </q-btn>-->
<q-btn flat dense class="social-btn"> <q-btn flat dense class="social-btn" v-if="yyzlImg&&yyzlImg!=''">
<img src="../../assets/img/wechat.png" class="btn-img" style="width:25px;height:25px;display: block;" /> <img src="../../assets/img/wechat.png" class="btn-img" style="width:25px;height:25px;display: block;" />
<div class="social-pop"> <div class="social-pop">
<div class="arrow"></div> <div class="arrow"></div>
...@@ -356,7 +356,7 @@ ...@@ -356,7 +356,7 @@
</div> </div>
</div> </div>
</q-btn> </q-btn>
<q-btn flat dense class="social-btn"> <q-btn flat dense class="social-btn" v-if="xhsImgList&&xhsImgList.length>0">
<img src="../../assets/img/xiaohongshu.png" class="btn-img" style="width:25px;height:25px;display: block;" /> <img src="../../assets/img/xiaohongshu.png" class="btn-img" style="width:25px;height:25px;display: block;" />
<div class="social-pop xhs-pop"> <div class="social-pop xhs-pop">
<div class="arrow"></div> <div class="arrow"></div>
...@@ -368,13 +368,22 @@ ...@@ -368,13 +368,22 @@
</div> </div>
</div> </div>
</q-btn> </q-btn>
<q-btn flat dense class="social-btn" v-if="wbImg&&wbImg!=''">
<img src="../../assets/img/weibo.png" class="btn-img" style="width:25px;height:25px;display: block;" />
<div class="social-pop">
<div class="arrow"></div>
<div class="social-qrcode">
<img :src="wbImg" />
<div class="social-tip">扫码关注微博</div>
</div>
</div>
</q-btn>
<q-btn v-if="LoginUser.id <= 0" label="注册" flat></q-btn> <q-btn v-if="LoginUser.id <= 0" label="注册" flat></q-btn>
<template v-if="LoginUser.token"> <template v-if="LoginUser.token">
<q-btn-dropdown style="color: #444; font-weight: bold" class="q-ml-lg" unelevated> <q-btn-dropdown style="color: #444; font-weight: bold" class="q-ml-lg" unelevated>
<template v-slot:label> <template v-slot:label>
<img class="avatar" v-if="LoginUser.photo" :src="LoginUser.photo" /> <img 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> -->
</template> </template>
<div class="row no-wrap"> <div class="row no-wrap">
...@@ -520,12 +529,9 @@ ...@@ -520,12 +529,9 @@
selectedAreaId: "", selectedAreaId: "",
isHome: false, isHome: false,
isSearch: true, isSearch: true,
yyzlImg: "https://imgfile.oytour.com/static/b2c/yyzl.jpg", yyzlImg: "", //印象之旅
xhsImgList: [ xhsImgList: [], //小红书
"https://imgfile.oytour.com/static/b2c/JPtravel.png", wbImg: "", //微博
"https://imgfile.oytour.com/static/b2c/RoyalHolidays1.png",
"https://imgfile.oytour.com/static/b2c/RoyalHolidays2.png",
]
}; };
}, },
watch: { watch: {
...@@ -562,6 +568,18 @@ ...@@ -562,6 +568,18 @@
if (localStorage.b2bUser) { if (localStorage.b2bUser) {
this.LoginUser = JSON.parse(window.localStorage.getItem("b2bUser")); this.LoginUser = JSON.parse(window.localStorage.getItem("b2bUser"));
} }
var baseInfo = JSON.parse(window.localStorage.getItem('baseifo'));
if (baseInfo && baseInfo.Config && baseInfo.Config.platObj) {
if (baseInfo.Config.platObj.yyzlImg) {
this.yyzlImg = baseInfo.Config.platObj.yyzlImg;
}
if (baseInfo.Config.platObj.xhsImgList && baseInfo.Config.platObj.xhsImgList.length > 0) {
this.xhsImgList = baseInfo.Config.platObj.xhsImgList;
}
if (baseInfo.Config.platObj.wbImg) {
this.wbImg = baseInfo.Config.platObj.wbImg;
}
}
var newStartDate = new Date(); var newStartDate = new Date();
var newStartDateStr = this.formatDate( var newStartDateStr = this.formatDate(
newStartDate.getFullYear(), newStartDate.getFullYear(),
......
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