From f7452b9d6295748c9840245d26df6514e8ed2c1d Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sun, 08 Sep 2024 15:30:00 +0800
Subject: [PATCH] 合并冲突
---
by-wxparty/pages/register/index.wxml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/by-wxparty/pages/register/index.wxml b/by-wxparty/pages/register/index.wxml
index f620ca7..94341e8 100644
--- a/by-wxparty/pages/register/index.wxml
+++ b/by-wxparty/pages/register/index.wxml
@@ -51,7 +51,7 @@
纠纷描述
<text class="cell-required">（必填）</text>
</view>
- <van-field autosize="{{ { maxHeight: 88, minHeight: 22 } }}" bind:change="handleChange" border="{{ false }}" custom-style="padding:0;" data-key="caseDes" placeholder="请简要描述纠纷发生的时间、地点及经过" type="textarea" value="{{ submitData.caseDes }}" />
+ <van-field autosize="{{ { maxHeight: 88, minHeight: 88 } }}" bind:change="handleChange" border="{{ false }}" custom-style="padding:0;" data-key="caseDes" placeholder="请简要描述纠纷发生的时间、地点及经过请简要描述纠纷发生的时间、地点及经过请简要描述纠纷发生的时间、地点及经过" type="textarea" value="{{ submitData.caseDes }}" />
<!-- <view class="case">
<view class="img-case_2">
<image src="/img/case_1.png" class="img1"></image>
--
Gitblit v1.8.0