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

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

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