jwyu 1 tahun lalu
induk
melakukan
4ed5a5ba74

TEMPAT SAMPAH
src/assets/imgs/icon_back.png


+ 1 - 0
src/assets/styles/common.scss

@@ -3,6 +3,7 @@
     --van-red:#C54322;
     --van-green:#2BA471; 
     --van-gray-3:#DCDFE6;
+    --van-button-round-radius:6PX;
 }
 
 html,body{

+ 8 - 5
src/layouts/Index.vue

@@ -23,6 +23,10 @@ function handleLoginOut(){
     router.replace('/login')
 }
 
+function goBack(){
+    router.back()
+}
+
 
 
 </script>
@@ -32,10 +36,9 @@ function handleLoginOut(){
         <div class="pad-header-box" v-if="!$route.meta.noHead">
             <div>
                 <div 
-                    class="back-home-box" 
-                    v-if="$route.meta.hasBackHome"
-                    @click="$router.replace('/')"
-                >返回首页</div>
+                    class="back-home-box"
+                    @click="goBack"
+                >返回</div>
             </div>
             <van-popover v-model:show="showUserInfo" placement="bottom-end">
                 <div class="userinfo-box_pad" v-if="userInfo">
@@ -141,7 +144,7 @@ function handleLoginOut(){
                 display: block;
                 width: 20px;
                 height: 20px;
-                background-image: url('@/assets/imgs/tabbar/home-s.png');
+                background-image: url('@/assets/imgs/icon_back.png');
                 background-size: cover;
                 margin-right: 5px;
                 position: relative;

+ 4 - 1
src/router/index.js

@@ -2,7 +2,10 @@
  * 说明
  * 此文件为路由配置入口文件
  * 路由子模块请按模块拆分到同文件夹下其他文件中
- * meta
+ * meta:{
+ * noHead:true pad端没有顶部头部
+ * hasBackTop:true 有回到顶部
+ * }
  */
 import { createRouter, createWebHistory } from "vue-router";
 import {useCachedViewsStore} from '@/store/modules/cachedViews'

+ 2 - 8
src/router/myETA.js

@@ -1,8 +1,6 @@
 // myETA路由模块
 /**
  * meta:{
- * noHead:pad端不需要顶部
- * hasBackHome:pad端顶部有返回首页
  * }
  */
  export const myETARoutes=[
@@ -12,7 +10,6 @@
         component: () => import("@/views/myETA/Index.vue"),
         meta: { 
             title: "My ETA",
-            hasBackHome:true,
             keepAlive:false
         },
     },
@@ -22,7 +19,6 @@
         component: () => import("@/views/myETA/ChartList.vue"),
         meta: { 
             title: "My ETA",
-            hasBackHome:true,
             keepAlive:false
         },
     },
@@ -32,7 +28,6 @@
         component: () => import("@/views/myETA/SearchList.vue"),
         meta: { 
             title: "My ETA",
-            hasBackHome:true,
             keepAlive:false
         },
     },
@@ -42,8 +37,8 @@
         component: () => import("@/views/myETA/ChooseChart.vue"),
         meta: { 
             title: "选择图表",
-            hasBackHome:true,
-            keepAlive:false
+            keepAlive:false,
+            hasBackTop:true
         },
     },
     {
@@ -52,7 +47,6 @@
         component: () => import("@/views/myETA/ChartDetail.vue"),
         meta: { 
             title: "图表详情",
-            hasBackHome:true,
             keepAlive:false
         },
     }

+ 0 - 2
src/router/ppt.js

@@ -12,7 +12,6 @@ export const pptRoutes=[
         component: () => import("@/views/ppt/Index.vue"),
         meta: { 
             title: "智能PPT",
-            hasBackHome:true,
             keepAlive:false
         },
     },
@@ -22,7 +21,6 @@ export const pptRoutes=[
         component: () => import("@/views/ppt/Detail.vue"),
         meta: { 
             title: "智能PPT",
-            hasBackHome:true,
             keepAlive:true
         },
     },

+ 0 - 8
src/router/pptEn.js

@@ -1,10 +1,4 @@
 // ppt路由模块
-/**
- * meta:{
- * noHead:pad端不需要顶部
- * hasBackHome:pad端顶部有返回首页
- * }
- */
  export const pptENRoutes=[
     {
         path:"/ppten/index",
@@ -12,7 +6,6 @@
         component: () => import("@/views/ppt/Index.vue"),
         meta: { 
             title: "英文PPT",
-            hasBackHome:true,
             keepAlive:false
         },
     },
@@ -22,7 +15,6 @@
         component: () => import("@/views/ppt/Detail.vue"),
         meta: { 
             title: "英文PPT",
-            hasBackHome:true,
             keepAlive:true
         },
     },

+ 0 - 11
src/router/report.js

@@ -1,10 +1,4 @@
 // 中文研报路由模块
-/**
- * meta:{
- * noHead:pad端不需要顶部
- * hasBackHome:pad端顶部有返回首页
- * }
- */
  export const reportRoutes=[
     {
         path:"/report/list",
@@ -12,7 +6,6 @@
         component: () => import("@/views/report/List.vue"),
         meta: { 
             title: "中文研报",
-            hasBackHome:true,
             keepAlive:true,
             hasBackTop:true
         },
@@ -23,7 +16,6 @@
         component: () => import("@/views/report/Detail.vue"),
         meta: { 
             title: "中文研报",
-            hasBackHome:true,
             keepAlive:false,
             hasBackTop:true
         },
@@ -34,7 +26,6 @@
         component: () => import("@/views/report/chapter/List.vue"),
         meta: { 
             title: "中文研报",
-            hasBackHome:true,
             keepAlive:false
         },
     },
@@ -44,7 +35,6 @@
         component: () => import("@/views/report/chapter/Detail.vue"),
         meta: { 
             title: "中文研报",
-            hasBackHome:true,
             keepAlive:false,
             hasBackTop:true
         },
@@ -55,7 +45,6 @@
         component: () => import("@/views/report/Search.vue"),
         meta: { 
             title: "中文研报",
-            hasBackHome:true,
             keepAlive:true,
             hasBackTop:true
         },

+ 0 - 10
src/router/reportEn.js

@@ -1,10 +1,4 @@
 // 英文研报路由模块
-/**
- * meta:{
- * noHead:pad端不需要顶部
- * hasBackHome:pad端顶部有返回首页
- * }
- */
  export const reportEnRoutes=[
     {
         path:"/reportEn/list",
@@ -12,7 +6,6 @@
         component: () => import("@/views/reportEn/List.vue"),
         meta: { 
             title: "英文研报",
-            hasBackHome:true,
             keepAlive:true,
             hasBackTop:true
         },
@@ -23,7 +16,6 @@
         component: () => import("@/views/reportEn/Search.vue"),
         meta: { 
             title: "英文研报",
-            hasBackHome:true,
             keepAlive:true,
             hasBackTop:true
         },
@@ -34,7 +26,6 @@
         component: () => import("@/views/reportEn/Detail.vue"),
         meta: { 
             title: "英文研报",
-            hasBackHome:true,
             keepAlive:false,
             hasBackTop:true
         },
@@ -45,7 +36,6 @@
         component: () => import("@/views/reportEn/SendEmailLog.vue"),
         meta: { 
             title: "群发日志",
-            hasBackHome:true,
             keepAlive:false
         },
     },

+ 1 - 2
src/views/myETA/ChooseChart.vue

@@ -225,8 +225,7 @@ async function handleConfirmEditClassify(){
         </ul>
         </van-list>
     </div>
-    <!-- 返回顶部 -->
-    <van-back-top offset="2000"/>
+
     <!-- 选择分类弹窗 -->
     <van-popup 
         v-model:show="showSelect" 

+ 1 - 3
src/views/ppt/components/MobileClassifyWrap.vue

@@ -157,7 +157,6 @@ const showPopover=ref(false)
         @confirm="handlePPTCatalogueReName"
     >
         <div class="file-rename-wrap">
-            <span>目录名称</span>
             <input type="text" placeholder="请输入目录名" v-model="fileOptState.reNameVal">
         </div>
     </van-dialog>
@@ -211,7 +210,6 @@ const showPopover=ref(false)
         :before-close="handlePPTCopyBeforeClose"
     >
         <div class="ppt-copy-wrap">
-            <span>选择目录</span>
             <van-popover v-model:show="showPopover">
                 <ul class="select-copy-val-box">
                     <li 
@@ -219,7 +217,7 @@ const showPopover=ref(false)
                         v-for="item in PPTOptState.copyActions" 
                         :key="item.GroupId"
                         @click="PPTOptState.copySelectData=item;showPopover=false"
-                    >{{item.text}}111</li>
+                    >{{item.text}}</li>
                 </ul>
                 <template #reference>
                     <span :class="['select-value-box',!PPTOptState.copySelectData.GroupName&&'grey-text']">{{PPTOptState.copySelectData.GroupName||'请选择目录'}}</span>

+ 0 - 3
src/views/ppt/components/PadPPTIndexWrap.vue

@@ -259,7 +259,6 @@ const showPopover=ref(false)
         @confirm="handlePPTCatalogueReName"
     >
         <div class="file-rename-wrap">
-            <span>目录名称</span>
             <input type="text" placeholder="请输入目录名" v-model="fileOptState.reNameVal">
         </div>
     </van-dialog>
@@ -273,7 +272,6 @@ const showPopover=ref(false)
         :before-close="handlePPTCopyBeforeClose"
     >
         <div class="ppt-copy-wrap">
-            <span>选择目录</span>
             <van-popover v-model:show="showPopover">
                 <ul class="select-copy-val-box">
                     <li 
@@ -515,7 +513,6 @@ const showPopover=ref(false)
         padding: 50px 30px;
         span{
             flex-shrink: 0;
-            margin-right: 20px;
         }
         :deep(.van-popover__wrapper){
             flex: 1;

+ 2 - 1
src/views/tabbar/Home.vue

@@ -7,7 +7,8 @@ cachedViewsStore.removeCaches(-1)
 const router=useRouter()
 
 function goNext(path){
-    router.push(path)
+    const routerEl=router.resolve({path})
+    window.open(routerEl.href,'_blank')
 }
 
 if(!localStorage.getItem('token')){