修改bug

.gitignore

@@ -18,4 +18,6 @@ dist
 *.ntvs*
 *.njsproj
 *.sln
-*.sw?
+*.sw?
+
+stats.html

components.d.ts

@@ -0,0 +1,15 @@
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by vite-plugin-uni-components
+// Read more: https://github.com/vuejs/core/pull/3399
+export {}
+
+declare module 'vue' {
+  export interface GlobalComponents {
+    UtActionSheet: typeof import('./src/components/ut-action-sheet/ut-action-sheet.vue')['default']
+    UtEmpty: typeof import('./src/components/ut-empty/ut-empty.vue')['default']
+    UtSearch: typeof import('./src/components/ut-search/ut-search.vue')['default']
+    UtTabs: typeof import('./src/components/ut-tabs/ut-tabs.vue')['default']
+  }
+}

package.json

@@ -3,7 +3,7 @@
     "version": "0.0.0",
     "scripts": {
         "dev:custom": "uni -p",
-        "dev:h5": "uni --mode development",
+        "dev:h5": "uni --mode development --host 0.0.0.0",
         "dev:h5:ssr": "uni --ssr",
         "dev:mp-alipay": "uni -p mp-alipay",
         "dev:mp-baidu": "uni -p mp-baidu",
@@ -37,49 +37,50 @@
         "type-check": "vue-tsc --noEmit"
     },
     "dependencies": {
-        "@dcloudio/uni-app": "3.0.0-4060620250520001",
-        "@dcloudio/uni-app-harmony": "3.0.0-4060620250520001",
-        "@dcloudio/uni-app-plus": "3.0.0-4060620250520001",
-        "@dcloudio/uni-components": "3.0.0-4060620250520001",
-        "@dcloudio/uni-h5": "3.0.0-4060620250520001",
-        "@dcloudio/uni-mp-alipay": "3.0.0-4060620250520001",
-        "@dcloudio/uni-mp-baidu": "3.0.0-4060620250520001",
-        "@dcloudio/uni-mp-harmony": "3.0.0-4060620250520001",
-        "@dcloudio/uni-mp-jd": "3.0.0-4060620250520001",
-        "@dcloudio/uni-mp-kuaishou": "3.0.0-4060620250520001",
-        "@dcloudio/uni-mp-lark": "3.0.0-4060620250520001",
-        "@dcloudio/uni-mp-qq": "3.0.0-4060620250520001",
-        "@dcloudio/uni-mp-toutiao": "3.0.0-4060620250520001",
-        "@dcloudio/uni-mp-weixin": "3.0.0-4060620250520001",
-        "@dcloudio/uni-mp-xhs": "3.0.0-4060620250520001",
-        "@dcloudio/uni-quickapp-webview": "3.0.0-4060620250520001",
-        "@uni-helper/unocss-preset-uni": "^0.2.11",
+        "@dcloudio/uni-app": "3.0.0-4080720251210001",
+        "@dcloudio/uni-app-harmony": "3.0.0-4080720251210001",
+        "@dcloudio/uni-app-plus": "3.0.0-4080720251210001",
+        "@dcloudio/uni-components": "3.0.0-4080720251210001",
+        "@dcloudio/uni-h5": "3.0.0-4080720251210001",
+        "@dcloudio/uni-mp-alipay": "3.0.0-4080720251210001",
+        "@dcloudio/uni-mp-baidu": "3.0.0-4080720251210001",
+        "@dcloudio/uni-mp-harmony": "3.0.0-4080720251210001",
+        "@dcloudio/uni-mp-jd": "3.0.0-4080720251210001",
+        "@dcloudio/uni-mp-kuaishou": "3.0.0-4080720251210001",
+        "@dcloudio/uni-mp-lark": "3.0.0-4080720251210001",
+        "@dcloudio/uni-mp-qq": "3.0.0-4080720251210001",
+        "@dcloudio/uni-mp-toutiao": "3.0.0-4080720251210001",
+        "@dcloudio/uni-mp-weixin": "3.0.0-4080720251210001",
+        "@dcloudio/uni-mp-xhs": "3.0.0-4080720251210001",
+        "@dcloudio/uni-quickapp-webview": "3.0.0-4080720251210001",
+        "@uni-helper/vite-plugin-uni-components": "^0.2.3",
         "clipboard": "^2.0.11",
         "dayjs": "^1.11.13",
         "pinia": "^2.0.36",
         "rollup-plugin-visualizer": "^6.0.3",
         "unplugin-auto-import": "^19.3.0",
-        "uview-plus": "^3.4.29",
-        "vue": "3.5.17",
-        "vue-i18n": "9.14.4",
+        "uview-plus": "^3.6.4",
+        "vue": "3.5.26",
+        "vue-i18n": "9.14.5",
         "z-paging": "^2.8.7"
     },
     "devDependencies": {
-        "@dcloudio/types": "3.4.16",
-        "@dcloudio/uni-automator": "3.0.0-4060620250520001",
-        "@dcloudio/uni-cli-shared": "3.0.0-4060620250520001",
-        "@dcloudio/uni-stacktracey": "3.0.0-4060620250520001",
-        "@dcloudio/vite-plugin-uni": "3.0.0-4060620250520001",
+        "@dcloudio/types": "3.4.28",
+        "@dcloudio/uni-automator": "3.0.0-4080720251210001",
+        "@dcloudio/uni-cli-shared": "3.0.0-4080720251210001",
+        "@dcloudio/uni-stacktracey": "3.0.0-4080720251210001",
+        "@dcloudio/vite-plugin-uni": "3.0.0-4080720251210001",
         "@types/node": "^24.0.10",
-        "@unocss/preset-legacy-compat": "^0.59.4",
-        "@unocss/preset-uno": "^0.59.4",
-        "@vue/runtime-core": "3.5.17",
+        "@unocss/transformer-directives": "^66.5.10",
+        "@vue/runtime-core": "3.5.26",
         "@vue/tsconfig": "^0.1.3",
         "sass": "^1.63.2",
         "sass-loader": "^10.4.1",
         "typescript": "^4.9.4",
-        "unocss": "^0.58.9",
+        "uni-unocss": "^1.0.0-beta.2",
+        "unocss": "^0.61.6",
         "unocss-applet": "^0.7.8",
+        "unocss-preset-weapp": "^66.0.2",
         "vite": "5.2.8",
         "vue-tsc": "^1.0.24"
     }

src/App.vue

@@ -23,7 +23,13 @@ onHide(() => {
 });
 </script>
 <style lang="scss">
+    
+@import "uview-plus/index.scss";
 @import '@/assets/styles/public.scss';
 @import '@/assets/styles/common.scss';
 @import '@/assets/styles/uview-plus.scss';
+// 设置背景色
+page {
+	background-color: #f7f7f7;
+}
 </style>

src/assets/styles/common.scss

@@ -129,7 +129,7 @@
 // 底部样式
 .base-bottom-wrap {
     position: relative;
-    box-shadow: 6rpx 0px 27rpx 0px rgba(#1D9C3E, 0.3);
+    box-shadow: 6rpx 0px 27rpx 0px rgba(#37A954, 0.3);
     background-color: #fff;
 }
 
@@ -243,7 +243,7 @@
         align-items: center;
         flex: 1;
         height: 100%;
-        color: #1D9C3E;
+        color: #37A954;
         background-color: #D4E2DC;
     }
     .btn2 {
@@ -253,7 +253,7 @@
         flex: 1;
         height: 100%;
         color: #FBE6A9;
-        background-color: #1D9C3E;
+        background-color: #37A954;
     }
 }
 .w-s-no{
@@ -269,7 +269,7 @@
 
 .btm-wrap-shadow {
     position: relative;
-    box-shadow: 6rpx 0px 27rpx 0px rgba(#1D9C3E, 0.3);
+    box-shadow: 6rpx 0px 27rpx 0px rgba(#37A954, 0.3);
 }
 .outview {
     width: 100%;

src/assets/styles/public.scss

@@ -92,7 +92,7 @@ $colors: (
     fa: #fafafa,
     gl: #affec2,
     // 主题色
-    primary: #1D9C3E,
+    primary: #37A954,
     light-black: #4d4d4d,
     // 成功
     success: #67c23a,
@@ -117,7 +117,7 @@ $colors: (
     }
 }
 :root {
-    --primary: #009932;
+    --primary: #37A954;
     // 橙色
     --orange: #ffa500;
 }

src/assets/styles/uview-plus.scss

@@ -35,6 +35,11 @@
     color: #ccc;
     font-weight: 400;
 }
-uni-button:after{
+/* 兼容 H5 与各类小程序的按钮点击态描边移除 */
+button::after,
+uni-button::after{
     border: none;
+}
+.u-alert--primary--light {
+    background-color: #EBF6EE;
 }

src/main.ts

@@ -1,17 +1,17 @@
 import { createSSRApp } from 'vue';
 import App from './App.vue';
 import * as Pinia from 'pinia';
-import 'uno.css';
+import 'uno.css'
 import { selectDictLabel, selectDictLabels } from './utils/ruoyi';
 import { useDict } from '@/utils/dict';
-import uviewPlus from 'uview-plus';
+import uviewPlus, { setConfig } from 'uview-plus';
 import { navigateBackOrHome, showToast } from '@/utils/common';
 import routerGuard from '@/uni_modules/hh-router-guard/src/index';
-const uviewProps = {
+const uviewProps: any = {
     config: {
         loadFontOnce: true,
         color: {
-            primary: '#714B22',
+            primary: '#37A954',
         },
     },
     props: {
@@ -36,6 +36,7 @@ const uviewProps = {
 export function createApp() {
     const app = createSSRApp(App);
     app.use(Pinia.createPinia());
+    // setConfig(uviewProps)
     app.use(uviewPlus, () => {
         return {
             options: {

src/manifest.json

@@ -61,7 +61,8 @@
             "urlCheck" : false
         },
         "usingComponents" : true,
-        "mergeVirtualHostAttributes" : true
+        "mergeVirtualHostAttributes" : true,
+        "styleIsolation": "shared"
     },
     "mp-alipay" : {
         "usingComponents" : true

src/pages.json

@@ -2,9 +2,9 @@
     "easycom": {
         "autoscan": true,
         "custom": {
-            "^u--(.*)": "uview-plus/components/u-$1/u-$1.vue",
-            "^up-(.*)": "uview-plus/components/u-$1/u-$1.vue",
-            "^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue",
+           	"^u--(.*)": "uview-plus/components/u-$1/u-$1.vue",
+			"^up-(.*)": "uview-plus/components/u-$1/u-$1.vue",
+	        "^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue",
             "^ut-(.*)": "@/src/components/ut-$1/ut-$1.vue",
             "^(?!z-paging-refresh|z-paging-load-more)z-paging(.*)": "z-paging/components/z-paging$1/z-paging$1.vue"
         }

src/pages/plant/index.vue

@@ -51,30 +51,60 @@
                     <view class="d-flex a-c">
                         <view class="c-333 f-s-32 f-w-5">基地与地块管理</view>
                         <view class="flex1"></view>
-                        <view class="c-primary f-s-22">GAP基地获评信息管理></view>
+                        <view class="c-primary f-s-22">GAP基地获评信息管理{{ '>' }}</view>
                     </view>
-                    <view class="d-flex a-c pt-20">
-                        <view class="w-200">
-                            <ut-action-sheet v-model="form.type" :tabs="[{ label: '全部', value: '' }]" @change="onRefresh" title="选择原料类型">
-                                <view class="d-flex search-select-item a-c">
-                                    <view class="flex1 ov-hd f-s-28 c-333 text-center f-w-5">{{ '全部' }}</view>
-                                    <!-- @unocss-skip-start -->
-                                    <up-icon size="20rpx" color="red" name="arrow-down-fill" class="mr-10"></up-icon>
-                                    <!-- @unocss-skip-end -->
-                                </view>
-                            </ut-action-sheet>
-                        </view>
-                        <view class="h-86 pl-20 pr-20">
-                            <ut-search ref="searchRef" v-model="form.keywords" @search="changeSeach" margin="0" :border="false" :placeholder="form.placeholder" bgColor="#fff" height="86rpx" borderRadius="10rpx"></ut-search>
+                    <view class="">
+                        <view class="d-flex a-c pt-20 mb-20">
+                            <view class="w-200">
+                                <ut-action-sheet v-model="form.type" :tabs="[{ label: '全部', value: '' }]" @change="onRefresh" title="选择原料类型">
+                                    <view class="d-flex search-select-item a-c">
+                                        <view class="flex1 ov-hd f-s-28 c-333 text-center f-w-5">{{ '全部' }}</view>
+                                        <up-icon size="26rpx" color="#333" name="arrow-down-fill" class="mr-10"></up-icon>
+                                    </view>
+                                </ut-action-sheet>
+                            </view>
+                            <view class="h-86 pl-20 pr-20">
+                                <ut-search ref="searchRef" v-model="form.keywords" @search="changeSeach" margin="0" :border="false" :placeholder="form.placeholder" bgColor="#fff" height="86rpx" borderRadius="10rpx"></ut-search>
+                            </view>
                         </view>
+                        <template>
+                            <view class="b-radius bg-#fff pd-20 mb-20">
+                                <view class="c-333 f-s-34 pd-5 f-w-5">德钦县拖顶乡洛沙村各加尼拉基地</view>
+                                <view class="c-ccc f-s-24 pd-5 pt-0">DQTDLSC00156768951001</view>
+                                <view class="d-flex a-c">
+                                    <view class="c-333 f-s-28 pd-5">
+                                        <text class="c-#666">基地面积：</text>
+                                        <text class="f-w-5">12000亩</text>
+                                    </view>
+                                    <view class="flex1"></view>
+                                    <view class="c-333 f-s-28 pd-5">
+                                        <text class="c-#666">建设时间：</text>
+                                        <text class="f-w-5">2003年</text>
+                                    </view>
+                                </view>
+                                <view class="c-333 f-s-28 pd-5">
+                                    <text class="c-#666">基地地址:</text>
+                                    <text class="f-w-5">云南省红河州个旧市卡房镇田心村小田心村268号</text>
+                                </view>
+                                <view class="c-333 f-s-28 pd-5 d-flex">
+                                    <text class="c-#666 w-s-no">当前在地物种:</text>
+                                    <text class="ov-hd tx-ov w-s-no f-w-5">三七、天麻、徐长卿、白及、徐长卿、白及、三七、天麻、徐长卿、白及、徐长卿、白及</text>
+                                    <text class="flex1 w-s-no f-w-5">等120个物种</text>
+                                </view>
+                                <view class="pd-10"></view>
+                                <view class="p-rtv">
+                                    <up-image width="100%" src="https://img1.baidu.com/it/u=436536502,2810995452&fm=253&fmt=auto&app=120&f=JPEG?w=820&h=500" mode="widthFix"> </up-image>
+                                    <view class="pl-20 pr-20 pt-10 pb-10 bg-#00000080 c-#ccc f-s-20" style="position: absolute; bottom: 140rpx; right: 0; border-radius: 10rpx 0 0 10rpx">李思思负责</view>
+                                    <view class="pl-20 pr-20 pt-10 pb-10 bg-#00000080 c-#ccc f-s-20" style="position: absolute; bottom: 80rpx; right: 0; border-radius: 10rpx 0 0 10rpx">公司+合作社</view>
+                                    <view class="pl-20 pr-20 pt-10 pb-10 bg-#00000080 c-#ccc f-s-20" style="position: absolute; bottom: 20rpx; right: 0; border-radius: 10rpx 0 0 10rpx">经度:E64.63 纬度:N27.7385</view>
+                                </view>
+                            </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>
+                        </template>
                     </view>
-                    <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"
-                            >去添加基地
-                            <up-icon name="photo" color="#fff"></up-icon>
-                        </view>
-                    </template>
                 </view>
             </view>
         </template>

src/plant/base/base-edit/index.vue

@@ -1,17 +1,31 @@
 <template>
-    <view class="">
+    <view class="h-container">
         <up-navbar title="添加基地" :fixed="false"></up-navbar>
-        <view class="pd-5"></view>
-        <ut-tabs :tabs="tabs" mode="btw"></ut-tabs>
+        <view class="bg-fff mb-10">
+            <view class="pd-5"></view>
+            <ut-tabs v-model="activeTab" :tabs="tabs" mode="btw"></ut-tabs>
+        </view>
+        <view class="flex1 ov-hd p-rtv" v-if="activeTab == 'base'">
+            <BaseInfo></BaseInfo>
+        </view>
     </view>
 </template>
 <script setup lang="ts">
-import { useUserStore } from "@/store";
-import { useClientRequest } from "@/utils/request";
+
+import { useUserStore } from '@/store';
+import { useClientRequest } from '@/utils/request';
+import BaseInfo from './models/base-info/base-info.vue';
 const tabs = reactive([
     { label: '基本信息', value: 'base' },
     { label: '地块信息', value: 'plot' },
     { label: '选址依据及环境信息', value: 'environment' },
-])
+]);
+const activeTab = ref('base');
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.h-container {
+    min-height: 100vh;
+    display: flex;
+    flex-direction: column;
+}
+</style>

src/plant/base/base-edit/models/base-info/base-info.vue

@@ -0,0 +1,51 @@
+<template>
+    <view class="z-paging-wrap">
+        <z-paging class="" ref="paging" bgColor="#fff" :fixed="false">
+            <view class="pd-24">
+                <up-alert type="primary" fontSize="24rpx"
+                    description="注意：基地不强制与品种挂钩！基地地址以行政村为界，可成片集中或相对集中，跨村则视为另一基地（连片跨村除外）。"></up-alert>
+                <view class="pd-10"></view>
+                <up-form class="p-rtv" labelPosition="top" :model="form" :rules="rules" labelWidth="auto"
+                    ref="upFormRef">
+
+                    <ut-action-sheet v-model="form.baseType" :tabs="yes_no" title="选择样品认证">
+                        <up-form-item borderBottom label="样品认证" required prop="attestationResult">
+                            <view v-if="form.baseType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(yes_no, form.baseType) }}</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>
+                            </template>
+                        </up-form-item>
+                    </ut-action-sheet>
+
+                </up-form>
+            </view>
+            <template #bottom>
+                <up-button text="月落" type="primary"></up-button>
+            </template>
+        </z-paging>
+    </view>
+
+</template>
+<script setup lang="ts" name="base-info">
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { yes_no } = toRefs<any>(proxy?.useDict('yes_no'));
+
+const paging = ref<any>(null);
+const upFormRef = ref<any>(null);
+const form = ref({
+    baseType: ''
+});
+const rules = reactive({
+    baseType: [{ required: true, message: '请选择基地类型', trigger: 'change' }]
+});
+</script>
+<style lang="scss" scoped>
+.z-paging-wrap {
+    position: absolute;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    left: 0;
+}
+</style>

src/plant/base/base-edit/models/environment-info/environment-info.vue

@@ -0,0 +1,3 @@
+<template>
+    <view>内容</view>
+</template>

src/plant/base/base-edit/models/plot-info/plot-info.vue

@@ -0,0 +1,3 @@
+<template>
+    <view>内容</view>
+</template>

src/uni.scss

@@ -15,8 +15,12 @@
 /* 颜色变量 */
 @import 'uview-plus/theme.scss';
 
+$u-primary: #37A954;
+$u-primary-dark: #37A954;
+$up-primary: #37A954;
+
 /* 行为相关颜色 */
-$uni-color-primary: #1D9C3E;
+$uni-color-primary: #37A954;
 $uni-color-success: #4cd964;
 $uni-color-warning: #f0ad4e;
 $uni-color-error: #dd524d;
@@ -29,7 +33,7 @@ $uni-text-color-placeholder: #808080;
 $uni-text-color-disable: #c0c0c0;
 
 /* 背景颜色 */
-$uni-bg-color: #fff;
+$uni-bg-color: #f8f8f8;
 $uni-bg-color-grey: #f8f8f8;
 $uni-bg-color-hover: #f1f1f1; // 点击状态颜色
 $uni-bg-color-mask: rgba(0, 0, 0, 0.4); // 遮罩颜色

unocss.config.js

@@ -1,38 +1,10 @@
-import { presetUni } from '@uni-helper/unocss-preset-uni';
-import { defineConfig, presetIcons, presetAttributify, transformerDirectives, transformerVariantGroup } from 'unocss';
+import { defineConfig, presetUni } from 'uni-unocss';
 
 export default defineConfig({
-    presets: [
-        presetUni(),
-        presetIcons({
-            scale: 1.2,
-            warn: true,
-            extraProperties: {
-                display: 'inline-block',
-                'vertical-align': 'middle',
-            },
-        }),
-        // 支持css class属性化, 可能会与ui的组件属性冲突
-        presetAttributify({
-            ignoreAttributes: [
-                'color',
-                // ...
-            ],
-        }),
-    ],
-    transformers: [
-        // 启用指令功能：主要用于支持 @apply、@screen 和 theme() 等 CSS 指令
-        transformerDirectives(),
-        // 启用 () 分组功能
-        // 支持css class组合，eg: `<div class="hover:(bg-gray-400 font-medium) font-(light mono)">测试 unocss</div>`
-        transformerVariantGroup(),
-    ],
+    presets: [presetUni()],
     shortcuts: [
         {
             center: 'flex justify-center items-center',
-            'p-rtv': 'position: relative',
-            'text-indent-2': 'text-indent: 2em',
-            'w-s-no': 'white-space: nowrap',
         },
     ],
     rules: [
@@ -107,10 +79,8 @@ export default defineConfig({
         [/^f-w-([\.\d]+)$/, ([_, num]) => ({ 'font-weight': `${num > 100 ? num : num * 100}` })],
         // 宽
         [/^w-([\.\d]+)$/, ([_, num]) => ({ width: `${num}rpx` })],
-        [/^w-([\.\d]+)%$/, ([_, num]) => ({ width: `${num}%` })],
         // 高
         [/^h-([\.\d]+)$/, ([_, num]) => ({ height: `${num}rpx` })],
-        [/^h-([\.\d]+)%$/, ([_, num]) => ({ height: `${num}%` })],
         // 带透明度的可传入颜色计算rgba值加背景
         // 行高
         [/^lh-([\.\d]+)$/, ([_, num]) => ({ 'line-height': `${num}` })],

vite.config.ts

@@ -3,14 +3,14 @@ import uni from "@dcloudio/vite-plugin-uni";
 import path from "path";
 import AutoImport from "unplugin-auto-import/vite";
 import { visualizer } from "rollup-plugin-visualizer";
+import UniUnoCSS from 'uni-unocss'
 export default async () => {
-    const UnoCSS = (await import("unocss/vite")).default;
+    const UnoCss = await import('unocss/vite').then(i => i.default)
     return defineConfig({
         define: {
             "process.env": process.env, // 配置变量在业务代码内生效
         },
         plugins: [
-            uni(),
             AutoImport({
                 imports: [
                     // 预设
@@ -20,7 +20,8 @@ export default async () => {
                 ],
                 dts: true,
             }),
-            UnoCSS(),
+            uni(),
+            UniUnoCSS(), // 自动处理平台差异
             visualizer(),
         ],
         css: {