huangxw 3 тижнів тому
батько
коміт
c904000021

+ 1 - 1
src/components/ut-empty/ut-empty.vue

@@ -26,7 +26,7 @@ const props = defineProps({
     },
     image: {
         type: String,
-        default: 'https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images/common/no_data.png',
+        default: '/static/images/plant/noEmpty.png',
     },
     color: {
         type: String,

+ 14 - 14
src/components/ut-search/ut-search.vue

@@ -1,10 +1,10 @@
 <template>
     <!-- 搜索框 -->
-    <view class="search-input d-flex a-c" :class="{ 'up-border': border }" :style="{ margin, background: bgColor, height,borderRadius}">
+    <view class="search-input d-flex a-c" :class="{ 'up-border': border }" :style="{ margin, background: bgColor, height, borderRadius }">
         <u-input v-model="value" ref="searchInputRef" cursor cursorColor="#333" clearable type="text" :focus="focused" border="none" @change="inputSearch" @clear="clear" @confirm="search" confirmType="search" :fontSize="fontSize" :maxlength="maxlength" :placeholder="placeholder">
             <template #suffix>
-                <view @click.stop="search" class="d-flex j-c a-c" style="padding: 0 26rpx;">
-                    <image class="search_icon" src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images/common/search_icon.png" mode="widthFix" />
+                <view @click.stop="search" class="d-flex j-c a-c" style="padding: 0 26rpx">
+                    <image class="search_icon" src="/static/images/plant/search_icon.png" mode="widthFix" />
                 </view>
             </template>
         </u-input>
@@ -16,41 +16,41 @@ import { debounce } from 'uview-plus';
 const props = defineProps({
     modelValue: {
         type: String,
-        default: ''
+        default: '',
     },
     margin: {
         type: String,
-        default: '24rpx'
+        default: '24rpx',
     },
     placeholder: {
         type: String,
-        default: '请输入搜索内容'
+        default: '请输入搜索内容',
     },
     maxlength: {
         type: Number,
-        default: 140
+        default: 140,
     },
     fontSize: {
         type: String,
-        default: '30rpx'
+        default: '30rpx',
     },
     height: {
         type: String,
-        default: '86rpx'
+        default: '86rpx',
     },
     border: {
         type: Boolean,
-        default: true
+        default: true,
     },
     // 背景颜色
     bgColor: {
         type: String,
-        default: '#fff'
+        default: '#fff',
     },
     borderRadius: {
         type: String,
-        default: '84rpx'
-    }
+        default: '84rpx',
+    },
 });
 const value = ref(props.modelValue);
 const emit = defineEmits(['search', 'update:modelValue', 'change']);
@@ -85,7 +85,7 @@ watch(
     }
 );
 defineExpose({
-    doFocus
+    doFocus,
 });
 </script>
 <style lang="scss" scoped>

+ 18 - 13
src/pages/plant/index.vue

@@ -5,7 +5,7 @@
                 <template #left>
                     <view class="d-flex a-c pb-5" id="topup-navbar" :style="{ width: `${bubble.left - 30}px` }">
                         <image class="home_icon mr-20" src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images/common/home.png" mode="widthFix" />
-                        <text class="f-s-42 c-333 f-w-5 mr-40 w-s-no">中药材种植全链条追溯</text>
+                        <text class="f-s-40 c-333 f-w-5 w-s-no">中药材种植全链条追溯</text>
                         <view class="flex1"></view>
                     </view>
                 </template>
@@ -37,29 +37,31 @@
             <view class="p-rtv">
                 <view class="pd-10 mg-14">
                     <view class="b-radius pd-6" style="border: 1rpx solid #fff; background: linear-gradient(90deg, #c1f3c5 0%, rgba(193, 243, 197, 0.5) 20%, rgba(255, 255, 255, 0.5) 35%, rgba(255, 255, 255, 0.5) 50%, rgba(232, 255, 234, 0.5) 100%, #e8ffea 100%), linear-gradient(90deg, transparent 0%, rgba(255, 255, 255, 0.3) 30%, rgba(255, 255, 255, 0.3) 80%, transparent 100%)">
-                        <view class="b-radius pd-10" style="border: 1rpx solid #baedbf">
+                        <view class="b-radius pd-10 p-rtv" style="border: 1rpx solid #baedbf">
+                            <image class="w-200" src="/static/images/plant/typeofBusiness.png" mode="widthFix" style="position: absolute; top: 10rpx; left: 10rpx" />
                             <view v-if="!speciesArray.length" class="pd-20"></view>
                             <view v-if="speciesArray.length" class="d-flex pr-15">
                                 <view class="flex1"></view>
                                 <view class="f-s-22 c-primary" @click="$u.route({ url: '/plant/species/config/index' })">去修改{{ '>' }}</view>
                             </view>
-                            <view v-if="speciesArray.length" class="c-#333 f-s-24 d-flex pl-30 pr-15 pb-15 pt-15">
+                            <view v-if="speciesArray.length" class="c-#333 f-s-24 d-flex pl-40 pr-15 pb-15 pt-15">
                                 <view class="ov-hd tx-ov w-s-no">三七、天麻、徐长卿、白及、徐长卿、白及、三七、天麻、徐长卿、白及、徐长卿、白及</view>
                                 <view class="flex1 w-s-no">等120个品种</view>
                             </view>
-                            <view v-if="!speciesArray.length" class="c-primary bg-#E3F6E7 f-s-22 mg-at radius-10 w-250 h-50 d-flex a-c j-c"> 暂未配置品种,去配置> </view>
+                            <view v-if="!speciesArray.length" class="c-primary bg-#E3F6E7 f-s-22 mg-at radius-10 w-250 h-50 d-flex a-c j-c"> 暂未配置品种,去配置{{ '>' }}</view>
                             <view v-if="!speciesArray.length" class="pd-7"></view>
                         </view>
                     </view>
                 </view>
-                <view class="b-radius pd-16 pt-0 bg-#f7f7f7" style="border: 1rpx solid #fff; border-bottom-color: transparent; margin-top: -40rpx">
+                <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 bg-#f7f7f7 pt-16">
-                            <view class="c-333 f-s-32 f-w-5">基地与地块管理</view>
+                        <view class="d-flex a-c pd-16 p-rtv">
+                            <view class="c-333 f-s-32 f-w-5 z-index-1">基地与地块管理</view>
                             <view class="flex1"></view>
-                            <view @click="$u.route({ url: '/plant/base/gap-base-info/index' })" class="c-primary f-s-22">GAP基地获评信息管理{{ '>' }}</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 bg-#f7f7f7">
+                        <view class="d-flex a-c pt-20 pb-20 pl-16 pr-16 bg-#f7f7f7">
                             <view class="min-w-170 flex1">
                                 <ut-action-sheet v-model="form.type" :tabs="[{ label: '全部', value: '' }]" @change="onRefresh" title="选择原料类型">
                                     <view class="d-flex search-select-item a-c">
@@ -108,8 +110,11 @@
                             </view>
                         </template>
                         <template #empty>
-                            <ut-empty class="mg-at" color="">尚未添加绘制种养殖基地信息~</ut-empty>
-                            <view class="b-radius c-#fff f-s-36 bg-#37A954 h-78 w-382 d-flex a-c j-c mg-at">去添加基地 </view>
+                            <ut-empty class="mg-at" color="#ccc" size="28rpx" image="/static/images/plant/noEmptyBase.png">尚未添加绘制种养殖基地信息~</ut-empty>
+                            <view class="b-radius c-#fff f-s-36 bg-#37A954 h-78 w-382 d-flex a-c j-c mg-at">
+                                <img class="w-38 h-36 mr-10" src="/static/images/plant/chooseGAP.png" alt="" mode="widthFix" />
+                                <text>去添加基地</text>
+                            </view>
                         </template>
                     </view>
                 </view>
@@ -129,7 +134,7 @@ const name = ref('神奇大侠');
 const phone = ref('17708862791');
 const cpyname = ref('智慧溯源有限公司');
 const form = ref({ type: '', placeholder: '搜基地名称、编号、地址、负责人', keywords: '' });
-const speciesArray = ref(['']);
+const speciesArray = ref([]);
 const navBarBgColor = ref('transparent');
 const stickyTop = ref(0);
 const changeSeach = () => {
@@ -141,7 +146,7 @@ const onRefresh = () => {
 const onPageScroll = (e) => {
     const { scrollTop } = e.detail;
     if (scrollTop > 20) {
-        navBarBgColor.value = '#eafad8';
+        navBarBgColor.value = '#d9f8d6';
     } else {
         navBarBgColor.value = 'transparent';
     }

+ 8 - 6
src/plant/base/gap-base-info/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <z-paging ref="paging" v-model="list" @onRefresh="onRefresh" bgColor="#f7f7f7" @query="query" safe-area-inset-bottom>
+    <z-paging ref="paging" v-model="list" @onRefresh="onRefresh" bgColor="#f7f7f7" @query="query" safe-area-inset-bottom hide-empty-view>
         <template #top>
             <up-navbar title="GAP基地信息" @leftClick="navigateBackOrHome()" :fixed="false"></up-navbar>
             <view class="d-flex a-c pd-25">
@@ -16,10 +16,9 @@
                 </view>
             </view>
         </template>
-
         <template>
             <template>
-                <view class="pl-20 pr-20">
+                <view class="pl-25 pr-25">
                     <up-swipe-action>
                         <up-swipe-action-item v-for="item in list" :name="item?.id" :key="item?.id" :options="optionsAction" @click="clickSwipe" class="mb-20">
                             <view class="b-radius bg-#fff pd-20">
@@ -50,11 +49,11 @@
             </template>
             <!-- 空数据处理 -->
             <template v-if="!address && list.length === 0">
-                <ut-empty class="mg-at" size="28rpx" color="#999" padding="10rpx">非云南省内企业,无法获取已获评的GAP基地信息~</ut-empty>
+                <ut-empty class="mg-at" size="28rpx" color="#999" padding="10rpx" image="/static/images/plant/noEmptyBase.png">非云南省内企业,无法获取已获评的GAP基地信息~</ut-empty>
                 <view class="d-flex j-c f-s-28 c-#ccc">可点击底部按钮上传佐证材料添加获评信息</view>
             </template>
             <template v-if="address && list.length === 0">
-                <ut-empty class="mg-at" size="28rpx" color="#999" padding="10rpx">暂无获评GAP基地信息~</ut-empty>
+                <ut-empty class="mg-at" size="28rpx" color="#999" padding="10rpx" image="/static/images/plant/noEmptyBase.png">暂无获评GAP基地信息~</ut-empty>
                 <view class="d-flex j-c f-s-28 c-#ccc">如需认定GAP基地,可前往数字云药官网进行申报</view>
                 <view class="d-flex j-c f-s-28 c-primary pd-15">https://www.shuziyunyao.com/</view>
                 <up-button type="primary" class="b-radius" style="width: 340rpx" @click="copyText('https://www.shuziyunyao.com/')">复制网址</up-button>
@@ -62,7 +61,10 @@
         </template>
         <template #bottom v-if="!address">
             <view class="base-bottom-wrap pd-20 pb-0">
-                <up-button type="primary">添加GAP基地信息</up-button>
+                <up-button type="primary">
+                    <img class="w-38 h-36 mr-10" src="/static/images/plant/chooseGAP.png" alt="" mode="widthFix" />
+                    <text>添加GAP基地信息</text>
+                </up-button>
             </view>
         </template>
     </z-paging>

+ 4 - 2
src/plant/species/models/speList.vue

@@ -1,7 +1,8 @@
 <template>
     <view class="spe-list-item" @click="handleClick">
         <!-- 左侧搜索图标 -->
-        <up-icon name="search" size="50rpx" color="#ccc" class="search-icon" />
+        <!-- <up-icon name="search" size="50rpx" color="#ccc" class="search-icon" /> -->
+        <img class="w-34 h-34 search-icon" src="/static/images/plant/searchGrey.png" mode="widthFix" alt="" />
         <!-- 中间文本区域(间隔30rpx) -->
         <view class="text-container">
             <!-- 使用 view + text 显示高亮文本 -->
@@ -12,7 +13,8 @@
             </view>
         </view>
         <!-- 右侧勾选图标(根据check状态显示) -->
-        <up-icon v-if="check" name="checkmark" size="45rpx" color="#37A954" class="check-icon" />
+        <!-- <up-icon v-if="check" name="checkmark" size="45rpx" color="#37A954" class="check-icon" /> -->
+        <img v-if="check" class="w-30 h-30" src="/static/images/plant/chooseSuccessfully.png" mode="widthFix" alt="" />
     </view>
 </template>
 

BIN
src/static/images/plant/basePlotBG.png


+ 0 - 0
src/static/images/plant/去添加基地.png → src/static/images/plant/chooseGAP.png


+ 0 - 0
src/static/images/plant/选择.png → src/static/images/plant/chooseSuccessfully.png


+ 0 - 0
src/static/images/plant/暂无数据.png → src/static/images/plant/noEmpty.png


+ 0 - 0
src/static/images/plant/暂无基地.png → src/static/images/plant/noEmptyBase.png


+ 0 - 0
src/static/images/plant/搜索-灰.png → src/static/images/plant/searchGrey.png


+ 0 - 0
src/static/images/plant/搜索.png → src/static/images/plant/search_icon.png


+ 0 - 0
src/static/images/plant/单位主营品种.png → src/static/images/plant/typeofBusiness.png


BIN
src/static/images/plant/基地与地块管理.png


Різницю між файлами не показано, бо вона завелика
+ 0 - 151
stats.html


Деякі файли не було показано, через те що забагато файлів було змінено