提交 460cc901 authored 作者: huaxinzhu's avatar huaxinzhu

增加对“历史数据”查看限制,channel_id为0,才显示

上级 c9d17ce4
......@@ -42,9 +42,9 @@ export function getallCloudList(params) {
//获取sso域名
export function getssoUrl(data) {
return request({
url: '//sysapi.jxhh.com/api/v1/oem/webSite/ssoChannel' ,
// url: '//192.168.26.179:6601/api/v1/oem/webSite/ssoChannel' ,
// url: '//sysapi.jxhh.com/api/v1/oem/webSite/ssoChannel',
url: '//192.168.26.179:6601/api/v1/oem/webSite/ssoChannel',
method: 'get',
params: data
})
}
\ No newline at end of file
}
......@@ -4,8 +4,7 @@
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
<div style="position:fixed;height: 100%;line-height: 50px;font-size:16px; right: 100px;">
<!-- <el-button type="text"><a href="http://oldpop.jxhh.com/" >切换老版本</a></el-button>-->
<div v-if="channel_id == 0" style="position:fixed;height: 100%;line-height: 50px;font-size:16px; right: 100px;">
<el-tooltip class="item" effect="dark" content="查看历史订单及财务数据" placement="bottom-end">
<a href="http://oldpop.jxhh.com/" style="color:red;font-size:14px;">查看历史数据</a>
</el-tooltip>
......@@ -57,6 +56,7 @@
<script>
import { mapGetters } from 'vuex'
import { indexInfo } from '@/api/webSite'
import Breadcrumb from '@/components/Breadcrumb'
import Hamburger from '@/components/Hamburger'
import Screenfull from '@/components/Screenfull'
......@@ -94,11 +94,29 @@ export default {
}
},
data(){
return{
ssourl:'',
return {
ssourl: '',
channel_id: '',
}
},
created() {
/** 获取渠道id */
this.getChannelId()
},
methods: {
/** 判断渠道 值=0才显示 查看历史数据 链接 */
getChannelId() {
let ssa = window.location.host
const data = {
domain: ssa,
}
indexInfo(data).then(res=> {
if (res.code == 1) {
this.channel_id = res.data.channel_id
}
});
},
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
......@@ -114,7 +132,7 @@ export default {
}
})
.catch(() => {
})
},
async logout() {
......@@ -125,7 +143,7 @@ export default {
}).then(() => {
this.$store.dispatch('LogOut').then(() => {
var ssa = window.location.host
var ht = document.location.protocol
var ht = document.location.protocol
if(ssa =='localhost:1024'){
window.location.href=ht+'//'+this.ssourl +'/logout?redirect='+ht+'//'+ssa+'/login'
}else{
......
......@@ -14,20 +14,20 @@
<el-tab-pane label="全部订单" name="fourth" ></el-tab-pane>
</el-tabs>
<div v-show="activeName == 'first' " style="position: absolute; top: -2px; right: 0;">
<el-tooltip class="item" effect="dark" content="查看2021年10月8日之前的订单" placement="bottom-end">
<el-tooltip v-if="channel_id == 0" class="item" effect="dark" content="查看2021年10月8日23:00之前的订单" placement="bottom-end">
<el-button size="small" @click="gotoOldShop">查看老订单</el-button>
</el-tooltip>
<el-button size="mini" type="primary" icon="el-icon-download" @click="handleExportUnSendOrder">导出订单</el-button>
<el-button size="mini" icon="el-icon-position" @click="handleExportDeliveryOrder">批量发货</el-button>
</div>
<div v-show="activeName == 'fourth' " style="position: absolute; top: -2px; right: 0;">
<el-tooltip class="item" effect="dark" content="查看2021年10月8日之前的订单" placement="bottom-end">
<el-tooltip v-if="channel_id == 0" class="item" effect="dark" content="查看2021年10月8日23:00之前的订单" placement="bottom-end">
<el-button size="small" @click="gotoOldShop">查看老订单</el-button>
</el-tooltip>
<el-button size="mini" type="primary" icon="el-icon-download" @click="handleAllOrderExport">导出订单</el-button>
</div>
<div v-show="activeName == 'second' || activeName == 'third'" style="position: absolute; top: -2px; right: 0;">
<el-tooltip class="item" effect="dark" content="查看2021年10月8日之前的订单" placement="bottom-end">
<el-tooltip v-if="channel_id == 0" class="item" effect="dark" content="查看2021年10月8日23:00之前的订单" placement="bottom-end">
<el-button size="small" @click="gotoOldShop">查看老订单</el-button>
</el-tooltip>
</div>
......@@ -254,6 +254,7 @@
</template>
<script>
import { indexInfo } from '@/api/webSite'
import {listOrder, exportOrder, orderInfo, deliveryOrder, expressList, getOrderTabData , exportUnSendOrderGoodsData,deliveryOrderExport} from '@/api/module/order'
import {dateFormat} from '@/utils'
import OrderDetail from './components/orderDetail.vue'
......@@ -266,6 +267,9 @@
},
data() {
return {
// channel_id
channel_id: '',
//
sellerId: 0,
currentPage: 1,
pageSize: 20,
......@@ -315,12 +319,27 @@
mounted() {
/** 获取 seller_id*/
this.sellerId = this.$store.state.user.sellerid;
/** 获取渠道id */
this.getChannelId()
// 订单列表 搜索
this.getListOrder()
//
this.getExpressList()
},
methods: {
/** 判断渠道 值=0才显示 查看历史数据 链接 */
getChannelId() {
let ssa = window.location.host
const data = {
domain: ssa,
}
indexInfo(data).then(res=> {
if (res.code == 1) {
this.channel_id = res.data.channel_id
}
});
},
/** 查看老订单 */
gotoOldShop() {
window.location.href = 'http://oldpop.jxhh.com/'
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论