|
@@ -1,12 +1,12 @@
|
|
|
<template>
|
|
|
<section class="app-main" :style="{ paddingTop: show ? '140px' : '80px' }">
|
|
|
<div class="app-main-view">
|
|
|
- <transition name="fade-transform" mode="out-in">
|
|
|
- <keep-alive v-if="$route.name">
|
|
|
- <router-view :key="$route.name" />
|
|
|
- </keep-alive>
|
|
|
- <router-view v-else />
|
|
|
- </transition>
|
|
|
+ <!-- <transition name="fade-transform" mode="out-in"> -->
|
|
|
+ <keep-alive v-if="$route.name">
|
|
|
+ <router-view :key="$route.name" />
|
|
|
+ </keep-alive>
|
|
|
+ <router-view v-else />
|
|
|
+ <!-- </transition> -->
|
|
|
<!-- 通知框 -->
|
|
|
<notify-box :mes-type="mesType" @reset="handleReset" />
|
|
|
<zj-watermark color="rgba(200,200,200,.3)" position="absolute" :str="str" z-index="99" />
|
|
@@ -82,11 +82,13 @@ export default {
|
|
|
position: 'bottom-right',
|
|
|
dangerouslyUseHTMLString: true,
|
|
|
message: (
|
|
|
- <div >
|
|
|
+ <div>
|
|
|
<div>通知:您有一条新的物流通知发货单号{this.invoiceOrderList.length && this.invoiceOrderList[0].id}</div>
|
|
|
- <div style='text-align:right'><el-link type='primary' underline={false} onClick={() => That.handleJump()}>
|
|
|
- 点击查看详情
|
|
|
- </el-link></div>
|
|
|
+ <div style="text-align:right">
|
|
|
+ <el-link type="primary" underline={false} onClick={() => That.handleJump()}>
|
|
|
+ 点击查看详情
|
|
|
+ </el-link>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
),
|
|
|
onClose() {
|