Merge branch 'dev' of https://gitlab.yiring.com/digital-agri/agri-app into dev

src/pages/linghuoyonggong/components/register-dialog.vue

@@ -73,7 +73,7 @@
         </view>
         <view class="text-left">
             <fui-form ref="formRef">
-                <fui-input marginTop="30" size="28" placeholder="请填写预留姓名" v-model="pageData.form.reservedname" required maxlength="16" placeholderStyle="margin-left: 10rpx"/>
+                <fui-input marginTop="30" size="28" placeholder="请填写姓名" v-model="pageData.form.reservedname" required maxlength="16" placeholderStyle="margin-left: 10rpx"/>
                 <fui-input marginTop="30" size="28" placeholder="请填写预留手机" v-model="pageData.form.reservedmobile" required type="number" maxlength="11" placeholderStyle="margin-left: 10rpx"/>
                 <view style="margin-top: 30rpx">
                     <fui-button text="提交" bold radius="96rpx" @click="submit" />

src/pages/nongjifuwu/components/apply-dialog.vue

@@ -139,7 +139,7 @@
                 <fui-input marginTop="30" size="24" disabled @click="pageData.areaShow.address = true" placeholder="请选择作业区域" v-model="pageData.scopeText" required placeholderStyle="margin-left: 10rpx;"/>
                 <fui-input marginTop="30" size="24" placeholder="请填写详细地址" v-model="pageData.form.address" required placeholderStyle="margin-left: 10rpx;"/>
                 <fui-input marginTop="30" size="24" placeholder="请选择作业时间" v-model="pageData.form.time" @click="dict.show.time = true" required placeholderStyle="margin-left: 10rpx;"/>
-                <fui-textarea v-model="pageData.form.demand" :marginTop="30" size="24" placeholder="简要说明作业需求" flexStart required placeholderStyle="margin-left: 10rpx;"/>
+                <fui-textarea v-model="pageData.form.demand" :marginTop="30" size="24" placeholder="简要说明作业要求" flexStart required placeholderStyle="margin-left: 10rpx;" height="100rpx" />
                 <view style="margin-top: 30rpx">
                     <fui-button type="warning" text="提交" bold radius="96rpx" @click="submit" />
                 </view>