解决冲突
This commit is contained in:
@@ -1,9 +1,7 @@
|
||||
<template>
|
||||
<view class="content-class">
|
||||
<template v-if="isLoggedIn">
|
||||
<!-- 顶部渐变背景层 -->
|
||||
<view class="bg-gradient"></view>
|
||||
|
||||
<!-- 页面内容区 -->
|
||||
<view class="page-content">
|
||||
<view class="sticky-header">
|
||||
@@ -22,14 +20,6 @@
|
||||
style="height: 100%; width: 100%"
|
||||
></image>
|
||||
</view>
|
||||
<view class="community-selector">
|
||||
<text class="community-name">{{ currentCommunity }}</text>
|
||||
<view class="community-icon">
|
||||
<image
|
||||
src="https://wuyeadmin.bugtc.com/images/imgs/adress.png"
|
||||
style="height: 100%; width: 100%"
|
||||
></image>
|
||||
</view>
|
||||
<view class="community-selector">
|
||||
<text class="community-name">{{ currentCommunity }}</text>
|
||||
<view class="community-icon">
|
||||
@@ -42,7 +32,6 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 可滚动内容区 -->
|
||||
<view class="scroll-content">
|
||||
|
||||
Reference in New Issue
Block a user