Commit 778e3f45 authored by chenqikuai's avatar chenqikuai

feat: 修改部分UI

Toast成功的icon、动作列表展示项的顺序、模板列表的背景高度、模板列表的标题高度、存证流程计数文字的颜色、编辑按钮的icon
parent b8d50437
......@@ -2,7 +2,7 @@ import Vue from 'vue';
import App from './App.vue';
import router from './router';
import store from './store';
import ToastSuccess from '@/assets/toastSuccess.png';
import apis from './api/index';
Vue.use(apis);
import components from '@/components';
......@@ -19,8 +19,11 @@ Vue.use(confirmChain);
import VueClipboard from 'vue-clipboard2';
Vue.use(VueClipboard);
import { Lazyload } from 'vant';
import { Lazyload, Toast} from 'vant';
// import 'vant/lib/index.css';
Toast.setDefaultOptions({
icon: ToastSuccess,
});
Vue.use(Lazyload);
import Component from 'vue-class-component';
......
......@@ -8,7 +8,7 @@ export default class Template extends Vue {
protected ActionList: any = {
edit: {
key: 'edit',
icon: 'zhongmingming2x',
icon: 'bianji2x',
text: '编辑',
callback: this.editTemplate,
},
......
declare module '*.svg'
declare module '*.png'
declare module '*.jpg'
declare module '*.jpeg'
\ No newline at end of file
......@@ -61,7 +61,7 @@
class="desc"
@click.stop="toggleShowIncrementListHandler">
<common-svg name="suyuan-duoshaotiao1"></common-svg>
<div>{{ isSy ? '溯源' : '慈善' }}流程{{ proof.increment_num }}</div>
<div>{{ isSy ? '溯源' : '慈善' }}流程<span class="flow-count">{{ proof.increment_num }}</span></div>
<common-svg
name="fanhui"
class="arrow"
......@@ -203,6 +203,10 @@ export default class ProofItem extends Vue {
padding-top: 10px;
font-size: 12px;
color:#B6B5BA;
.flow-count{
color: #3175FF;
margin: 0 3px;
}
.arrow {
transition: all .3s linear;
&.expand {
......
......@@ -8,7 +8,7 @@
align-items: center;
"
>
<span>{{ folderName }}</span
<p>{{ folderName }}</p
><router-link
v-if="isFolderList"
:to="{ name: 'Add', query: { folderId: id } }"
......@@ -230,7 +230,9 @@ export default class List extends Mixins(TemplateMixin) {
.then(async () => {
await this.getTemplateListToList(+this.id);
this.folderMoveingPopupVisible = false;
Toast.success('移动成功');
Toast.success({
message: '移动成功',
});
});
}
}
......@@ -239,6 +241,7 @@ export default class List extends Mixins(TemplateMixin) {
<style scoped lang="scss">
.template-list {
box-sizing: border-box;
min-height: 100vh;
padding: 11px 14px;
background: #f9fbff;
a {
......
......@@ -52,7 +52,7 @@
</van-popup>
<transition name="van-slide-up">
<div v-if="showSelectFolder" class="slide-up-folder-list">
<div style="overflow:auto;height:100vh;">
<div class="list-container">
<div class="move-to-text">请选择文件夹</div>
<folder-list
class="folder-list"
......@@ -273,12 +273,19 @@ $bottom-block: calc(40px + 2 * 18px);
right: 0;
background: white;
z-index: 3000;
.list-container {
overflow: auto;
height: 100vh;
padding: 0 16px;
}
.move-to-text {
text-align: left;
font-size: 12px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #353535;
margin-top: 17px;
margin-bottom: 12px;
}
.folder-list {
margin-bottom: $bottom-block;
......
......@@ -40,10 +40,10 @@ export default class RecycleList extends Mixins(MixinProof) {
get actionList() {
const { blockquery , copyhash, hide } = this.ActionList;
const obj: any = {
[ChainStatus.SUCCESS]: [ blockquery , copyhash, hide],
[ChainStatus.HIDING]: [ blockquery, copyhash ],
[ChainStatus.SUCCESS]: [ hide, copyhash, blockquery ],
[ChainStatus.HIDING]: [ copyhash, blockquery ],
[ChainStatus.HIDED]: [ copyhash ],
[ChainStatus.HIDEFAILURE]: [ blockquery, copyhash, hide],
[ChainStatus.HIDEFAILURE]: [ hide, copyhash, blockquery ],
};
return obj[this.currentProof.status];
}
......
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