2 コミット 415128796f ... 9d9f28a060

作者 SHA1 メッセージ 日付
  lisy 9d9f28a060 修改 2 週間 前
  lisy b223ba6de5 修改部分样式 2 週間 前
2 ファイル変更17 行追加14 行削除
  1. 14 12
      src/pages/plant/base/index.vue
  2. 3 2
      src/plant/port/port-create/index.vue

+ 14 - 12
src/pages/plant/base/index.vue

@@ -57,14 +57,14 @@
                 </view>
                 <view class="b-radius pt-0 bg-#f7f7f7" style="border: 1rpx solid #fff; border-bottom-color: transparent; margin-top: -40rpx">
                     <up-sticky :offset-top="stickyTop">
-                        <view class="d-flex a-c pd-16 p-rtv">
+                        <view class="d-flex a-c pd4-16-24-16-24 p-rtv">
                             <view class="c-333 f-s-32 f-w-5 z-index-1">基地与地块管理</view>
-                            <image class="w-230" src="/static/images/plant/BasePlotManagement.png" mode="widthFix" style="position: absolute; top: 44rpx; left: 16rpx; z-index: 0" />
+                            <image class="w-230" src="/static/images/plant/BasePlotManagement.png" mode="widthFix" style="position: absolute; top: 44rpx; left: 24rpx; z-index: 0" />
                             <view class="flex1"></view>
                             <view @click="$u.route({ url: '/plant/base/gap-base-info/index' })" class="c-primary f-s-22 z-index-1">GAP基地获评信息管理{{ '>' }}</view>
                             <image src="/static/images/plant/basePlotBG.png" class="w-100%" mode="widthFix" style="position: absolute; top: 0; left: 0; z-index: -1"></image>
                         </view>
-                        <view class="d-flex a-c pt-20 pb-20 pl-16 pr-16 bg-#f7f7f7">
+                        <view class="d-flex a-c pd4-20-24-20-24 bg-#f7f7f7">
                             <view class="min-w-170 flex1">
                                 <ut-action-sheet v-model="form.queryType" :tabs="[{ label: '全部', value: '' }]" @change="onRefresh" title="选择原料类型">
                                     <view class="d-flex search-select-item a-c">
@@ -73,12 +73,12 @@
                                     </view>
                                 </ut-action-sheet>
                             </view>
-                            <view class="h-86 pl-20 w-100%">
+                            <view class="h-86 pl-24 w-100%">
                                 <ut-search ref="searchRef" v-model="form.keyword" @search="changeSeach" margin="0" :border="false" placeholder="搜基地名称、编号、地址、负责人" bgColor="#fff" height="86rpx" borderRadius="10rpx"></ut-search>
                             </view>
                         </view>
                     </up-sticky>
-                    <view class="pd-16">
+                    <view class="pd4-16-24-16-24">
                         <template>
                             <view v-for="(item, index) in list" :key="index" class="b-radius bg-#fff pd-20 mb-20 p-rtv" @click="$u.route({ url: '/plant/base/base-detail/index', params: { id: item.id } })">
                                 <view class="c-333 f-s-34 pd-5 f-w-5">{{ item?.baseName }}</view>
@@ -105,12 +105,14 @@
                                 </view>
                                 <view class="pd-10"></view>
                                 <view v-if="item.gapInfo?.basePic" class="p-rtv">
-                                    <image class="w-full h-310" :src="item.gapInfo?.basePic" mode="aspectFill"> </image>
-                                    <view class="pd2-10-20 bg-black-op-0.5 c-#ccc f-s-20" style="position: absolute; bottom: 140rpx; right: 0; border-radius: 10rpx 0 0 10rpx"> {{ item?.contactName }}负责</view>
-                                    <view class="pd2-10-20 bg-black-op-0.5 c-#ccc f-s-20" style="position: absolute; bottom: 80rpx; right: 0; border-radius: 10rpx 0 0 10rpx"> 公司+合作社</view>
-                                    <view class="pd2-10-20 bg-black-op-0.5 c-#ccc f-s-20" style="position: absolute; bottom: 20rpx; right: 0; border-radius: 10rpx 0 0 10rpx"> 经度:E{{ item?.gapInfo?.lng }} 纬度:N{{ item?.gapInfo?.lat }}</view>
+                                    <image class="w-full h-310" :src="item.gapInfo?.basePic" mode="aspectFill"></image>
+                                    <view class="d-flex flex-cln a-ed" style="position: absolute; bottom: 20rpx; right: 0">
+                                        <view class="pd2-10-20 bg-black-op-0.5 c-#ccc f-s-20 mb-10" style="border-radius: 10rpx 0 0 10rpx; width: max-content"> {{ item?.contactName }}负责</view>
+                                        <view class="pd2-10-20 bg-black-op-0.5 c-#ccc f-s-20 mb-10" style="border-radius: 10rpx 0 0 10rpx; width: max-content"> 公司+合作社</view>
+                                        <view class="pd2-10-20 bg-black-op-0.5 c-#ccc f-s-20" style="border-radius: 10rpx 0 0 10rpx; width: max-content"> 经度:E{{ item?.gapInfo?.lng }} 纬度:N{{ item?.gapInfo?.lat }}</view>
+                                    </view>
                                 </view>
-                                <view v-if="+item?.tempFlag" class="temp_flag">暂存</view>
+                                <view v-if="+(item?.tempFlag ?? 0)" class="temp_flag">暂存</view>
                             </view>
                         </template>
                     </view>
@@ -314,7 +316,7 @@ onMounted(() => {
         .exec();
     getSpecies();
     uni.$on('refreshBaseList', () => {
-       onRefresh();
+        onRefresh();
     });
 });
 onShow(() => {
@@ -337,7 +339,7 @@ onShow(() => {
     position: absolute;
     right: 0;
     top: 0;
-    background-color: #C5C6C6;
+    background-color: #c5c6c6;
     color: #fff;
     font-size: 20rpx;
     padding: 4rpx 16rpx;

+ 3 - 2
src/plant/port/port-create/index.vue

@@ -27,9 +27,9 @@
                             <view class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_task_type, form.taskType) }}</view>
                         </up-form-item>
                     </ut-action-sheet>
-                    <ut-action-sheet v-model="form.queryType1" :tabs="pt_org_type" title="选择溯源级别">
+                    <ut-action-sheet v-model="form.mgMethod" :tabs="pt_org_type" title="选择溯源级别">
                         <up-form-item borderBottom label="溯源级别" required prop="orgType">
-                            <view v-if="form.queryType1" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_org_type, form.queryType1) }}</view>
+                            <view v-if="form.mgMethod" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_org_type, form.mgMethod) }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择溯源级别</view>
                             <template #right>
                                 <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
@@ -125,6 +125,7 @@ const form = ref({
     deawerData: null,
     baseId: '',
     taskType: '',
+    mgMethod: '',
     queryType: '',
     queryType1: '',
     queryType2: '',