From 6cffb189105aaa2dbde8886c3f43a1a65276e872 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期一, 20 五月 2024 17:44:43 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/repository/repository.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/pages/repository/repository.vue b/src/pages/repository/repository.vue
index 7f1adf4..7bac2d9 100644
--- a/src/pages/repository/repository.vue
+++ b/src/pages/repository/repository.vue
@@ -41,7 +41,7 @@
</el-card>
<el-card class="box-card" style="width: 100%;height: 2.06rem; margin: .26rem 0;">
<div class="clearfix flex" style="font-weight: 900;font-size: .14rem;padding-bottom: .1rem;">
- <span>鏃剁┖鍦伴搧</span>
+ <span>鏃剁┖鍦板浘</span>
<!-- <el-button icon="el-icon-rank" style="float: right; padding: 3px 0" type="text"></el-button> -->
<img src="@/static/image/fangda.png" @click="fangdaClick(2)"
style="width: .18rem;height: .18rem;" alt="" />
@@ -141,7 +141,7 @@
<!-- 杩斿洖椤堕儴 -->
<el-col style="position: absolute;bottom: 1rem;left:1.2rem ;">
- <el-button style="width: .4935rem;height: .4935rem;font-size: .3rem;" icon="el-icon-download" circle
+ <el-button style="width: .50rem;height: .50rem;font-size: .3rem;" icon="el-icon-top" circle
@click="scrollToTop"></el-button>
</el-col>
</view>
@@ -152,7 +152,7 @@
import 'echarts/extension/bmap/bmap';
import {
loadBMap
- } from "../../static/map.js"
+ } from "@/static/map.js"
import Table1 from '@/components/table1/table1.vue'
export default {
components: {
@@ -286,7 +286,7 @@
if (index == 1) {
console.log('璺宠浆鍏崇郴鍦板浘');
uni.navigateTo({
- url: '/pages/characterRelation/characterRelation'
+ url: '/pages/character/index'
})
} else if (index == 2) {
uni.navigateTo({
@@ -301,7 +301,7 @@
},
// 杩斿洖涓婁竴椤�
goBack() {
- uni.navigateBack();
+ this.$router.go(-1);
},
// 杩斿洖椤堕儴
scrollToTop() {
--
Gitblit v1.9.1