From 3e778610752d6ad3fbb96da18d39d171866613e3 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 12 四月 2024 17:40:36 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packagePersonal/pages/aboutUs/index.wxml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/packagePersonal/pages/aboutUs/index.wxml b/packagePersonal/pages/aboutUs/index.wxml
index 634d3ce..5431f5c 100644
--- a/packagePersonal/pages/aboutUs/index.wxml
+++ b/packagePersonal/pages/aboutUs/index.wxml
@@ -1,4 +1,8 @@
-<view class="aboutUsBox">
+<import src="index.skeleton.wxml" />
+<template is="skeleton" wx:if="{{loading}}" />
+
+
+<view class="aboutUsBox" hidden="{{hidden}}">
<view class="titleBox">
<view style="width: 100%; height: {{barHeight}}px; "></view>
<view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
@@ -12,13 +16,11 @@
<view wx:if="{{types == 'jsek_aboutUs'}}" class="aboutUs">
-
- <view class="aboutText ">
+ <view class="aboutText aboutUs">
<rich-text nodes="{{aboutText}}" space="emsp"></rich-text>
</view>
-
</view>
- <view wx:else class="aboutText ">
- <rich-text style="width: 100%;" nodes="{{aboutText}}"></rich-text>
+ <view wx:else class="aboutText" style="margin: 5rpx;">
+ <rich-text class="richTextBox" style="width: 100%;" space="emsp" nodes="{{aboutText}}" mode="compat"></rich-text>
</view>
</view>
\ No newline at end of file
--
Gitblit v1.9.1