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

package.json

 {
     "name": "数字农服",
-    "version": "1.0.17",
+    "version": "1.0.18",
     "description": "数字农服",
     "keywords": [
         "app",

src/manifest.json

@@ -2,8 +2,8 @@
     "name": "数字农服",
     "appid": "__UNI__FD09823",
     "description": "数字农服 APP",
-    "versionName": "1.0.17",
-    "versionCode": 10017,
+    "versionName": "1.0.18",
+    "versionCode": 10018,
     "transformPx": false,
     "locale": "zh-Hans",
     "vueVersion": "3",

src/pages/chanxiao/supplyXuQiu.vue

@@ -289,8 +289,23 @@
         <view class="formBox">
             <fui-form ref="formRef" label-weight="auto" top="60">
                 <view class="mt20">
-                    <fui-input label="供应标题" placeholder="请输入供应标题" placeholderStyle="font-size: 26rpx" v-model="form.title" labelSize="28" label-width="180" required />
-                    <fui-input label="规格说明" placeholder="请输入规格说明" placeholderStyle="font-size: 26rpx" v-model="form.productSpecs" labelSize="28" label-width="180" />
+                    <fui-input
+                        label="供应标题"
+                        placeholder="请输入供应标题"
+                        placeholderStyle="font-size: 26rpx"
+                        v-model="form.title"
+                        labelSize="28"
+                        label-width="180"
+                        required
+                    />
+                    <fui-input
+                        label="规格说明"
+                        placeholder="请输入规格说明"
+                        placeholderStyle="font-size: 26rpx"
+                        v-model="form.productSpecs"
+                        labelSize="28"
+                        label-width="180"
+                    />
                 </view>
                 <view class="mt20">
                     <!-- 价格区间 -->
@@ -298,16 +313,64 @@
                         <view class="form-item required flex align-center">
                             <text class="label" style="font-size: 28rpx">价格区间</text>
                             <view class="price-range">
-                                <input type="number" class="price-input" v-model="form.minPrice" placeholder="最低价" placeholderStyle="font-size: 26rpx" :min="0" />
+                                <input
+                                    type="number"
+                                    class="price-input"
+                                    v-model="form.minPrice"
+                                    placeholder="最低价"
+                                    placeholderStyle="font-size: 26rpx"
+                                    :min="0"
+                                />
                                 <text class="price-separator">-</text>
-                                <input type="number" class="price-input" v-model="form.maxPrice" placeholder="最高价" placeholderStyle="font-size: 26rpx" :min="0" />
+                                <input
+                                    type="number"
+                                    class="price-input"
+                                    v-model="form.maxPrice"
+                                    placeholder="最高价"
+                                    placeholderStyle="font-size: 26rpx"
+                                    :min="0"
+                                />
                             </view>
                         </view>
                     </view>
-                    <fui-input required label="计量单位" placeholder="请输入计量单位" placeholderStyle="font-size: 26rpx" v-model="form.unit" labelSize="28" label-width="180" />
-                    <fui-input required label="币种" placeholder="请输入币种" placeholderStyle="font-size: 26rpx" v-model="form.currency" labelSize="28" label-width="180" />
-                    <fui-input required label="供应数量" placeholder="请输入供应数量" placeholderStyle="font-size: 26rpx" v-model="form.supplyQuantity" labelSize="28" label-width="180" type="number" />
-                    <fui-input required label="最小起订量" placeholder="请输入最小起订量" placeholderStyle="font-size: 26rpx" v-model="form.minOrderQuantity" labelSize="28" label-width="180" type="number" />
+                    <fui-input
+                        required
+                        label="计量单位"
+                        placeholder="请输入计量单位"
+                        placeholderStyle="font-size: 26rpx"
+                        v-model="form.unit"
+                        labelSize="28"
+                        label-width="180"
+                    />
+                    <fui-input
+                        required
+                        label="币种"
+                        placeholder="请输入币种"
+                        placeholderStyle="font-size: 26rpx"
+                        v-model="form.currency"
+                        labelSize="28"
+                        label-width="180"
+                    />
+                    <fui-input
+                        required
+                        label="供应数量"
+                        placeholder="请输入供应数量"
+                        placeholderStyle="font-size: 26rpx"
+                        v-model="form.supplyQuantity"
+                        labelSize="28"
+                        label-width="180"
+                        type="number"
+                    />
+                    <fui-input
+                        required
+                        label="最小起订量"
+                        placeholder="请输入最小起订量"
+                        placeholderStyle="font-size: 26rpx"
+                        v-model="form.minOrderQuantity"
+                        labelSize="28"
+                        label-width="180"
+                        type="number"
+                    />
                 </view>
                 <view class="mt20">
                     <view class="form-item required flex align-center" style="padding: 20rpx 10rpx">
@@ -318,7 +381,15 @@
                             </text>
                         </view>
                     </view>
-                    <fui-input required label="详细地址" placeholder="请输入详细地址" placeholderStyle="font-size: 26rpx" v-model="form.detailedAddress" labelSize="28" label-width="180" />
+                    <fui-input
+                        required
+                        label="详细地址"
+                        placeholder="请输入详细地址"
+                        placeholderStyle="font-size: 26rpx"
+                        v-model="form.detailedAddress"
+                        labelSize="28"
+                        label-width="180"
+                    />
 
                     <!-- 供应时间 -->
                     <view class="form-section" style="padding: 0 30rpx">
@@ -328,7 +399,12 @@
                                 <view class="time-input" @click="show.time1 = true">
                                     <text class="time-text" :class="{ placeholder: !form.supplyStartDate }">
                                         {{ form.supplyStartDate || '开始时间' }}
-                                    <text class="time-text" :class="{ placeholder: !form.supplyStartDate }" style="font-size: 26rpx">
+                                    </text>
+                                    <text
+                                        class="time-text"
+                                        :class="{ placeholder: !form.supplyStartDate }"
+                                        style="font-size: 26rpx"
+                                    >
                                         {{ form.supplyStartDate || '开始时间' }}
                                     </text>
                                 </view>
@@ -336,7 +412,12 @@
                                 <view class="time-input" @click="show.time2 = true">
                                     <text class="time-text" :class="{ placeholder: !form.supplyEndDate }">
                                         {{ form.supplyEndDate || '结束时间' }}
-                                    <text class="time-text" :class="{ placeholder: !form.supplyEndDate }" style="font-size: 26rpx">
+                                    </text>
+                                    <text
+                                        class="time-text"
+                                        :class="{ placeholder: !form.supplyEndDate }"
+                                        style="font-size: 26rpx"
+                                    >
                                         {{ form.supplyEndDate || '结束时间' }}
                                     </text>
                                 </view>
@@ -347,7 +428,11 @@
                         <view class="form-item required flex align-center">
                             <text class="label" style="font-size: 28rpx">分类</text>
                             <view class="time-input" @click="show.classify = true">
-                                <text class="select-text" :class="{ placeholder: !form.classifyText }" style="font-size: 26rpx" >
+                                <text
+                                    class="select-text"
+                                    :class="{ placeholder: !form.classifyText }"
+                                    style="font-size: 26rpx"
+                                >
                                     {{ form.classifyText || '请选择分类' }}
                                 </text>
                             </view>
@@ -357,18 +442,58 @@
 
                 <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" />
+                    <uni-file-picker
+                        :value="form.imageObj"
+                        ref="uploadRef"
+                        limit="1"
+                        :auto-upload="false"
+                        @select="handleUpload"
+                        @delete="handleDelete"
+                    />
                 </view>
                 <view class="fui-btn__box" v-if="!form.id" style="margin-top: 30rpx">
                     <fui-button text="发布需求" bold radius="96rpx" @click="submit" />
                 </view>
             </fui-form>
 
-            <fui-date-picker :show="show.time1" type="3" @change="handleChangeTime1" @cancel="show.time1 = false" :minDate="getCurrentDate()" />
-            <fui-date-picker :show="show.time2" type="3" @change="handleChangeTime2" @cancel="show.time2 = false" :minDate="getCurrentDate()" />
-            <fui-picker :show="show.status" :layer="1" :linkage="true" :options="options.status" @change="handleChangeStatus" @cancel="show.status = false" />
-            <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-date-picker
+                :show="show.time1"
+                type="3"
+                @change="handleChangeTime1"
+                @cancel="show.time1 = false"
+                :minDate="getCurrentDate()"
+            />
+            <fui-date-picker
+                :show="show.time2"
+                type="3"
+                @change="handleChangeTime2"
+                @cancel="show.time2 = false"
+                :minDate="getCurrentDate()"
+            />
+            <fui-picker
+                :show="show.status"
+                :layer="1"
+                :linkage="true"
+                :options="options.status"
+                @change="handleChangeStatus"
+                @cancel="show.status = false"
+            />
+            <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" />
         </view>
     </view>