Skip to content

basic-uniapp-v3
basic-uniapp-v3
提交 123218d9 作者: 方治民
操作

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

上级 4ffeb10f 5d650a0f
正在显示 包含 55 行增加 和 266 行删除
src/api/model/userInfo.ts
...@@ -8,7 +8,6 @@ enum Api { ...@@ -8,7 +8,6 @@ enum Api {
sms = '/sys/sms', sms = '/sys/sms',
dictList = '/sys/dict/queryAllDictItems', // 获取字典数据 dictList = '/sys/dict/queryAllDictItems', // 获取字典数据
location = '/tianditu/geocode', // 根据经纬度获取地址 location = '/tianditu/geocode', // 根据经纬度获取地址
sysSmsCode = '/app/user/getSmsCode', // 短信验证码
sysRegister = '/app/user/register', // 注册 sysRegister = '/app/user/register', // 注册
} }
/** /**
...@@ -101,16 +100,3 @@ export function sysRegister(params = {}) { ...@@ -101,16 +100,3 @@ export function sysRegister(params = {}) {
params, params,
}) })
} }
/**
* @param params 请求参数
* @description: 短信验证码
*/
export function sysSmsCode(params = {}) {
return otherHttp.get({
url: Api.sysSmsCode,
params,
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
},
})
}
src/pages/linghuoyonggong/form.vue
...@@ -273,6 +273,14 @@ return ...@@ -273,6 +273,14 @@ return
} }
}) })
} }
function getCurrentDate(){
const date = new Date()
const year = date.getFullYear()
const month = date.getMonth() + 1
const day = date.getDate()
return `${year}-${month}-${day}`
}
</script> </script>
<template> <template>
...@@ -280,81 +288,18 @@ return ...@@ -280,81 +288,18 @@ return
<view class="formBox"> <view class="formBox">
<fui-form ref="formRef" label-weight="auto" top="60" :disabled="form.id ? true : false"> <fui-form ref="formRef" label-weight="auto" top="60" :disabled="form.id ? true : false">
<view class="mt20"> <view class="mt20">
<fui-input <fui-input required label="名称" placeholder="请输入名称" v-model="form.name" labelSize="28" label-width="180" />
required <fui-input required label="工作内容" placeholder="请输入工作内容" v-model="form.content" labelSize="28" label-width="180" />
label="名称"
placeholder="请输入名称"
v-model="form.name"
labelSize="28"
label-width="180"
/>
<fui-input
required
label="工作内容"
placeholder="请输入工作内容"
v-model="form.content"
labelSize="28"
label-width="180"
/>
</view> </view>
<view class="mt20"> <view class="mt20">
<fui-input <fui-input required type="number" :min="0" label="工人数量" placeholder="请输入工人数量" v-model="form.workers" labelSize="28" label-width="180" />
required <fui-input required type="number" label="价钱" :min="0" placeholder="请输入价钱" v-model="form.price" labelSize="28" label-width="180" />
type="number" <fui-input required label="类型" placeholder="请选择类型" v-model="form.typeText" labelSize="28" label-width="180" @click="show.type = true" />
:min="0"
label="工人数量"
placeholder="请输入工人数量"
v-model="form.workers"
labelSize="28"
label-width="180"
/>
<fui-input
required
type="number"
label="价钱"
:min="0"
placeholder="请输入价钱"
v-model="form.price"
labelSize="28"
label-width="180"
/>
<fui-input
required
label="类型"
placeholder="请选择类型"
v-model="form.typeText"
labelSize="28"
label-width="180"
@click="show.type = true"
/>
</view> </view>
<view class="mt20"> <view class="mt20">
<fui-input <fui-input required label="地区" placeholder="请选择地区" v-model="form.areaText" labelSize="28" label-width="180" @click="show.area = true" />
required <fui-input required label="详细地址" placeholder="请输入详细地址" v-model="form.address" labelSize="28" label-width="180" />
label="地区" <fui-input required label="紧急程度" placeholder="请选择紧急程度" v-model="form.urgentdegreeText" labelSize="28" label-width="180" @click="show.urgentdegree = true" />
placeholder="请选择地区"
v-model="form.areaText"
labelSize="28"
label-width="180"
@click="show.area = true"
/>
<fui-input
required
label="详细地址"
placeholder="请输入详细地址"
v-model="form.address"
labelSize="28"
label-width="180"
/>
<fui-input
required
label="紧急程度"
placeholder="请选择紧急程度"
v-model="form.urgentdegreeText"
labelSize="28"
label-width="180"
@click="show.urgentdegree = true"
/>
<!-- 时间范围 --> <!-- 时间范围 -->
<view class="form-section" style="padding: 0 30rpx"> <view class="form-section" style="padding: 0 30rpx">
<view class="form-item flex align-center"> <view class="form-item flex align-center">
...@@ -376,7 +321,7 @@ return ...@@ -376,7 +321,7 @@ return
</view> </view>
</view> </view>
<view class="bg-white mt20" style="padding: 0.875rem 1rem"> <view class="bg-white mt20" style="padding: 0.875rem 1rem">
<view class="mb-1 flex justify-start"> 图片 </view> <view class="mb-1 flex justify-start"><span style="color: red;">*&nbsp;</span> 图片 </view>
<uni-file-picker <uni-file-picker
:value="form.pictureObj" :value="form.pictureObj"
ref="uploadRef" ref="uploadRef"
...@@ -393,33 +338,11 @@ return ...@@ -393,33 +338,11 @@ return
</view> </view>
</view> </view>
<fui-date-picker :show="show.time1" type="3" @change="handleChangeTime1" @cancel="show.time1 = false" /> <fui-date-picker :show="show.time1" type="3" @change="handleChangeTime1" :min-date="getCurrentDate()" @cancel="show.time1 = false" />
<fui-date-picker :show="show.time2" type="3" @change="handleChangeTime2" @cancel="show.time2 = false" /> <fui-date-picker :show="show.time2" type="3" @change="handleChangeTime2" :min-date="getCurrentDate()" @cancel="show.time2 = false" />
<fui-picker <fui-picker :show="show.type" :layer="1" :linkage="true" :options="options.type" @change="handleChangetype" @cancel="show.type = false" />
:show="show.type" <fui-picker :show="show.urgentdegree" :layer="1" :linkage="true" :options="options.urgentdegree" @change="handleChangeUrgentdegree" @cancel="show.urgentdegree = false"/>
:layer="1" <fui-picker :show="show.area" :options="options.area" :linkage="true" :layer="3" @change="handleChangeAddress" @cancel="show.area = false" />
:linkage="true"
:options="options.type"
@change="handleChangetype"
@cancel="show.type = false"
/>
<fui-picker
:show="show.urgentdegree"
:layer="1"
:linkage="true"
:options="options.urgentdegree"
@change="handleChangeUrgentdegree"
@cancel="show.urgentdegree = false"
/>
<fui-picker
:show="show.area"
:options="options.area"
:linkage="true"
:layer="3"
@change="handleChangeAddress"
@cancel="show.area = false"
/>
<fui-toast ref="toastRef" /> <fui-toast ref="toastRef" />
<fui-loading isFixed v-if="pageData.loading" backgroundColor="rgba(0, 0, 0, 0.4)" /> <fui-loading isFixed v-if="pageData.loading" backgroundColor="rgba(0, 0, 0, 0.4)" />
</template> </template>
......
src/pages/nongjifuwu/components/apply-dialog.vue
...@@ -22,31 +22,26 @@ ...@@ -22,31 +22,26 @@
}, },
rules: [ rules: [
{ {
name: 'phone',
rule: ['required'],
msg: ['请填写手机号码'],
}, {
name: 'scope',
rule: ['required'],
msg: ['请选择作业区域'],
}, {
name: 'startTime', name: 'startTime',
rule: ['required'], rule: ['required'],
msg: ['请选择开始时间'], msg: ['请选择开始时间'],
}, }, {
{
name: 'endTime', name: 'endTime',
rule: ['required'], rule: ['required'],
msg: ['请选择结束时间'], msg: ['请选择结束时间'],
}, }, {
{
name: 'scope',
rule: ['required'],
msg: ['请填写地区'],
},
{
name: 'address', name: 'address',
rule: ['required'], rule: ['required'],
msg: ['请填写详细地址'], msg: ['请填写详细地址'],
}, }, {
{
name: 'phone',
rule: ['required'],
msg: ['请填写联系方式'],
},
{
name: 'demand', name: 'demand',
rule: ['required'], rule: ['required'],
msg: ['请填写需求'], msg: ['请填写需求'],
...@@ -121,24 +116,17 @@ ...@@ -121,24 +116,17 @@
</view> </view>
<view class="text-left"> <view class="text-left">
<fui-form ref="formRef"> <fui-form ref="formRef">
<fui-input marginTop="30" size="24" placeholder="请填写预留手机" v-model="pageData.form.phone" /> <fui-input marginTop="30" size="24" placeholder="请填写手机号码" v-model="pageData.form.phone" required />
<fui-input marginTop="30" size="24" placeholder="请填写作业地区" v-model="pageData.form.scope" /> <fui-input marginTop="30" size="24" placeholder="请选择作业区域" v-model="pageData.form.scope" required />
<fui-input marginTop="30" size="24" placeholder="请填写作业详细地址" v-model="pageData.form.address" /> <fui-input marginTop="30" size="24" placeholder="请填写详细地址" v-model="pageData.form.address" required />
<fui-input <fui-input marginTop="30" size="24" placeholder="请选择作业时间" v-model="pageData.form.time" @click="dict.show.time = true" required />
marginTop="30" <fui-textarea v-model="pageData.form.demand" :marginTop="30" size="24" placeholder="简要说明作业需求" required />
size="24"
placeholder="请选择作业时间"
v-model="pageData.form.time"
@click="dict.show.time = true"
/>
<fui-textarea v-model="pageData.form.demand" :marginTop="30" size="24" placeholder="简要说明作业需求" />
<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>
</fui-form> </fui-form>
</view> </view>
</fui-dialog> </fui-dialog>
<fui-date-picker :show="dict.show.time" type="3" range @change="handleTimeChange" @cancel="handleTimeCancel" /> <fui-date-picker :show="dict.show.time" type="3" range @change="handleTimeChange" @cancel="handleTimeCancel" />
</template> </template>
......
src/pages/nongjifuwu/farm-form.vue
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
{ {
name: 'scope', name: 'scope',
rule: ['required'], rule: ['required'],
msg: ['请填写服务范围'], msg: ['请选择服务范围'],
}, },
{ {
name: 'address', name: 'address',
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
{ {
name: 'demand', name: 'demand',
rule: ['required'], rule: ['required'],
msg: ['请填写需求描述'], msg: ['请填写作业需求'],
}, },
{ {
name: 'startTime', name: 'startTime',
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
function getScope(scope: any) { function getScope(scope: any) {
if (!scope || !pageData.options.address) { if (!scope || !pageData.options.address) {
return [] return ''
} }
const values = scope.split(',') const values = scope.split(',')
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
labels.push(text) labels.push(text)
} }
return labels.join(' / ') return labels ? labels.join(' / ') : ''
} }
function getDetails(id) { function getDetails(id) {
...@@ -229,6 +229,14 @@ ...@@ -229,6 +229,14 @@
} }
}) })
} }
function getCurrentDate(){
const date = new Date()
const year = date.getFullYear()
const month = date.getMonth() + 1
const day = date.getDate()
return `${year}-${month}-${day}`
}
</script> </script>
<template> <template>
...@@ -264,7 +272,7 @@ ...@@ -264,7 +272,7 @@
required required
type="number" type="number"
label="联系方式" label="联系方式"
placeholder="请输入联系方式" placeholder="请填写联系方式"
v-model="form.phone" v-model="form.phone"
labelSize="28" labelSize="28"
label-width="180" label-width="180"
...@@ -322,14 +330,14 @@ ...@@ -322,14 +330,14 @@
type="3" type="3"
@change="handleChangeTime1" @change="handleChangeTime1"
@cancel="show.time1 = false" @cancel="show.time1 = false"
minDate="2025-01-01" :minDate="getCurrentDate()"
/> />
<fui-date-picker <fui-date-picker
:show="show.time2" :show="show.time2"
type="3" type="3"
@change="handleChangeTime2" @change="handleChangeTime2"
@cancel="show.time2 = false" @cancel="show.time2 = false"
minDate="2025-01-01" :minDate="getCurrentDate()"
/> />
<fui-toast ref="toastRef" /> <fui-toast ref="toastRef" />
......
src/pages/nongjifuwu/machine-form.vue
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
function getScope(scope: any) { function getScope(scope: any) {
if (!scope || !pageData.options.address) { if (!scope || !pageData.options.address) {
return [] return ''
} }
const values = scope.split(',') const values = scope.split(',')
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
labels.push(text) labels.push(text)
} }
return labels.join(' / ') return labels ? labels.join(' / ') : ''
} }
function getDetails(id) { function getDetails(id) {
......
src/pages/nongjifuwu/nongjifuwu.vue
...@@ -224,123 +224,7 @@ import { s } from 'vite/dist/node/types.d-aGj9QkWt' ...@@ -224,123 +224,7 @@ import { s } from 'vite/dist/node/types.d-aGj9QkWt'
</view> </view>
</view> </view>
</view> </view>
<!-- <view class="codefun-flex-row group_6">
<view class="codefun-flex-row codefun-items-center codefun-flex-1 codefun-self-center">
<image
class="codefun-shrink-0 image_8"
src="/static/images/codefun/e3f873f79cdddaee3655c048852302e3.png"
/>
<view class="codefun-flex-col codefun-items-start codefun-flex-1 codefun-ml-12">
<text class="font text_9">小麦播种机</text>
<text class="font_3 text_10">服务范围：全市各区县</text>
<view class="group_7">
<text class="font_6">¥</text>
<text class="font_4 text_11">60</text>
<text class="font_7">/亩</text>
</view>
</view>
</view>
<view
class="codefun-flex-col codefun-justify-start codefun-items-center codefun-shrink-0 codefun-self-start text-wrapper_2 view_2 codefun-ml-20"
>
<text class="font_5">我有需要</text>
</view>
</view>
<view class="codefun-flex-row group_8">
<view class="codefun-flex-row codefun-items-center codefun-flex-1 codefun-self-center">
<image
class="codefun-shrink-0 image_8"
src="/static/images/codefun/da314c458ad5d6714cfe7ee8524ccd9c.png"
/>
<view class="codefun-flex-col codefun-items-start codefun-flex-1 codefun-ml-12">
<text class="font text_12">多功能拖拉机</text>
<text class="font_3 text_13">服务范围：全市各区县</text>
<view class="group_9">
<text class="font_6">¥</text>
<text class="font_4 text_14">60</text>
<text class="font_7">/亩</text>
</view>
</view>
</view>
<view
class="codefun-flex-col codefun-justify-start codefun-items-center codefun-shrink-0 codefun-self-start text-wrapper_2 view_3 codefun-ml-20"
>
<text class="font_5">我有需要</text>
</view>
</view> -->
<!-- <view class="codefun-flex-col codefun-justify-start codefun-relative section_5">
<view class="codefun-shrink-0 section_6" />
<text class="font_8 text_15 pos_4">夏收专享：收割机服务8折优惠</text>
<view class="codefun-flex-col codefun-justify-start codefun-items-center text-wrapper_3 pos_3">
<text class="font_2 text_16">立即预约</text>
</view>
</view> -->
<!-- <view class="codefun-flex-row group_10">
<view class="codefun-flex-row codefun-items-center codefun-flex-1 codefun-self-center">
<image
class="codefun-shrink-0 image_8"
src="/static/images/codefun/3500502108a998fe7f49363a276af806.png"
/>
<view class="codefun-flex-col codefun-items-start codefun-flex-1 codefun-ml-12">
<text class="font">水稻插秧机</text>
<text class="font_3 text_17">服务范围：全市各区县</text>
<view class="group_11">
<text class="font_6">¥</text>
<text class="font_4 text_18">60</text>
<text class="font_7">/亩</text>
</view>
</view>
</view>
<view
class="codefun-flex-col codefun-justify-start codefun-items-center codefun-shrink-0 codefun-self-start text-wrapper_2 view_4 codefun-ml-20"
>
<text class="font_5">我有需要</text>
</view>
</view> -->
</view> </view>
<!-- <view class="codefun-flex-col section_7">
<view class="grid">
<view class="codefun-flex-row codefun-justify-between codefun-items-center grid-item">
<text class="font_3 text_19">农机类型</text>
<image class="image_10" src="/static/images/codefun/a13c36a46232de65d09f43b1720ba29d.png" />
</view>
<view class="codefun-flex-row codefun-justify-between codefun-items-center grid-item_2">
<view class="codefun-flex-row codefun-items-center">
<image
class="codefun-shrink-0 image_9"
src="/static/images/codefun/bf7b1672e65ba021aa79827f30014280.png"
/>
<text class="font_3 text_20 codefun-ml-8">作业地点</text>
</view>
<image class="image_10" src="/static/images/codefun/a13c36a46232de65d09f43b1720ba29d.png" />
</view>
<view class="codefun-flex-row codefun-justify-between codefun-items-center grid-item_4">
<view class="codefun-flex-row codefun-items-center">
<image
class="codefun-shrink-0 image_11"
src="/static/images/codefun/206576465476f031295c48dcef261286.png"
/>
<text class="font_3 text_21 codefun-ml-4">作业时间</text>
</view>
<image class="image_10" src="/static/images/codefun/a13c36a46232de65d09f43b1720ba29d.png" />
</view>
<view class="codefun-flex-row codefun-items-center grid-item_4">
<image class="image_12" src="/static/images/codefun/43220b5bebf6a41ff3f05e6ec94ce9f0.png" />
<text class="font_3 text_22 codefun-ml-4">联系方式</text>
</view>
</view>
<view class="codefun-flex-col codefun-mt-12">
<view class="codefun-flex-row codefun-items-center grid-item group_12">
<image class="image_13" src="/static/images/codefun/a83082710831140b897349a7f3bd46d9.png" />
<text class="font_3 text_23 codefun-ml-8">简要说明作业需求</text>
</view>
<view
class="codefun-flex-col codefun-justify-start codefun-items-center text-wrapper_4 codefun-mt-12"
>
<text class="font_8 text_24">发布需求</text>
</view>
</view>
</view> -->
</view> </view>
</view> </view>
<fui-fab position="right" distance="10" bottom="240" width="96" @click="handlePublish"> <fui-fab position="right" distance="10" bottom="240" width="96" @click="handlePublish">
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论