From fc3422d53b7e948d84ac15d60705ecd096c7adb2 Mon Sep 17 00:00:00 2001
From: liuwh <964324856@qq.com>
Date: Tue, 10 Sep 2024 18:27:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-wxparty/components/steps/index.wxml | 77 ++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 37 deletions(-)
diff --git a/gz-wxparty/components/steps/index.wxml b/gz-wxparty/components/steps/index.wxml
index 85f12b8..10806b9 100644
--- a/gz-wxparty/components/steps/index.wxml
+++ b/gz-wxparty/components/steps/index.wxml
@@ -1,39 +1,42 @@
<!--步骤条-->
<view class="steps">
- <block wx:if="{{ stepsType === 'number' }}">
- <view class="steps-item {{ index <= stepsActive && 'steps-item-active' }}" wx:for="{{ stepsData }}" wx:key="index">
- <view class="steps-item-round" wx:if="{{ index > stepsActive }}">{{ index + 1 }}</view>
- <view class="steps-item-round" wx:else>
- <van-icon name="success" />
- </view>
- <view class="steps-item-text">{{ item }}</view>
- <view class="steps-item-icon" wx:if="{{ index < stepsData.length - 1 }}">
- <block wx:if="{{ index > stepsActive }}">
- <van-icon name="{{ imgUrl }}steps-arrow.png" size="14" />
- </block>
- <block wx:else>
- <van-icon name="{{ imgUrl }}steps-arrow-active.png" size="14" />
- </block>
- </view>
- </view>
- </block>
- <block wx:else>
- <view class="steps-item {{ index <= stepsActive && 'steps-item-active' }}" wx:for="{{ stepsData }}" wx:key="index">
- <view class="steps-item-round" wx:if="{{ index > stepsActive }}">
- <van-icon name="{{ imgUrl }}{{ item.icon }}" />
- </view>
- <view class="steps-item-round" wx:else>
- <van-icon name="{{ imgUrl }}{{ item.activeIcon }}" />
- </view>
- <view class="steps-item-text">{{ item.title }}</view>
- <view class="steps-item-icon" wx:if="{{ index < stepsData.length - 1 }}">
- <block wx:if="{{ index > stepsActive }}">
- <van-icon name="{{ imgUrl }}steps-arrow.png" size="14" />
- </block>
- <block wx:else>
- <van-icon name="{{ imgUrl }}steps-arrow-active.png" size="14" />
- </block>
- </view>
- </view>
- </block>
-</view>
+ <block wx:if="{{ stepsType === 'number' }}">
+ <view class="steps-item {{ index <= stepsActive && 'steps-item-active' }}" wx:for="{{ stepsData }}" wx:key="index">
+ <view class="steps-item-round" wx:if="{{ index > stepsActive }}">{{ index + 1 }}</view>
+ <view class="steps-item-round" wx:else>
+ <van-icon name="success" />
+ </view>
+ <view class="steps-item-text">{{ item }}</view>
+ <view class="steps-item-icon" wx:if="{{ index < stepsData.length - 1 }}">
+ <block wx:if="{{ index > stepsActive }}">
+ <van-icon name="{{ imgUrl }}steps-arrow.png" size="14" />
+ </block>
+ <block wx:else>
+ <van-icon custom-style="font-weight:600" name="arrow" size="14" />
+ </block>
+ </view>
+ </view>
+ </block>
+ <block wx:else>
+ <view class="steps-item {{ index <= stepsActive && 'steps-item-active' }}" wx:for="{{ stepsData }}" wx:key="index">
+ <view class="steps-item-round" wx:if="{{ index > stepsActive }}">
+ <view class="steps-item-number">{{item.number}}</view>
+ </view>
+ <view class="steps-item-round" wx:if="{{ index === stepsActive }}">
+ <view class="steps-item-number">{{item.number}}</view>
+ </view>
+ <view class="steps-item-round1" wx:if="{{ index < stepsActive }}">
+ <van-icon name="success" />
+ </view>
+ <view class="steps-item-text">{{ item.title }}</view>
+ <view class="steps-item-icon" wx:if="{{ index < stepsData.length - 1 }}">
+ <block wx:if="{{ index > stepsActive }}">
+ <view class="steps-item-line"></view>
+ </block>
+ <block wx:else>
+ <view class="steps-item-hoverLine"></view>
+ </block>
+ </view>
+ </view>
+ </block>
+</view>
\ No newline at end of file
--
Gitblit v1.8.0