From b6923adb7b6a5fcbe4a2eaa06e1ebe0e044ba0e2 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 28 三月 2024 14:22:42 +0800
Subject: [PATCH] 代码合并
---
packagePersonal/pages/aboutUs/index.wxml | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/packagePersonal/pages/aboutUs/index.wxml b/packagePersonal/pages/aboutUs/index.wxml
index 40f4321..634d3ce 100644
--- a/packagePersonal/pages/aboutUs/index.wxml
+++ b/packagePersonal/pages/aboutUs/index.wxml
@@ -1,20 +1,24 @@
-<view style="width: 100%; height: {{barHeight}}px; "></view>
-<view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
- <view>
- <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
+<view class="aboutUsBox">
+ <view class="titleBox">
+ <view style="width: 100%; height: {{barHeight}}px; "></view>
+ <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
+ <view>
+ <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
+ </view>
+ <view wx:if="{{types == 'jsek_aboutUs'}}" class="navbar-title">鍏充簬鎴戜滑</view>
+ <view wx:else class="navbar-title">鑱旂郴鎴戜滑</view>
+ </view>
</view>
- <view wx:if="{{types == 'jsek_aboutUs'}}" class="navbar-title">鍏充簬鎴戜滑</view>
- <view wx:else class="navbar-title">鑱旂郴鎴戜滑</view>
-</view>
+ <view wx:if="{{types == 'jsek_aboutUs'}}" class="aboutUs">
+ <view class="aboutText ">
+ <rich-text nodes="{{aboutText}}" space="emsp"></rich-text>
+ </view>
-
-
-<view class="aboutUs">
-
- <view class="aboutText">
- <rich-text nodes="{{aboutText}}"></rich-text>
+ </view>
+ <view wx:else class="aboutText ">
+ <rich-text style="width: 100%;" nodes="{{aboutText}}"></rich-text>
</view>
</view>
\ No newline at end of file
--
Gitblit v1.9.1