Commit 262baa76 authored by 郭志伟's avatar 郭志伟

fix: 问题修复

parent edbe4cd3
......@@ -2,9 +2,7 @@
<div id="app">
<cr-nav-bar v-if="header" :title="title" left-text="" @click-left="backFun" />
<div class="app">
<transition :name="transitionName">
<router-view />
</transition>
<router-view />
</div>
<div v-if="loading" class="loading-container">
<cr-loading class="loading" size="24px">加载中...</cr-loading>
......@@ -44,15 +42,6 @@ export default {
},
$route(to, from) {
routerStorage(to.path, from.path);
const firstPath = ['/home', '/orderDetail', '/payWaiting'];
if (
[to.path, from.path].every(v => firstPath.includes(v)) ||
[to.path, from.path].includes('/')
) {
this.transitionName = '';
return;
}
this.transitionName = this.$router.isBack ? 'slide-right' : 'slide-left';
this.$router.isBack = false;
}
},
......@@ -113,33 +102,4 @@ export default {
.b-t:after {
top: 0;
}
.slide-right-enter-active,
.slide-right-leave-active,
.slide-left-enter-active,
.slide-left-leave-active {
will-change: transform;
transition: all 500ms;
position: absolute;
}
.slide-right-enter {
opacity: 0;
transform: translate3d(-100%, 0, 0);
}
.slide-right-leave-active {
opacity: 0;
transform: translate3d(100%, 0, 0);
}
.slide-left-enter {
opacity: 0;
transform: translate3d(100%, 0, 0);
}
.slide-left-leave-active {
opacity: 0;
transform: translate3d(-100%, 0, 0);
}
</style>
......@@ -8,7 +8,7 @@ const http = new HttpRequest(
{
headers: {
'x-user-terminal': 'H5',
version: appVersion?.[1] || '7.9.0'
version: appVersion || '7.9.0'
}
},
function(msg) {
......
......@@ -55,7 +55,7 @@
提醒发货
</cr-button>
<cr-button
v-if="item.orderStatus == 31"
v-if="item.orderStatus == 41"
size="small"
plain
type="primary"
......
<template>
<div class="page page__nopad">
<cr-tabs v-model="currentTab" sticky :offset-top="isApp ? 0 : 48" @change="handleTabChange">
<cr-tabs v-model="currentTab" sticky :offset-top="tabOffset" @change="handleTabChange">
<cr-tab v-for="(item, index) in navList" :key="index" :title="item.title" :name="index">
<list
:list="item.list"
......@@ -17,6 +17,7 @@
import orderApi from '@/api/order.api';
import List from './components/List';
import { isApp } from '@/service/validation.service';
import Cookie from '@/service/cookieStorage.service';
const commonParams = {
loading: false,
finished: false,
......@@ -31,7 +32,7 @@ export default {
},
data() {
return {
isApp,
tabOffset: isApp || Cookie.get('h') == '0' ? 0 : 48,
currentTab: 0,
navList: [
{
......@@ -99,7 +100,9 @@ export default {
this.$router.push({ path: '/pay', query: { orderNo: this.currentOrder.orderNo } });
},
toGoods() {
this.$router.push({ path: '/goods' });
this.$router.push({
path: this.isKeyChange ? '/vipLife' : '/home'
});
},
orderNotify() {
this.$toast.success('已通知卖家');
......
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