From cd98c69ff835643f518337ee9ab532885c647efb Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 15 三月 2024 18:48:39 +0800
Subject: [PATCH] 合并代码
---
pages/aboutUs/index.wxml | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/pages/aboutUs/index.wxml b/pages/aboutUs/index.wxml
index 9b311d6..40f4321 100644
--- a/pages/aboutUs/index.wxml
+++ b/pages/aboutUs/index.wxml
@@ -1,30 +1,19 @@
-<!--pages/aboutUs/index.wxml-->
-<!-- <text>鍏充簬鎴戜滑</text> -->
+<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 class="">
- <canvas style="width: 200px; height: 200px;margin:0 auto" canvas-id="myQrcode"></canvas>
-</view> -->
-
-
-
-
-
-
-<!-- <view class="swiper-wrap">
- <t-swiper list="{{bannerList}}" current="{{current}}" autoplay="{{autoplay}}" duration="{{duration}}" interval="{{interval}}" navigation="{{navigation}}" />
-</view> -->
<view class="aboutUs">
- <view class="imageBox">
- <image src="{{swiperList}}" alt="" />
- </view>
+
<view class="aboutText">
<rich-text nodes="{{aboutText}}"></rich-text>
</view>
--
Gitblit v1.9.1