Skip to content

basic-uniapp-v3
basic-uniapp-v3
提交 9a530bba 作者: 吴佳伟
操作

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

上级 4b730fe6 b6f619be
正在显示 包含 77 行增加 和 203 行删除
src/pages/chanxiao/purchaseXuQiu.vue
...@@ -60,9 +60,17 @@ ...@@ -60,9 +60,17 @@
}, },
rules: [ rules: [
{ {
name: 'classify',
rule: ['required'],
msg: ['请选择采购类别'],
}, {
name: 'title', name: 'title',
rule: ['required'], rule: ['required'],
msg: ['请输入标题'], msg: ['请输入采购标题'],
}, {
name: 'count',
rule: ['required'],
msg: ['请输入数量'],
}, },
{ {
name: 'count', name: 'count',
...@@ -94,11 +102,7 @@ ...@@ -94,11 +102,7 @@
rule: ['required'], rule: ['required'],
msg: ['请选择省/市/区县'], msg: ['请选择省/市/区县'],
}, },
{
name: 'classify',
rule: ['required'],
msg: ['请选择分类'],
},
{ {
name: 'image', name: 'image',
rule: ['required'], rule: ['required'],
...@@ -244,6 +248,14 @@ return ...@@ -244,6 +248,14 @@ return
formData.country = addressValue[2] formData.country = addressValue[2]
} }
} }
function getCurrentDate() {
const date = new Date()
const year = date.getFullYear()
const month = String(date.getMonth() + 1).padStart(2, '0')
const day = String(date.getDate()).padStart(2, '0')
return `${year}-${month}-${day}`
}
</script> </script>
<template> <template>
...@@ -251,21 +263,17 @@ return ...@@ -251,21 +263,17 @@ return
<view class="formBox"> <view class="formBox">
<fui-form ref="formRef" label-weight="auto" top="60"> <fui-form ref="formRef" label-weight="auto" top="60">
<view class="mt20"> <view class="mt20">
<fui-input <view class="form-section" style="padding: 0 10rpx">
required <view class="form-item required flex align-center">
label="采购标题" <text class="label">采购类别</text>
placeholder="请输入采购标题" <view class="time-input" @click="show.classify = true">
v-model="form.title" <text class="select-text" :class="{ placeholder: !form.classifyText }">
labelSize="28" {{ form.classifyText || '请选择采购类别' }}
label-width="180" </text>
/> </view>
<fui-input </view>
label="说明" </view>
placeholder="请输入规格说明" <fui-input required label="采购标题" placeholder="请输入需求名称" v-model="form.title" labelSize="28" label-width="180" maxlength="16" size="28" />
v-model="form.inputTextArea"
labelSize="28"
label-width="180"
/>
</view> </view>
<view class="mt20"> <view class="mt20">
<!-- 价格区间 --> <!-- 价格区间 -->
...@@ -273,136 +281,59 @@ return ...@@ -273,136 +281,59 @@ return
<view class="form-item required flex align-center"> <view class="form-item required flex align-center">
<text class="label">价格区间</text> <text class="label">价格区间</text>
<view class="price-range"> <view class="price-range">
<input <input type="number" class="price-input" v-model="form.priceStart" placeholder="最低价" :min="0" maxlength="6" />
type="number" <text class="price-separator">至</text>
class="price-input" <input type="number" class="price-input" v-model="form.priceEnd" placeholder="最高价" :min="0" maxlength="6" >
v-model="form.priceStart" <view slot="suffix" class="unit-slot" style="font-size: 28rpx;">元</view>
placeholder="最低价" </input>
:min="0"
/>
<text class="price-separator">-</text>
<input
type="number"
class="price-input"
v-model="form.priceEnd"
placeholder="最高价"
:min="0"
/>
</view> </view>
</view> </view>
</view> </view>
<fui-input <fui-input type="number" required label="采购数量" placeholder="请输入采购数量" v-model="form.count" labelSize="28" label-width="180" maxlength="8" size="28"/>
type="number" <fui-input required label="单位" placeholder="请输入单位(如：个、kg、袋等)" v-model="form.unit" labelSize="28" label-width="180" maxlength="4" size="28"/>
required
label="数量"
placeholder="请输入数量"
v-model="form.count"
labelSize="28"
label-width="180"
/>
<fui-input
required
label="单位"
placeholder="请输入计量单位"
v-model="form.unit"
labelSize="28"
label-width="180"
/>
</view>
<view class="mt20">
<view class="form-item required flex align-center" style="padding: 20rpx 10rpx"> <view class="form-item required flex align-center" style="padding: 20rpx 10rpx">
<text class="label">省/市/区县</text> <text class="label">区域</text>
<view class="time-input" @click="show.address = true"> <view class="time-input" @click="show.address = true">
<text class="select-text" :class="{ placeholder: !form.address }"> <text class="select-text" :class="{ placeholder: !form.address }">
{{ getText(form.address, ' / ') || '请选择省/市/区县' }} {{ getText(form.address, ' / ') || '请选择区域' }}
</text> </text>
</view> </view>
</view> </view>
</view>
<view class="mt20">
<!-- 截至时间 --> <!-- 截至时间 -->
<view class="form-section" style="padding: 0 10rpx"> <view class="form-section" style="padding: 0 10rpx">
<view class="form-item required flex align-center"> <view class="form-item required flex align-center">
<text class="label">截至时间</text> <text class="label">截止时间</text>
<view class="time-input" @click="show.time = true"> <view class="time-input" @click="show.time = true">
<text class="time-text" :class="{ placeholder: !form.deadLine }"> <text class="time-text" :class="{ placeholder: !form.deadLine }">
{{ form.deadLine || '请选择截止时间' }} {{ form.deadLine || '请选择采购截止时间' }}
</text> </text>
</view> </view>
</view> </view>
</view> </view>
<view class="form-section" style="padding: 0 10rpx"> <view class="mb-1 flex justify-start" style="font-size: 28rpx;">
<view class="form-item required flex align-center"> <span style="color: red;margin-left: 10rpx;">*&nbsp;</span>
<text class="label">分类</text> <span>图片</span>
<view class="time-input" @click="show.classify = true">
<text class="select-text" :class="{ placeholder: !form.classifyText }">
{{ form.classifyText || '请选择分类' }}
</text>
</view>
</view>
</view> </view>
</view> <uni-file-picker :value="form.imageObj" ref="uploadRef" limit="1" :auto-upload="false" @select="handleUpload" @delete="handleDelete" style="margin-left:35rpx"/>
<view class="bg-white mt20" style="padding: 0.875rem 1rem">
<view class="mb-1 flex justify-start"> 示例图片 </view>
<uni-file-picker
:value="form.imageObj"
ref="uploadRef"
limit="1"
:auto-upload="false"
@select="handleUpload"
@delete="handleDelete"
/>
</view> </view>
<view class="fui-btn__box" v-if="!form.id" style="margin-top: 30rpx"> <view class="fui-btn__box" v-if="!form.id" style="margin-top: 30rpx">
<fui-button text="发布需求" bold radius="96rpx" @click="submit" /> <fui-button text="发布" bold radius="96rpx" @click="submit" />
</view> </view>
</fui-form> </fui-form>
<fui-date-picker :show="show.time" type="3" @change="handleChangeTime" @cancel="show.time = false" /> <fui-date-picker :show="show.time" type="3" @change="handleChangeTime" @cancel="show.time = false" />
<fui-picker <fui-picker :show="show.classify" :layer="1" :linkage="true" :options="options.classify" @change="handleChangeClassify" @cancel="show.classify = false" />
:show="show.classify" <fui-picker :show="show.address" :options="options.address" :linkage="true" :layer="3" @change="handleChangeAddress" @cancel="show.address = false" />
:layer="1"
:linkage="true"
:options="options.classify"
@change="handleChangeClassify"
@cancel="show.classify = false"
/>
<fui-picker
:show="show.address"
:options="options.address"
:linkage="true"
:layer="3"
@change="handleChangeAddress"
@cancel="show.address = false"
/>
<fui-toast ref="toastRef" /> <fui-toast ref="toastRef" />
</view> </view>
</view> </view>
<fui-date-picker <fui-date-picker :show="show.time" type="3" @change="handleChangeTime" @cancel="show.time = false" minDate="2025-01-01" />
:show="show.time" <fui-picker :show="show.classify" :layer="1" :linkage="true" :options="options.classify" @change="handleChangeClassify" @cancel="show.classify = false" />
type="3" <fui-picker :show="show.address" :options="options.address" :linkage="true" :layer="3" @change="handleChangeAddress" @cancel="show.address = false" />
@change="handleChangeTime"
@cancel="show.time = false"
minDate="2025-01-01"
/>
<fui-picker
:show="show.classify"
:layer="1"
:linkage="true"
:options="options.classify"
@change="handleChangeClassify"
@cancel="show.classify = false"
/>
<fui-picker
:show="show.address"
:options="options.address"
:linkage="true"
:layer="3"
@change="handleChangeAddress"
@cancel="show.address = false"
/>
<fui-toast ref="toastRef" /> <fui-toast ref="toastRef" />
</template> </template>
......
src/pages/fuwu/fuwu.vue
...@@ -349,43 +349,29 @@ ...@@ -349,43 +349,29 @@
</view> </view>
<view class="codefun-flex-row equal-division_2 section_1"> <view class="codefun-flex-row equal-division_2 section_1">
<template v-for="(product, index) in pageData.financialProducts" :key="product.id"> <template v-for="(product, index) in pageData.financialProducts" :key="product.id">
<view <view class="codefun-flex-col group_12" :class="{
class="codefun-flex-col group_12"
:class="{
group_36: product.id === 1, group_36: product.id === 1,
group_32: product.id === 2, group_32: product.id === 2,
group_33: product.id === 3, group_33: product.id === 3,
}" }" @click="onFinancialProductClick(product)">
@click="onFinancialProductClick(product)"
>
<image class="codefun-self-center image_10" :src="product.image" /> <image class="codefun-self-center image_10" :src="product.image" />
<template v-if="product.name"> <template v-if="product.name">
<text class="codefun-self-center font_11" :class="`text_${19 + product.id}`">{{ <text class="codefun-self-center font_11" :class="`text_${19 + product.id}`">{{product.name}}</text>
product.name
}}</text>
<text class="codefun-self-center font_11">{{ product.subName }}</text> <text class="codefun-self-center font_11">{{ product.subName }}</text>
</template> </template>
<template v-else> <template v-else>
<text class="codefun-self-stretch font_11 text_22">{{ product.description }}</text> <text class="codefun-self-stretch font_11 text_22">{{ product.description }}</text>
</template> </template>
<view <view class="codefun-flex-col codefun-justify-start codefun-items-center codefun-self-stretch"
class="codefun-flex-col codefun-justify-start codefun-items-center codefun-self-stretch"
:class="{ :class="{
'text-wrapper_2 view_1': product.id === 1, 'text-wrapper_2 view_1': product.id === 1,
'text-wrapper_14': product.id === 2, 'text-wrapper_14': product.id === 2,
'text-wrapper_2 view_2': product.id === 3, 'text-wrapper_2 view_2': product.id === 3,
}" }">
> <text class="font_12" :class="`text_${24 + product.id}`">{{product.actionText}}</text>
<text class="font_12" :class="`text_${24 + product.id}`">{{
product.actionText
}}</text>
</view> </view>
</view> </view>
<view v-if="index < pageData.financialProducts.length - 1" class="section_5 horiz-divider"/>
<view
v-if="index < pageData.financialProducts.length - 1"
class="section_5 horiz-divider"
/>
</template> </template>
</view> </view>
</view> </view>
...@@ -393,32 +379,17 @@ ...@@ -393,32 +379,17 @@
<text class="codefun-self-start font_5 text_26">农资交易</text> <text class="codefun-self-start font_5 text_26">农资交易</text>
<view class="codefun-flex-col codefun-self-stretch section_6 codefun-mt-16"> <view class="codefun-flex-col codefun-self-stretch section_6 codefun-mt-16">
<view class="grid"> <view class="grid">
<view <view v-for="product in pageData.agriculturalProducts" :key="product.id" class="codefun-flex-col grid-item_3" @click="onAgriculturalProductClick(product)" >
v-for="product in pageData.agriculturalProducts" <view class="codefun-flex-col codefun-justify-start codefun-items-start codefun-self-stretch section_10">
:key="product.id" <view class="codefun-flex-col codefun-justify-start codefun-items-center text-wrapper_3" >
class="codefun-flex-col grid-item_3"
@click="onAgriculturalProductClick(product)"
>
<view
class="codefun-flex-col codefun-justify-start codefun-items-start codefun-self-stretch section_10"
>
<view
class="codefun-flex-col codefun-justify-start codefun-items-center text-wrapper_3"
>
<text class="font_13">{{ product.labels_dictText.split(',')[0] }}</text> <text class="font_13">{{ product.labels_dictText.split(',')[0] }}</text>
</view> </view>
</view> </view>
<text class="codefun-self-start font text_27 codefun-mt-10 ellipsis">{{ <text class="codefun-self-start font text_27 codefun-mt-10 ellipsis" style="font-size: 28rpx;">{{product.name}}</text>
product.name <text class="codefun-self-start font_1 text_27 codefun-mt-10" style="font-size: 28rpx;">￥{{ product.sellPrice }}</text>
}}</text>
<text class="codefun-self-start font_1 text_27 codefun-mt-10"
>￥{{ product.sellPrice }}</text
>
</view> </view>
</view> </view>
<view <view class="codefun-flex-col codefun-justify-start codefun-items-center text-wrapper_4 codefun-mt-14 !hidden">
class="codefun-flex-col codefun-justify-start codefun-items-center text-wrapper_4 codefun-mt-14 !hidden"
>
<text class="font_15 text_29">作业预约</text> <text class="font_15 text_29">作业预约</text>
</view> </view>
</view> </view>
...@@ -427,54 +398,26 @@ ...@@ -427,54 +398,26 @@
<text class="codefun-self-start font_5">一站式解决农机问题</text> <text class="codefun-self-start font_5">一站式解决农机问题</text>
<view class="codefun-flex-col codefun-self-stretch section_11"> <view class="codefun-flex-col codefun-self-stretch section_11">
<view class="codefun-flex-row equal-division_3"> <view class="codefun-flex-row equal-division_3">
<view <view v-for="service in pageData.farmMachineryServices" :key="service.id" class="codefun-flex-col equal-division-item_3"
v-for="service in pageData.farmMachineryServices" :class="{section_12: service.id === 1, 'section_13 ml-11': service.id === 2,}" @click="onFarmMachineryServiceClick(service)">
:key="service.id"
class="codefun-flex-col equal-division-item_3"
:class="{
section_12: service.id === 1,
'section_13 ml-11': service.id === 2,
}"
@click="onFarmMachineryServiceClick(service)"
>
<view class="codefun-flex-row codefun-items-center codefun-self-stretch"> <view class="codefun-flex-row codefun-items-center codefun-self-stretch">
<image class="image_11" :src="service.image" /> <image class="image_11" :src="service.image" />
<text class="font_5 text_33 ml-7">{{ service.title }}</text> <text class="font_5 text_33 ml-7">{{ service.title }}</text>
</view> </view>
<text <text class="codefun-self-start font_10" :class="`text_${31 + service.id} codefun-mt-10`" >{{ service.description }}</text>
class="codefun-self-start font_10" <view class="codefun-flex-row codefun-justify-end codefun-items-center codefun-self-stretch"
:class="`text_${31 + service.id} codefun-mt-10`" :class="{'group_13 codefun-mt-10': service.id === 1, 'codefun-mt-10': service.id === 2,}">
>{{ service.description }}</text <image class="image_12" :class="{ image_13: service.id === 1, image_14: service.id === 2 }" :src="service.actionImage"/>
> <text class="font_10" :class="`text_${33 + service.id}`">{{service.actionText}}</text>
<view
class="codefun-flex-row codefun-justify-end codefun-items-center codefun-self-stretch"
:class="{
'group_13 codefun-mt-10': service.id === 1,
'codefun-mt-10': service.id === 2,
}"
>
<image
class="image_12"
:class="{ image_13: service.id === 1, image_14: service.id === 2 }"
:src="service.actionImage"
/>
<text class="font_10" :class="`text_${33 + service.id}`">{{
service.actionText
}}</text>
</view> </view>
</view> </view>
</view> </view>
<view <view class="codefun-flex-col codefun-justify-start codefun-items-center codefun-self-stretch text-wrapper_4 codefun-mt-14" @click="Navigate.to('/pages/nongjifuwu/nongjifuwu')">
class="codefun-flex-col codefun-justify-start codefun-items-center codefun-self-stretch text-wrapper_4 codefun-mt-14"
@click="Navigate.to('/pages/nongjifuwu/nongjifuwu')"
>
<text class="font_15 text_29">作业预约</text> <text class="font_15 text_29">作业预约</text>
</view> </view>
<text class="codefun-self-center font_10 text_36 codefun-mt-14">紧急报修30分钟响应</text> <text class="codefun-self-center font_10 text_36 codefun-mt-14">紧急报修30分钟响应</text>
</view> </view>
<view <view class="codefun-flex-row codefun-justify-between codefun-items-center codefun-self-stretch group_14">
class="codefun-flex-row codefun-justify-between codefun-items-center codefun-self-stretch group_14"
>
<text class="font_5">一站式解决农机问题</text> <text class="font_5">一站式解决农机问题</text>
<!-- <text class="font_6 text_37" @click="onViewAllMachineryCases">全部案例</text> --> <!-- <text class="font_6 text_37" @click="onViewAllMachineryCases">全部案例</text> -->
</view> </view>
......
src/pages/linghuoyonggong/components/register-dialog.vue
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</view> </view>
<view class="text-left"> <view class="text-left">
<fui-form ref="formRef"> <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"/> <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"> <view style="margin-top: 30rpx">
<fui-button text="提交" bold radius="96rpx" @click="submit" /> <fui-button text="提交" bold radius="96rpx" @click="submit" />
......
src/pages/nongjifuwu/components/apply-dialog.vue
...@@ -139,7 +139,7 @@ ...@@ -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" 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.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-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"> <view style="margin-top: 30rpx">
<fui-button type="warning" text="提交" bold radius="96rpx" @click="submit" /> <fui-button type="warning" text="提交" bold radius="96rpx" @click="submit" />
</view> </view>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论