Commit 947d2ea1 authored by songrui's avatar songrui

Merge branch 'chronic-master' of…

Merge branch 'chronic-master' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-master
parents a53b0cc3 ca7c45c0
...@@ -78,7 +78,7 @@ export default { ...@@ -78,7 +78,7 @@ export default {
window.sessionStorage.setItem('userInfo', JSON.stringify(user.data)) window.sessionStorage.setItem('userInfo', JSON.stringify(user.data))
} else { } else {
let user = JSON.parse(window.sessionStorage.getItem('userInfo')) let user = JSON.parse(window.sessionStorage.getItem('userInfo'))
this.store.$patch({ userInfo: user.data || {} }) this.store.$patch({ userInfo: user || {} })
} }
this.visible = true this.visible = true
} }
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
</div> </div>
<div class="p-3 grow cont-box"> <div class="p-3 grow cont-box">
<div class="p-3 h-full cont-inner"> <div class="p-3 h-full cont-inner">
<div class="flex justify-between collapse-head"> <div class="flex justify-between collapse-head mt-2">
<span class="text-16">全部内容</span> <span class="text-16 font-semibold">全部内容</span>
<!-- <span @click="toggleAll"> <!-- <span @click="toggleAll">
<span v-if="!collapseAll">展开全部</span> <span v-if="!collapseAll">展开全部</span>
<span v-else>展开收起</span> <span v-else>展开收起</span>
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
</div> </div>
<div class="p-3 grow cont-box"> <div class="p-3 grow cont-box">
<div class="p-3 h-full cont-inner"> <div class="p-3 h-full cont-inner">
<div class="flex justify-between collapse-head"> <div class="flex justify-between collapse-head mt-2">
<span class="text-16">全部内容</span> <span class="text-16 font-semibold">全部内容</span>
<span @click="toggleAll"> <span @click="toggleAll">
<span v-if="!collapseAll">展开全部</span> <span v-if="!collapseAll">展开全部</span>
<span v-else>展开收起</span> <span v-else>展开收起</span>
......
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
</div> </div>
<div class='p-3 grow cont-box'> <div class='p-3 grow cont-box'>
<div class='p-3 h-full cont-inner'> <div class='p-3 h-full cont-inner'>
<div class='flex justify-between collapse-head'> <div class='flex justify-between collapse-head mt-2'>
<span class='text-16'>全部内容</span> <span class='text-16 font-semibold'>全部内容</span>
<span @click='toggleAll'> <span @click='toggleAll'>
<span v-if='!collapseAll'>展开全部</span> <span v-if='!collapseAll'>展开全部</span>
<span v-else>展开收起</span> <span v-else>展开收起</span>
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
.van-cell { .van-cell {
padding: .1rem 0; padding: .1rem 0;
color: #8C8C8C; color: #8C8C8C;
font-weight: 600;
background: transparent; background: transparent;
&::after { &::after {
display: none; display: none;
......
<template> <template>
<div class="p-3 grow cont-box"> <div class="p-3 grow cont-box">
<div class="p-3 h-full cont-inner"> <div class="p-3 h-full cont-inner">
<div class="flex justify-between collapse-head"> <div class="flex justify-between collapse-head mt-2">
<span class="text-16">全部内容</span> <span class="text-16 font-semibold">全部内容</span>
<span @click="toggleAll"> <span @click="toggleAll">
<span v-if="!collapseAll">展开全部</span> <span v-if="!collapseAll">展开全部</span>
<span v-else>收起全部</span> <span v-else>收起全部</span>
......
<template> <template>
<div class="p-3 grow cont-box"> <div class="p-3 grow cont-box">
<div class="p-3 h-full cont-inner"> <div class="p-3 h-full cont-inner">
<div class="flex justify-between collapse-head"> <div class="flex justify-between collapse-head mt-2">
<span class="text-16">全部内容</span> <span class="text-16 font-semibold">全部内容</span>
<span @click="toggleAll"> <span @click="toggleAll">
<span v-if="!collapseAll">展开全部</span> <span v-if="!collapseAll">展开全部</span>
<span v-else>收起全部</span> <span v-else>收起全部</span>
......
<template> <template>
<div class="p-3 grow cont-box"> <div class="p-3 grow cont-box">
<div class="p-3 h-full cont-inner"> <div class="p-3 h-full cont-inner">
<div class="flex justify-between collapse-head"> <div class="flex justify-between collapse-head mt-2">
<span class="text-16">全部内容</span> <span class="text-16 font-semibold">全部内容</span>
<span @click="toggleAll"> <span @click="toggleAll">
<span v-if="!collapseAll">展开全部</span> <span v-if="!collapseAll">展开全部</span>
<span v-else>收起全部</span> <span v-else>收起全部</span>
......
<template> <template>
<div class="p-3 grow cont-box"> <div class="p-3 grow cont-box">
<div class="p-3 h-full cont-inner"> <div class="p-3 h-full cont-inner">
<div class="flex justify-between collapse-head"> <div class="flex justify-between collapse-head mt-2">
<span class="text-16">全部内容</span> <span class="text-16 font-semibold">全部内容</span>
<span @click="toggleAll"> <span @click="toggleAll">
<span v-if="!collapseAll">展开全部</span> <span v-if="!collapseAll">展开全部</span>
<span v-else>收起全部</span> <span v-else>收起全部</span>
......
<template> <template>
<div class="p-3 grow cont-box"> <div class="p-3 grow cont-box">
<div class="p-3 h-full cont-inner"> <div class="p-3 h-full cont-inner">
<div class="flex justify-between collapse-head"> <div class="flex justify-between collapse-head mt-2">
<span class="text-16">全部内容</span> <span class="text-16 font-semibold">全部内容</span>
<span @click="toggleAll"> <span @click="toggleAll">
<span v-if="!collapseAll">展开全部</span> <span v-if="!collapseAll">展开全部</span>
<span v-else>收起全部</span> <span v-else>收起全部</span>
......
<template> <template>
<div class="p-3 grow cont-box"> <div class="p-3 grow cont-box">
<div class="p-3 h-full cont-inner"> <div class="p-3 h-full cont-inner">
<div class="flex justify-between collapse-head"> <div class="flex justify-between collapse-head mt-2">
<span class="text-16">全部内容</span> <span class="text-16 font-semibold">全部内容</span>
<span @click="toggleAll"> <span @click="toggleAll">
<span v-if="!collapseAll">展开全部</span> <span v-if="!collapseAll">展开全部</span>
<span v-else>收起全部</span> <span v-else>收起全部</span>
......
<template> <template>
<div class="p-3 grow cont-box"> <div class="p-3 grow cont-box">
<div class="p-3 h-full cont-inner"> <div class="p-3 h-full cont-inner">
<div class="flex justify-between collapse-head"> <div class="flex justify-between collapse-head mt-2">
<span class="text-16">全部内容</span> <span class="text-16 font-semibold">全部内容</span>
<span @click="toggleAll"> <span @click="toggleAll">
<span v-if="!collapseAll">展开全部</span> <span v-if="!collapseAll">展开全部</span>
<span v-else>收起全部</span> <span v-else>收起全部</span>
......
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
</div> </div>
<div class="p-3 grow cont-box"> <div class="p-3 grow cont-box">
<div class="p-3 h-full cont-inner"> <div class="p-3 h-full cont-inner">
<div class="flex justify-between collapse-head"> <div class="flex justify-between collapse-head mt-2">
<span class="text-16">全部内容</span> <span class="text-16 font-semibold">全部内容</span>
<span @click="toggleAll"> <span @click="toggleAll">
<span v-if="!collapseAll">展开全部</span> <span v-if="!collapseAll">展开全部</span>
<span v-else>收起全部</span> <span v-else>收起全部</span>
......
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