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

fix: 问题修复

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