diff --git a/components/checkbox-switch/checkbox-switch.vue b/components/checkbox-switch/checkbox-switch.vue
new file mode 100644
index 0000000..6f10dcf
--- /dev/null
+++ b/components/checkbox-switch/checkbox-switch.vue
@@ -0,0 +1,73 @@
+<!-- components/checkbox-switch.vue -->
+<template>
+  <view class="custom-checkbox" @click="toggle" :class="{ 'custom-checkbox--checked': modelValue }">
+    <!-- 这里可以用一个图标，或者用CSS绘制一个方框 -->
+    <view class="custom-checkbox__icon">
+      <!-- 示例：使用一个简单的对勾符号 -->
+      <up-icon v-if="modelValue" name="checkbox-mark" color="#FFF" size="15"></up-icon>
+    </view>
+    <text class="custom-checkbox__label" v-if="$slots.default">
+      <slot></slot>
+    </text>
+  </view>
+</template>
+
+<script setup>
+// 1. 定义并接收 props，将其解构赋值
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    required: true
+  }
+})
+
+// 定义 emits
+const emit = defineEmits(['update:modelValue'])
+
+// 2. 在函数中使用 props.modelValue
+const toggle = () => {
+  emit('update:modelValue', !props.modelValue)
+}
+</script>
+
+<style lang="scss" scoped>
+.custom-checkbox {
+  display: inline-flex;
+  align-items: center;
+  user-select: none;
+  cursor: pointer;
+  padding: 8rpx;
+
+  &__icon {
+    width: 16px;
+    height: 16px;
+    border: 2rpx solid #c8c9cc;
+    border-radius: 6rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-right: 10rpx;
+    transition: all 0.2s;
+  }
+
+  &__icon-text {
+    font-size: 24rpx;
+    color: #ffffff;
+  }
+
+  &__label {
+    font-size: 28rpx;
+    color: #606266;
+  }
+
+  // 选中状态的样式
+  &--checked &__icon {
+    background-color: #2979ff;
+    border-color: #2979ff;
+  }
+
+  &--checked &__label {
+    color: #2979ff;
+  }
+}
+</style>
diff --git a/components/da-tree/index.vue b/components/da-tree/index.vue
index c264fdc..a4bc692 100644
--- a/components/da-tree/index.vue
+++ b/components/da-tree/index.vue
@@ -49,7 +49,8 @@
           class="da-tree-item__label"
           :class="'da-tree-item__label--' + item.checkedStatus"
           @click="handleLabelClick(item)"
-          ><text>{{ item.label }} </text><text class="da-tree-item__label--append" v-if="item.append">{{ item.append }}</text></view
+          ><text>{{ item.label }} </text
+          ><text class="da-tree-item__label--append" v-if="item.append">{{ item.append }}</text></view
         >
       </view>
     </scroll-view>
@@ -1154,8 +1155,8 @@ export default defineComponent({
       flex: 1;
       margin-left: 2px;
       color: #555;
-	  display: flex;
-	  flex-direction: column;
+      display: flex;
+      flex-direction: column;
 
       &--2 {
         color: var(--theme-color, #007aff);
diff --git a/components/sample/auncel-select-popup.vue b/components/sample/auncel-select-popup.vue
index 470ceda..42b2e1a 100644
--- a/components/sample/auncel-select-popup.vue
+++ b/components/sample/auncel-select-popup.vue
@@ -86,8 +86,7 @@ const getPageData = () => {
       pageNo: 1,
       pageSize: 999,
       collectDeviceType: 'balance',
-      deviceStatus: '0',
-      isEnable: '1',
+       deviceStatus: "{\"Enable\":\"1\"}",
       deployLocation: deployLocation.value === '全部' ? '' : deployLocation.value
     })
     .then(res => {
diff --git a/components/zzjc-num-keyboard/zzjc-num-keyboard.vue b/components/zzjc-num-keyboard/zzjc-num-keyboard.vue
index 30ea2f0..93014af 100644
--- a/components/zzjc-num-keyboard/zzjc-num-keyboard.vue
+++ b/components/zzjc-num-keyboard/zzjc-num-keyboard.vue
@@ -125,13 +125,13 @@ const changeNums = (item, index) => {
   }
 
   // 检查小数位数限制
-  let decimal = props.numKeyboardParam?.decimal ?? -1
-  const parts = nums.value.split('.')
-  if (parts.length === 2 && decimal !== -1) {
-    if (parts[1].length >= decimal) {
-      return false
-    }
-  }
+  // let decimal = props.numKeyboardParam?.decimal ?? -1
+  // const parts = nums.value.split('.')
+  // if (parts.length === 2 && decimal !== -1) {
+  //   if (parts[1].length >= decimal) {
+  //     return false
+  //   }
+  // }
 
   nums.value += inputChar
 }
diff --git a/defaultBaseUrl.js b/defaultBaseUrl.js
index e048450..179ca34 100644
--- a/defaultBaseUrl.js
+++ b/defaultBaseUrl.js
@@ -1,14 +1,15 @@
 // 在此不用配置接口前缀
 const isDev = process.env.NODE_ENV === 'development'
 // 正式环境
-const BaseUrl = isDev ? 'http://172.17.19.29:48080/admin-api' : 'http://172.17.19.29:48080/admin-api'
-const upgradeBaseUrl = isDev ? 'http://172.17.19.29:48080/admin-api' : 'http://172.17.19.29:48080/admin-api'
-const websocketUrl = isDev ? 'ws://172.17.19.11:30330' : 'ws://172.17.19.11:30330'
+// const BaseUrl = isDev ? 'http://172.17.19.29:48080/admin-api' : 'http://172.17.19.29:48080/admin-api'
+// const upgradeBaseUrl = isDev ? 'http://172.17.19.29:48080/admin-api' : 'http://172.17.19.29:48080/admin-api'
+// const websocketUrl = isDev ? 'ws://172.17.19.11:30330' : 'ws://172.17.19.11:30330'
 
 // 公司测试环境
-// const BaseUrl = isDev ? 'http://192.168.26.253:48080/admin-api' : 'http://192.168.26.116:888/admin-api'
-// const upgradeBaseUrl = isDev ? 'http://192.168.26.116:888/admin-api' : 'http://192.168.26.116:888/admin-api'
-// const websocketUrl = isDev ? 'ws://192.168.26.116:888/ws' : 'ws://192.168.26.116:888/ws'
+const BaseUrl = isDev ? 'http://192.168.26.163:48080/admin-api' : 'http://192.168.26.116:888/admin-api'
+// const BaseUrl = isDev ? 'http://192.168.26.116:888/admin-api' : 'http://192.168.26.116:888/admin-api'
+const upgradeBaseUrl = isDev ? 'http://192.168.26.116:888/admin-api' : 'http://192.168.26.116:888/admin-api'
+const websocketUrl = isDev ? 'ws://192.168.26.116:888/ws' : 'ws://192.168.26.116:888/ws'
 
 const tenantId = '1'
 export const clientId = 'zgty_lims'
diff --git a/manifest.json b/manifest.json
index b7336a2..0bc9b69 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,31 +1,31 @@
 {
-    "name" : "实验室管理系统",
-    "appid" : "__UNI__4B3B4B0",
-    "description" : "实验室管理系统",
-    "versionName" : "1.1.2",
-    "versionCode" : 112,
-    "transformPx" : false,
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
+    "name": "实验室管理系统",
+    "appid": "__UNI__4B3B4B0",
+    "description": "实验室管理系统",
+    "versionName": "1.1.6",
+    "versionCode": 116,
+    "transformPx": false,
+    "app-plus": {
+        "usingComponents": true,
+        "nvueCompiler": "uni-app",
+        "compilerVersion": 3,
+        "splashscreen": {
+            "alwaysShowBeforeRender": true,
+            "waiting": true,
+            "autoclose": true,
+            "delay": 0
         },
-        "modules" : {
-            "LivePusher" : {},
-            "Camera" : {}
+        "modules": {
+            "LivePusher": {},
+            "Camera": {}
         },
-        "distribute" : {
-            "android" : {
-                "packagename" : "tech.zzjc.mas.zgtylims",
-                "keystore" : "zzjc_android.jks",
-                "password" : "zzjc@20190226",
-                "aliasname" : "app",
-                "permissions" : [
+        "distribute": {
+            "android": {
+                "packagename": "tech.zzjc.mas.zgtylims",
+                "keystore": "zzjc_android.jks",
+                "password": "zzjc@20190226",
+                "aliasname": "app",
+                "permissions": [
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
@@ -50,155 +50,158 @@
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },
-            "ios" : {
-                "dSYMs" : false
+            "ios": {
+                "dSYMs": false
             },
-            "harmony" : {
-                "permissions" : [ "ohos.permission.INTERNET", "ohos.permission.GET_NETWORK_INFO" ],
-                "package" : "zzjc.test.app",
-                "compatibleSdkVersion" : 5
+            "harmony": {
+                "permissions": [
+                    "ohos.permission.INTERNET",
+                    "ohos.permission.GET_NETWORK_INFO"
+                ],
+                "package": "zzjc.test.app",
+                "compatibleSdkVersion": 5
             },
-            "sdkConfigs" : {},
-            "icons" : {
-                "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+            "sdkConfigs": {},
+            "icons": {
+                "android": {
+                    "hdpi": "unpackage/res/icons/72x72.png",
+                    "xhdpi": "unpackage/res/icons/96x96.png",
+                    "xxhdpi": "unpackage/res/icons/144x144.png",
+                    "xxxhdpi": "unpackage/res/icons/192x192.png"
                 },
-                "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                "ios": {
+                    "appstore": "unpackage/res/icons/1024x1024.png",
+                    "ipad": {
+                        "app": "unpackage/res/icons/76x76.png",
+                        "app@2x": "unpackage/res/icons/152x152.png",
+                        "notification": "unpackage/res/icons/20x20.png",
+                        "notification@2x": "unpackage/res/icons/40x40.png",
+                        "proapp@2x": "unpackage/res/icons/167x167.png",
+                        "settings": "unpackage/res/icons/29x29.png",
+                        "settings@2x": "unpackage/res/icons/58x58.png",
+                        "spotlight": "unpackage/res/icons/40x40.png",
+                        "spotlight@2x": "unpackage/res/icons/80x80.png"
                     },
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    "iphone": {
+                        "app@2x": "unpackage/res/icons/120x120.png",
+                        "app@3x": "unpackage/res/icons/180x180.png",
+                        "notification@2x": "unpackage/res/icons/40x40.png",
+                        "notification@3x": "unpackage/res/icons/60x60.png",
+                        "settings@2x": "unpackage/res/icons/58x58.png",
+                        "settings@3x": "unpackage/res/icons/87x87.png",
+                        "spotlight@2x": "unpackage/res/icons/80x80.png",
+                        "spotlight@3x": "unpackage/res/icons/120x120.png"
                     }
                 }
             }
         },
         /* 可选，JSON对象，应用UserAgent相关配置 **/
-        "useragent" : {
+        "useragent": {
             /* 可选，字符串类型，设置的默认userAgent值 */
-            "value" : "LIMS-PDA/1.1.2",
+            "value": "LIMS-PDA/1.1.6",
             /* 可选，Boolean类型，是否将value值作为追加值连接到系统默认userAgent值之后 */
-            "concatenate" : true
+            "concatenate": true
         },
         /* 可选，JSON对象，Android平台应用UserAgent相关配置，优先级高于useragent配置 */
-        "useragent_android" : {
+        "useragent_android": {
             /* 可选，字符串类型，设置的默认userAgent值 */
-            "value" : "LIMS-PDA/1.1.2",
+            "value": "LIMS-PDA/1.1.6",
             /* 可选，Boolean类型，是否将value值作为追加值连接到系统默认userAgent值之后 */
-            "concatenate" : true
+            "concatenate": true
         },
         /* 可选，JSON对象，iOS平台应用UserAgent相关配置，优先级高于useragent配置 */
-        "useragent_ios" : {
+        "useragent_ios": {
             /* 可选，字符串类型，设置的默认userAgent值 */
-            "value" : "LIMS-PDA/1.1.2",
+            "value": "LIMS-PDA/1.1.6",
             /* 可选，Boolean类型，是否将value值作为追加值连接到系统默认userAgent值之后 */
-            "concatenate" : true
+            "concatenate": true
         }
     },
-    "quickapp" : {},
-    "mp-weixin" : {
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : false,
-            "minified" : false
+    "quickapp": {},
+    "mp-weixin": {
+        "appid": "",
+        "setting": {
+            "urlCheck": false,
+            "minified": false
         },
-        "optimization" : {
-            "subPackages" : true
+        "optimization": {
+            "subPackages": true
         },
-        "usingComponents" : true,
-        "mergeVirtualHostAttributes" : true
+        "usingComponents": true,
+        "mergeVirtualHostAttributes": true
     },
-    "mp-alipay" : {
-        "usingComponents" : true
+    "mp-alipay": {
+        "usingComponents": true
     },
-    "mp-baidu" : {
-        "usingComponents" : true
+    "mp-baidu": {
+        "usingComponents": true
     },
-    "mp-toutiao" : {
-        "usingComponents" : true
+    "mp-toutiao": {
+        "usingComponents": true
     },
-    "uniStatistics" : {
-        "enable" : false
+    "uniStatistics": {
+        "enable": false
     },
-    "vueVersion" : "3",
-    "h5" : {
-        "devServer" : {
-            "port" : 33888,
-            "https" : false,
-            "proxy" : {
-                "/api" : {
+    "vueVersion": "3",
+    "h5": {
+        "devServer": {
+            "port": 33888,
+            "https": false,
+            "proxy": {
+                "/api": {
                     // "target" : "http://mas.new.will-way.cn/api/",
                     //"target" : "http://192.168.31.180:9090/",
-                    "target" : "http://127.0.0.1:9999/",
-                    "changeOrigin" : true,
-                    "ws" : true,
-                    "pathRewrite" : {
-                        "^/api" : ""
+                    "target": "http://127.0.0.1:9999/",
+                    "changeOrigin": true,
+                    "ws": true,
+                    "pathRewrite": {
+                        "^/api": ""
                     }
                 },
-                "/sys" : {
+                "/sys": {
                     // "target" : "http://mas.new.will-way.cn/api/",
                     //"target" : "http://192.168.31.180:9090/",
-                    "target" : "http://127.0.0.1:9999/sys",
-                    "changeOrigin" : true,
-                    "ws" : true,
-                    "pathRewrite" : {
-                        "^/api" : ""
+                    "target": "http://127.0.0.1:9999/sys",
+                    "changeOrigin": true,
+                    "ws": true,
+                    "pathRewrite": {
+                        "^/api": ""
                     }
                 },
-                "/report" : {
-                    "target" : "http://127.0.0.1:9999/report/",
-                    "changeOrigin" : true,
-                    "ws" : true,
-                    "pathRewrite" : {
-                        "^/api" : ""
+                "/report": {
+                    "target": "http://127.0.0.1:9999/report/",
+                    "changeOrigin": true,
+                    "ws": true,
+                    "pathRewrite": {
+                        "^/api": ""
                     }
                 }
             }
         },
-        "optimization" : {
-            "treeShaking" : {
-                "enable" : true
+        "optimization": {
+            "treeShaking": {
+                "enable": true
             }
         },
-        "router" : {
-            "base" : "./"
+        "router": {
+            "base": "./"
         },
-        "template" : "template.h5.html"
+        "template": "template.h5.html"
     },
-    "app-harmony" : {
-        "distribute" : {
-            "bundleName" : "zzjc.test.app",
-            "signingConfigs" : {
-                "default" : {
-                    "certpath" : "certs\\DebugCert.cer",
-                    "keyAlias" : "zzjc-test",
-                    "keyPassword" : "0000001A62465932FE19E037517BC61FE03A8F9D69CB7892019EEC82A5A07691ECAE824A92BAD8FAEB34",
-                    "profile" : "certs\\DebugProfileDebug.p7b",
-                    "signAlg" : "SHA256withECDSA",
-                    "storeFile" : "certs\\.p12",
-                    "storePassword" : "0000001ACE8F050DA6F2E36A4D0EC332ECF3A78E16F485E7C0B9DA5919649626428710609023E1DD99FD"
+    "app-harmony": {
+        "distribute": {
+            "bundleName": "zzjc.test.app",
+            "signingConfigs": {
+                "default": {
+                    "certpath": "certs\\DebugCert.cer",
+                    "keyAlias": "zzjc-test",
+                    "keyPassword": "0000001A62465932FE19E037517BC61FE03A8F9D69CB7892019EEC82A5A07691ECAE824A92BAD8FAEB34",
+                    "profile": "certs\\DebugProfileDebug.p7b",
+                    "signAlg": "SHA256withECDSA",
+                    "storeFile": "certs\\.p12",
+                    "storePassword": "0000001ACE8F050DA6F2E36A4D0EC332ECF3A78E16F485E7C0B9DA5919649626428710609023E1DD99FD"
                 }
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/nx/api/dailyCheck.js b/nx/api/dailyCheck.js
index 9e37fff..1782565 100644
--- a/nx/api/dailyCheck.js
+++ b/nx/api/dailyCheck.js
@@ -32,7 +32,7 @@ export default {
     request({
       url: '/qms/resource/device-maintain/getLastDailyCheckOfToday',
       method: 'GET',
-      params,
+      params
     }),
   createDailyCheck: data =>
     request({
diff --git a/nx/api/deviceInfo.js b/nx/api/deviceInfo.js
index ccb017c..73c6ad3 100644
--- a/nx/api/deviceInfo.js
+++ b/nx/api/deviceInfo.js
@@ -2,21 +2,21 @@ import request from '@/nx/request'
 
 export function getDeviceBusInfoById(id) {
   return request({
-    url: '/lims/bus/deviceBusInfo/queryById',
+    url: '/qms/resource/device-infomation/get',
     method: 'GET',
     params: { id }
   })
 }
 export function deviceList(params) {
   return request({
-    url: '/lims/bus/deviceBusInfo/list',
+    url: '/qms/resource/device-infomation/page',
     method: 'GET',
     params
   })
 }
 export function treeData(params) {
   return request({
-    url: '/lims/bus/deviceBusProduct/listTree',
+    url: '/qms/resource/device-product/getProductTreeData',
     method: 'GET',
     params
   })
@@ -74,6 +74,3 @@ export function stopList(params) {
     params
   })
 }
-export default{
-	getDeviceBusInfoById
-}
diff --git a/nx/api/material.js b/nx/api/material.js
index 1641864..64422e3 100644
--- a/nx/api/material.js
+++ b/nx/api/material.js
@@ -7,11 +7,79 @@ export default {
       method: 'GET',
       params
     }),
+  // 查询大类
+  queryMaterialCategory: params =>
+    request({
+      url: '/qms/resource/material-product/category-data',
+      method: 'GET',
+      params
+    }),
+  // 查询物料实例
+  queryMaterialInformation: params =>
+    request({
+      url: '/qms/resource/material-infomation/page',
+      method: 'GET',
+      params
+    }),
   // 物料出库
   execMaterialOut: data =>
     request({
       url: '/qms/resource/material-inventory-outbound/add',
       method: 'POST',
       data
+    }),
+  // 新增使用记录
+  addUseRecord: data =>
+    request({
+      url: '/qms/resource/material-use-record/add',
+      method: 'POST',
+      data
+    }),
+  // 删除使用记录
+  deleteUseRecord: params =>
+    request({
+      url: '/qms/resource/material-use-record/delete',
+      method: 'DELETE',
+      params
+    }),
+  getUseRecord: params =>
+    request({
+      url: '/qms/resource/material-use-record/page',
+      method: 'GET',
+      params
+    }),
+  // 使用确认
+  confirmUseRecord: data =>
+    request({
+      url: '/qms/resource/material-use-record/review',
+      method: 'PUT',
+      data
+    }),
+  // 新增危化品配置信息
+  addHazardousMake: data =>
+    request({
+      url: '/qms/resource/material-use-record/hzrd-make',
+      method: 'POST',
+      data
+    }),
+  // 新增用完标记和清洗回收
+  addUseOver: data =>
+    request({
+      url: '/qms/resource/material-use-end-reuse/add',
+      method: 'POST',
+      data
+    }),
+  getMaterialUseEndReuseDetailPage: params =>
+    request({
+      url: `/qms/resource/material-use-end-reuse-detail/page`,
+      method: 'GET',
+      params
+    }),
+  // 试剂瓶回收
+  reuse: data =>
+    request({
+      url: '/qms/resource/material-use-end-reuse/reuse',
+      method: 'PUT',
+      data
     })
 }
diff --git a/nx/api/sampleWarehouse.js b/nx/api/sampleWarehouse.js
index 91e2135..864cf36 100644
--- a/nx/api/sampleWarehouse.js
+++ b/nx/api/sampleWarehouse.js
@@ -79,9 +79,10 @@ export default {
       data
     }),
   // 根据权限查询样品库
-  querySampleLocation: () =>
+  querySampleLocation: params =>
     request({
       url: '/qms/config-warehouse-location/selectListWithPermission',
-      method: 'GET'
+      method: 'GET',
+      params
     })
 }
diff --git a/nx/api/sys.js b/nx/api/sys.js
index 1dfd3d8..f50c87b 100644
--- a/nx/api/sys.js
+++ b/nx/api/sys.js
@@ -35,5 +35,11 @@ export default {
         isTransformResponse: false
       }
     })
+  },
+  getDataListByCategoryKey: key => {
+    return request({
+      url: `/qms/dictionary-business/getDataListByCategoryKey?key=` + key,
+      method: 'GET'
+    })
   }
 }
diff --git a/nx/helper/calcAnalysisValue.js b/nx/helper/calcAnalysisValue.js
index fc9145a..77d9990 100644
--- a/nx/helper/calcAnalysisValue.js
+++ b/nx/helper/calcAnalysisValue.js
@@ -327,6 +327,79 @@ export function handleRoundFiveNumber(number, fixed = 0) {
   //偶不进,将取值的当前位数,直接截取字符即可
   return number.substr(0, indexFixed)
 }
+export function handleEfficaciousNumber(number, fixed, effectiveDigit) {
+  // 1. 先将数字补全到 fixed 位小数
+  const numStr = String(number)
+  const dotIndex = numStr.indexOf('.') // dotIndex = 1
+  let actualFixed = fixed // 默认为 fixed
+
+  if (dotIndex !== -1) {
+    const decimalPart = numStr.slice(dotIndex + 1) // decimalPart = "0400"
+    console.log(`小数部分: ${decimalPart}`)
+
+    let nonZeroCount = 0
+    let targetEffectiveDigitPos = -1
+
+    // 2. 循环 "0400"，寻找有效数字
+    for (let i = 0; i < decimalPart.length; i++) {
+      // i=0 to 3
+      const char = decimalPart[i]
+      console.log(`检查第 ${i + 1} 位: '${char}', 当前 nonZeroCount: ${nonZeroCount}`)
+
+      if (nonZeroCount === 0) {
+        // 寻找第一个非零数字
+        if (char !== '0') {
+          // i=0, '0' -> false; i=1, '4' -> true
+          nonZeroCount++ // nonZeroCount = 1
+          console.log(`  -> 找到第 1 个有效数字: '${char}'`)
+        }
+      } else {
+        // 已经找到第一个非零数字，后续所有数字都算有效
+        if (nonZeroCount < effectiveDigit) {
+          // 1 < 2 -> true
+          nonZeroCount++ // nonZeroCount = 2
+          console.log(`  -> 找到第 2 个有效数字: '${char}'`)
+        }
+      }
+
+      if (nonZeroCount === effectiveDigit) {
+        // 2 === 2 -> true when i=2
+        targetEffectiveDigitPos = i + 1 // i=2, so pos is 3
+        console.log(`  -> 目标有效数字 (${effectiveDigit}) 已找到，位于第 ${targetEffectiveDigitPos} 位`)
+        break
+      }
+    }
+    console.log(`targetEffectiveDigitPos: ${targetEffectiveDigitPos}`)
+
+    // 3. 判断并设置最终精度
+    if (targetEffectiveDigitPos !== -1 && targetEffectiveDigitPos <= fixed) {
+      // 3 !== -1 and 3 <= 4 -> true
+      actualFixed = targetEffectiveDigitPos // actualFixed = 3
+    }
+    const finalNumber = handleRoundFiveNumber(Number(number), actualFixed)
+            // 获取整数部分
+            const finalIntegerPart = finalNumber.slice(0, dotIndex + 1) // 包含小数点
+            const finalDecimalPart = finalNumber.slice(dotIndex + 1)
+			        // 截取指定长度的小数部分
+			let truncatedDecimalPart = ''
+			    if (Number(finalDecimalPart) === 0) {
+			      truncatedDecimalPart = finalDecimalPart.substring(0, effectiveDigit)
+			    }else{
+			        truncatedDecimalPart = finalDecimalPart.substring(0, actualFixed)
+				}
+            
+    
+            // 拼接最终结果
+            let result = finalIntegerPart + truncatedDecimalPart
+    
+        // 特殊情况处理：如果截取后小数部分为空，则去掉小数点
+        if (actualFixed === 0) {
+          result = finalIntegerPart.slice(0, -1) // 去掉最后的 "."
+        }
+    
+        return result
+  }
+}
 
 /**
  ** 除法函数，用来得到精确的除法结果
diff --git a/nx/helper/calcAnalysisValue.js.bak b/nx/helper/calcAnalysisValue.js.bak
deleted file mode 100644
index a236161..0000000
--- a/nx/helper/calcAnalysisValue.js.bak
+++ /dev/null
@@ -1,511 +0,0 @@
-import { create, all, number, pow } from 'mathjs'
-import parseSafeArgs from './parseSafeArgs'
-const math = create(all)
-math.config({
-  number: 'BigNumber',
-  precision: 64
-})
-export { math }
-
-const GetRecoveryRate = function (elementFormulaCode, value) {
-  // //读取conRecoveryRateList
-  const conRecoveryRateList = uni.getStorageSync('ConRecoveryRateList')
-  if (!conRecoveryRateList) return
-  let o = conRecoveryRateList.find(i => {
-    //console.log("取得的" + i + "回收率：" + i);
-    if (value === 0) {
-      return i.elementFormulaCode === elementFormulaCode && i.minValue === value
-    }
-    return i.elementFormulaCode === elementFormulaCode && i.minValue < value && value <= i.maxValue
-  })
-  // console.log(o);
-  const rate = o ? o.rate : 100
-  // console.log("取得的" + elementFormulaCode + "回收率：" + rate);
-  return rate
-  // console.log("执行方法：GetRecoveryRate");
-  // return 100;
-}
-/*
- * 根据硫值计算：支持碳、硝酸钾（滇中）
- * 当S%<22%时，需加入淀粉的量=(75-S%*22*M)/12
- * 当 S%>22%时，需加入硝酸钾的量=(S%*22*M-75)/4
- * 当 S%==22%时，硝酸钾为0，淀粉为空
- * sValueKey：硫值对应的dicKey
- * weightKey：重量对应的dicKey
- * percent：计算参数
- *
- * 举例：Get_C_KNO3_bySValue|(|p14|, |p2|, |>|)
- * */
-const Get_C_KNO3_bySValue = function (sValue, weight, operator) {
-  //判断sValue是数字
-  if (isNaN(sValue) || isNaN(weight)) {
-    return ''
-  }
-  let v = number(sValue)
-  const w = number(weight)
-  if (w === 0) return ''
-  v = v * 0.01
-  //当S%<22%时，需加入淀粉的量=(75-S%*22*M)/12
-  if (operator === '<' && v < 0.22) {
-    // return ( 75 - v * 22 * w )/12;
-    return accDiv(accSub(75, accMul(accMul(v, 22), w)), 12)
-  }
-  //S%>22%时，需加入硝酸钾的量=(S%*22*M-75)/4
-  if (operator === '>=' && v >= 0.22) {
-    //S%==22%时，硝酸钾为0，淀粉为空
-    if (v === 22) return 0
-    // return ( v * 22 * w - 75 ) + 44;
-    return accDiv(accSub(accMul(v, accMul(22, w)), 75), 4)
-  }
-
-  return ''
-}
-const Get_C_KNO3 = function (weight, sValue, operator) {
-  //判断sValue是数字
-  const S = number(sValue)
-  const W = number(weight)
-  //如果样重为0就不计算
-  if (W === 0) {
-    return ''
-  }
-  if (W === 0) return ''
-  const V = ((W * S) / 100) * 22 - 75
-  if (operator === '<' && V < 0) {
-    return math.abs(V / 12)
-  }
-  if (operator === '>=' && V >= 0) {
-    return V / 4
-  }
-  return ''
-}
-const FORMULA_FUNCTIONS = {
-  GetRecoveryRate,
-  Get_C_KNO3_bySValue,
-  Get_C_KNO3
-}
-/*
- * 计算当前样品分析值*/
-export function calcAnalysisValue(group, externalFormData, taskIngredientsWay) {
-  const MAX_ITERATIONS = 5 // 防止无限循环
-  let iterations = 0
-  let changed = true
-  while (changed && iterations < MAX_ITERATIONS) {
-    changed = false
-    iterations++
-    try {
-      for (const g of group) {
-        for (const ele of g.fields) {
-          if (!ele.formula || ele.formula == '' || ele.formula.startsWith('From')) continue
-          let formula = ele.formula
-          let formulas = formula.split('|')
-          let formulaVal = ''
-          formulas.forEach(f => {
-            let value = ''
-            if (f.charAt(0) === 'p') {
-              let o = findFieldInGroup(f, group, 'p')
-              value = o.value || 0
-            } else if (f.charAt(0) === 'e') {
-              let o = findFieldInGroup(f, group, 'e')
-              value = o.value || 0
-            } else if (f.charAt(0) === '<' || f.charAt(0) === '>') {
-              value = "'" + f + "'"
-            } else {
-              value = f
-            }
-
-            formulaVal += value
-          })
-
-          let v = ''
-          if (formulaVal.startsWith('Get_')) {
-            //计算公式为Get开头的，都是执行方法,只有人工配料才执行
-            if (taskIngredientsWay !== 'manual') continue
-            v = eval(formulaVal)
-          } else if (formulaVal.startsWith('GetFrom')) {
-            v = evaluateGetFromFormula(formulaVal, false, externalFormData)
-          } else {
-            v = math.evaluate(formulaVal).toString()
-            v = isFinite(v) ? v.toString() : 0
-          }
-          ele.value = handleRoundFiveNumber(v, ele.decimalPosition, ele.type === 'project')
-          changed = true
-        }
-      }
-    } catch (error) {
-      console.log(error)
-    }
-  }
-}
-
-// parse: 是否解析公式
-export function evaluateGetFromFormula(formula, parse, externalFormData, currentColumn, row, dynamicsColumns) {
-  let formulaVal = formula
-  if (parse) {
-    formulaVal = parseFormula(formulaVal, row, dynamicsColumns)
-  }
-  let relFormulaVal = formulaVal.split(':')[1]
-  for (const [key, value] of Object.entries(externalFormData)) {
-    if (relFormulaVal.includes(key)) {
-      relFormulaVal = relFormulaVal.replace(key, value || 0)
-    }
-  }
-  try {
-    let v = math.evaluate(relFormulaVal).toString()
-    v = isFinite(v) ? v : 0
-    if (parse) {
-      return handleRoundFiveNumber(v, currentColumn.decimalPosition, currentColumn.type === 'project')
-    }
-    return v
-  } catch (e) {
-    console.warn('GetFrom formula evaluate error:', relFormulaVal, e)
-    return 0
-  }
-}
-// 解析公式
-function parseFormula(formula, row, dynamicsColumns) {
-  let formulas = formula.split('|')
-  let formulaVal = ''
-  formulas.forEach(f => {
-    if (f.charAt(0) === 'p') {
-      let o = dynamicsColumns.find(i => 'p' + i.paramNo === f && i.type !== 'project')
-      const currentColumnData = row[o.fieldIndex]
-      formulaVal += currentColumnData.value ? currentColumnData.value : 0
-    } else if (f.charAt(0) === 'e') {
-      let o = dynamicsColumns.find(i => 'e' + i.paramNo === f)
-      formulaVal += row[o.fieldIndex]?.value ? row[o.fieldIndex].value : 0
-    } else {
-      formulaVal += f
-    }
-  })
-  return formulaVal
-}
-// 根据样品和配置列计算分析值
-export function calcRowAnalysisValue(row, columnObj, dynamicsColumns, externalFormData, taskIngredientsWay) {
-  if (!columnObj.paramNo || !row[columnObj.fieldIndex]) return
-
-  for (let i = 0; i < dynamicsColumns.length; i++) {
-    let curItem = dynamicsColumns[i]
-    if (curItem.fieldIndex === columnObj.fieldIndex) continue
-
-    let param = columnObj.fieldIndex.charAt(0) === 'p' ? 'p' + columnObj.paramNo : 'e' + columnObj.paramNo
-    if (curItem.formula && curItem.formula.includes(param)) {
-      let formula = curItem.formula
-      let formulaVal = parseFormula(formula, row, dynamicsColumns)
-      let v
-      if (formulaVal.startsWith('Get_')) {
-        if (taskIngredientsWay !== 'manual') continue
-        const match = formulaVal.match(/^([a-zA-Z_]\w*)\((.*)\)$/)
-        const funcName = match[1]
-        const argsStr = match[2].trim()
-        const func = FORMULA_FUNCTIONS[funcName]
-        // 安全解析参数（支持数字、字符串）
-        const args = parseSafeArgs(argsStr)
-        v = func(...args)
-      } else if (formulaVal.startsWith('GetFrom')) {
-        v = evaluateGetFromFormula(formulaVal, false, externalFormData)
-      } else {
-        v = math.evaluate(formulaVal).toString()
-        v = isFinite(v) ? v : 0
-      }
-      let rowObj = row[curItem.fieldIndex]
-      rowObj.value = handleRoundFiveNumber(Number(v), rowObj.decimalPosition, rowObj.type === 'project')
-      calcRowAnalysisValue(row, curItem, dynamicsColumns, externalFormData)
-    }
-  }
-}
-const findFieldInGroup = function (paramNo, group, p) {
-  for (const g of group) {
-    for (const f of g.fields) {
-      if (p === 'p' && f.type == 'project') continue
-      if (p + f.paramNo === paramNo) {
-        return f
-      }
-    }
-  }
-  return { value: null }
-}
-
-/** 处理数值数据：四舍六入奇进偶不进
- * 1，如果取小数的最后一位为5，5前为奇数进位，为偶不进,五后非零就进一,五后皆零看奇偶,五前为偶应舍去,五前为奇要进一
- * 2.5后不为0时就入，为0时看5前，奇进偶不进
- * 3.四舍，六入
- * 传入数值和保留位数
- */
-export function handleRoundFiveNumber(number, fixed = 0, useTwoSignificantDigits = false) {
-  if (number == null || number === '' || isNaN(number)) return number
-  if (fixed === -1) return number
-  number = String(number)
-  //可以考虑清掉末尾的0，暂时限制了不会有,因为传入数值，末尾0是去掉的
-  //  保留2位有效数字：小数点后面大于0的才叫有效数字，从小数点后面查找两位有效数字 ，如果末尾的有效数字的位数大于所设置的精度 以及 如果查找的有效数字没有两位的 ，就按照所设置的精度逻辑来计算，两位有效数字的最后 一位是在第几位，就用这个位数充当精度来按照原来精度的逻辑计算，
-  // ===== 新增：按小数点后前两个非零数字确定精度 =====
-  let actualFixed = fixed
-  if (useTwoSignificantDigits) {
-    const numStr = String(number)
-    const dotIndex = numStr.indexOf('.')
-
-    if (dotIndex !== -1) {
-      const decimalPart = numStr.slice(dotIndex + 1)
-      let nonZeroCount = 0
-      let secondNonZeroPos = -1
-
-      for (let i = 0; i < decimalPart.length; i++) {
-        if (decimalPart[i] !== '0') {
-          nonZeroCount++
-          if (nonZeroCount === 2) {
-            secondNonZeroPos = i + 1 // 小数点后第几位（从1开始）
-            break
-          }
-        }
-      }
-
-      // 只有同时满足：
-      //   1. 找到两个非零数字
-      //   2. 第二个的位置 <= 用户指定的 fixed
-      // 才使用该位置作为精度
-      if (secondNonZeroPos !== -1 && secondNonZeroPos <= fixed) {
-        actualFixed = secondNonZeroPos
-      }
-    }
-  }
-  console.log(actualFixed)
-  const index = number.indexOf('.')
-  if (index == -1) {
-    if (actualFixed > 0) {
-      number += '.'
-    }
-    for (let i = 0; i < actualFixed; i++) {
-      number += '0'
-    }
-    //补0返回
-    return number
-  }
-  //取到保留小数位的下一位，5.5555取保留俩位，那就是小数点后第三位
-  const indexFixed = index + actualFixed + 1
-  if (indexFixed >= number.length) {
-    //如果小数位数不够, 补0直接返回
-    const zerolen = indexFixed - number.length
-    for (let i = 0; i < zerolen; i++) {
-      number += '0'
-    }
-    return number
-  }
-  //取保留位数的后一位做判断，以下是有5的判断
-  const endNumber = number.substr(indexFixed, 1)
-  if (endNumber != '5') {
-    //如果做判断的数不是五，就按正常的四舍五入，即忽略了5，后面补0的那些由于是数字传进来，0已经去掉，此处不做处理
-    return Number(number).toFixed(actualFixed)
-  }
-  if (indexFixed != number.length - 1) {
-    //由于当前判断位不是最后一位，而又去除了0，那么后面后的位数应该直接入位，五后不为0时入,由于会有小于五的，四舍五入肯定不行，那么只能截取到当前保留位数，然后转成数字加上10的负fixed的次方即可
-    number = number.substring(0, indexFixed)
-    if (number.indexOf('-') != -1) {
-      //需要考虑到负数的情况
-      return (Number(number) - Number(Math.pow(10, -actualFixed))).toFixed(actualFixed)
-    }
-    return (Number(number) + Number(Math.pow(10, -actualFixed))).toFixed(actualFixed)
-    //return this.accAdd(number,Math.pow(10,-fixed))
-  }
-  //接下来就时五后没有值也就是0的需要看前面的奇入偶不入了，取当前位的上一位
-  let twoNumber = number.substr(indexFixed - 1, 1)
-  if (twoNumber == '.') {
-    //取到小数点，再取一次，要取到小数点左边第一位
-    twoNumber = number.substr(indexFixed - 2, 1)
-  }
-  if ('13579'.indexOf(twoNumber) != -1) {
-    //奇进
-    number = number.substring(0, indexFixed)
-    if (number.indexOf('-') != -1) {
-      //需要考虑到负数的情况
-      return (Number(number) - Math.pow(10, -actualFixed)).toFixed(actualFixed)
-    }
-    return (Number(number) + Math.pow(10, -actualFixed)).toFixed(actualFixed)
-  }
-  //偶不进,将取值的当前位数,直接截取字符即可
-  return number.substr(0, indexFixed)
-}
-
-/**
- ** 除法函数，用来得到精确的除法结果
- ** 说明：javascript的除法结果会有误差，在两个浮点数相除的时候会比较明显。这个函数返回较为精确的除法结果。
- ** 调用：accDiv(arg1,arg2)
- ** 返回值：arg1除以arg2的精确结果
- **/
-function accDiv(arg1, arg2) {
-  var t1 = 0,
-    t2 = 0,
-    r1,
-    r2
-  try {
-    t1 = arg1.toString().split('.')[1].length
-  } catch (e) {}
-  try {
-    t2 = arg2.toString().split('.')[1].length
-  } catch (e) {}
-  r1 = Number(arg1.toString().replace('.', ''))
-  r2 = Number(arg2.toString().replace('.', ''))
-  return (r1 / r2) * pow(10, t2 - t1)
-}
-
-/**
- ** 乘法函数，用来得到精确的乘法结果
- ** 说明：javascript的乘法结果会有误差，在两个浮点数相乘的时候会比较明显。这个函数返回较为精确的乘法结果。
- ** 调用：accMul(arg1,arg2)
- ** 返回值：arg1乘以 arg2的精确结果
- **/
-function accMul(arg1, arg2) {
-  var m = 0,
-    s1 = arg1.toString(),
-    s2 = arg2.toString()
-  try {
-    m += s1.split('.')[1].length
-  } catch (e) {}
-  try {
-    m += s2.split('.')[1].length
-  } catch (e) {}
-  return (Number(s1.replace('.', '')) * Number(s2.replace('.', ''))) / Math.pow(10, m)
-}
-
-/**
- ** 减法函数，用来得到精确的减法结果
- ** 说明：javascript的减法结果会有误差，在两个浮点数相减的时候会比较明显。这个函数返回较为精确的减法结果。
- ** 调用：accSub(arg1,arg2)
- ** 返回值：arg1加上arg2的精确结果
- **/
-function accSub(arg1, arg2) {
-  var r1, r2, m, n
-  try {
-    r1 = arg1.toString().split('.')[1].length
-  } catch (e) {
-    r1 = 0
-  }
-  try {
-    r2 = arg2.toString().split('.')[1].length
-  } catch (e) {
-    r2 = 0
-  }
-  m = Math.pow(10, Math.max(r1, r2)) //last modify by deeka //动态控制精度长度
-  n = r1 >= r2 ? r1 : r2
-  return ((arg1 * m - arg2 * m) / m).toFixed(n)
-}
-
-/**
- ** 加法函数，用来得到精确的加法结果
- ** 说明：javascript的加法结果会有误差，在两个浮点数相加的时候会比较明显。这个函数返回较为精确的加法结果。
- ** 调用：accAdd(arg1,arg2)
- ** 返回值：arg1加上arg2的精确结果
- **/
-function accAdd(arg1, arg2) {
-  var r1, r2, m, c
-  try {
-    r1 = arg1.toString().split('.')[1].length
-  } catch (e) {
-    r1 = 0
-  }
-  try {
-    r2 = arg2.toString().split('.')[1].length
-  } catch (e) {
-    r2 = 0
-  }
-  c = Math.abs(r1 - r2)
-  m = Math.pow(10, Math.max(r1, r2))
-  if (c > 0) {
-    var cm = Math.pow(10, c)
-    if (r1 > r2) {
-      arg1 = Number(arg1.toString().replace('.', ''))
-      arg2 = Number(arg2.toString().replace('.', '')) * cm
-    } else {
-      arg1 = Number(arg1.toString().replace('.', '')) * cm
-      arg2 = Number(arg2.toString().replace('.', ''))
-    }
-  } else {
-    arg1 = Number(arg1.toString().replace('.', ''))
-    arg2 = Number(arg2.toString().replace('.', ''))
-  }
-  return (arg1 + arg2) / m
-}
-
-// 通过配置项分组
-export function groupByField(list, cupNumFieldIndex, groupKey = 'groupDictionaryBusinessKey') {
-  const groupMap = new Map()
-
-  // 插入“全部”项
-  list.unshift({ groupDictionaryBusinessKey: 'all', groupDictionaryBusinessName: '全部' })
-
-  for (const item of list) {
-    // 赋值杯号 fieldIndex
-    if (item.title === '杯号') {
-      cupNumFieldIndex.value = item.fieldIndex
-    }
-
-    let key = item[groupKey]
-
-    // 如果没有有效 key，统一归入自定义分组
-    if (!key) {
-      key = 'customParameter' // 使用固定字符串作为无 key 项的分组标识
-    }
-
-    // 如果该分组不存在，初始化
-    if (!groupMap.has(key)) {
-      groupMap.set(key, {
-        value: key,
-        label: key === 'customParameter' ? '分析项目' : item.groupDictionaryBusinessName || '未知分组',
-        fields: []
-      })
-    }
-
-    // 将当前项加入对应分组
-    groupMap.get(key).fields.push(item)
-  }
-
-  return Array.from(groupMap.values())
-}
-
-export function validateElementRange(fieldIndex, row, conRangeElementAnalysisList) {
-  if (!conRangeElementAnalysisList?.length) return null
-  const rangeElementAnalysis = conRangeElementAnalysisList.find(
-    ele => ele.dictionaryProjectId === row[fieldIndex]?.dicId && row[fieldIndex]['type'] === 'project'
-  )
-
-  if (!rangeElementAnalysis) return null
-
-  const val = row[fieldIndex]?.value
-
-  if (val == '' || val == null) return null
-  const value = Number(val)
-
-  let result = { promptType: '', promptMsg: '' }
-
-  switch (Number(rangeElementAnalysis.rangeType)) {
-    case 1:
-      //如果值小于最小警告值或者大于最大警告值，则校验不通过
-      if (value < rangeElementAnalysis.minimumWarningValue || value > rangeElementAnalysis.maximumWarningValue) {
-        result.promptType = 'warning'
-        result.promptMsg = `警告：值超出范围（${rangeElementAnalysis.minimumWarningValue} ~ ${rangeElementAnalysis.maximumWarningValue}）`
-      }
-      break
-    case 2:
-      //如果值小于最小限制值或者大于最大限制值，则校验不通过
-      if (value < rangeElementAnalysis.minimumValue || value > rangeElementAnalysis.maximumValue) {
-        result.promptType = 'error'
-        result.promptMsg = `错误：值超出范围（${rangeElementAnalysis.minimumValue} ~ ${rangeElementAnalysis.maximumValue}）`
-      }
-      break
-    case 3:
-      //如果值小于最小限制值或者大于最大限制值，则校验不通过
-      if (value < rangeElementAnalysis.minimumValue || value > rangeElementAnalysis.maximumValue) {
-        result.promptType = 'error'
-        result.promptMsg = `错误：值超出范围（${rangeElementAnalysis.minimumValue} ~ ${rangeElementAnalysis.maximumValue}）`
-      } else if (
-        (rangeElementAnalysis.minimumValue < value && value < rangeElementAnalysis.minimumWarningValue) ||
-        (rangeElementAnalysis.maximumWarningValue < value && value <= rangeElementAnalysis.maximumValue)
-      ) {
-        result.promptType = 'warning'
-        result.promptMsg = `警告：值超出范围（${rangeElementAnalysis.minimumWarningValue} ~ ${rangeElementAnalysis.maximumWarningValue}）`
-      }
-      break
-    default:
-      return null
-  }
-
-  return result
-}
diff --git a/nx/helper/index.js b/nx/helper/index.js
index 3c43f83..6abb065 100644
--- a/nx/helper/index.js
+++ b/nx/helper/index.js
@@ -1,5 +1,6 @@
 import test from './test.js'
 import { round } from './digit.js'
+import dayjs from 'dayjs'
 /**
  * @description 如果value小于min，取min；如果value大于max，取max
  * @param {number} min
@@ -741,7 +742,76 @@ function isJsonString(str) {
     return false
   }
 }
+/**
+ * 构造树型结构数据
+ * @param {*} data 数据源
+ * @param {*} id id字段 默认 'id'
+ * @param {*} parentId 父节点字段 默认 'parentId'
+ * @param {*} children 孩子节点字段 默认 'children'
+ */
+const handleTree = (data, id, parentId, children) => {
+  if (!Array.isArray(data)) {
+    console.warn('data must be an array')
+    return []
+  }
+  const config = {
+    id: id || 'id',
+    parentId: parentId || 'parentId',
+    childrenList: children || 'children'
+  }
 
+  const childrenListMap = {}
+  const nodeIds = {}
+  const tree = []
+
+  for (const d of data) {
+    const parentId = d[config.parentId]
+    if (childrenListMap[parentId] == null) {
+      childrenListMap[parentId] = []
+    }
+    nodeIds[d[config.id]] = d
+    childrenListMap[parentId].push(d)
+  }
+
+  for (const d of data) {
+    const parentId = d[config.parentId]
+    if (nodeIds[parentId] == null) {
+      tree.push(d)
+    }
+  }
+
+  for (const t of tree) {
+    adaptToChildrenList(t)
+  }
+
+  function adaptToChildrenList(o) {
+    if (childrenListMap[o[config.id]] !== null) {
+      o[config.childrenList] = childrenListMap[o[config.id]]
+    }
+    if (o[config.childrenList]) {
+      for (const c of o[config.childrenList]) {
+        adaptToChildrenList(c)
+      }
+    }
+  }
+
+  return tree
+}
+
+function formateToDate(date) {
+  if (date) {
+    return dayjs(date).format('YYYY-MM-DD')
+  } else {
+    return ''
+  }
+}
+function formateToDateTime(date) {
+  if (date) {
+    return dayjs(date).format('YYYY-MM-DD HH:mm:ss')
+  } else {
+    return ''
+  }
+}
 export default {
   range,
   getPx,
@@ -777,5 +847,8 @@ export default {
   uuid,
   replacer,
   reviver,
-  isJsonString
+  isJsonString,
+  handleTree,
+  formateToDate,
+  formateToDateTime
 }
diff --git a/nx/hooks/usePageListData.js b/nx/hooks/usePageListData.js
index 67a6841..33346d7 100644
--- a/nx/hooks/usePageListData.js
+++ b/nx/hooks/usePageListData.js
@@ -7,7 +7,7 @@ export function useListData({ searchParams, api, needInitListData = false, proce
   const loadingData = ref(true)
   const pageParams = reactive({
     pageNo: 1,
-    pageSize: 10
+    pageSize: 15
   })
   const total = ref(0)
   const loadStatus = ref('loadmore')
@@ -16,8 +16,8 @@ export function useListData({ searchParams, api, needInitListData = false, proce
   // 模拟获取数据的方法
   const getListData = async () => {
     const params = {
-      ...unref(searchParams),
-      ...pageParams
+      ...pageParams,
+      ...unref(searchParams)
     }
     let { list, total: pageTotal } = await api(params)
     total.value = pageTotal
diff --git a/nx/request/index.js b/nx/request/index.js
index 4839155..978cf7a 100644
--- a/nx/request/index.js
+++ b/nx/request/index.js
@@ -74,10 +74,7 @@ http.interceptors.request.use(
       LoadingInstance.count === 1 &&
         uni.showLoading({
           title: config.custom.loadingMsg,
-          mask: true,
-          fail: () => {
-            uni.hideLoading()
-          }
+          mask: true
         })
     }
     config.baseURL = getBaseUrl()
diff --git a/nx/utils/call-check-version.js b/nx/utils/call-check-version.js
index 35246d7..f07ae03 100644
--- a/nx/utils/call-check-version.js
+++ b/nx/utils/call-check-version.js
@@ -7,6 +7,10 @@ export default function () {
       const osName = plus.os.name
       let appId = plus.runtime.appid
       appId = clientId
+      uni.showLoading({
+        title: '请求更新中...',
+        mask: true
+      })
       uni.request({
         url:
           getUpgradeBaseUrl() +
@@ -15,6 +19,7 @@ export default function () {
           '&updatePlatform=android',
         method: 'GET',
         success: res => {
+          uni.hideLoading()
           console.log(res)
 
           const data = res.data.data
diff --git a/pages.json b/pages.json
index 56f0bf5..ebc3dbb 100644
--- a/pages.json
+++ b/pages.json
@@ -309,6 +309,41 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/material/useRecord/index",
+			"style": {
+				"navigationBarTitleText": "使用记录",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/material/useRecord/useConfirm",
+			"style": {
+				"navigationBarTitleText": "使用确认",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/material/useUpMark/index",
+			"style": {
+				"navigationBarTitleText": "用完标记",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/material/recycle/index",
+			"style": {
+				"navigationBarTitleText": "回收",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/material/wash/index",
+			"style": {
+				"navigationBarTitleText": "清洗",
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/setting/UrlConfig",
 			"style": {
@@ -382,7 +417,10 @@
 		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "lims",
 		"navigationBarBackgroundColor": "#0055A2",
-		"backgroundColor": "#F8F8F8"
+		"backgroundColor": "#F8F8F8",
+		"app-plus": {
+			"bounce": "none" // 关闭所有页面的弹性效果
+		}
 	},
 	"tabBar": {
 		"custom": true,
diff --git a/pages/analysis/auncel/auncel-status.vue b/pages/analysis/auncel/auncel-status.vue
index 28db681..4d3f739 100644
--- a/pages/analysis/auncel/auncel-status.vue
+++ b/pages/analysis/auncel/auncel-status.vue
@@ -99,8 +99,7 @@ function getPageData() {
       pageNo: 1,
       pageSize: 999,
       collectDeviceType: 'balance',
-      deviceStatus: '0',
-      isEnable: '1',
+      deviceStatus: "{\"Enable\":\"1\"}",
 	  deployLocation: deployLocation.value === '全部' ? '' : deployLocation.value
     })
     .then(res => {
diff --git a/pages/analysis/sample/sample-work-detail.vue b/pages/analysis/sample/sample-work-detail.vue
index 5f4b722..bbbe53f 100644
--- a/pages/analysis/sample/sample-work-detail.vue
+++ b/pages/analysis/sample/sample-work-detail.vue
@@ -230,6 +230,7 @@ import request from '@/nx/request'
 import {
   calcAnalysisValue,
   handleRoundFiveNumber,
+  handleEfficaciousNumber,
   calcRowAnalysisValue,
   evaluateGetFromFormula,
   math,
@@ -655,6 +656,7 @@ const saveAuncelData = () => {
   }, 100)
 }
 let dynamicFormData = reactive({})
+
 const saveDetail = async () => {
   //检查杯号
   if (!checkBh()) return
@@ -677,7 +679,14 @@ const saveDetail = async () => {
         if (item.calcMethod === 'calculateAverageValue') {
           item.value = calcAverageValue(sourceKey, currentAssayType.value.tableData)
         } else {
-          item.value = handleRoundFiveNumber(row[sourceKey].value, row.decimalPosition)
+          const rowObj = row[selectedField.value.fieldIndex]
+          const isProject = rowObj.type === 'project'
+          const flagValue = handleRoundFiveNumber(row[sourceKey].value, row.decimalPosition)
+          if (isProject) {
+            item.value = handleEfficaciousNumber(flagValue, rowObj.decimalPosition, rowObj.effectiveDigit)
+          } else {
+            item.value = flagValue
+          }
         }
         // 如果处理后的值不为空，重新赋值该字段到其他样品类型下的样品上，并触发每一个样品的计算
         for (const col of currentAssayType.value.columns) {
@@ -710,9 +719,16 @@ const saveDetail = async () => {
 function calcAverageValue(fieldIndex, tableData) {
   const rows = tableData.map(row => row[fieldIndex])
   const decimalPosition = rows[0].decimalPosition
+  const isProject = rows[0].type === 'project'
+  const effectiveDigit = rows[0].effectiveDigit
   const values = rows.map(row => Number(row.value))
   if (values.some(item => item == null)) return null
-  return handleRoundFiveNumber(math.mean(values), decimalPosition)
+  const flagValue = handleRoundFiveNumber(math.mean(values), decimalPosition)
+  if (isProject) {
+    return handleEfficaciousNumber(flagValue, decimalPosition, effectiveDigit)
+  } else {
+    return flagValue
+  }
 }
 
 // 表格数据更新后重新计算
@@ -1113,12 +1129,19 @@ const listenNumKeyboard = () => {
     }
     //自动补全小数位数
     const decimalPosition = selectedField.value.decimalPosition
+    const isProject = selectedField.value.type === 'project'
+    const effectiveDigit = currentSampleData.value[selectedField.value.fieldIndex]?.effectiveDigit || decimalPosition
     let val = res.val
     const symbol = res.symbol
     if (decimalPosition == null) {
       selectedField.value.value = val
     } else {
-      selectedField.value.value = handleRoundFiveNumber(val, decimalPosition)
+      const flagValue = handleRoundFiveNumber(val, decimalPosition)
+      if (isProject) {
+        selectedField.value.value = handleEfficaciousNumber(flagValue, decimalPosition, effectiveDigit)
+      } else {
+        selectedField.value.value = flagValue
+      }
     }
     if (symbol) {
       selectedField.value.symbol = symbol
diff --git a/pages/analysis/sample/sample-work-detail.vue.bak b/pages/analysis/sample/sample-work-detail.vue.bak
deleted file mode 100644
index f41d47f..0000000
--- a/pages/analysis/sample/sample-work-detail.vue.bak
+++ /dev/null
@@ -1,1515 +0,0 @@
-<template>
-  <view>
-    <navbar-back :autoBack="false" titleWidth="800" :title="title" @leftClick="customBack">
-      <view class="navbar-right" @click="navRightClick">
-        <text>填写任务单</text>
-        <u-icon color="" name="edit-pen" size="19"></u-icon>
-      </view>
-    </navbar-back>
-
-    <u-row gutter="8">
-      <u-col span="3" style="height: 60px">
-        <up-tabs
-          class="content-tabs"
-          :current="activeAssayTypeIndex"
-          :list="assayGroups"
-          lineColor="#5ac725"
-          :activeStyle="{
-            fontWeight: 'bold',
-            color: '#0055a2'
-          }"
-          :itemStyle="{
-            height: '35px'
-          }"
-          @change="handleAssayTypeChange"
-        ></up-tabs>
-        <u-gap height="5" bg-color="#0055A2"></u-gap>
-      </u-col>
-      <u-col span="6" style="height: 60px">
-        <view class="content-title-name">
-          <view class="current-sample-code">{{ currentSampleData.sampleCode }}</view>
-          <view>数据采集或录入</view>
-        </view>
-        <u-gap height="5" bg-color="#0055A2"></u-gap>
-      </u-col>
-      <u-col span="3" style="height: 60px">
-        <u-dropdown>
-          <u-dropdown-item
-            v-model="curParameterKey"
-            :title="curParameterTitle"
-            height="70vh"
-            :options="fieldGroup"
-            @change="parameterClassifyChange"
-          ></u-dropdown-item>
-        </u-dropdown>
-        <u-gap height="5" bg-color="#0055A2"></u-gap>
-      </u-col>
-    </u-row>
-    <u-row gutter="8" align="top">
-      <u-col span="3">
-        <scroll-view class="content-left-scroll" scroll-with-animation scroll-y :scroll-top="scrollTop">
-          <view
-            v-for="(sample, index) in sampleDataList"
-            :key="index"
-            class="u-tab-item"
-            :class="[currentSampleIndex === index ? 'u-tab-item-active' : '']"
-            :data-current="index"
-            @tap.stop="switchSample(index)"
-          >
-            <u-badge type="warning" :value="index + 1"></u-badge>
-            <view class="ml20">
-              <view>
-                {{ sample.sampleCode }}
-              </view>
-              <view class="mt10"> {{ sample.sampleName }} </view>
-            </view>
-          </view>
-        </scroll-view>
-        <view v-if="taskIsIngredients == 1" class="x-f">
-          <template v-if="taskIngredientsWay === 'initial'">
-            <u-button class="btn-operation mr10" type="primary" @click="handleIngredients()">自动配料</u-button>
-            <u-button class="btn-operation ml10" type="primary" @click="handleManualIngredients()">人工配料</u-button>
-          </template>
-          <template v-else>
-            <u-button
-              v-if="taskIngredientsStatus === 'allow_submit'"
-              class="btn-operation"
-              type="primary"
-              @click="submitTask()"
-              >数据上报</u-button
-            >
-            <u-button v-else class="btn-operation" type="primary" :disabled="taskIngredientsStatus === 'in_progress'"
-              >等待配料</u-button
-            >
-          </template>
-        </view>
-        <u-button v-else class="btn-operation" type="primary" @click="submitTask()">数据上报</u-button>
-      </u-col>
-      <u-col span="6">
-        <view class="x-bc">
-          <view class="field-name" v-html="selectedField.title" />
-          <u-button
-            v-if="fillingWay.length > 1"
-            type="primary"
-            shape="circle"
-            plain
-            size="small"
-            style="width: 15%"
-            :text="`切换${currentFillingWay == 'collect' ? '录入' : '采集'}`"
-            @click="switchFillingWay"
-          ></u-button>
-        </view>
-        <zzjc-num-keyboard
-          ref="myKeyboard"
-          v-show="currentFillingWay == 'keyboard' || (selectedField.type == 'project' && selectedField.isEdit)"
-          :showSymbol="selectedField.type == 'project' && selectedField.isEdit"
-          :numKeyboardParam="numKeyboardParam"
-        ></zzjc-num-keyboard>
-        <view v-if="currentFillingWay == 'collect'" class="y-f">
-          <view class="auncel" @click="selectAuncel">
-            <view class="code">{{ currentAuncel.code }}</view>
-            <view class="auncel-title"> 杯号：{{ currentCupNum }} </view>
-            <view class="auncel-weight">
-              <view class="weight">
-                <view
-                  :style="{ textAlign: !currentAuncel.isConnected ? 'center' : 'right' }"
-                  :class="
-                    currentAuncel.weightStable === 0
-                      ? 'weight-data-yellow'
-                      : currentAuncel.weightStable === 1
-                      ? 'weight-data'
-                      : 'weight-data-warning'
-                  "
-                >
-                  {{ currentAuncel.weightData }}
-                </view>
-              </view>
-              <view class="weight-unit">{{ currentAuncel.weightUnit }}</view>
-            </view>
-          </view>
-
-          <u-button
-            class="btn-operation"
-            type="success"
-            :disabled="confirmWeightDisabled"
-            shape="circle"
-            @click="saveAuncelData"
-          >
-            确认采集
-          </u-button>
-        </view>
-        <view v-if="currentFillingWay === 'input'" class="p8">
-          <up-textarea v-model="inputValue" placeholder="请输入内容"></up-textarea>
-          <view class="x-c mt20 pl100 pr100">
-            <up-button @click="handleResetInputValue" style="width: 30%" :plain="true" text="清空"></up-button>
-            <up-button @click="handleInputConfirm" style="width: 30%" type="success" text="确认"></up-button>
-          </view>
-        </view>
-      </u-col>
-      <u-col span="3">
-        <view class="pt10">
-          <scroll-view class="content-right-scroll" scroll-y scroll-with-animation :scroll-top="scrollFieldTop">
-            <view>
-              <up-collapse ref="collapseRef" :value="activeCollapses" :border="false">
-                <template v-for="(fields, groupIndex) in currentGroup">
-                  <up-collapse-item v-if="fields.label !== '全部'">
-                    <template #title>
-                      <text class="font-bold fs18">{{ fields.label }}</text>
-                    </template>
-                    <template v-for="(field, fieldIndex) in fields.fields" :key="groupIndex + '-' + fieldIndex">
-                      <view
-                        class="form-item-my"
-                        @click="fieldClick(field, groupIndex + '-' + fieldIndex)"
-                        v-show="field.hidden != 1"
-                        :class="{
-                          'selected-field': groupFieldIndex === groupIndex + '-' + fieldIndex,
-                          'disabled-field': !field.isEdit,
-                          'flex-column': field.dataType === 'datetime'
-                        }"
-                      >
-                        <view
-                          :class="['label-my', { 'label-high-light': field.highlight == 1 }]"
-                          v-html="field.title"
-                        ></view>
-                        <view class="content-my">
-                          <!--普通输入框 使用文本显示-->
-                          <view class="content-my-text" v-if="field.dataType != 'select'">
-                            <text v-if="!field.value" class="content-my-text-placeholder">{{
-                              !field.fillingWay || field.fillingWay == 'calculate'
-                                ? '计算值'
-                                : field.fillingWay == 'datetime'
-                                ? '请选择时间'
-                                : '请输入'
-                            }}</text>
-                            <text
-                              v-else
-                              :class="['content-my-text-value', { 'field-high-light': field.highlight == 1 }]"
-                              ><text v-if="field.symbol !== '='" class="mr5">{{ field.symbol }}</text
-                              >{{ field.value }}</text
-                            >
-                          </view>
-                        </view>
-                      </view>
-                      <view
-                        v-if="field.validation"
-                        class="fs12"
-                        :class="field.validation?.promptType === 'warning' ? 'valid-warning' : 'valid-error'"
-                        >{{ field.validation?.promptMsg }}</view
-                      >
-                    </template>
-                  </up-collapse-item>
-                </template>
-              </up-collapse>
-            </view>
-          </scroll-view>
-          <u-button class="btn-operation" type="success" @click="saveDetail()">保存样品数据</u-button>
-        </view>
-      </u-col>
-    </u-row>
-    <up-datetime-picker
-      :show="dateTimeShow"
-      v-model="dateTimeDefaultValue"
-      @confirm="handleDateConfirm"
-      @cancel="dateTimeShow = false"
-      mode="datetime"
-    ></up-datetime-picker>
-    <!--    天平选择-->
-    <auncel-select-popup
-      ref="auncelSelector"
-      v-model:showAuncelSelector="showAuncelSelector"
-      :previousAuncelId="currentAuncel.id"
-      @doSelect="auncelDoSelect"
-    ></auncel-select-popup>
-  </view>
-</template>
-
-<script setup>
-import { ref, reactive, computed, nextTick, watch, getCurrentInstance } from 'vue'
-import { onLoad, onBackPress, onShow, onHide, onUnload } from '@dcloudio/uni-app'
-import request from '@/nx/request'
-import {
-  calcAnalysisValue,
-  handleRoundFiveNumber,
-  calcRowAnalysisValue,
-  evaluateGetFromFormula,
-  math,
-  groupByField,
-  validateElementRange
-} from '@/nx/helper/calcAnalysisValue'
-import { number } from 'mathjs'
-import AuncelSelectPopup from '@/components/sample/auncel-select-popup.vue'
-import { getTenantId } from '@/defaultBaseUrl'
-import { useScreenOrientation } from '@/nx/hooks/useScreenOrientation'
-import nx from '@/nx'
-import { getDataSourceTypeShow } from '../common'
-import tools from '@/nx/utils/tools'
-
-const { proxy } = getCurrentInstance()
-
-// 响应式数据定义
-const taskId = ref('')
-const taskIngredientsStatus = ref('') //配料状态
-const taskIsIngredients = ref('')
-const taskIngredientsWay = ref('')
-const configReportTemplateKey = ref('')
-const elId = nx.$helper.uuid()
-const scrollTop = ref(0) //tab标题的滚动条位置
-const scrollFieldTop = ref(0)
-const menuHeight = ref(0) // 左边菜单的高度
-const menuItemHeight = ref(0) // 左边菜单item的高度
-const weightDataIsToZero = ref(false) //重量数据是否归零
-const currentSampleIndex = ref(0) // 预设当前项的值
-let sampleDataList = ref([])
-const title = ref('')
-const numKeyboardParam = reactive({
-  decimal: '-1' //数字键盘小数位数，-1为不限制
-})
-const showAuncelSelector = ref(false) //显示天平选择框
-const currentAuncel = ref({
-  id: '',
-  name: '',
-  code: '',
-  weightStable: 0,
-  weightData: '请选天平',
-  weightUnit: ''
-})
-let selectedField = ref({})
-const groupFieldIndex = ref('') //分组的索引
-const curParameterTitle = ref('选择字段分类')
-const curParameterKey = ref('all')
-const conAssayTaskId = ref('')
-const busSubCSampleId = ref('')
-let fieldGroup = ref([])
-const collaHeights = ref([])
-const cupNumKey = '杯号'
-const inputValue = ref('')
-const dateTimeShow = ref(false)
-const dateTimeDefaultValue = ref(new Date())
-
-function handleResetInputValue() {
-  inputValue.value = ''
-}
-// refs
-const myKeyboard = ref(null)
-const auncelSelector = ref(null)
-
-// 计算属性
-const confirmWeightDisabled = computed(() => {
-  if (currentAuncel.value.weightStable === 1 && Number(currentAuncel.value.weightData) > 0) {
-    return false
-  }
-  return true
-})
-
-const userInfo = computed(() => nx.$store('user').userInfo)
-
-// 方法定义
-const getDomHeight = async () => {
-  await nextTick() // 等待 DOM 更新完成
-  collaHeights.value = []
-  if (fieldGroup.value.length) {
-    fieldGroup.value.forEach((item, index) => {
-      proxy.$u.getRect('#elId' + index).then(res => {
-        collaHeights.value.push(res.height)
-      })
-    })
-  }
-}
-
-//返回上一页
-const customBack = () => {
-  uni.redirectTo({
-    url: '/pages/analysis/sample/sample-work-list'
-  })
-}
-
-const navRightClick = () => {
-  let url = `/pages/analysis/sample/sample-work-edit-task?currentTaskId=${taskId.value}&configReportTemplateKey=${configReportTemplateKey.value}`
-  uni.navigateTo({
-    url: url
-  })
-}
-
-const parameterClassifyChange = v => {
-  curParameterKey.value = v
-  curParameterTitle.value = currentGroup.value[0].label
-  groupFieldIndex.value = ''
-  selectedField.value = {}
-  collapseRef.value.init()
-  autoNextField()
-}
-
-function handleInputConfirm() {
-  selectedField.value.value = inputValue.value
-  syncFieldValueByEqualParamNo()
-  autoNextField()
-}
-function handleDateConfirm(e) {
-  selectedField.value.value = nx.$dayjs(e.value).format('YYYY-MM-DD HH:mm:ss')
-  dateTimeShow.value = false
-  autoNextField()
-}
-const fieldClick = (field, key) => {
-  if (!field.isEdit) return
-  currentFillingIndex.value = 0
-  selectedField.value = field
-  groupFieldIndex.value = key
-  if (currentFillingWay.value === 'input') {
-    inputValue.value = field.value
-  }
-  if (currentFillingWay.value === 'datetime') {
-    dateTimeShow.value = true
-  }
-  if (myKeyboard.value) {
-    myKeyboard.value.clearNum()
-  }
-  //判断小数位数
-  let decimalPosition = field.decimalPosition
-  if (decimalPosition == null || decimalPosition < -1) decimalPosition = -1
-  numKeyboardParam.decimal = decimalPosition
-}
-
-const currentFillingIndex = ref(0)
-const fillingWay = computed(() => {
-  if (selectedField.value.fillingWay) {
-    return selectedField.value.fillingWay.split(',')
-  } else {
-    return []
-  }
-})
-const currentFillingWay = computed(() => {
-  return fillingWay.value[currentFillingIndex.value] || ''
-})
-watch(
-  () => currentFillingWay.value,
-  newVal => {
-    if (newVal == 'collect') {
-      listenDeviceData()
-    } else {
-      closeDeviceListener()
-    }
-  }
-)
-const switchFillingWay = () => {
-  currentFillingIndex.value = (currentFillingIndex.value + 1) % fillingWay.value.length
-}
-//自动切换到下一个字段
-const autoNextField = () => {
-  let groupIndex = 0
-  let fieldIndex = 0
-  if (typeof groupFieldIndex.value === 'undefined' || groupFieldIndex.value === '') groupFieldIndex.value = '0-'
-  const indexV = groupFieldIndex.value.split('-')
-  groupIndex = number(indexV[0])
-  fieldIndex = indexV[1] === '' ? -1 : number(indexV[1])
-  const group = currentGroup.value[groupIndex]
-  const fields = group.fields
-  if (fields.length > fieldIndex + 1) {
-    //切换到下一个字段
-    const key = groupIndex + '-' + (fieldIndex + 1)
-    fieldClick(fields[fieldIndex + 1], key)
-  }
-}
-
-//自动切换到下一个样品
-const autoNextSample = indexParam => {
-  let index = 0
-  if (indexParam !== undefined) {
-    index = indexParam
-  } else {
-    index = currentSampleIndex.value + 1
-  }
-
-  // 在数组范围内，且当前样品是 in_progress，就继续往后找
-  while (index < sampleDataList.value.length) {
-    const sample = sampleDataList.value[index]
-
-    if (sample.rollbackStatus !== 'in_progress') {
-      // 找到了合法的样品，切换
-      switchSample(index)
-      return
-    }
-    index++
-  }
-}
-
-//手动切换样品
-const switchSample = async index => {
-  //重置天平归0
-  weightDataIsToZero.value = false
-  if (index === currentSampleIndex.value) return
-  currentSampleIndex.value = index
-  // 如果为0，意味着尚未初始化
-  if (menuHeight.value === 0 || menuItemHeight.value === 0) {
-    const rect = await getElRect('u-tab-item')
-    menuItemHeight.value = rect.height
-  }
-  // 将菜单菜单活动item垂直居中
-  scrollTop.value = index * menuItemHeight.value + menuItemHeight.value / 2 - menuHeight.value / 2 - 50
-  uni.showLoading({ title: '加载中...' })
-  setValueToField()
-  autoGenerateCupNum()
-  setTimeout(() => {
-    uni.hideLoading()
-  }, 500)
-}
-
-// 获取一个目标元素的高度
-const getElRect = (elClass, maxRetry = 50) => {
-  return new Promise((resolve, reject) => {
-    let retryCount = 0
-    const execQuery = () => {
-      uni
-        .createSelectorQuery()
-        .in(proxy)
-        .select('.' + elClass)
-        .fields({ size: true, rect: true })
-        .exec(res => {
-          const result = res[0] // exec 返回数组，取第一个
-          if (result) {
-            resolve(result)
-          } else if (retryCount < maxRetry) {
-            retryCount++
-            setTimeout(execQuery, 10)
-          } else {
-            reject(new Error(`无法获取元素 .${elClass} 的尺寸，已重试 ${maxRetry} 次`))
-          }
-        })
-    }
-
-    execQuery()
-  })
-}
-
-//读取样品明细字段
-const getDetailFieldsAndStatus = autoSelectNextField => {
-  const taskDetailId = currentSampleData.value.id
-  //读取回收率配置
-  loadConRecoveryList()
-  conAssayTaskId.value = res.additionalProperties.conAssayTaskId
-  busSubCSampleId.value = res.additionalProperties.busSubCSampleId
-  const detail = res.additionalProperties.taskDetail
-  //处理硫值、硫量：未保存过的数据，读取接口返回的硫值、硫量
-  loadSValue(detail)
-  calAndCheck()
-}
-
-const checkLoadSValue = () => {
-  const vKey = 'sRange'
-  const vF = getFieldByKey(vKey)
-  if (vF === null) return false
-  const v = vF.value
-  if (v === null || v === '') return true
-  try {
-    if (v === 0 || number(v) === 0) return true
-  } catch (e) {}
-  return false
-}
-
-//读取硫值、硫量
-const loadSValue = detail => {
-  let flag = checkLoadSValue()
-  if (!flag) return
-  const vKey = 'sValue'
-  const rKey = 'sRange'
-  const vF = getFieldByKey(vKey)
-  if (vF !== null) {
-    vF.value = detail.svalue
-  }
-  const rF = getFieldByKey(rKey)
-  if (rF !== null) {
-    rF.value = detail.srange
-  }
-}
-
-const getFieldByKey = key => {
-  const group = fieldGroup.value
-  let field = null
-  for (let g of group) {
-    for (let f of g.fields) {
-      const dicKey = f.dicKey
-      if (dicKey && dicKey === key) {
-        field = f
-        break
-      }
-    }
-  }
-  return field
-}
-
-//按公式计算值，并检查原数据与计算后的数据是否一致
-const calAndCheck = () => {
-  //提取原本数值
-  const oldVal = fitUpValues()
-  calcAnalysisValue(fieldGroup.value)
-  if (checkDataNew(oldVal)) return
-  const newVal = fitUpValues(oldVal)
-  //检查是否一致
-  let modifyFlag = false
-  for (const o in oldVal) {
-    let old = oldVal[o]
-    if (old === null) old = 0
-    //判断是否number
-    try {
-      if (number(old) !== number(newVal[o])) {
-        modifyFlag = true
-      }
-    } catch (e) {
-      if (old !== newVal[o]) modifyFlag = true
-    }
-  }
-  if (modifyFlag)
-    uni.showToast({
-      title: '数据有修改，请检查所有样品，并重新保存！',
-      duration: 2000,
-      icon: 'error'
-    })
-}
-
-//检查是否是新数据
-const checkDataNew = data => {
-  for (const o in data) {
-    if (data[o] !== null && data[o] !== '0') return false
-  }
-  return true
-}
-
-//组装表单值，用于数据比对
-const fitUpValues = () => {
-  const val = {}
-  for (const g of fieldGroup.value) {
-    for (const f of g.fields) {
-      const detailId = f.detailId
-      if (!detailId) continue
-      val[detailId] = f.value
-    }
-  }
-  return val
-}
-
-const checkBh = () => {
-  //检查杯号
-  let hasHb = true
-  for (const g of fieldGroup.value) {
-    for (const f of g.fields) {
-      if (f.title && f.title.indexOf(cupNumKey) >= 0) {
-        if (typeof f.value === 'undefined' || f.value === null || f.value === '') hasHb = false
-      }
-    }
-  }
-  if (!hasHb) {
-    nx.$helper.showToast({
-      title: '杯号不能为空，请填写杯号！'
-    })
-    return false
-  }
-  return true
-}
-const checkRange = async () => {
-  for (const g of fieldGroup.value) {
-    for (const f of g.fields) {
-      if (f.validation) {
-        if (f.validation.promptType === 'error') {
-          nx.$helper.showToast({
-            title: '存在范围校验错误，请修正后再保存！',
-            icon: 'error',
-            duration: 2000
-          })
-          return false
-        }
-        if (f.validation.promptType === 'warning') {
-          const confirm = await tools.showPromiseModal('提示', '检测到范围警告，是否继续保存？')
-          return confirm
-        }
-      }
-    }
-  }
-  return true // 无问题，通过
-}
-const saveAuncelData = () => {
-  //保存数据
-  if (!weightDataIsToZero.value) {
-    nx.$helper.showToast({
-      title: '天平必须先回零！'
-    })
-    return
-  }
-  //获取当前重量
-  let weight = currentAuncel.value.weightData
-  selectedField.value.value = weight
-
-  syncFieldValueByEqualParamNo()
-  //计算
-  try {
-    calcAnalysisValue(fieldGroup.value, dynamicFormData, taskIngredientsWay.value)
-  } catch (e) {
-    console.error(e)
-  }
-
-  //自动跳转下一个字段
-  setTimeout(() => {
-    autoNextField()
-    weightDataIsToZero.value = false
-  }, 100)
-}
-let dynamicFormData = reactive({})
-const saveDetail = async () => {
-  //检查杯号
-  if (!checkBh()) return
-  // 检查范围校验
-  if (!(await checkRange())) return
-  setValueToSample()
-  let params = {
-    businessAssayTaskId: taskId.value
-  }
-
-  // 如果是空白样和标样就需要根据配置信息来计算质控样、分析样
-  if (activeAssayTypeKey.value === 'kby' || activeAssayTypeKey.value === 'by' || activeAssayTypeKey.value === 'zkkby') {
-    // 处理其他页签的输入变化
-    const configInfomation = currentAssayType.value.configQCSampleMethodInfo
-    const row = currentSampleData.value
-    configInfomation.forEach(item => {
-      const sourceKey = item.source
-      const sourceValue = row[sourceKey]
-      if (sourceValue !== undefined) {
-        if (item.calcMethod === 'calculateAverageValue') {
-          item.value = calcAverageValue(sourceKey, currentAssayType.value.tableData)
-        } else {
-          item.value = handleRoundFiveNumber(row[sourceKey].value, row.decimalPosition, row.type === 'project')
-        }
-        // 如果处理后的值不为空，重新赋值该字段到其他样品类型下的样品上，并触发每一个样品的计算
-        for (const col of currentAssayType.value.columns) {
-          if (col.fieldIndex === sourceKey) {
-            if (item.value) {
-              dynamicFormData[item.target] = item.value
-            } else {
-              dynamicFormData[item.target] = row[sourceKey].value
-            }
-          }
-        }
-        updateTableDataByConfigFields()
-      }
-    })
-    params.formValue = JSON.stringify(dynamicFormData)
-    params.assayTaskAnalysisDataList = assayGroups.value.map(item => ({
-      datas: item.tableData,
-      analysisType: item.value
-    }))
-  } else {
-    const datas = currentSampleData.value
-    params.assayTaskAnalysisDataList = [{ datas: [datas], analysisType: activeAssayTypeKey.value }]
-  }
-
-  await nx.$api.assayTask.saveBatchSmpleAndQcAnalysis(params)
-  // getSampleAnalysisByTaskId()
-  autoNextSample()
-}
-// 计算表格列平均值
-function calcAverageValue(fieldIndex, tableData) {
-  const rows = tableData.map(row => row[fieldIndex])
-  const decimalPosition = rows[0].decimalPosition
-  const isProject = rows[0].type === 'project'
-  const values = rows.map(row => Number(row.value))
-  if (values.some(item => item == null)) return null
-  return handleRoundFiveNumber(math.mean(values), decimalPosition, isProject)
-}
-
-// 表格数据更新后重新计算
-function updateTableDataByConfigFields() {
-  let needCalcTabs = []
-  needCalcTabs = assayGroups.value.filter(t => t.value !== 'by' && t.value !== 'kby' && t.value !== 'zkkby')
-  if (needCalcTabs.length === 0) return
-  for (const key in dynamicFormData) {
-    for (const tab of needCalcTabs) {
-      const columnObj = tab.columns.find(c => {
-        if (c.formula) {
-          let FromKey = c.formula.split(':')
-          return FromKey[1] === key || FromKey[0] === 'GetFrom'
-        }
-        return false
-      })
-      if (!columnObj) continue
-      tab.tableData.forEach(row => {
-        // 赋值配置列参与计算
-        if (row[columnObj.fieldIndex]) {
-          if (columnObj.formula.startsWith('From')) {
-            row[columnObj.fieldIndex].value = dynamicFormData[key]
-          }
-          if (columnObj.formula.startsWith('GetFrom')) {
-            row[columnObj.fieldIndex].value = evaluateGetFromFormula(
-              columnObj.formula,
-              true,
-              dynamicFormData,
-              columnObj,
-              row,
-              tab.columns
-            )
-          }
-        }
-        calcRowAnalysisValue(row, columnObj, tab.columns, dynamicFormData, taskIngredientsWay.value)
-      })
-    }
-  }
-}
-
-// 把字段值保存回样品数据中
-function setValueToSample() {
-  let fields = fieldGroup.value.flatMap(item => item.fields)
-  fields.forEach(item => {
-    if (
-      currentSampleData.value.hasOwnProperty(item.fieldIndex) &&
-      nx.$test.object(currentSampleData.value[item.fieldIndex])
-    ) {
-      currentSampleData.value[item.fieldIndex].value = item.value
-      currentSampleData.value[item.fieldIndex].symbol = item.symbol
-    }
-  })
-}
-
-//自动生成杯号（仅顺序称重）：第一杯：手填，后续杯 = 上一杯 + 1
-const autoGenerateCupNum = () => {
-  let cupNum = 0
-  let currentIndex = currentSampleIndex.value
-  //第一杯
-  if (currentIndex === 0) return
-  //取上一个样品的杯号
-  const sample = sampleDataList.value[currentIndex - 1]
-  cupNum = sample[cupNumFieldIndex.value]?.value
-  if (!cupNum) return
-  //杯号赋值到当前样品
-  putCupNum(Number(cupNum) + 1, currentIndex, Number(cupNum))
-}
-
-const putCupNum = (cupNum, sampleIndex, lastCupNum) => {
-  for (const fields of fieldGroup.value) {
-    if (typeof fields === 'undefined') continue
-    //杯号
-    for (const field of fields.fields) {
-      if (field.fieldIndex === cupNumFieldIndex.value) {
-        if (typeof field.value === 'undefined' || field.value === null || field.value === '') {
-          field.value = cupNum
-          return true
-        }
-      }
-    }
-  }
-}
-
-const loadConRecoveryList = () => {
-  const conBaseSampleId = currentSampleData.value.conBaseSampleId
-  const rParam = {
-    pageNo: 1,
-    pageSize: -1,
-    conBaseSampleId: conBaseSampleId
-  }
-  const storageKey = 'ConRecoveryRateList'
-  nx.$api.assayTask
-    .queryConRecoveryRateList(rParam)
-    .then(res => {
-      const result = res.result
-      if (typeof result === 'undefined' || result === null || !result) {
-        uni.setStorage(storageKey, [])
-        return
-      }
-      const records = result.records
-      if (!records || records.length === 0) {
-        uni.setStorage(storageKey, [])
-        return
-      }
-      uni.setStorageSync(storageKey, records)
-    })
-    .catch(err => {
-      console.error(err)
-    })
-}
-
-// 分析样品组
-let assayGroups = ref([])
-const activeAssayTypeKey = ref('')
-const activeAssayTypeIndex = ref(0)
-//元素结果范围
-let conRangeElementAnalysisList = ref([])
-// 杯号fieldIndex
-const cupNumFieldIndex = ref('')
-const currentAssayType = computed(() => {
-  return assayGroups.value.find(item => item.value === activeAssayTypeKey.value)
-})
-// 当前样品数据
-const currentSampleData = computed(() => {
-  if (sampleDataList.value.length > 0) {
-    return sampleDataList.value[currentSampleIndex.value]
-  }
-  return {}
-})
-watch(
-  () => currentAssayType.value,
-  () => {
-    sampleDataList.value = currentAssayType.value.tableData
-    fieldGroup.value = groupByField(currentAssayType.value.columns, cupNumFieldIndex)
-    autoNextSample(0)
-    setValueToField()
-    // getDomHeight()
-    activeCollapses.value = fieldGroup.value.map((_, index) => index)
-  }
-)
-const currentCupNum = computed(() => {
-  for (const item of fieldGroup.value) {
-    const field = item.fields.find(field => field.fieldIndex === cupNumFieldIndex.value)
-    if (field) {
-      return field.value
-    }
-  }
-  return null
-})
-const currentGroup = computed(() => {
-  if (!currentAssayType.value || curParameterKey.value === 'all') {
-    return fieldGroup.value
-  } else {
-    return fieldGroup.value.filter(g => g.value === curParameterKey.value)
-  }
-})
-watch(
-  () => currentGroup.value,
-  () => {
-    fieldGroup.value.forEach(item => {
-      item.fields.forEach(field => {
-        const validation = validateElementRange(
-          field.fieldIndex,
-          currentSampleData.value,
-          conRangeElementAnalysisList.value
-        )
-        field.validation = validation
-      })
-    })
-  }
-)
-const collapseRef = ref()
-const activeCollapses = ref([])
-function handleAssayTypeChange({ index, value }) {
-  scrollFieldTop.value = 0
-  activeAssayTypeKey.value = value
-  activeAssayTypeIndex.value = index
-  currentSampleIndex.value = 0
-  groupFieldIndex.value = ''
-  selectedField.value = {}
-  curParameterKey.value = 'all'
-  curParameterTitle.value = '选择字段分类'
-  collapseRef.value.init()
-}
-// 获取任务数据
-async function getSampleAnalysisByTaskId() {
-  const {
-    assayTaskAnalysisDataList,
-    configAssayMethodProjectRangeList,
-    businessAssayTasNo,
-    formValue,
-    ingredientsStatus,
-    isIngredients,
-    ingredientsWay
-  } = await nx.$api.assayTask.batchSampleAndQcAnalysisByTaskId(taskId.value)
-  title.value = '样品分析-任务单编号：' + businessAssayTasNo
-  taskIngredientsStatus.value = ingredientsStatus
-  taskIsIngredients.value = isIngredients
-  taskIngredientsWay.value = ingredientsWay
-  // 处理分析数据
-  assayGroups.value = assayTaskAnalysisDataList.map(group => {
-    // 必须深拷贝 datas！防止多个表格共享引用
-    const tableData = JSON.parse(JSON.stringify(group.datas || []))
-    const columns = group.columns.filter(item => item.paramNo) || []
-
-    return {
-      value: group.analysisType,
-      name: group.analysisName,
-      columns,
-      tableData,
-      configQCSampleMethodInfo: group.configQCSampleMethod?.configInfomation
-        ? JSON.parse(group.configQCSampleMethod['configInfomation'])['set']
-        : []
-    }
-  })
-  dynamicFormData = formValue ? JSON.parse(formValue) : {}
-  // 默认激活第一个 类型
-  if (!activeAssayTypeKey.value) {
-    activeAssayTypeKey.value = assayGroups.value.length > 0 ? assayGroups.value[0].value : ''
-  }
-  conRangeElementAnalysisList.value = configAssayMethodProjectRangeList || []
-}
-// 设置字段值
-function setValueToField() {
-  for (const group of fieldGroup.value) {
-    group.fields.forEach(field => {
-      let value = getFieldValue(field)
-      field.value = value
-      let symbol = getFieldSymbol(field)
-      field.symbol = symbol
-      if (!getField(field)) {
-        field.hidden = 1
-      } else {
-        field.hidden = 0
-      }
-    })
-  }
-}
-function getField(field) {
-  const fieldObj = currentSampleData.value[field.fieldIndex]
-  return fieldObj
-}
-function getFieldValue(field) {
-  const fieldValue = currentSampleData.value[field.fieldIndex]?.value
-  if (fieldValue) {
-    return fieldValue
-  } else {
-    return ''
-  }
-}
-function getFieldSymbol(field) {
-  const fieldSymbol = currentSampleData.value[field.fieldIndex]?.symbol
-  if (fieldSymbol) {
-    return fieldSymbol
-  } else {
-    return '='
-  }
-}
-
-const apiRequest = async url => {
-  return request({
-    url: url,
-    method: 'GET'
-  })
-}
-
-//读取字段里的API选项
-const loadFieldApiData = async fieldGroups => {
-  for (const fields of fieldGroups) {
-    for (const field of fields.fields) {
-      const api = field.api
-      const type = field.type
-      if (type === 'select' && api && api !== '') {
-        //读取API选项
-        try {
-          const res = await apiRequest(api)
-          const data = res
-          field.options = data
-          field.rangeKey = 'displayName'
-        } catch (e) {}
-      }
-    }
-  }
-}
-
-/*
- * 选择器组件确认事件
- * event： 事件默认参数
- * field： 当前字段
- * 处理逻辑：
- *   field.value = 选中的值
- *   field.valueText = 选中的文本
- * */
-const dicPickerConfirm = (event, field) => {
-  const checked = event.value[0]
-  const displayName = checked.displayName
-  const value = checked.dictValue
-  const extField1 = checked.extField1
-  field.value = value
-  field.valueText = value
-
-  const relatedFieldNo = '8'
-  //查找并处理关联字段
-  for (const fieldGroup of fieldGroup.value) {
-    for (const field of fieldGroup.fields) {
-      if (field.paramNo === relatedFieldNo) {
-        field.value = extField1
-        break
-      }
-    }
-  }
-  //触发计算公式
-  calcAnalysisValue(fieldGroup.value)
-}
-// 天平监听
-const listenDeviceData = () => {
-  //监听websocket返回来的数据
-  //设备数据
-  uni.$on('deviceData', res => {
-    switch (res.deviceType) {
-      case 'balance':
-        if (currentAuncel.value.id === res.deviceId) {
-          currentAuncel.value.weightData = res.weightData
-          currentAuncel.value.weightUnit = res.weightUnit
-          currentAuncel.value.weightStable = res.weightStable
-          currentAuncel.value.isConnected = true
-          if (Number(res.weightData) === 0) {
-            weightDataIsToZero.value = true
-          }
-        }
-        break
-      default:
-        break
-    }
-  })
-  //设备状态
-  uni.$on('deviceStatus', res => {
-    if (currentAuncel.value.id === res.deviceId) {
-      if (res.connected === 0) {
-        currentAuncel.value.weightStable = 0
-        currentAuncel.value.weightData = '天平断开'
-        currentAuncel.value.weightUnit = ''
-      }
-    }
-    currentAuncel.value.isConnected = res.connected
-  })
-  //控制设备状态
-  uni.$on('controlDevice', res => {
-    if (currentAuncel.value.id === res.deviceId && !res.isControl) {
-      currentAuncel.value.id = ''
-      currentAuncel.value.name = ''
-      currentAuncel.value.code = ''
-      currentAuncel.value.weightStable = 0
-      currentAuncel.value.weightData = '请选天平'
-      currentAuncel.value.weightUnit = ''
-    }
-  })
-  //连接断开
-  uni.$on('connClose', res => {
-    //重置
-    currentAuncel.value.weightData = ''
-    currentAuncel.value.weightUnit = ''
-    currentAuncel.value.weightStable = 0
-    currentAuncel.value.controlUserName = ''
-    currentAuncel.value.isConnected = false
-  })
-}
-const closeDeviceListener = () => {
-  uni.$off('deviceData')
-  uni.$off('deviceStatus')
-  uni.$off('controlDevice')
-  uni.$off('connClose')
-}
-const loadDevice = () => {
-  //注册websocket
-  let regData = {
-    msgId: nx.$helper.uuid(),
-    cmd: 'register',
-    clientType: 'caaClient',
-    data: {
-      userId: userInfo.value.id,
-      tenantId: getTenantId(),
-      userRealName: userInfo.value.realname
-    }
-  }
-  nx.$measure.setRegData(JSON.stringify(regData))
-  nx.$measure.open()
-}
-
-// 键盘监听
-const listenNumKeyboard = () => {
-  //键盘监听
-  uni.$on('keyboardOK', res => {
-    if (res === null) {
-      clearFieldVal()
-      return
-    }
-    //自动补全小数位数
-    const decimalPosition = selectedField.value.decimalPosition
-    const isProject = selectedField.value.type === 'project'
-    let val = res.val
-    const symbol = res.symbol
-    if (decimalPosition == null) {
-      selectedField.value.value = val
-    } else {
-      selectedField.value.value = handleRoundFiveNumber(val, decimalPosition, isProject)
-    }
-    if (symbol) {
-      selectedField.value.symbol = symbol
-    }
-    syncFieldValueByEqualParamNo()
-    calcAnalysisValue(fieldGroup.value, dynamicFormData, taskIngredientsWay.value)
-    //自动跳转下一个字段
-    setTimeout(() => {
-      autoNextField()
-    }, 60)
-  })
-}
-// 查找paramNo相同的列，并且类型相同，使其值同步
-function syncFieldValueByEqualParamNo() {
-  for (const group of fieldGroup.value) {
-    group.fields.forEach(field => {
-      if (field.paramNo === selectedField.value.paramNo && field.type === selectedField.value.type) {
-        field.value = selectedField.value.value
-      }
-    })
-  }
-}
-const clearFieldVal = () => {
-  uni.showModal({
-    title: '提示',
-    content: '清空当前字段的值，是否继续？',
-    cancelColor: '#0055A2',
-    confirmColor: '#0055A2',
-    success: res => {
-      if (res.cancel) {
-        return
-      }
-      selectedField.value.value = ''
-      //重新计算
-      calcAnalysisValue(fieldGroup.value, dynamicFormData, taskIngredientsWay.value)
-    }
-  })
-}
-const closeNumKeyBoardListener = () => {
-  uni.$off('keyboardOK')
-}
-
-const closeDeviceLink = () => {
-  const deviceId = currentAuncel.value.id
-  releaseDeviceControl(deviceId)
-}
-
-//释放设备控制
-const releaseDeviceControl = deviceId => {
-  if (!deviceId || deviceId === '') return
-  let controlDevice = {
-    msgId: deviceId,
-    cmd: 'controlDevice',
-    clientType: 'caaClient',
-    data: {
-      deviceId: deviceId,
-      isControl: false,
-      controlRealName: userInfo.value.nickname,
-      controlUserId: userInfo.value.id
-    }
-  }
-  //发送控制数据
-  nx.$measure.send(JSON.stringify(controlDevice))
-}
-
-// 天平选择
-const selectAuncel = () => {
-  showAuncelSelector.value = true
-}
-// 天平选择回调
-const auncelDoSelect = res => {
-  const data = res.data
-  if (data) {
-    currentAuncel.value.id = data.deviceId
-    currentAuncel.value.name = data.deviceName
-    currentAuncel.value.code = data.deviceCode
-  }
-}
-
-//提交任务单
-const submitTask = () => {
-  if (checkSampleReturning()) return
-  const url = `/pages/analysis/sample/pdf-preview?businessAssayTaskId=${taskId.value}&reportKey=${configReportTemplateKey.value}&showConfirmBtn=true`
-  uni.navigateTo({ url })
-}
-// 自动配料
-function handleIngredients() {
-  if (checkSampleReturning()) return
-  const params = {
-    businessAssayTaskId: taskId.value
-  }
-  nx.$api.assayTask.taskIngredients(params).then(res => {
-    getSampleAnalysisByTaskId()
-  })
-}
-// 人工配料
-function handleManualIngredients() {
-  const params = {
-    businessAssayTaskId: taskId.value
-  }
-  nx.$api.assayTask.manualIngredients(params).then(res => {
-    getSampleAnalysisByTaskId()
-  })
-}
-//
-function checkSampleReturning() {
-  const analysisSampleData = assayGroups.value.find(t => t.value == 'analysis').tableData
-  const hasReturning = analysisSampleData.some(item => item.rollbackStatus === 'in_progress')
-  if (hasReturning) {
-    nx.$helper.showToast('该任务单存在退回中的样品')
-    return true
-  }
-  return false
-}
-// 生命周期
-const { lockOrientation } = useScreenOrientation()
-
-onLoad(param => {
-  lockOrientation('landscape')
-  if (param.currentTaskId) {
-    taskId.value = param.currentTaskId
-    configReportTemplateKey.value = param.configReportTemplateKey
-    getSampleAnalysisByTaskId()
-  }
-  loadFieldApiData(fieldGroup.value)
-  listenNumKeyboard()
-})
-
-onShow(() => {
-  loadDevice()
-  // listenDeviceData()
-})
-
-onHide(() => {
-  closeDeviceListener()
-})
-
-onUnload(() => {
-  closeDeviceLink()
-  closeDeviceListener()
-  closeNumKeyBoardListener()
-})
-
-onBackPress(() => {
-  customBack()
-  return true
-})
-</script>
-
-<style lang="scss" scoped>
-/* 原始样式保留不变 */
-.navbar-right {
-  font-size: 16px;
-  color: #fff;
-  display: flex;
-}
-.content-title-name {
-  font-size: 22px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-}
-.content-tabs {
-  height: 100%;
-  :deep(.u-tabs__wrapper) {
-    height: 100%;
-  }
-}
-.current-sample-code {
-  font-weight: bold;
-  margin-right: 20px;
-}
-:deep(.u-dropdown) {
-  height: 100%;
-  .u-dropdown__menu {
-    height: 60px !important;
-    .u-dropdown__menu__item__text {
-      font-size: 18px !important;
-    }
-  }
-}
-.form-item-my {
-  display: flex;
-  align-items: center;
-  min-height: 35px;
-  font-size: 16px;
-  border-bottom: 1px solid #dcdcdc;
-}
-.selected-field {
-  background-color: #bada55;
-}
-.disabled-field {
-  background-color: #eee;
-}
-.flex-column {
-  display: flex;
-  flex-direction: column;
-  align-items: start;
-  padding: 4px;
-}
-.label-my {
-  flex: 5;
-}
-
-.label-high-light {
-  color: #000;
-  font-weight: 600;
-  font-size: 1.2em;
-}
-
-.field-high-light {
-  color: #000;
-  font-weight: 600;
-  font-size: 1.2em;
-}
-
-.label-my sub {
-  font-size: 0.6em;
-  vertical-align: sub;
-}
-
-.content-my {
-  flex: 2;
-  text-align: right;
-  padding-right: 4px;
-  .select-my {
-    color: #303133;
-    font-size: 15px;
-    padding: 6px 8px;
-    border: 1px solid #dcdcdc;
-    border-radius: 5px;
-  }
-}
-
-.content-my-text-value {
-  color: rgb(48, 49, 51);
-}
-.content-my-text-placeholder {
-  color: #c0c4cc;
-}
-.content-left-scroll {
-  height: 75vh;
-}
-.content-right-scroll {
-  height: 74vh;
-}
-.valid-warning {
-  color: orange;
-}
-.valid-error {
-  color: red;
-}
-
-.u-tab-item {
-  display: flex;
-  align-items: center;
-  font-size: 16px;
-  color: #444;
-  padding: 8px 16px;
-  box-sizing: border-box;
-  border-bottom: 2px dotted #444;
-}
-
-.u-tab-item-active {
-  color: #0055a2;
-  font-weight: 600;
-}
-.u-tab-item-disabled {
-  background-color: #ddd;
-  pointer-events: none;
-  opacity: 0.6;
-}
-
-.btn-operation {
-  width: 80%;
-  font-size: 18px;
-  margin-top: 10px;
-}
-
-.auncel {
-  width: 90%;
-  height: 55vh;
-  background-image: url(/static/images/auncel.png);
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  background-position: center;
-  display: flex;
-  flex-direction: column;
-  position: relative;
-  .code {
-    position: absolute;
-    font-style: 18px;
-    top: 25px;
-    left: 70px;
-  }
-}
-
-.auncel-title {
-  flex: 3;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  font-size: 32px;
-}
-
-.auncel-weight {
-  flex: 2.5;
-  display: flex;
-  align-items: center;
-  padding-bottom: 20px;
-  box-sizing: border-box;
-  position: relative;
-}
-
-.weight {
-  font-size: 42px;
-  width: 100%;
-  padding-right: 80px;
-  line-height: 1;
-}
-
-.weight-data {
-  color: #4cd964;
-  font-family: zzjc-lcd;
-}
-
-.weight-data-yellow {
-  color: #ffff00;
-  font-family: zzjc-lcd;
-}
-
-.weight-data-warning {
-  color: #ff3333;
-  font-family: zzjc-lcd;
-}
-
-.weight-unit {
-  position: absolute;
-  right: 30px;
-  color: #ffffff;
-  font-size: 32px;
-}
-@media (max-width: 700px) {
-  .auncel {
-    height: 45vh;
-  }
-  .auncel-title {
-    font-size: 20px;
-  }
-  .auncel-weight {
-    padding-bottom: 15px;
-  }
-  .weight {
-    font-size: 26px;
-  }
-  .weight-unit {
-    font-size: 20px;
-  }
-}
-
-.field-name {
-  font-size: 26px;
-  padding: 16px;
-  width: 100%;
-}
-
-.my-collapse {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 5px 10px 5px 0;
-  .title {
-    font-weight: bold;
-  }
-}
-.content {
-  overflow: hidden;
-  padding-right: 10px;
-  transition: height 100ms;
-}
-
-@media (max-width: 700px) {
-  .content-left-scroll {
-    height: 45vh;
-  }
-  .content-right-scroll {
-    height: 55vh;
-  }
-  .field-name {
-    font-size: 16px;
-    width: 100%;
-  }
-}
-</style>
diff --git a/pages/device/calibrationList/calibration.api.js b/pages/device/calibrationList/calibration.api.js
index 357826f..924a5b9 100644
--- a/pages/device/calibrationList/calibration.api.js
+++ b/pages/device/calibrationList/calibration.api.js
@@ -2,7 +2,7 @@ import request from '@/nx/request'
 
 export function list(params) {
   return request({
-    url: '/lims/bus/deviceBusCalibration/queryPageList',
+    url: '/qms/device-calibration/page',
     method: 'GET',
     params
   })
diff --git a/pages/device/deviceBusInfo/baseInfo.vue b/pages/device/deviceBusInfo/baseInfo.vue
index 0ae952a..3da4748 100644
--- a/pages/device/deviceBusInfo/baseInfo.vue
+++ b/pages/device/deviceBusInfo/baseInfo.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="container">
     <up-sticky>
-      <navbar-back :title="`（${deviceText}）设备信息`"></navbar-back>
+      <navbar-back :title="`（${deviceText}）设备信息`" titleWidth="800"></navbar-back>
     </up-sticky>
     <up-tabs lineWidth="30" :list="tabs" @click="tabClick"></up-tabs>
     <scroll-view scroll-y="true" class="content">
@@ -77,7 +77,7 @@ function tabClick(e) {
   background-color: #f0f2f5;
   height: 100%;
   .content {
-    height: 75vh;
+    // height: 75vh;
   }
 }
 :deep(.u-tabs__wrapper__nav__item__text) {
diff --git a/pages/device/deviceBusInfo/deviceBusInfo.data.js b/pages/device/deviceBusInfo/deviceBusInfo.data.js
index a2c5eb0..4b524f4 100644
--- a/pages/device/deviceBusInfo/deviceBusInfo.data.js
+++ b/pages/device/deviceBusInfo/deviceBusInfo.data.js
@@ -4,14 +4,12 @@ export function getColumn(isFold) {
     {
       label: '设备名称',
       name: 'deviceName',
-      width: isFold ? 200 : 130,
-      fixed: true
+      width: isFold ? 200 : 130
     },
     {
       label: '别名',
       name: 'alias',
-      width: isFold ? 120 : 90,
-      fixed: true
+      width: isFold ? 120 : 90
     },
     {
       label: '设备状态',
@@ -27,17 +25,17 @@ export function getColumn(isFold) {
     {
       label: '规格型号',
       name: 'modelNo',
-      width: isFold ? 160 : 130
+      width: isFold ? 180 : 150
     },
     {
       label: '使用班组',
       name: 'deptName',
-      width: isFold ? 140 : 100
+      width: isFold ? 180 : 150
     },
     {
       label: '负责人',
       name: 'managerUserName',
-      width: isFold ? 100 : 90
+      width: isFold ? 150 : 120
     },
     {
       name: 'operation',
diff --git a/pages/device/deviceBusInfo/index.vue b/pages/device/deviceBusInfo/index.vue
index e36f605..b253949 100644
--- a/pages/device/deviceBusInfo/index.vue
+++ b/pages/device/deviceBusInfo/index.vue
@@ -1,60 +1,47 @@
 <template>
+  <navbar-back title="设备查询" />
   <view class="container">
-    <up-sticky>
-      <navbar-back title="设备查询" />
-    </up-sticky>
-    <view class="content">
-      <up-transition :show="!isFold" mode="slide-left">
-        <view class="con-left" v-show="!isFold">
-          <uni-card style="height: 100%; overflow: auto" title="分类和产品" padding="0" margin="0" spacing="0">
-            <DaTree
-              ref="DaTreeRef"
-              :data="roomTreeData"
-              labelField="name"
-              valueField="id"
-              appendField="modelNo"
-              :indent="10"
-              @change="handleTreeChange"
-            ></DaTree>
-          </uni-card>
-        </view>
-      </up-transition>
-      <view class="con-right">
-        <uni-card padding="0" margin="10">
-          <view class="p10 x-f" style="width: 60%">
-            <image
-              class="mr15"
-              style="width: 30px; height: 30px"
-              :src="`/static/images/${isFold ? 'zhedie2' : 'zhedie1'}.png`"
-              @click="isFold = !isFold"
-            ></image>
-            <up-search
-              v-model="keyword"
-              shape="square"
-              placeholder="请输入设备名称或者扫描设备二维码码查询"
-              actionText="重置"
-              :clearabled="false"
-              :showAction="true"
-              @change="handleInputSearch"
-              @custom="handleReset"
-            ></up-search>
-          </view>
-          <view style="height: 73vh; width: 100%">
-            <zb-table
-              ref="zbTableRef"
-              isShowLoadMore
-              stripe
-              :fit="false"
-              :columns="column"
-              :cellStyle="setCellStyle"
-              :cellHeaderStyle="setCellHeaderStyle"
-              :data="listData"
-              @detail="handleDetail"
-              @pullUpLoading="pullUpLoadingAction"
-            ></zb-table>
-          </view>
-        </uni-card>
+    <up-transition :show="!isFold" mode="slide-left">
+      <view class="con-left" v-show="!isFold">
+        <view class="border-b p8 pl16 font-bold"> 分类和产品 </view>
+        <DaTree
+          style="height: 95%"
+          ref="DaTreeRef"
+          :data="roomTreeData"
+          labelField="name"
+          valueField="id"
+          appendField="modelNo"
+          :indent="10"
+          @change="handleTreeChange"
+        ></DaTree>
       </view>
+    </up-transition>
+    <view class="con-right">
+      <view class="p10 x-f" style="width: 60%">
+        <image
+          class="mr15"
+          style="width: 30px; height: 30px"
+          :src="`/static/images/${isFold ? 'zhedie2' : 'zhedie1'}.png`"
+          @click="isFold = !isFold"
+        ></image>
+        <up-input v-model="keyword" placeholder="请输入设备名称或者扫描设备二维码码查询" @change="handleInputSearch"
+          ><template #suffix> <up-icon name="scan" size="30" @click="handleScan"></up-icon> </template
+        ></up-input>
+        <up-button class="ml10" style="width: 50px; height: 35px" type="primary" @click="handleReset">重置</up-button>
+      </view>
+      <zb-table
+        style="height: 90%"
+        ref="zbTableRef"
+        isShowLoadMore
+        stripe
+        :fit="false"
+        :columns="column"
+        :cellStyle="setCellStyle"
+        :cellHeaderStyle="setCellHeaderStyle"
+        :data="listData"
+        @detail="handleDetail"
+        @pullUpLoading="pullUpLoadingAction"
+      ></zb-table>
     </view>
   </view>
 </template>
@@ -75,28 +62,39 @@ const column = computed(() => getColumn(isFold.value))
 const isFold = ref(false)
 const roomTreeData = ref([])
 
-const { scanQRInfo } = toRefs(nx.$store('biz'))
-watch(scanQRInfo, newVal => {
-  if (newVal && nx.$router.getCurrentPage().route == 'pages/device/deviceBusInfo/index') {
-    try {
-      const codeObj = JSON.parse(newVal)
+function handleScan() {
+  uni.scanCode({
+    onlyFromCamera: true,
+    success: function (res) {
+      const codeObj = JSON.parse(res.result)
       handleDetail({ id: codeObj.id })
-      scanQRInfo.value = ''
-    } catch (error) {
-      scanQRInfo.value = ''
-      uni.showToast({
-        title: '请扫描设备码',
-        icon: 'none'
-      })
     }
-  }
-})
-onShow(() => {
-  scanQRInfo.value = ''
-})
+  })
+}
+// const { scanQRInfo } = toRefs(nx.$store('biz'))
+// watch(scanQRInfo, newVal => {
+//   if (newVal && nx.$router.getCurrentPage().route == 'pages/device/deviceBusInfo/index') {
+//     try {
+//       const codeObj = JSON.parse(newVal)
+//       handleDetail({ id: codeObj.id })
+//       scanQRInfo.value = ''
+//     } catch (error) {
+//       scanQRInfo.value = ''
+//       uni.showToast({
+//         title: '请扫描设备码',
+//         icon: 'none'
+//       })
+//     }
+//   }
+// })
+// onShow(() => {
+//   scanQRInfo.value = ''
+// })
 async function getTreeData() {
   const res = await treeData()
-  roomTreeData.value = res
+  console.log(res)
+
+  roomTreeData.value = nx.$helper.handleTree([...res])
 }
 getTreeData()
 const { lockOrientation } = useScreenOrientation()
@@ -180,25 +178,26 @@ async function handleDetail(row, index) {
 </script>
 
 <style lang="scss" scoped>
-.u-sticky {
-  top: 0 !important;
-}
 .container {
   background-color: #f0f2f5;
-  height: 100%;
-  .content {
-    display: flex;
-    .con-left {
-      height: 83vh;
-      overflow: scroll;
-      margin-top: 10px;
-      margin-left: 10px;
-      flex: 2;
-    }
-    .con-right {
-      flex: 8;
-      overflow: auto;
-    }
+  height: calc(100vh - 77px);
+  display: flex;
+  padding: 10px;
+  box-sizing: border-box;
+  .con-left,
+  .con-right {
+    background-color: #fff;
+    box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 3px 1px;
+    height: 100%;
+    border-radius: 5px;
+  }
+  .con-left {
+    padding-left: 8px;
+    margin-right: 10px;
+    flex: 2;
+  }
+  .con-right {
+    flex: 8;
   }
 }
 :deep(.zb-table uni-button[type='primary']) {
diff --git a/pages/device/deviceBusUseRecord/SampleSelectPopup.vue b/pages/device/deviceBusUseRecord/SampleSelectPopup.vue
new file mode 100644
index 0000000..8c48b70
--- /dev/null
+++ b/pages/device/deviceBusUseRecord/SampleSelectPopup.vue
@@ -0,0 +1,96 @@
+<template>
+  <view>
+    <up-popup :show="addConfigShow" round="10" @close="addConfigShow = false">
+      <view class="text-center">样品选择</view>
+      <view class="x-bc mt8">
+        <up-button size="small" style="width: 60px" text="取消" @click="handleCancel"></up-button>
+        <up-button size="small" style="width: 60px" type="primary" text="确认" @click="handleAdd"></up-button>
+      </view>
+      <scroll-view style="height: 60vh" scroll-y scroll-with-animation class="mt16 pl16">
+        <template v-if="taskList.length > 0">
+          <up-radio-group v-model="selectRowId" placement="column">
+            <view v-for="(task, index) in taskList">
+              <up-radio :name="task.id">
+                <template #label>
+                  <view
+                    class="x-f pb4 pl8 border-b full-width"
+                    :class="{ active: current === index }"
+                    @click="current = index"
+                  >
+                    <view class="fs20">{{ task.taskNo }}</view>
+                    <view class="pl16 pr16">{{ task.taskName }}{{ task.assayOper }}</view>
+                    <view class="x-f">
+                      <u-icon name="clock"></u-icon>
+                      <text class="ml5">{{ nx.$helper.formateToDateTime(task.taskAssignTime) }}</text>
+                    </view>
+                  </view>
+                </template>
+              </up-radio>
+            </view>
+          </up-radio-group>
+        </template>
+        <up-empty v-else text="暂无数据" mode="list"> </up-empty>
+      </scroll-view>
+    </up-popup>
+  </view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+
+import nx from '@/nx'
+
+let emits = defineEmits(['confirm'])
+const addConfigShow = ref(false)
+function show() {
+  addConfigShow.value = true
+  selectRowId.value = undefined
+  current.value = undefined
+  getAssayTaskList()
+}
+const userInfo = computed(() => nx.$store('user').userInfo)
+const taskList = ref([])
+const current = ref(undefined)
+const getAssayTaskList = async () => {
+  const param = {
+    taskAssignStatus: 'submitted',
+    taskAssayStatusList: ['not_start', 'saved'],
+    assayOperator: userInfo.value.nickname
+  }
+  const res = await nx.$api.assayTask.getAssayTaskList(param)
+  taskList.value = res
+}
+function handleCancel() {
+  addConfigShow.value = false
+}
+const selectRowId = ref(undefined)
+function handleAdd() {
+  if (!selectRowId.value) {
+    return uni.showToast({
+      title: '请选择任务单',
+      icon: 'none'
+    })
+  }
+  let sampleList = []
+  nx.$api.assayTask.getAssayTaskDetailList({ businessAssayTaskId: selectRowId.value }).then(res => {
+    const list = res || []
+    sampleList = list
+    emits('confirm', sampleList)
+    addConfigShow.value = false
+  })
+}
+
+defineExpose({
+  show
+})
+</script>
+
+<style lang="scss" scoped>
+:deep(.u-radio__label-wrap) {
+  width: 100%;
+}
+.active {
+  color: #0055a2;
+  font-weight: 500;
+}
+</style>
diff --git a/pages/device/deviceBusUseRecord/StandardSelectPopup.vue b/pages/device/deviceBusUseRecord/StandardSelectPopup.vue
new file mode 100644
index 0000000..0223f03
--- /dev/null
+++ b/pages/device/deviceBusUseRecord/StandardSelectPopup.vue
@@ -0,0 +1,80 @@
+<template>
+  <view>
+    <up-popup :show="addConfigShow" round="10" @close="addConfigShow = false">
+      <view class="text-center">标准物质选择</view>
+      <view class="x-bc mt8">
+        <up-button size="small" style="width: 60px" text="取消" @click="handleCancel"></up-button>
+        <up-button size="small" style="width: 60px" type="primary" text="确认" @click="handleAdd"></up-button>
+      </view>
+      <scroll-view style="height: 60vh" scroll-y scroll-with-animation class="mt16 pl16">
+        <template v-if="standardList.length > 0">
+          <u-checkbox-group placement="column" v-model="selectRows">
+            <view v-for="(item, index) in standardList">
+              <u-checkbox :name="item.id">
+                <template #label>
+                  <view class="x-f p8 border-b">
+                    <view>{{ item.name }}</view>
+                    <view class="pl16 pr16">{{ item.code }}</view>
+                    <view class="pl16 pr16">{{ item.modelNo }}</view>
+                  </view>
+                </template>
+              </u-checkbox>
+            </view>
+          </u-checkbox-group>
+        </template>
+        <up-empty v-else text="暂无数据" mode="list"> </up-empty>
+      </scroll-view>
+    </up-popup>
+  </view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+import nx from '@/nx'
+
+let emits = defineEmits(['confirm'])
+const addConfigShow = ref(false)
+function show() {
+  addConfigShow.value = true
+  selectRows.value = []
+  current.value = undefined
+  getList()
+}
+const standardList = ref([])
+const current = ref(undefined)
+const getList = async () => {
+  standardList.value = []
+  const param = {
+    standardMaterialFlag: 1,
+    pageNo: 1,
+    pageSize: 1000
+  }
+  const { list } = await nx.$api.material.queryMaterialInformation(param)
+  standardList.value = list
+}
+function handleCancel() {
+  addConfigShow.value = false
+}
+const selectRows = ref([])
+function handleAdd() {
+  if (selectRows.value.length === 0) {
+    return uni.showToast({
+      title: '请选择标准物质',
+      icon: 'none'
+    })
+  }
+  let list = standardList.value.filter(item => selectRows.value.includes(item.id))
+  emits('confirm', list)
+  addConfigShow.value = false
+}
+
+defineExpose({
+  show
+})
+</script>
+
+<style lang="scss" scoped>
+:deep(.u-checkbox__label-wrap) {
+  width: 100%;
+}
+</style>
diff --git a/pages/device/deviceBusUseRecord/detail.vue b/pages/device/deviceBusUseRecord/detail.vue
index 3763137..f68e08a 100644
--- a/pages/device/deviceBusUseRecord/detail.vue
+++ b/pages/device/deviceBusUseRecord/detail.vue
@@ -9,7 +9,7 @@
         </up-col>
         <up-col span="6"
           >开始时间：
-          <text class="value">{{ detailInfo.useTimeStart }}</text>
+          <text class="value">{{ nx.$helper.formateToDateTime(detailInfo.useTimeStart) }}</text>
         </up-col>
       </up-row>
       <up-row>
@@ -19,7 +19,7 @@
         </up-col>
         <up-col span="6"
           >结束时间：
-          <text class="value">{{ detailInfo.useTimeEnd }}</text>
+          <text class="value">{{ nx.$helper.formateToDateTime(detailInfo.useTimeEnd) }}</text>
         </up-col>
       </up-row>
       <up-row>
@@ -42,16 +42,19 @@
           <text class="value">{{ detailInfo.humidity }}</text>
         </up-col>
         <up-col span="6"
-          >样品类别/个数/任务：
-          <text class="value">{{ detailInfo.useRemark }}</text>
+          >检测项目：
+          <text class="value">{{ detailInfo.useItem }}</text>
         </up-col>
       </up-row>
+      <u-table2 class="mt8" height="300px" :data="tableData" :columns="columns" stripe border> </u-table2>
     </scroll-view>
   </up-popup>
 </template>
 
 <script setup>
 import { ref, reactive, onMounted, watch, computed } from 'vue'
+import nx from '@/nx'
+import { getDetailList } from './useRecord.api'
 
 const props = defineProps({
   show: {
@@ -77,8 +80,18 @@ function handleClose() {
   emit('close')
 }
 
+const columns = ref([
+  { title: '样品名称', key: 'sampleName', align: 'center' },
+  { title: '样品编号', key: 'sampleCode', align: 'center' }
+])
+const tableData = ref([])
+async function getUseRecordDetailList(id) {
+  const res = await getDetailList({ parentId: id })
+  tableData.value = res
+}
 function handleOpen() {
   detailInfo.value = props.checkInfo
+  getUseRecordDetailList(props.checkInfo.id)
 }
 </script>
 
@@ -101,4 +114,7 @@ function handleOpen() {
 :deep(.uicon-close) {
   font-size: 22px !important;
 }
+:deep(.u-popup__content__close--top-right) {
+  top: 30px;
+}
 </style>
diff --git a/pages/device/deviceBusUseRecord/index.vue b/pages/device/deviceBusUseRecord/index.vue
index 8ea55d3..589904a 100644
--- a/pages/device/deviceBusUseRecord/index.vue
+++ b/pages/device/deviceBusUseRecord/index.vue
@@ -14,7 +14,12 @@
       </navbar-back>
     </up-sticky>
     <view class="container">
-      <n-scanTemp v-if="!detailInfo.id" title="请扫描设备条码进行设备使用" @deviceId="id => handleTestAction(id)" />
+      <n-scanTemp
+        v-if="!detailInfo.id"
+        title="请扫描设备条码进行设备使用"
+        @deviceId="id => handleTestAction(id)"
+        @scanResult="result => handleScanResult(result)"
+      />
       <view v-else class="content">
         <view>
           <uni-section titleFontSize="20px" type="line" title="设备信息"> </uni-section>
@@ -51,28 +56,49 @@
               <up-input v-model="formData.humidity"></up-input>
             </up-col>
             <up-col span="3.5">
-              <view class="p5">样品类别/个数/任务：</view>
-              <up-input v-model="formData.useRemark"></up-input>
-            </up-col>
-          </up-row>
-          <up-row justify="space-around">
-            <up-col span="11.5">
-              <view class="p5">{{ useIng ? '结束使用人' : '开始使用人' }}：</view>
-              <up-input v-if="useIng" v-model="formData.userNameEnd"></up-input>
-              <up-input v-else v-model="formData.userName"></up-input>
+              <view class="p5">检测项目：</view>
+              <up-input v-model="formData.useItem"></up-input>
             </up-col>
           </up-row>
           <up-row justify="space-around">
             <up-col span="11.5">
               <view class="p5">备注：</view>
-              <up-textarea v-model="formData.remark" placeholder="请输入内容" autoHeight></up-textarea>
+              <up-input v-model="formData.remark" placeholder="请输入内容"></up-input>
             </up-col>
           </up-row>
         </view>
-
+        <view class="x-f mt8">
+          <up-button
+            size="small"
+            type="primary"
+            style="width: 100px"
+            text="选择样品"
+            @click="handleSelect('sample')"
+          ></up-button>
+          <up-button
+            size="small"
+            style="width: 100px"
+            type="primary"
+            text="选择标准物质"
+            @click="handleSelect('standard')"
+          ></up-button>
+        </view>
+        <u-table2 class="mt8" height="240px" :data="tableData" :columns="columns" stripe border>
+          <template #cell="{ row, column }">
+            <up-button
+              v-if="column.key === 'action'"
+              size="mini"
+              plain
+              style="width: 50%"
+              type="error"
+              text="移除"
+              @click="handleDelete(row)"
+            ></up-button>
+          </template>
+        </u-table2>
         <up-button
           style="width: 90%"
-          class="mt40"
+          class="mt20"
           loadingText="提交中..."
           type="primary"
           :text="useIng ? '结束使用' : '开始使用'"
@@ -91,6 +117,9 @@
       @cancel="modalShow = false"
     ></up-modal>
     <up-loading-page :loading="pageLoading"></up-loading-page>
+
+    <SampleSelectPopup ref="sampleSelectPopupRef" @confirm="list => handleSampleSelect(list, 'sample')" />
+    <StandardSelectPopup ref="standardSelectPopupRef" @confirm="list => handleSampleSelect(list, 'standard')" />
   </view>
 </template>
 
@@ -98,10 +127,12 @@
 import { ref, reactive, onMounted, onUnmounted, watch, toRefs } from 'vue'
 import { onShow, onLoad } from '@dcloudio/uni-app'
 import { getDeviceBusInfoById } from '@/nx/api/deviceInfo'
-import { getUseRecordById, addUseRecord, editUseRecord } from './useRecord.api'
+import { getUseRecordById, addUseRecord, editUseRecord, getDetailList } from './useRecord.api'
 import dailyCheckApi from '@/nx/api/dailyCheck'
 import { useScreenOrientation } from '@/nx/hooks/useScreenOrientation'
 import { useGridCol } from '@/nx/hooks/useGridCol'
+import SampleSelectPopup from './SampleSelectPopup.vue'
+import StandardSelectPopup from './StandardSelectPopup.vue'
 import nx from '@/nx'
 
 const { gridCol } = useGridCol([700], [6, 4])
@@ -116,53 +147,116 @@ const detailSchema = [
   { label: '设备编码', value: 'deviceCode' },
   { label: '使用班组', value: 'deptName' }
 ]
+const columns = ref([
+  { title: '样品名称', key: 'sampleName', align: 'center' },
+  { title: '样品编号', key: 'sampleCode', align: 'center' },
+  { title: '操作', key: 'action', width: '100px', align: 'center' }
+])
+const tableData = ref([])
+
+const sampleSelectPopupRef = ref()
+const standardSelectPopupRef = ref()
+function handleSelect(type) {
+  if (type === 'sample') {
+    sampleSelectPopupRef.value.show()
+  } else {
+    standardSelectPopupRef.value.show()
+  }
+}
+function handleSampleSelect(dataList, type) {
+  const transformData = newData => {
+    if (type === 'sample') {
+      return {
+        id: newData.id,
+        detailType: 'sample',
+        sampleCode: newData.sampleCode,
+        sampleName: newData.sampleName,
+        taskNo: newData.taskNo,
+        taskId: newData.businessAssayTaskId
+      }
+    } else {
+      return {
+        id: newData.id,
+        detailType: 'standard',
+        sampleCode: newData.code,
+        sampleName: newData.name
+      }
+    }
+  }
+
+  for (const newData of dataList) {
+    const index = tableData.value.findIndex(item => item.id === newData.id)
+    const transformedItem = transformData(newData)
+
+    if (index > -1) {
+      // 找到匹配的项，直接替换
+      tableData.value[index] = transformedItem
+    } else {
+      // 没有找到匹配的项，添加到末尾
+      tableData.value.push(transformedItem)
+    }
+  }
+}
+
+function handleDelete(row) {
+  tableData.value = tableData.value.filter(item => item.id !== row.id)
+}
 const pageLoading = ref(false)
 const userId = nx.$store('user').userInfo['id']
 const userName = nx.$store('user').userInfo['realname']
 let detailInfo = ref({})
 
-const { scanQRInfo } = toRefs(nx.$store('biz'))
-watch(scanQRInfo, newVal => {
-  if (newVal && nx.$router.getCurrentPage().route == 'pages/device/deviceBusUseRecord/index') {
-    try {
-      const codeObj = JSON.parse(newVal)
-      if (!pageLoading.value) {
-        getLastDailyCheckOfToday(codeObj.id)
-      }
-      scanQRInfo.value = ''
-    } catch (error) {
-      scanQRInfo.value = ''
-      uni.showToast({
-        title: '请扫描设备码',
-        icon: 'none'
-      })
-    }
-  }
-})
-onShow(() => {
-  scanQRInfo.value = ''
-})
+// const { scanQRInfo } = toRefs(nx.$store('biz'))
+// watch(scanQRInfo, newVal => {
+//   if (newVal && nx.$router.getCurrentPage().route == 'pages/device/deviceBusUseRecord/index') {
+//     try {
+//       const codeObj = JSON.parse(newVal)
+//       if (!pageLoading.value) {
+//         getLastDailyCheckOfToday(codeObj.id)
+//       }
+//       scanQRInfo.value = ''
+//     } catch (error) {
+//       scanQRInfo.value = ''
+//       uni.showToast({
+//         title: '请扫描设备码',
+//         icon: 'none'
+//       })
+//     }
+//   }
+// })
+// onShow(() => {
+//   scanQRInfo.value = ''
+// })
 
+function handleScanResult(result) {
+  const codeObj = JSON.parse(result)
+  if (!pageLoading.value) {
+    getLastDailyCheckOfToday(codeObj.id)
+  }
+}
 // 检查该设备在使用前是否已经点检过
-function getLastDailyCheckOfToday(id) {
+async function getLastDailyCheckOfToday(id) {
   pageLoading.value = true
   try {
-    dailyCheckApi.getLastDailyCheckOfToday({ deviceId: id }).then(async res => {
-      if (!res || res.submitFlag == '0') {
-        setTimeout(() => {
-          uni.showToast({
-            title: '设备使用前请先进行设备点检',
-            icon: 'none'
-          })
-        }, 100)
-        pageLoading.value = false
-        nx.$router.go('/pages/device/deviceBusDailyCheck/index', { deviceId: id })
-      } else {
-        getDeviceInfo(id)
-        await getUseIngRecord(id)
-        pageLoading.value = false
-      }
-    })
+    // dailyCheckApi.getLastDailyCheckOfToday({ deviceId: id }).then(async res => {
+    //   if (!res || res.submitFlag == '0') {
+    //     setTimeout(() => {
+    //       uni.showToast({
+    //         title: '设备使用前请先进行设备点检',
+    //         icon: 'none'
+    //       })
+    //     }, 100)
+    //     pageLoading.value = false
+    //     nx.$router.go('/pages/device/deviceBusDailyCheck/index', { deviceId: id })
+    //   } else {
+    //     getDeviceInfo(id)
+    //     await getUseIngRecord(id)
+    //     pageLoading.value = false
+    //   }
+    // })
+    getDeviceInfo(id)
+    await getUseIngRecord(id)
+    pageLoading.value = false
   } catch (error) {
     pageLoading.value = false
   }
@@ -186,11 +280,17 @@ async function getUseIngRecord(id) {
     formData.value = res
     formData.value.userIdEnd = userId
     formData.value.userNameEnd = userName
+    getUseRecordDetailList(res.id)
+
     // checkUseStatusIsMySelf(res)
   } else {
     useIng.value = false
   }
 }
+async function getUseRecordDetailList(id) {
+  const res = await getDetailList({ parentId: id })
+  tableData.value = res
+}
 // 定义一个变量，用于标记当前是否有 modal 正在显示
 let isModalShowing = false
 // 如果设备在使用中，检查设备使用记录是否是所登录用户的
@@ -217,8 +317,6 @@ function checkUseStatusIsMySelf(useInfo) {
 }
 
 let formData = ref({
-  userName,
-  userId,
   stateBefore: '正常'
 })
 
@@ -244,15 +342,15 @@ function handleValidate() {
       })
     }
   }
-  if (!formData.value.userName) {
+  if (!formData.value.useItem) {
     return uni.showToast({
-      title: '请输入使用人',
+      title: '请输入检测项目',
       icon: 'none'
     })
   }
-  if (!formData.value.useRemark) {
+  if (tableData.value.length === 0) {
     return uni.showToast({
-      title: '请输入样品类别/个数/任务',
+      title: '请选择样品和标准物质',
       icon: 'none'
     })
   }
@@ -266,7 +364,8 @@ async function submitConfirm() {
     ...formData.value,
     deviceId: detailInfo.value.id,
     temperature: formData.value.temperature || '/',
-    humidity: formData.value.humidity || '/'
+    humidity: formData.value.humidity || '/',
+    detailList: tableData.value
   }
   // 如果在使用中加入使用结束参数
   let currentTime = nx.$dayjs().format('YYYY-MM-DD HH:mm:ss')
@@ -288,10 +387,9 @@ async function submitConfirm() {
     })
 }
 function reset() {
-  formData.value = {
-    userName: nx.$store('user').userInfo['realname']
-  }
+  formData.value = {}
   detailInfo.value = {}
+  tableData.value = []
 }
 function handleUseRecord() {
   nx.$store('biz').deviceInfo = detailInfo.value
@@ -308,7 +406,8 @@ function handleUseRecord() {
     background-color: #fff;
     height: 100%;
     padding: 16px;
-    padding-top: 10px;
+    padding-top: 0px;
+    padding-bottom: 0px;
     font-size: 16px;
     .title {
       font-size: 22px;
diff --git a/pages/device/deviceBusUseRecord/list.vue b/pages/device/deviceBusUseRecord/list.vue
index 533fa32..3d3adfb 100644
--- a/pages/device/deviceBusUseRecord/list.vue
+++ b/pages/device/deviceBusUseRecord/list.vue
@@ -1,8 +1,6 @@
 <template>
   <view>
-    <up-sticky v-if="!isComponent">
-      <navbar-back title="设备使用记录查看"> </navbar-back>
-    </up-sticky>
+    <navbar-back v-if="!isComponent" title="设备使用记录查看"> </navbar-back>
     <uni-card spacing="0">
       <uni-section v-if="!isComponent" titleFontSize="20px" type="line" :title="deviceText"> </uni-section>
       <view class="p10" style="width: 50%">
@@ -18,7 +16,7 @@
           @custom="reset"
         ></up-search>
       </view>
-      <view :style="{ height: isComponent ? '60vh' : '62vh' }">
+      <view :style="{ height: isComponent ? '70vh' : '72vh' }">
         <zb-table
           ref="zbTableRef"
           isShowLoadMore
@@ -28,6 +26,7 @@
           :cellStyle="setCellStyle"
           :cellHeaderStyle="setCellHeaderStyle"
           :data="listData"
+          :formatter="columnFormatter"
           @detail="handleDetail"
           @pullUpLoading="pullUpLoadingAction"
         ></zb-table>
@@ -58,12 +57,13 @@ const column = reactive([
   {
     label: '开始使用人',
     name: 'userName',
-    width: 100
+    width: 150
   },
   {
     label: '开始时间',
     name: 'useTimeStart',
-    width: 170
+    width: 170,
+    formatter: true
   },
   {
     label: '结束使用人',
@@ -73,7 +73,8 @@ const column = reactive([
   {
     label: '结束时间',
     name: 'useTimeEnd',
-    width: 170
+    width: 170,
+    formatter: true
   },
   {
     label: '使用前状态',
@@ -94,10 +95,22 @@ const column = reactive([
   {
     name: 'operation',
     type: 'operation',
+    width: 100,
     label: '操作',
     renders: [{ name: '详情', func: 'detail' }]
   }
 ])
+function columnFormatter(row, column, rowIndex, columnIndex) {
+  // 判断是哪一列需要格式化
+  if (column.name === 'useTimeStart') {
+    return nx.$helper.formateToDateTime(row.useTimeStart)
+  }
+  if (column.name === 'useTimeEnd') {
+    return nx.$helper.formateToDateTime(row.useTimeEnd)
+  }
+  // 对于不需要特殊格式化的列，返回原始值
+  return row[column.name]
+}
 let zbTableRef = ref(null)
 const deviceId = ref('')
 const deviceText = ref('')
@@ -148,10 +161,6 @@ function handleDetail(row) {
 </script>
 
 <style lang="scss" scoped>
-.u-sticky {
-  top: 0 !important;
-  background-color: #fff !important;
-}
 :deep(.zb-table uni-button[type='primary']) {
   background-color: $uni-color-primary !important;
 }
diff --git a/pages/device/deviceBusUseRecord/useRecord.api.js b/pages/device/deviceBusUseRecord/useRecord.api.js
index 18081c8..ebac414 100644
--- a/pages/device/deviceBusUseRecord/useRecord.api.js
+++ b/pages/device/deviceBusUseRecord/useRecord.api.js
@@ -2,7 +2,7 @@ import request from '@/nx/request'
 
 export function addUseRecord(data) {
   return request({
-    url: '/lims/bus/device/use-record/create',
+    url: '/qms/resource/device-use-record/create',
     method: 'POST',
     data,
     custom: {
@@ -12,8 +12,8 @@ export function addUseRecord(data) {
 }
 export function editUseRecord(data) {
   return request({
-    url: '/lims/bus/device/use-record/edit',
-    method: 'POST',
+    url: '/qms/resource/device-use-record/update',
+    method: 'PUT',
     data,
     custom: {
       showSuccess: true
@@ -22,15 +22,22 @@ export function editUseRecord(data) {
 }
 export function getList(params) {
   return request({
-    url: '/lims/bus/device/use-record/list',
+    url: '/qms/resource/device-use-record/page',
     method: 'GET',
     params
   })
 }
 export function getUseRecordById(id) {
   return request({
-    url: '/lims/bus/device/use-record/queryLastUsingData',
+    url: '/qms/resource/device-use-record/queryLastUsingData',
     method: 'GET',
     params: { deviceId: id }
   })
 }
+export function getDetailList(params) {
+  return request({
+    url: '/qms/resource/device-use-record-detail/getListByParentId',
+    method: 'GET',
+    params
+  })
+}
diff --git a/pages/device/periodCheckList/period.api.js b/pages/device/periodCheckList/period.api.js
index 573fe63..f80c6de 100644
--- a/pages/device/periodCheckList/period.api.js
+++ b/pages/device/periodCheckList/period.api.js
@@ -2,7 +2,7 @@ import request from '@/nx/request'
 
 export function list(params) {
   return request({
-    url: '/lims/bus/deviceBusPeriodCheck/queryPageList',
+    url: '/qms/resource/device-period-check/page',
     method: 'GET',
     params
   })
diff --git a/pages/login/login.vue b/pages/login/login.vue
index ebea37e..073d326 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -57,8 +57,8 @@ import callCheckUpdate from '@/nx/utils/check-update'
 const loading = ref(false)
 const captchaEnable = true
 let loginInfo = reactive({
-  username: '',
-  password: '',
+  username: 'ytjyAdmin',
+  password: 'P@ssword25',
   captchaVerification: ''
 })
 
@@ -74,7 +74,9 @@ onShow(() => {
   // #ifdef APP-PLUS
   if (process.env.NODE_ENV !== 'development') {
     setTimeout(() => {
-      callCheckUpdate()
+      callCheckUpdate().catch(() => {
+        callCheckUpdate()
+      })
     }, 1500)
   }
   // #endif
diff --git a/pages/material/recycle/index.vue b/pages/material/recycle/index.vue
new file mode 100644
index 0000000..f859792
--- /dev/null
+++ b/pages/material/recycle/index.vue
@@ -0,0 +1,98 @@
+<template>
+  <navbar-back title="试剂瓶回收"></navbar-back>
+  <view class="p8">
+    <u-sticky>
+      <view class="x-bc bg-w" v-if="listData.length > 0">
+        <checkbox-switch v-model="allChecked">全选</checkbox-switch>
+        <view class="pl16">
+          <up-button size="small" style="width: 60px" type="primary" text="回收" @click="handleSubmit"></up-button>
+        </view>
+      </view>
+    </u-sticky>
+    <scroll-view style="height: 90vh" scroll-y scroll-with-animation @scrolltolower="handleScrolltolower">
+      <u-checkbox-group placement="column" v-model="detailIds">
+        <view class="x-f border-b" v-for="(item, index) in listData">
+          <u-checkbox :name="item.id"></u-checkbox>
+          <view class="data-item">
+            <view
+              >试剂瓶名称：<text>{{ item.materialName }}</text></view
+            >
+            <view
+              >类型：<text>{{ item.materialType }}</text></view
+            >
+            <view
+              >数量：<text>{{ item.quantity }}</text></view
+            >
+            <view
+              >清洗人：<text>{{ item.operator }}</text></view
+            >
+            <view
+              >清洗日期：<text>{{ nx.$dayjs(item.operatorDate).format('YYYY-MM-DD') }}</text></view
+            >
+          </view>
+        </view>
+      </u-checkbox-group>
+      <up-loadmore v-if="listData.length > 0" :status="loadStatus" />
+      <up-empty v-else mode="data" text="暂无数据" marginTop="50"> </up-empty>
+    </scroll-view>
+  </view>
+</template>
+
+<script setup>
+import { ref, computed, watch } from 'vue'
+import { useListData } from '@/nx/hooks/usePageListData'
+import { onShow } from '@dcloudio/uni-app'
+import nx from '@/nx'
+
+const allChecked = ref(false)
+const detailIds = ref([])
+watch(allChecked, value => {
+  if (value) {
+    detailIds.value = listData.value.map(item => item.id)
+  } else {
+    detailIds.value = []
+  }
+})
+const searchParams = computed(() => {
+  return {
+    treatmentStatus: '0',
+    pageSize: 999
+  }
+})
+const { listData, scrollToLower, loadStatus, getInitData } = useListData({
+  searchParams,
+  api: nx.$api.material.getMaterialUseEndReuseDetailPage
+})
+
+onShow(() => {
+  getInitData()
+})
+function handleScrolltolower() {
+  scrollToLower()
+}
+function handleSubmit() {
+  if (detailIds.value.length === 0) {
+    return uni.showToast({
+      title: '请选择要回收的试剂瓶',
+      icon: 'none'
+    })
+  }
+  nx.$api.material.reuse(detailIds.value).then(res => {
+    uni.showToast({
+      title: '回收成功',
+      icon: 'none'
+    })
+    getInitData()
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+.data-item {
+  padding: 8px;
+  color: #909399;
+  text {
+    color: #000;
+  }
+}
+</style>
diff --git a/pages/material/useRecord/index.vue b/pages/material/useRecord/index.vue
new file mode 100644
index 0000000..1ee24b5
--- /dev/null
+++ b/pages/material/useRecord/index.vue
@@ -0,0 +1,228 @@
+<template>
+  <navbar-back title="危化品使用记录"></navbar-back>
+  <view class="pl8 pr8 pt8">
+    <view class="x-f">
+      <text class="pl6">监督人：</text>
+      <uni-data-select v-model="selectUserId" :localdata="range" placeholder="请选择监督人人"></uni-data-select>
+    </view>
+    <view class="x-f mt12">
+      <text class="pl6">是否配置：</text>
+      <up-switch v-model="hazardousMakeFlag" :activeValue="1" :inactiveValue="0"></up-switch>
+    </view>
+    <UseForm ref="useFromRef" v-if="hazardousMakeFlag === 0" />
+    <template v-else>
+     
+      
+      <uni-section type="line" title="配置信息" titleFontSize="15px" />
+      <view class="x-f">
+        <text class="pl6">配置后危化品：</text>
+        <uni-data-select v-model="configInfo.productId" :localdata="hazardousRange" placeholder="请选择配置后危化品" />
+      </view>
+	  <view class="x-f mt8 pl8"
+	    ><view class="pr16">参与配置危化品选择：</view
+	    ><u-icon :name="`/static/images/add.png`" size="40" @click="handleAddConfigDetail"
+	  /></view>
+	  <uni-section type="line" title="参与配置明细" titleFontSize="15px">
+	    <template #right> <up-text type="error" size="18" bold :text="configDetail.length"></up-text></template>
+	    <up-swipe-action>
+	      <up-swipe-action-item
+	        v-for="(item, index) in configDetail"
+	        :key="index"
+	        :index="index"
+	        :options="options"
+	        @click="configDetailSwipeClick"
+	      >
+	        <view class="border-b">
+	          <view class="">
+	            <view
+	              >危化品名称：<text class="black">{{ item.name }}</text></view
+	            >
+	          </view>
+	          <view class="mt4">
+	            <view
+	              >规格型号：<text class="black">{{ item.modelNo }}</text></view
+	            >
+	          </view>
+	          <view class="mt4">
+	            <view
+	              >使用量：<text class="black">{{ item.operationQuantity }}</text></view
+	            >
+	          </view>
+	        </view>
+	      </up-swipe-action-item>
+	    </up-swipe-action>
+	  </uni-section>
+	  <view class="p6 x-f"
+	    ><view class="pr16">配置体积：</view><text>{{ configVolume }}</text></view
+	  >
+	  <view class="p6 x-f"
+	    ><view class="pr16">备注：</view><up-input placeholder="请输入备注" v-model="configInfo.remark"></up-input
+	  ></view>
+    </template>
+    <up-button
+      class="mt20"
+      v-if="useFormInfo?.infomationId || configVolume > 0"
+      type="primary"
+      :loading="btnLoading"
+      style="width: 50%"
+      text="提交"
+      @click="handleSubmit"
+    ></up-button>
+
+    <up-popup :show="addConfigShow" round="10" @close="addConfigShow = false">
+      <view style="height: 80vh">
+        <UseForm showAction :configInfo="{reason:selectConfigMaterial.text}" @close="addConfigShow = false" @confirm="configAdd" />
+      </view>
+    </up-popup>
+  </view>
+</template>
+
+<script setup>
+import { computed, ref, toRefs, watch, onMounted } from 'vue'
+import nx from '@/nx'
+import { onLoad, onShow } from '@dcloudio/uni-app'
+import UseForm from './useForm.vue'
+
+const options = [
+  {
+    text: '删除',
+    style: {
+      fontSize: '14px',
+      backgroundColor: 'rgb(255,58,49)'
+    }
+  }
+]
+const btnLoading = ref(false)
+
+const range = ref([])
+
+const userInfo = computed(() => nx.$store('user').userInfo)
+
+const selectUserId = ref('')
+
+const useFromRef = ref()
+
+const hazardousMakeFlag = ref(0)
+
+const addConfigShow = ref(false)
+let configDetail = ref([])
+const hazardousRange = ref([])
+async function getHazardousRange() {
+  const data = await nx.$api.material.queryMaterialCategory({ nodeType: 'data', hazardous: 1 })
+  hazardousRange.value = data.map(item => ({ text: item.name, value: item.id }))
+}
+watch(hazardousMakeFlag, val => {
+  if (val === 1) {
+    getHazardousRange()
+  }
+})
+const configInfo = ref({
+  productId: '',
+  remark: ''
+})
+
+const useFormInfo = computed(() => {
+  return useFromRef.value?.formData
+})
+const configVolume = computed(() => {
+  return configDetail.value.reduce((pre, cur) => {
+    return pre + Number(cur.operationQuantity)
+  }, 0)
+})
+
+function handleAddConfigDetail() {
+	if (!configInfo.value.productId) {
+	  return uni.showToast({
+	    title: '请选择配置后危化品',
+	    icon: 'none'
+	  })
+	}
+  addConfigShow.value = true
+}
+function configAdd(data) {
+  configDetail.value.push(data)
+}
+const configDetailSwipeClick = ({ index }) => {
+  configDetail.value.splice(index, 1)
+  uni.showToast({ title: '删除成功！', icon: 'none' })
+}
+function handleReset() {
+  selectUserId.value = ''
+  if (hazardousMakeFlag.value === 1) {
+    configDetail.value = []
+    configInfo.value = {}
+  } else {
+    useFromRef.value.handleReset()
+  }
+}
+
+const selectUser = computed(() => {
+  return range.value.find(item => item.value === selectUserId.value)
+})
+const selectConfigMaterial = computed(()=>{
+	return hazardousRange.value.find(item=>item.value === configInfo.value.productId)
+})
+async function handleSubmit() {
+  let params = {}
+  if (selectUserId.value === '') {
+    return uni.showToast({
+      title: '请选择监督人',
+      icon: 'none'
+    })
+  }
+  if (hazardousMakeFlag.value === 1) {
+    if (configDetail.value.length === 0) {
+      return uni.showToast({
+        title: '请选择配置的危化品',
+        icon: 'none'
+      })
+    }
+    params = {
+      records: configDetail.value,
+      ...configInfo.value,
+      supervisorId: selectUser.value.value,
+      supervisorName: selectUser.value.text
+    }
+  } else {
+    if (!useFromRef.value.operationQuantity) return uni.showToast({ title: '请填写使用数量', icon: 'none' })
+    params = {
+      ...useFormInfo.value,
+      hazardousMakeFlag: 0,
+      supervisorId: selectUser.value.value,
+      supervisorName: selectUser.value.text
+    }
+  }
+  uni.showModal({
+    title: '提示',
+    content: '确定要提交使用吗？',
+    success: async function (res) {
+      if (res.confirm) {
+        btnLoading.value = true
+        let Api = hazardousMakeFlag.value === 1 ? nx.$api.material.addHazardousMake : nx.$api.material.addUseRecord
+        await Api(params).finally(() => {
+          btnLoading.value = false
+        })
+        uni.showToast({
+          title: '提交成功',
+          icon: 'none'
+        })
+        handleReset()
+      }
+    }
+  })
+}
+onMounted(async () => {
+  const data = await nx.$api.user.getAssignUserList()
+  range.value = data.map(item => ({ text: item.nickname, value: item.id }))
+})
+</script>
+
+<style lang="scss" scoped>
+.sample-item {
+  position: relative;
+  pointer-events: none;
+}
+:deep(.uni-select__input-placeholder) {
+  font-size: 16px;
+}
+</style>
diff --git a/pages/material/useRecord/useConfirm.vue b/pages/material/useRecord/useConfirm.vue
new file mode 100644
index 0000000..c137f34
--- /dev/null
+++ b/pages/material/useRecord/useConfirm.vue
@@ -0,0 +1,129 @@
+<template>
+  <navbar-back title="危化品使用确认"></navbar-back>
+  <view class="p8">
+    <u-sticky>
+      <up-subsection
+        activeColor="#0055A2"
+        mode="subsection"
+        :list="list"
+        :current="current"
+        @change="changeTab"
+      ></up-subsection>
+      <view class="x-bc pt8" v-if="listData.length > 0 && current === 0">
+        <checkbox-switch v-model="allChecked">全选</checkbox-switch>
+        <view class="pl16">
+          <up-button size="small" style="width: 60px" type="primary" text="确认" @click="handleSubmit"></up-button>
+        </view>
+      </view>
+    </u-sticky>
+    <scroll-view style="height: 82vh" scroll-y scroll-with-animation @scrolltolower="handleScrolltolower">
+      <u-checkbox-group placement="column" v-model="detailIds">
+        <view class="x-f border-b" v-for="(item, index) in listData">
+          <u-checkbox v-show="current === 0" :name="item.id"></u-checkbox>
+          <view class="data-item">
+            <view
+              >危化品名称：<text>{{ item.infomationName }}</text></view
+            >
+            <view
+              >使用人：<text>{{ item.userName }}</text></view
+            >
+            <view
+              >使之前量：<text>{{ item.beforeQuantity }}</text></view
+            >
+            <view
+              >本次用量：<text>{{ item.operationQuantity }}</text></view
+            >
+            <view
+              >余量：<text>{{ item.afterQuantity }}</text></view
+            >
+            <view
+              >说明：<text>{{ item.reason }}</text></view
+            >
+            <view
+              >使用日期：<text>{{ nx.$dayjs(item.useDate).format('YYYY-MM-DD') }}</text></view
+            >
+          </view>
+        </view>
+      </u-checkbox-group>
+      <up-loadmore v-if="listData.length > 0" :status="loadStatus" />
+      <up-empty v-else mode="data" text="暂无数据" marginTop="50"> </up-empty>
+    </scroll-view>
+  </view>
+</template>
+
+<script setup>
+import { ref, computed, watch } from 'vue'
+import { useListData } from '@/nx/hooks/usePageListData'
+import { onShow } from '@dcloudio/uni-app'
+import nx from '@/nx'
+
+const userInfo = computed(() => nx.$store('user').userInfo)
+const list = ref(['待确认', '已确认'])
+const allChecked = ref(false)
+const detailIds = ref([])
+watch(allChecked, value => {
+  if (value) {
+    detailIds.value = listData.value.map(item => item.id)
+  } else {
+    detailIds.value = []
+  }
+})
+const current = ref(0)
+
+function changeTab(index) {
+  current.value = index
+  getInitData()
+}
+const searchParams = computed(() => {
+  if (current.value === 0) {
+    return {
+      supervisorId: userInfo.value.id,
+      reviewStatus: '0',
+      pageSize: 999
+    }
+  } else {
+    return {
+      supervisorId: userInfo.value.id,
+      reviewStatus: '1',
+      pageSize: 999
+    }
+  }
+})
+const { listData, scrollToLower, loadStatus, getInitData } = useListData({
+  searchParams,
+  api: nx.$api.material.getUseRecord
+})
+
+onShow(() => {
+  getInitData()
+})
+function handleScrolltolower() {
+  scrollToLower()
+}
+function handleSubmit() {
+  if (detailIds.value.length === 0) {
+    return uni.showToast({
+      title: '请选择要确认的使用记录',
+      icon: 'none'
+    })
+  }
+  nx.$api.material.confirmUseRecord(detailIds.value).then(res => {
+    uni.showToast({
+      title: '确认成功',
+      icon: 'none'
+    })
+    getInitData()
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+.data-item {
+  padding: 8px;
+  border-bottom: 1px solid #eee;
+  color: #909399;
+  text {
+    color: #000;
+  }
+}
+</style>
diff --git a/pages/material/useRecord/useForm.vue b/pages/material/useRecord/useForm.vue
new file mode 100644
index 0000000..8bae4c9
--- /dev/null
+++ b/pages/material/useRecord/useForm.vue
@@ -0,0 +1,151 @@
+<template>
+  <view>
+    <view v-if="showAction && checkInfo.id" class="x-bc mt8">
+      <up-button size="small" style="width: 60px" text="取消" @click="handleCancel"></up-button>
+      <up-button size="small" style="width: 60px" type="primary" text="添加" @click="handleAdd"></up-button>
+    </view>
+    <up-input
+      style="padding-top: 20px"
+      border="bottom"
+      v-model="materialCode"
+      placeholder="请扫描需要使用的物料编号"
+      prefixIcon="scan"
+      fontSize="16"
+      prefixIconStyle="font-size: 30px;"
+      @confirm="getMaterialInfo"
+    >
+    </up-input>
+    <view class="pl8 pr8" v-if="checkInfo.id">
+      <view class="mt4">
+        <view
+          >危化品名称：<text class="black">{{ checkInfo.name }}</text></view
+        >
+      </view>
+      <view class="mt4">
+        <view
+          >规格型号：<text class="black">{{ checkInfo.modelNo }}</text></view
+        >
+      </view>
+      <view class="mt4">
+        <view
+          >计量单位：<text class="black">{{ checkInfo.unit }}</text></view
+        >
+      </view>
+      <view class="mt4">
+        <view
+          >总量：<text class="black">{{ checkInfo.remainingVolume }}</text></view
+        >
+      </view>
+      <view class="x-f mt8">
+        <text>使用量：</text>
+        <up-input placeholder="请输入使用量" type="digit" v-model="operationQuantity"></up-input>
+      </view>
+	  <up-text v-if="operationQuantity>=Number(checkInfo.remainingVolume)" type="error"   text="使用量大于等于剩余量，请确认试剂已用完"></up-text>
+      <view class="x-f mt8">
+        <text class="pr16">用途：</text>
+        <up-input placeholder="请输入用途" v-model="reason"></up-input>
+      </view>
+      <view class="x-f mt8">
+        <text class="pr16">备注：</text>
+        <up-input placeholder="请输入备注" v-model="remark"></up-input>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { computed, ref, toRefs, watch, onMounted } from 'vue'
+import { debounce } from 'lodash'
+import nx from '@/nx'
+import { onLoad, onShow } from '@dcloudio/uni-app'
+
+let emits = defineEmits(['close', 'confirm'])
+let props = defineProps({
+  showAction: {
+    type: Boolean,
+    default: false
+  },
+  configInfo: {
+	  type: Object,
+	  default:()=>({})
+  }
+})
+
+const { scanQRInfo } = toRefs(nx.$store('biz'))
+const materialCode = ref('')
+watch(scanQRInfo, newVal => {
+  debouncedHandleScan(newVal)
+})
+const debouncedHandleScan = debounce(val => {
+  if (!val) return
+  scanQRInfo.value = ''
+  if (nx.$router.getCurrentPage().route !== 'pages/material/useRecord/index') return
+  try {
+    materialCode.value = val
+    getMaterialInfo()
+  } catch (error) {
+    uni.showToast({
+      title: '请扫描正确的物料编码',
+      icon: 'none'
+    })
+  }
+}, 300)
+onShow(() => {
+  scanQRInfo.value = ''
+})
+
+let checkInfo = ref({})
+async function getMaterialInfo() {
+  if (materialCode.value === '') return
+  let params = {
+    code: materialCode.value,
+    hazardous: 1,
+    usageStatus: 1,
+    useEndFlag: 0
+  }
+  const data = await nx.$api.material.queryMaterialInfo(params)
+  if (!data) return uni.showToast({ title: '未查询到可以使用的危化品信息', icon: 'none' })
+  checkInfo.value = data
+  if(props.showAction) reason.value = '配置'+ props.configInfo.reason
+}
+const operationQuantity = ref('')
+const reason = ref('')
+const remark = ref('')
+
+function handleCancel() {
+  emits('close')
+}
+async function handleAdd() {
+  if (!operationQuantity.value) return uni.showToast({ title: '请填写使用数量', icon: 'none' })
+  const data = {
+    infomationId: checkInfo.value.id,
+    operationQuantity: operationQuantity.value,
+    reason: reason.value,
+    remark: remark.value,
+    name: checkInfo.value.name,
+    modelNo: checkInfo.value.modelNo
+  }
+  emits('confirm', data)
+  handleCancel()
+}
+function handleReset() {
+  materialCode.value = ''
+  checkInfo.value = {}
+  operationQuantity.value = ''
+  reason.value = ''
+  remark.value = ''
+}
+const formData = computed(() => ({
+  infomationId: checkInfo.value.id,
+  operationQuantity: operationQuantity.value,
+  reason: reason.value,
+  remark: remark.value
+}))
+defineExpose({
+  formData,
+  operationQuantity,
+  handleReset
+})
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/pages/material/useUpMark/index.vue b/pages/material/useUpMark/index.vue
new file mode 100644
index 0000000..014e231
--- /dev/null
+++ b/pages/material/useUpMark/index.vue
@@ -0,0 +1,121 @@
+<template>
+  <navbar-back title="用完标记"></navbar-back>
+  <view class="pl8 pr8 pt8">
+    <up-input
+      style="padding-top: 20px"
+      border="bottom"
+      v-model="materialCode"
+      placeholder="请扫描需要标记的物料编号"
+      prefixIcon="scan"
+      fontSize="16"
+      prefixIconStyle="font-size: 30px;"
+      @confirm="getMaterialList"
+    >
+    </up-input>
+
+    <uni-section v-if="materialList.length > 0" type="line" title="标记明细" titleFontSize="15px">
+      <template #right> <up-text type="error" size="18" bold :text="materialList.length"></up-text></template>
+      <scroll-view style="height: 60vh" scroll-y scroll-with-animation>
+        <uni-card margin="5px" v-for="item in materialList" class="sample-item">
+          <view class="mt4">
+            <view
+              >物料编号：<text class="black">{{ item.code }}</text></view
+            >
+          </view>
+          <view class="mt4">
+            <view
+              >物料名称：<text class="black">{{ item.name }}</text></view
+            >
+          </view>
+          <view class="mt4"
+            >规格型号：<text class="black">{{ item.modelNo }}</text></view
+          >
+          <!-- <view class="mt4"
+            >单位：<text class="black">{{ item.unit }}</text></view
+          > -->
+        </uni-card>
+      </scroll-view>
+      <up-button type="primary" :loading="btnLoading" style="width: 50%" text="提交" @click="handleSubmit"></up-button>
+    </uni-section>
+  </view>
+</template>
+
+<script setup>
+import { computed, ref, toRefs, watch, onMounted } from 'vue'
+import { debounce } from 'lodash'
+import nx from '@/nx'
+import { onLoad, onShow } from '@dcloudio/uni-app'
+
+const btnLoading = ref(false)
+let materialCode = ref('')
+let materialList = ref([])
+
+const { scanQRInfo } = toRefs(nx.$store('biz'))
+watch(scanQRInfo, newVal => {
+  debouncedHandleScan(newVal)
+})
+const debouncedHandleScan = debounce(val => {
+  if (!val) return
+  scanQRInfo.value = ''
+  if (nx.$router.getCurrentPage().route !== 'pages/material/useUpMark/index') return
+  try {
+    materialCode.value = val
+    getMaterialList()
+  } catch (error) {
+    uni.showToast({
+      title: '请扫描正确的物料编码',
+      icon: 'none'
+    })
+  }
+}, 300)
+onShow(() => {
+  scanQRInfo.value = ''
+})
+
+async function getMaterialList() {
+  if (materialCode.value === '') return
+  let params = {
+    code: materialCode.value,
+    usageStatus: 1,
+    useEndFlag: 0
+  }
+  const data = await nx.$api.material.queryMaterialInfo(params)
+  if (!data) return uni.showToast({ title: '未查询到该物料信息', icon: 'none' })
+  const existingCodes = new Set(materialList.value.map(item => item.id))
+  if (existingCodes.has(data.id)) {
+    return uni.showToast({ title: '该物料已存在，无需重复添加', icon: 'none' })
+  }
+
+  materialList.value.push(data)
+}
+async function handleSubmit() {
+  btnLoading.value = true
+  let params = {
+    businessType: '用完标记',
+    infomationIds: materialList.value.map(item => item.id)
+  }
+  await nx.$api.material.addUseOver(params).finally(() => {
+    btnLoading.value = false
+  })
+  uni.showToast({
+    title: '标记成功',
+    icon: 'none'
+  })
+  handleReset()
+}
+function handleReset() {
+  materialCode.value = ''
+  materialList.value = []
+}
+onMounted(async () => {})
+</script>
+
+<style lang="scss" scoped>
+.sample-item {
+  position: relative;
+  pointer-events: none;
+}
+:deep(.uni-select__input-placeholder) {
+  font-size: 16px;
+}
+</style>
diff --git a/pages/material/wash/index.vue b/pages/material/wash/index.vue
new file mode 100644
index 0000000..48ada02
--- /dev/null
+++ b/pages/material/wash/index.vue
@@ -0,0 +1,102 @@
+<template>
+  <navbar-back title="试剂瓶清洗"></navbar-back>
+  <view class="pl8 pr8 pt16">
+    <view>
+      <text class="pl6">试剂瓶类型：</text>
+      <uni-data-select v-model="materialType" :localdata="range" placeholder="请选择类型"></uni-data-select>
+    </view>
+    <view class="pt16">
+      <text class="pl6">试剂瓶名称：</text>
+      <up-input v-model="materialName" placeholder="请输入试剂瓶名称" />
+    </view>
+    <view class="pt16">
+      <text class="pl6">数量：</text>
+      <up-input v-model="quantity" placeholder="请输入数量" />
+    </view>
+    <view class="pt16">
+      <text class="pl6">备注：</text>
+      <up-input v-model="remark" placeholder="请输入备注" />
+    </view>
+    <up-button
+      class="mt20"
+      type="primary"
+      :loading="btnLoading"
+      style="width: 50%"
+      text="提交"
+      @click="handleSubmit"
+    ></up-button>
+  </view>
+</template>
+
+<script setup>
+import { computed, ref, toRefs, watch, onMounted } from 'vue'
+import nx from '@/nx'
+
+const btnLoading = ref(false)
+const range = ref([])
+const materialType = ref('')
+const materialName = ref('')
+const quantity = ref('')
+const remark = ref('清洗至pH检测为7')
+
+async function handleSubmit() {
+  if (!materialType.value) {
+    return uni.showToast({
+      title: '请选择类型',
+      icon: 'none'
+    })
+  }
+  if (!materialName.value) {
+    return uni.showToast({
+      title: '请输入试剂瓶名称',
+      icon: 'none'
+    })
+  }
+  if (!quantity.value) {
+    return uni.showToast({
+      title: '请输入数量',
+      icon: 'none'
+    })
+  }
+  btnLoading.value = true
+  let params = {
+    businessType: '清洗回收',
+    remark: remark.value,
+    detailList: [
+      {
+        materialName: materialName.value,
+        materialType: materialType.value,
+        quantity: quantity.value
+      }
+    ]
+  }
+  await nx.$api.material.addUseOver(params).finally(() => {
+    btnLoading.value = false
+  })
+  uni.showToast({
+    title: '提交成功',
+    icon: 'none'
+  })
+  handleReset()
+}
+function handleReset() {
+  remark.value = ''
+  materialName.value = ''
+  materialType.value = ''
+  quantity.value = ''
+}
+onMounted(async () => {
+  const data = await nx.$api.sys.getDataListByCategoryKey('试剂瓶类型')
+  range.value = data.map(item => ({ text: item.name, value: item.name }))
+})
+</script>
+
+<style lang="scss" scoped>
+.sample-item {
+  position: relative;
+  pointer-events: none;
+}
+:deep(.uni-select__input-placeholder) {
+  font-size: 16px;
+}
+</style>
diff --git a/static/images/add.png b/static/images/add.png
new file mode 100644
index 0000000..27330d5
Binary files /dev/null and b/static/images/add.png differ
diff --git a/static/images/menus/confirm.png b/static/images/menus/confirm.png
new file mode 100644
index 0000000..691cb5f
Binary files /dev/null and b/static/images/menus/confirm.png differ
diff --git a/static/images/menus/recycle.png b/static/images/menus/recycle.png
new file mode 100644
index 0000000..8e18ae0
Binary files /dev/null and b/static/images/menus/recycle.png differ
diff --git a/static/images/menus/sign.png b/static/images/menus/useUpMark.png
similarity index 100%
rename from static/images/menus/sign.png
rename to static/images/menus/useUpMark.png
diff --git a/static/images/menus/wash.png b/static/images/menus/wash.png
new file mode 100644
index 0000000..5f01e64
Binary files /dev/null and b/static/images/menus/wash.png differ
diff --git a/uview-plus/README.md b/uview-plus/README.md
index 930e9cc..6cf8517 100644
--- a/uview-plus/README.md
+++ b/uview-plus/README.md
@@ -12,7 +12,19 @@
 
 ## 说明
 
-uview-plus，是uni-app全面兼容vue3/nvue/鸿蒙/uni-app-x的uni-app生态框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水。uview-plus是基于uView2.x移植的支持vue3的版本，感谢uView。
+【文档有广告，不喜勿入谢谢】
+
+uview-plus，是uni-app全面兼容vue3/nvue/鸿蒙/uni-app-x(已经发布https://ext.dcloud.net.cn/plugin?name=uview-ultra)的uni-app生态框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水。uview-plus是基于uView2.x移植的支持vue3的版本，感谢uView。
+
+## 版本
+
+### uview-plus v3 (uni-app版本)
+1. 保持选项式API，尽可能兼容原有uview2各种API，比如mixins，方便大家升级更容易；
+2. 新手友好，保持原汁原味js，二次开发方便，未使用typescript重写，但带有独立的类型申明包；
+
+### uview-ultra v4 (uni-app-x版本)
+1. 尽可能保持原有组件的API一致，方便大家升级；
+2. 使用uts + 组合式API架构级全新重构，但仍然保持源码的简易，不封装过于复杂，便于修改。
 
 ## 可视化设计
 
@@ -32,7 +44,13 @@ uview-plus现已推出免费可视化设计，可以方便的进行页面可视
 您可以通过**微信**扫码，查看最佳的演示效果。
 <br>
 <br>
-<img src="https://uview-plus.jiangruyi.com/common/h5_qrcode.png" width="220" height="220" >
+
+|  H5     |   微信小程序    |    安卓    |   鸿蒙Next（已上架）   | 
+| --- | --- | --- | --- |
+| <img src="https://uview-plus.jiangruyi.com/common/h5_qrcode.png" width="160" height="160" />   |     <img src="https://uview-plus.jiangruyi.com/common/weixin_mini_qrcode.jpg" width="160" height="160" /> | <img src="https://uview-plus.jiangruyi.com/common/android_qrcode.png" width="160" height="160" /> |    <img src="https://uview-plus.jiangruyi.com/common/hos_qrcode.jpg" width="160" height="160" /> |
+<br>
+<img src="https://uview-plus.jiangruyi.com/common/hos.png">
+
 
 ## 链接
 
@@ -41,9 +59,6 @@ uview-plus现已推出免费可视化设计，可以方便的进行页面可视
 - [升级指南](https://uview-plus.jiangruyi.com/components/changeGuide.html)
 - [关于我们](https://uview-plus.jiangruyi.com/cooperation/about.html)
 
-## 交流反馈
-
-欢迎加入我们的QQ群交流反馈：[点此跳转](https://uview-plus.jiangruyi.com/components/addQQGroup.html)
 
 ## 关于PR
 
diff --git a/uview-plus/changelog.md b/uview-plus/changelog.md
index 90de199..95ec865 100644
--- a/uview-plus/changelog.md
+++ b/uview-plus/changelog.md
@@ -1,3 +1,1230 @@
+## 3.7.20（2026-02-26）
+improvement：box组件示例改为组合式API
+
+## 3.7.19（2026-02-25）
+improvement：agreement组件示例改为组合式API
+
+## 3.7.18（2026-02-24）
+improvement：barcode组件示例改为组合式API
+
+## 3.7.17（2026-02-11）
+fix: 修复steps组件current失效
+
+## 3.7.16（2026-02-09）
+improvment: choose组件示例改为组合式API
+
+## 3.7.14（2026-02-08）
+refactor: up-signature组件改用up-canvas组件
+
+## 3.7.13（2026-02-07）
+add: 新增up-canvas组件
+
+## 3.7.12（2026-02-07）
+improvment: 优化签名组件兼容性修复微信小程序支持
+
+## 3.7.11（2026-02-06）
+add: action-sheet组件新增nameKey和subnameKey属性
+
+## 3.7.10（2026-02-06）
+add: checkbox-group组件的change事件增加第二个返回参数为当前触发变化的checkbox组件name信息等
+
+## 3.7.9（2026-02-06）
+fix: 修复align-self属性值缺少d导致样式不生效的问题
+
+## 3.7.8（2026-02-05）
+improvment: 优化card组件示例
+
+## 3.7.7（2026-02-05）
+add: select组件新增closeSelect方法用于自定义控制关闭
+
+
+## 3.7.6（2026-02-04）
+add: picker组件示例onLoad后加载数据
+
+## 3.7.5（2026-02-03）
+add: up-slider组件新增垂直模式
+
+## 3.7.4（2026-02-03）
+add: box组件props优化及新增leftIcon/leftTitle/rightTopIcon/rightTopTitle/rightBottomIcon/rightBottomTitle参数
+
+## 3.7.3（2026-02-03）
+improvment: city-locate组件示例改为组合式API
+
+## 3.7.2（2026-02-02）
+improvment: color-picker组件示例改为组合式API
+
+## 3.7.1（2026-02-02）
+fix:修复qrcode缺失的preview定义emit
+
+## 3.7.0（2026-02-01）
+fix: 修复up-qrcode二维码在微信小程序报错
+
+## 3.6.134（2026-01-30）
+chore: dragsort可通过参数控制是否可震动
+
+## 3.6.132（2026-01-30）
+feat: dragsort支持自定义拖动句柄
+
+## 3.6.131（2026-01-29）
+fix: 优化dragdort组件
+
+## 3.6.130（2026-01-28）
+improvment: cropper组件示例改为组合式API
+
+## 3.6.129（2026-01-28）
+improvment: drag组件示例改为组合式API
+
+## 3.6.128（2026-01-27）
+improvment: tooltip组件示例改为组合式API
+
+## 3.6.127（2026-01-27）
+improvment: textarea组件示例改为组合式API
+
+## 3.6.126（2026-01-27）
+improvment: text组件示例改为组合式API
+
+## 3.6.125（2026-01-27）
+fix: 修复Cascader级联选择器设置默认值显示问题
+
+修复在传入默认值时多列只会显示第一列bug
+
+## 3.6.124（2026-01-27）
+improvment: tabs组件示例改为组合式API
+
+## 3.6.123（2026-01-27）
+improvment: swiper组件示例改为组合式API
+
+## 3.6.122（2026-01-26）
+fix: 🐛 修复u-input在change事件里无法获取value的异常情况 #950
+
+## 3.6.120（2026-01-26）
+improvment: 增加Cascader级联选择器的取消事件
+
+## 3.6.119（2026-01-26）
+improvment: skeleton组件示例改为组合式API
+
+## 3.6.118（2026-01-26）
+improvment: steps组件示例改为组合式API
+
+## 3.6.117（2026-01-24）
+improvment: subsection组就示例改为组合式API
+
+## 3.6.116（2026-01-24）
+improvment: 优化Cascader级联选择器右上角关闭图标的显示控制
+
+如果在级联文本过长或者类目过多时关闭图标会与类目文字重合，现在增加控制关闭图标的控制可以控制是否需要显示关闭图标，底部有取消按钮，关闭图标不是必须的
+
+## 3.6.115（2026-01-23）
+improvment: scroll-list组就示例改为组合式API
+
+## 3.6.114（2026-01-23）
+improvment: readmore组就示例改为组合式API
+
+## 3.6.113（2026-01-23）
+improvment: popover组就示例改为组合式API
+
+## 3.6.112（2026-01-23）
+improvment: picker组件示例改为组合式API
+
+## 3.6.111（2026-01-23）
+improvment: no-network组件示例改为组合式API
+
+## 3.6.110（2026-01-22）
+improvment: navbar组件示例改为组合式API
+
+## 3.6.109（2026-01-22）
+improvment: modal组件示例改为组合式API
+
+## 3.6.108（2026-01-22）
+improvment: loadmore组件示例改为组合式API
+
+## 3.6.107（2026-01-21）
+improvment: list组件示例改为组合式API
+
+## 3.6.106（2026-01-21）
+improvment: index-list2组件示例改为组合式API
+
+## 3.6.105（2026-01-21）
+improvment: index-list组件示例改为组合式API
+
+## 3.6.104（2026-01-21）
+improvment: layout组件示例改为组合式API
+
+## 3.6.103（2026-01-21）
+improvment: input组件示例改为组合式API
+
+## 3.6.102（2026-01-20）
+fix: 修复cascader缺少emits申明
+
+## 3.6.101（2026-01-20）
+improvment: form组件示例改为组合式API
+
+## 3.6.100（2026-01-20）
+improvment: datetimepicker组件示例改为组合式API
+
+## 3.6.99（2026-01-20）
+fix: 修复cate-tab组件设置默认current不生效
+
+## 3.6.98（2026-01-20）
+improvment: code-input组件示例改为组合式API
+
+## 3.6.97（2026-01-20）
+improvment: calendar组件示例改为组合式API
+
+## 3.6.96（2026-01-20）
+improvment: avatar组件示例改为组合式API
+
+## 3.6.95（2026-01-20）
+improvment: album组件示例改为组合式API
+
+## 3.6.94（2026-01-19）
+improvment: waterfall组件示例改为组合式API
+
+## 3.6.93（2026-01-19）
+improvment: upload组件示例改为组合式API
+
+## 3.6.92（2026-01-17）
+improvment: toast组件示例改为组合式API
+
+## 3.6.91（2026-01-16）
+improvment: tag组件示例改为组合式API
+
+## 3.6.90（2026-01-16）
+improvment: table2组件示例改为组合式API
+
+## 3.6.89（2026-01-16）
+add: 增加鸿蒙Next已上架二维码
+
+## 3.6.88（2026-01-16）
+improvment: table组件示例改为组合式API
+
+## 3.6.87（2026-01-15）
+tabbar2组件示例改为组合式API
+## 3.6.86（2026-01-15）
+improvment: tabbar组件示例改为组合式API
+## 3.6.85（2026-01-15）
+improvment: switch组件示例改为组合式API
+
+## 3.6.84（2026-01-15）
+improvment: slider组件示例改为组合式API
+
+## 3.6.83（2026-01-15）
+improvment: search组件示例改为组合式API
+
+## 3.6.82（2026-01-15）
+improvment: progress组件示例改为组合式API
+
+## 3.6.81（2026-01-15）
+improvment: parse组件示例改为组合式API
+
+
+## 3.6.80（2026-01-15）
+improvment: number-box组件示例改为组合式API
+
+## 3.6.78（2026-01-15）
+improvment: notify组件示例改为组合式API
+
+## 3.6.77（2026-01-15）
+improvment: notice-bar组件示例改为组合式API
+
+## 3.6.76（2026-01-15）
+ improvment: keyborad组件示例改为组合式API
+
+## 3.6.75（2026-01-15）
+improvment: dropdown组件示例改为组合式API
+
+## 3.6.74（2026-01-15）
+fix: 修复parse组件props缺少)
+
+## 3.6.73（2026-01-15）
+improvment: count-to组件示例改为组合式API
+
+## 3.6.72（2026-01-15）
+improvment: count-down组件示例改为组合式API
+
+## 3.6.71（2026-01-14）
+improvment: collapse组件示例改为组合式API
+
+## 3.6.70（2026-01-14）
+improvment: code组件示例改为组合式API
+
+## 3.6.69（2026-01-14）
+improvment: card组件示例改为组合式API
+
+## 3.6.68（2026-01-13）
+fix: 修复list组件在支付宝小程序下scrolltolower无法触发 #422
+## 3.6.67（2026-01-13）
+fix: 删除经典下拉框的打印
+
+## 3.6.66（2026-01-12）
+fix: 修正 RadioSlots 类型定义
+
+## 3.6.65（2026-01-12）
+fix: 修复u-picker在hasInput下回显异常和vue报错
+
+## 3.6.64（2026-01-12）
+fix: 解决cropper在ios小程序中底部操作栏被遮挡的问题
+
+## 3.6.63（2026-01-10）
+improvment: badge组建示例改为组合式API
+
+## 3.6.62（2026-01-10）
+improvment: alert组件示例改为组合式API
+
+## 3.6.61（2026-01-09）
+improvment: action-sheet组件示例改为组合式API
+
+## 3.6.60（2026-01-09）
+improvment: transition组件示例改为组合式API
+
+## 3.6.59（2026-01-09）
+improvment: swipe-action组件示例改为组合式API
+
+## 3.6.58（2026-01-09）
+improvment: sticky组件示例改为组合式API
+
+## 3.6.57（2026-01-08）
+improvment: 优化完善no-nerwork组件细节
+
+## 3.6.56（2026-01-08）
+fix: 修复signature的t方法
+
+## 3.6.55（2026-01-08）
+perf：补充多处TS声明提示信息 #953
+
+## 3.6.54（2026-01-08）
+fix: 修复slider示例页面变量重复
+## 3.6.53（2026-01-08）
+fix: 修复qrcode组件鸿蒙兼容
+
+## 3.6.52（2026-01-08）
+fix: nvue下采用webview支持二维码显示logo(因为gcanvas不支持图片渲染)
+
+## 3.6.51（2026-01-08）
+fix: 修复qrcode组件在App不显示logo
+
+improvment: qrcode逻辑优化封装
+
+## 3.6.50（2026-01-06）
+improvment: rate组件示例改为组合式API
+
+## 3.6.49（2026-01-06）
+improvment: radio组件示例改为组合式API
+
+## 3.6.48（2026-01-06）
+improvment: popup组件示例改为组合式API
+
+## 3.6.47（2026-01-06）
+improvment: overlay示例改为组合式API
+
+## 3.6.46（2026-01-05）
+improvment: loading-page组建示例改为组合式API
+
+## 3.6.45（2026-01-05）
+improvment: loading-icon组件示例改为组合式API
+
+## 3.6.44（2026-01-05）
+improvment: link组件示例改为组合式API
+
+## 3.6.43（2026-01-05）
+improvment: line组件示例改为组合式API
+
+## 3.6.42（2026-01-04）
+improvment: layzload组件示例改为组合式API
+
+## 3.6.41（2026-01-04）
+fix: 修复select组件缺少mixin
+
+## 3.6.40（2026-01-04）
+improvment: 去除ReadmeQQ群链接
+
+## 3.6.39（2026-01-04）
+improvment: image组件示例改为组合式API
+
+## 3.6.38（2026-01-03）
+improvment:  icon示例改为组合式API
+
+## 3.6.37（2025-12-31）
+improvment: 静态资源修复
+
+## 3.6.36（2025-12-30）
+improvment: grid示例改为组合式API
+
+## 3.6.35（2025-12-25）
+fix: 修复grid布局由于内容溢出导致形变
+
+## 3.6.34（2025-12-24）
+fix: modal组件asyncCloseTip多语言key未对应
+
+## 3.6.33（2025-12-23）
+fix: 提升$parent方法兼容性修复表单验证失效
+
+## 3.6.32（2025-12-21）
+improvment: 优化slider、search、steps等组件细节
+
+## 3.6.31（2025-12-19）
+improvment: 优化search组件等
+
+## 3.6.30（2025-12-19）
+improvment:  优化完善部分文件注释
+
+## 3.6.29（2025-12-18）
+fix: 修复语法错
+## 3.6.28（2025-12-18）
+fix: 优化$parent方法兼容性
+
+## 3.6.27（2025-12-17）
+add: datetimepicker增加maskClass和maskStyle属性
+
+## 3.6.26（2025-12-16）
+add: picker增加maskClass/maskStyle属性
+
+## 3.6.25（2025-12-15）
+fix: 修复cascader对列表数据层级差异的兼容问题
+
+## 3.6.24（2025-12-14）
+fix: 修复将empty组件的mode设置为wifi后图标不能显示的问题 #928
+
+## 3.6.23（2025-12-13）
+fix: 修复cascader已选中三级菜单后再选择二级菜单时tabs报错问题
+
+## 3.6.22（2025-12-12）
+fix: dragsort组件拖动抖动的问题
+
+## 3.6.21（2025-12-09）
+ fix: form-item初始化时机优化
+
+## 3.6.20（2025-12-08）
+improvment: 优化form组件语法普适性
+
+## 3.6.19（2025-12-01）
+fix: 修复商品SKU组件i18n
+
+fix: Choose组件会有width警告提示 #915
+
+## 3.6.18（2025-11-30）
+feature: upload组件file模式支持微信小程序chooseMessageFile的extension属性 #913
+
+## 3.6.17（2025-11-18）
+add: picker-data支持表单验证
+
+## 3.6.16（2025-11-18）
+improvment: 优化下拉菜单示例
+
+## 3.6.15（2025-11-10）
+fix: 修复tabs添加activeStyle切换后滑块无法居中
+
+## 3.6.14（2025-11-07）
+fix: 修复引用拼写
+
+## 3.6.13（2025-11-06）
+improvment: 组合式API升级之gap示例改造
+
+## 3.6.12（2025-11-05）
+improvment: empty示例改为组合式API
+
+## 3.6.11（2025-11-05）
+improvment: divider示例改为组合式API
+
+## 3.6.10（2025-11-04）
+improvment: checkbox示例改为组合式API
+
+## 3.6.9（2025-10-21）
+improvment: cell示例改为组合式API
+
+## 3.6.8（2025-10-20）
+imporvment: button示例改为组合式API
+
+## 3.6.7（2025-10-17）
+fix: 优化picker当前列判断
+
+## 3.6.6（2025-10-13）
+fix: 修复getWindowInfo微信小程序下报警告
+
+## 3.6.5（2025-10-11）
+🐛fix: 修复picker双向绑定 #753
+
+## 3.6.4（2025-10-09）
+🐛fix: import rpx2px function and add to exports in index.js
+
+## 3.6.3（2025-10-09）
+fix: 修复getWindowInfo微信小程序下报警告
+
+## 3.6.2（2025-10-05）
+fix: 修复picker双向绑定 #753
+
+## 3.6.1（2025-10-01）
+fix: 修复poster海报组件微信小程序图片绘制失败
+
+## 3.6.0（2025-09-30）
+fix: 修复parse事件报错及统一事件名称小写
+
+## 3.5.57（2025-09-30）
+improvment: 更换部分资源域名提升访问速度
+
+## 3.5.56（2025-09-29）
+fix: 修复picker和datetime-picker在部分原生渲染时hasInput触发键盘弹起
+
+## 3.5.55（2025-09-29）
+feat: waterfall新增after-add-one和after-add-all事件
+
+## 3.5.54（2025-09-25）
+🐞 fix: 解决索引列表初始化时获取不到高度导致的字母列表异常
+
+## 3.5.53（2025-09-19）
+improvment: back-top示例组合式API改造
+
+## 3.5.52（2025-09-19）
+fix: 优化tabbar的borderColor优先级
+
+## 3.5.51（2025-09-19）
+fix: 微信小程序下u-transition包裹的内容因为没有默认flex column而出现布局错误
+
+## 3.5.50（2025-09-18）
+fix: 修复tabbar组件borderColor类型
+
+## 3.5.49（2025-09-18）
+fix: 修复action-sheet列表中第一个item的hover style
+
+## 3.5.48（2025-09-17）
+fix: 修复table2的fixedHeader参数生效
+
+## 3.5.47（2025-09-16）
+fix: 修复modelValue类型
+
+## 3.5.46（2025-09-15）
+feat: table2新增支持span-method合并单元格
+
+## 3.5.45（2025-09-13）
+fix: 修复数据分配时未等待获取元素后再执行下一次循环导致数据插入错误，addTime属性未使用修改。
+
+## 3.5.44（2025-09-12）
+fix: 单选快捷组件作为受控组件，当modelValue清除选择时，组件状态未被清除。
+
+## 3.5.43（2025-09-10）
+fix: 增加subsection兼容性索引转为数字
+
+## 3.5.42（2025-09-09）
+feat: index-list增加下边距高度
+
+## 3.5.41（2025-09-08）
+fix: 修复cascader方法引用位置
+
+## 3.5.40（2025-09-08）
+feat: goods-sku组件支持多语言
+
+## 3.5.39（2025-09-07）
+fix: 修复cascader多语言问题
+
+## 3.5.38（2025-09-07）
+improvment: 完善演示图标
+
+## 3.5.37（2025-09-05）
+feat: cascader支持多语言
+
+## 3.5.36（2025-09-04）
+improvment: 补充图标
+
+## 3.5.35（2025-09-04）
+feat: cascader级联组件增加垂直头部与单列选项支持
+
+## 3.5.34（2025-09-03）
+improvement: 优化steps-item
+
+## 3.5.33（2025-09-02）
+升级uni-app至最新版
+## 3.5.32（2025-09-01）
+feat: cate-tab支持非联动跟随的单一切换模式
+
+feat: choose组件示例使用cate-tab的单一切换模式
+
+
+## 3.5.31（2025-09-01）
+feat: 新增choose通用选项选择器组件
+
+## 3.5.30（2025-08-31）
+fix: 修复缺失cascader级联选择器
+
+## 3.5.29（2025-08-30）
+feat: 新增cascader级联选择器
+
+## 3.5.28（2025-08-29）
+feat: 多语言增加泰语
+
+## 3.5.27（2025-08-29）
+feat: 新增基于tooltip的popover组件
+
+## 3.5.26（2025-08-29）
+improvment: 增强多语言兼容性
+
+## 3.5.25（2025-08-28）
+fix: 修复左侧与右侧弹出时页面打开闪现问题
+
+## 3.5.24（2025-08-28）
+feat: 优化tooltip弹窗定位
+
+feat: tooltip组件新增forcePosition支持强制精确定位
+
+## 3.5.23（2025-08-28）
+improvment: 调整pdf阅读器默认高度
+
+## 3.5.22（2025-08-28）
+feat: 新增goods-sku商品SKU选购组件
+
+## 3.5.21（2025-08-27）
+fix: 修复popup组件手势控制参数注释
+
+## 3.5.20（2025-08-27）
+improvement: 提升checkbox条件编译兼容性
+
+## 3.5.19（2025-08-27）
+feat: popup新增iOS风格手势控制上下高度及下滑关闭
+
+## 3.5.18（2025-08-26）
+feat: 新增coupon优惠券组件
+
+## 3.5.17（2025-08-26）
+fix: 分支合并冲突修复
+
+feat: picker-data组件新增cancel/close/confirm事件支持
+
+## 3.5.16（2025-08-26）
+feat: tabbar新增支持中间凸起按钮
+
+## 3.5.15（2025-08-25）
+feat: 之前的color-picker颜色选择器按计划上线
+
+## 3.5.14（2025-08-25）
+feat: 新增PDF阅读器组件
+
+## 3.5.13（2025-08-24）
+fix: 修复短视频示例https
+
+## 3.5.12（2025-08-23）
+feat: short-video短视频组件增加视频播放示例
+
+## 3.5.11（2025-08-23）
+feat: 新增short-video短视频切换组件
+
+feat: tabbar支持backgroundColor和borderColor属性
+
+feat: slider支持innerStyle样式属性
+
+## 3.5.10（2025-08-22）
+feat: 新增poster海报生成组件
+
+
+## 3.5.9（2025-08-22）
+feat: 优化qrcode组件支持toTempFilePath方法
+
+## 3.5.8（2025-08-22）
+fix: 优化rpx下calendar高度计算强制px
+
+## 3.5.7（2025-08-22）
+feat: input和search新增onlyClearableOnFocused参数支持控制是否仅聚焦时显示清除按钮
+
+## 3.5.6（2025-08-21）
+feat: picker弹窗及datetime-picker组件支持页面内模式
+
+## 3.5.5（2025-08-21）
+feat: popup弹窗及canlendar组件支持页面内插入无弹窗模式
+
+## 3.5.4（2025-08-21）
+feat: popup弹窗及canlendar组件支持页面内插入无弹窗模式
+
+## 3.5.3（2025-08-21）
+fix: 修复下拉刷新多语言key
+
+## 3.5.2（2025-08-20）
+fix: 修复非cli模式下引入的三方库报An error occurred while trying to read the map file错误
+
+fix: 去除i18n多语言多余console
+
+## 3.5.1（2025-08-20）
+feat: calendar组件月份标题自动适配多语言
+
+## 3.5.0（2025-08-20）
+feat: 组件库新增多语言支持且无侵入无依赖内置八种语言
+
+## 3.4.107（2025-08-20）
+feat: input组件支持密码显示切换
+
+## 3.4.106（2025-08-20）
+feat: tooltip组件支持左右方向弹窗
+
+## 3.4.105（2025-08-19）
+feat: 增加markdown解析器组件AI对话流式响应示例
+
+## 3.4.104（2025-08-19）
+feat: tooltip支持自定义触发器
+
+feat: tooltip支持插槽自定义内容
+
+feat: tooltip支持单击触发
+
+feat: tooltip支持设置弹窗背景色
+
+## 3.4.103（2025-08-19）
+feat: 内置一份dayjs库
+
+fix: 删除个别组件多余重复方法
+
+fix: 修复marked库App打包时报错
+
+## 3.4.102（2025-08-19）
+fix: 小程序下cate-tab动态加载数据后尺寸获取及联动异常
+
+## 3.4.101（2025-08-18）
+improvment: 增加一些涉及触摸组件PC端需要仿真模式提示
+
+## 3.4.100（2025-08-18）
+feat: 新增markdown解析器组件
+
+## 3.4.99（2025-08-18）
+fix: 修复parse富文本组件可能导致无限循环的问题
+
+## 3.4.98（2025-08-17）
+feat: alert组件新增transitionMode/icon/duration/modelValue等参数
+
+improvment:  完善alert组件注释
+
+## 3.4.97（2025-08-16）
+improvment: 完善album组件注释
+
+## 3.4.96（2025-08-16）
+improvment: 完善action-sheet注释
+
+## 3.4.95（2025-08-16）
+del: 去除不再需要的重复组件
+
+## 3.4.94（2025-08-15）
+improvment: 组件库内部icon前缀统一
+
+## 3.4.93（2025-08-15）
+fix: 修复dropdown组件在打开下拉菜单时content高度为NANpx的问题
+
+## 3.4.92（2025-08-14）
+fix: 修复多余空格导致cropper编译出错 #830
+
+## 3.4.91（2025-08-14）
+feat: 新增agreement弹窗协议组件
+
+## 3.4.90（2025-08-13）
+feat: datetimepicker新增datehour类型
+
+## 3.4.89（2025-08-13）
+fix: 修复u-form-item组件缺少对labelPosition的判断
+
+## 3.4.88（2025-08-13）
+fix: subsection组件的disabled属性应为Boolean类型
+
+## 3.4.87（2025-08-12）
+improvment: 签名组件示例前缀改为up
+
+## 3.4.86（2025-08-12）
+feat: 新增signature签名签字组件
+
+## 3.4.85（2025-08-11）
+feat: 完善图片裁剪功能支持props及JS两种方式
+
+fix: 修复H5下裁剪后图片黑屏
+
+## 3.4.84（2025-08-11）
+feat: 新增cropper图片裁剪组件
+
+## 3.4.83（2025-08-11）
+feat: 新增barcode无三方依赖条码组
+
+## 3.4.82（2025-08-11）
+improvment: 优化table2递归组件逻辑
+
+feat: 支持树状列表复选框
+
+## 3.4.81（2025-08-10）
+feat: table2新增树状结构递归支持
+
+## 3.4.80（2025-08-10）
+feat: 新增table2固定列对树状支持
+
+## 3.4.79（2025-08-09）
+feat: table2组件支持左侧固定列功能
+
+## 3.4.78（2025-08-09）
+fix: 修复table2在popup弹窗中无法横向滚动
+
+## 3.4.77（2025-08-08）
+feat: 优化waterfall瀑布流组件逻辑
+
+feat: waterfall瀑布流组件支持多列
+
+feat: waterfall瀑布流组件支持响应式列数
+
+## 3.4.76（2025-08-08）
+feat: 取消props中tabs组件默认颜色影响主题色生效
+
+fix: 修复parse富文本组件报错$options
+
+feat: timeFormat时间格式化方法支持UTC格式时间 #596
+
+## 3.4.75（2025-08-07）
+feat: 新增loadFontOnce参数控制是否全局只加载一次字体图标
+
+## 3.4.74（2025-08-07）
+feat: input组件新增cursorColor属性
+
+## 3.4.73（2025-08-05）
+improvment: 优化下拉刷新默认图标
+
+## 3.4.72（2025-08-05）
+improvment: 优化virtual-list虚拟列表样式
+
+feat: 新增virtual-list虚拟列表演示
+
+## 3.4.71（2025-08-05）
+feat: 新增virtual-list虚拟列表组件
+
+feat: 新增pull-refresh下拉刷新结合虚拟列表使用
+
+## 3.4.70（2025-08-05）
+fix: 修复qrcode组件长按事件传入错误cid导致的报错
+
+fix: 修复index-list组件key为undefined导致的索引报错消失
+
+## 3.4.69（2025-08-04）
+feat: pull-refresh下拉刷新新增上拉加载特性
+
+## 3.4.68（2025-08-03）
+feat: 新增pull-refresh下拉刷新组件
+
+## 3.4.67（2025-08-02）
+feat: number-box支持disabledBgColor参数
+
+## 3.4.66（2025-08-01）
+improvment: 增加组件图标
+
+feat: table2组件新增列排序插槽
+
+fix: 分段器组件onWindowResize使用条件编译
+
+fix: 修复u-line-1单行省略样式
+
+## 3.4.65（2025-07-26）
+fix: 修复部分环境下字体图标全局加载问题
+
+## 3.4.64（2025-07-25）
+feat: 新增dragsort拖动排序组件
+
+## 3.4.63（2025-07-24）
+feat: count-down支持slot传递时间参数
+
+## 3.4.62（2025-07-24）
+feat: divider支持默认插槽
+
+## 3.4.61（2025-07-24）
+feat: divider支持默认插槽
+
+## 3.4.60（2025-07-23）
+fix: 修复use阶段全局加载图标引起App端不明$page报错
+
+## 3.4.59（2025-07-23）
+fix: 修复album组件和CateTab组件watch和emits重复
+
+fix: 修复样式优先级导致form表单labelPosition属性top失效
+
+## 3.4.58（2025-07-22）
+fix: 修复样式优先级影响grid宫格组件布局
+
+## 3.4.57（2025-07-22）
+feat: 新增title标题组件
+
+## 3.4.56（2025-07-21）
+fix: 去除多余hotCity参数
+
+## 3.4.55（2025-07-21）
+feat: 新增city-locate城市定位选择组件
+
+feat: 优化index-list组件索引
+
+## 3.4.54（2025-07-18）
+feat: dropdown组件的highlight方法支持同时高亮多个菜单项
+
+feat: 支持一次性全局加载icon字体
+
+## 3.4.53（2025-07-18）
+feat: dropdown组件的highlight方法支持同时高亮多个菜单项 感谢@keeplearning66
+
+## 3.4.52（2025-07-16）
+fix: 修复底部安全区域组件兼容性
+
+## 3.4.51（2025-07-14）
+fix: 修复u-slider在click后没有触发change事件
+
+## 3.4.50（2025-07-13）
+feat: subsection分段器添加禁用参数
+
+## 3.4.49（2025-07-11）
+feat: picker支持bgColor、round、duration和overlayOpacity属性
+
+## 3.4.48（2025-07-10）
+fix: 官方文档Card示例组件多行显示省略号样式异常
+
+feat: album组件支持自定义preview事件
+
+## 3.4.47（2025-07-09）
+fix: 修复datetime-picker打开时，数值可能出现对不上的问题
+
+feat: Subsection 分段器添加支持从 list中读取激活文字颜色和未激活文字颜色
+
+fix: 修复modal定义confirmButton
+
+fix: safe-bottom底部安全距离在小程序优先用JS计算
+
+feat: 新增tree树形组件
+
+## 3.4.46（2025-07-08）
+feat: 上传组件预览视频支持videoPreviewObjectFit参数
+
+feat: td增加多个样式props
+
+fix: 修复noticeBar字号增大时文字遮挡
+
+feat: 项目工程增加pinia
+
+## 3.4.45（2025-07-01）
+fix: 修复picker-data组件缺少name
+
+fix: 优化picker高度单位
+
+## 3.4.44（2025-06-30）
+fix: 修复indexList中stikcy属性写死的问题(always true)
+
+feat: 搜索框添加新的右侧插槽
+
+fix: 修复indexList中丢失的select event
+
+fix: 解决因为层级问题导致点击picker选择器无法正常弹出
+
+## 3.4.43（2025-06-16）
+feat: table2支持header插槽
+
+## 3.4.42（2025-06-12）
+fix: 修复qrcode中默认id问题及canvas2时App无法绘制二维码 感谢@jiaruiyan
+
+## 3.4.41（2025-06-11）
+feat: qrcode支持 新参数useRootHeightAndWidth 是否使用根节点的宽高 感谢@YJR
+
+feat: toast支持设置zIndex层级
+
+
+
+## 3.4.40（2025-06-06）
+fix: 升级二维码 canvas -> canvas2 感谢@yjr
+
+## 3.4.39（2025-05-31）
+fix: 修改步骤条微信小程序下的布局 感谢@jiaruiyan
+
+fix: u-tabs在屏幕尺寸发生变化时滑块位置没有发生变化 感谢@aqzhft
+
+fix: 鸿蒙平台不支持plus.runtime.openWeb 感谢@aqzhft
+
+## 3.4.38（2025-05-30）
+fix: 修复picker-data快捷组件缺少index
+
+fix: 修复picker组件双向绑定初始化及取消后复原再次打开后的当前项目
+
+## 3.4.37（2025-05-29）
+feat: modal支持设置动画时间
+
+fix: DatetimePicker v-model 绑定异步设置无效 (#803)
+
+## 3.4.36（2025-05-28）
+fix: lazy-load图片为空时显示错误
+
+## 3.4.35（2025-05-28）
+feat: 进度条支持从右往左加载
+
+## 3.4.34（2025-05-28）
+feat: table2支持自定义标题和单元格样式
+
+## 3.4.33（2025-05-27）
+fix: 修复小程序cate-tab第一次切换时没反应 感谢@jiaruiyan
+
+fix: 修复datetimepicker传入空字符串时导致组件崩溃 感谢@jiaruiyan
+
+fix: 修复album带单位的字符串参与计算导致的计算数据错误 感谢@jiaruiyan
+
+## 3.4.32（2025-05-26）
+feat: 增加状态栏独立颜色配置支持支付宝小程序状态栏对背景色识别的不友好的情况
+
+fix: 抖音二维码兼容修复
+
+feat: cate-tab组件增加rightTop插槽 #715
+
+fix: 修改 test.promise(res) 预期结果不一致
+
+## 3.4.31（2025-05-17）
+fix: 修复parse富文本组件导致鸿蒙运行白屏
+
+fix: 去除演示项目中uni.$u用法便于兼容鸿蒙
+
+feat: modal新增popupBottom插槽适用类似关闭按钮与内容区域分离的场景
+
+## 3.4.30（2025-05-16）
+feat: 新增pagination分页器组件
+
+feat: popup新增bottom插槽适用类似关闭按钮与内容区域分离的场景
+
+## 3.4.29（2025-05-15）
+fix: 修复table2横向滚动样式
+
+fix: 修复table2组件宽度兼容
+
+fix: 修复image显示png图片时默认背景色问题
+
+feat: cate-tab新增height参数便于设置组件高度
+
+feat: 在index.js种导出digit.js便于使用
+
+fix: 修复tag组件缺失iconColor属性
+
+fix: 优化index-list的setValueForTouch方法逻辑 #708
+
+feat: number-box支持change事件返回变动是点击了增加还是减少按钮
+
+fix: 修复table2在小程序下部分情形不显示表格
+
+## 3.4.28（2025-05-12）
+feat: 新增table表格组件
+
+feat: 新增element-plus风格的table2组件
+
+## 3.4.27（2025-05-06）
+fix: 修复card组件props
+
+## 3.4.26（2025-05-06）
+fix: 修复test工具引入
+
+feat: card组件支持全局设置props默认值
+
+fix: 修复image在加载错误情况下高度和宽度不正确问题
+
+fix: 修复picker-data快捷组件默认picker选中
+
+fix: 修复日历month子组件缺失emits定义
+
+## 3.4.25（2025-04-27）
+fix: up-form编译在微信小程序里样式缺失 #640
+
+fix: number-box输入为空时自动设为最小值
+
+feat: picker与datetimepicke组件hasInput模式支持inputProps属性
+
+## 3.4.24（2025-04-25）
+fix: 修复upload上传逻辑(感谢@semdy)
+
+## 3.4.23（2025-04-24）
+chore: 补全chooseFile TS类型(感谢@semdy)
+
+feat: u-search组件的图标支持显示在右边(感谢@semdy)
+
+chore: 修正chooseFile返回的数据TS类型(感谢@semdy)
+
+fix: PR导致缺失name影响uplad自动上传扩展名
+
+
+## 3.4.22（2025-04-22）
+fix: 修复自动上传偶发的success被覆盖为uploading
+
+fix: float-button缺少key #677
+
+fix: upload组件完善优化(感谢@semdy)
+
+fix: toolbar组件confirmColor属性默认改为空，以便默认使用主题色、标题字体加粗(感谢@semdy)
+
+## 3.4.21（2025-04-21）
+feat: subsection分段器支持双向绑定current
+
+feat: select组件支持maxHeight属性
+
+feat: datetime-picker支持inputBorder属性
+
+## 3.4.20（2025-04-17）
+fix: 修复navbar-mini提示border不存在
+
+feat: status-bar支持对外暴露状态栏高度值
+
+feat: upload支持自定义自动上传后处理逻辑便于对接不同规范后端
+
+feat: 优化tag组件插槽
+
+
+## 3.4.19（2025-04-14）
+fix: 修复model组件增加contentStyle带来的语法问题
+
+## 3.4.18（2025-04-14）
+fix: upload组件支持所有文件类型的onClickPreview事件
+
+## 3.4.17（2025-04-11）
+feat: select组件text插槽增加scope传递currentLabel
+
+## 3.4.16（2025-04-10）
+fix: 修复安卓新加载字体方式导致Cannot read property '$page' of undefined
+
+## 3.4.15（2025-04-10）
+improvment: 优化移步加载数据时swiper组件displayMultipleItems报错
+
+feat: modal增加contentStyle属性
+
+fix: 修复下拉菜单收起动画缺失
+
+fix: 修复sticky的offset属性值为响应式数据时失效 #237
+
+
+## 3.4.14（2025-04-09）
+feat: 支持自托管内置图标及扩展自定义图标
+
+## 3.4.13（2025-04-08）
+fix: tabs点击当前tab触发change事件
+
+## 3.4.12（2025-04-02）
+fix: dropdown关闭后遮挡页面内容 #653
+
+fix u-sticky.vue Uncaught TypeError: e.querySelector is not a function at uni-app-view.umd.js
+
+## 3.4.11（2025-03-31）
+fix: 优化upload组件预览视频的弹窗占位
+
+## 3.4.10（2025-03-28）
+feat: select组件新增多个props属性及优化
+
+fix: 修复cate-tab报错index is not defined #661
+
+
+## 3.4.9（2025-03-27）
+fix: 修复upload组件split报错
+
+fix: 修复float-button缺少flex样式
+
+## 3.4.8（2025-03-27）
+fix: 修复upload组件split报错
+
+fix: 移除mapState
+
+## 3.4.7（2025-03-26）
+fix: 修复action-sheet-data和picker-data数据回显
+
+fix:  优化upload组件视频封面兼容
+
+## 3.4.6（2025-03-25）
+feat: checkbox触发change时携带name参数
+
+feat: upload组件支持服务器本机和阿里云OSS自动上传功能及上传进度条
+
+feat: upload组件支持视频预览及oss上传时获取视频封面图
+
+feat: 新增up-action-sheet-data快捷组件
+
+feat: 新增up-picker-data快捷组件
+
+## 3.4.5（2025-03-24）
+feat: tag组件新增textSize/height/padding/borderRadius属性
+
+feat: 新增genLightColor自动计算浅色方法及tag组件支持autoBgColor自动计算背景色
+
+## 3.4.4（2025-03-13）
+feat: modal增加异步操作进行中点击取消弹出提示特性防止操作被中断
+
+fix: 修复toast组件show方法类型声明
+
+## 3.4.3（2025-03-12）
+fix: 修复textarea自动增高时在输入时高度异常
+
+## 3.4.2（2025-03-11）
+feat: step组件增加title插槽及增加辅助class便于自定义样式
+
+## 3.4.1（2025-03-11）
+feat: 新机制确保setConfig与http在nvue等环境下生效
+
+## 3.3.74（2025-03-06）
+fix: CateTab语法问题
+
+## 3.3.73（2025-03-06）
+feat: CateTab新增v-model:current属性
+
+## 3.3.72（2025-02-28）
+feat: tabs组件支持icon图标及插槽
+
+## 3.3.71（2025-02-27）
+feat: 折叠面板collapse增加titileStyle/iconStyle/rightIconStyle属性
+
+feat: 折叠面板组件新增cellCustomStyle/cellCustomClass属性
+
+fix: select组件盒模型
+
+## 3.3.70（2025-02-24）
+fix: 修改u-checkbox-group组件changes事件发生位置
+
+## 3.3.69（2025-02-19）
+picker允许传递禁用颜色props
+
+slider组件isRange状态下增加min max插槽分开显示内容
+
+feat: 新增经典下拉框组件up-select
+
+## 3.3.68（2025-02-12）
+fix: 修复weekText类型
+
+feat: 日历增加单选与多选指定禁止选中的日期功能
+
+fix: NumberBox删除数字时取值有误 #613
+
+## 3.3.67（2025-02-11）
+feat: navbar支持返回全局拦截器配置
+
+feat: 表单-校验-支持无提示-得到校验结果
+
+feat: picker传递hasInput属性时候，可以禁用输入框点击
+
+## 3.3.66（2025-02-09）
+feat: steps-item增加content插槽
+
+## 3.3.65（2025-02-05）
+feat: number-box组件新增按钮圆角/按钮宽度/数据框背景色/迷你模式
+## 3.3.64（2025-01-18）
+feat: 日历组件支持自定义星期文案
+
+## 3.3.63（2025-01-13）
+fix: cate-tab支持支付宝小程序
+
+fix: textarea 修复 placeholder-style
+
+fix: 修复在图片加载及加载失败时容器宽度
+
+fix: waterfall组件报错Maximum recursive updates
+
+## 3.3.62（2025-01-10）
+feat: sleder滑动选择器双滑块增加外层触发值的变动功能
+
+fix: picker支持hasInput优化
+
+## 3.3.61（2024-12-31）
+fix: 修复微信getSystemInfoSync接口废弃警告
+
+fix: 'u-status-bar' symbol missing
+
+## 3.3.60（2024-12-30）
+feat: 日期组件支持禁用
+
+fix: ts定义修复 #600
+
+feat: Tabs组件选中时增加一个active的class #595
+
+## 3.3.59（2024-12-30）
+fix: Property "isH5" was accessed during render
+
+## 3.3.58（2024-12-26）
+fix: slider组件change事件传参
+
 ## 3.3.57（2024-12-23）
 fix: slider组件change事件传参
 
diff --git a/uview-plus/components/u--form/u--form.vue b/uview-plus/components/u--form/u--form.vue
deleted file mode 100644
index 78e9dc4..0000000
--- a/uview-plus/components/u--form/u--form.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<template>
-	<uvForm
-		ref="uForm"
-		:model="model"
-		:rules="rules"
-		:errorType="errorType"
-		:borderBottom="borderBottom"
-		:labelPosition="labelPosition"
-		:labelWidth="labelWidth"
-		:labelAlign="labelAlign"
-		:labelStyle="labelStyle"
-		:customStyle="customStyle"
-	>
-		<slot />
-	</uvForm>
-</template>
-
-<script>
-	/**
-	 * 此组件存在的理由是，在nvue下，u-form被uni-app官方占用了，u-form在nvue中相当于form组件
-	 * 所以在nvue下，取名为u--form，内部其实还是u-form.vue，只不过做一层中转
-	 */
-	import uvForm from '../u-form/u-form.vue';
-	import { props } from '../u-form/props.js';
-	import { mpMixin } from '../../libs/mixin/mpMixin';
-	import { mixin } from '../../libs/mixin/mixin';
-	export default {
-		// #ifdef MP-WEIXIN
-		name: 'u-form',
-		// #endif
-		// #ifndef MP-WEIXIN
-		name: 'u--form',
-		// #endif
-		mixins: [mpMixin, props, mixin],
-		components: {
-			uvForm
-		},
-		created() {
-			this.children = []
-		},
-		methods: {
-			// 手动设置校验的规则，如果规则中有函数的话，微信小程序中会过滤掉，所以只能手动调用设置规则
-			setRules(rules) {
-				this.$refs.uForm.setRules(rules)
-			},
-			validate() {
-				/**
-				 * 在微信小程序中，通过this.$parent拿到的父组件是u--form，而不是其内嵌的u-form
-				 * 导致在u-form组件中，拿不到对应的children数组，从而校验无效，所以这里每次调用u-form组件中的
-				 * 对应方法的时候，在小程序中都先将u--form的children赋值给u-form中的children
-				 */
-				// #ifdef MP-WEIXIN
-				this.setMpData()
-				// #endif
-				return this.$refs.uForm.validate()
-			},
-			validateField(value, callback) {
-				// #ifdef MP-WEIXIN
-				this.setMpData()
-				// #endif
-				return this.$refs.uForm.validateField(value, callback)
-			},
-			resetFields() {
-				// #ifdef MP-WEIXIN
-				this.setMpData()
-				// #endif
-				return this.$refs.uForm.resetFields()
-			},
-			clearValidate(props) {
-				// #ifdef MP-WEIXIN
-				this.setMpData()
-				// #endif
-				return this.$refs.uForm.clearValidate(props)
-			},
-			setMpData() {
-				this.$refs.uForm.children = this.children
-			}
-		},
-	}
-</script>
diff --git a/uview-plus/components/u--image/u--image.vue b/uview-plus/components/u--image/u--image.vue
deleted file mode 100644
index 5916065..0000000
--- a/uview-plus/components/u--image/u--image.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<template>
-	<uvImage 
-		:src="src"
-		:mode="mode"
-		:width="width"
-		:height="height"
-		:shape="shape"
-		:radius="radius"
-		:lazyLoad="lazyLoad"
-		:showMenuByLongpress="showMenuByLongpress"
-		:loadingIcon="loadingIcon"
-		:errorIcon="errorIcon"
-		:showLoading="showLoading"
-		:showError="showError"
-		:fade="fade"
-		:webp="webp"
-		:duration="duration"
-		:bgColor="bgColor"
-		:customStyle="customStyle"
-		@click="$emit('click')"
-		@error="$emit('error')"
-		@load="$emit('load')"
-	>
-		<template v-slot:loading>
-			<slot name="loading"></slot>
-		</template>
-		<template v-slot:error>
-			<slot name="error"></slot>
-		</template>
-	</uvImage>
-</template>
-
-<script>
-	/**
-	 * 此组件存在的理由是，在nvue下，u-image被uni-app官方占用了，u-image在nvue中相当于image组件
-	 * 所以在nvue下，取名为u--image，内部其实还是u-iamge.vue，只不过做一层中转
-	 */
-	import uvImage from '../u-image/u-image.vue';
-	import { props } from '../u-image/props.js';
-	import { mpMixin } from '../../libs/mixin/mpMixin';
-	import { mixin } from '../../libs/mixin/mixin';
-	export default {
-		name: 'u--image',
-		mixins: [mpMixin, props, mixin],
-		components: {
-			uvImage
-		},
-		emits: ['click', 'error', 'load']
-	}
-</script>
\ No newline at end of file
diff --git a/uview-plus/components/u--input/u--input.vue b/uview-plus/components/u--input/u--input.vue
deleted file mode 100644
index 2a8933f..0000000
--- a/uview-plus/components/u--input/u--input.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<template>
-	<uvInput 
-		<!-- #ifdef VUE2 -->
-		:value="value"
-		@input="e => $emit('input', e)"
-		<!-- #endif -->
-		<!-- #ifdef VUE3 -->
-		:modelValue="modelValue"
-		@update:modelValue="e => $emit('update:modelValue', e)"
-		<!-- #endif -->
-		:type="type"
-		:fixed="fixed"
-		:disabled="disabled"
-		:disabledColor="disabledColor"
-		:clearable="clearable"
-		:password="password"
-		:maxlength="maxlength"
-		:placeholder="placeholder"
-		:placeholderClass="placeholderClass"
-		:placeholderStyle="placeholderStyle"
-		:showWordLimit="showWordLimit"
-		:confirmType="confirmType"
-		:confirmHold="confirmHold"
-		:holdKeyboard="holdKeyboard"
-		:focus="focus"
-		:autoBlur="autoBlur"
-		:disableDefaultPadding="disableDefaultPadding"
-		:cursor="cursor"
-		:cursorSpacing="cursorSpacing"
-		:selectionStart="selectionStart"
-		:selectionEnd="selectionEnd"
-		:adjustPosition="adjustPosition"
-		:inputAlign="inputAlign"
-		:fontSize="fontSize"
-		:color="color"
-		:prefixIcon="prefixIcon"
-		:suffixIcon="suffixIcon"
-		:suffixIconStyle="suffixIconStyle"
-		:prefixIconStyle="prefixIconStyle"
-		:border="border"
-		:readonly="readonly"
-		:shape="shape"
-		:customStyle="customStyle"
-		:formatter="formatter"
-		:ignoreCompositionEvent="ignoreCompositionEvent"
-	>
-		<!-- #ifdef MP -->
-		<slot name="prefix"></slot>
-		<slot name="suffix"></slot>
-		<!-- #endif -->
-		<!-- #ifndef MP -->
-		<slot name="prefix" slot="prefix"></slot>
-		<slot name="suffix" slot="suffix"></slot>
-		<!-- #endif -->
-	</uvInput>
-</template>
-
-<script>
-	/**
-	 * 此组件存在的理由是，在nvue下，u-input被uni-app官方占用了，u-input在nvue中相当于input组件
-	 * 所以在nvue下，取名为u--input，内部其实还是u-input.vue，只不过做一层中转
-	 */
-	import uvInput from '../u-input/u-input.vue';
-	import { props } from '../u-input/props.js';
-	import { mpMixin } from '../../libs/mixin/mpMixin';
-	import { mixin } from '../../libs/mixin/mixin';
-	export default {
-		name: 'u--input',
-		mixins: [mpMixin, props, mixin],
-		components: {
-			uvInput
-		},
-	}
-</script>
\ No newline at end of file
diff --git a/uview-plus/components/u--text/u--text.vue b/uview-plus/components/u--text/u--text.vue
deleted file mode 100644
index 9cdcf7b..0000000
--- a/uview-plus/components/u--text/u--text.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<template>
-    <uvText
-        :type="type"
-        :show="show"
-        :text="text"
-        :prefixIcon="prefixIcon"
-        :suffixIcon="suffixIcon"
-        :mode="mode"
-        :href="href"
-        :format="format"
-        :call="call"
-        :openType="openType"
-        :bold="bold"
-        :block="block"
-        :lines="lines"
-        :color="color"
-		:decoration="decoration"
-        :size="size"
-        :iconStyle="iconStyle"
-        :margin="margin"
-        :lineHeight="lineHeight"
-        :align="align"
-        :wordWrap="wordWrap"
-        :customStyle="customStyle"
-    ></uvText>
-</template>
-
-<script>
-/**
- * 此组件存在的理由是，在nvue下，u-text被uni-app官方占用了，u-text在nvue中相当于input组件
- * 所以在nvue下，取名为u--input，内部其实还是u-text.vue，只不过做一层中转
- * 不使用v-bind="$attrs"，而是分开独立写传参，是因为微信小程序不支持此写法
- */
-import uvText from "../u-text/u-text.vue";
-import { props } from "../u-text/props.js";
-import { mpMixin } from '../../libs/mixin/mpMixin.js'
-import { mixin } from '../../libs/mixin/mixin.js'
-export default {
-    name: "u--text",
-    mixins: [mpMixin, mixin, props,],
-    components: {
-        uvText,
-    },
-};
-</script>
diff --git a/uview-plus/components/u--textarea/u--textarea.vue b/uview-plus/components/u--textarea/u--textarea.vue
deleted file mode 100644
index becd23d..0000000
--- a/uview-plus/components/u--textarea/u--textarea.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-	<uvTextarea
-		:value="value"
-		:modelValue="modelValue"
-		:placeholder="placeholder"
-		:height="height"
-		:confirmType="confirmType"
-		:disabled="disabled"
-		:count="count"
-		:focus="focus"
-		:autoHeight="autoHeight"
-		:fixed="fixed"
-		:cursorSpacing="cursorSpacing"
-		:cursor="cursor"
-		:showConfirmBar="showConfirmBar"
-		:selectionStart="selectionStart"
-		:selectionEnd="selectionEnd"
-		:adjustPosition="adjustPosition"
-		:disableDefaultPadding="disableDefaultPadding"
-		:holdKeyboard="holdKeyboard"
-		:maxlength="maxlength"
-		:border="border"
-		:customStyle="customStyle"
-		:formatter="formatter"
-		:ignoreCompositionEvent="ignoreCompositionEvent"
-		@input="e => $emit('input', e)"
-		@update:modelValue="e => $emit('update:modelValue', e)"
-	></uvTextarea>
-</template>
-
-<script>
-	/**
-	 * 此组件存在的理由是，在nvue下，u--textarea被uni-app官方占用了，u-textarea在nvue中相当于textarea组件
-	 * 所以在nvue下，取名为u--textarea，内部其实还是u-textarea.vue，只不过做一层中转
-	 */
-	import uvTextarea from '../u-textarea/u-textarea.vue';
-	import { props } from '../u-textarea/props.js';
-	import { mpMixin } from '../../libs/mixin/mpMixin';
-	import { mixin } from '../../libs/mixin/mixin';
-	export default {
-		name: 'u--textarea',
-		mixins: [mpMixin, props, mixin],
-		components: {
-			uvTextarea
-		},
-	}
-</script>
diff --git a/uview-plus/components/u-action-sheet-data/u-action-sheet-data.vue b/uview-plus/components/u-action-sheet-data/u-action-sheet-data.vue
new file mode 100644
index 0000000..234d5cf
--- /dev/null
+++ b/uview-plus/components/u-action-sheet-data/u-action-sheet-data.vue
@@ -0,0 +1,109 @@
+<template>
+	<view class="u-action-sheet-data">
+		<view class="u-action-sheet-data__trigger">
+			<slot name="trigger"></slot>
+			<up-input
+				v-if="!$slots['trigger']"
+				:modelValue="current"
+				disabled
+				disabledColor="#ffffff"
+				:placeholder="title"
+				border="none"
+			></up-input>
+			<view @click="show = true"
+				class="u-action-sheet-data__trigger__cover"></view>
+		</view>
+		<up-action-sheet
+			:show="show"
+			:actions="options"
+			:title="title"
+			safeAreaInsetBottom
+			:description="description"
+			@close="show = false"
+			@select="select"
+		>
+		</up-action-sheet>
+	</view>
+</template>
+
+<script>
+export default {
+    props: {
+		modelValue: {
+			type: [String, Number],
+			default: ''
+		},
+		title: {
+			type: String,
+			default: ''
+		},
+		description: {
+			type: String,
+			default: ''
+		},
+		options: {
+			type: Array,
+			default: () => {
+				return []
+			}
+		},
+		valueKey: {
+			type: String,
+			default: 'value'
+		},
+		labelKey: {
+			type: String,
+			default: 'name'
+		}
+    },
+    data() {
+        return {
+			show: false,
+			current: '',
+        }
+    },
+    created() {
+		if (this.modelValue) {
+			this.options.forEach((ele) => {
+				if (ele[this.valueKey] == this.modelValue) {
+					this.current = ele[this.labelKey]
+				}
+			})
+		}
+    },
+    emits: ['update:modelValue'],
+	watch: {
+		modelValue() {
+			this.options.forEach((ele) => {
+				if (ele[this.valueKey] == this.modelValue) {
+					this.current = ele[this.labelKey]
+				}
+			})
+		}
+	},
+    methods: {
+        hideKeyboard() {
+            uni.hideKeyboard()
+        },
+        select(e) {
+            this.$emit('update:modelValue', e[this.valueKey])
+			this.current = e[this.labelKey]
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+	.u-action-sheet-data {
+		&__trigger {
+			position: relative;
+			&__cover {
+				position: absolute;
+				top: 0;
+				left: 0;
+				right: 0;
+				bottom: 0;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uview-plus/components/u-action-sheet/actionSheet.js b/uview-plus/components/u-action-sheet/actionSheet.js
index 086898d..bc27648 100644
--- a/uview-plus/components/u-action-sheet/actionSheet.js
+++ b/uview-plus/components/u-action-sheet/actionSheet.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:44:35
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/actionSheet.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-08-16 10:52:35
+ * @FilePath     : /uview-plus/libs/config/props/actionSheet.js
  */
 export default {
     // action-sheet组件
@@ -14,6 +14,8 @@ export default {
         title: '',
         description: '',
         actions: [],
+        nameKey: 'name',
+        subnameKey: 'subnameKey',
         index: '',
         cancelText: '',
         closeOnClickAction: true,
diff --git a/uview-plus/components/u-action-sheet/props.js b/uview-plus/components/u-action-sheet/props.js
index eb45834..e08c9af 100644
--- a/uview-plus/components/u-action-sheet/props.js
+++ b/uview-plus/components/u-action-sheet/props.js
@@ -1,3 +1,11 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 3.0
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-08-16 10:52:35
+ * @FilePath     : /uview-plus/libs/config/props/props.js
+ */
 import { defineMixin } from '../../libs/vue'
 import defProps from '../../libs/config/props.js'
 
@@ -23,6 +31,16 @@ export const props = defineMixin({
             type: Array,
             default: () => defProps.actionSheet.actions
         },
+        // 选项名称key
+        nameKey: {
+            type: String,
+            default: () => defProps.actionSheet.nameKey
+        },
+        // 选项子名称key
+        subnameKey: {
+            type: String,
+            default: () => defProps.actionSheet.subnameKey
+        },
         // 取消按钮的文字，不为空时显示按钮
         cancelText: {
             type: String,
diff --git a/uview-plus/components/u-action-sheet/u-action-sheet.vue b/uview-plus/components/u-action-sheet/u-action-sheet.vue
index 98174b8..46a9ba1 100644
--- a/uview-plus/components/u-action-sheet/u-action-sheet.vue
+++ b/uview-plus/components/u-action-sheet/u-action-sheet.vue
@@ -1,4 +1,3 @@
-
 <template>
 	<u-popup
 	    :show="show"
@@ -8,6 +7,7 @@
 	    :round="round"
 	>
 		<view class="u-action-sheet">
+			<!-- 顶部标题区域 -->
 			<view
 			    class="u-action-sheet__header"
 			    v-if="title"
@@ -17,14 +17,15 @@
 				    class="u-action-sheet__header__icon-wrap"
 				    @tap.stop="cancel"
 				>
-					<u-icon
+					<up-icon
 					    name="close"
 					    size="17"
 					    color="#c8c9cc"
 					    bold
-					></u-icon>
+					></up-icon>
 				</view>
 			</view>
+			<!-- 描述信息 -->
 			<text
 			    class="u-action-sheet__description"
 				:style="[{
@@ -33,7 +34,9 @@
 			    v-if="description"
 			>{{description}}</text>
 			<slot>
+				<!-- 分割线 -->
 				<u-line v-if="description"></u-line>
+				<!-- 操作项列表 -->
 				<scroll-view scroll-y class="u-action-sheet__item-wrap" :style="{maxHeight: wrapMaxHeight}">
 					<view :key="index" v-for="(item, index) in actions">
 						<!-- #ifdef MP -->
@@ -62,17 +65,19 @@
 							    @tap.stop="selectHandler(index)"
 							    :hover-class="!item.disabled && !item.loading ? 'u-action-sheet--hover' : ''"
 							    :hover-stay-time="150"
+							    :style="getItemHoverStyle(index)"
 							>
 								<template v-if="!item.loading">
 									<text
 									    class="u-action-sheet__item-wrap__item__name"
 									    :style="[itemStyle(index)]"
-									>{{ item.name }}</text>
+									>{{ item[nameKey] }}</text>
 									<text
-									    v-if="item.subname"
+									    v-if="item[subnameKey]"
 									    class="u-action-sheet__item-wrap__item__subname"
-									>{{ item.subname }}</text>
+									>{{ item[subnameKey] }}</text>
 								</template>
+								<!-- 加载状态图标 -->
 								<u-loading-icon
 								    v-else
 								    custom-class="van-action-sheet__loading"
@@ -83,15 +88,18 @@
 							<!-- #ifdef MP -->
 						</button>
 						<!-- #endif -->
+						<!-- 选项间分割线 -->
 						<u-line v-if="index !== actions.length - 1"></u-line>
 					</view>
 				</scroll-view>
 			</slot>
+			<!-- 取消按钮前的分割区域 -->
 			<u-gap
 			    bgColor="#eaeaec"
 			    height="6"
 			    v-if="cancelText"
 			></u-gap>
+			<!-- 取消按钮 -->
 			<view class="u-action-sheet__item-wrap__item u-action-sheet__cancel"
 				hover-class="u-action-sheet--hover" @tap="cancel" v-if="cancelText">
 				<text
@@ -114,7 +122,7 @@
 	/**
 	 * ActionSheet 操作菜单
 	 * @description 本组件用于从底部弹出一个操作菜单，供用户选择并返回结果。本组件功能类似于uni的uni.showActionSheetAPI，配置更加灵活，所有平台都表现一致。
-	 * @tutorial https://ijry.github.io/uview-plus/components/actionSheet.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/actionSheet.html
 	 * 
 	 * @property {Boolean}			show				操作菜单是否展示 （默认 false ）
 	 * @property {String}			title				操作菜单标题
@@ -168,6 +176,7 @@
 		},
 		emits: ["close", "select", "update:show"],
 		methods: {
+			// 关闭操作菜单事件处理
 			closeHandler() {
 				// 允许点击遮罩关闭时，才发出close事件
 				if(this.closeOnClickOverlay) {
@@ -180,6 +189,7 @@
 				this.$emit('update:show', false)
 				this.$emit('close')
 			},
+			// 选择操作项处理
 			selectHandler(index) {
 				const item = this.actions[index]
 				if (item && !item.disabled && !item.loading) {
@@ -190,12 +200,21 @@
 					}
 				}
 			},
+			// 动态处理Hover时候第一个item的圆角
+			getItemHoverStyle(index) {
+				if (index === 0 && this.round && !this.title && !this.description) {
+					return {
+						borderTopLeftRadius: `${this.round}px`,
+						borderTopRightRadius: `${this.round}px`,
+					}
+				}
+				return {}
+			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	$u-action-sheet-reset-button-width:100% !default;
 	$u-action-sheet-title-font-size: 16px !default;
 	$u-action-sheet-title-padding: 12px 30px !default;
@@ -280,4 +299,4 @@
 			background-color: $u-action-sheet-cancel-text-hover-background-color;
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/uview-plus/components/u-agreement/u-agreement.vue b/uview-plus/components/u-agreement/u-agreement.vue
new file mode 100644
index 0000000..438c467
--- /dev/null
+++ b/uview-plus/components/u-agreement/u-agreement.vue
@@ -0,0 +1,76 @@
+<style scoped lang="scss">
+    .agreement-content {
+        width: 100%;;
+        display: inline-block;
+        flex-direction: column;
+        .agreement-url {
+            display: inline-block;
+            color: blue;
+            // #ifdef H5
+            cursor: pointer;
+            // #endif
+        }
+    }
+</style>
+
+<template>
+    <view class="up-agreement">
+        <up-modal v-model:show="show" showCancelButton @confirm="confirm" @cancel="close" confirmText="阅读并同意">
+            <view class="agreement-content">
+                <slot>
+                    我们非常重视您的个人信息和隐私保护。为了更好地保障您的个人权益，在您使用我们的产品前，
+                    请务必审慎阅读《<text class="agreement-url" @click="urlClick('urlProtocol')">用户协议</text>》
+                    和《<text class="agreement-url" @click="urlClick('urlPrivacy')">隐私政策</text>》内的所有条款，
+                    尤其是:1.我们对您的个人信息的收集/保存/使用/对外提供/保护等规则条款，以及您的用户权利等条款;2. 约定我们的限制责任、免责
+                    条款;3.其他以颜色或加粗进行标识的重要条款。如您对以上协议有任何疑问，请先不要同意，您点击“同意并继续”的行为即表示您已阅读
+                    完毕并同意以上协议的全部内容。
+                </slot>
+            </view>
+        </up-modal>
+    </view>
+</template>
+
+<script>
+    export default {
+        name: 'up-agreement',
+        props: {
+            urlProtocol: {
+                type: String,
+                default: '/pages/user_agreement/agreement/info?title=用户协议'
+            },
+            urlPrivacy: {
+                type: String,
+                default: '/pages/user_agreement/agreement/info?title=隐私政策'
+            },
+        },
+        emits: ['confirm'],
+        data() {
+            return {
+                show: false
+            }
+        },
+        methods: {
+            close() {
+                // #ifdef H5
+                window.opener = null;
+                window.close();
+                // #endif
+                // #ifdef APP-PLUS
+                plus.runtime.quit();
+                // #endif
+            },
+            confirm() {
+                this.show = false;
+                this.$emit('confirm', 1);
+            },
+            showModal() {
+                this.show = true;
+            },
+            urlClick(type) {
+                uni.navigateTo({
+                    url: this[type]
+                });
+            }
+        }
+    }
+</script>
diff --git a/uview-plus/components/u-album/album.js b/uview-plus/components/u-album/album.js
index 8aebaba..e7568bf 100644
--- a/uview-plus/components/u-album/album.js
+++ b/uview-plus/components/u-album/album.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:47:24
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/album.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-08-16 16:32:24
+ * @FilePath     : /uview-plus/libs/config/props/album.js
  */
 export default {
     // album 组件
diff --git a/uview-plus/components/u-album/props.js b/uview-plus/components/u-album/props.js
index a219acb..a8d5474 100644
--- a/uview-plus/components/u-album/props.js
+++ b/uview-plus/components/u-album/props.js
@@ -1,5 +1,14 @@
+/*
+ * @Author       : jry
+ * @Description  :
+ * @version      : 3.0
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-08-16 16:35:24
+ * @FilePath     : /uview-plus/components/u-album/props.js
+ */
 import { defineMixin } from '../../libs/vue'
 import defProps from '../../libs/config/props.js'
+
 export const props = defineMixin({
     props: {
         // 图片地址，Array<String>|Array<Object>形式
diff --git a/uview-plus/components/u-album/u-album.vue b/uview-plus/components/u-album/u-album.vue
index 08f987a..fb6b58d 100644
--- a/uview-plus/components/u-album/u-album.vue
+++ b/uview-plus/components/u-album/u-album.vue
@@ -1,5 +1,6 @@
 <template>
     <view class="u-album">
+        <!-- 相册行容器，每行显示 rowCount 个图片 -->
         <view
             class="u-album__row"
             ref="u-album__row"
@@ -8,13 +9,15 @@
             :key="index"
             :style="{flexWrap: autoWrap ? 'wrap' : 'nowrap'}"
         >
+            <!-- 图片包装容器 -->
             <view
                 class="u-album__row__wrapper"
                 v-for="(item, index1) in arr"
                 :key="index1"
                 :style="[imageStyle(index + 1, index1 + 1)]"
-                @tap="previewFullImage ? onPreviewTap($event, getSrc(item)) : ''"
+                @tap="onPreviewTap($event, getSrc(item))"
             >
+                <!-- 图片显示 -->
                 <image
                     :src="getSrc(item)"
                     :mode="
@@ -32,6 +35,7 @@
                         }
                     ]"
                 ></image>
+                <!-- 超出最大显示数量时的更多提示 -->
                 <view
                     v-if="
                         showMore &&
@@ -64,14 +68,14 @@ import { mixin } from '../../libs/mixin/mixin';
 import { addUnit, sleep } from '../../libs/function/index';
 import test from '../../libs/function/test';
 // #ifdef APP-NVUE
-// 由于weex为阿里的KPI业绩考核的产物，所以不支持百分比单位，这里需要通过dom查询组件的宽度
+// 不支持百分比单位，这里需要通过dom查询组件的宽度
 const dom = uni.requireNativePlugin('dom')
 // #endif
 
 /**
  * Album 相册
  * @description 本组件提供一个类似相册的功能，让开发者开发起来更加得心应手。减少重复的模板代码
- * @tutorial https://ijry.github.io/uview-plus/components/album.html
+ * @tutorial https://uview-plus.jiangruyi.com/components/album.html
  *
  * @property {Array}           urls             图片地址列表 Array<String>|Array<Object>形式
  * @property {String}          keyName          指定从数组的对象元素中读取哪个属性作为图片地址
@@ -108,14 +112,20 @@ export default {
         urls: {
             immediate: true,
             handler(newVal) {
+                // 当只有一张图片时，获取图片尺寸信息
                 if (newVal.length === 1) {
                     this.getImageRect()
                 }
             }
         }
     },
-	emits: ["albumWidth"],
     computed: {
+        /**
+         * 计算图片样式
+         * @param {Number} index1 - 行索引
+         * @param {Number} index2 - 列索引
+         * @returns {Object} 图片样式对象
+         */
         imageStyle() {
             return (index1, index2) => {
                 const { space, rowCount, multipleSize, urls } = this,
@@ -139,11 +149,16 @@ export default {
                 return style
             }
         },
-        // 将数组划分为二维数组
+        /**
+         * 将图片地址数组划分为二维数组，用于按行显示
+         * @returns {Array} 二维数组，每个子数组代表一行图片
+         */
         showUrls() {
             if (this.autoWrap) {
+                // 自动换行模式下，所有图片放在一行中显示
                 return [ this.urls.slice(0, this.maxCount) ];
             } else {
+                // 固定行数模式下，按 rowCount 分割图片
                 const arr = []
                 this.urls.map((item, index) => {
                     // 限制最大展示数量
@@ -160,18 +175,29 @@ export default {
                 return arr
             }
         },
+        /**
+         * 计算图片宽度
+         * @returns {String} 图片宽度样式值
+         */
         imageWidth() {
             return addUnit(
                 this.urls.length === 1 ? this.singleWidth : this.multipleSize, this.unit
             )
         },
+        /**
+         * 计算图片高度
+         * @returns {String} 图片高度样式值
+         */
         imageHeight() {
             return addUnit(
                 this.urls.length === 1 ? this.singleHeight : this.multipleSize, this.unit
             )
         },
-        // 此变量无实际用途，仅仅是为了利用computed特性，让其在urls长度等变化时，重新计算图片的宽度
-        // 因为用户在某些特殊的情况下，需要让文字与相册的宽度相等，所以这里事件的形式对外发送
+        /**
+         * 计算相册总宽度，用于外部组件对齐
+         * 此变量无实际用途，仅仅是为了利用computed特性，让其在urls长度等变化时，重新计算图片的宽度
+         * @returns {Number} 相册宽度
+         */
         albumWidth() {
             let width = 0
             if (this.urls.length === 1) {
@@ -185,59 +211,100 @@ export default {
             return width
         }
     },
+    emits: ['preview', 'albumWidth'],
     methods: {
         addUnit,
-        // 预览图片
+        /**
+         * 点击图片预览
+         * @param {Event} e - 点击事件对象
+         * @param {String} url - 当前点击图片的地址
+         */
         onPreviewTap(e, url) {
+            // 获取所有图片地址
             const urls = this.urls.map((item) => {
                 return this.getSrc(item)
             })
-            uni.previewImage({
-                current: url,
-                urls
-            })
-            // 是否阻止事件传播
-			this.stop && this.preventEvent(e)
+            if (this.previewFullImage) {
+                // 使用系统默认预览图片功能
+                uni.previewImage({
+                    current: url,
+                    urls
+                })
+                // 是否阻止事件传播
+                this.stop && this.preventEvent(e)
+            } else {
+                // 发送自定义预览事件
+                this.$emit('preview', {
+                    urls,
+                    currentIndex: urls.indexOf(url)
+                })
+            }
         },
-        // 获取图片的路径
+        /**
+         * 获取图片地址
+         * @param {String|Object} item - 图片项，可以是字符串或对象
+         * @returns {String} 图片地址
+         */
         getSrc(item) {
             return test.object(item)
                 ? (this.keyName && item[this.keyName]) || item.src
                 : item
         },
-        // 单图时，获取图片的尺寸
-        // 在小程序中，需要将网络图片的的域名添加到小程序的download域名才可能获取尺寸
-        // 在没有添加的情况下，让单图宽度默认为盒子的一定宽度(singlePercent)
+        /**
+         * 单图时，获取图片的尺寸
+         * 在小程序中，需要将网络图片的的域名添加到小程序的download域名才可能获取尺寸
+         * 在没有添加的情况下，让单图宽度默认为盒子的一定宽度(singlePercent)
+         */
         getImageRect() {
             const src = this.getSrc(this.urls[0])
             uni.getImageInfo({
                 src,
                 success: (res) => {
+                    let singleSize = this.singleSize;
+                    // 单位
+                    let unit = '';
+                    if (Number.isNaN(Number(this.singleSize))) {
+                        // 大小中有字符 则记录字符
+                        unit = this.singleSize.replace(/\d+/g, ''); // 单位
+                        singleSize = Number(this.singleSize.replace(/\D+/g, ''), 10); // 具体值
+                    }
+
                     // 判断图片横向还是竖向展示方式
                     const isHorizotal = res.width >= res.height
                     this.singleWidth = isHorizotal
-                        ? this.singleSize
-                        : (res.width / res.height) * this.singleSize
+                        ? singleSize
+                        : (res.width / res.height) * singleSize
                     this.singleHeight = !isHorizotal
-                        ? this.singleSize
+                        ? singleSize
                         : (res.height / res.width) * this.singleWidth
+
+                    // 如果有单位统一设置单位
+                    if(unit != null && unit !== ''){
+                        this.singleWidth = this.singleWidth + unit
+                        this.singleHeight = this.singleHeight + unit
+                    }
                 },
                 fail: () => {
+                    // 获取图片信息失败时，通过组件宽度计算
                     this.getComponentWidth()
                 }
             })
         },
-        // 获取组件的宽度
+        /**
+         * 获取组件的宽度，用于计算单图显示尺寸
+         */
         async getComponentWidth() {
             // 延时一定时间，以获取dom尺寸
             await sleep(30)
             // #ifndef APP-NVUE
+            // H5、小程序等平台通过 $uGetRect 获取组件宽度
             this.$uGetRect('.u-album__row').then((size) => {
                 this.singleWidth = size.width * this.singlePercent
             })
             // #endif
 
             // #ifdef APP-NVUE
+            // NVUE 平台通过 dom 插件获取组件宽度
             // 这里ref="u-album__row"所在的标签为通过for循环出来，导致this.$refs['u-album__row']是一个数组
             const ref = this.$refs['u-album__row'][0]
             ref &&
@@ -251,8 +318,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../../libs/css/components.scss';
-
 .u-album {
     @include flex(column);
 
@@ -276,4 +341,4 @@ export default {
         }
     }
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/uview-plus/components/u-alert/alert.js b/uview-plus/components/u-alert/alert.js
index 8f8182c..fb543c0 100644
--- a/uview-plus/components/u-alert/alert.js
+++ b/uview-plus/components/u-alert/alert.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:48:53
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/alert.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-08-17 17:23:53
+ * @FilePath     : /uview-plus/libs/config/props/alert.js
  */
 export default {
     // alert警告组件
@@ -17,6 +17,10 @@ export default {
         showIcon: false,
         effect: 'light',
         center: false,
-        fontSize: 14
+        fontSize: 14,
+        transitionMode: 'fade',
+        duration: 0,
+        icon: '',
+        value: true
     }
 }
diff --git a/uview-plus/components/u-alert/props.js b/uview-plus/components/u-alert/props.js
index 9f150b5..88fb972 100644
--- a/uview-plus/components/u-alert/props.js
+++ b/uview-plus/components/u-alert/props.js
@@ -1,5 +1,14 @@
+/*
+ * @Author       : jry
+ * @Description  :
+ * @version      : 3.0
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-08-17 17:23:53
+ * @FilePath     : /uview-plus/libs/config/props/props.js
+ */
 import { defineMixin } from '../../libs/vue'
 import defProps from '../../libs/config/props.js'
+
 export const props = defineMixin({
     props: {
         // 显示文字
@@ -41,6 +50,26 @@ export const props = defineMixin({
         fontSize: {
             type: [String, Number],
             default: () => defProps.alert.fontSize
+        },
+        // 动画类型
+        transitionMode: {
+            type: [String],
+            default: () => defProps.alert.transitionMode
+        },
+        // 自动定时关闭毫秒
+        duration: {
+            type: [Number],
+            default: () => defProps.alert.duration
+        },
+        // 自定义图标
+        icon: {
+            type: [String],
+            default: () => defProps.alert.icon
+        },
+        // 是否显示
+        modelValue: {
+            type: [Boolean],
+            default: () => defProps.alert.value
         }
     }
 })
diff --git a/uview-plus/components/u-alert/u-alert.vue b/uview-plus/components/u-alert/u-alert.vue
index 9f4fc4b..8b09720 100644
--- a/uview-plus/components/u-alert/u-alert.vue
+++ b/uview-plus/components/u-alert/u-alert.vue
@@ -1,6 +1,6 @@
 <template>
-	<u-transition
-	    mode="fade"
+	<up-transition
+	    :mode="transitionMode"
 	    :show="show"
 	>
 		<view
@@ -9,22 +9,25 @@
 		    @tap.stop="clickHandler"
 		    :style="[addStyle(customStyle)]"
 		>
+			<!-- 左侧图标 -->
 			<view
 			    class="u-alert__icon"
 			    v-if="showIcon"
 			>
-				<u-icon
+				<up-icon
 				    :name="iconName"
 				    size="18"
 				    :color="iconColor"
-				></u-icon>
+				></up-icon>
 			</view>
+			<!-- 内容区域 -->
 			<view
 			    class="u-alert__content"
 			    :style="[{
 					paddingRight: closable ? '20px' : 0
 				}]"
 			>
+				<!-- 标题 -->
 				<text
 				    class="u-alert__content__title"
 				    v-if="title"
@@ -34,6 +37,7 @@
 					}]"
 				    :class="[effect === 'dark' ? 'u-alert__text--dark' : `u-alert__text--${type}--light`]"
 				>{{ title }}</text>
+				<!-- 描述信息 -->
 				<text
 				    class="u-alert__content__desc"
 					v-if="description"
@@ -44,19 +48,22 @@
 				    :class="[effect === 'dark' ? 'u-alert__text--dark' : `u-alert__text--${type}--light`]"
 				>{{ description }}</text>
 			</view>
+			<!-- 关闭按钮 -->
 			<view
 			    class="u-alert__close"
 			    v-if="closable"
 			    @tap.stop="closeHandler"
 			>
-				<u-icon
-				    name="close"
-				    :color="iconColor"
-				    size="15"
-				></u-icon>
+				<slot name="close">
+					<up-icon
+					    name="close"
+					    :color="iconColor"
+					    size="15"
+					></up-icon>
+				</slot>
 			</view>
 		</view>
-	</u-transition>
+	</up-transition>
 </template>
 
 <script>
@@ -67,10 +74,10 @@
 	/**
 	 * Alert  警告提示
 	 * @description 警告提示，展现需要关注的信息。
-	 * @tutorial https://ijry.github.io/uview-plus/components/alertTips.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/alertTips.html
 	 * 
 	 * @property {String}			title       显示的文字 
-	 * @property {String}			type        使用预设的颜色  （默认 'warning' ）
+	 * @property {String}			type        使用预设的颜色 （默认 'warning' ）
 	 * @property {String}			description 辅助性文字，颜色比title浅一点，字号也小一点，可选  
 	 * @property {Boolean}			closable    关闭按钮(默认为叉号icon图标)  （默认 false ）
 	 * @property {Boolean}			showIcon    是否显示左边的辅助图标   （ 默认 false ）
@@ -78,24 +85,34 @@
 	 * @property {Boolean}			center		文字是否居中  （默认 false ）
 	 * @property {String | Number}	fontSize    字体大小  （默认 14 ）
 	 * @property {Object}			customStyle	定义需要用到的外部样式
+	 * @property {String}			transitionMode 过渡动画模式 （默认 'fade' ）
+	 * @property {String | Number}	duration	自动关闭延时(毫秒)，设置为0或负数则不自动关闭 （默认 0 ）
+	 * @property {String}			icon		自定义图标名称，优先级高于type默认图标
+	 * @property {Boolean}			modelValue/v-model	绑定值，控制是否显示 （默认 true ）
 	 * @event    {Function}        click       点击组件时触发
 	 * @event    {Function}        close       点击关闭按钮时触发
-	 * @example  <u-alert :title="title"  type = "warning" :closable="closable" :description = "description"></u-alert>
+	 * @event    {Function}        closed      关闭动画结束时触发
+	 * @example  <up-alert :title="title"  type = "warning" :closable="closable" :description = "description"></up-alert>
 	 */
 	export default {
 		name: 'u-alert',
 		mixins: [mpMixin, mixin, props],
 		data() {
 			return {
+				// 控制组件显示隐藏
 				show: true
 			}
 		},
 		computed: {
+			// 根据不同的主题类型返回对应的图标颜色
 			iconColor() {
 				return this.effect === 'light' ? this.type : '#fff'
 			},
 			// 不同主题对应不同的图标
 			iconName() {
+				// 如果用户自定义了图标，则优先使用自定义图标
+				if (this.icon) return this.icon;
+				
 				switch (this.type) {
 					case 'success':
 						return 'checkmark-circle-fill';
@@ -117,25 +134,50 @@
 				}
 			}
 		},
-		emits: ["click","close"],
+		emits: ["click","close", "closed", "update:modelValue"],
+		watch: {
+			modelValue: {
+				handler(newVal) {
+					this.show = newVal;
+				},
+				immediate: true
+			},
+			show: {
+				handler(newVal) {
+					this.$emit('update:modelValue', newVal);
+					
+					// 如果是从显示到隐藏，且启用了自动关闭功能
+					if (!newVal && this.duration > 0) {
+						this.$emit('closed');
+					}
+				}
+			}
+		},
+		mounted() {
+			// 如果设置了自动关闭时间，则在指定时间后自动关闭
+			if (this.duration > 0) {
+				setTimeout(() => {
+					this.closeHandler();
+				}, this.duration);
+			}
+		},
 		methods: {
 			addUnit,
 			addStyle,
-			// 点击内容
+			// 点击内容区域触发click事件
 			clickHandler() {
 				this.$emit('click')
 			},
-			// 点击关闭按钮
+			// 点击关闭按钮触发close事件并隐藏组件
 			closeHandler() {
 				this.show = false   
-				this.$emit('close')
+				this.$emit('close');
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-alert {
 		position: relative;
diff --git a/uview-plus/components/u-avatar-group/avatarGroup.js b/uview-plus/components/u-avatar-group/avatarGroup.js
index 29ad008..6e81ba3 100644
--- a/uview-plus/components/u-avatar-group/avatarGroup.js
+++ b/uview-plus/components/u-avatar-group/avatarGroup.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:49:55
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/avatarGroup.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/avatarGroup.js
  */
 export default {
     // avatarGroup 组件
diff --git a/uview-plus/components/u-avatar-group/u-avatar-group.vue b/uview-plus/components/u-avatar-group/u-avatar-group.vue
index fdfeaad..6635014 100644
--- a/uview-plus/components/u-avatar-group/u-avatar-group.vue
+++ b/uview-plus/components/u-avatar-group/u-avatar-group.vue
@@ -40,7 +40,7 @@
 	/**
 	 * AvatarGroup  头像组
 	 * @description 本组件一般用于展示头像的地方，如个人中心，或者评论列表页的用户头像展示等场所。
-	 * @tutorial https://ijry.github.io/uview-plus/components/avatar.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/avatar.html
 	 * 
 	 * @property {Array}           urls     头像图片组 （默认 [] ）
 	 * @property {String | Number} maxCount 最多展示的头像数量 （ 默认 5 ）
@@ -79,7 +79,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-avatar-group {
 		@include flex;
diff --git a/uview-plus/components/u-avatar/avatar.js b/uview-plus/components/u-avatar/avatar.js
index c097d4e..b469247 100644
--- a/uview-plus/components/u-avatar/avatar.js
+++ b/uview-plus/components/u-avatar/avatar.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:49:22
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/avatar.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/avatar.js
  */
 export default {
     // avatar 组件
diff --git a/uview-plus/components/u-avatar/u-avatar.vue b/uview-plus/components/u-avatar/u-avatar.vue
index 1830e35..864323e 100644
--- a/uview-plus/components/u-avatar/u-avatar.vue
+++ b/uview-plus/components/u-avatar/u-avatar.vue
@@ -23,12 +23,12 @@
 			<!-- #ifndef MP-WEIXIN && MP-QQ && MP-BAIDU  -->
 			<template v-if="mpAvatar && allowMp"></template>
 			<!-- #endif -->
-			<u-icon
+			<up-icon
 				v-else-if="icon"
 				:name="icon"
 				:size="fontSize"
 				:color="color"
-			></u-icon>
+			></up-icon>
 			<up-text
 				v-else-if="text"
 				:text="text"
@@ -63,7 +63,7 @@
 	/**
 	 * Avatar  头像
 	 * @description 本组件一般用于展示头像的地方，如个人中心，或者评论列表页的用户头像展示等场所。
-	 * @tutorial https://ijry.github.io/uview-plus/components/avatar.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/avatar.html
 	 *
 	 * @property {String}			src				头像路径，如加载失败，将会显示默认头像(不能为相对路径)
 	 * @property {String}			shape			头像形状  （ circle (默认) | square）
@@ -151,7 +151,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-avatar {
 		@include flex;
diff --git a/uview-plus/components/u-back-top/backtop.js b/uview-plus/components/u-back-top/backtop.js
index 13052ab..11918bc 100644
--- a/uview-plus/components/u-back-top/backtop.js
+++ b/uview-plus/components/u-back-top/backtop.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:50:18
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/backtop.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/backtop.js
  */
 export default {
     // backtop组件
diff --git a/uview-plus/components/u-back-top/u-back-top.vue b/uview-plus/components/u-back-top/u-back-top.vue
index fcdb045..d9d8b52 100644
--- a/uview-plus/components/u-back-top/u-back-top.vue
+++ b/uview-plus/components/u-back-top/u-back-top.vue
@@ -10,10 +10,10 @@
 		    v-if="!$slots.default && !$slots.$default"
 			@click="backToTop"
 		>
-			<u-icon
+			<up-icon
 			    :name="icon"
 			    :custom-style="iconStyle"
-			></u-icon>
+			></up-icon>
 			<text
 			    v-if="text"
 			    class="u-back-top__text"
@@ -111,7 +111,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import '../../libs/css/components.scss';
      $u-back-top-flex:1 !default;
      $u-back-top-height:100% !default;
      $u-back-top-background-color:#E1E1E1 !default;
diff --git a/uview-plus/components/u-badge/badge.js b/uview-plus/components/u-badge/badge.js
index 8818f98..c5f37ee 100644
--- a/uview-plus/components/u-badge/badge.js
+++ b/uview-plus/components/u-badge/badge.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-23 19:51:50
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/badge.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/badge.js
  */
 export default {
     // 徽标数组件
diff --git a/uview-plus/components/u-badge/u-badge.vue b/uview-plus/components/u-badge/u-badge.vue
index ecc843f..6e03954 100644
--- a/uview-plus/components/u-badge/u-badge.vue
+++ b/uview-plus/components/u-badge/u-badge.vue
@@ -89,7 +89,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	$u-badge-primary: $u-primary !default;
 	$u-badge-error: $u-error !default;
diff --git a/uview-plus/components/u-barcode/u-barcode.vue b/uview-plus/components/u-barcode/u-barcode.vue
new file mode 100644
index 0000000..9512c43
--- /dev/null
+++ b/uview-plus/components/u-barcode/u-barcode.vue
@@ -0,0 +1,1000 @@
+<template>
+  <view class="u-barcode" v-if="calcSizeDone">
+    <canvas 
+      v-if="showCanvas && !error" 
+      :id="canvasId" 
+      :canvas-id="canvasId" 
+      :style="{ width: canvasWidth + 'px', height: canvasHeight + 'px' }"
+    ></canvas>
+    <image 
+      v-else-if="!showCanvas && !error"
+      :src="barcodeImage" 
+      :style="{ width: canvasWidth + 'px', height: canvasHeight + 'px' }"
+      mode="aspectFit"
+    />
+    <view 
+      v-else
+      class="error-container"
+      :style="{ width: canvasWidth + 'px', height: canvasHeight + 'px' }"
+    >
+      <text class="error-text">{{ error }}</text>
+    </view>
+  </view>
+</template>
+
+<script>
+import { nextTick } from 'vue'
+import { t } from '../../libs/i18n'
+
+export default {
+  name: 'u-barcode',
+  props: {
+    // 条码值
+    value: {
+      type: [String, Number],
+      required: true
+    },
+    // 条码格式
+    format: {
+      type: String,
+      default: 'auto',
+      validator: function (value) {
+        return [
+          'auto', 
+          'CODE128', 'CODE128A', 'CODE128B', 'CODE128C',
+          'EAN13', 'EAN8', 'EAN5', 'EAN2',
+          'UPC', 'UPCA', 'UPCE',
+          'CODE39',
+          'ITF', 'ITF14',
+          'MSI', 'MSI10', 'MSI11', 'MSI1010', 'MSI1110',
+          'pharmacode',
+          'codabar'
+        ].includes(value)
+      }
+    },
+    // 宽度
+    width: {
+      type: Number,
+      default: 200
+    },
+    // 高度
+    height: {
+      type: Number,
+      default: 80
+    },
+    // 是否显示文本
+    displayValue: {
+      type: Boolean,
+      default: true
+    },
+    // 文本内容
+    text: {
+      type: String,
+      default: undefined
+    },
+    // 字体选项
+    fontOptions: {
+      type: String,
+      default: ''
+    },
+    // 字体
+    font: {
+      type: String,
+      default: 'monospace'
+    },
+    // 文本对齐方式
+    textAlign: {
+      type: String,
+      default: 'center'
+    },
+    // 文本位置
+    textPosition: {
+      type: String,
+      default: 'bottom'
+    },
+    // 文本边距
+    textMargin: {
+      type: Number,
+      default: 2
+    },
+    // 字体大小
+    fontSize: {
+      type: Number,
+      default: 14
+    },
+    // 背景色
+    background: {
+      type: String,
+      default: '#ffffff'
+    },
+    // 条码颜色
+    lineColor: {
+      type: String,
+      default: '#000000'
+    },
+    // 边距
+    margin: {
+      type: Number,
+      default: 10
+    },
+    // 上边距
+    marginTop: {
+      type: Number,
+      default: undefined
+    },
+    // 下边距
+    marginBottom: {
+      type: Number,
+      default: undefined
+    },
+    // 左边距
+    marginLeft: {
+      type: Number,
+      default: undefined
+    },
+    // 右边距
+    marginRight: {
+      type: Number,
+      default: undefined
+    },
+    // 使用canvas还是生成图片
+    useCanvas: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      canvasId: 'barcode-' + Math.random().toString(36).substr(2, 9),
+      barcodeImage: '',
+      showCanvas: false,
+      canvasWidth: 0,
+      canvasHeight: 0,
+      calcSizeDone: false,
+      error: ''
+    }
+  },
+  watch: {
+    value() {
+      this.generateBarcode()
+    },
+    format() {
+      this.generateBarcode()
+    },
+    width() {
+      this.generateBarcode()
+    },
+    height() {
+      this.generateBarcode()
+    },
+    displayValue() {
+      this.generateBarcode()
+    },
+    text() {
+      this.generateBarcode()
+    },
+    font() {
+      this.generateBarcode()
+    },
+    textAlign() {
+      this.generateBarcode()
+    },
+    textPosition() {
+      this.generateBarcode()
+    },
+    textMargin() {
+      this.generateBarcode()
+    },
+    fontSize() {
+      this.generateBarcode()
+    },
+    background() {
+      this.generateBarcode()
+    },
+    lineColor() {
+      this.generateBarcode()
+    },
+    margin() {
+      this.generateBarcode()
+    }
+  },
+  mounted() {
+    /**
+     * @author jry <ijry@qq.com>
+     */
+    this.$nextTick(() => {
+      this.generateBarcode()
+    })
+  },
+  methods: {
+    /**
+     * 生成条形码
+     * @author jry <ijry@qq.com>
+     * @param {String|Number} value - 条码值
+     * @param {Object} options - 条码配置选项
+     */
+    generateBarcode() {
+      // 统一处理默认值
+      const margin = this.margin
+      const options = {
+        format: this.format || 'auto',
+        width: this.width,
+        height: this.height,
+        displayValue: this.displayValue,
+        text: this.text,
+        fontOptions: this.fontOptions || '',
+        font: this.font || 'monospace',
+        textAlign: this.textAlign || 'center',
+        textPosition: this.textPosition || 'bottom',
+        textMargin: this.textMargin !== undefined ? this.textMargin : 2,
+        fontSize: this.fontSize || 20,
+        background: this.background || '#ffffff',
+        lineColor: this.lineColor || '#000000',
+        margin: margin,
+        marginTop: this.marginTop !== undefined ? this.marginTop : margin,
+        marginBottom: this.marginBottom !== undefined ? this.marginBottom : margin,
+        marginLeft: this.marginLeft !== undefined ? this.marginLeft : margin,
+        marginRight: this.marginRight !== undefined ? this.marginRight : margin
+      }
+      
+      // 清理未定义的选项
+      Object.keys(options).forEach(key => {
+        if (options[key] === undefined) {
+          delete options[key]
+        }
+      })
+      
+      if (this.useCanvas) {
+        // 使用canvas渲染
+        this.showCanvas = true
+        this.$nextTick(() => {
+          this.renderToCanvas(options)
+        })
+      } else {
+        // 生成图片
+        this.showCanvas = false
+        this.renderToImage(options)
+      }
+    },
+    
+    /**
+     * 渲染条形码到canvas
+     * @author jry <ijry@qq.com>
+     * @param {Object} options - 条码配置选项
+     */
+    async renderToCanvas(options) {
+      try {
+        // 计算canvas尺寸
+        this.calculateCanvasSize(options)
+
+        await nextTick()
+
+        // 获取canvas上下文
+        const ctx = uni.createCanvasContext(this.canvasId, this)
+        
+        // 清空画布
+        ctx.setFillStyle(options.background)
+        ctx.fillRect(0, 0, this.canvasWidth, this.canvasHeight)
+        
+        // 生成条形码数据
+        const barcodeData = this.encodeBarcode(this.value, options.format)
+        
+        if (barcodeData) {
+          // 绘制条形码
+          this.drawBarcode(ctx, barcodeData, options)
+        }
+        
+        // 绘制到canvas
+        ctx.draw(false, () => {
+          // 绘制完成回调
+          this.$emit('rendered', { type: 'canvas', id: this.canvasId })
+        })
+      } catch (error) {
+        console.error('生成条码失败:', error)
+        this.error = error.message || t('up.barcode.error')
+        this.$emit('error', error)
+      }
+    },
+    
+    /**
+     * 渲染条形码为图片
+     * @author jry <ijry@qq.com>
+     * @param {Object} options - 条码配置选项
+     */
+    renderToImage(options) {
+      try {
+        // 计算canvas尺寸
+        this.calculateCanvasSize(options)
+        
+        // 创建临时canvas用于生成图片
+        const tempCanvasId = 'temp-' + this.canvasId
+        const ctx = uni.createCanvasContext(tempCanvasId, this)
+        
+        // 清空画布
+        ctx.setFillStyle(options.background)
+        ctx.fillRect(0, 0, this.canvasWidth, this.canvasHeight)
+        
+        // 生成条形码数据
+        const barcodeData = this.encodeBarcode(this.value, options.format)
+        
+        if (barcodeData) {
+          // 绘制条形码
+          this.drawBarcode(ctx, barcodeData, options)
+        }
+        
+        // 绘制到临时canvas并生成图片
+        ctx.draw(false, () => {
+          // 延迟一小段时间确保canvas绘制完成
+          setTimeout(() => {
+            // 将canvas转换为图片
+            uni.canvasToTempFilePath({
+              canvasId: tempCanvasId,
+              success: (res) => {
+                this.barcodeImage = res.tempFilePath
+                this.$emit('rendered', { type: 'image', value: this.value, path: res.tempFilePath })
+              },
+              fail: (error) => {
+                console.error('生成条码图片失败:', error)
+                this.$emit('error', error)
+              }
+            }, this)
+          }, 100)
+        })
+      } catch (error) {
+        console.error('生成条码图片失败:', error)
+        this.$emit('error', error)
+      }
+    },
+    
+    /**
+     * 计算canvas尺寸
+     * @author jry <ijry@qq.com>
+     * @param {Object} options - 条码配置选项
+     */
+    calculateCanvasSize(options) {
+      // 基础宽度计算
+      let width = options.width
+      let height = options.height
+      
+      // 考虑边距
+      const marginLeft = options.marginLeft
+      const marginRight = options.marginRight
+      const marginTop = options.marginTop
+      const marginBottom = options.marginBottom
+      
+      // 考虑文本高度
+      let textHeight = 0
+      if (options.displayValue !== false) {
+        textHeight = options.fontSize + options.textMargin
+      }
+      
+      // 根据文本位置调整高度
+      if (options.textPosition === 'top' || options.textPosition === 'bottom') {
+        height += textHeight
+      }
+      
+      // 添加边距
+      width += marginLeft + marginRight
+      height += marginTop + marginBottom
+      
+      this.canvasWidth = Math.max(width, 100)
+      this.canvasHeight = Math.max(height, 60 + textHeight)
+
+      this.calcSizeDone = true
+    },
+    
+    /**
+     * 编码条形码数据
+     * @author jry <ijry@qq.com>
+     * @param {String|Number} value - 条码值
+     * @param {String} format - 条码格式
+     * @returns {String|null} 条形码编码数据
+     */
+    encodeBarcode(value, format) {
+      try {
+        switch (format) {
+          case 'CODE128':
+          case 'auto':
+            return this.encodeCode128(value)
+          case 'CODE39':
+            return this.encodeCode39(value)
+          case 'EAN13':
+            return this.encodeEAN13(value)
+          case 'EAN8':
+            return this.encodeEAN8(value)
+          case 'EAN5':
+          case 'EAN2':
+            return this.encodeEAN52(value, format)
+          case 'UPC':
+          case 'UPCA':
+            return this.encodeUPCA(value)
+          case 'UPCE':
+            return this.encodeUPCE(value)
+          default:
+            // 默认使用CODE128
+            return this.encodeCode128(value)
+        }
+      } catch (error) {
+        console.error('条码编码失败:', error)
+        throw error
+      }
+    },
+
+    /**
+     * 添加右侧安静区（至少2个模块宽度的空白）
+     * @author jry <ijry@qq.com>
+     * @param {String} data - 要编码的数据
+     * @returns {String|null} 编码后的条形码数据
+     */
+    encodeCode128(data) {
+      const CODE128_START_CODE_B = 104
+      const CODE128_STOP = 106
+      
+      // CODE128 Code B 字符集
+      const CODE128_CODE_B_CHARS = ' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~'
+      
+      // 条形码模式 (B 模式)
+      const codes = []
+      let checksum = CODE128_START_CODE_B
+      
+      // 添加起始字符
+      codes.push(CODE128_START_CODE_B)
+      
+      // 编码每个字符
+      for (let i = 0; i < data.length; i++) {
+        const char = data[i]
+        const code = CODE128_CODE_B_CHARS.indexOf(char)
+        
+        if (code === -1) {
+          throw new Error('Invalid character in CODE128: ' + char)
+        }
+        
+        codes.push(code)
+        checksum += code * (i + 1)
+      }
+      
+      // 添加校验字符
+      codes.push(checksum % 103)
+      
+      // 添加结束字符
+      codes.push(CODE128_STOP)
+      
+      // 转换为条形码模式 (1 = 黑条, 0 = 白条)
+      let barcode = ''
+      for (let i = 0; i < codes.length; i++) {
+        const code = codes[i]
+        barcode += this.getCode128Pattern(code)
+      }
+      
+      // 添加右侧安静区（至少2个模块宽度的空白）
+      barcode += '00000'
+      
+      return barcode
+    },
+    
+    /**
+     * 获取CODE128编码模式
+     * @author jry <ijry@qq.com>
+     * @param {Number} code - 字符编码
+     * @returns {String} 条形码二进制模式
+     */
+    getCode128Pattern(code) {
+      // CODE128编码表
+      const patterns = [
+        "11011001100", "11001101100", "11001100110", "10010011000", 
+        "10010001100", "10001001100", "10011001000", "10011000100", 
+        "10001100100", "11001001000", "11001000100", "11000100100", 
+        "10110011100", "10011011100", "10011001110", "10111001100", 
+        "10011101100", "10011100110", "11001110010", "11001011100", 
+        "11001001110", "11011100100", "11001110100", "11101101110", 
+        "11101001100", "11100101100", "11100100110", "11101100100", 
+        "11100110100", "11100110010", "11011011000", "11011000110", 
+        "11000110110", "10100011000", "10001011000", "10001000110", 
+        "10110001000", "10001101000", "10001100010", "11010001000", 
+        "11000101000", "11000100010", "10110111000", "10110001110", 
+        "10001101110", "10111011000", "10111000110", "10001110110", 
+        "11101110110", "11010001110", "11000101110", "11011101000", 
+        "11011100010", "11011101110", "11101011000", "11101000110", 
+        "11100010110", "11101101000", "11101100010", "11100011010", 
+        "11101111010", "11001000010", "11110001010", "10100110000", 
+        "10100001100", "10010110000", "10010000110", "10000101100", 
+        "10000100110", "10110010000", "10110000100", "10011010000", 
+        "10011000010", "10000110100", "10000110010", "11000010010", 
+        "11001010000", "11110111010", "11000010100", "10001111010", 
+        "10100111100", "10010111100", "10010011110", "10111100100", 
+        "10011110100", "10011110010", "11110100100", "11110010100", 
+        "11110010010", "11011011110", "11011110110", "11110110110", 
+        "10101111000", "10100011110", "10001011110", "10111101000", 
+        "10111100010", "11110101000", "11110100010", "10111011110", 
+        "10111101110", "11101011110", "11110101110", "11010000100", 
+        "11010010000", "11010011100", "11000111010"
+      ];
+      
+      return patterns[code] || "";
+    },
+    
+    /**
+     * CODE39编码实现
+     * @author jry <ijry@qq.com>
+     * @param {String} data - 要编码的数据
+     * @returns {String|null} 编码后的条形码数据
+     */
+    encodeCode39(data) {
+      const codes = {
+        '0': '101000111011101',
+        '1': '111010001010111',
+        '2': '101110001010111',
+        '3': '111011100010101',
+        '4': '101000111010111',
+        '5': '111010001110101',
+        '6': '101110001110101',
+        '7': '101000101110111',
+        '8': '111010001011101',
+        '9': '101110001011101',
+        'A': '111010100010111',
+        'B': '101110100010111',
+        'C': '111011101000101',
+        'D': '101011100010111',
+        'E': '111010111000101',
+        'F': '101110111000101',
+        'G': '101010001110111',
+        'H': '111010100011101',
+        'I': '101110100011101',
+        'J': '101011100011101',
+        'K': '111010101000111',
+        'L': '101110101000111',
+        'M': '111011101010001',
+        'N': '101011101000111',
+        'O': '111010111010001',
+        'P': '101110111010001',
+        'Q': '101010111000111',
+        'R': '111010101110001',
+        'S': '101110101110001',
+        'T': '101011101110001',
+        'U': '111000101010111',
+        'V': '100011101010111',
+        'W': '111000111010101',
+        'X': '100010111010111',
+        'Y': '111000101110101',
+        'Z': '100011101110101',
+        '-': '100010101110111',
+        '.': '111000101011101',
+        ' ': '100011101011101',
+        '*': '100010111011101', // 起始和终止字符
+        '$': '100010001000101',
+        '/': '100010001010001',
+        '+': '100010100010001',
+        '%': '101000100010001'
+      }
+      
+      // 转为大写
+      data = data.toUpperCase()
+      
+      // 添加起始和终止字符
+      let barcode = codes['*']
+      
+      // 添加数据字符
+      for (let i = 0; i < data.length; i++) {
+        const char = data[i]
+        if (codes[char]) {
+          barcode += '0' // 字符间隔
+          barcode += codes[char]
+        } else {
+          throw new Error('Invalid character in CODE39: ' + char)
+        }
+      }
+      
+      // 添加终止字符
+      barcode += '0' // 字符间隔
+      barcode += codes['*']
+      
+      return barcode
+    },
+    
+    /**
+     * EAN13编码实现
+     * @author jry <ijry@qq.com>
+     * @param {String} data - 13位数字字符串
+     * @returns {String|null} 编码后的条形码数据
+     */
+    encodeEAN13(data) {
+      // 确保数据是13位数字
+      if (!/^\d{13}$/.test(data)) {
+        throw new Error('EAN13 must be 13 digits')
+      }
+      
+      // 验证校验位
+      let sum = 0
+      for (let i = 0; i < 12; i++) {
+        const digit = parseInt(data[i])
+        sum += (i % 2 === 0) ? digit : digit * 3
+      }
+      const checkDigit = (10 - (sum % 10)) % 10
+      if (parseInt(data[12]) !== checkDigit) {
+        throw new Error('Invalid EAN13 check digit')
+      }
+      
+      // 左侧数据
+      const leftData = data.substring(1, 7)
+      const rightData = data.substring(7, 13)
+      
+      // 起始符
+      let barcode = '101'
+      
+      // 左侧数据编码 (根据第一位数字决定编码方式)
+      const firstDigit = parseInt(data[0])
+      const leftPatterns = [
+        ['LLLLLL', 'LLGLGG', 'LLGGLG', 'LLGGGL', 'LGLLGG', 
+         'LGGLLG', 'LGGGLL', 'LGLGLG', 'LGLGGL', 'LGGLGL']
+      ]
+      
+      const pattern = leftPatterns[0][firstDigit]
+      
+      // 左侧奇偶编码模式
+      const leftOdd = [
+        '0001101', '0011001', '0010011', '0111101', '0100011',
+        '0110001', '0101111', '0111011', '0110111', '0001011'
+      ]
+      
+      const leftEven = [
+        '0100111', '0110011', '0011011', '0100001', '0011101',
+        '0111001', '0000101', '0010001', '0001001', '0010111'
+      ]
+      
+      // 编码左侧数据
+      for (let i = 0; i < leftData.length; i++) {
+        const digit = parseInt(leftData[i])
+        if (pattern[i] === 'L') {
+          barcode += leftOdd[digit]
+        } else {
+          barcode += leftEven[digit]
+        }
+      }
+      
+      // 中间分隔符
+      barcode += '01010'
+      
+      // 右侧数据编码 (始终使用右编码)
+      const rightCodes = [
+        '1110010', '1100110', '1101100', '1000010', '1011100',
+        '1001110', '1010000', '1000100', '1001000', '1110100'
+      ]
+      
+      for (let i = 0; i < rightData.length; i++) {
+        const digit = parseInt(rightData[i])
+        barcode += rightCodes[digit]
+      }
+      
+      // 结束符
+      barcode += '101'
+      
+      return barcode
+    },
+    
+    /**
+     * EAN8编码实现
+     * @author jry <ijry@qq.com>
+     * @param {String} data - 8位数字字符串
+     * @returns {String|null} 编码后的条形码数据
+     */
+    encodeEAN8(data) {
+      // 确保数据是8位数字
+      if (!/^\d{8}$/.test(data)) {
+        throw new Error('EAN8 must be 8 digits')
+      }
+      
+      // 验证校验位
+      let sum = 0
+      for (let i = 0; i < 7; i++) {
+        const digit = parseInt(data[i])
+        sum += digit * (i % 2 === 0 ? 3 : 1)
+      }
+      const checkDigit = (10 - (sum % 10)) % 10
+      if (parseInt(data[7]) !== checkDigit) {
+        throw new Error('Invalid EAN8 check digit')
+      }
+      
+      // 左侧数据(4位)
+      const leftData = data.substring(0, 4)
+      // 右侧数据(4位)
+      const rightData = data.substring(4, 8)
+      
+      // 起始符
+      let barcode = '101'
+      
+      // 左侧奇偶编码模式
+      const leftOdd = [
+        '0001101', '0011001', '0010011', '0111101', '0100011',
+        '0110001', '0101111', '0111011', '0110111', '0001011'
+      ]
+      
+      // 编码左侧数据
+      for (let i = 0; i < leftData.length; i++) {
+        const digit = parseInt(leftData[i])
+        barcode += leftOdd[digit]
+      }
+      
+      // 中间分隔符
+      barcode += '01010'
+      
+      // 右侧数据编码 (始终使用右编码)
+      const rightCodes = [
+        '1110010', '1100110', '1101100', '1000010', '1011100',
+        '1001110', '1010000', '1000100', '1001000', '1110100'
+      ]
+      
+      // 编码右侧数据
+      for (let i = 0; i < rightData.length; i++) {
+        const digit = parseInt(rightData[i])
+        barcode += rightCodes[digit]
+      }
+      
+      // 结束符
+      barcode += '101'
+      
+      return barcode
+    },
+    
+    /**
+     * EAN5/EAN2编码实现
+     * @author jry <ijry@qq.com>
+     * @param {String} data - 2位或5位数字字符串
+     * @param {String} format - 格式类型(EAN5或EAN2)
+     * @returns {String|null} 编码后的条形码数据
+     */
+    encodeEAN52(data, format) {
+      const length = format === 'EAN5' ? 5 : 2
+      // 确保数据是相应位数的数字
+      if (!new RegExp(`^\\d{${length}}$`).test(data)) {
+        throw new Error(`${format} must be ${length} digits`)
+      }
+      
+      // EAN5/2编码表
+      const codes = [
+        '0001101', '0011001', '0010011', '0111101', '0100011',
+        '0110001', '0101111', '0111011', '0110111', '0001011'
+      ]
+      
+      // 计算校验和
+      let checksum = 0
+      for (let i = 0; i < data.length; i++) {
+        checksum += parseInt(data[i]) * (i % 2 === 0 ? 3 : 1)
+      }
+      
+      // 根据校验和确定编码模式
+      const patterns = format === 'EAN5' ? 
+        ['00001', '00010', '00100', '01000', '10000', // 0-4
+         '00000', '00011', '00101', '00110', '01001', // 5-9
+         '01010', '01100', '10001', '10010', '10100', // 10-14
+         '11000', '11001', '11010', '11100'] : // 15-18
+        ['00', '01', '10', '11'] // EAN2只有4种模式
+      
+      const pattern = format === 'EAN5' ? 
+        patterns[checksum % 10] : 
+        patterns[parseInt(data) % 4]
+      
+      // 起始符
+      let barcode = '1011'
+      
+      // 编码数据
+      for (let i = 0; i < data.length; i++) {
+        // 添加分隔符(除了第一个字符)
+        if (i > 0) {
+          barcode += '01' // 字符间分隔符
+        }
+        
+        // 根据模式确定编码方式
+        const digit = parseInt(data[i])
+        const code = codes[digit]
+        
+        barcode += code
+      }
+      
+      return barcode
+    },
+    
+    /**
+     * UPCA编码实现
+     * @author jry <ijry@qq.com>
+     * @param {String} data - 11位或12位数字字符串
+     * @returns {String|null} 编码后的条形码数据
+     */
+    encodeUPCA(data) {
+      // 如果是11位，计算校验位
+      if (/^\d{11}$/.test(data)) {
+        let sum = 0
+        for (let i = 0; i < 11; i++) {
+          const digit = parseInt(data[i])
+          sum += (i % 2 === 0) ? digit * 3 : digit
+        }
+        const checkDigit = (10 - (sum % 10)) % 10
+        data += checkDigit
+      }
+      
+      // 确保数据是12位数字
+      if (!/^\d{12}$/.test(data)) {
+        throw new Error('UPC-A must be 11 or 12 digits')
+      }
+      
+      // UPCA实际上是EAN13的第一个数字为0的特殊情况
+      return this.encodeEAN13('0' + data)
+    },
+    
+    /**
+     * UPCE编码实现
+     * @author jry <ijry@qq.com>
+     * @param {String} data - 6位或8位数字字符串
+     * @returns {String|null} 编码后的条形码数据
+     */
+    encodeUPCE(data) {
+      // 如果是7位，计算校验位
+      if (/^\d{7}$/.test(data)) {
+        let sum = 0
+        for (let i = 0; i < 7; i++) {
+          const digit = parseInt(data[i])
+          sum += (i % 2 === 0) ? digit * 3 : digit
+        }
+        const checkDigit = (10 - (sum % 10)) % 10
+        data += checkDigit
+      }
+      
+      // 确保数据是8位数字
+      if (!/^\d{8}$/.test(data)) {
+        throw new Error('UPC-E must be 7 or 8 digits')
+      }
+      
+      // 检查是否是有效的UPC-E格式
+      if (data[0] !== '0' && data[0] !== '1') {
+        throw new Error('UPC-E must start with 0 or 1')
+      }
+      
+      // UPCE编码表
+      const leftOdd = [
+        '0001101', '0011001', '0010011', '0111101', '0100011',
+        '0110001', '0101111', '0111011', '0110111', '0001011'
+      ]
+      
+      const leftEven = [
+        '0100111', '0110011', '0011011', '0100001', '0011101',
+        '0111001', '0000101', '0010001', '0001001', '0010111'
+      ]
+      
+      // 根据系统数字确定编码模式
+      const systemDigit = data[0]
+      const checkDigit = data[7]
+      
+      // 提取中间6位
+      const middleData = data.substring(1, 7)
+      
+      // 确定编码模式
+      let pattern
+      if (checkDigit === '0' || checkDigit === '1' || checkDigit === '2') {
+        pattern = 'EEEEOO' // 0,1,2
+      } else if (checkDigit === '3') {
+        pattern = 'EEEEOO' // 3
+      } else if (checkDigit === '4') {
+        pattern = 'EEEOOO' // 4
+      } else {
+        pattern = 'EEOOOO' // 5,6,7,8,9
+      }
+      
+      // 起始符
+      let barcode = '101'
+      
+      // 编码中间6位数据
+      for (let i = 0; i < middleData.length; i++) {
+        const digit = parseInt(middleData[i])
+        if (pattern[i] === 'E') {
+          barcode += leftEven[digit]
+        } else {
+          barcode += leftOdd[digit]
+        }
+      }
+      
+      // 中间分隔符
+      barcode += '010101'
+      
+      // 结束符
+      barcode += '101'
+      
+      return barcode
+    },
+    
+    /**
+     * 绘制条形码
+     * @author jry <ijry@qq.com>
+     * @param {Object} ctx - canvas上下文
+     * @param {String} barcodeData - 条形码数据
+     * @param {Object} options - 条码配置选项
+     */
+    drawBarcode(ctx, barcodeData, options) {
+      if (!barcodeData) return
+      
+      const marginLeft = options.marginLeft
+      const marginTop = options.marginTop
+      const marginBottom = options.marginBottom
+      const textHeight = options.displayValue !== false ? options.fontSize + options.textMargin : 0
+      const height = options.height
+      // 恢复: 根据总长度计算模块宽度
+      const moduleWidth = Math.max(1, (this.canvasWidth - marginLeft - (options.marginRight || 10)) / barcodeData.length)
+      
+      ctx.setFillStyle(options.lineColor)
+      
+      // 计算条形码绘制的Y坐标
+      let barcodeY = marginTop
+      // 如果文本在顶部，需要调整条形码绘制位置
+      if (options.displayValue !== false && options.textPosition === 'top') {
+        barcodeY += textHeight
+      }
+      
+      // 恢复: 使用计算出的模块宽度绘制条形码
+      let x = marginLeft
+      for (let i = 0; i < barcodeData.length; i++) {
+        if (barcodeData[i] === '1') {
+          // 使用计算的模块宽度绘制每个条
+          ctx.fillRect(x, barcodeY, moduleWidth, height)
+        }
+        // 每个条/空都占用一个模块宽度
+        x += moduleWidth
+      }
+      
+      // 绘制文本
+      if (options.displayValue !== false) {
+        const text = options.text || this.value
+        let textY
+        
+        ctx.setFillStyle(options.lineColor)
+        ctx.setFontSize(options.fontSize)
+        ctx.setTextAlign(options.textAlign)
+        
+        let textX
+        switch (options.textAlign) {
+          case 'left':
+            textX = marginLeft
+            break
+          case 'right':
+            textX = this.canvasWidth - options.marginRight
+            break
+          default: // center
+            textX = this.canvasWidth / 2
+        }
+        
+        // 根据文本位置确定Y坐标
+        if (options.textPosition === 'top') {
+          textY = marginTop + options.fontSize - 3
+        } else { // bottom
+          // 修复：正确计算底部文本位置，确保文本完全显示
+          textY = barcodeY + height + options.textMargin + options.fontSize
+          // 确保文本不会超出画布边界
+          if (textY > this.canvasHeight - marginBottom) {
+            textY = this.canvasHeight - marginBottom - 2
+          }
+        }
+        
+        ctx.fillText(text, textX, textY)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.u-barcode {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+}
+
+.error-container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: #f0f0f0;
+  color: #ff0000;
+}
+
+.error-text {
+  font-size: 14px;
+}
+</style>
diff --git a/uview-plus/components/u-box/box.js b/uview-plus/components/u-box/box.js
new file mode 100644
index 0000000..bdef30d
--- /dev/null
+++ b/uview-plus/components/u-box/box.js
@@ -0,0 +1,24 @@
+/*
+ * @Author       : ly
+ * @Description  :
+ * @version      : 4.0
+ * @Date         : 2026-02-02 23:54:58
+ * @LastAuthor   : ly
+ * @lastTime     : 2026-02-02 23:54:58
+ * @FilePath     : /uview-ultra/components/up-box/box.js
+ */
+export default {
+    // box 组件
+    box: {
+        bgColors: ['#EEFCFF', '#FCF8FF', '#FDF8F2'],
+        height: '160px',
+        borderRadius: '6px',
+        gap: '15px',
+        leftIcon: '',
+        leftTitle: '左',
+        rightTopIcon: '',
+        rightTopTitle: '右上',
+        rightBottomIcon: '',
+        rightBottomTitle: '右下'
+    }
+}
\ No newline at end of file
diff --git a/uview-plus/components/u-box/props.js b/uview-plus/components/u-box/props.js
index cfe75e4..d6ddf46 100644
--- a/uview-plus/components/u-box/props.js
+++ b/uview-plus/components/u-box/props.js
@@ -1,27 +1,57 @@
-import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import { defineMixin } from '../../libs/vue.js'
+import defProps from './box.js'
 
 export const propsBox = defineMixin({
     props: {
         // 背景色
         bgColors: {
             type: [Array],
-            default: ['#EEFCFF', '#FCF8FF', '#FDF8F2']
+            default: () => defProps.box.bgColors
         },
         // 高度
         height: {
             type: [String],
-            default: "160px"
+            default: () => defProps.box.height
         },
         // 圆角
         borderRadius: {
             type: [String],
-            default: "6px"
+            default: () => defProps.box.borderRadius
         },
         // 间隔
         gap: {
             type: [String],
-            default: "15px"
+            default: () => defProps.box.gap
+        },
+        // 左侧图标
+        leftIcon: {
+            type: [String],
+            default: () => defProps.box.leftIcon
+        },
+        // 左侧文案
+        leftTitle: {
+            type: [String],
+            default: () => defProps.box.leftTitle
+        },
+        // 右上图标
+        rightTopIcon: {
+            type: [String],
+            default: () => defProps.box.rightTopIcon
+        },
+        // 右上文案
+        rightTopTitle: {
+            type: [String],
+            default: () => defProps.box.rightTopTitle
+        },
+        // 右下图标
+        rightBottomIcon: {
+            type: [String],
+            default: () => defProps.box.rightBottomIcon
+        },
+        // 右下文案
+        rightBottomTitle: {
+            type: [String],
+            default: () => defProps.box.rightBottomTitle
         },
     }
-})
+})
\ No newline at end of file
diff --git a/uview-plus/components/u-box/u-box.vue b/uview-plus/components/u-box/u-box.vue
index ce47b5c..759047e 100644
--- a/uview-plus/components/u-box/u-box.vue
+++ b/uview-plus/components/u-box/u-box.vue
@@ -1,18 +1,33 @@
 <template>
 	<view class="u-box" :style="[{height: height}, addStyle(customStyle)]">
-        <view class="u-box__left" :style="{borderRadius: borderRadius, backgroundColor: bgColors[0]}">
-            <slot name="left">左</slot>
-        </view>
-        <view class="u-box__gap" :style="{width: gap, height: height}"></view>
-        <view class="u-box__right">
-            <view class="u-box__right-top" :style="{borderRadius: borderRadius, backgroundColor: bgColors[1]}">
-                <slot name="rightTop">右上</slot>
-            </view>
-            <view class="u-box__right-gap" :style="{height: gap}"></view>
-            <view class="u-box__right-bottom" :style="{borderRadius: borderRadius, backgroundColor: bgColors[2]}">
-                <slot name="rightBottom">右下</slot>
-            </view>
-        </view>
+	    <view class="u-box__left" :style="{borderRadius: borderRadius, backgroundColor: bgColors[0]}">
+	        <slot name="left">
+	            <view class="flex flex-row items-center justify-center">
+	                <u-icon size="36" :name="leftIcon"></u-icon>
+	                <text class="ml-2 text-16px">{{leftTitle}}</text>
+	            </view>
+	        </slot>
+	    </view>
+	    <view class="u-box__gap" :style="{width: gap, height: height}"></view>
+	    <view class="u-box__right">
+	        <view class="u-box__right-top" :style="{borderRadius: borderRadius, backgroundColor: bgColors[1]}">
+	            <slot name="rightTop">
+	                <view class="flex flex-row items-center justify-center">
+	                    <u-icon size="36" :name="rightTopIcon"></u-icon>
+	                    <text class="ml-2 text-15px">{{rightTopTitle}}</text>
+	                </view>
+	            </slot>
+	        </view>
+	        <view class="u-box__right-gap" :style="{height: gap}"></view>
+	        <view class="u-box__right-bottom" :style="{borderRadius: borderRadius, backgroundColor: bgColors[2]}">
+	            <slot name="rightBottom">
+	                <view class="flex flex-row items-center justify-center">
+	                    <u-icon size="36" :name="rightBottomIcon"></u-icon>
+	                    <text class="ml-2 text-15px">{{rightBottomTitle}}</text>
+	                </view>
+	            </slot>
+	        </view>
+	    </view>
 	</view>
 </template>
 
@@ -51,7 +66,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-box {
         /* #ifndef APP-NVUE */
diff --git a/uview-plus/components/u-button/button.js b/uview-plus/components/u-button/button.js
index 4519ff8..a38e88f 100644
--- a/uview-plus/components/u-button/button.js
+++ b/uview-plus/components/u-button/button.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:51:27
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/button.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/button.js
  */
 export default {
     // button组件
diff --git a/uview-plus/components/u-button/u-button.vue b/uview-plus/components/u-button/u-button.vue
index c9a52ef..15ca8de 100644
--- a/uview-plus/components/u-button/u-button.vue
+++ b/uview-plus/components/u-button/u-button.vue
@@ -39,13 +39,13 @@
             >
         </template>
         <template v-else>
-            <u-icon
+            <up-icon
                 v-if="icon"
                 :name="icon"
                 :color="iconColorCom"
                 :size="textSize * 1.35"
                 :customStyle="{ marginRight: '2px' }"
-            ></u-icon>
+            ></up-icon>
             <slot>
                 <text
                     class="u-button__text"
@@ -87,12 +87,12 @@
             >
         </template>
         <template v-else>
-            <u-icon
+            <up-icon
                 v-if="icon"
                 :name="icon"
                 :color="iconColorCom"
                 :size="textSize * 1.35"
-            ></u-icon>
+            ></up-icon>
             <text
                 class="u-button__text"
                 :style="[
@@ -121,7 +121,7 @@ import color from '../../libs/config/color';
 /**
  * button 按钮
  * @description Button 按钮
- * @tutorial https://ijry.github.io/uview-plus/components/button.html
+ * @tutorial https://uview-plus.jiangruyi.com/components/button.html
  *
  * @property {Boolean}			hairline				是否显示按钮的细边框 (默认 true )
  * @property {String}			type					按钮的预置样式，info，primary，error，warning，success (默认 'info' )
@@ -206,7 +206,7 @@ export default {
         },
         iconColorCom() {
             // 如果是镂空状态，设置了color就用color值，否则使用主题颜色，
-            // u-icon的color能接受一个主题颜色的值
+            // up-icon的color能接受一个主题颜色的值
 			if (this.iconColor) return this.iconColor;
 			if (this.plain) {
                 return this.color ? this.color : this.type;
@@ -306,8 +306,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
-
 /* #ifndef APP-NVUE */
 @import "./vue.scss";
 /* #endif */
diff --git a/uview-plus/components/u-calendar/calendar.js b/uview-plus/components/u-calendar/calendar.js
index 7f90beb..aaf6190 100644
--- a/uview-plus/components/u-calendar/calendar.js
+++ b/uview-plus/components/u-calendar/calendar.js
@@ -1,21 +1,22 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:52:43
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/calendar.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/calendar.js
  */
+import { t } from '../../libs/i18n'
 export default {
     // calendar 组件
     calendar: {
-        title: '日期选择',
+        title: t("up.calendar.chooseDates"),
         showTitle: true,
         showSubtitle: true,
         mode: 'single',
-        startText: '开始',
-        endText: '结束',
+        startText: t("up.common.start"),
+        endText: t("up.common.end"),
         customList: [],
         color: '#3c9cff',
         minDate: 0,
@@ -26,8 +27,8 @@ export default {
         formatter: null,
         showLunar: false,
         showMark: true,
-        confirmText: '确定',
-        confirmDisabledText: '确定',
+        confirmText: t("up.common.confirm"),
+        confirmDisabledText: t("up.common.confirm"),
         show: false,
         closeOnClickOverlay: false,
         readonly: false,
@@ -37,6 +38,11 @@ export default {
         showRangePrompt: true,
         allowSameDay: false,
 		round: 0,
-		monthNum: 3
+		monthNum: 3,
+        weekText: [t("up.week.one"), t("up.week.two"), t("up.week.three"), t("up.week.four"), t("up.week.five"), t("up.week.six"), t("up.week.seven")],
+        forbidDays: [],
+        forbidDaysToast: t("up.calendar.disabled"),
+        monthFormat: '',
+        pageInline: false
     }
 }
diff --git a/uview-plus/components/u-calendar/header.vue b/uview-plus/components/u-calendar/header.vue
index 3273bd8..e289643 100644
--- a/uview-plus/components/u-calendar/header.vue
+++ b/uview-plus/components/u-calendar/header.vue
@@ -9,13 +9,13 @@
 			v-if="showSubtitle"
 		>{{ subtitle }}</text>
 		<view class="u-calendar-header__weekdays">
-			<text class="u-calendar-header__weekdays__weekday">一</text>
-			<text class="u-calendar-header__weekdays__weekday">二</text>
-			<text class="u-calendar-header__weekdays__weekday">三</text>
-			<text class="u-calendar-header__weekdays__weekday">四</text>
-			<text class="u-calendar-header__weekdays__weekday">五</text>
-			<text class="u-calendar-header__weekdays__weekday">六</text>
-			<text class="u-calendar-header__weekdays__weekday">日</text>
+			<text class="u-calendar-header__weekdays__weekday">{{ weekText[0] }}</text>
+			<text class="u-calendar-header__weekdays__weekday">{{ weekText[1] }}</text>
+			<text class="u-calendar-header__weekdays__weekday">{{ weekText[2] }}</text>
+			<text class="u-calendar-header__weekdays__weekday">{{ weekText[3] }}</text>
+			<text class="u-calendar-header__weekdays__weekday">{{ weekText[4] }}</text>
+			<text class="u-calendar-header__weekdays__weekday">{{ weekText[5] }}</text>
+			<text class="u-calendar-header__weekdays__weekday">{{ weekText[6] }}</text>
 		</view>
 	</view>
 </template>
@@ -47,6 +47,13 @@
 				type: Boolean,
 				default: true
 			},
+			// 星期文本
+			weekText: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
 		},
 		data() {
 			return {
@@ -62,7 +69,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-calendar-header {
 		display: flex;
diff --git a/uview-plus/components/u-calendar/month.vue b/uview-plus/components/u-calendar/month.vue
index 76c81c5..42a3de1 100644
--- a/uview-plus/components/u-calendar/month.vue
+++ b/uview-plus/components/u-calendar/month.vue
@@ -2,7 +2,7 @@
 	<view class="u-calendar-month-wrapper" ref="u-calendar-month-wrapper">
 		<view v-for="(item, index) in months" :key="index" :class="[`u-calendar-month-${index}`]"
 			:ref="`u-calendar-month-${index}`" :id="`month-${index}`">
-			<text v-if="index !== 0" class="u-calendar-month__title">{{ item.year }}年{{ item.month }}月</text>
+			<text v-if="index !== 0" class="u-calendar-month__title">{{ monthTitle(item) }}</text>
 			<view class="u-calendar-month__days">
 				<view v-if="showMark" class="u-calendar-month__days__month-mark-wrapper">
 					<text class="u-calendar-month__days__month-mark-wrapper__text">{{ item.month }}</text>
@@ -12,11 +12,11 @@
 					:class="[item1.selected && 'u-calendar-month__days__day__select--selected']">
 					<view class="u-calendar-month__days__day__select" :style="[daySelectStyle(index, index1, item1)]">
 						<text class="u-calendar-month__days__day__select__info"
-							:class="[item1.disabled && 'u-calendar-month__days__day__select__info--disabled']"
+							:class="[(item1.disabled || isForbid(item1) ) ? 'u-calendar-month__days__day__select__info--disabled' : '']"
 							:style="[textStyle(item1)]">{{ item1.day }}</text>
 						<text v-if="getBottomInfo(index, index1, item1)"
 							class="u-calendar-month__days__day__select__buttom-info"
-							:class="[item1.disabled && 'u-calendar-month__days__day__select__buttom-info--disabled']"
+							:class="[(item1.disabled || isForbid(item1) ) ? 'u-calendar-month__days__day__select__buttom-info--disabled' : '']"
 							:style="[textStyle(item1)]">{{ getBottomInfo(index, index1, item1) }}</text>
 						<text v-if="item1.dot" class="u-calendar-month__days__day__select__dot"></text>
 					</view>
@@ -37,7 +37,8 @@
 	import { colorGradient } from '../../libs/function/colorGradient';
 	import test from '../../libs/function/test';
 	import defProps from '../../libs/config/props';
-	import dayjs from 'dayjs/esm/index'
+	import dayjs from '../u-datetime-picker/dayjs.esm.min.js';
+	import { t } from '../../libs/i18n'
 	export default {
 		name: 'u-calendar-month',
 		mixins: [mpMixin, mixin],
@@ -126,6 +127,14 @@
 			allowSameDay: {
 				type: Boolean,
 				default: false
+			},
+			forbidDays: {
+				type: Array,
+				default: () => []
+			},
+			forbidDaysToast: {
+				type: String,
+				default: ''
 			}
 		},
 		data() {
@@ -160,14 +169,14 @@
 					// #ifdef APP-NVUE
 					style.width = addUnit(dayWidth, 'px')
 					// #endif
-					style.height = addUnit(this.rowHeight)
+					style.height = addUnit(this.rowHeight, 'px')
 					if (index2 === 0) {
 						// 获取当前为星期几，如果为0，则为星期天，减一为每月第一天时，需要向左偏移的item个数
 						week = (week === 0 ? 7 : week) - 1
 						style.marginLeft = addUnit(week * dayWidth, 'px')
 					}
 					if (this.mode === 'range') {
-						// 之所以需要这么写，是因为DCloud公司的iOS客户端的开发者能力有限导致的bug
+						// 之所以需要这么写，是因为DCloud公司的iOS客户端导致的bug
 						style.paddingLeft = 0
 						style.paddingRight = 0
 						style.paddingBottom = 0
@@ -213,7 +222,7 @@
 								style.opacity = 0.7
 							}
 						} else if (this.selected.length === 1) {
-							// 之所以需要这么写，是因为DCloud公司的iOS客户端的开发者能力有限导致的bug
+							// 之所以需要这么写，是因为uni-app的iOS客户端的bug
 							// 进行还原操作，否则在nvue的iOS，uni-app有bug，会导致诡异的表现
 							style.borderTopLeftRadius = '3px'
 							style.borderBottomLeftRadius = '3px'
@@ -284,6 +293,7 @@
 		mounted() {
 			this.init()
 		},
+		emits: ['monthSelected', 'updateMonthTop'],
 		methods: {
 			init() {
 				// 初始化默认选中
@@ -297,6 +307,20 @@
 					})
 				})
 			},
+			monthTitle(item) {
+				if (uni.getLocale() == 'zh-Hans' || uni.getLocale() == 'zh-Hant') {
+					return item.year + '年' + (item.month < 10 ? '0' + item.month : item.month) + '月'
+				} else {
+					return (item.month < 10 ? '0' + item.month : item.month) + '/' + item.year
+				}
+			},
+			isForbid(item) {
+				let date = dayjs(item.date).format("YYYY-MM-DD")
+				if (this.mode !== 'range' && this.forbidDays.includes(date)) {
+					return true
+				}
+				return false
+			},
 			// 判断两个日期是否相等
 			dateSame(date1, date2) {
 				return dayjs(date1).isSame(dayjs(date2))
@@ -335,7 +359,7 @@
 			// 获取每个月份区域的尺寸
 			getMonthRectByPromise(el) {
 				// #ifndef APP-NVUE
-				// $uGetRect为uView自带的节点查询简化方法，详见文档介绍：https://ijry.github.io/uview-plus/js/getRect.html
+				// $uGetRect为uView自带的节点查询简化方法，详见文档介绍：https://uview-plus.jiangruyi.com/js/getRect.html
 				// 组件内部一般用this.$uGetRect，对外的为uni.$u.getRect，二者功能一致，名称不同
 				return new Promise(resolve => {
 					this.$uGetRect(`.${el}`).then(size => {
@@ -362,6 +386,12 @@
 				this.item = item
 				const date = dayjs(item.date).format("YYYY-MM-DD")
 				if (item.disabled) return
+				if (this.isForbid(item)) {
+					uni.showToast({
+						title: this.forbidDaysToast
+					})
+					return
+				}
 				// 对上一次选择的日期数组进行深度克隆
 				let selected = deepClone(this.selected)
 				if (this.mode === 'single') {
@@ -393,7 +423,7 @@
 								if(this.rangePrompt) {
 									toast(this.rangePrompt)
 								} else {
-									toast(`选择天数不能超过 ${this.maxRange} 天`)
+									toast(t("up.calendar.daysExceed", { days: this.maxRange }))
 								}
 								return
 							}
@@ -459,7 +489,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-calendar-month-wrapper {
 		margin-top: 4px;
diff --git a/uview-plus/components/u-calendar/props.js b/uview-plus/components/u-calendar/props.js
index df990fd..3dc0950 100644
--- a/uview-plus/components/u-calendar/props.js
+++ b/uview-plus/components/u-calendar/props.js
@@ -142,6 +142,28 @@ export const props = defineMixin({
 		monthNum: {
 			type: [Number, String],
 			default: 3
-		}	
+		},
+        // 星期文案
+        weekText: {
+			type: Array,
+			default: defProps.calendar.weekText
+		},
+        forbidDays: {
+			type: Array,
+			default: defProps.calendar.forbidDays
+		},
+        forbidDaysToast:{
+			type: String,
+			default: defProps.calendar.forbidDaysToast
+		},
+        monthFormat:{
+			type: String,
+			default: defProps.calendar.monthFormat
+		},
+        // 是否页面内展示
+        pageInline:{
+			type: Boolean,
+			default: defProps.calendar.pageInline
+		}
     }
 })
diff --git a/uview-plus/components/u-calendar/u-calendar.vue b/uview-plus/components/u-calendar/u-calendar.vue
index c8f77ff..f2f92ae 100644
--- a/uview-plus/components/u-calendar/u-calendar.vue
+++ b/uview-plus/components/u-calendar/u-calendar.vue
@@ -2,9 +2,10 @@
 	<u-popup
 		:show="show"
 		mode="bottom"
-		closeable
+		:closeable="!pageInline"
 		@close="close"
 		:round="round"
+		:pageInline="pageInline"
 		:closeOnClickOverlay="closeOnClickOverlay"
 	>
 		<view class="u-calendar">
@@ -13,10 +14,11 @@
 				:subtitle="subtitle"
 				:showSubtitle="showSubtitle"
 				:showTitle="showTitle"
+				:weekText="weekText"
 			></uHeader>
 			<scroll-view
 				:style="{
-                    height: addUnit(listHeight)
+                    height: addUnit(listHeight, 'px')
                 }"
 				scroll-y
 				@scroll="onScroll"
@@ -41,6 +43,9 @@
 					:rangePrompt="rangePrompt"
 					:showRangePrompt="showRangePrompt"
 					:allowSameDay="allowSameDay"
+					:forbidDays="forbidDays"
+					:forbidDaysToast="forbidDaysToast"
+					:monthFormat="monthFormat"
 					ref="month"
 					@monthSelected="monthSelected"
 					@updateMonthTop="updateMonthTop"
@@ -68,16 +73,16 @@ import uHeader from './header.vue'
 import uMonth from './month.vue'
 import { props } from './props.js'
 import util from './util.js'
-import dayjs from 'dayjs/esm/index'
+import dayjs from '../u-datetime-picker/dayjs.esm.min.js';
 import Calendar from '../../libs/util/calendar.js'
 import { mpMixin } from '../../libs/mixin/mpMixin.js'
 import { mixin } from '../../libs/mixin/mixin.js'
-import { addUnit, range, error, padZero } from '../../libs/function/index';
+import { addUnit, getPx, range, error, padZero } from '../../libs/function/index';
 import test from '../../libs/function/test';
 /**
  * Calendar 日历
  * @description  此组件用于单个选择日期，范围选择日期等，日历被包裹在底部弹起的容器中.
- * @tutorial https://ijry.github.io/uview-plus/components/calendar.html
+ * @tutorial https://uview-plus.jiangruyi.com/components/calendar.html
  *
  * @property {String}				title				标题内容 (默认 日期选择 )
  * @property {Boolean}				showTitle			是否显示标题  (默认 true )
@@ -106,6 +111,7 @@ import test from '../../libs/function/test';
  * @property {Boolean}				allowSameDay	    是否允许日期范围的起止时间为同一天，mode = range时有效 (默认 false )
  * @property {Number|String}	    round				圆角值，默认无圆角  (默认 0 )
  * @property {Number|String}	    monthNum			最多展示的月份数量  (默认 3 )
+ * @property {Array}	            weekText			星期文案  (默认 ['一', '二', '三', '四', '五', '六', '日'] )
  *
  * @event {Function()} confirm 		点击确定按钮时触发		选择日期相关的返回参数
  * @event {Function()} close 		日历关闭时触发			可定义页面关闭时的回调事件
@@ -182,9 +188,11 @@ export default {
 		subtitle() {
 			// 初始化时，this.months为空数组，所以需要特别判断处理
 			if (this.months.length) {
-				return `${this.months[this.monthIndex].year}年${
-					this.months[this.monthIndex].month
-				}月`
+				if (uni.getLocale() == 'zh-Hans' || uni.getLocale() == 'zh-Hant') {
+					return this.months[this.monthIndex].year + '年' + (this.months[this.monthIndex].month < 10 ? '0' + this.months[this.monthIndex].month : this.months[this.monthIndex].month) + '月'
+				} else {
+					return (this.months[this.monthIndex].month < 10 ? '0' + this.months[this.monthIndex].month : this.months[this.monthIndex].month) + '/' + this.months[this.monthIndex].year
+				}
 			} else {
 				return ''
 			}
@@ -242,7 +250,13 @@ export default {
 				return error('maxDate不能小于minDate时间')
 			}
 			// 滚动区域的高度
-			this.listHeight = this.rowHeight * 5 + 30
+			let bottomPadding = 0;
+			if (this.pageInline) {
+				bottomPadding = 0
+			} else {
+				bottomPadding = 30
+			}
+			this.listHeight = this.rowHeight * 5 + bottomPadding
 			this.setMonth()
 		},
 		close() {
@@ -399,8 +413,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../../libs/css/components.scss';
-
 .u-calendar {
 	&__confirm {
 		padding: 7px 18px;
diff --git a/uview-plus/components/u-calendar/util.js b/uview-plus/components/u-calendar/util.js
index 18762c1..4483937 100644
--- a/uview-plus/components/u-calendar/util.js
+++ b/uview-plus/components/u-calendar/util.js
@@ -1,4 +1,4 @@
-import dayjs from 'dayjs/esm/index'
+import dayjs from '../u-datetime-picker/dayjs.esm.min.js';
 export default {
     methods: {
         // 设置月份数据
diff --git a/uview-plus/components/u-canvas/u-canvas.vue b/uview-plus/components/u-canvas/u-canvas.vue
new file mode 100644
index 0000000..3716925
--- /dev/null
+++ b/uview-plus/components/u-canvas/u-canvas.vue
@@ -0,0 +1,423 @@
+<template>
+    <view class="u-canvas"
+        :id="rootId"
+        :style="{
+            width: useRootHeightAndWidth ? '100%' : 'auto',
+            height: useRootHeightAndWidth ? '100%' : 'auto',
+        }">
+        <!-- #ifdef MP || H5 -->
+        <canvas
+            class="u-canvas__canvas"
+            :id="canvasId"
+            :canvas-id="canvasId"
+            type="2d"
+            :style="{ width: width + unit, height: height + unit }"
+            @touchstart="onTouchStart"
+            @touchmove="onTouchMove"
+            @touchend="onTouchEnd"/>
+        <!-- #endif -->
+
+        <!-- #ifdef APP-PLUS -->
+        <canvas
+            class="u-canvas__canvas"
+            :id="canvasId"
+            :canvas-id="canvasId"
+            :style="{ width: width + unit, height: height + unit }" 
+            @touchstart="onTouchStart"
+            @touchmove="onTouchMove"
+            @touchend="onTouchEnd"/>
+        <!-- #endif -->
+
+        <!-- #ifdef APP-NVUE -->
+        <gcanvas class="u-canvas__canvas" ref="gcanvess"
+            :style="{ width: width + unit, height: height + unit }"
+            @touchstart="onTouchStart"
+            @touchmove="onTouchMove"
+            @touchend="onTouchEnd">
+        </gcanvas>
+        <!-- #endif -->
+    </view>
+</template>
+
+<script>
+// #ifdef APP-NVUE
+// https://github.com/dcloudio/NvueCanvasDemo/blob/master/README.md
+import {
+    enable,
+    WeexBridge,
+	Image as GImage
+} from '../../libs/util/gcanvas/index.js';
+// #endif
+let canvasNode = null;
+export default {
+    name: "u-canvas",
+    props: {
+        canvasId: {
+            type: String,
+            default: () => {
+				return `u-canvas${Math.floor(Math.random() * 1000000)}`
+			}
+        },
+        width: {
+            type: [String, Number],
+            default: 300
+        },
+        height: {
+            type: [String, Number],
+            default: 300
+        },
+        unit: {
+            type: String,
+            default: 'px'
+        },
+        useRootHeightAndWidth: {
+            type: Boolean,
+            default: false
+        },
+        // 背景色
+        bgColor: {
+            type: String,
+            default: '#ffffff'
+        }
+    },
+    data() {
+        return {
+            rootId: `rootId${Number(Math.random() * 100).toFixed(0)}`,
+            ganvas: null,
+            canvasContext: null,
+            widthLocal: this.width,
+            heightLocal: this.height,
+            ctx: null
+        };
+    },
+    computed: {
+        // 计算实际画布尺寸
+        actualWidth() {
+            return this.useRootHeightAndWidth ? this.widthLocal : Number(this.width);
+        },
+        actualHeight() {
+            return this.useRootHeightAndWidth ? this.heightLocal : Number(this.height);
+        }
+    },
+    methods: {
+        // 添加触摸事件处理方法
+        onTouchStart(e) {
+            this.$emit('touchstart', e);
+        },
+        onTouchMove(e) {
+            this.$emit('touchmove', e);
+        },
+        onTouchEnd(e) {
+            this.$emit('touchend', e);
+        },
+
+        /**
+         * 获取节点
+         * @param id 节点id
+         * @param isCanvas 是否为Canvas节点
+         * @return {Promise<unknown>}
+         */
+        async getCanvasNode(id, isCanvas = true) {
+			let that = this
+        	return new Promise((resolve, reject) => {
+        		try {
+        			// #ifdef APP-NVUE
+        			setTimeout(() => {
+        				/*获取元素引用*/
+        				this.ganvas = this.$refs["gcanvess"]
+        				/*通过元素引用获取canvas对象*/
+        				let canvasNode = enable(this.ganvas, {
+        				    bridge: WeexBridge
+        				})
+        				resolve(canvasNode)
+        			}, 200)
+        			// #endif
+        			// #ifndef APP-PLUS-NVUE
+                    const query = uni.createSelectorQuery().in(that).select(`#${id}`);
+                    query.fields({
+                            node: true,
+                            size: true
+                        })
+                        .exec((res) => {
+                            if (isCanvas) {
+                                if (res[0]?.node) {
+                                    resolve(res[0].node)
+                                } else {
+                                    resolve(false)
+                                    console.error("获取节点出错", res)
+                                }
+                            } else {
+                                resolve(res[0])
+                            }
+                        })
+        			// #endif
+        		} catch (e) {
+        			console.error("获取节点失败", e)
+        		}
+        	})
+        },
+		
+        /**
+         * 获取Canvas上下文
+         */
+        getCanvasContext() {
+            // #ifdef APP-PLUS
+            return uni.createCanvasContext(this.canvasId, this);
+            // #endif
+            // #ifdef APP-PLUS-NVUE || MP || H5
+            return canvasNode.getContext('2d');
+            // #endif
+        },
+
+        /**
+         * 初始化Canvas
+         */
+        async initCanvas() {
+            try {
+                canvasNode = await this.getCanvasNode(this.canvasId);
+                
+                // #ifdef MP-WEIXIN
+                // 在微信小程序中，为了提高清晰度，需要考虑设备像素比
+                const dpr = uni.getSystemInfoSync().pixelRatio;
+                if(canvasNode) {
+                    // 设置canvas实际绘制尺寸为显示尺寸的dpr倍
+                    canvasNode.width = this.actualWidth * dpr;
+                    canvasNode.height = this.actualHeight * dpr;
+                }
+                // #endif
+                
+                this.ctx = this.getCanvasContext();
+                
+                // #ifdef MP-WEIXIN
+                if(this.ctx) {
+                    this.ctx.scale(dpr, dpr);
+                }
+                // #endif
+                
+                // 初始化背景，但不在微信小程序中调用draw
+                this.clearCanvas();
+            } catch (error) {
+                console.error("初始化Canvas失败:", error);
+            }
+        },
+
+        /**
+         * 清空画布
+         */
+        clearCanvas() {
+            if (!this.ctx) return;
+
+            this.clearRect(0, 0, this.actualWidth, this.actualHeight);
+
+            // 填充背景色
+            this.beginPath();
+            this.rect(0, 0, this.actualWidth, this.actualHeight);
+
+            this.setFillStyle(this.bgColor);
+            this.fill();
+            
+            this.draw();
+        },
+        rect(x, y, width, height) {
+            if (!this.ctx) return;
+            this.ctx.rect(x, y, width, height);
+        },
+        clearRect(x, y, width, height) {
+            if (!this.ctx) return;
+            this.ctx.clearRect(x, y, width, height);
+        },
+        fill() {
+            if (!this.ctx) return;
+            this.ctx.fill();
+        },
+        setFillStyle(color) {
+            if (!this.ctx) return;
+
+            // #ifndef APP-PLUS-NVUE
+            if (this.ctx.setFillStyle) {
+                this.ctx.setFillStyle(color);
+            } else {
+                this.ctx.fillStyle = color;
+            }
+            // #endif
+            // #ifdef APP-PLUS-NVUE
+            this.ctx.setFillStyle(color);
+            // #endif
+        },
+
+        /**
+         * 设置线条样式
+         */
+        setLineStyle(lineColor, lineWidth) {
+            if (!this.ctx) return;
+            this.setLineCap('round');
+            this.setLineJoin('round');
+            this.setStrokeStyle(lineColor);
+            this.setLineWidth(lineWidth);
+        },
+        setLineCap(lineCap = 'round') {
+            if (!this.ctx) return;
+            if (this.ctx.setLineCap) {
+                this.ctx.setLineCap(lineCap);
+            } else {
+                this.ctx.lineCap = lineCap;
+            }
+        },
+        setLineJoin(lineJoin = 'round') {
+            if (!this.ctx) return;
+            if (this.ctx.setLineJoin) {
+                this.ctx.setLineJoin(lineJoin);
+            } else {
+                this.ctx.lineJoin = lineJoin;
+            }
+        },
+        setStrokeStyle(color) {
+            if (!this.ctx) return;
+            if (this.ctx.setStrokeStyle) {
+                this.ctx.setStrokeStyle(color);
+            } else {
+                this.ctx.strokeStyle = color;
+            }
+        },
+        setLineWidth(width) {
+            if (!this.ctx) return;
+            if (this.ctx.setLineWidth) {
+                this.ctx.setLineWidth(width);
+            } else {
+                this.ctx.lineWidth = width;
+            }
+        },
+
+        /**
+         * 开始路径
+         */
+        beginPath() {
+            if (!this.ctx) return;
+            this.ctx.beginPath();
+        },
+
+        /**
+         * 移动到某点
+         */
+        moveTo(x, y) {
+            if (!this.ctx) return;
+            this.ctx.moveTo(x, y);
+        },
+
+        /**
+         * 画线到某点
+         */
+        lineTo(x, y) {
+            if (!this.ctx) return;
+            this.ctx.lineTo(x, y);
+        },
+
+        /**
+         * 描边
+         */
+        stroke() {
+            if (!this.ctx) return;
+            this.ctx.stroke();
+        },
+
+        /**
+         * 关闭路径
+         */
+        closePath() {
+            if (!this.ctx) return;
+            this.ctx.closePath();
+        },
+
+        /**
+         * 绘制操作
+         */
+        draw(isLastDraw = false) {
+            // #ifndef MP-WEIXIN
+            if (this.ctx && typeof this.ctx.draw === 'function') {
+                this.ctx.draw(isLastDraw);
+            }
+            // #endif
+        },
+
+        /**
+         * 导出图片
+         */
+        exportImage(fileType = 'png', quality = 1) {
+            return new Promise((resolve, reject) => {
+                // #ifdef MP-WEIXIN
+                // 微信小程序中需要先完成绘制，然后导出图片
+                setTimeout(() => {
+                    uni.canvasToTempFilePath({
+                        x: 0,
+                        y: 0,
+                        width: this.actualWidth,
+                        height: this.actualHeight,
+                        destWidth: this.actualWidth * 2, // 使用双倍尺寸以提高清晰度
+                        destHeight: this.actualHeight * 2,
+                        canvas: canvasNode, // 2d必须
+                        canvasId: this.canvasId,
+                        fileType: fileType,
+                        quality: quality,
+                        success: (res) => {
+                            resolve(res.tempFilePath);
+                        },
+                        fail: (err) => {
+                            console.error('导出图片失败:', err);
+                            reject(err);
+                        }
+                    }, this);
+                }, 50); // 等待50毫秒确保绘制完成
+                // #endif
+
+                // #ifndef MP-WEIXIN
+                uni.canvasToTempFilePath({
+                    canvas: canvasNode, // 2d必须
+                    canvasId: this.canvasId,
+                    fileType: fileType,
+                    quality: quality,
+                    success: (res) => {
+                        resolve(res.tempFilePath);
+                    },
+                    fail: (err) => {
+                        console.error('导出图片失败:', err);
+                        reject(err);
+                    }
+                }, this);
+                // #endif
+            });
+        },
+
+        /**
+         * 使用根节点宽高 设置新的size
+         * @return {Promise<void>}
+         */
+        async setNewSize(){
+            const rootNode = await this.getCanvasNode(this.rootId, false);
+            const { width , height } = rootNode;
+            this.widthLocal = height;
+            this.heightLocal = width;
+        }
+    },
+    
+    async mounted() {
+        // 如果使用根节点的宽高 则 重新设置 size
+        if(this.useRootHeightAndWidth){
+            await this.setNewSize();
+        }
+        
+        // 初始化Canvas
+        await this.initCanvas();
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+    .u-canvas {
+        position: relative;
+        overflow: hidden;
+    }
+
+    .u-canvas__canvas {
+        display: block;
+    }
+</style>
\ No newline at end of file
diff --git a/uview-plus/components/u-car-keyboard/carKeyboard.js b/uview-plus/components/u-car-keyboard/carKeyboard.js
index af1baa0..487a612 100644
--- a/uview-plus/components/u-car-keyboard/carKeyboard.js
+++ b/uview-plus/components/u-car-keyboard/carKeyboard.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:53:20
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/carKeyboard.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/carKeyboard.js
  */
 export default {
     // 车牌号键盘
diff --git a/uview-plus/components/u-car-keyboard/u-car-keyboard.vue b/uview-plus/components/u-car-keyboard/u-car-keyboard.vue
index d78aab0..cf0f7f0 100644
--- a/uview-plus/components/u-car-keyboard/u-car-keyboard.vue
+++ b/uview-plus/components/u-car-keyboard/u-car-keyboard.vue
@@ -56,11 +56,11 @@
 					hover-class="u-hover-class"
 					:hover-stay-time="200"
 				>
-					<u-icon
+					<up-icon
 						size="28"
 						name="backspace"
 						color="#303133"
-					></u-icon>
+					></up-icon>
 				</view>
 			</view>
 		</view>
@@ -222,7 +222,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	$u-car-keyboard-background-color: rgb(224, 228, 230) !default;
 	$u-car-keyboard-padding:6px 0 6px !default;
 	$u-car-keyboard-button-inner-width:64rpx !default;
diff --git a/uview-plus/components/u-card/card.js b/uview-plus/components/u-card/card.js
new file mode 100644
index 0000000..9d71214
--- /dev/null
+++ b/uview-plus/components/u-card/card.js
@@ -0,0 +1,40 @@
+/*
+ * @Author       : jry
+ * @Description  :
+ * @version      : 3.0
+ * @Date         : 2025-04-26 16:37:21
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-04-26 16:37:21
+ * @FilePath     : /uview-plus/libs/config/props/card.js
+ */
+export default {
+	// card组件的props
+	card: {
+		full: false,
+		title: '',
+		titleColor: '#303133',
+		titleSize: '15px',
+		subTitle: '',
+		subTitleColor: '#909399',
+		subTitleSize: '13px',
+		border: true,
+		index: '',
+		margin: '15px',
+		borderRadius: '8px',
+		headStyle: {},
+		bodyStyle: {},
+		footStyle: {},
+		headBorderBottom: true,
+		footBorderTop: true,
+		thumb: '',
+		thumbWidth: '30px',
+		thumbCircle: false,
+		padding: '15px',
+		paddingHead: '',
+        paddingBody: '',
+        paddingFoot: '',
+        showHead: true,
+        showFoot: true,
+        boxShadow: 'none'
+	}
+}
diff --git a/uview-plus/components/u-card/props.js b/uview-plus/components/u-card/props.js
index d1de61c..fa8d72a 100644
--- a/uview-plus/components/u-card/props.js
+++ b/uview-plus/components/u-card/props.js
@@ -6,135 +6,129 @@ export const propsCard = defineMixin({
         // 与屏幕两侧是否留空隙
 		full: {
 			type: Boolean,
-			default: false
+			default: () => defProps.card.full
 		},
 		// 标题
 		title: {
 			type: String,
-			default: ''
+			default: () => defProps.card.title
 		},
 		// 标题颜色
 		titleColor: {
 			type: String,
-			default: '#303133'
+			default: () => defProps.card.titleColor
 		},
 		// 标题字体大小
 		titleSize: {
 			type: [Number, String],
-			default: '15px'
+			default: () => defProps.card.titleSize
 		},
 		// 副标题
 		subTitle: {
 			type: String,
-			default: ''
+			default: () => defProps.card.subTitle
 		},
 		// 副标题颜色
 		subTitleColor: {
 			type: String,
-			default: '#909399'
+			default: () => defProps.card.subTitleColor
 		},
 		// 副标题字体大小
 		subTitleSize: {
 			type: [Number, String],
-			default: '13'
+			default: () => defProps.card.subTitleSize
 		},
 		// 是否显示外部边框，只对full=false时有效(卡片与边框有空隙时)
 		border: {
 			type: Boolean,
-			default: true
+			default: () => defProps.card.border
 		},
 		// 用于标识点击了第几个
 		index: {
 			type: [Number, String, Object],
-			default: ''
+			default: () => defProps.card.index
 		},
 		// 用于隔开上下左右的边距，带单位的写法，如："30px 30px"，"20px 20px 30px 30px"
 		margin: {
 			type: String,
-			default: '15px'
+			default: () => defProps.card.margin
 		},
 		// card卡片的圆角
 		borderRadius: {
 			type: [Number, String],
-			default: '8px'
+			default: () => defProps.card.borderRadius
 		},
 		// 头部自定义样式，对象形式
 		headStyle: {
 			type: Object,
-			default() {
-				return {};
-			}
+			default: () => defProps.card.headStyle
 		},
 		// 主体自定义样式，对象形式
 		bodyStyle: {
 			type: Object,
-			default() {
-				return {};
-			}
+			default: () => defProps.card.bodyStyle
 		},
 		// 底部自定义样式，对象形式
 		footStyle: {
 			type: Object,
-			default() {
-				return {};
-			}
+			default: () => defProps.card.footStyle
 		},
 		// 头部是否下边框
 		headBorderBottom: {
 			type: Boolean,
-			default: true
+			default: () => defProps.card.headBorderBottom
 		},
 		// 底部是否有上边框
 		footBorderTop: {
 			type: Boolean,
-			default: true
+			default: () => defProps.card.footBorderTop
 		},
 		// 标题左边的缩略图
 		thumb: {
 			type: String,
-			default: ''
+			default: () => defProps.card.thumb
 		},
 		// 缩略图宽高
 		thumbWidth: {
 			type: [String, Number],
-			default: '30px'
+			default: () => defProps.card.thumbWidth
 		},
 		// 缩略图是否为圆形
 		thumbCircle: {
 			type: Boolean,
-			default: false
+			default: () => defProps.card.thumbCircle
 		},
 		// 给head，body，foot的内边距
 		padding: {
 			type: [String, Number],
-			default: '15px'
+			default: () => defProps.card.padding
 		},
 		paddingHead: {
 			type: [String, Number],
-			default: ''
+			default: () => defProps.card.paddingHead
 		},
 		paddingBody: {
 			type: [String, Number],
-			default: ''
+			default: () => defProps.card.paddingBody
 		},
 		paddingFoot: {
 			type: [String, Number],
-			default: ''
+			default: () => defProps.card.paddingFoot
 		},
 		// 是否显示头部
 		showHead: {
 			type: Boolean,
-			default: true
+			default: () => defProps.card.showHead
 		},
 		// 是否显示尾部
 		showFoot: {
 			type: Boolean,
-			default: true
+			default: () => defProps.card.showFoot
 		},
 		// 卡片外围阴影，字符串形式
 		boxShadow: {
 			type: String,
-			default: 'none'
+			default: () => defProps.card.boxShadow
 		}
     }
 })
diff --git a/uview-plus/components/u-card/u-card.vue b/uview-plus/components/u-card/u-card.vue
index f04758a..0d98131 100644
--- a/uview-plus/components/u-card/u-card.vue
+++ b/uview-plus/components/u-card/u-card.vue
@@ -136,8 +136,6 @@
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
-	
 .u-card {
 	position: relative;
 	overflow: hidden;
diff --git a/uview-plus/components/u-cascader/u-cascader.vue b/uview-plus/components/u-cascader/u-cascader.vue
new file mode 100644
index 0000000..ac56c7a
--- /dev/null
+++ b/uview-plus/components/u-cascader/u-cascader.vue
@@ -0,0 +1,344 @@
+<template>
+	<up-popup :show="popupShow" mode="bottom" :popup="false"
+		:mask="true" :closeable="closeable" :safe-area-inset-bottom="true"
+		close-icon-color="#ffffff" :z-index="uZIndex"
+		:maskCloseAble="maskCloseAble" @close="close">
+		<view class="up-p-t-30 up-p-l-20 up-m-b-10" v-if="headerDirection =='column'">
+			<up-steps v-if="popupShow" dot direction="column" v-model:current="tabsIndex">
+				<up-steps-item  v-for="(item, index) in genTabsList"
+					@click="tabsIndex = index" :title="item.name"></up-steps-item>
+			</up-steps>
+		</view>
+		<view class="up-p-t-20 up-m-b-10" v-else>
+			<up-tabs v-if="popupShow" :list="genTabsList"
+				:scrollable="true" v-model:current="tabsIndex" @change="tabsChange" ref="tabs"></up-tabs>
+		</view>
+		<view class="area-box">
+			<view class="u-flex" :class="{ 'change':isChange }"
+				:style="{transform: optionsCols == 2 && isChange ? 'translateX(-33.3333333%)' : ''}">
+				<template v-for="(levelData, levelIndex) in levelList" :key="levelIndex">
+					<view v-if="optionsCols == 2 || levelIndex == tabsIndex" class="area-item"
+						:style="{ width: optionsCols == 2 ? '33.33333%' : '750rpx'}">
+						<view class="u-padding-10 u-bg-gray" style="height: 100%;">
+							<scroll-view :scroll-y="true" style="height: 100%">
+								<up-cell-group v-if="levelIndex === 0 || selectedValueIndexs[levelIndex - 1] !== undefined">
+									<up-cell v-for="(item,index) in levelData"
+										:title="item[labelKey]" :arrow="false"
+										:index="index" :key="index"
+										@click="levelChange(levelIndex, index)">
+										<template v-slot:right-icon>
+											<up-icon v-if="selectedValueIndexs[levelIndex] === index"
+												size="17" name="checkbox-mark"></up-icon>
+										</template>
+									</up-cell>
+								</up-cell-group>
+							</scroll-view>
+						</view>
+					</view>
+				</template>
+			</view>
+		</view>
+		<!-- 添加按钮区域 -->
+		<view class="u-cascader-action up-flex up-flex-between">
+			<view class="u-padding-20 up-flex-fill">
+				<up-button @click="handleCancel" type="default">{{ t("up.common.cancel") }}</up-button>
+			</view>
+			<view class="u-padding-20 up-flex-fill">
+				<up-button @click="handleConfirm" type="primary">{{ t("up.common.confirm") }}</up-button>
+			</view>
+		</view>
+	</up-popup>
+</template>
+
+<script>
+	/**
+	 * u-cascader 通用无限级联选择器
+	 * @property {String Number} z-index 弹出时的z-index值（默认1075）
+	 * @property {Boolean} mask-close-able 是否允许通过点击遮罩关闭Picker（默认true）
+	 * @property {Array} data 级联数据
+	 * @property {Array} default-value 默认选中的值
+	 * @property {String} valueKey 指定选项的值为选项对象中的哪个属性值
+	 * @property {String} labelKey 指定选项标签为选项对象中的哪个属性值
+	 * @property {String} childrenKey 指定选项的子选项为选项对象中的哪个属性值
+	 * @property {Boolean} autoClose 是否在选择最后一级时自动关闭并触发confirm（默认false）
+	 * @property {Boolean} closeable 是否显示关闭图标（默认true）
+	 */
+	import { t } from '../../libs/i18n'
+	export default {
+		name: 'up-cascader',
+		props: {
+			// 通过双向绑定控制组件的弹出与收起
+			show: {
+				type: Boolean,
+				default: false
+			},
+			// 级联数据
+			data: {
+				type: Array,
+				default() {
+					return [];
+				}
+			},
+			// 默认选中的值
+			modelValue: {
+				type: Array,
+				default() {
+					return [];
+				}
+			},
+			// 指定选项的值为选项对象中的哪个属性值
+			valueKey: {
+				type: String,
+				default: 'value'
+			},
+			// 指定选项标签为选项对象中的哪个属性值
+			labelKey: {
+				type: String,
+				default: 'label'
+			},
+			// 指定选项的子选项为选项对象中的哪个属性值
+			childrenKey: {
+				type: String,
+				default: 'children'
+			},
+			// 是否允许通过点击遮罩关闭Picker
+			maskCloseAble: {
+				type: Boolean,
+				default: true
+			},
+			// 弹出的z-index值
+			zIndex: {
+				type: [String, Number],
+				default: 0
+			},
+			// 是否在选择最后一级时自动关闭并触发confirm
+			autoClose: {
+				type: Boolean,
+				default: false
+			},
+			// 选中项目的展示方向direction垂直方向适合文字长度过长
+			headerDirection: {
+				type: String,
+				default: 'row'
+			},
+			// 选项区域列数，支持1列和2列，默认为2列
+			optionsCols: {
+				type: [Number],
+				default: 2
+			},
+			// 是否显示关闭图标
+			closeable: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				// 存储每一级的数据
+				levelList: [],
+				// 存储每一级选中的索引
+				selectedValueIndexs: [],
+				tabsIndex: 0,
+				popupShow: false,
+				// 新增confirmValues用于存储确认的值
+				confirmValues: []
+			}
+		},
+		watch: {
+			data: {
+				handler() {
+					this.initLevelList();
+					this.setDefaultValue();
+				},
+				immediate: true
+			},
+			show() {
+				this.popupShow = this.show;
+			},
+			modelValue: {
+				handler() {
+					// 初始化选中值
+					this.setDefaultValue();
+				},
+				immediate: true
+			}
+		},
+		computed: {
+			isChange() {
+				return this.tabsIndex > 1;
+			},
+			genTabsList() {
+				let tabsList = [{
+					name: "请选择"
+				}];
+				
+				// 根据选中的值动态生成tabs
+				for (let i = 0; i < this.selectedValueIndexs.length; i++) {
+					if (this.selectedValueIndexs[i] !== undefined && this.levelList[i]) {
+						const selectedItem = this.levelList[i][this.selectedValueIndexs[i]];
+						if (selectedItem) {
+							tabsList[i] = {
+								name: selectedItem[this.labelKey]
+							};
+							// 如果还有下一级，则添加"请选择"
+							if (i === this.selectedValueIndexs.length - 1 && 
+								selectedItem[this.childrenKey] && 
+								selectedItem[this.childrenKey].length > 0) {
+								tabsList.push({
+									name: "请选择"
+								});
+							}
+						}
+					}
+				}
+				
+				return tabsList;
+			},
+			uZIndex() {
+				// 如果用户有传递z-index值，优先使用
+				return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+			}
+		},
+		// 新增confirm事件
+		emits: ['update:modelValue', 'update:show', 'change', 'confirm', 'cancel'],
+		methods: {
+			t,
+			initLevelList() {
+				// 初始化第一级数据
+				if (this.data && this.data.length > 0) {
+					this.levelList = [this.data];
+					this.selectedValueIndexs = [];
+				}
+			},
+			setDefaultValue() {
+				// 检查data是否为空
+				if (!this.data || this.data.length == 0) return;
+				// 检查modelValue是否为空
+				if (!this.modelValue || this.modelValue.length == 0) return;
+				// 根据默认值设置选中项
+				// 根据modelValue获取indexs给selectedValueIndexs
+				this.selectedValueIndexs = [];
+				this.levelList = []; // 设置层级数据为空
+				let currentLevelData = this.data;
+				
+				for (let i = 0; i < this.modelValue.length; i++) {
+					const value = this.modelValue[i];
+					const index = currentLevelData.findIndex(item => item[this.valueKey] === value);
+					this.levelList[i] = currentLevelData; // 设置每一层级的数据
+					
+					if (index !== -1) {
+						this.selectedValueIndexs.push(index);
+						// 更新下一级的数据
+						if (currentLevelData[index][this.childrenKey]) {
+							currentLevelData = currentLevelData[index][this.childrenKey];
+						} else {
+							// 如果没有子级数据，则停止处理
+							break;
+						}
+					} else {
+						// 如果找不到匹配项，则停止处理
+						break;
+					}
+				}
+			},
+			close() {
+				this.$emit('cancel');
+				this.$emit('update:show', false);
+			},
+			tabsChange(item) {
+			},
+			levelChange(levelIndex, index) {
+				// 设置当前级的选中值
+				this.$set(this.selectedValueIndexs, levelIndex, index);
+				
+				// 清除后续级别的选中值
+				this.selectedValueIndexs.splice(levelIndex + 1);
+				this.tabsIndex = Math.min(this.tabsIndex, levelIndex);
+				
+				// 清除后续级别的列表
+				this.levelList.splice(levelIndex + 1);
+				
+				// 获取当前选中项
+				const currentItem = this.levelList[levelIndex][index];
+				
+				// 如果有子级数据，则初始化下一级
+				if (currentItem && currentItem[this.childrenKey] && currentItem[this.childrenKey].length > 0) {
+					// 确保levelList数组足够长
+					if (this.levelList.length <= levelIndex + 1) {
+						this.levelList.push(currentItem[this.childrenKey]);
+					} else {
+						this.$set(this.levelList, levelIndex + 1, currentItem[this.childrenKey]);
+					}
+					// 切换到下一级tab
+					this.tabsIndex = levelIndex + 1;
+				} else {
+					// 没有子级数据，说明是最后一级
+					if (this.autoClose) {
+						// 如果启用自动关闭，则触发change事件并关闭
+						this.emitChange();
+					} else {
+						// 否则只触发change事件，不关闭
+						this.emitChange(false);
+					}
+				}
+			},
+			// 修改emitChange方法，增加closePopup参数
+			emitChange(closePopup = true) {
+				// 构造选中结果
+				const result = [];
+				for (let i = 0; i < this.selectedValueIndexs.length; i++) {
+					if (this.selectedValueIndexs[i] !== undefined && this.levelList[i]) {
+						result.push(this.levelList[i][this.selectedValueIndexs[i]][this.valueKey]);
+					}
+				}
+				
+				// 更新confirmValues
+				this.confirmValues = [...result];
+				
+				// 触发change事件，返回value数组
+				this.$emit('change', this.confirmValues);
+				
+				// 根据参数决定是否关闭弹窗
+				if (closePopup) {
+					this.close();
+				}
+			},
+			handleCancel() {
+				this.close();
+			},
+			handleConfirm() {
+				// 确认时触发confirm事件
+				this.$emit('update:modelValue', this.confirmValues);
+				this.$emit('confirm', this.confirmValues);
+				this.close();
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	.area-box {
+		width: 100%;
+		overflow: hidden;
+		height: 800rpx;
+
+		>view {
+			width: 150%;
+			transition: transform 0.3s ease-in-out 0s;
+			transform: translateX(0);
+
+			&.change {
+				// transform: translateX(-33.3333333%);
+			}
+		}
+
+		.area-item {
+			// width: 750rpx;
+			height: 800rpx;
+		}
+	}
+	
+	// 添加按钮区域样式
+	.u-cascader-action {
+		border-top: 1px solid #eee;
+	}
+</style>
diff --git a/uview-plus/components/u-cate-tab/u-cate-tab.vue b/uview-plus/components/u-cate-tab/u-cate-tab.vue
index 8979069..8d1a9ea 100644
--- a/uview-plus/components/u-cate-tab/u-cate-tab.vue
+++ b/uview-plus/components/u-cate-tab/u-cate-tab.vue
@@ -1,44 +1,64 @@
 <template>
-	<view class="u-cate-tab">
+	<view class="u-cate-tab" :style="{ height: addUnit(height) }">
 		<view class="u-cate-tab__wrap">
 			<scroll-view class="u-cate-tab__view u-cate-tab__menu-scroll-view"
                 scroll-y scroll-with-animation :scroll-top="scrollTop"
 			    :scroll-into-view="itemId">
 				<view v-for="(item, index) in tabList" :key="index" class="u-cate-tab__item"
-                    :class="[current == index ? 'u-cate-tab__item-active' : '']"
+                    :class="[innerCurrent == index ? 'u-cate-tab__item-active' : '']"
 				 @tap.stop="swichMenu(index)">
-                    <slot name="tabItem" :item="item">
-                        <text class="u-line-1">{{item[tabKeyName]}}</text>
+					<slot name="tabItem" :item="item">
                     </slot>
+                    <text v-if="!$slots['tabItem']" class="u-line-1">{{item[tabKeyName]}}</text>
 				</view>
 			</scroll-view>
-			<scroll-view :scroll-top="scrollRightTop" scroll-y scroll-with-animation class="u-cate-tab__right-box" @scroll="rightScroll">
+			<scroll-view :scroll-top="scrollRightTop" scroll-with-animation :scroll-into-view="scrollIntoView"
+				scroll-y class="u-cate-tab__right-box" @scroll="rightScroll">
+				<view class="u-cate-tab__right-top">
+					<slot name="rightTop" :tabList="tabList">
+                	</slot>
+				</view>
 				<view class="u-cate-tab__page-view">
-					<view class="u-cate-tab__page-item" :id="'item' + index" v-for="(item , index) in tabList" :key="index">
-                        <slot name="itemList" :item="item">
-                            <view class="item-title">
-                                <text>{{item[tabKeyName]}}</text>
-                            </view>
-                            <view class="item-container">
-                                <template v-for="(item1, index1) in item.children" :key="index1">
-                                    <slot name="pageItem" :pageItem="item1">
-                                        <view class="thumb-box" >
-                                            <image class="item-menu-image" :src="item1.icon" mode=""></image>
-                                            <view class="item-menu-name">{{item1[itemKeyName]}}</view>
-                                        </view>
-                                    </slot>
-                                </template>
-                            </view>
-                        </slot>
-					</view>
+					<template :key="index" v-for="(item , index) in tabList">
+						<view v-if="mode == 'follow' || ( mode == 'tab' && index == innerCurrent)"
+							class="u-cate-tab__page-item" :id="'item' + index">
+							<slot name="itemList" :item="item">
+							</slot>
+							<template v-if="!$slots['itemList']">
+								<view class="item-title">
+									<text>{{item[tabKeyName]}}</text>
+								</view>
+								<view class="item-container">
+									<template v-for="(item1, index1) in item.children" :key="index1">
+										<slot name="pageItem" :pageItem="item1">
+											<view class="thumb-box" >
+												<image class="item-menu-image" :src="item1.icon" mode=""></image>
+												<view class="item-menu-name">{{item1[itemKeyName]}}</view>
+											</view>
+										</slot>
+									</template>
+								</view>
+							</template>
+						</view>
+					</template>
 				</view>
 			</scroll-view>
 		</view>
 	</view>
 </template>
 <script>
+	import { addUnit, sleep } from '../../libs/function/index';
 	export default {
+		name: 'up-cate-tab',
         props: {
+			mode: {
+                type: String,
+                default: 'follow' // follo跟随联动, tab单一显示。
+            },
+			height: {
+                type: String,
+                default: '100%'
+            },
             tabList: {
                 type: Array,
                 default: () => {
@@ -52,18 +72,43 @@
             itemKeyName: {
                 type: String,
                 default: 'name'
+            },
+			current: {
+                type: Number,
+                default: 0
             }
         },
         watch: {
-            tabList() {
-                this.getMenuItemTop()
-            }
+			tabList: {
+				deep: true,
+				handler(newVal, oldVal) {
+					// this.observer();
+					sleep(30).then(() => {
+						this.getMenuItemTop();
+						this.leftMenuStatus(this.innerCurrent);
+					})
+				}
+			},
+			current(nval) {
+				this.innerCurrent = nval;
+				this.leftMenuStatus(this.innerCurrent);
+				sleep(30).then(() => {
+					this.swichMenu(this.innerCurrent)
+				})
+			},
+			height() {
+				// console.log('height change');
+				this.getMenuItemTop();
+				this.leftMenuStatus(this.innerCurrent);
+			}
         },
+		emits: ['update:current'],
 		data() {
 			return {
 				scrollTop: 0, //tab标题的滚动条位置
+				scrollIntoView: '', // 滚动至哪个元素
 				oldScrollTop: 0,
-				current: 0, // 预设当前项的值
+				innerCurrent: 0, // 预设当前项的值
 				menuHeight: 0, // 左边菜单的高度
 				menuItemHeight: 0, // 左边菜单item的高度
 				itemId: '', // 栏目右边scroll-view用于滚动的id
@@ -74,26 +119,38 @@
 				timer: null, // 定时器
 			}
 		},
-		onMounted() {
+		mounted() {
+			// this.observer();
+			this.innerCurrent = this.current;
+			this.leftMenuStatus(this.innerCurrent);
 			this.getMenuItemTop()
+			// 设置默认index
+			sleep(50).then(() => {
+				this.swichMenu(this.innerCurrent)
+			})
 		},
 		methods: {
+			addUnit,
 			// 点击左边的栏目切换
 			async swichMenu(index) {
-				if(this.arr.length == 0) {
-					await this.getMenuItemTop();
+				if (this.mode == 'follow') {
+					if(this.arr.length == 0) {
+						await this.getMenuItemTop();
+					}
+					if (this.scrollIntoView != 'item' + index) {
+						this.scrollIntoView = 'item' + index;
+					}
 				}
-				if (index == this.current) return;
-				this.scrollRightTop = this.oldScrollTop;
+
+				if (index == this.innerCurrent) return;
 				this.$nextTick(function(){
-					this.scrollRightTop = this.arr[index];
-					this.current = index;
-					this.leftMenuStatus(index);
+					this.innerCurrent = index;
+					this.$emit('update:current', index);
 				})
 			},
 			// 获取一个目标元素的高度
 			getElRect(elClass, dataVal) {
-				new Promise((resolve, reject) => {
+				return new Promise((resolve, reject) => {
 					const query = uni.createSelectorQuery().in(this);
 					query.select('.' + elClass).fields({
 						size: true
@@ -112,54 +169,73 @@
 			},
 			// 观测元素相交状态
 			async observer() {
+				await this.$nextTick();
+				// 清除之前的观察器
+				if (this._observerList) {
+					this._observerList.forEach(observer => {
+						observer.disconnect();
+					});
+				}
+				this._observerList = [];
+				
 				this.tabList.map((val, index) => {
 					let observer = uni.createIntersectionObserver(this);
-					// 检测右边scroll-view的id为itemxx的元素与u-cate-tab__right-box的相交状态
-					// 如果跟.u-cate-tab__right-box底部相交，就动态设置左边栏目的活动状态
+					this._observerList.push(observer);
+					// 检测相交状态
 					observer.relativeTo('.u-cate-tab__right-box', {
-						top: 0
-					}).observe('#item' + index, res => {
+						top: 10
+					}).observe('#item' + index, (res) => {
 						if (res.intersectionRatio > 0) {
-							let id = res.id.substring(4);
-							this.leftMenuStatus(id);
+							console.log('res', res);
+							// 修复：确保正确获取索引
+							let id = res.id ? res.id.substring(4) : index;
+							this.leftMenuStatus(parseInt(id));
 						}
 					})
 				})
 			},
 			// 设置左边菜单的滚动状态
 			async leftMenuStatus(index) {
-				this.current = index;
+				this.innerCurrent = index;
+				this.$emit('update:current', index);
 				// 如果为0，意味着尚未初始化
 				if (this.menuHeight == 0 || this.menuItemHeight == 0) {
 					await this.getElRect('u-cate-tab__menu-scroll-view', 'menuHeight');
 					await this.getElRect('u-cate-tab__item', 'menuItemHeight');
 				}
+				// console.log(this.menuHeight, this.menuItemHeight)
 				// 将菜单活动item垂直居中
 				this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2;
 			},
 			// 获取右边菜单每个item到顶部的距离
-			getMenuItemTop() {
-				new Promise(resolve => {
-					let selectorQuery = uni.createSelectorQuery();
+			async getMenuItemTop() {
+				// await this.$nextTick();
+				// console.log('getMenuItemTop')
+				return new Promise(resolve => {
+					let selectorQuery = uni.createSelectorQuery().in(this);
 					selectorQuery.selectAll('.u-cate-tab__page-item').boundingClientRect((rects) => {
 						// 如果节点尚未生成，rects值为[](因为用selectAll，所以返回的是数组)，循环调用执行
 						if(!rects.length) {
 							setTimeout(() => {
 								this.getMenuItemTop();
-							}, 10);
+							}, 100);
 							return ;
 						}
+						// console.log(rects)
                         this.rects = rects;
+						this.arr = [];
 						rects.forEach((rect) => {
 							// 这里减去rects[0].top，是因为第一项顶部可能不是贴到导航栏(比如有个搜索框的情况)
 							this.arr.push(rect.top - rects[0].top);
-							resolve();
 						})
+						// console.log(this.arr)
+                        resolve();
 					}).exec()
 				})
 			},
 			// 右边菜单滚动
 			async rightScroll(e) {
+				if (this.mode !== 'follow') return;
 				this.oldScrollTop = e.detail.scrollTop;
                 // console.log(e.detail.scrollTop)
                 // console.log(JSON.stringify(this.arr))
@@ -190,7 +266,7 @@
 							return ;
 						}
 					}
-				}, 10)
+				}, 100)
 			}
 		}
 	}
@@ -205,6 +281,7 @@
 	.u-cate-tab__wrap {
 		flex: 1;
 		display: flex;
+		flex-direction: row;
 		overflow: hidden;
 	}
 
@@ -262,6 +339,7 @@
 	}
 
 	.u-cate-tab__right-box {
+		flex: 1;
 		background-color: rgb(250, 250, 250);
 	}
 
diff --git a/uview-plus/components/u-cell-group/cellGroup.js b/uview-plus/components/u-cell-group/cellGroup.js
index d48a9cd..8a39d07 100644
--- a/uview-plus/components/u-cell-group/cellGroup.js
+++ b/uview-plus/components/u-cell-group/cellGroup.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:54:16
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/cellGroup.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/cellGroup.js
  */
 export default {
     // cell-group组件的props
diff --git a/uview-plus/components/u-cell-group/u-cell-group.vue b/uview-plus/components/u-cell-group/u-cell-group.vue
index 40ed2dd..0fd1fb4 100644
--- a/uview-plus/components/u-cell-group/u-cell-group.vue
+++ b/uview-plus/components/u-cell-group/u-cell-group.vue
@@ -39,7 +39,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	
 	$u-cell-group-title-padding: 16px 16px 8px !default;
 	$u-cell-group-title-font-size: 15px !default;
diff --git a/uview-plus/components/u-cell/cell.js b/uview-plus/components/u-cell/cell.js
index 425ea3f..85f395b 100644
--- a/uview-plus/components/u-cell/cell.js
+++ b/uview-plus/components/u-cell/cell.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-23 20:53:09
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/cell.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/cell.js
  */
 export default {
 	// cell组件的props
diff --git a/uview-plus/components/u-cell/u-cell.vue b/uview-plus/components/u-cell/u-cell.vue
index fd20778..fd00a90 100644
--- a/uview-plus/components/u-cell/u-cell.vue
+++ b/uview-plus/components/u-cell/u-cell.vue
@@ -7,9 +7,9 @@
 				<view class="u-cell__left-icon-wrap" v-if="$slots.icon || icon">
 					<slot name="icon" v-if="$slots.icon">
 					</slot>
-					<u-icon v-else :name="icon"
+					<up-icon v-else :name="icon"
 						:custom-style="iconStyle"
-						:size="size === 'large' ? 22 : 18"></u-icon>
+						:size="size === 'large' ? 22 : 18"></up-icon>
 				</view>
 				<view class="u-cell__title">
                     <!-- 将slot与默认内容用if/else分开主要是因为微信小程序不支持slot嵌套传递，这样才能解决collapse组件的slot不失效问题，label暂时未用到。 -->
@@ -30,9 +30,9 @@
 			</slot>
 			<view class="u-cell__right-icon-wrap" v-if="$slots['right-icon'] || isLink"
 				:class="[`u-cell__right-icon-wrap--${arrowDirection}`]">
-				<u-icon v-if="rightIcon && !$slots['right-icon']" :name="rightIcon"
+				<up-icon v-if="rightIcon && !$slots['right-icon']" :name="rightIcon"
 					:custom-style="rightIconStyle" :color="disabled ? '#c8c9cc' : 'info'"
-					:size="size === 'large' ? 18 : 16"></u-icon>
+					:size="size === 'large' ? 18 : 16"></up-icon>
 				<slot v-else name="right-icon">
 				</slot>
 			</view>
@@ -113,7 +113,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	$u-cell-padding: 13px 15px !default;
 	$u-cell-font-size: 15px !default;
diff --git a/uview-plus/components/u-checkbox-group/checkboxGroup.js b/uview-plus/components/u-checkbox-group/checkboxGroup.js
index d0e22b6..d685a0a 100644
--- a/uview-plus/components/u-checkbox-group/checkboxGroup.js
+++ b/uview-plus/components/u-checkbox-group/checkboxGroup.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:54:47
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/checkboxGroup.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/checkboxGroup.js
  */
 export default {
     // checkbox-group组件
diff --git a/uview-plus/components/u-checkbox-group/u-checkbox-group.vue b/uview-plus/components/u-checkbox-group/u-checkbox-group.vue
index 0640d85..7563fae 100644
--- a/uview-plus/components/u-checkbox-group/u-checkbox-group.vue
+++ b/uview-plus/components/u-checkbox-group/u-checkbox-group.vue
@@ -14,7 +14,7 @@
 	/**
 	 * checkboxGroup 复选框组
 	 * @description 复选框组件一般用于需要多个选择的场景，该组件功能完整，使用方便
-	 * @tutorial https://ijry.github.io/uview-plus/components/checkbox.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/checkbox.html
 	 * @property {String}			name			标识符 
 	 * @property {Array}			value			绑定的值
 	 * @property {String}			shape			形状，circle-圆形，square-方形 （默认 'square' ）
@@ -100,8 +100,7 @@
 						values.push(child.name)
 					}
 				})
-				// 发出事件
-				this.$emit('change', values)
+			
 				// 修改通过v-model绑定的值
 				// #ifdef VUE3
 				this.$emit("update:modelValue", values);
@@ -109,13 +108,17 @@
 				// #ifdef VUE2
 				this.$emit("input", values);
 				// #endif
+       			// 放在最后更新，否则change事件传出去的values不会更新
+				this.$emit('change', values, {
+					isChecked: childInstance.$data['isChecked'],
+					name: childInstance.$props['name'] // 当前变动的checkbox的name值
+				})
 			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-checkbox-group {
 
diff --git a/uview-plus/components/u-checkbox/checkbox.js b/uview-plus/components/u-checkbox/checkbox.js
index 2310901..694dbf8 100644
--- a/uview-plus/components/u-checkbox/checkbox.js
+++ b/uview-plus/components/u-checkbox/checkbox.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-23 21:06:59
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/checkbox.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/checkbox.js
  */
 export default {
     // checkbox组件
diff --git a/uview-plus/components/u-checkbox/u-checkbox.vue b/uview-plus/components/u-checkbox/u-checkbox.vue
index adc3945..491b920 100644
--- a/uview-plus/components/u-checkbox/u-checkbox.vue
+++ b/uview-plus/components/u-checkbox/u-checkbox.vue
@@ -12,7 +12,7 @@
 		    :style="[iconWrapStyle]"
 		>
 			<slot name="icon" :elIconSize="elIconSize" :elIconColor="elIconColor">
-				<u-icon
+				<up-icon
 				    class="u-checkbox__icon-wrap__icon"
 				    name="checkbox-mark"
 				    :size="elIconSize"
@@ -177,7 +177,7 @@
 				const style = {}
 				if (!this.usedAlone) {
 					if (this.parentData.borderBottom && this.parentData.placement === 'row') {
-						error('检测到您将borderBottom设置为true，需要同时将u-checkbox-group的placement设置为column才有效')
+						error('检测到您将borderBottom设置为true，需要同时将up-checkbox-group的placement设置为column才有效')
 					}
 					// 当父组件设置了显示下边框并且排列形式为纵向时，给内容和边框之间加上一定间隔
 					if (this.parentData.borderBottom && this.parentData.placement === 'column') {
@@ -197,13 +197,14 @@
 					// 支付宝小程序不支持provide/inject，所以使用这个方法获取整个父组件，在created定义，避免循环引用
 					this.updateParentData()
 					if (!this.parent) {
-						error('u-checkbox必须搭配u-checkbox-group组件使用')
+						error('up-checkbox必须搭配up-checkbox-group组件使用')
 					}
+					let value = '';
 					// #ifdef VUE2
-					const value = this.parentData.value
+					value = this.parentData.value
 					// #endif
 					// #ifdef VUE3
-					const value = this.parentData.modelValue
+					value = this.parentData.modelValue
 					// #endif
 					// 设置初始化时，是否默认选中的状态，父组件u-checkbox-group的value可能是array，所以额外判断
 					if (this.checked) {
@@ -248,7 +249,9 @@
 				}
 			},
 			emitEvent() {
-				this.$emit('change', this.isChecked)
+				this.$emit('change', this.isChecked, {
+					name: this.name
+				})
 				// 双向绑定
 				if (this.usedAlone) {
 					this.$emit('update:checked', this.isChecked)
@@ -281,7 +284,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	$u-checkbox-icon-wrap-margin-right:6px !default;
 	$u-checkbox-icon-wrap-font-size:6px !default;
 	$u-checkbox-icon-wrap-border-width:1px !default;
diff --git a/uview-plus/components/u-choose/u-choose.vue b/uview-plus/components/u-choose/u-choose.vue
new file mode 100644
index 0000000..90cc5b7
--- /dev/null
+++ b/uview-plus/components/u-choose/u-choose.vue
@@ -0,0 +1,109 @@
+<style scoped lang="scss">
+	.up-choose {
+		::v-deep .up-tag {
+		    font-weight: 600;
+		}
+		&:last-child {
+			margin-right: 0;
+		}
+	}
+	
+	.up-choose-wrap {
+		flex-wrap: wrap;
+	}
+	
+	.up-choose-nowrap {
+		flex-wrap: nowrap;
+		white-space: nowrap;
+	}
+</style>
+
+<template>
+	<scroll-view 
+		:scroll-x="wrap === false" 
+		:class="['up-choose', wrap ? 'up-choose-wrap' : 'up-choose-nowrap']">
+        <template :key="item.id"  v-for="(item,index) in options">
+            <view :style="{width: itemWidth, display: 'inline-block'}">
+                <slot :item="item" :index="index">
+                    <up-tag :type="index == currentIndex ? 'primary' : 'info'"
+                        size="large" :plain="index == currentIndex ? false : true"
+                        :class="currentIndex === index ? 'active': ''" :height="itemHeight"
+                        :style="{width: itemWidth, padding: itemPadding}"
+                        @click="change(index)">
+                        {{item[labelName]}}
+                    </up-tag>
+                </slot>
+            </view>
+        </template>
+	</scroll-view>
+</template>
+
+<script>
+	export default {
+	    name: 'up-choose',
+	    props: {
+			options:{
+				type: Array,
+				default: ()=>{
+					return [];
+				}
+			},
+			modelValue: {
+				type: [Number,String,Array],
+				default: false
+			},
+			type: {
+			    type: [String],
+			    default: 'radio'
+			},
+			itemWidth: {
+			    type: [String],
+			    default: 'auto'
+			},
+			itemHeight: {
+			    type: [String],
+			    default: '50px'
+			},
+            itemPadding: {
+                type: [String],
+			    default: '8px'
+            },
+			labelName: {
+			    type: String,
+			    default: 'title'
+			},
+			valueName: {
+			    type: String,
+			    default: 'value'
+			},
+			customClick: {
+			    type: Boolean,
+			    default: false
+			},
+			// 是否换行
+			wrap: {
+				type: Boolean,
+				default: true
+			}
+	    },
+	    data() {
+	        return {
+				currentIndex: ''
+	        }
+	    },
+	    created: function () {
+			this.currentIndex = this.modelValue;
+	    },
+        emits: ['update:modelValue', 'custom-click'],
+	    methods: {
+	        change(index){
+				if (this.customClick) {
+					this.$emit('custom-click', index);
+				} else {
+					this.currentIndex = index;
+					this.$emit('update:modelValue', index);
+				}
+			}
+	    }
+	}
+</script>
\ No newline at end of file
diff --git a/uview-plus/components/u-circle-progress/circleProgress.js b/uview-plus/components/u-circle-progress/circleProgress.js
index b3a9b43..2fd907a 100644
--- a/uview-plus/components/u-circle-progress/circleProgress.js
+++ b/uview-plus/components/u-circle-progress/circleProgress.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:55:02
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/circleProgress.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/circleProgress.js
  */
 export default {
     // circleProgress 组件
diff --git a/uview-plus/components/u-circle-progress/u-circle-progress.vue b/uview-plus/components/u-circle-progress/u-circle-progress.vue
index 6dd5c93..496bb19 100644
--- a/uview-plus/components/u-circle-progress/u-circle-progress.vue
+++ b/uview-plus/components/u-circle-progress/u-circle-progress.vue
@@ -37,7 +37,7 @@
 	/**
 	 * CircleProgress 圆形进度条 TODO: 待完善 
 	 * @description 展示操作或任务的当前进度，比如上传文件，是一个圆形的进度环。
-	 * @tutorial https://ijry.github.io/uview-plus/components/circleProgress.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/circleProgress.html
 	 * @property {String | Number}	percentage	圆环进度百分比值，为数值类型，0-100 (默认 30 )
 	 * @example
 	 */
@@ -112,7 +112,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-circle-progress {
 		@include flex(row);
diff --git a/uview-plus/components/u-city-locate/u-city-locate.vue b/uview-plus/components/u-city-locate/u-city-locate.vue
new file mode 100644
index 0000000..c9a3688
--- /dev/null
+++ b/uview-plus/components/u-city-locate/u-city-locate.vue
@@ -0,0 +1,163 @@
+<template>
+	<view class="u-city-locate">
+		<up-index-list :indexList="indexList">
+			<template #header>
+				<view class="u-current-city-wrap">
+					<view class="u-current-city-title">{{ t("up.cityLocate.locateCity") }}</view>
+					<view class="u-current-city-item" @tap="location">
+						<view class="u-location-city">{{locationCity}}</view>
+					</view>
+				</view>
+			</template>
+			<template :key="index" v-for="(item, index) in cityList">
+				<!-- #ifdef APP-NVUE -->
+				<up-index-anchor :text="indexList[index]"></up-index-anchor>
+				<!-- #endif -->
+				<up-index-item>
+					<!-- #ifndef APP-NVUE -->
+					<up-index-anchor :text="indexList[index]"></up-index-anchor>
+					<!-- #endif -->
+					<view class="hot-city-list" v-if="index == 0">
+						<view class="" v-for="(item1, index1) in item" @tap="selectedCity(item1)">
+							<view class="hot-city-item">{{ item1[nameKey] }}</view>
+						</view>
+					</view>
+					<view v-else class="item-list" v-for="(item1, index1) in item" :key="index1">
+						<view class="list__item" @tap="selectedCity(item1)">
+							<text class="list__item__city-name">{{item1[nameKey]}}</text>
+						</view>
+						<up-line></up-line>
+					</view>
+				</up-index-item>
+			</template>
+			<template #footer>
+				<view class="u-safe-area-inset--bottom">
+					<text class="list__footer"></text>
+				</view>
+			</template>
+		</up-index-list>
+	</view>
+</template>
+
+<script>
+	import { t } from '../../libs/i18n'
+	export default{
+		name: 'u-city-locate',
+		props:{
+			indexList: {
+				type: Array,
+				default: ['🔥']
+			},
+			cityList:{
+				type: Array,
+				default: () => {
+					return [
+						[{
+							name: '北京',
+							value: 'beijing'
+						},
+						{
+							name: '上海',
+							value: 'shanghai'
+						},
+						{
+							name: '广州',
+							value: 'guangzhou'
+						},
+						{
+							name: '深圳',
+							value: 'shenzhen'
+						},
+						{
+							name: '杭州',
+							value: 'hangzhou'
+						}]
+					]
+				}
+			},
+			locationType: {
+				type: String,
+				default: 'wgs84'
+			},
+			currentCity: {
+				type: String,
+				default: ''
+			},
+			nameKey: {
+				type: String,
+				default: 'name'
+			}
+		},
+		computed:{
+		},
+		watch:{
+			currentCity(val) {
+				this.locationCity = val;
+			}
+		},
+		data(){
+			return{
+				locationCity: t("up.cityLocate.locating") + '....'
+			}
+		},
+		emits: ['location-success', 'select-city'],
+		methods:{
+			t,
+			// 获取城市
+			selectedCity(city){
+				this.locationCity = city[this.nameKey];
+				this.$emit('select-city', {
+					locationCity: this.locationCity
+				});
+			},
+			// 定位操作
+			location(){
+				let That = this;
+				uni.getLocation({
+				    type: this.locationType,
+					geocode:true,
+				    success(res){
+						console.log(res);
+						That.locationCity = res.address && res.address.city;
+						That.$emit('location-success', {
+							...res,
+							locationCity: That.locationCity
+						});
+				    },
+					fail(){
+						That.locationCity = t("up.cityLocate.fail");
+					}
+				});
+			},
+		},
+		// 页面挂载后进行异步操作
+		created(){
+		},
+		mounted(){
+			this.location();
+		}
+	}
+</script>
+
+<style lang="scss">
+	.list__item {
+		padding: 8px 1px;
+	}
+	.u-current-city-title {
+		color: grey;
+		margin-bottom: 5px;
+	}
+	.u-current-city-item {
+		height: 30px;
+	}
+	.hot-city-list {
+		display: flex !important;
+		flex-direction: row !important;
+		padding: 12px 0;
+		.hot-city-item {
+			padding: 6px 12px;
+			margin: 5px;
+			border: 1px solid #ededed;
+		}
+	}
+</style>
diff --git a/uview-plus/components/u-code-input/codeInput.js b/uview-plus/components/u-code-input/codeInput.js
index cac9265..a9003c0 100644
--- a/uview-plus/components/u-code-input/codeInput.js
+++ b/uview-plus/components/u-code-input/codeInput.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:55:58
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/codeInput.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/codeInput.js
  */
 export default {
     // codeInput 组件
diff --git a/uview-plus/components/u-code-input/u-code-input.vue b/uview-plus/components/u-code-input/u-code-input.vue
index d0c0061..4253eef 100644
--- a/uview-plus/components/u-code-input/u-code-input.vue
+++ b/uview-plus/components/u-code-input/u-code-input.vue
@@ -58,7 +58,7 @@
 	/**
 	 * CodeInput 验证码输入
 	 * @description 该组件一般用于验证用户短信验证码的场景，也可以结合uview-plus的键盘组件使用
-	 * @tutorial https://ijry.github.io/uview-plus/components/codeInput.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/codeInput.html
 	 * @property {String | Number}	maxlength			最大输入长度 （默认 6 ）
 	 * @property {Boolean}			dot					是否用圆点填充 （默认 false ）
 	 * @property {String}			mode				显示模式，box-盒子模式，line-底部横线模式 （默认 'box' ）
@@ -220,7 +220,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	$u-code-input-cursor-width: 1px;
 	$u-code-input-cursor-height: 20px;
 	$u-code-input-cursor-animation-duration: 1s;
diff --git a/uview-plus/components/u-code/code.js b/uview-plus/components/u-code/code.js
index 693417a..422aae2 100644
--- a/uview-plus/components/u-code/code.js
+++ b/uview-plus/components/u-code/code.js
@@ -1,20 +1,20 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:55:27
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/code.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/code.js
  */
-
+import { t } from '../../libs/i18n'
 export default {
     // code 组件
     code: {
         seconds: 60,
-        startText: '获取验证码',
-        changeText: 'X秒重新获取',
-        endText: '重新获取',
+        startText: t("up.code.send"),
+        changeText: t("up.code.resendAfter"),
+        endText: t("up.code.resend"),
         keepRunning: false,
         uniqueKey: ''
     }
diff --git a/uview-plus/components/u-code/u-code.vue b/uview-plus/components/u-code/u-code.vue
index 32ba0a7..3d8359b 100644
--- a/uview-plus/components/u-code/u-code.vue
+++ b/uview-plus/components/u-code/u-code.vue
@@ -11,7 +11,7 @@
 	/**
 	 * Code 验证码输入框
 	 * @description 考虑到用户实际发送验证码的场景，可能是一个按钮，也可能是一段文字，提示语各有不同，所以本组件 不提供界面显示，只提供提示语，由用户将提示语嵌入到具体的场景
-	 * @tutorial https://ijry.github.io/uview-plus/components/code.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/code.html
 	 * @property {String | Number}	seconds			倒计时所需的秒数（默认 60 ）
 	 * @property {String}			startText		开始前的提示语，见官网说明（默认 '获取验证码' ）
 	 * @property {String}			changeText		倒计时期间的提示语，必须带有字母"x"，见官网说明（默认 'X秒重新获取' ）
@@ -128,5 +128,4 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 </style>
diff --git a/uview-plus/components/u-col/col.js b/uview-plus/components/u-col/col.js
index 7621653..9b19160 100644
--- a/uview-plus/components/u-col/col.js
+++ b/uview-plus/components/u-col/col.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:56:12
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/col.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/col.js
  */
 export default {
     // col 组件
diff --git a/uview-plus/components/u-col/u-col.vue b/uview-plus/components/u-col/u-col.vue
index 57a12d6..fe28108 100644
--- a/uview-plus/components/u-col/u-col.vue
+++ b/uview-plus/components/u-col/u-col.vue
@@ -20,7 +20,7 @@
 	/**
 	 * CodeInput 栅格系统的列 
 	 * @description 该组件一般用于Layout 布局 通过基础的 12 分栏，迅速简便地创建布局
-	 * @tutorial https://ijry.github.io/uview-plus/components/Layout.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/Layout.html
 	 * @property {String | Number}	span		栅格占据的列数，总12等份 (默认 12 ) 
 	 * @property {String | Number}	offset		分栏左边偏移，计算方式与span相同 (默认 0 ) 
 	 * @property {String}			justify		水平排列方式，可选值为`start`(或`flex-start`)、`end`(或`flex-end`)、`center`、`around`(或`space-around`)、`between`(或`space-between`)  (默认 'start' ) 
@@ -100,7 +100,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-col {
 		padding: 0;
diff --git a/uview-plus/components/u-collapse-item/collapseItem.js b/uview-plus/components/u-collapse-item/collapseItem.js
index 1225a7b..f56c74e 100644
--- a/uview-plus/components/u-collapse-item/collapseItem.js
+++ b/uview-plus/components/u-collapse-item/collapseItem.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:56:42
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/collapseItem.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/collapseItem.js
  */
 export default {
     // collapseItem 组件
@@ -21,6 +21,11 @@ export default {
         name: '',
         icon: '',
         duration: 300,
-        showRight: true
+        showRight: true,
+        titleStyle: {},
+        iconStyle: {},
+		rightIconStyle: {},
+        cellCustomStyle: {},
+        cellCustomClass: ''
     }
 }
diff --git a/uview-plus/components/u-collapse-item/props.js b/uview-plus/components/u-collapse-item/props.js
index b0b1426..095c571 100644
--- a/uview-plus/components/u-collapse-item/props.js
+++ b/uview-plus/components/u-collapse-item/props.js
@@ -7,6 +7,13 @@ export const props = defineMixin({
             type: String,
             default: () => defProps.collapseItem.title
         },
+        // 标题的样式
+        titleStyle: {
+            type: [Object, String],
+			default: () => {
+				return defProps.collapseItem.titleStyle
+			}
+        },
         // 标题右侧内容
         value: {
             type: String,
@@ -62,5 +69,29 @@ export const props = defineMixin({
             type: Boolean,
             default: () => defProps.collapseItem.showRight
         },
+        // 左侧图标样式
+        iconStyle: {
+            type: [Object, String],
+            default: () => {
+				return defProps.collapseItem.iconStyle
+			}
+        },
+        // 右侧箭头图标的样式
+        rightIconStyle: {
+            type: [Object, String],
+            default: () => {
+				return defProps.collapseItem.rightIconStyle
+			}
+        },
+        cellCustomStyle: {
+            type: [Object, String],
+            default: () => {
+				return defProps.collapseItem.cellCustomStyle
+			}
+        },
+        cellCustomClass: {
+            type: String,
+            default: () => defProps.collapseItem.cellCustomClass
+        }
     }
 })
diff --git a/uview-plus/components/u-collapse-item/u-collapse-item.vue b/uview-plus/components/u-collapse-item/u-collapse-item.vue
index e9725bd..957da74 100644
--- a/uview-plus/components/u-collapse-item/u-collapse-item.vue
+++ b/uview-plus/components/u-collapse-item/u-collapse-item.vue
@@ -11,6 +11,8 @@
 			@click="clickHandler"
 			:arrowDirection="expanded ? 'up' : 'down'"
 			:disabled="disabled"
+			:customClass="cellCustomClass"
+			:customStyle="cellCustomStyle"
 		>
 			<!-- 微信小程序不支持，因为微信中不支持 <slot name="title" #title />的写法 -->
 			<template #title>
@@ -22,7 +24,7 @@
 			</template>
 			<template #icon>
 				<slot name="icon">
-					<u-icon v-if="!$slots.icon && icon" :size="22" :name="icon"></u-icon>
+					<up-icon v-if="!$slots.icon && icon" :size="22" :name="icon"></up-icon>
 				</slot>
 			</template>
 			<template #value>
@@ -34,7 +36,7 @@
 			</template>
 			<template #right-icon>
 				<template v-if="showRight">
-					<u-icon v-if="!$slots['right-icon']" :size="16" name="arrow-right"></u-icon>
+					<up-icon v-if="!$slots['right-icon']" :size="16" name="arrow-right"></up-icon>
 					<slot name="right-icon">
 					</slot>
 				</template>
@@ -69,7 +71,7 @@
 	/**
 	 * collapseItem 折叠面板Item
 	 * @description 通过折叠面板收纳内容区域（搭配u-collapse使用）
-	 * @tutorial https://ijry.github.io/uview-plus/components/collapse.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/collapse.html
 	 * @property {String}			title 		标题
 	 * @property {String}			value 		标题右侧内容
 	 * @property {String}			label 		标题下方的描述信息
@@ -199,7 +201,7 @@
 			// 查询内容高度
 			queryRect() {
 				// #ifndef APP-NVUE
-				// $uGetRect为uView自带的节点查询简化方法，详见文档介绍：https://ijry.github.io/uview-plus/js/getRect.html
+				// $uGetRect为uView自带的节点查询简化方法，详见文档介绍：https://uview-plus.jiangruyi.com/js/getRect.html
 				// 组件内部一般用this.$uGetRect，对外的为uni.$u.getRect，二者功能一致，名称不同
 				return new Promise(resolve => {
 					this.$uGetRect(`#${this.elId}`).then(size => {
@@ -223,7 +225,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-collapse-item {
 
diff --git a/uview-plus/components/u-collapse/collapse.js b/uview-plus/components/u-collapse/collapse.js
index c2b9fdd..f2386a0 100644
--- a/uview-plus/components/u-collapse/collapse.js
+++ b/uview-plus/components/u-collapse/collapse.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:56:30
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/collapse.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/collapse.js
  */
 export default {
     // collapse 组件
diff --git a/uview-plus/components/u-collapse/u-collapse.vue b/uview-plus/components/u-collapse/u-collapse.vue
index f7ec7f7..81c7af4 100644
--- a/uview-plus/components/u-collapse/u-collapse.vue
+++ b/uview-plus/components/u-collapse/u-collapse.vue
@@ -12,7 +12,7 @@
 	/**
 	 * collapse 折叠面板 
 	 * @description 通过折叠面板收纳内容区域
-	 * @tutorial https://ijry.github.io/uview-plus/components/collapse.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/collapse.html
 	 * @property {String | Number | Array}	value		当前展开面板的name，非手风琴模式：[<string | number>]，手风琴模式：string | number
 	 * @property {Boolean}					accordion	是否手风琴模式（ 默认 false ）
 	 * @property {Boolean}					border		是否显示外边框 ( 默认 true ）
@@ -87,5 +87,4 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 </style>
diff --git a/uview-plus/components/u-color-picker/u-color-picker.vue b/uview-plus/components/u-color-picker/u-color-picker.vue
new file mode 100644
index 0000000..768f483
--- /dev/null
+++ b/uview-plus/components/u-color-picker/u-color-picker.vue
@@ -0,0 +1,1095 @@
+<template>
+	<view class="up-color-picker">
+        <view clas="up-color-picker__trigger" @click="show = true"
+            :style="{backgroundColor: value}" >
+            <slot></slot>
+        </view>
+		<up-popup :show="show" mode="bottom" round="10" @close="close" :closeOnClickOverlay="true">
+			<view class="up-color-picker__content">
+				<view class="up-color-picker__header">
+					<text class="up-color-picker__title">选择颜色</text>
+				</view>
+				
+				<!-- 纯色/渐变色切换 -->
+				<view class="up-color-picker__switch">
+					<up-subsection
+						:list="[{ name: '纯色' }, { name: '渐变' }]"
+						:current="colorTypeIndex"
+						@change="changeColorType"
+						fontSize="14"
+					></up-subsection>
+				</view>
+				
+				<!-- 渐变色选择器 -->
+				<view v-if="colorTypeIndex == 1" class="up-color-picker__gradient">
+					<!-- 渐变色控制条 -->
+					<view 
+						class="up-color-picker__gradient-track"
+                        :style="{ background: gradientStyle }"
+					>
+						<view 
+							class="up-color-picker__gradient-pointer" 
+							v-for="(item, index) in gradientColors" 
+							:key="index"
+							:style="{ left: getGradientPointerPosition(index) + 'px' }"
+                            @click="openColorPickerForGradient(index)"
+							@touchstart="onPointerTouchStart($event, index)"
+							@touchmove.stop="onPointerTouchMove"
+							@touchend.stop="onPointerTouchEnd"
+						>
+							<view class="up-color-picker__gradient-pointer-inner" :style="{ backgroundColor: item.color }"></view>
+						</view>
+					</view>
+					
+					<view class="up-color-picker__gradient-controls">
+						<up-button 
+							type="primary" 
+							size="mini" 
+							plain 
+							@click="addGradientColor"
+							class="up-color-picker__add-btn"
+						>
+							添加颜色
+						</up-button>
+					</view>
+					
+					<!-- 圆形方向选择器 -->
+					<view class="up-color-picker__gradient-direction">
+						<text>方向:</text>
+						<view class="up-color-picker__gradient__direction-circle" 
+							@touchstart="onDirectionTouchStart"
+							@touchmove="onDirectionTouchMove"
+							@touchend="onDirectionTouchEnd">
+							<view 
+								class="up-color-picker__direction-pointer"
+								:style="{ 
+									left: directionPointer.x + 'px', 
+									top: directionPointer.y + 'px' 
+								}"
+							></view>
+						</view>
+					</view>
+				</view>
+
+                <!-- 纯色选择器 -->
+				<view class="up-color-picker__solid">
+					<!-- 饱和度和明度选择区域 -->
+					<view 
+						class="up-color-picker__saturation" 
+						:style="{ backgroundColor: `hsl(${hue}, 100%, 50%)` }"
+						@touchstart="onSaturationTouchStart"
+						@touchmove="onSaturationTouchMove"
+						@touchend="onSaturationTouchEnd"
+					>
+						<view 
+							class="up-color-picker__saturation-pointer" 
+							:style="{
+								left: saturationPosition.x + 'px',
+								top: saturationPosition.y + 'px'
+							}"
+						></view>
+					</view>
+					
+					<!-- 色相选择 -->
+					<view 
+						class="up-color-picker__hue"
+						@touchstart="onHueTouchStart"
+						@touchmove="onHueTouchMove"
+						@touchend="onHueTouchEnd"
+					>
+						<view 
+							class="up-color-picker__hue-pointer" 
+							:style="{ left: huePosition + 'px' }"
+						></view>
+					</view>
+					
+					<!-- 透明度选择 -->
+					<view v-if="colorTypeIndex == 0" 
+						class="up-color-picker__alpha"
+						@touchstart="onAlphaTouchStart"
+						@touchmove="onAlphaTouchMove"
+						@touchend="onAlphaTouchEnd"
+					>
+						<view class="up-color-picker__alpha-bg"></view>
+						<view 
+							class="up-color-picker__alpha-pointer" 
+							:style="{ left: alphaPosition + 'px' }"
+						></view>
+					</view>
+				</view>
+				
+				<!-- 常用颜色 -->
+				<view v-if="commonColors && commonColors.length" class="up-color-picker__common">
+					<text class="up-color-picker__common-title">常用颜色</text>
+					<view class="up-color-picker__common-list">
+						<view 
+							v-for="(color, index) in commonColors" 
+							:key="index"
+							class="up-color-picker__common-item"
+							:style="{ backgroundColor: color }"
+							@click="selectCommonColor(color)"
+						></view>
+					</view>
+				</view>
+				
+				<!-- 颜色预览和操作按钮 -->
+				<view class="up-color-picker__footer">
+					<view class="up-color-picker__preview">
+						<view 
+							class="up-color-picker__preview-color"
+							:style="{ backgroundColor: displayColor }"
+						></view>
+						<text class="up-color-picker__preview-text">{{ displayColor }}</text>
+					</view>
+					<view class="up-color-picker__actions">
+						<up-button 
+							type="primary" 
+							size="small" 
+							@click="confirm"
+							class="up-color-picker__btn"
+						>
+							确定
+						</up-button>
+						<up-button 
+							type="info" 
+							size="small" 
+							@click="close"
+							class="up-color-picker__btn"
+						>
+							取消
+						</up-button>
+					</view>
+				</view>
+			</view>
+		</up-popup>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'up-color-picker',
+	props: {
+		// 初始颜色值
+		modelValue: {
+			type: String,
+			default: '#ff0000'
+		},
+		// 常用颜色列表
+		commonColors: {
+			type: Array,
+			default: () => [
+            ]
+		}
+	},
+	data() {
+		return {
+            show: false,
+			// 颜色类型索引：0-纯色，1-渐变色
+			colorTypeIndex: 0,
+			// 纯色相关数据
+			hue: 0,
+			saturation: 100,
+			lightness: 50,
+			alpha: 1,
+			saturationPosition: { x: 150, y: 0 },
+			huePosition: 0,
+			alphaPosition: 0, // 将在initColor中设置为最右侧
+			// 渐变色相关数据
+			gradientColors: [
+				{ color: '#ff0000', percent: 0 },
+				{ color: '#0000ff', percent: 1 }
+			],
+			gradientDirections: [
+				{ label: '从左到右', value: 'to right' },
+				{ label: '从上到下', value: 'to bottom' },
+				{ label: '从左上到右下', value: 'to bottom right' },
+				{ label: '从右上到左下', value: 'to bottom left' }
+			],
+			currentDirection: { label: '从左到右', value: 'to right' },
+			showDirectionPicker: false,
+			// 当前选中颜色
+			currentColor: '#ff0000',
+			// 渐变色控制相关
+			draggingPointerIndex: -1,
+			directionPointer: { x: 20, y: 20 }, // 默认向右(在圆的右侧)
+			// 渐变节点颜色修改相关
+			editingGradientIndex: -1,
+			// 保存纯色和渐变色的各自状态
+			solidColorState: {
+				hue: 0,
+				saturation: 100,
+				lightness: 50,
+				alpha: 1,
+				saturationPosition: { x: 150, y: 0 },
+				huePosition: 0,
+				alphaPosition: 0, // 将在initColor中设置为最右侧
+				currentColor: '#ff0000'
+			},
+			gradientColorState: {
+				gradientColors: [
+					{ color: '#ff0000', percent: 0 },
+					{ color: '#0000ff', percent: 1 }
+				],
+				currentDirection: { label: '从左到右', value: 'to right' },
+				directionPointer: { x: 100, y: 0 }
+			},
+			// 区分预览类型：solid-纯色预览，gradient-整体渐变预览，gradient-point-渐变点预览
+			previewType: 'solid'
+		}
+	},
+	computed: {
+		// 渐变色样式
+		gradientStyle() {
+			const colors = this.gradientColors.map(item => `${item.color} ${Math.round(item.percent * 100)}%`).join(', ')
+			return `linear-gradient(${this.currentDirection.value}, ${colors})`
+		},
+		// 显示的颜色预览值
+		displayColor() {
+			if (this.previewType === 'gradient-point' && this.editingGradientIndex >= 0) {
+				return this.gradientColors[this.editingGradientIndex].color;
+			}
+            console.log(this.editingGradientIndex)
+			return this.currentColor;
+		}
+	},
+	watch: {
+		show(newVal) {
+			if (newVal) {
+				this.initColor()
+			}
+		},
+        colorTypeIndex(newVal) {
+            if (newVal == 0) {
+                this.editingGradientIndex = -1
+            }
+		},
+	},
+	mounted() {
+		this.initColor()
+	},
+    emits: ['update:modelValue', 'confirm', 'close'],
+	methods: {
+		// 初始化颜色
+		initColor() {
+			if (this.modelValue) {
+				this.currentColor = this.modelValue
+				if (this.modelValue.includes('linear-gradient')) {
+					// 解析渐变色
+					this.colorTypeIndex = 1
+					this.parseGradientColor(this.modelValue)
+					this.previewType = 'gradient';
+				} else {
+					// 解析纯色
+					this.colorTypeIndex = 0
+					this.parseSolidColor(this.modelValue)
+					this.previewType = 'solid';
+				}
+			}
+            // 初始化方向指针位置
+            this.initDirectionPointer();
+            // 初始化alphaPosition为最右侧
+            this.initAlphaPosition();
+		},
+		
+        // 初始化alpha位置为最右侧
+        async initAlphaPosition() {
+            const query = uni.createSelectorQuery().in(this);
+            query.select('.up-color-picker__alpha').boundingClientRect();
+            await this.$nextTick();
+            query.exec(res => {
+                const rect = res[0];
+                if (rect) {
+                    this.alphaPosition = rect.width || 150; // 默认150像素
+                } else {
+                    this.alphaPosition = 150; // 默认值
+                }
+                
+                // 同步solidColorState中的alphaPosition
+                this.solidColorState.alphaPosition = this.alphaPosition;
+                this.updateSolidColor();
+            });
+        },
+        
+        // 初始化方向指针位置
+        initDirectionPointer() {
+            const angle = this.getDirectionAngle(this.currentDirection.value);
+            this.setDirectionPointerByAngle(angle);
+        },
+        
+        // 根据方向值获取角度
+        getDirectionAngle(direction) {
+            switch(direction) {
+                case 'to right': return 0;
+                case 'to bottom': return 90;
+                case 'to left': return 180;
+                case 'to top': return 270;
+                case 'to bottom right': return 45;
+                case 'to bottom left': return 135;
+                case 'to top left': return 225;
+                case 'to top right': return 315;
+                default: return 0;
+            }
+        },
+        
+        // 根据角度设置方向指针位置
+        setDirectionPointerByAngle(angle) {
+            const radian = angle * Math.PI / 180;
+            const radius = 20; // 圆半径
+            this.directionPointer = {
+                x: radius * Math.cos(radian) + 20, // 20是圆心位置
+                y: radius * Math.sin(radian) + 20
+            };
+        },
+		
+		// 打开颜色选择器以修改渐变节点颜色
+		openColorPickerForGradient(index) {
+			this.editingGradientIndex = index;
+			// 设置当前颜色为选中节点的颜色
+			const color = this.gradientColors[index].color;
+			this.currentColor = color;
+			// 设置预览类型为渐变点预览
+			this.previewType = 'gradient-point';
+			
+			// 解析颜色并设置选择器位置
+			if (!color.includes('linear-gradient')) {
+				this.colorTypeIndex = 0;
+				this.parseSolidColor(color);
+				// 保存当前渐变状态
+				this.gradientColorState = {
+					gradientColors: [...this.gradientColors],
+					currentDirection: {...this.currentDirection},
+					directionPointer: {...this.directionPointer}
+				};
+			}
+		},
+		
+		// 解析纯色
+		parseSolidColor(color) {
+			// 简化处理，实际项目中可以使用更复杂的颜色解析
+			this.currentColor = color
+			// 如果正在编辑渐变节点，则更新该节点颜色
+			if (this.editingGradientIndex >= 0) {
+				this.gradientColors[this.editingGradientIndex].color = color;
+				// 切换回渐变模式并恢复渐变状态
+				this.colorTypeIndex = 1;
+				Object.assign(this, this.solidColorState);
+				this.previewType = 'gradient-point';
+			} else {
+				this.previewType = 'solid';
+			}
+		},
+		
+		// 解析渐变色
+		parseGradientColor(gradient) {
+			// 简化处理，实际项目中可以使用更复杂的渐变解析
+			this.currentColor = gradient
+			// this.previewType = 'gradient';
+		},
+		
+		// 切换颜色类型
+		changeColorType(index) {
+			// 保存当前状态
+			if (this.colorTypeIndex === 0) {
+				// 保存纯色状态
+				this.solidColorState = {
+					hue: this.hue,
+					saturation: this.saturation,
+					lightness: this.lightness,
+					alpha: this.alpha,
+					saturationPosition: {...this.saturationPosition},
+					huePosition: this.huePosition,
+					alphaPosition: this.alphaPosition,
+					currentColor: this.currentColor
+				};
+			} else {
+				// 保存渐变状态
+				this.gradientColorState = {
+					gradientColors: [...this.gradientColors],
+					currentDirection: {...this.currentDirection},
+					directionPointer: {...this.directionPointer}
+				};
+			}
+			
+			this.colorTypeIndex = index;
+			
+			// 恢复目标状态
+			if (index === 0) {
+				Object.assign(this, this.solidColorState);
+				this.previewType = 'solid';
+			} else {
+				Object.assign(this, this.gradientColorState);
+				// 确保gradientColors是响应式的
+				this.gradientColors = [...this.gradientColorState.gradientColors];
+				this.previewType = 'gradient';
+			}
+		},
+		
+		// 饱和度和明度触摸开始
+		onSaturationTouchStart(e) {
+			this.updateSaturationPosition(e)
+		},
+		
+		// 饱和度和明度触摸移动
+		onSaturationTouchMove(e) {
+			this.updateSaturationPosition(e)
+		},
+		
+		// 饱和度和明度触摸结束
+		onSaturationTouchEnd(e) {
+			this.updateSaturationPosition(e)
+		},
+		
+		// 更新饱和度和明度位置
+		updateSaturationPosition(e) {
+			const touch = e.touches[0] || e.changedTouches[0]
+			const target = e.currentTarget
+			const query = uni.createSelectorQuery().in(this);
+			query.select('.up-color-picker__saturation').boundingClientRect()
+			
+			query.exec(res => {
+				const rect = res[0];
+				if (rect) {
+					let x = touch.clientX - rect.left
+					let y = touch.clientY - rect.top
+					
+					// 边界处理
+					x = Math.max(0, Math.min(x, rect.width))
+					y = Math.max(0, Math.min(y, rect.height))
+					
+					this.saturationPosition = { x, y }
+					this.updateSolidColor()
+				}
+			})
+		},
+		
+		// 色相触摸开始
+		onHueTouchStart(e) {
+			this.updateHuePosition(e)
+		},
+		
+		// 色相触摸移动
+		onHueTouchMove(e) {
+			this.updateHuePosition(e)
+		},
+		
+		// 色相触摸结束
+		onHueTouchEnd(e) {
+			this.updateHuePosition(e)
+		},
+		
+		// 更新色相位置
+		updateHuePosition(e) {
+			const touch = e.touches[0] || e.changedTouches[0]
+			const target = e.currentTarget
+			const query = uni.createSelectorQuery().in(this);
+			query.select('.up-color-picker__hue').boundingClientRect()
+			
+			query.exec(res => {
+				const rect = res[0];
+				if (rect) {
+					let x = touch.clientX - rect.left
+					x = Math.max(0, Math.min(x, rect.width))
+					this.huePosition = x
+					this.hue = Math.round((x / rect.width) * 360)
+					this.updateSolidColor()
+				}
+			})
+		},
+		
+		// 透明度触摸开始
+		onAlphaTouchStart(e) {
+			this.updateAlphaPosition(e)
+		},
+		
+		// 透明度触摸移动
+		onAlphaTouchMove(e) {
+			this.updateAlphaPosition(e)
+		},
+		
+		// 透明度触摸结束
+		onAlphaTouchEnd(e) {
+			this.updateAlphaPosition(e)
+		},
+		
+		// 更新透明度位置
+		updateAlphaPosition(e) {
+			const touch = e.touches[0] || e.changedTouches[0]
+			const target = e.currentTarget
+			const query = uni.createSelectorQuery().in(this);
+			query.select('.up-color-picker__alpha').boundingClientRect()
+			
+			query.exec(res => {
+				const rect = res[0];
+				if (rect) {
+					let x = touch.clientX - rect.left
+					x = Math.max(0, Math.min(x, rect.width))
+					this.alphaPosition = x
+					this.alpha = x / rect.width
+					this.updateSolidColor()
+				}
+			})
+		},
+		
+		// 更新纯色
+		updateSolidColor() {
+			// 使用实际元素尺寸替代硬编码的150
+			const query = uni.createSelectorQuery().in(this);
+			query.select('.up-color-picker__saturation').boundingClientRect();
+			
+			query.exec(res => {
+				const rect = res[0];
+				const size = rect ? Math.min(rect.width, rect.height) : 150; // 默认150作为后备值
+				
+				const s = (this.saturationPosition.x / size) * 100
+				const l = 100 - (this.saturationPosition.y / size) * 100
+				this.saturation = s
+				this.lightness = l
+				
+				// 使用正确的HSL转RGB算法
+				if (this.colorTypeIndex == 0) {
+					this.currentColor = this.hslToRgb(this.hue, this.saturation, this.lightness, this.alpha)
+				} else if (this.colorTypeIndex == 1) {
+					this.gradientColors[this.editingGradientIndex].color
+						= this.hslToRgb(this.hue, this.saturation, this.lightness, this.alpha)
+				}
+			});
+		},
+		
+		// 添加渐变色
+		addGradientColor() {
+			if (this.gradientColors.length < 5) {
+				this.gradientColors.push({
+					color: '#ffffff',
+					percent: 1
+				})
+			}
+		},
+		
+		// 删除渐变色
+		removeGradientColor(index) {
+			if (this.gradientColors.length > 2) {
+				this.gradientColors.splice(index, 1)
+			}
+		},
+		
+		// 获取渐变控制点位置
+		getGradientPointerPosition(index) {
+			const trackWidth = 280; // 需要与样式中的宽度一致
+			return this.gradientColors[index].percent * trackWidth;
+		},
+		
+		// 更新渐变色
+		updateGradientColor(e) {
+			const touch = e.touches[0] || e.changedTouches[0];
+			const query = uni.createSelectorQuery().in(this);
+			query.select('.up-color-picker__gradient-track').boundingClientRect();
+			
+			query.exec(res => {
+				const rect = res[0];
+				if (rect) {
+					let x = touch.clientX - rect.left;
+					// 边界处理
+					x = Math.max(0, Math.min(x, rect.width));
+					const percent = x / rect.width;
+					
+					// 如果正在拖动控制点，则更新该控制点位置
+					if (this.draggingPointerIndex >= 0) {
+						this.gradientColors[this.draggingPointerIndex].percent = percent;
+						// 保持控制点顺序
+						this.gradientColors.sort((a, b) => a.percent - b.percent);
+					} else {
+						// 否则添加新的控制点（此处可选功能）
+					}
+				}
+			});
+		},
+		
+		// 控制点触摸开始
+		onPointerTouchStart(e, index) {
+			this.draggingPointerIndex = index;
+			// 点击控制点时更新预览颜色
+			this.currentColor = this.gradientColors[index].color;
+			this.previewType = 'gradient-point';
+			this.editingGradientIndex = index; // 添加这行以正确设置编辑索引
+			// 阻止事件冒泡
+			e.stopPropagation();
+		},
+		
+		// 控制点触摸移动
+		onPointerTouchMove(e) {
+			if (this.draggingPointerIndex === -1) return;
+			
+			const touch = e.touches[0] || e.changedTouches[0];
+			const query = uni.createSelectorQuery().in(this);
+			query.select('.up-color-picker__gradient-track').boundingClientRect();
+			
+			query.exec(res => {
+				const rect = res[0];
+				if (rect) {
+					let x = touch.clientX - rect.left;
+					// 边界处理
+					x = Math.max(0, Math.min(x, rect.width));
+					let percent = x / rect.width;
+					
+					// 处理边界情况，确保能精确到达两端
+					if (x === 0) percent = 0;
+					if (x === rect.width) percent = 1;
+					
+					// 更新控制点位置
+					this.gradientColors[this.draggingPointerIndex].percent = percent;
+					// 保持控制点顺序
+					this.gradientColors.sort((a, b) => a.percent - b.percent);
+					// 更新拖拽索引以匹配排序后的索引
+					this.draggingPointerIndex = this.gradientColors.findIndex((item, index) => {
+						// 使用更精确的比较方法，处理浮点数精度问题
+						return Math.abs(item.percent - percent) < 0.0001;
+					});
+				}
+			});
+		},
+		
+		// 控制点触摸结束
+		onPointerTouchEnd() {
+			this.draggingPointerIndex = -1;
+		},
+		
+		// 方向选择器触摸开始
+		onDirectionTouchStart(e) {
+			this.updateDirection(e);
+		},
+		
+		// 方向选择器触摸移动
+		onDirectionTouchMove(e) {
+			this.updateDirection(e);
+		},
+		
+		// 方向选择器触摸结束
+		onDirectionTouchEnd(e) {
+			this.updateDirection(e);
+		},
+		
+		// 更新方向
+		updateDirection(e) {
+			const touch = e.touches[0] || e.changedTouches[0];
+			const query = uni.createSelectorQuery().in(this);
+			query.select('.up-color-picker__gradient__direction-circle').boundingClientRect();
+			
+			query.exec(res => {
+				const rect = res[0];
+				if (rect) {
+					const centerX = rect.left + rect.width / 2;
+					const centerY = rect.top + rect.height / 2;
+					const x = touch.clientX - centerX;
+					const y = touch.clientY - centerY;
+					const distance = Math.sqrt(x * x + y * y);
+					const maxDistance = rect.width / 2;
+					
+					// 限制在圆内
+					if (distance <= maxDistance) {
+						this.directionPointer = {
+							x: x + rect.width / 2,
+							y: y + rect.height / 2
+						};
+					} else {
+						// 限制在圆周上
+						const ratio = maxDistance / distance;
+						this.directionPointer = {
+							x: x * ratio + rect.width / 2,
+							y: y * ratio + rect.height / 2
+						};
+					}
+					
+					// 计算角度并更新方向
+					const angle = Math.atan2(y, x) * 180 / Math.PI;
+                    console.log(angle)
+					this.updateGradientDirection(angle);
+				}
+			});
+		},
+		
+		// 根据角度更新渐变方向
+		updateGradientDirection(angle) {
+			// 角度转换为标准方向
+			if (angle < 0) angle += 360;
+			
+			if (angle >= 315 || angle < 45) {
+				this.currentDirection = { label: '从左到右', value: 'to right' };
+			} else if (angle >= 45 && angle < 135) {
+				this.currentDirection = { label: '从上到下', value: 'to bottom' };
+			} else if (angle >= 135 && angle < 225) {
+				this.currentDirection = { label: '从右到左', value: 'to left' };
+			} else {
+				this.currentDirection = { label: '从下到上', value: 'to top' };
+			}
+		},
+		
+		// 确认方向选择
+		confirmDirection(e) {
+			this.currentDirection = this.gradientDirections[e.index]
+			this.showDirectionPicker = false
+		},
+		
+		// 选择常用颜色
+		selectCommonColor(color) {
+			this.currentColor = color
+			if (this.colorTypeIndex === 0) {
+				this.parseSolidColor(color)
+			} else {
+				// 如果是渐变模式，将常用颜色作为渐变的一个节点
+				this.gradientColors[this.editingGradientIndex].color = color
+			}
+		},
+		
+		// 确认选择
+		confirm() {
+			let color = this.currentColor
+			if (this.colorTypeIndex === 1) {
+				color = this.gradientStyle
+			}
+            this.$emit('update:modelValue', color)
+            this.show = false;
+			this.$emit('confirm', color)
+			// 重置编辑状态
+			this.editingGradientIndex = -1;
+			this.previewType = this.colorTypeIndex === 0 ? 'solid' : 'gradient';
+			this.close()
+		},
+		
+		// 关闭选择器
+		close() {
+            this.show = false;
+			this.$emit('close')
+		},
+		
+		// HSL转RGB辅助函数
+		hslToRgb(h, s, l, a = 1) {
+			h = h / 360;
+			s = s / 100;
+			l = l / 100;
+			
+			let r, g, b;
+			
+			if (s === 0) {
+				r = g = b = l; // achromatic
+			} else {
+				const hue2rgb = (p, q, t) => {
+					if (t < 0) t += 1;
+					if (t > 1) t -= 1;
+					if (t < 1/6) return p + (q - p) * 6 * t;
+					if (t < 1/2) return q;
+					if (t < 2/3) return p + (q - p) * (2/3 - t) * 6;
+					return p;
+				};
+				
+				const q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+				const p = 2 * l - q;
+				r = hue2rgb(p, q, h + 1/3);
+				g = hue2rgb(p, q, h);
+				b = hue2rgb(p, q, h - 1/3);
+			}
+			
+			const round = (value) => Math.round(value * 255);
+			return `rgba(${round(r)}, ${round(g)}, ${round(b)}, ${a.toFixed(2)})`;
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.up-color-picker {
+	&__content {
+		width: 100%;
+		padding: 20px;
+		background-color: #fff;
+	}
+	
+	&__header {
+		text-align: center;
+		margin-bottom: 20px;
+	}
+	
+	&__title {
+		font-size: 18px;
+		font-weight: bold;
+		color: #333;
+	}
+	
+	&__switch {
+		margin-bottom: 20px;
+	}
+	
+	&__saturation {
+		position: relative;
+		width: 100%;
+		height: 150px;
+		border-radius: 4px;
+		margin-bottom: 15px;
+		overflow: hidden;
+		
+		&:after {
+			content: '';
+			position: absolute;
+			top: 0;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			background: linear-gradient(to right, #fff, rgba(255,255,255,0));
+		}
+		
+		&:before {
+			content: '';
+			position: absolute;
+			top: 0;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			background: linear-gradient(to top, #000, rgba(0,0,0,0));
+		}
+	}
+	
+	&__saturation-pointer {
+		position: absolute;
+		width: 12px;
+		height: 12px;
+		border: 2px solid #fff;
+		border-radius: 50%;
+		transform: translate(-50%, -50%);
+		box-shadow: 0 0 2px rgba(0,0,0,0.5);
+		pointer-events: none;
+	}
+	
+	&__hue,
+	&__alpha {
+		position: relative;
+		width: 100%;
+		height: 12px;
+		border-radius: 6px;
+		margin-bottom: 15px;
+		cursor: pointer;
+	}
+	
+	&__hue {
+		background: linear-gradient(to right, #f00 0%, #ff0 16.66%, #0f0 33.33%, #0ff 50%, #00f 66.66%, #f0f 83.33%, #f00 100%);
+	}
+	
+	&__alpha {
+		position: relative;
+		overflow: hidden;
+		
+		&-bg {
+			position: absolute;
+			top: 0;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			background: linear-gradient(45deg, #ccc 25%, transparent 25%, transparent 75%, #ccc 75%),
+						linear-gradient(45deg, #ccc 25%, transparent 25%, transparent 75%, #ccc 75%);
+			background-size: 10px 10px;
+			background-position: 0 0, 5px 5px;
+		}
+		
+		&:after {
+			content: '';
+			position: absolute;
+			top: 0;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			background: linear-gradient(to right, rgba(255,255,255,0), rgba(255,255,255,1));
+		}
+	}
+	
+	&__hue-pointer,
+	&__alpha-pointer {
+		position: absolute;
+		width: 4px;
+		height: 16px;
+		background: #fff;
+		border: 1px solid #ccc;
+		border-radius: 2px;
+		transform: translateX(-50%);
+		top: -2px;
+		box-shadow: 0 0 2px rgba(0,0,0,0.5);
+		pointer-events: none;
+	}
+	
+	&__gradient {
+		&-bar {
+			width: 100%;
+			height: 40px;
+			border-radius: 4px;
+		}
+		
+		&-track {
+			position: relative;
+            margin-top: 20px;
+			width: 100%;
+			height: 32px;
+			border-radius: 4px;
+			margin-bottom: 15px;
+			cursor: pointer;
+		}
+		
+		&-pointer {
+			position: absolute;
+			top: -10px;
+			transform: translateX(-50%);
+			width: 0;
+			height: 0;
+			border-left: 8px solid transparent;
+			border-right: 8px solid transparent;
+			border-top: 10px solid #333;
+			z-index: 10;
+		}
+		
+		&-pointer-inner {
+			position: absolute;
+			top: -25px;
+			left: -10px;
+			width: 20px;
+			height: 20px;
+			border-radius: 50%;
+			border: 2px solid #fff;
+			box-shadow: 0 0 2px rgba(0,0,0,0.5);
+		}
+		
+		&-controls {
+			display: flex;
+            flex-direction: row;
+			flex-wrap: wrap;
+			align-items: center;
+			margin-bottom: 15px;
+		}
+		
+		&-item {
+			display: flex;
+            flex-direction: row;
+			align-items: center;
+			margin-right: 10px;
+			margin-bottom: 10px;
+		}
+		
+		&-color-preview {
+			width: 20px;
+			height: 20px;
+			border-radius: 50%;
+			margin-right: 5px;
+			border: 1px solid #eee;
+		}
+		
+		&-percent {
+			font-size: 12px;
+			color: #666;
+			margin-right: 5px;
+		}
+		
+		&-direction {
+			display: flex;
+            flex-direction: row;
+			align-items: center;
+			margin: 10px 0;
+		}
+		
+		&__direction-circle {
+			width: 40px;
+			height: 40px;
+			border-radius: 50%;
+			background: conic-gradient(
+				#ff0000 0deg, 
+				#ffff00 60deg, 
+				#00ff00 120deg, 
+				#00ffff 180deg, 
+				#0000ff 240deg, 
+				#ff00ff 300deg, 
+				#ff0000 360deg
+			);
+			position: relative;
+			margin: 10px auto;
+			cursor: pointer;
+			border: 2px solid #eee;
+		}
+		
+		&__direction-pointer {
+			position: absolute;
+			width: 6px;
+			height: 6px;
+			background: #fff;
+			border: 2px solid #333;
+			border-radius: 50%;
+			transform: translate(-50%, -50%);
+			box-shadow: 0 0 2px rgba(0,0,0,0.5);
+			z-index: 10;
+            pointer-events: none;
+		}
+	}
+	
+	&__add-btn {
+		margin-top: 10px;
+	}
+	
+	&__common {
+		margin-top: 20px;
+		
+		&-title {
+			display: block;
+			margin-bottom: 10px;
+			font-size: 14px;
+			color: #666;
+		}
+		
+		&-list {
+			display: flex;
+            flex-direction: row;
+			flex-wrap: wrap;
+		}
+		
+		&-item {
+			width: 24px;
+			height: 24px;
+			border-radius: 50%;
+			margin-right: 10px;
+			margin-bottom: 10px;
+			border: 1px solid #eee;
+			cursor: pointer;
+		}
+	}
+	
+	&__footer {
+		margin-top: 20px;
+	}
+	
+	&__preview {
+		display: flex;
+        flex-direction: row;
+		align-items: center;
+		margin-bottom: 15px;
+	}
+	
+	&__preview-color {
+		width: 40px;
+		height: 40px;
+		border-radius: 4px;
+		border: 1px solid #eee;
+		margin-right: 10px;
+	}
+	
+	&__preview-text {
+		font-size: 14px;
+		color: #333;
+		flex: 1;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+	
+	&__actions {
+		display: flex;
+        flex-direction: row;
+		justify-content: flex-end;
+		
+		& .up-color-picker__btn {
+			margin-left: 10px;
+		}
+	}
+}
+</style>
diff --git a/uview-plus/components/u-column-notice/columnNotice.js b/uview-plus/components/u-column-notice/columnNotice.js
index f1497af..07e84cc 100644
--- a/uview-plus/components/u-column-notice/columnNotice.js
+++ b/uview-plus/components/u-column-notice/columnNotice.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:57:16
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/columnNotice.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/columnNotice.js
  */
 export default {
     // columnNotice 组件
diff --git a/uview-plus/components/u-column-notice/u-column-notice.vue b/uview-plus/components/u-column-notice/u-column-notice.vue
index 81ca35a..3ccd926 100644
--- a/uview-plus/components/u-column-notice/u-column-notice.vue
+++ b/uview-plus/components/u-column-notice/u-column-notice.vue
@@ -8,11 +8,11 @@
 				class="u-notice__left-icon"
 				v-if="icon"
 			>
-				<u-icon
+				<up-icon
 					:name="icon"
 					:color="color"
 					size="19"
-				></u-icon>
+				></up-icon>
 			</view>
 		</slot>
 		<swiper
@@ -40,19 +40,19 @@
 			class="u-notice__right-icon"
 			v-if="['link', 'closable'].includes(mode)"
 		>
-			<u-icon
+			<up-icon
 				v-if="mode === 'link'"
 				name="arrow-right"
 				:size="17"
 				:color="color"
-			></u-icon>
-			<u-icon
+			></up-icon>
+			<up-icon
 				v-if="mode === 'closable'"
 				name="close"
 				:size="16"
 				:color="color"
 				@click="close"
-			></u-icon>
+			></up-icon>
 		</view>
 	</view>
 </template>
@@ -66,7 +66,7 @@
 	/**
 	 * ColumnNotice 滚动通知中的垂直滚动 内部组件
 	 * @description 该组件用于滚动通告场景，是其中的垂直滚动方式
-	 * @tutorial https://ijry.github.io/uview-plus/components/noticeBar.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/noticeBar.html
 	 * @property {Array}			text 			显示的内容，字符串
 	 * @property {String}			icon 			是否显示左侧的音量图标 （ 默认 'volume' ）
 	 * @property {String}			mode 			通告模式，link-显示右箭头，closable-显示右侧关闭图标
@@ -128,7 +128,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-notice {
 		@include flex;
diff --git a/uview-plus/components/u-copy/u-copy.vue b/uview-plus/components/u-copy/u-copy.vue
index 3a71910..49c2cd4 100644
--- a/uview-plus/components/u-copy/u-copy.vue
+++ b/uview-plus/components/u-copy/u-copy.vue
@@ -1,9 +1,10 @@
 <template>
 	<view @click="handleClick">
-        <slot>复制</slot>
+        <slot>{{ t("up.common.copy") }}</slot>
     </view>
 </template>
 <script>
+import { t } from '../../libs/i18n'
 export default {
     name: "up-copy",
     props: {
@@ -17,16 +18,17 @@ export default {
 		},
 		notice: {
 			type: String,
-			default: '复制成功'
+			default: t("up.common.copy") + t("up.common.success")
 		}
     },
 	emits: ['success'],
     methods: {
+		t,
         handleClick() {
             let content = this.content;
 			if (!content) {
 				uni.showToast({
-				    title: '暂无',
+				    title: t("up.common.none"),
 				    icon: 'none',
 				    duration: 2000,
 				});
@@ -42,7 +44,7 @@ export default {
                 success: function() {
 					if (that.alertStyle == 'modal') {
 						uni.showModal({
-							title: '提示',
+							title: "up.common.tip",
 							content: that.notice
 						});
 					} else {
@@ -55,7 +57,7 @@ export default {
                 },
                 fail:function(){
                     uni.showToast({
-                        title: '复制失败',
+                        title: t("up.common.copy") + t("up.common.fail"),
                         icon: 'none',
                         duration:3000,
                     });
diff --git a/uview-plus/components/u-count-down/countDown.js b/uview-plus/components/u-count-down/countDown.js
index 81e33b1..99caef5 100644
--- a/uview-plus/components/u-count-down/countDown.js
+++ b/uview-plus/components/u-count-down/countDown.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:11:29
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/countDown.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/countDown.js
  */
 export default {
     // u-count-down 计时器组件
diff --git a/uview-plus/components/u-count-down/u-count-down.vue b/uview-plus/components/u-count-down/u-count-down.vue
index f0896ba..0c6d231 100644
--- a/uview-plus/components/u-count-down/u-count-down.vue
+++ b/uview-plus/components/u-count-down/u-count-down.vue
@@ -1,6 +1,7 @@
 <template>
 	<view class="u-count-down">
-		<slot>
+		<slot :days="timeData.days" :hours="timeData.hours"
+			:minutes="timeData.minutes" :seconds="timeData.seconds">
 			<text class="u-count-down__text">{{ formattedTime }}</text>
 		</slot>
 	</view>
@@ -112,6 +113,7 @@
 				this.remainTime = remain
 				// 根据剩余的毫秒时间，得出该有天，小时，分钟等的值，返回一个对象
 				const timeData = parseTimeData(remain)
+				this.timeData = timeData;
 				this.$emit('change', timeData)
 				// 得出格式化后的时间
 				this.formattedTime = parseFormat(this.format, timeData)
@@ -151,7 +153,6 @@
 	lang="scss"
 	scoped
 >
-	@import "../../libs/css/components.scss";
 	$u-count-down-text-color:$u-content-color !default;
 	$u-count-down-text-font-size:15px !default;
 	$u-count-down-text-line-height:22px !default;
diff --git a/uview-plus/components/u-count-to/countTo.js b/uview-plus/components/u-count-to/countTo.js
index a536cde..be93a1c 100644
--- a/uview-plus/components/u-count-to/countTo.js
+++ b/uview-plus/components/u-count-to/countTo.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:57:32
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/countTo.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/countTo.js
  */
 export default {
     // countTo 组件
diff --git a/uview-plus/components/u-count-to/u-count-to.vue b/uview-plus/components/u-count-to/u-count-to.vue
index 83ab13d..36e7cf5 100644
--- a/uview-plus/components/u-count-to/u-count-to.vue
+++ b/uview-plus/components/u-count-to/u-count-to.vue
@@ -17,7 +17,7 @@ import { addUnit } from '../../libs/function/index';
 /**
  * countTo 数字滚动
  * @description 该组件一般用于需要滚动数字到某一个值的场景，目标要求是一个递增的值。
- * @tutorial https://ijry.github.io/uview-plus/components/countTo.html
+ * @tutorial https://uview-plus.jiangruyi.com/components/countTo.html
  * @property {String | Number}	startVal	开始的数值，默认从0增长到某一个数（默认 0 ）
  * @property {String | Number}	endVal		要滚动的目标数值，必须 （默认 0 ）
  * @property {String | Number}	duration	滚动到目标数值的动画持续时间，单位为毫秒（ms） （默认 2000 ）
@@ -178,8 +178,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
-
 .u-count-num {
 	/* #ifndef APP-NVUE */
 	display: inline-flex;
diff --git a/uview-plus/components/u-coupon/u-coupon.vue b/uview-plus/components/u-coupon/u-coupon.vue
new file mode 100644
index 0000000..ef91d4b
--- /dev/null
+++ b/uview-plus/components/u-coupon/u-coupon.vue
@@ -0,0 +1,406 @@
+<template>
+	<view class="up-coupon" :class="[`up-coupon--${shape}`, `up-coupon--${type}`, `up-coupon--${size}`, {'up-coupon--disabled': disabled}]" 
+		:style="[couponStyle]" @click="handleClick">
+		<view class="up-coupon__content">
+			<!-- 左侧金额区域 -->
+			<view class="up-coupon__amount">
+				<slot name="unit" :unit="unit" :unitPosition="unitPosition" v-if="unitPosition === 'left'">
+					<text class="up-coupon__amount-unit" v-if="unitPosition === 'left'">{{ unit }}</text>
+				</slot>
+				<slot name="amount" :amount="amount">
+					<text class="up-coupon__amount-value">{{ amount }}</text>
+				</slot>
+				<slot name="unit" :unit="unit" :unitPosition="unitPosition" v-if="unitPosition === 'right'">
+					<text class="up-coupon__amount-unit" v-if="unitPosition === 'right'">{{ unit }}</text>
+				</slot>
+				<slot name="limit" :limit="limit">
+					<text class="up-coupon__amount-limit" v-if="limit">{{ limit }}</text>
+				</slot>
+			</view>
+			
+			<!-- 中间描述区域 -->
+			<view class="up-coupon__info">
+				<slot name="title" :title="title">
+					<text class="up-coupon__info-title">{{ title }}</text>
+				</slot>
+				<slot name="desc" :desc="desc">
+					<text class="up-coupon__info-desc" v-if="desc">{{ desc }}</text>
+				</slot>
+				<slot name="time" :time="time">
+					<text class="up-coupon__info-time" v-if="time">{{ time }}</text>
+				</slot>
+			</view>
+			
+			<!-- 右侧操作区域 -->
+			<view class="up-coupon__action u-padding-right-20">
+				<slot name="action" :actionText="actionText" :circle="circle">
+                    <up-tag type="error" :bgColor="type ? 'transparent' : '#eb433d'"
+                        :borderColor="type ? '#eee' : '#eb433d'" borderRadius="6px"
+                        size="medium" class="up-coupon__action-text"
+                        :shape="circle ? 'circle': 'circle'">{{ actionText }}</up-tag>
+				</slot>
+			</view>
+		</view>
+		
+		<!-- 红包绳子效果 -->
+		<view v-if="shape === 'envelope'" class="up-coupon__rope"></view>
+		
+		<!-- 默认插槽，可用于添加额外内容 -->
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'up-coupon',
+		props: {
+			// 金额
+			amount: {
+				type: [String, Number],
+				default: ''
+			},
+			// 金额单位
+			unit: {
+				type: String,
+				default: '￥'
+			},
+			// 单位位置
+			unitPosition: {
+				type: String,
+				default: 'left'
+			},
+			// 使用限制
+			limit: {
+				type: String,
+				default: ''
+			},
+			// 标题
+			title: {
+				type: String,
+				default: '优惠券'
+			},
+			// 描述
+			desc: {
+				type: String,
+				default: ''
+			},
+			// 有效期
+			time: {
+				type: String,
+				default: ''
+			},
+			// 操作按钮文字
+			actionText: {
+				type: String,
+				default: '使用'
+			},
+			// 形状：coupon-优惠券, envelope-红包, card-卡片
+			shape: {
+				type: String,
+				default: 'coupon'
+			},
+			// 尺寸：small, medium, large
+			size: {
+				type: String,
+				default: 'medium'
+			},
+			// 是否圆形按钮
+			circle: {
+				type: Boolean,
+				default: false
+			},
+			// 是否禁用
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 背景颜色
+			bgColor: {
+				type: String,
+				default: ''
+			},
+			// 文字颜色
+			color: {
+				type: String,
+				default: ''
+			},
+            // 内置背景类型
+            type: {
+				type: String,
+				default: ''
+			},
+		},
+		computed: {
+			couponStyle() {
+				const style = {};
+				if (this.bgColor) style.background = this.bgColor;
+				if (this.color) style.color = this.color;
+				return style;
+			},
+			dotCount() {
+				// 根据尺寸计算锯齿数量
+				const map = {
+					small: 8,
+					medium: 10,
+					large: 12
+				};
+				return map[this.size] || 10;
+			}
+		},
+		methods: {
+			handleClick() {
+				if (this.disabled) return;
+				this.$emit('click');
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.up-coupon {
+		position: relative;
+		overflow: hidden;
+		border-radius: 8rpx;
+		background: #ffebf0;
+		color: $u-main-color;
+		
+		&--coupon {
+			border-radius: 16rpx;
+			overflow: hidden;
+			
+			&::before {
+				content: '';
+				position: absolute;
+				left: -24rpx;
+				top: 50%;
+				transform: translateY(-50%);
+				width: 48rpx;
+				height: 48rpx;
+				background-color: #fff;
+				border-radius: 50%;
+			}
+			
+			&::after {
+				content: '';
+				position: absolute;
+				right: -24rpx;
+				top: 50%;
+				transform: translateY(-50%);
+				width: 48rpx;
+				height: 48rpx;
+				background-color: #fff;
+				border-radius: 50%;
+			}
+		}
+		
+		&--envelope {
+			border-radius: 16rpx;
+			
+			&::before {
+				content: '';
+				position: absolute;
+				left: 0;
+				top: 0;
+				right: 0;
+				height: 20rpx;
+				background: repeating-linear-gradient(-45deg, #ffd000, #ffd000 10rpx, #ffa000 10rpx, #ffa000 20rpx);
+			}
+		}
+		
+		&--card {
+			border-radius: 16rpx;
+		}
+
+        width: 100%;
+		
+		&--small {
+			// width: 520rpx;
+			height: 160rpx;
+		}
+		
+		&--medium {
+			// width: 600rpx;
+			height: 180rpx;
+		}
+		
+		&--large {
+			// width: 700rpx;
+			height: 220rpx;
+		}
+		
+		&--disabled {
+			opacity: 0.5;
+		}
+		
+		&__content {
+			display: flex;
+            flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			height: 100%;
+			padding: 0 30rpx;
+			position: relative;
+			z-index: 2;
+		}
+		
+		&__amount {
+			display: flex;
+			flex-direction: column;
+			align-items: flex-start;
+            padding-left: 10rpx;
+			padding-right: 30rpx;
+            border-right: 1px dashed #ccc;
+			
+			&-unit {
+				font-size: 24rpx;
+				font-weight: normal;
+			}
+			
+			&-value {
+				font-size: 56rpx;
+				font-weight: bold;
+                color: red;
+				line-height: 1;
+				margin: 10rpx 0;
+			}
+			
+			&-limit {
+				font-size: 24rpx;
+				opacity: 0.9;
+			}
+		}
+		
+		&__info {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			align-items: flex-start;
+            padding-left: 30rpx;
+			
+			&-title {
+				font-size: 32rpx;
+				font-weight: bold;
+				margin-bottom: 10rpx;
+			}
+			
+			&-desc {
+				font-size: 24rpx;
+				opacity: 0.9;
+				margin-bottom: 10rpx;
+			}
+			
+			&-time {
+				font-size: 20rpx;
+				opacity: 0.8;
+			}
+		}
+		
+		&__action {
+			display: flex;
+            flex-direction: row;
+			align-items: center;
+			justify-content: center;
+		}
+		
+		&__dots {
+			position: absolute;
+			left: 0;
+			top: 0;
+			bottom: 0;
+			width: 100%;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			padding: 30rpx 0;
+			z-index: 1;
+		}
+		
+		&__dot {
+			width: 32rpx;
+			height: 32rpx;
+			background-color: #fff;
+			border-radius: 50%;
+			margin: 0 -16rpx;
+			z-index: 3;
+		}
+		
+		&__rope {
+			position: absolute;
+			top: -40rpx;
+			left: 50%;
+			transform: translateX(-50%);
+			width: 80rpx;
+			height: 80rpx;
+			background: linear-gradient(to right, #ffd000, #ffa000);
+			border-radius: 40rpx 40rpx 0 0;
+			z-index: 1;
+			
+			&::before {
+				content: '';
+				position: absolute;
+				top: 0;
+				left: -20rpx;
+				width: 20rpx;
+				height: 40rpx;
+				background: linear-gradient(to bottom, #ffd000, #ffa000);
+				border-radius: 10rpx 0 0 10rpx;
+			}
+			
+			&::after {
+				content: '';
+				position: absolute;
+				top: 0;
+				right: -20rpx;
+				width: 20rpx;
+				height: 40rpx;
+				background: linear-gradient(to bottom, #ffd000, #ffa000);
+				border-radius: 0 10rpx 10rpx 0;
+			}
+		}
+		
+		// 不同主题样式
+		&--primary {
+			background: linear-gradient(90deg, #43afff, #3b8cff);
+            color: #fff;
+            .up-coupon__amount {
+                border-right: 1px dashed #eee;
+            }
+            .up-coupon__amount-value {
+                color: #fff;
+            }
+		}
+		
+		&--success {
+			background: linear-gradient(90deg, #67dda9, #19be6b);
+            color: #fff !important;
+            .up-coupon__amount {
+                border-right: 1px dashed #eee;
+            }
+            .up-coupon__amount-value {
+                color: #fff;
+            }
+		}
+		
+		&--warning {
+			background: linear-gradient(90deg, #ff9739, #ff6a39);
+            color: #fff;
+            .up-coupon__amount {
+                border-right: 1px dashed #eee;
+            }
+            .up-coupon__amount-value {
+                color: #fff;
+            }
+		}
+		
+		&--error {
+			background: linear-gradient(90deg, #ff7070, #ff4747);
+            color: #fff;
+            .up-coupon__amount {
+                border-right: 1px dashed #eee;
+            }
+            .up-coupon__amount-value {
+                color: #fff;
+            }
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uview-plus/components/u-cropper/u-cropper.vue b/uview-plus/components/u-cropper/u-cropper.vue
new file mode 100644
index 0000000..d5dc3e8
--- /dev/null
+++ b/uview-plus/components/u-cropper/u-cropper.vue
@@ -0,0 +1,1231 @@
+<template>
+	<view class="u-cropper">
+		<!-- <image :src="imgSrc.imgSrc" @click="select" :style="[ imgStyle ]" class="my-avatar"></image> -->
+		<canvas :canvas-id="'avatar-canvas-' + instanceId" :id="'avatar-canvas-' + instanceId" class="my-canvas"
+			:style="{top: styleTop, height: cvsStyleHeight}" disable-scroll="false"></canvas>
+		<canvas :canvas-id="'oper-canvas-' + instanceId" :id="'oper-canvas-' + instanceId" class="oper-canvas"
+			:style="{top: styleTop, height: cvsStyleHeight}"
+			disable-scroll="false" @touchstart="start" @touchmove="move" @touchend="end"></canvas>
+		<canvas :canvas-id="'prv-canvas-' + instanceId" :id="'prv-canvas-' + instanceId" class="prv-canvas"
+			disable-scroll="false" @touchstart="hideImg" :style="{ height: cvsStyleHeight, top: prvTop }"></canvas>
+		<view class="oper-wrapper" :style="{display: styleDisplay}">
+			<view class="oper">
+				<view class="btn-wrapper" v-if="showOper">
+					<view @click="select"  hover-class="hover" :style="{width: btnWidth}">
+						<text>{{ t("up.common.re-select") }}</text>
+					</view>
+					<view @click="close"  hover-class="hover" :style="{width: btnWidth}">
+						<text>{{ t("up.common.close") }}</text>
+					</view>
+					<view @click="rotate"  hover-class="hover" :style="{width: btnWidth, display: btnDsp}">
+						<text>{{ t("up.common.rotate") }}</text>
+					</view>
+					<view @click="preview" hover-class="hover" :style="{width: btnWidth}">
+						<text>{{ t("up.common.preview") }}</text>
+					</view>
+					<view @click="confirm"  hover-class="hover" :style="{width: btnWidth}">
+						<text>{{ t("up.common.confirm") }}</text>
+					</view>
+				</view>
+				<view class="clr-wrapper" v-else>
+					<slider class="my-slider" @change="colorChange"
+					block-size="25" value="0" min="-100" max="100" activeColor="red"
+					backgroundColor="green" block-color="grey" show-value></slider>
+					<view @click="prvUpload"  hover-class="hover" :style="{width: btnWidth}">
+						<text>{{ t("up.common.confirm") }}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view @click="chooseImage(0, {})" v-if="styleDisplay == 'none'">
+			<slot>
+				
+			</slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { t } from '../../libs/i18n'
+	const tabHeight = 50;
+	export default {
+		name: "u-cropper",
+		data() {
+			return {
+				// 添加实例ID用于区分不同实例
+				instanceId: Date.now() + '-' + Math.random().toString(36).substr(2, 9),
+				cvsStyleHeight: '0px',
+				styleDisplay: 'none',
+				styleTop: '-10000px',
+				prvTop: '-10000px',
+				imgStyle: {},
+				selStyle: {},
+				showOper: true,
+				imgSrc: {
+					imgSrc: ''
+				},
+				btnWidth: '19%',
+				btnDsp: 'flex',
+				// 裁剪区域宽度，用于设置选择区域的宽度
+				arWidth: '',
+				// 裁剪区域高度，用于设置选择区域的高度
+				arHeight: '',
+				// 导出图片宽度，用于设置最终导出图片的宽度
+				expWidth: '',
+				// 导出图片高度，用于设置最终导出图片的高度
+				expHeight: '',
+				// 是否允许调整裁剪框大小
+				letChangeSize: false,
+				// 底部安全区大小
+				safeAreaInsetsBottom: 0,
+			};
+		},
+		watch: {
+			avatarSrc() {
+				this.imgSrc.imgSrc = this.avatarSrc;
+			}
+		},
+		emits: ['avtinit', 'confirm'],
+		props:{
+			minScale: '',
+			maxScale: '',
+			canScale: true,
+			canRotate: true,
+			lockWidth: '',
+			lockHeight: '',
+			stretch: '',
+			lock: '',
+			noTab: true,
+			inner: false,
+			quality: '',
+			index: '',
+			canChangeSize: false,
+			areaWidth: '300rpx',
+			// 裁剪区域高度，用于设置选择区域的高度
+			areaHeight: '300rpx',
+			// 导出图片宽度，用于设置最终导出图片的宽度
+			exportWidth: '260rpx',
+			// 导出图片高度，用于设置最终导出图片的高度
+			exportHeight: '260rpx',
+		},
+		created() {
+			this.ctxCanvas = uni.createCanvasContext('avatar-canvas-' + this.instanceId, this);
+			this.ctxCanvasOper = uni.createCanvasContext('oper-canvas-' + this.instanceId, this);
+			this.ctxCanvasPrv = uni.createCanvasContext('prv-canvas-' + this.instanceId, this);
+			this.qlty = parseInt(this.quality) || 0.9;
+			this.imgSrc.imgSrc = this.imageSrc;
+			this.letRotate = (this.canRotate === false || this.inner === true) ? 0 : 1;
+			this.letScale = this.canScale === false ? 0 : 1;
+			// 是否允许调整裁剪框大小，false表示不允许，其他值表示允许
+			this.letChangeSize = this.canChangeSize;
+			this.isin = this.inner === true ? 1 : 0;
+			this.indx = this.index || undefined;
+			this.mnScale = this.minScale || 0.3;
+			this.mxScale = this.maxScale || 4;
+			this.noBar = this.noTab === true ? 1 : 0;
+			this.stc = this.stretch;
+			this.lck = this.lock;
+			if(this.isin) {
+				this.btnWidth = '24%';
+				this.btnDsp = 'none';
+			} else {
+				this.btnWidth = '19%';
+				this.btnDsp = 'flex';
+			}
+
+			if(this.noBar) {
+				this.moreHeight = 0;
+				this.windowResize();
+			} else {
+				uni.showTabBar({
+					complete:(res) => {
+						this.moreHeight = (res.errMsg === 'showTabBar:ok') ? 50 : 0;
+						this.windowResize();
+					}
+				});
+			}
+		},
+		methods: {
+			t,
+			windowResize() {
+				let sysInfo = uni.getSystemInfoSync();
+				this.platform = sysInfo.platform;
+				this.pixelRatio = sysInfo.pixelRatio;
+				this.windowWidth = sysInfo.windowWidth;
+				this.safeAreaInsetsBottom = sysInfo.safeAreaInsets.bottom;
+				// #ifdef H5
+				this.drawTop = sysInfo.windowTop;
+				this.windowHeight = sysInfo.windowHeight + sysInfo.windowBottom;
+				this.cvsStyleHeight = this.windowHeight - tabHeight + 'px';
+				// #endif
+				// #ifdef APP-PLUS
+				if(this.platform === 'android') {
+					this.windowHeight = sysInfo.screenHeight + sysInfo.statusBarHeight;
+					this.cvsStyleHeight = this.windowHeight - tabHeight + 'px';
+				} else {
+					this.windowHeight = sysInfo.windowHeight + this.moreHeight;
+					this.cvsStyleHeight = this.windowHeight - tabHeight - this.safeAreaInsetsBottom + 6 + 'px';
+				}
+				// #endif
+				// #ifdef MP
+				this.windowHeight = sysInfo.windowHeight + this.moreHeight;
+				this.cvsStyleHeight = this.windowHeight - tabHeight - this.safeAreaInsetsBottom - 2 + 'px';
+				// #endif
+				this.pxRatio = this.windowWidth/750;
+
+				let style = this.avatarStyle;
+				if(style && style !== true && (style=style.trim()) ) {
+					style = style.split(';');
+					let obj = {};
+					for( let v of style ) {
+						if(!v) continue;
+						v = v.trim().split(':');
+						if(v[1].indexOf('rpx') >= 0) {
+							let arr = v[1].trim().split(' ');
+							for( let k in arr ) {
+								if(!arr[k]) continue;
+								if(arr[k].indexOf('rpx') >= 0) {
+									arr[k] = parseFloat(arr[k]) * this.pxRatio + 'px';
+								}
+							}
+							v[1] = arr.join(' ');
+						}
+						obj[v[0].trim()] = v[1].trim();
+					}
+					this.imgStyle = obj;
+				}
+
+				this.expWidth && (this.expWidth = this.expWidth.indexOf('rpx') >= 0 ? parseInt(this.expWidth)*this.pxRatio : parseInt(this.expWidth));
+				this.expHeight && (this.expHeight = this.expHeight.indexOf('rpx') >= 0 ? parseInt(this.expHeight)*this.pxRatio : parseInt(this.expHeight));
+
+				if(this.styleDisplay === 'flex') {
+					this.drawInit(true);
+				}
+				this.hideImg();
+			},
+			select() {
+				if(this.fSelecting) return;
+				this.fSelecting = true;
+				setTimeout(()=>{ this.fSelecting = false; }, 500);
+
+				uni.chooseImage({
+					count: 1,
+					sizeType: ['original', 'compressed'],
+					sourceType: ['album', 'camera'],
+					success: (r)=>{
+						uni.showLoading({ mask: true });
+						let path = this.imgPath = r.tempFilePaths[0];
+						uni.getImageInfo({
+							src: path,
+							success: r => {
+								this.imgWidth = r.width;
+								this.imgHeight = r.height;
+								this.path = path;
+								if( !this.hasSel ) {
+									let style = this.selStyle || {};
+									if( this.arWidth && this.arHeight ) {
+										let areaWidth  = this.arWidth.indexOf('rpx')  >= 0 ? parseInt(this.arWidth)  * this.pxRatio: parseInt(this.arWidth),
+											areaHeight = this.arHeight.indexOf('rpx') >= 0 ? parseInt(this.arHeight) * this.pxRatio: parseInt(this.arHeight);
+										style.width = areaWidth + 'px';
+										style.height = areaHeight + 'px';
+										style.top = (this.windowHeight - areaHeight - tabHeight)/2 + 'px';
+										style.left = (this.windowWidth - areaWidth)/2 + 'px';
+									} else {
+										uni.showModal({
+											title: t("up.cropper.emptyWidhtOrHeight"),
+											showCancel: false
+										})
+										return;
+									}
+									this.selStyle = style;
+								}
+
+								if(	this.noBar ) {
+									this.drawInit(true);
+								} else {
+									uni.hideTabBar({
+										complete: () => {
+											this.drawInit(true);
+										}
+									});
+								}
+							},
+							fail: ()=>{
+								uni.showToast({
+									title: "error3",
+									duration: 2000,
+								})
+							},
+							complete() {
+								uni.hideLoading();
+							}
+						});
+					}
+				})
+			},
+			confirm() {
+				if(this.fUploading)	return;
+				this.fUploading = true;
+				setTimeout(()=>{ this.fUploading = false; }, 1000)
+
+				let style = this.selStyle,
+					x = parseInt(style.left),
+					y = parseInt(style.top),
+					width = parseInt(style.width),
+					height = parseInt(style.height),
+					expWidth = this.expWidth || width,
+					expHeight = this.expHeight || height;
+
+				// #ifdef H5
+				// x *= this.pixelRatio;
+				// y *= this.pixelRatio;
+				expWidth = width;
+				expHeight = height;
+				// #endif
+
+				uni.showLoading({ mask: true });
+				this.styleDisplay = 'none';
+				this.styleTop = '-10000px';
+				this.hasSel = false;
+				this.hideImg();
+				uni.canvasToTempFilePath({
+					x: x,
+					y: y,
+					width: width,
+					height: height,
+					destWidth: expWidth,
+					destHeight: expHeight,
+					canvasId: 'avatar-canvas-' + this.instanceId,
+					fileType: 'png',
+					quality: this.qlty,
+					success: (r)=>{
+						r = r.tempFilePath;
+						// #ifdef H5
+						this.btop(r).then((r)=> {
+							if(this.expWidth && this.expHeight) {
+								let ctxCanvas = this.ctxCanvas;
+								expWidth = this.expWidth,
+								expHeight = this.expHeight;
+
+								ctxCanvas.drawImage(r, 0, 0, expWidth, expHeight);
+								ctxCanvas.draw(false,()=>{
+									uni.canvasToTempFilePath({
+										x: 0,
+										y: 0,
+										width: expWidth,
+										height: expHeight,
+										destWidth: expWidth,
+										destHeight: expHeight,
+										canvasId: 'avatar-canvas-' + this.instanceId,
+										fileType: 'png',
+										quality: this.qlty,
+										success: (r)=>{
+											r = r.tempFilePath;
+											this.btop(r).then((r)=> {
+												this.$emit("confirm", {avatar: this.imgSrc, path: r, index: this.indx, data: this.rtn});
+											});
+										},
+										fail: ()=>{
+											uni.showToast({
+												title: "error0",
+												duration: 2000,
+											})
+										}
+									});
+								});
+							} else {
+								this.$emit("confirm", {avatar: this.imgSrc, path: r, index: this.indx, data: this.rtn});
+							}
+						})
+						// #endif
+						// #ifndef H5
+						this.$emit("confirm", {avatar: this.imgSrc, path: r, index: this.indx, data: this.rtn});
+						// #endif
+					},
+					fail: (res)=>{
+						uni.showToast({
+							title: "error1",
+							duration: 2000,
+						})
+					},
+					complete: () => {
+						uni.hideLoading();
+						this.noBar || uni.showTabBar();
+					}
+				}, this);
+			},
+			// 用户点击"预览"模式下的"确认"按钮时被调用，用于将预览的裁剪结果上传
+			prvUpload() {
+				if(this.fPrvUploading)	return;
+				this.fPrvUploading = true;
+				setTimeout(()=>{ this.fPrvUploading = false; }, 1000)
+
+				let style = this.selStyle,
+					destWidth = parseInt(style.width),
+					destHeight = parseInt(style.height),
+					prvX = this.prvX,
+					prvY = this.prvY,
+					prvWidth = this.prvWidth,
+					prvHeight = this.prvHeight,
+					expWidth = this.expWidth || prvWidth,
+					expHeight = this.expHeight || prvHeight;
+
+				// #ifdef H5
+				// prvX *= this.pixelRatio;
+				// prvY *= this.pixelRatio;
+				expWidth = prvWidth;
+				expHeight = prvHeight;
+				// #endif
+
+				uni.showLoading({ mask: true });
+
+				this.styleDisplay = 'none';
+				this.styleTop = '-10000px';
+				this.hasSel = false;
+				this.hideImg();
+				uni.canvasToTempFilePath({
+					x: prvX,
+					y: prvY,
+					width: prvWidth,
+					height: prvHeight,
+					destWidth: expWidth,
+					destHeight: expHeight,
+					canvasId: 'prv-canvas-' + this.instanceId,
+					fileType: 'png',
+					quality: this.qlty,
+					success: (r)=>{
+						r = r.tempFilePath;
+						// #ifdef H5
+						this.btop(r).then((r)=> {
+							if(this.expWidth && this.expHeight) {
+								let ctxCanvas = this.ctxCanvas;
+								expWidth = this.expWidth,
+								expHeight = this.expHeight;
+
+								ctxCanvas.drawImage(r, 0, 0, expWidth, expHeight);
+								ctxCanvas.draw(false, ()=>{
+									uni.canvasToTempFilePath({
+										x: 0,
+										y: 0,
+										width: expWidth,
+										height: expHeight,
+										destWidth: expWidth,
+										destHeight: expHeight,
+										canvasId: 'avatar-canvas-' + this.instanceId,
+										fileType: 'png',
+										quality: this.qlty,
+										success: (r)=>{
+											r = r.tempFilePath;
+											this.btop(r).then((r)=> {
+												this.$emit("confirm", {avatar: this.imgSrc, path: r, index: this.indx, data: this.rtn});
+											});
+										},
+										fail: ()=>{
+											uni.showToast({
+												title: "error0",
+												duration: 2000,
+											})
+										}
+									});
+								});
+							} else {
+								this.$emit("confirm", {avatar: this.imgSrc, path: r, index: this.indx, data: this.rtn});
+							}
+						})
+						// #endif
+						// #ifndef H5
+						this.$emit("confirm", {avatar: this.imgSrc, path: r, index: this.indx, data: this.rtn});
+						// #endif
+					},
+					fail: ()=>{
+						uni.showToast({
+							title: "error_prv",
+							duration: 2000,
+						})
+					},
+					complete: () => {
+						uni.hideLoading();
+						this.noBar || uni.showTabBar();
+					}
+				}, this);
+			},
+			drawInit(ini=false) {
+				let allWidth = this.windowWidth,
+					allHeight = this.windowHeight,
+					imgWidth = this.imgWidth,
+					imgHeight = this.imgHeight,
+					imgRadio = imgWidth/imgHeight,
+					useWidth = allWidth - 40,
+					useHeight = allHeight - tabHeight - 80,
+					pixelRatio = this.pixelRatio,
+					selWidth = parseInt(this.selStyle.width),
+					selHeight = parseInt(this.selStyle.height);
+
+				this.fixWidth = 0;
+				this.fixHeight = 0;
+				this.lckWidth = 0;
+				this.lckHeight = 0;
+				switch(this.stc) {
+					case 'x': this.fixWidth = 1; break;
+					case 'y': this.fixHeight = 1; break;
+					case 'long': if(imgRadio > 1) this.fixWidth = 1; else this.fixHeight = 1; break;
+					case 'short': if(imgRadio > 1) this.fixHeight = 1; else this.fixWidth = 1; break;
+					case 'longSel': if(selWidth > selHeight) this.fixWidth = 1; else this.fixHeight = 1; break;
+					case 'shortSel': if(selWidth > selHeight) this.fixHeight = 1; else this.fixWidth = 1; break;
+				}
+				// lck 用于控制裁剪框的宽度和高度锁定行为
+				// 'x': 锁定宽度，不允许水平方向调整
+				// 'y': 锁定高度，不允许垂直方向调整
+				// 'long': 根据图片长边锁定，如果图片横向较长则锁定宽度，否则锁定高度
+				// 'short': 根据图片短边锁定，如果图片横向较长则锁定高度，否则锁定宽度
+				// 'longSel': 根据选择框的长边锁定，如果选择框宽度大于高度则锁定宽度，否则锁定高度
+				// 'shortSel': 根据选择框的短边锁定，如果选择框宽度大于高度则锁定高度，否则锁定宽度
+				switch(this.lck) {
+					case 'x': this.lckWidth = 1; break;
+					case 'y': this.lckHeight = 1; break;
+					case 'long': if(imgRadio > 1) this.lckWidth = 1; else this.lckHeight = 1; break;
+					case 'short': if(imgRadio > 1) this.lckHeight = 1; else this.lckWidth = 1; break;
+					case 'longSel': if(selWidth > selHeight) this.lckWidth = 1; else this.lckHeight = 1; break;
+					case 'shortSel': if(selWidth > selHeight) this.lckHeight = 1; else this.lckWidth = 1; break;
+				}
+				if( this.fixWidth ) {
+					useWidth = selWidth;
+					useHeight = useWidth/imgRadio;
+				} else if( this.fixHeight ) {
+					useHeight = selHeight;
+					useWidth = useHeight*imgRadio;
+				} else if( imgRadio < 1 ) {
+					if( imgHeight < useHeight ) {
+						useWidth = imgWidth;
+						useHeight = imgHeight;
+					} else {
+						useHeight = useHeight;
+						useWidth = useHeight*imgRadio;
+					}
+				} else {
+					if( imgWidth < useWidth ) {
+						useWidth = imgWidth;
+						useHeight = imgHeight;
+					} else {
+						useWidth = useWidth;
+						useHeight = useWidth/imgRadio;
+					}
+				}
+				if( this.isin ) {
+					this.scaleWidth = 0;
+					this.scaleHeight = 0;
+					if(useWidth < selWidth) {
+						useWidth = selWidth;
+						useHeight = useWidth/imgRadio;
+						this.lckHeight = 0;
+					}
+					if(useHeight < selHeight) {
+						useHeight = selHeight;
+						useWidth = useHeight*imgRadio;
+						this.lckWidth = 0;
+					}
+				}
+
+				this.scaleSize = 1;
+				this.rotateDeg = 0;
+				this.posWidth = (allWidth-useWidth)/2;
+				this.posHeight = (allHeight-useHeight-tabHeight)/2;
+				this.useWidth = useWidth;
+				this.useHeight = useHeight;
+
+				let style = this.selStyle,
+					left = parseInt(style.left),
+					top = parseInt(style.top),
+					width = parseInt(style.width),
+					height = parseInt(style.height),
+					canvas = this.canvas,
+					canvasOper = this.canvasOper,
+					ctxCanvas = this.ctxCanvas,
+					ctxCanvasOper = this.ctxCanvasOper;
+
+				ctxCanvasOper.setLineWidth(3);
+				ctxCanvasOper.setStrokeStyle('grey');
+				ctxCanvasOper.setGlobalAlpha(0.4);
+				ctxCanvasOper.setFillStyle('black');
+				ctxCanvasOper.strokeRect( left, top, width, height );
+				ctxCanvasOper.fillRect(0, 0, this.windowWidth, top);
+				ctxCanvasOper.fillRect(0, top, left, height);
+				ctxCanvasOper.fillRect(0, top+height, this.windowWidth, this.windowHeight-height-top-tabHeight);
+				ctxCanvasOper.fillRect(left+width, top,this.windowWidth-width-left, height);
+				ctxCanvasOper.setStrokeStyle('red');
+				ctxCanvasOper.moveTo(left+20, top);ctxCanvasOper.lineTo(left, top);ctxCanvasOper.lineTo(left, top+20);
+				ctxCanvasOper.moveTo(left+width-20, top);ctxCanvasOper.lineTo(left+width, top);ctxCanvasOper.lineTo(left+width, top+20);
+				ctxCanvasOper.moveTo(left+20, top+height);ctxCanvasOper.lineTo(left, top+height);ctxCanvasOper.lineTo(left, top+height-20);
+				ctxCanvasOper.moveTo(left+width-20, top+height);ctxCanvasOper.lineTo(left+width, top+height);ctxCanvasOper.lineTo(left+width, top+height-20);
+				
+				// 绘制控制点（四个角）
+				const controlPointSize = 10;
+				ctxCanvasOper.setFillStyle('white');
+				ctxCanvasOper.setStrokeStyle('grey');
+				ctxCanvasOper.setLineWidth(1);
+				// 左上角
+				ctxCanvasOper.fillRect(left - controlPointSize/2, top - controlPointSize/2, controlPointSize, controlPointSize);
+				ctxCanvasOper.strokeRect(left - controlPointSize/2, top - controlPointSize/2, controlPointSize, controlPointSize);
+				// 右上角
+				ctxCanvasOper.fillRect(left + width - controlPointSize/2, top - controlPointSize/2, controlPointSize, controlPointSize);
+				ctxCanvasOper.strokeRect(left + width - controlPointSize/2, top - controlPointSize/2, controlPointSize, controlPointSize);
+				// 左下角
+				ctxCanvasOper.fillRect(left - controlPointSize/2, top + height - controlPointSize/2, controlPointSize, controlPointSize);
+				ctxCanvasOper.strokeRect(left - controlPointSize/2, top + height - controlPointSize/2, controlPointSize, controlPointSize);
+				// 右下角
+				ctxCanvasOper.fillRect(left + width - controlPointSize/2, top + height - controlPointSize/2, controlPointSize, controlPointSize);
+				ctxCanvasOper.strokeRect(left + width - controlPointSize/2, top + height - controlPointSize/2, controlPointSize, controlPointSize);
+				
+				ctxCanvasOper.stroke();
+
+				ctxCanvasOper.draw(false, ()=>{
+					if( ini ) {
+						this.styleDisplay = 'flex';
+						// #ifdef H5
+						this.styleTop = this.drawTop + 'px';
+						// #endif
+						// #ifndef H5
+						this.styleTop = '0';
+						// #endif
+						ctxCanvas.setFillStyle('black');
+						this.drawImage();
+					}
+				});
+
+				this.$emit("avtinit");
+			},
+			drawImage() {
+				let tm_now = Date.now();
+				if(tm_now - this.drawTm < 20) return;
+				this.drawTm = tm_now;
+				let ctxCanvas = this.ctxCanvas;
+				ctxCanvas.fillRect(0, 0, this.windowWidth, this.windowHeight-tabHeight);
+				ctxCanvas.translate(this.posWidth+this.useWidth/2, this.posHeight+this.useHeight/2);
+				ctxCanvas.scale(this.scaleSize, this.scaleSize);
+				ctxCanvas.rotate(this.rotateDeg * Math.PI/180);
+				ctxCanvas.drawImage(this.imgPath, -this.useWidth/2, -this.useHeight/2, this.useWidth, this.useHeight);
+				ctxCanvas.draw(false);
+			},
+			hideImg() {
+				this.prvImg = '';
+				this.prvTop = '-10000px';
+				this.showOper = true;
+				this.prvImgData = null;
+				this.target = null;
+			},
+			close() {
+				this.styleDisplay = 'none';
+				this.styleTop = '-10000px';
+				this.hasSel = false;
+				this.hideImg();
+				this.noBar || uni.showTabBar();
+			},
+			preview() {
+				if(this.fPreviewing) return;
+				this.fPreviewing = true;
+				setTimeout(()=>{ this.fPreviewing = false; }, 1000);
+				let style = this.selStyle,
+					x = parseInt(style.left),
+					y = parseInt(style.top),
+					width = parseInt(style.width),
+					height = parseInt(style.height);
+
+				uni.showLoading({ mask: true });
+				// console.log('size', x, y, width, height)
+				uni.canvasToTempFilePath({
+					x: x,
+					y: y,
+					width: width,
+					height: height,
+					canvasId: 'avatar-canvas-' + this.instanceId,
+					fileType: 'png',
+					quality: this.qlty,
+					success: (r)=>{
+						// console.log(r)
+						this.prvImgTmp = r = r.tempFilePath;
+
+						let ctxCanvasPrv = this.ctxCanvasPrv,
+							prvX = this.windowWidth,
+							prvY = parseInt(this.cvsStyleHeight),
+							prvWidth = parseInt(this.selStyle.width),
+							prvHeight = parseInt(this.selStyle.height),
+							useWidth = prvX - 40,
+							useHeight = prvY - 80,
+							radio = useWidth/prvWidth,
+							rHeight = prvHeight*radio;
+							if(rHeight < useHeight) {
+								prvWidth = useWidth;
+								prvHeight = rHeight;
+							} else {
+								radio = useHeight/prvHeight;
+								prvWidth *= radio;
+								prvHeight = useHeight;
+							}
+						ctxCanvasPrv.setFillStyle('black');
+						ctxCanvasPrv.fillRect(0, 0, prvX, prvY);
+						ctxCanvasPrv.fillRect(x, y, width, height);
+						this.prvX = prvX = (prvX-prvWidth)/2;
+						this.prvY = prvY = (prvY-prvHeight)/2;
+						this.prvWidth = prvWidth;
+						this.prvHeight = prvHeight;
+						ctxCanvasPrv.drawImage(r, prvX, prvY, prvWidth, prvHeight);
+						ctxCanvasPrv.draw(false, () => {
+							// #ifdef H5
+							this.btop(this.prvImgTmp).then((r)=> {
+								this.showOper = false;
+								this.prvTop = this.drawTop + 'px';
+							})
+							// #endif
+							// #ifndef H5
+							if( this.platform != 'android' ) {
+								this.showOper = false;
+							}
+							this.prvTop = '0';
+							// #endif
+						});
+					},
+					fail: ()=>{
+						uni.showToast({
+							title: "error2",
+							duration: 2000,
+						})
+					},
+					complete: () => {
+						uni.hideLoading();
+					}
+				}, this);
+			},
+			chooseImage(index=undefined, params=undefined, data=undefined) {
+				if(params) {
+					console.log(params)
+					let areaWidth = params.areaWidth || this.areaWidth,
+						areaHeight = params.areaHeight || this.areaHeight,
+						expWidth = params.exportWidth || this.exportWidth,
+						expHeight = params.exportHeight || this.exportHeight,
+						quality = params.quality,
+						canRotate = params.canRotate,
+						canScale = params.canScale,
+						canChangeSize = params.canChangeSize,
+						minScale = params.minScale,
+						maxScale = params.maxScale,
+						stretch = params.stretch,
+						inner = params.inner,
+						lock = params.lock;
+						console.log('areaWidth', this.areaWidth)
+
+					expWidth && (this.expWidth = expWidth.indexOf('rpx') >= 0 ? parseInt(expWidth)*this.pxRatio : parseInt(expWidth));
+					expHeight && (this.expHeight = expHeight.indexOf('rpx') >= 0 ? parseInt(expHeight)*this.pxRatio : parseInt(expHeight));
+					this.letRotate = canRotate === false ? 0 : 1;
+					this.letScale = canScale === false ? 0 : 1;
+					// 设置是否允许调整裁剪框大小
+					this.letChangeSize = canChangeSize || false;
+					this.qlty = parseInt(quality) || 0.9;
+					this.mnScale = minScale || 0.3;
+					this.mxScale = maxScale || 4;
+					this.stc = stretch;
+					this.isin = inner === true ? 1 : 0;
+					this.lck = lock;
+					if(this.isin) {
+						this.btnWidth = '24%';
+						this.btnDsp = 'none';
+					} else {
+						this.btnWidth = '19%';
+						this.btnDsp = 'flex';
+					}
+
+					if( areaWidth && areaHeight) {
+						areaWidth  = areaWidth.indexOf('rpx')  >= 0 ? parseInt(areaWidth)  * this.pxRatio: parseInt(areaWidth);
+						areaHeight = areaHeight.indexOf('rpx') >= 0 ? parseInt(areaHeight) * this.pxRatio: parseInt(areaHeight);
+						this.selStyle.width = areaWidth + 'px';
+						this.selStyle.height = areaHeight + 'px';
+						this.selStyle.top = (this.windowHeight - areaHeight - tabHeight)/2 + 'px';
+						this.selStyle.left = (this.windowWidth - areaWidth)/2 + 'px';
+						// console.log(this.selStyle);
+						this.hasSel = true;
+					}
+				}
+				this.rtn = data;
+				this.indx = index;
+				this.select();
+			},
+			rotate() {
+				// #ifdef APP-PLUS
+				if(this.platform === 'android') {
+					if(this.fRotateing) return;
+					this.fRotateing = true;
+					setTimeout(()=>{ this.fRotateing = false; }, 500);
+				}
+				// #endif
+
+				// if(this.letRotate) {
+					this.rotateDeg += 90 - this.rotateDeg%90;
+					this.drawImage();
+				// }
+			},
+			start(e) {
+				let touches = e.touches,
+				touch0 = touches[0],
+				touch1 = touches[1];
+
+				this.touch0 = touch0;
+				this.touch1 = touch1;
+
+				if( touch1 ) {
+					let x = touch1.x - touch0.x,
+						y = touch1.y - touch0.y;
+					this.fgDistance = Math.sqrt(x * x + y * y);
+				} else {
+					// 只有在允许调整大小时才检查控制点
+					if (this.letChangeSize) {
+						// 检查是否点击在控制点上
+						const controlPointSize = 20;
+						const x = touch0.x;
+						const y = touch0.y;
+						const style = this.selStyle;
+						const left = parseInt(style.left);
+						const top = parseInt(style.top);
+						const width = parseInt(style.width);
+						const height = parseInt(style.height);
+						
+						// 检查四个控制点
+						if (Math.abs(x - left) < controlPointSize && Math.abs(y - top) < controlPointSize) {
+							this.resizeHandle = 'top-left';
+						} else if (Math.abs(x - (left + width)) < controlPointSize && Math.abs(y - top) < controlPointSize) {
+							this.resizeHandle = 'top-right';
+						} else if (Math.abs(x - left) < controlPointSize && Math.abs(y - (top + height)) < controlPointSize) {
+							this.resizeHandle = 'bottom-left';
+						} else if (Math.abs(x - (left + width)) < controlPointSize && Math.abs(y - (top + height)) < controlPointSize) {
+							this.resizeHandle = 'bottom-right';
+						} else {
+							this.resizeHandle = null;
+						}
+					} else {
+						this.resizeHandle = null;
+					}
+				}
+			},
+			move(e) {
+				let touches = e.touches,
+					touch0 = touches[0],
+					touch1 = touches[1];
+
+				if( touch1 ) {
+					let x = touch1.x - touch0.x,
+						y = touch1.y - touch0.y,
+						fgDistance = Math.sqrt(x * x + y * y),
+						scaleSize = 0.005 * (fgDistance - this.fgDistance),
+						beScaleSize = this.scaleSize + scaleSize;
+
+					do	{
+						if( !this.letScale ) break;
+						if( beScaleSize < this.mnScale) break;
+						if( beScaleSize > this.mxScale) break;
+						if(this.isin) {
+							let	imgWidth = this.useWidth*beScaleSize,
+								imgHeight = this.useHeight*beScaleSize,
+								rx0 = this.posWidth+this.useWidth/2,
+								ry0 = this.posHeight+this.useHeight/2,
+								l = rx0-imgWidth/2, t = ry0-imgHeight/2,
+								r = l+imgWidth,	    b = t+imgHeight,
+								left = parseInt(this.selStyle.left),
+								top = parseInt(this.selStyle.top),
+								width = parseInt(this.selStyle.width),
+								height = parseInt(this.selStyle.height);
+								if(left < l || left+width > r || top < t || top+height > b) break;
+								this.scaleWidth = (this.useWidth-imgWidth)/2;
+								this.scaleHeight = (this.useHeight-imgHeight)/2;
+						}
+
+						this.scaleSize = beScaleSize;
+					} while(0);
+					this.fgDistance = fgDistance;
+
+					if(touch1.x !== touch0.x && this.letRotate) {
+						x = (this.touch1.y - this.touch0.y)/(this.touch1.x - this.touch0.x);
+						y = (touch1.y - touch0.y)/(touch1.x - touch0.x);
+						this.rotateDeg += Math.atan((y-x)/(1+x*y)) * 180/Math.PI;
+						this.touch0 = touch0;
+						this.touch1 = touch1;
+					}
+
+					this.drawImage();
+				} else if( this.touch0 ) {
+					// 只有在允许调整大小时才处理裁剪框大小调整
+					if (this.resizeHandle && this.letChangeSize) {
+						const style = {...this.selStyle};
+						const left = parseInt(style.left);
+						const top = parseInt(style.top);
+						const width = parseInt(style.width);
+						const height = parseInt(style.height);
+						const minWidth = 50;
+						const minHeight = 50;
+						
+						switch (this.resizeHandle) {
+							case 'top-left':
+								style.left = touch0.x + 'px';
+								style.top = touch0.y + 'px';
+								style.width = (left + width - touch0.x) + 'px';
+								style.height = (top + height - touch0.y) + 'px';
+								break;
+							case 'top-right':
+								style.top = touch0.y + 'px';
+								style.width = (touch0.x - left) + 'px';
+								style.height = (top + height - touch0.y) + 'px';
+								break;
+							case 'bottom-left':
+								style.left = touch0.x + 'px';
+								style.width = (left + width - touch0.x) + 'px';
+								style.height = (touch0.y - top) + 'px';
+								break;
+							case 'bottom-right':
+								style.width = (touch0.x - left) + 'px';
+								style.height = (touch0.y - top) + 'px';
+								break;
+						}
+						
+						// 确保最小尺寸
+						if (parseInt(style.width) >= minWidth && parseInt(style.height) >= minHeight) {
+							// 确保裁剪框不超出屏幕边界
+							if (parseInt(style.left) >= 0 && 
+								parseInt(style.top) >= 0 &&
+								(parseInt(style.left) + parseInt(style.width)) <= this.windowWidth &&
+								(parseInt(style.top) + parseInt(style.height)) <= (this.windowHeight - tabHeight)) {
+								this.selStyle = style;
+								// 重新绘制操作层
+								this.drawInit();
+							}
+						}
+					} else {
+						// 原有的移动图片逻辑
+						let x = touch0.x - this.touch0.x,
+							y = touch0.y - this.touch0.y,
+							beX = this.posWidth + x,
+							beY = this.posHeight + y;
+						if(this.isin) {
+							let	imgWidth = this.useWidth*this.scaleSize,
+								imgHeight = this.useHeight*this.scaleSize,
+								rx0 = beX+this.useWidth/2,
+								ry0 = beY+this.useHeight/2,
+								l = rx0-imgWidth/2, t = ry0-imgHeight/2,
+								r = l+imgWidth,	    b = t+imgHeight,
+								left = parseInt(this.selStyle.left),
+								top = parseInt(this.selStyle.top),
+								width = parseInt(this.selStyle.width),
+								height = parseInt(this.selStyle.height);
+								if(!this.lckWidth && Math.abs(x) < 100) {
+									if(left >= l && left+width <= r) {
+										this.posWidth  = beX;
+									} else if(left < l){
+										this.posWidth = left - this.scaleWidth;
+									} else if(left+width > r) {
+										this.posWidth = left-(imgWidth-width) - this.scaleWidth;
+									}
+								}
+								if(!this.lckHeight && Math.abs(y) < 100) {
+									if(top >= t && top+height <= b) {
+										this.posHeight  = beY;
+									} else if(top < t) {
+										this.posHeight = top - this.scaleHeight;
+									} else if(top+height > b) {
+										this.posHeight = top-(imgHeight-height) - this.scaleHeight;
+									}
+								}
+						} else {
+							if( Math.abs(x) < 100 && !this.lckWidth) this.posWidth  = beX;
+							if( Math.abs(y) < 100 && !this.lckHeight) this.posHeight = beY;
+						}
+
+						this.touch0 = touch0;
+						this.drawImage();
+					}
+				}
+			},
+			end(e) {
+				let touches = e.touches,
+					touch0 = touches && touches[0],
+					touch1 = touches && touches[1];
+				if(touch0) {
+					this.touch0 = touch0;
+				} else {
+					this.touch0 = null;
+					this.touch1 = null;
+					this.resizeHandle = null; // 重置调整手柄
+				}
+			},
+			getImgData() {
+				return new Promise((resolve, reject)=>{
+					let prvX = this.prvX,
+						prvY = this.prvY,
+						prvWidth = this.prvWidth,
+						prvHeight = this.prvHeight;
+					// #ifdef APP-PLUS||H5
+					prvX *= this.pixelRatio;
+					prvY *= this.pixelRatio;
+					prvWidth *= this.pixelRatio;
+					prvHeight *= this.pixelRatio;
+					// #endif
+					uni.canvasGetImageData({
+						canvasId: 'prv-canvas-' + this.instanceId,
+						x: prvX,
+						y: prvY,
+						width: prvWidth,
+						height: prvHeight,
+						success(res) {
+							resolve(res.data);
+						},
+						fail(err) {
+							reject(err);
+						}
+					}, this);
+				});
+			},
+			async colorChange(e) {
+				let tm_now = Date.now();
+				if(tm_now - this.prvTm < 100) return;
+				this.prvTm = tm_now;
+
+				uni.showLoading({ mask: true });
+
+				if( !this.prvImgData ) {
+					if( !(this.prvImgData = await this.getImgData().catch((res)=>{
+						uni.showToast({
+							title: "error_read",
+							duration: 2000,
+						})
+					}))) return;
+					this.target = new Uint8ClampedArray(this.prvImgData.length);
+				}
+
+				let data = this.prvImgData,
+					target = this.target,
+					i = e.detail.value,
+					r,g,b,a,h,s,l,d,p,q,t,min,max,hK,tR,tG,tB;
+
+				if( i === 0 ) {
+					target = data;
+				} else {
+					i = (i+100)/200;
+					if( i < 0.005 ) i = 0;
+					if( i > 0.995 ) i = 1;
+					for( let n = data.length-1; n >= 0; n-=4 ) {
+						r = data[n-3] / 255;
+						g = data[n-2] / 255;
+						b = data[n-1] / 255;
+						max = Math.max(r,g,b);
+						min = Math.min(r,g,b);
+						d = max-min;
+						if ( max === min ){
+							h = 0 ;
+						}else if( max === r && g>=b ){
+							h = 60*( (g-b)/d ) ;
+						}else if( max === r && g<b ){
+							h = 60*( (g-b)/d ) + 360 ;
+						}else if( max === g ){
+							h = 60*( (b-r)/d ) + 120 ;
+						}else if( max === b ){
+							h = 60*( (r-g)/d ) + 240 ;
+						}
+						l = (max+min)/2 ;
+						if ( l===0 || max===min ){
+							s = 0 ;
+						}else if( 0<l && l<=0.5 ){
+							s = d/(2*l) ;
+						}else if( l>0.5 ){
+							s = d/(2-2*l) ;
+						}
+						data[n] && (a = data[n]);
+
+						if ( i < 0.5 ){
+							s = s*i/0.5 ;
+						}else if ( i > 0.5 ){
+							s = 2*s + 2*i - (s*i/0.5) - 1 ;
+						}
+
+						if ( s === 0 ){
+							r = g = b = Math.round( l*255 ) ;
+						}else{
+							if ( l<0.5 ){
+								q = l * ( 1 + s ) ;
+							}else if( l>=0.5 ){
+								q = l + s - ( l * s ) ;
+							}
+							p = 2*l-q ;
+							hK = h/360 ;
+							tR = hK + 1/3 ;
+							tG = hK ;
+							tB = hK - 1/3 ;
+							let correctRGB = (t)=>{
+								if( t<0 ){
+									return t + 1.0 ;
+								}
+								if( t>1 ){
+									return t - 1.0 ;
+								}
+								return t ;
+							} ;
+							let createRGB = (t)=>{
+								if ( t<(1/6) ){
+									return p+((q-p)*6*t) ;
+								}else if( t>=(1/6) && t<(1/2) ){
+									return q ;
+								}else if( t>=(1/2) && t<(2/3) ){
+									return p+((q-p)*6*((2/3)-t)) ;
+								}
+								return p ;
+							} ;
+							r = tR = Math.round( createRGB( correctRGB( tR ) )*255 ) ;
+							g = tG = Math.round( createRGB( correctRGB( tG ) )*255 ) ;
+							b = tB = Math.round( createRGB( correctRGB( tB ) )*255 ) ;
+						}
+						a && ( target[n] = a ) ;
+						target[n-3] = r;
+						target[n-2] = g;
+						target[n-1] = b;
+					}
+				}
+				let prvX = this.prvX,
+					prvY = this.prvY,
+					prvWidth = this.prvWidth,
+					prvHeight = this.prvHeight;
+
+				this.ctxCanvasPrv.setFillStyle('black');
+				this.ctxCanvasPrv.fillRect(prvX, prvY, prvWidth, prvHeight);
+				this.ctxCanvasPrv.draw(true);
+
+				// #ifdef APP-PLUS||H5
+				prvX *= this.pixelRatio;
+				prvY *= this.pixelRatio;
+				prvWidth *= this.pixelRatio;
+				prvHeight *= this.pixelRatio;
+				// #endif
+				uni.canvasPutImageData({
+					canvasId: 'prv-canvas-' + this.instanceId,
+					x: prvX,
+					y: prvY,
+					width: prvWidth,
+					height: prvHeight,
+					data: target,
+					fail() {
+						uni.showToast({
+							title: 'error_put',
+							duration: 2000
+						})
+					},
+					complete() {
+						uni.hideLoading();
+					}
+				}, this);
+			},
+			btop(base64) {
+				return new Promise(function(resolve, reject) {
+					var arr = base64.split(','),
+						mime = arr[0].match(/:(.*?);/)[1],
+						bstr = atob(arr[1]),
+						n = bstr.length,
+						u8arr = new Uint8Array(n);
+					while (n--) {
+						u8arr[n] = bstr.charCodeAt(n);
+					}
+					return resolve((window.URL || window.webkitURL).createObjectURL(new Blob([u8arr], { type: mime })));
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.u-cropper {
+	.my-canvas{
+		display: flex;
+		position: fixed !important;
+		background: #000000;
+		left: 0;
+		z-index: 100000;
+		width: 100%;
+	}
+	.my-avatar {
+		width: 150rpx;
+		height: 150rpx;
+		border-radius: 100%;
+	}
+	.oper-canvas {
+		display: flex;
+		position: fixed !important;
+		left: 0;
+		z-index: 100001;
+		width: 100%;
+	}
+	.prv-canvas {
+		display: flex;
+		position: fixed !important;
+		background: #000000;
+		left: 0;
+		z-index: 200000;
+		width: 100%;
+	}
+	.oper-wrapper {
+		height: 50px;
+		position: fixed !important;
+		box-sizing: border-box;
+		border: 1px solid #F1F1F1;
+		background: #ffffff;
+		width: 100%;
+		left: 0;
+		bottom: 0;
+		z-index: 100009;
+		flex-direction: row;
+	}
+	.oper {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		padding: 10rpx 20rpx;
+		width: 100%;
+		height: 100%;
+		box-sizing: border-box;
+		align-self: center;
+	}
+	.btn-wrapper {
+		display: flex;
+		flex-direction: row;
+		/* #ifndef H5 */
+		flex-grow: 1;
+		/* #endif */
+		/* #ifdef H5 */
+		height: 50px;
+		/* #endif */
+		justify-content: space-between;
+	}
+	.btn-wrapper view {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 16px;
+		color: #333;
+		border: 1px solid #f1f1f1;
+		border-radius: 6%;
+	}
+	.hover {
+		background: #f1f1f1;
+		border-radius: 6%;
+	}
+	.clr-wrapper {
+		display: flex;
+		flex-direction: row;
+		flex-grow: 1;
+	}
+	.clr-wrapper view {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 16px;
+		color: #333;
+		border: 1px solid #f1f1f1;
+		border-radius: 6%;
+	}
+	.my-slider {
+		flex-grow: 1;
+	}
+}
+</style>
+
diff --git a/uview-plus/components/u-datetime-picker/datetimePicker.js b/uview-plus/components/u-datetime-picker/datetimePicker.js
index 96e8ab8..b196522 100644
--- a/uview-plus/components/u-datetime-picker/datetimePicker.js
+++ b/uview-plus/components/u-datetime-picker/datetimePicker.js
@@ -1,12 +1,13 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:57:48
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/datetimePicker.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/datetimePicker.js
  */
+import { t } from '../../libs/i18n'
 export default {
     // datetimePicker 组件
     datetimePicker: {
@@ -26,12 +27,18 @@ export default {
         formatter: null,
         loading: false,
         itemHeight: 44,
-        cancelText: '取消',
-        confirmText: '确认',
+        cancelText: t("up.common.cancel"),
+        confirmText: t("up.common.confirm"),
         cancelColor: '#909193',
         confirmColor: '#3c9cff',
         visibleItemCount: 5,
         closeOnClickOverlay: false,
-        defaultIndex: []
+        defaultIndex: [],
+        inputBorder: 'surround',
+        disabled: false,
+        disabledColor: '',
+        placeholder: t("up.common.pleaseChoose"),
+        inputProps: {},
+        pageInline: false
     }
 }
diff --git a/uview-plus/components/u-datetime-picker/dayjs.esm.min.js b/uview-plus/components/u-datetime-picker/dayjs.esm.min.js
new file mode 100644
index 0000000..24c6ec9
--- /dev/null
+++ b/uview-plus/components/u-datetime-picker/dayjs.esm.min.js
@@ -0,0 +1,7 @@
+/**
+ * Bundled by jsDelivr using Rollup v2.79.2 and Terser v5.39.0.
+ * Original file: /npm/dayjs@1.11.13/dayjs.min.js
+ *
+ * Do NOT use SRI with dynamically generated files! More information: https://www.jsdelivr.com/using-sri-with-dynamic-files
+ */
+"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self&&self;var t={exports:{}},e=t.exports=function(){var t=1e3,e=6e4,n=36e5,r="millisecond",s="second",i="minute",u="hour",a="day",o="week",c="month",f="quarter",h="year",d="date",l="Invalid Date",$=/^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/,y=/\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,M={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(t){var e=["th","st","nd","rd"],n=t%100;return"["+t+(e[(n-20)%10]||e[n]||e[0])+"]"}},g=function(t,e,n){var r=String(t);return!r||r.length>=e?t:""+Array(e+1-r.length).join(n)+t},v={s:g,z:function(t){var e=-t.utcOffset(),n=Math.abs(e),r=Math.floor(n/60),s=n%60;return(e<=0?"+":"-")+g(r,2,"0")+":"+g(s,2,"0")},m:function t(e,n){if(e.date()<n.date())return-t(n,e);var r=12*(n.year()-e.year())+(n.month()-e.month()),s=e.clone().add(r,c),i=n-s<0,u=e.clone().add(r+(i?-1:1),c);return+(-(r+(n-s)/(i?s-u:u-s))||0)},a:function(t){return t<0?Math.ceil(t)||0:Math.floor(t)},p:function(t){return{M:c,y:h,w:o,d:a,D:d,h:u,m:i,s:s,ms:r,Q:f}[t]||String(t||"").toLowerCase().replace(/s$/,"")},u:function(t){return void 0===t}},m="en",D={};D[m]=M;var p="$isDayjsObject",S=function(t){return t instanceof _||!(!t||!t[p])},w=function t(e,n,r){var s;if(!e)return m;if("string"==typeof e){var i=e.toLowerCase();D[i]&&(s=i),n&&(D[i]=n,s=i);var u=e.split("-");if(!s&&u.length>1)return t(u[0])}else{var a=e.name;D[a]=e,s=a}return!r&&s&&(m=s),s||!r&&m},b=function(t,e){if(S(t))return t.clone();var n="object"==typeof e?e:{};return n.date=t,n.args=arguments,new _(n)},O=v;O.l=w,O.i=S,O.w=function(t,e){return b(t,{locale:e.$L,utc:e.$u,x:e.$x,$offset:e.$offset})};var _=function(){function M(t){this.$L=w(t.locale,null,!0),this.parse(t),this.$x=this.$x||t.x||{},this[p]=!0}var g=M.prototype;return g.parse=function(t){this.$d=function(t){var e=t.date,n=t.utc;if(null===e)return new Date(NaN);if(O.u(e))return new Date;if(e instanceof Date)return new Date(e);if("string"==typeof e&&!/Z$/i.test(e)){var r=e.match($);if(r){var s=r[2]-1||0,i=(r[7]||"0").substring(0,3);return n?new Date(Date.UTC(r[1],s,r[3]||1,r[4]||0,r[5]||0,r[6]||0,i)):new Date(r[1],s,r[3]||1,r[4]||0,r[5]||0,r[6]||0,i)}}return new Date(e)}(t),this.init()},g.init=function(){var t=this.$d;this.$y=t.getFullYear(),this.$M=t.getMonth(),this.$D=t.getDate(),this.$W=t.getDay(),this.$H=t.getHours(),this.$m=t.getMinutes(),this.$s=t.getSeconds(),this.$ms=t.getMilliseconds()},g.$utils=function(){return O},g.isValid=function(){return!(this.$d.toString()===l)},g.isSame=function(t,e){var n=b(t);return this.startOf(e)<=n&&n<=this.endOf(e)},g.isAfter=function(t,e){return b(t)<this.startOf(e)},g.isBefore=function(t,e){return this.endOf(e)<b(t)},g.$g=function(t,e,n){return O.u(t)?this[e]:this.set(n,t)},g.unix=function(){return Math.floor(this.valueOf()/1e3)},g.valueOf=function(){return this.$d.getTime()},g.startOf=function(t,e){var n=this,r=!!O.u(e)||e,f=O.p(t),l=function(t,e){var s=O.w(n.$u?Date.UTC(n.$y,e,t):new Date(n.$y,e,t),n);return r?s:s.endOf(a)},$=function(t,e){return O.w(n.toDate()[t].apply(n.toDate("s"),(r?[0,0,0,0]:[23,59,59,999]).slice(e)),n)},y=this.$W,M=this.$M,g=this.$D,v="set"+(this.$u?"UTC":"");switch(f){case h:return r?l(1,0):l(31,11);case c:return r?l(1,M):l(0,M+1);case o:var m=this.$locale().weekStart||0,D=(y<m?y+7:y)-m;return l(r?g-D:g+(6-D),M);case a:case d:return $(v+"Hours",0);case u:return $(v+"Minutes",1);case i:return $(v+"Seconds",2);case s:return $(v+"Milliseconds",3);default:return this.clone()}},g.endOf=function(t){return this.startOf(t,!1)},g.$set=function(t,e){var n,o=O.p(t),f="set"+(this.$u?"UTC":""),l=(n={},n[a]=f+"Date",n[d]=f+"Date",n[c]=f+"Month",n[h]=f+"FullYear",n[u]=f+"Hours",n[i]=f+"Minutes",n[s]=f+"Seconds",n[r]=f+"Milliseconds",n)[o],$=o===a?this.$D+(e-this.$W):e;if(o===c||o===h){var y=this.clone().set(d,1);y.$d[l]($),y.init(),this.$d=y.set(d,Math.min(this.$D,y.daysInMonth())).$d}else l&&this.$d[l]($);return this.init(),this},g.set=function(t,e){return this.clone().$set(t,e)},g.get=function(t){return this[O.p(t)]()},g.add=function(r,f){var d,l=this;r=Number(r);var $=O.p(f),y=function(t){var e=b(l);return O.w(e.date(e.date()+Math.round(t*r)),l)};if($===c)return this.set(c,this.$M+r);if($===h)return this.set(h,this.$y+r);if($===a)return y(1);if($===o)return y(7);var M=(d={},d[i]=e,d[u]=n,d[s]=t,d)[$]||1,g=this.$d.getTime()+r*M;return O.w(g,this)},g.subtract=function(t,e){return this.add(-1*t,e)},g.format=function(t){var e=this,n=this.$locale();if(!this.isValid())return n.invalidDate||l;var r=t||"YYYY-MM-DDTHH:mm:ssZ",s=O.z(this),i=this.$H,u=this.$m,a=this.$M,o=n.weekdays,c=n.months,f=n.meridiem,h=function(t,n,s,i){return t&&(t[n]||t(e,r))||s[n].slice(0,i)},d=function(t){return O.s(i%12||12,t,"0")},$=f||function(t,e,n){var r=t<12?"AM":"PM";return n?r.toLowerCase():r};return r.replace(y,(function(t,r){return r||function(t){switch(t){case"YY":return String(e.$y).slice(-2);case"YYYY":return O.s(e.$y,4,"0");case"M":return a+1;case"MM":return O.s(a+1,2,"0");case"MMM":return h(n.monthsShort,a,c,3);case"MMMM":return h(c,a);case"D":return e.$D;case"DD":return O.s(e.$D,2,"0");case"d":return String(e.$W);case"dd":return h(n.weekdaysMin,e.$W,o,2);case"ddd":return h(n.weekdaysShort,e.$W,o,3);case"dddd":return o[e.$W];case"H":return String(i);case"HH":return O.s(i,2,"0");case"h":return d(1);case"hh":return d(2);case"a":return $(i,u,!0);case"A":return $(i,u,!1);case"m":return String(u);case"mm":return O.s(u,2,"0");case"s":return String(e.$s);case"ss":return O.s(e.$s,2,"0");case"SSS":return O.s(e.$ms,3,"0");case"Z":return s}return null}(t)||s.replace(":","")}))},g.utcOffset=function(){return 15*-Math.round(this.$d.getTimezoneOffset()/15)},g.diff=function(r,d,l){var $,y=this,M=O.p(d),g=b(r),v=(g.utcOffset()-this.utcOffset())*e,m=this-g,D=function(){return O.m(y,g)};switch(M){case h:$=D()/12;break;case c:$=D();break;case f:$=D()/3;break;case o:$=(m-v)/6048e5;break;case a:$=(m-v)/864e5;break;case u:$=m/n;break;case i:$=m/e;break;case s:$=m/t;break;default:$=m}return l?$:O.a($)},g.daysInMonth=function(){return this.endOf(c).$D},g.$locale=function(){return D[this.$L]},g.locale=function(t,e){if(!t)return this.$L;var n=this.clone(),r=w(t,e,!0);return r&&(n.$L=r),n},g.clone=function(){return O.w(this.$d,this)},g.toDate=function(){return new Date(this.valueOf())},g.toJSON=function(){return this.isValid()?this.toISOString():null},g.toISOString=function(){return this.$d.toISOString()},g.toString=function(){return this.$d.toUTCString()},M}(),k=_.prototype;return b.prototype=k,[["$ms",r],["$s",s],["$m",i],["$H",u],["$W",a],["$M",c],["$y",h],["$D",d]].forEach((function(t){k[t[1]]=function(e){return this.$g(e,t[0],t[1])}})),b.extend=function(t,e){return t.$i||(t(e,_,b),t.$i=!0),b},b.locale=w,b.isDayjs=S,b.unix=function(t){return b(1e3*t)},b.en=D[m],b.Ls=D,b.p={},b}();export{e as default};
diff --git a/uview-plus/components/u-datetime-picker/props.js b/uview-plus/components/u-datetime-picker/props.js
index 190b937..15b7bd9 100644
--- a/uview-plus/components/u-datetime-picker/props.js
+++ b/uview-plus/components/u-datetime-picker/props.js
@@ -5,11 +5,29 @@ export const props = defineMixin({
         // 是否显示input
         hasInput: {
             type: Boolean,
-            default: () => false
+            default: false
         },
+        inputProps: {
+            type: Object,
+            default: () => {
+                return {}
+            }
+        },
+        inputBorder: {
+            type: String,
+            default: () => defProps.input.inputBorder
+        },
+		disabled: {
+            type: Boolean,
+            default: () => defProps.input.disabled
+        },
+		disabledColor:{
+			type: String,
+			default: () => defProps.input.disabledColor
+		},
         placeholder: {
             type: String,
-            default: () => '请选择'
+            default: () => defProps.input.placeholder
         },
         format: {
             type: String,
@@ -145,6 +163,21 @@ export const props = defineMixin({
         defaultIndex: {
             type: Array,
             default: () => defProps.datetimePicker.defaultIndex
-        }
+        },
+        // 是否页面内展示
+        pageInline:{
+            type: Boolean,
+            default: () => defProps.datetimePicker.pageInline
+        },
+		// 蒙层样式样式
+		maskClass: {
+			type: String,
+			defualt: ''
+		},
+		// 蒙层样式样式
+		maskStyle: {
+			type: String,
+			defualt: ''
+		}
     }
 })
diff --git a/uview-plus/components/u-datetime-picker/u-datetime-picker.vue b/uview-plus/components/u-datetime-picker/u-datetime-picker.vue
index 5b3afd1..7b12fe9 100644
--- a/uview-plus/components/u-datetime-picker/u-datetime-picker.vue
+++ b/uview-plus/components/u-datetime-picker/u-datetime-picker.vue
@@ -1,22 +1,21 @@
 <template>
     <view class="u-datetime-picker">
         <view v-if="hasInput" class="u-datetime-picker__has-input"
-            @click="showByClickInput = !showByClickInput"
+            @click="onShowByClickInput"
         >
             <slot name="trigger" :value="inputValue">
 				<up-input
-					:placeholder="placeholder"
 					:readonly="!!showByClickInput"
-					border="surround"
 					v-model="inputValue"
+					v-bind="inputPropsInner"
 				></up-input>
-				<div class="input-cover">
-				</div>
+				<cover-view class="input-cover">
+				</cover-view>
 			</slot>
         </view>
         <u-picker
             ref="picker"
-            :show="show || (hasInput && showByClickInput)"
+            :show="pageInline || show || (hasInput && showByClickInput)"
             :popupMode="popupMode"
             :closeOnClickOverlay="closeOnClickOverlay"
             :columns="columns"
@@ -30,6 +29,9 @@
             :cancelColor="cancelColor"
             :confirmColor="confirmColor"
             :toolbarRightSlot="toolbarRightSlot"
+			:pageInline="pageInline"
+			:maskClass="maskClass"
+			:maskStyle="maskStyle"
             @close="close"
             @cancel="cancel"
             @confirm="confirm"
@@ -59,13 +61,13 @@
 	import { props } from './props';
 	import { mpMixin } from '../../libs/mixin/mpMixin';
 	import { mixin } from '../../libs/mixin/mixin';
-	import dayjs from 'dayjs/esm/index';
+	import dayjs from './dayjs.esm.min.js';
 	import { range, error, padZero } from '../../libs/function/index';
 	import test from '../../libs/function/test';
 	/**
 	 * DatetimePicker 时间日期选择器
 	 * @description 此选择器用于时间日期
-	 * @tutorial https://ijry.github.io/uview-plus/components/datetimePicker.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/datetimePicker.html
 	 * @property {Boolean}			show				用于控制选择器的弹出与收起 ( 默认 false )
 	 * @property {Boolean}			showToolbar			是否显示顶部的操作栏  ( 默认 true )
 	 * @property {String | Number}	modelValue		    绑定值
@@ -110,6 +112,12 @@
 		watch: {
 			show(newValue, oldValue) {
 				if (newValue) {
+					// #ifdef VUE3
+					this.innerValue = this.correctValue(this.modelValue)
+					// #endif
+					// #ifdef VUE2
+					this.innerValue = this.correctValue(this.value)
+					// #endif
 					this.updateColumnValue(this.innerValue)
 				}
 			},
@@ -132,7 +140,17 @@
 		computed: {
 			// 如果以下这些变量发生了变化，意味着需要重新初始化各列的值
 			propsChange() {
-				return [this.mode, this.maxDate, this.minDate, this.minHour, this.maxHour, this.minMinute, this.maxMinute, this.filter, ]
+				return [this.mode, this.maxDate, this.minDate, this.minHour, this.maxHour, this.minMinute, this.maxMinute, this.filter, this.modelValue]
+			},
+			// input的props
+			inputPropsInner() {
+				return {
+					border: this.inputBorder,
+            		placeholder: this.placeholder,
+					disabled: this.disabled,
+					disabledColor: this.disabledColor,
+					...this.inputProps
+				}
 			}
 		},
 		mounted() {
@@ -161,6 +179,9 @@
 							case 'year-month':
 								format = 'YYYY-MM'
 								break;
+							case 'datehour':
+								format = 'YYYY-MM-DD HH'
+								break;
 							case 'datetime':
 								format = 'YYYY-MM-DD HH:mm'
 								break;
@@ -427,7 +448,10 @@
 			},
 			// 根据minDate、maxDate、minHour、maxHour等边界值，判断各列的开始和结束边界值
 			getBoundary(type, innerValue) {
-			    const value = new Date(innerValue)
+			    let value = new Date(innerValue)
+                if(isNaN(value.getTime())){
+                    value = new Date()
+                }
 			    const boundary = new Date(this[`${type}Date`])
 			    const year = dayjs(boundary).year()
 			    let month = 1
@@ -461,13 +485,18 @@
 			        [`${type}Hour`]: hour,
 			        [`${type}Minute`]: minute
 			    }
+			},
+			onShowByClickInput(){
+				if(!this.disabled){
+					this.showByClickInput = !this.showByClickInput
+				}
+
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	@import '../../libs/css/components.scss';
 	.u-datetime-picker {
 		flex: 1;
         &__has-input {
diff --git a/uview-plus/components/u-divider/divider.js b/uview-plus/components/u-divider/divider.js
index 55a8ce4..1f9978a 100644
--- a/uview-plus/components/u-divider/divider.js
+++ b/uview-plus/components/u-divider/divider.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:58:03
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/divider.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/divider.js
  */
 export default {
     // divider组件
diff --git a/uview-plus/components/u-divider/u-divider.vue b/uview-plus/components/u-divider/u-divider.vue
index 47dbf00..edc91bd 100644
--- a/uview-plus/components/u-divider/u-divider.vue
+++ b/uview-plus/components/u-divider/u-divider.vue
@@ -14,11 +14,13 @@
 		    v-if="dot"
 		    class="u-divider__dot"
 		>●</text>
-		<text
-		    v-else-if="text"
-		    class="u-divider__text"
-		    :style="[textStyle]"
-		>{{text}}</text>
+		<slot>
+			<text
+				v-if="!dot && text"
+				class="u-divider__text"
+				:style="[textStyle]"
+			>{{text}}</text>
+		</slot>
 		<u-line
 		    :color="lineColor"
 		    :customStyle="rightLineStyle"
@@ -36,7 +38,7 @@
 	/**
 	 * divider 分割线
 	 * @description 区隔内容的分割线，一般用于页面底部"没有更多"的提示。
-	 * @tutorial https://ijry.github.io/uview-plus/components/divider.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/divider.html
 	 * @property {Boolean}			dashed			是否虚线 （默认 false ）
 	 * @property {Boolean}			hairline		是否细线 （默认  true ）
 	 * @property {Boolean}			dot				是否以点替代文字，优先于text字段起作用 （默认 false ）
@@ -95,7 +97,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import '../../libs/css/components.scss';
 	$u-divider-margin:15px 0 !default;
 	$u-divider-text-margin:0 15px !default;
 	$u-divider-dot-font-size:12px !default;
diff --git a/uview-plus/components/u-dragsort/u-dragsort.vue b/uview-plus/components/u-dragsort/u-dragsort.vue
new file mode 100644
index 0000000..ba42dcc
--- /dev/null
+++ b/uview-plus/components/u-dragsort/u-dragsort.vue
@@ -0,0 +1,402 @@
+<template>
+    <view class="u-dragsort"
+        :class="[direction == 'horizontal' ? 'u-dragsort--horizontal' : '', direction == 'vertical' ? 'u-dragsort--vertical' : '', direction == 'all' ? 'u-dragsort--all' : '']"
+        :style="movableAreaStyle"
+        >
+        <movable-area class="u-dragsort-area">
+            <movable-view v-for="(item, index) in list" :key="item.id" :id="`u-dragsort-item-${index}`"
+                class="u-dragsort-item" :class="{ 'dragging': dragIndex === index, disabled: !draggable || item.draggable === false }"
+                :direction="direction === 'all' ? 'all' : direction" :x="item.x" :y="item.y" :inertia="false"
+                :disabled="!draggable || dragIndex === -1 || item.draggable === false" @change="onChange(index, $event)"
+                @touchstart="onTouchStart(index, $event)" @touchend="onTouchEnd" @touchcancel="onTouchEnd" @touchmove="onTouchMove">
+                <view class="u-dragsort-item-content">
+                    <view
+                        class="ui-dragSort-item-handler"
+                        v-if="$slots.handler"
+                        data-action="handler"
+                        @touchstart="onTouchStart(index, $event)"
+                    >
+                        <slot name="handler" :item="item" :index="index"></slot>
+                    </view>
+                    <slot :item="item" :index="index">
+                        {{ item.label }}
+                    </slot>
+                </view>
+            </movable-view>
+        </movable-area>
+    </view>
+</template>
+
+<script>
+import { mpMixin } from '../../libs/mixin/mpMixin';
+import { mixin } from '../../libs/mixin/mixin';
+import { sleep } from '../../libs/function/index';
+export default {
+    name: 'u-dragsort',
+    // #ifdef MP
+    mixins: [mpMixin, mixin,],
+    // #endif
+    // #ifndef MP
+    mixins: [mixin],
+    // #endif
+    props: {
+        initialList: {
+            type: Array,
+            required: true,
+            default: () => []
+        },
+        draggable: {
+            type: Boolean,
+            default: true
+        },
+        vibrate: {
+            type: Boolean,
+            default: true
+        },
+        direction: {
+            type: String,
+            default: 'vertical',
+            validator: value => ['vertical', 'horizontal', 'all'].includes(value)
+        },
+        // 新增列数属性，用于all模式
+        columns: {
+            type: Number,
+            default: 3
+        }
+    },
+    data() {
+        return {
+            list: [],
+            dragIndex: -1,
+            sortChanged: false,
+            itemHeight: 0,
+            itemWidth: 0,
+            areaWidth: 0, // 可拖动区域宽度
+            areaHeight: 0, // 可拖动区域高度
+            currentPosition: {
+                x: 0,
+                y: 0
+            }
+        };
+    },
+    computed: {
+        movableAreaStyle() {
+            if (this.direction === 'vertical') {
+                return {
+                    height: this.itemHeight ? `${this.list.length * this.itemHeight}px` : 'auto',
+                    width: '100%'
+                }
+            } else if (this.direction === 'horizontal') {
+                return {
+                    height: this.itemHeight ? `${this.itemHeight}px` : 'auto',
+                    width: this.itemWidth ? `${this.list.length * this.itemWidth}px` : 'auto'
+                }
+            } else {
+                // all模式，计算网格布局所需的高度
+                const rows = Math.ceil(this.list.length / this.columns)
+                return {
+                    height: this.itemHeight ? `${rows * this.itemHeight}px` : 'auto',
+                    width: '100%'
+                }
+            }
+        }
+    },
+    emits: ['drag-end'],
+    async mounted() {
+        await this.$nextTick();
+        this.initList();
+        this.calculateItemSize();
+        this.calculateAreaSize();
+    },
+    methods: {
+        initList() {
+            // 初始化列表项的位置
+            this.list = this.initialList.map((item, index) => {
+                let x
+                let y
+
+                if (this.direction === 'horizontal' && this.itemWidth) {
+                    x = index * this.itemWidth
+                    y = 0
+                } else if (this.direction === 'vertical' && this.itemHeight) {
+                    x = 0
+                    y = index * this.itemHeight
+                } else if (this.itemWidth && this.itemHeight) {
+                    // all模式，网格布局
+                    const col = index % this.columns
+                    const row = Math.floor(index / this.columns)
+                    x = col * this.itemWidth
+                    y = row * this.itemHeight
+                }
+
+                return {
+                    ...item,
+                    x,
+                    y
+                }
+            })
+        },
+        async calculateItemSize() {
+            // 计算项目尺寸
+            await sleep(30);
+            return new Promise((resolve) => {
+                uni.createSelectorQuery()
+                    .in(this)
+                    .select('.u-dragsort-item-content')
+                    .boundingClientRect(res => {
+                        if (res) {
+                            this.itemHeight = res.height || 40;
+                            this.itemWidth = res.width || 80;
+
+                            // 更新所有项目的位置
+                            this.updatePositions();
+                        }
+                        resolve(res);
+                    })
+                    .exec();
+            });
+        },
+        async calculateAreaSize() {
+            // 计算可拖动区域尺寸
+            await sleep(30);
+            return new Promise((resolve) => {
+                uni.createSelectorQuery()
+                    .in(this)
+                    .select('.u-dragsort-area')
+                    .boundingClientRect(res => {
+                        if (res) {
+                            this.areaWidth = res.width || 300;
+                            this.areaHeight = res.height || 300;
+                        }
+                        resolve(res);
+                    })
+                    .exec();
+            });
+        },
+        updatePositions(isDragging) {
+            // 更新所有项目的位置
+            this.list = this.list.map((item, index) => {
+                // 当前正在拖动的项目保持拖动位置不动，避免抖动
+                if (isDragging && this.dragIndex === index) {
+                    return item
+                }
+
+                if (this.direction === 'vertical') {
+                    return {
+                        ...item,
+                        x: 0,
+                        y: index * this.itemHeight
+                    }
+                }
+
+                if (this.direction === 'horizontal') {
+                    return {
+                        ...item,
+                        x: index * this.itemWidth,
+                        y: 0
+                    }
+                }
+
+                // all模式，网格布局
+                const col = index % this.columns
+                const row = Math.floor(index / this.columns)
+
+                return {
+                    ...item,
+                    x: col * this.itemWidth,
+                    y: row * this.itemHeight
+                }
+            })
+        },
+        onTouchStart(index, e) {
+            if (this.$slots.handler && e.currentTarget.dataset.action !== 'handler') {
+                return
+            }
+            if (this.list[index]?.draggable === false) return;
+            if (this.timer) clearTimeout(this.timer);
+            this.sortChanged = false;
+            this.dragIndex = index;
+        },
+        onTouchMove(e) {
+            if (this.dragIndex !== -1) {
+                // 目前只对H5生效, 如果该组件放置在开启了下拉刷新的scroll-view中, 向下拖动item还是会触发下拉刷新
+                e.stopPropagation()
+                e.preventDefault()
+            }
+        },
+        onChange(index, event) {
+            if (!event.detail.source || event.detail.source !== 'touch') return;
+
+            this.currentPosition.x = event.detail.x;
+            this.currentPosition.y = event.detail.y;
+
+            // all模式下使用更智能的位置计算
+            if (this.direction === 'all') {
+                this.handleAllModeChange(index);
+            } else {
+                // 原有的垂直和水平模式逻辑
+                let itemSize = 0;
+                let targetIndex = -1;
+
+                if (this.direction === 'vertical') {
+                    itemSize = this.itemHeight;
+                    targetIndex = Math.max(0, Math.min(
+                        Math.round(this.currentPosition.y / itemSize),
+                        this.list.length - 1
+                    ));
+                } else if (this.direction === 'horizontal') {
+                    itemSize = this.itemWidth;
+                    targetIndex = Math.max(0, Math.min(
+                        Math.round(this.currentPosition.x / itemSize),
+                        this.list.length - 1
+                    ));
+                }
+
+                // 如果位置发生变化，则重新排序
+                if (targetIndex !== index) {
+                    this.reorderItems(index, targetIndex);
+                }
+            }
+        },
+        handleAllModeChange(index) {
+            // 在all模式下，根据当前位置计算最近的网格位置
+            const col = Math.max(0, Math.min(Math.round(this.currentPosition.x / this.itemWidth), this.columns - 1));
+            const row = Math.max(0, Math.round(this.currentPosition.y / this.itemHeight));
+
+            // 计算目标索引
+            let targetIndex = row * this.columns + col;
+            targetIndex = Math.max(0, Math.min(targetIndex, this.list.length - 1));
+
+            // 如果位置发生变化，则重新排序
+            if (targetIndex !== index) {
+                this.reorderItems(index, targetIndex);
+            }
+        },
+        reorderItems(fromIndex, toIndex) {
+            const movedItem = this.list.splice(fromIndex, 1)[0];
+            this.list.splice(toIndex, 0, movedItem);
+
+            // 更新当前拖拽项目的新索引
+            this.dragIndex = toIndex;
+            this.sortChanged = true;
+
+            // 更新所有项目的位置
+            this.updatePositions(true);
+
+            // 震动反馈
+            if (this.vibrate && uni.vibrateShort) {
+                uni.vibrateShort({ type: 'light' });
+            }
+        },
+        onTouchEnd() {
+            // 未发生位移
+            if (this.dragIndex === -1) return
+
+            // 0.001是为了解决拖动过快等某些极限场景下位置还原不生效问题
+            if (this.direction === 'horizontal') {
+                this.list[this.dragIndex].x = this.currentPosition.x + 0.001;
+            } else if (this.direction === 'vertical' || this.direction === 'all') {
+                this.list[this.dragIndex].y = this.currentPosition.y + 0.001;
+                this.list[this.dragIndex].x = this.currentPosition.x + 0.001;
+            }
+
+            // 重置到位置，需要延迟触发动，否则无效。
+            sleep(50).then(() => {
+                this.updatePositions();
+                if (this.sortChanged) {
+                    this.$emit('drag-end', [...this.list]);
+                    this.sortChanged = false;
+                }
+                this.timer = setTimeout(() => {
+                    this.dragIndex = -1
+                }, 600)
+            });
+        }
+    },
+    watch: {
+        initialList: {
+            handler() {
+                this.$nextTick(() => {
+                    this.initList();
+                });
+            },
+            // deep: true
+        },
+        direction: {
+            handler() {
+                this.$nextTick(() => {
+                    this.initList();
+                    this.calculateItemSize();
+                    this.calculateAreaSize();
+                });
+            }
+        },
+        columns: {
+            handler() {
+                if (this.direction === 'all') {
+                    this.$nextTick(() => {
+                        this.initList();
+                        this.updatePositions();
+                    });
+                }
+            }
+        }
+    }
+};
+</script>
+
+<style scoped lang="scss">
+.u-dragsort {
+    width: 100%;
+    height: auto;
+
+    .u-dragsort-area {
+        width: 100%;
+        height: 100%;
+        position: relative;
+    }
+
+    .u-dragsort-item {
+        position: absolute;
+        width: 100%;
+        transition: box-shadow 0.45s ease-out;
+        cursor: pointer;
+
+        &.dragging {
+            z-index: 1000;
+            box-shadow: 0 6px 20px rgba(0, 0, 0, 0.15);
+        }
+
+        .u-dragsort-item-content {
+            position: relative;
+            padding: 0;
+            box-sizing: border-box;
+        }
+    }
+
+    &.u-dragsort--vertical {
+        .u-dragsort-item {
+            height: auto;
+        }
+    }
+
+    &.u-dragsort--horizontal {
+        .u-dragsort-area {
+            display: flex;
+            white-space: nowrap;
+        }
+
+        .u-dragsort-item {
+            width: auto;
+            height: auto;
+        }
+    }
+
+    &.u-dragsort--all {
+        .u-dragsort-item {
+            width: auto;
+            height: auto;
+        }
+    }
+}
+</style>
diff --git a/uview-plus/components/u-dropdown-item/u-dropdown-item.vue b/uview-plus/components/u-dropdown-item/u-dropdown-item.vue
index ec15a06..461e272 100644
--- a/uview-plus/components/u-dropdown-item/u-dropdown-item.vue
+++ b/uview-plus/components/u-dropdown-item/u-dropdown-item.vue
@@ -28,7 +28,7 @@
 	/**
 	 * dropdown-item 下拉菜单
 	 * @description 该组件一般用于向下展开菜单，同时可切换多个选项卡的场景
-	 * @tutorial https://ijry.github.io/uview-plus/components/dropdown.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/dropdown.html
 	 * @property {String | Number} v-model 双向绑定选项卡选择值
 	 * @property {String} title 菜单项标题
 	 * @property {Array[Object]} options 选项数据，如果传入了默认slot，此参数无效
@@ -114,7 +114,6 @@
 </script>
 
 <style scoped lang="scss">
-	@import "../../libs/css/components.scss";
     .u-dropdown-item__scroll {
         background: #ffffff;
     }
diff --git a/uview-plus/components/u-dropdown/u-dropdown.vue b/uview-plus/components/u-dropdown/u-dropdown.vue
index 02964bc..4663178 100644
--- a/uview-plus/components/u-dropdown/u-dropdown.vue
+++ b/uview-plus/components/u-dropdown/u-dropdown.vue
@@ -8,24 +8,24 @@
 			<view class="u-dropdown__menu__item" v-for="(item, index) in menuList" :key="index" @tap.stop="menuClick(index)">
 				<view class="u-flex u-flex-row">
 					<text class="u-dropdown__menu__item__text" :style="{
-						color: item.disabled ? '#c0c4cc' : (index === current || highlightIndex == index) ? activeColor : inactiveColor,
+						color: item.disabled ? '#c0c4cc' : (index === current || highlightIndexList.includes(index)) ? activeColor : inactiveColor,
 						fontSize: addUnit(titleSize)
 					}">{{item.title}}</text>
 					<view class="u-dropdown__menu__item__arrow" :class="{
 						'u-dropdown__menu__item__arrow--rotate': index === current
 					}">
-						<u-icon :custom-style="{display: 'flex'}" :name="menuIcon" :size="addUnit(menuIconSize)" :color="index === current || highlightIndex == index ? activeColor : '#c0c4cc'"></u-icon>
+						<up-icon :custom-style="{display: 'flex'}" :name="menuIcon" :size="addUnit(menuIconSize)" :color="index === current || highlightIndexList.includes(index) ? activeColor : '#c0c4cc'"></up-icon>
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="u-dropdown__content" :style="[contentStyle, {
-			transition: `opacity ${duration / 1000}s linear`,
-			top: addUnit(height),
-			height: contentHeight + 'px'
+			transition: `opacity ${duration / 1000}s, z-index ${duration / 1000}s linear`,
+			top: addUnit(height)
 		}]"
 		 @tap="maskClick" @touchmove.stop.prevent>
-			<view @tap.stop.prevent class="u-dropdown__content__popup" :style="[popupStyle]">
+			<view @tap.stop.prevent class="u-dropdown__content__popup" :style="[popupStyle, {
+			}]">
 				<slot></slot>
 			</view>
 			<view class="u-dropdown__content__mask"></view>
@@ -37,11 +37,11 @@
     import { props } from './props';
     import { mpMixin } from '../../libs/mixin/mpMixin';
 	import { mixin } from '../../libs/mixin/mixin';
-	import { addUnit, sys} from '../../libs/function/index';
+	import { addUnit, getWindowInfo} from '../../libs/function/index';
 	/**
 	 * dropdown 下拉菜单
 	 * @description 该组件一般用于向下展开菜单，同时可切换多个选项卡的场景
-	 * @tutorial https://ijry.github.io/uview-plus/components/dropdown.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/dropdown.html
 	 * @property {String} active-color 标题和选项卡选中的颜色（默认#2979ff）
 	 * @property {String} inactive-color 标题和选项卡未选中的颜色（默认#606266）
 	 * @property {Boolean} close-on-click-mask 点击遮罩是否关闭菜单（默认true）
@@ -71,8 +71,8 @@
 					zIndex: -1,
 					opacity: 0
 				},
-				// 让某个菜单保持高亮的状态
-				highlightIndex: 99999,
+				// 让某些菜单保持高亮的状态
+				highlightIndexList: [],
 				contentHeight: 0
 			}
 		},
@@ -129,6 +129,7 @@
 				// 展开时，设置下拉内容的样式
 				this.contentStyle = {
 					zIndex: 11,
+					height: this.contentHeight + 'px'
 				}
 				// 标记展开状态以及当前展开项的索引
 				this.active = true;
@@ -147,10 +148,11 @@
 				this.active = false;
 				this.current = 99999;
 				// 下拉内容的样式进行调整，不透明度设置为0
-				this.contentStyle = {
-					zIndex: -1,
-					opacity: 0
-				}
+				this.contentStyle.zIndex = -1;
+				this.contentStyle.opacity = 0;
+				setTimeout(() => {
+					this.contentStyle.height = 0;
+				}, this.duration)
 			},
 			// 点击遮罩
 			maskClick() {
@@ -158,16 +160,20 @@
 				if (!this.closeOnClickMask) return;
 				this.close();
 			},
-			// 外部手动设置某个菜单高亮
-			highlight(index = undefined) {
-				this.highlightIndex = index !== undefined ? index : 99999;
+			// 外部手动设置某些菜单高亮
+			highlight(indexParams = undefined) {
+                if (Array.isArray(indexParams)) {
+                    this.highlightIndexList = [...indexParams];
+                    return;
+                }
+				this.highlightIndexList = indexParams !== undefined ? [indexParams] : [];
 			},
 			// 获取下拉菜单内容的高度
 			getContentHeight() {
 				// 这里的原理为，因为dropdown组件是相对定位的，它的下拉出来的内容，必须给定一个高度
 				// 才能让遮罩占满菜单一下，直到屏幕底部的高度
-				// sys()为uview-plus封装的获取设备信息的方法
-				let windowHeight = sys().windowHeight;
+				// getWindowInfo()为uview-plus封装的获取设备信息的方法
+				let windowHeight = getWindowInfo().windowHeight;
 				this.$uGetRect('.u-dropdown__menu').then(res => {
 					// 这里获取的是dropdown的尺寸，在H5上，uniapp获取尺寸是有bug的(以前提出修复过，后来又出现了此bug，目前hx2.8.11版本)
 					// H5端bug表现为元素尺寸的top值为导航栏底部到到元素的上边沿的距离，但是元素的bottom值确是导航栏顶部到元素底部的距离
@@ -181,7 +187,6 @@
 </script>
 
 <style scoped lang="scss">
-	@import "../../libs/css/components.scss";
 
 	.u-dropdown {
 		flex: 1;
diff --git a/uview-plus/components/u-empty/empty.js b/uview-plus/components/u-empty/empty.js
index fe20445..c5009a2 100644
--- a/uview-plus/components/u-empty/empty.js
+++ b/uview-plus/components/u-empty/empty.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:03:27
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/empty.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/empty.js
  */
 export default {
     // empty组件
diff --git a/uview-plus/components/u-empty/u-empty.vue b/uview-plus/components/u-empty/u-empty.vue
index f83677f..f740663 100644
--- a/uview-plus/components/u-empty/u-empty.vue
+++ b/uview-plus/components/u-empty/u-empty.vue
@@ -4,13 +4,13 @@
 	    :style="[emptyStyle]"
 	    v-if="show"
 	>
-		<u-icon
+		<up-icon
 		    v-if="!isSrc"
 		    :name="mode === 'message' ? 'chat' : `empty-${mode}`"
 		    :size="iconSize"
 		    :color="iconColor"
 		    margin-top="14"
-		></u-icon>
+		></up-icon>
 		<image
 		    v-else
 		    :style="{
@@ -35,10 +35,11 @@
 	import { mpMixin } from '../../libs/mixin/mpMixin';
 	import { mixin } from '../../libs/mixin/mixin';
 	import { addUnit, addStyle, deepMerge } from '../../libs/function/index';
+	import { t } from '../../libs/i18n'
 	/**
 	 * empty 内容为空
 	 * @description 该组件用于需要加载内容，但是加载的第一页数据就为空，提示一个"没有内容"的场景， 我们精心挑选了十几个场景的图标，方便您使用。
-	 * @tutorial https://ijry.github.io/uview-plus/components/empty.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/empty.html
 	 * @property {String}			icon		内置图标名称，或图片路径，建议绝对路径
 	 * @property {String}			text		提示文字
 	 * @property {String}			textColor	文字颜色 (默认 '#c0c4cc' )
@@ -62,21 +63,21 @@
 		data() {
 			return {
 				icons: {
-					car: '购物车为空',
-					page: '页面不存在',
-					search: '没有搜索结果',
-					address: '没有收货地址',
-					wifi: '没有WiFi',
-					order: '订单为空',
-					coupon: '没有优惠券',
-					favor: '暂无收藏',
-					permission: '无权限',
-					history: '无历史记录',
-					news: '无新闻列表',
-					message: '消息列表为空',
-					list: '列表为空',
-					data: '数据为空',
-					comment: '暂无评论',
+					car: t("up.empty.car"),
+					page: t("up.empty.page"),
+					search: t("up.empty.search"),
+					address: t("up.empty.address"),
+					wifi: t("up.empty.wifi"),
+					order: t("up.empty.order"),
+					coupon: t("up.empty.coupon"),
+					favor: t("up.empty.favor"),
+					permission: t("up.empty.permission"),
+					history: t("up.empty.history"),
+					news: t("up.empty.news"),
+					message: t("up.empty.message"),
+					list: t("up.empty.list"),
+					data: t("up.empty.data"),
+					comment: t("up.empty.comment"),
 				}
 			}
 		},
@@ -107,7 +108,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import '../../libs/css/components.scss';
 	$u-empty-text-margin-top:20rpx !default;
 	$u-empty-slot-margin-top:20rpx !default;
 
diff --git a/uview-plus/components/u-float-button/u-float-button.vue b/uview-plus/components/u-float-button/u-float-button.vue
index e23064e..4ffc32b 100644
--- a/uview-plus/components/u-float-button/u-float-button.vue
+++ b/uview-plus/components/u-float-button/u-float-button.vue
@@ -9,6 +9,7 @@
         <view class="u-float-button__main" @click="clickHandler" :style="{
             backgroundColor: backgroundColor,
             color: color,
+			display: 'flex',
             flexDirection: 'row',
             justifyContent: 'center',
             alignItems: 'center',
@@ -24,10 +25,11 @@
                 bottom: height
             }">
                 <slot name="list">
-                    <template v-for="item in list">
+                    <template :key="index" v-for="(item, index) in list">
                         <view class="u-float-button__item" :style="{
                             backgroundColor: item?.backgroundColor ? item?.backgroundColor : backgroundColor,
                             color: item?.color ? item?.color : color,
+							display: 'flex',
                             flexDirection: 'row',
                             justifyContent: 'center',
                             alignItems: 'center',
@@ -52,7 +54,7 @@ import { addStyle, addUnit, deepMerge } from '../../libs/function/index';
 /**
  * FloatButton 悬浮按钮
  * @description 悬浮按钮常用于屏幕右下角点击展开的操作菜单
- * @tutorial https://ijry.github.io/uview-plus/components/floatButton.html
+ * @tutorial https://uview-plus.jiangruyi.com/components/floatButton.html
  * @property {String}                backgroundColor      背景颜色
  * @event {Function} click  点击触发事件
  * @example <up-float-button></up-float-button>
@@ -147,8 +149,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../../libs/css/components.scss';
-
 .u-float-button {
     z-index: 999;
     .show-list {
diff --git a/uview-plus/components/u-form-item/formItem.js b/uview-plus/components/u-form-item/formItem.js
index 5afc562..2113cc9 100644
--- a/uview-plus/components/u-form-item/formItem.js
+++ b/uview-plus/components/u-form-item/formItem.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:04:32
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/formItem.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/formItem.js
  */
 export default {
     // formItem 组件
diff --git a/uview-plus/components/u-form-item/u-form-item.vue b/uview-plus/components/u-form-item/u-form-item.vue
index c763ca7..79c6d96 100644
--- a/uview-plus/components/u-form-item/u-form-item.vue
+++ b/uview-plus/components/u-form-item/u-form-item.vue
@@ -1,10 +1,10 @@
 <template>
-	<view class="u-form-item" :class="{'u-form-item--error':(!!message && parentData.errorType === 'message')}">
+	<view class="u-form-item" :class="{'u-form-item--error':(!!message && parentData['errorType'] === 'message')}">
 		<view
 			class="u-form-item__body"
 			@tap="clickHandler"
 			:style="[addStyle(customStyle), {
-                flexDirection: (labelPosition || parentData.labelPosition) === 'left' ? 'row' : 'column'
+                flexDirection: (labelPosition || parentData['labelPosition']) === 'left' ? 'row' : 'column'
 			}]"
 		>
 			<!-- 微信小程序中，将一个参数设置空字符串，结果会变成字符串"true" -->
@@ -12,10 +12,10 @@
 				<!-- {{required}} -->
 				<view
 					class="u-form-item__body__left"
-					v-if="required || leftIcon || label"
+					v-if="required || leftIcon != '' || label != ''"
 					:style="{
-						width: addUnit(labelWidth || parentData.labelWidth),
-						marginBottom: parentData.labelPosition === 'left' ? 0 : '5px',
+						width: addUnit(labelWidth || parentData['labelWidth']),
+						marginBottom: (labelPosition || parentData['labelPosition']) === 'left' ? 0 : '5px',
 					}"
 				>
 					<!-- 为了块对齐 -->
@@ -29,15 +29,15 @@
 							class="u-form-item__body__left__content__icon"
 							v-if="leftIcon"
 						>
-							<u-icon
+							<up-icon
 								:name="leftIcon"
 								:custom-style="leftIconStyle"
-							></u-icon>
+							></up-icon>
 						</view>
 						<text
 							class="u-form-item__body__left__content__label"
 							:style="[parentData.labelStyle, {
-								justifyContent: parentData.labelAlign === 'left' ? 'flex-start' : parentData.labelAlign === 'center' ? 'center' : 'flex-end'
+								justifyContent: parentData['labelAlign'] === 'left' ? 'flex-start' : parentData['labelAlign'] === 'center' ? 'center' : 'flex-end'
 							}]"
 						>{{ label }}</text>
 					</view>
@@ -50,7 +50,7 @@
 					</view>
 					<view
 						class="item__body__right__content__icon"
-						v-if="$slots.right"
+						v-if="$slots['right']"
 					>
 						<slot name="right" />
 					</view>
@@ -59,17 +59,17 @@
 		</view>
 		<slot name="error">
 			<text
-				v-if="!!message && parentData.errorType === 'message'"
+				v-if="!!message && parentData['errorType'] === 'message'"
 				class="u-form-item__body__right__message"
 				:style="{
-					marginLeft:  addUnit(parentData.labelPosition === 'top' ? 0 : (labelWidth || parentData.labelWidth))
+					marginLeft:  addUnit((labelPosition || parentData['labelPosition']) === 'top' ? 0 : (labelWidth || parentData['labelWidth']))
 				}"
 			>{{ message }}</text>
 		</slot>
 		<u-line
 			v-if="borderBottom"
-			:color="message && parentData.errorType === 'border-bottom' ? color.error : propsLine.color"
-			:customStyle="`margin-top: ${message && parentData.errorType === 'message' ? '5px' : 0}`"
+			:color="message && parentData['errorType'] === 'border-bottom' ? color['error'] : propsLine['color']"
+			:customStyle="`margin-top: ${message && parentData['errorType'] === 'message' ? '5px' : 0}`"
 		></u-line>
 	</view>
 </template>
@@ -84,7 +84,7 @@
 	/**
 	 * Form 表单
 	 * @description 此组件一般用于表单场景，可以配置Input输入框，Select弹出框，进行表单验证等。
-	 * @tutorial https://ijry.github.io/uview-plus/components/form.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/form.html
 	 * @property {String}			label			input的label提示语
 	 * @property {String}			prop			绑定的值
 	 * @property {Array}			rules			绑定的规则
@@ -98,7 +98,7 @@
 	 * @example <u-form-item label="姓名" prop="userInfo.name" borderBottom ref="item1"></u-form-item>
 	 */
 	export default {
-		name: 'u-form-item',
+		name: 'up-form-item',
 		mixins: [mpMixin, mixin, props],
 		data() {
 			return {
@@ -127,7 +127,9 @@
 			}
 		},
 		mounted() {
-			this.init()
+			this.$nextTick(() => {
+				this.init()
+			})
 		},
 		emits: ["click"],
 		watch: {
@@ -146,7 +148,7 @@
 				// 父组件的实例
 				this.updateParentData()
 				if (!this.parent) {
-					error('u-form-item需要结合u-form组件使用')
+					error('u-form-item需要结合up-form组件使用')
 				}
 			},
 			// 手动设置校验的规则，如果规则中有函数的话，微信小程序中会过滤掉，所以只能手动调用设置规则
@@ -161,7 +163,7 @@
 			// 获取父组件的参数
 			updateParentData() {
 				// 此方法写在mixin中
-				this.getParentData('u-form');
+				this.getParentData('up-form');
 			},
 			// 移除u-form-item的校验结果
 			clearValidate() {
@@ -170,9 +172,9 @@
 			// 清空当前的组件的校验结果，并重置为初始值
 			resetField() {
 				// 找到原始值
-				const value = getProperty(this.parent.originalModel, this.prop)
-				// 将u-form的model的prop属性链还原原始值
-				setProperty(this.parent.model, this.prop, value)
+				const value = getProperty(this.parent.$data['originalModel'], this.prop)
+				// 将up-form的model的prop属性链还原原始值
+				setProperty(this.parent.$props['model'], this.prop, value)
 				// 移除校验结果
 				this.message = null
 			},
@@ -185,7 +187,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-form-item {
 		@include flex(column);
@@ -240,10 +241,8 @@
 
 					&__slot {
 						flex: 1;
-						/* #ifndef MP */
 						@include flex;
 						align-items: center;
-						/* #endif */
 					}
 
 					&__icon {
diff --git a/uview-plus/components/u-form/form.js b/uview-plus/components/u-form/form.js
index 204d845..6671b09 100644
--- a/uview-plus/components/u-form/form.js
+++ b/uview-plus/components/u-form/form.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:03:49
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/form.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/form.js
  */
 export default {
     // form 组件
diff --git a/uview-plus/components/u-form/u-form.vue b/uview-plus/components/u-form/u-form.vue
index bcbdb9f..133b6bf 100644
--- a/uview-plus/components/u-form/u-form.vue
+++ b/uview-plus/components/u-form/u-form.vue
@@ -16,7 +16,7 @@
 	/**
 	 * Form 表单
 	 * @description 此组件一般用于表单场景，可以配置Input输入框，Select弹出框，进行表单验证等。
-	 * @tutorial https://ijry.github.io/uview-plus/components/form.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/form.html
 	 * @property {Object}						model			当前form的需要验证字段的集合
 	 * @property {Object | Function | Array}	rules			验证规则
 	 * @property {String}						errorType		错误的提示方式，见上方说明 ( 默认 message )
@@ -25,10 +25,10 @@
 	 * @property {String | Number}				labelWidth		提示文字的宽度，单位px  ( 默认 45 ）
 	 * @property {String}						labelAlign		lable字体的对齐方式   ( 默认 ‘left' ）
 	 * @property {Object}						labelStyle		lable的样式，对象形式
-	 * @example <up-formlabelPosition="left" :model="model1" :rules="rules" ref="form1"></up-form>
+	 * @example <up-form labelPosition="left" :model="model1" :rules="rules" ref="form1"></up-form>
 	 */
 	export default {
-		name: "u-form",
+		name: "up-form",
 		mixins: [mpMixin, mixin, props],
 		provide() {
 			return {
@@ -126,7 +126,7 @@
 				});
 			},
 			// 对部分表单字段进行校验
-			async validateField(value, callback, event = null) {
+			async validateField(value, callback, event = null,options) {
 				// $nextTick是必须的，否则model的变更，可能会延后于此方法的执行
 				this.$nextTick(() => {
 					// 校验错误信息，返回给回调方法，用于存放所有form-item的错误信息
@@ -191,9 +191,11 @@
 												errorsRes.push(...errors);
 												childErrors.push(...errors);
 											}
-											child.message =
-												childErrors[0]?.message ? childErrors[0].message : null;
-
+											//没有配置，或者配置了showErrorMsg为true时候，才修改子组件message，默认没有配置
+											if(!options||options?.showErrorMsg==true){
+												child.message =
+													childErrors[0]?.message ? childErrors[0].message : null;
+											}
 											if (i == (rules.length - 1)) {
 												resolve(errorsRes)
 											}
@@ -217,8 +219,12 @@
 						});
 				});
 			},
-			// 校验全部数据
-			validate(callback) {
+			/**
+			 * 校验全部数据
+			 * @param {Object} options
+			 * @param {Boolean} options.showErrorMsg -是否显示校验信息，
+			 */
+			validate(options) {
 				// 开发环境才提示，生产环境不会提示
 				if (process.env.NODE_ENV === 'development' && Object.keys(this.formRules).length === 0) {
 					error('未设置rules，请看文档说明！如果已经设置，请刷新页面。');
@@ -240,7 +246,7 @@
 							} else {
 								resolve(true)
 							}
-						});
+						},null,options);
 					});
 				});
 			},
diff --git a/uview-plus/components/u-gap/gap.js b/uview-plus/components/u-gap/gap.js
index 60a21af..07dd2dc 100644
--- a/uview-plus/components/u-gap/gap.js
+++ b/uview-plus/components/u-gap/gap.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:05:25
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/gap.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/gap.js
  */
 export default {
     // gap组件
diff --git a/uview-plus/components/u-gap/u-gap.vue b/uview-plus/components/u-gap/u-gap.vue
index 36863a5..1debaaa 100644
--- a/uview-plus/components/u-gap/u-gap.vue
+++ b/uview-plus/components/u-gap/u-gap.vue
@@ -10,7 +10,7 @@
 	/**
 	 * gap 间隔槽
 	 * @description 该组件一般用于内容块之间的用一个灰色块隔开的场景，方便用户风格统一，减少工作量
-	 * @tutorial https://ijry.github.io/uview-plus/components/gap.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/gap.html
 	 * @property {String}			bgColor			背景颜色 （默认 'transparent' ）
 	 * @property {String | Number}	height			分割槽高度，单位px （默认 20 ）
 	 * @property {String | Number}	marginTop		与前一个组件的距离，单位px（ 默认 0 ）
@@ -37,5 +37,4 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 </style>
diff --git a/uview-plus/components/u-goods-sku/u-goods-sku.vue b/uview-plus/components/u-goods-sku/u-goods-sku.vue
new file mode 100644
index 0000000..dbb5c2a
--- /dev/null
+++ b/uview-plus/components/u-goods-sku/u-goods-sku.vue
@@ -0,0 +1,434 @@
+<template>
+    <view class="up-goods-sku"> 
+        <view @click="open">
+            <slot name="trigger"></slot>
+        </view>
+        <up-popup
+            v-model:show="show"
+            mode="bottom"
+            :closeable="pageInline ? false : closeable"
+            :pageInline="pageInline"
+            :border-radius="20"
+            @close="close"
+        >
+            <view class="up-goods-sku-container" :style="{padding: pageInline ? '0px' : ''}">
+                <view class="up-goods-sku__header">
+                    <slot name="header">
+                        <view class="up-goods-sku__header__image">
+                            <image :src="goodsInfo.image || goodsInfo.picture" mode="aspectFill"></image>
+                        </view>
+                        <view class="up-goods-sku__header__info">
+                            <view class="up-goods-sku__header__info__price">
+                                <text class="up-goods-sku__header__info__price__symbol">¥</text>
+                                <text class="up-goods-sku__header__info__price__value">{{ price }}</text>
+                            </view>
+                            <view class="up-goods-sku__header__info__stock">{{ t('up.goodsSku.stock') }} {{ stock }} {{ t('up.goodsSku.amount') }}</view>
+                            <view class="up-goods-sku__header__info__selected">{{ t('up.goodsSku.choosed') }}: {{ selectedSkuText }}</view>
+                        </view>
+                    </slot>
+                </view>
+                
+                <scroll-view class="up-goods-sku__content" scroll-y>
+                    <view v-for="(treeItem, index) in skuTree" :key="index" class="up-goods-sku__content__item">
+                        <view class="up-goods-sku__content__item__title">{{ treeItem.label }}</view>
+                        <view class="up-goods-sku__content__item__list">
+                            <view 
+                                v-for="(leafItem, leafIndex) in treeItem.children" 
+                                :key="leafIndex"
+                                class="up-goods-sku__content__item__list__item"
+                                :class="{
+                                    'up-goods-sku__content__item__list__item--active': isSelected(treeItem.name, leafItem.id),
+                                    'up-goods-sku__content__item__list__item--disabled': isDisabled(treeItem.name, leafItem.id)
+                                }"
+                                @click="onSkuClick(treeItem.name, leafItem)"
+                            >
+                                <text>{{ leafItem.name }}</text>
+                            </view>
+                        </view>
+                    </view>
+                    
+                    <view class="up-goods-sku__content__count">
+                        <view class="up-goods-sku__content__count__title">{{ t('up.goodsSku.buyAmount') }}</view>
+                        <view class="up-goods-sku__content__count__control">
+                            <up-number-box 
+                                v-model="buyNum" 
+                                :min="1" 
+                                :max="maxBuyNum"
+                                :disabled="!canBuy"
+                                @change="onNumChange"
+                            ></up-number-box>
+                        </view>
+                    </view>
+                </scroll-view>
+                
+                <view class="up-goods-sku__footer">
+                    <up-button 
+                        type="primary" 
+                        :disabled="!canBuy" 
+                        @click="onConfirm"
+                    >
+                        {{ confirmText }}
+                    </up-button>
+                </view>
+            </view>
+        </up-popup>
+    </view>
+</template>
+
+<script>
+	import { t } from '../../libs/i18n'
+	export default {
+		name: 'up-goods-sku',
+		props: {
+			// 商品信息
+			goodsInfo: {
+				type: Object,
+				default: () => ({})
+			},
+			// SKU树形结构
+			skuTree: {
+				type: Array,
+				default: () => []
+			},
+			// SKU列表
+			skuList: {
+				type: Array,
+				default: () => []
+			},
+			// 最大购买数量
+			maxBuy: {
+				type: Number,
+				default: 999
+			},
+			// 确认按钮文字
+			confirmText: {
+				type: String,
+				default: '确定'
+			},
+            // 是否显示关闭弹窗按钮
+            closeable: {
+				type: Boolean,
+				default: true
+			},
+            // 是否页面内联模式
+            pageInline: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+                show: false,
+				// 已选择的SKU
+				selectedSku: {},
+				// 购买数量
+				buyNum: 1
+			}
+		},
+		computed: {
+			// 当前价格
+			price() {
+				const selectedSkuComb = this.getSelectedSkuComb()
+				if (selectedSkuComb) {
+					return selectedSkuComb.price || selectedSkuComb.price_fee
+				}
+				return this.goodsInfo.price || this.goodsInfo.price_fee || 0
+			},
+			// 当前库存
+			stock() {
+				const selectedSkuComb = this.getSelectedSkuComb()
+				if (selectedSkuComb) {
+					return selectedSkuComb.stock || selectedSkuComb.quantity
+				}
+				return this.goodsInfo.stock || this.goodsInfo.quantity || 0
+			},
+			// 最大购买数量
+			maxBuyNum() {
+				const stock = this.stock
+				return stock > this.maxBuy ? this.maxBuy : stock
+			},
+			// 是否可以购买
+			canBuy() {
+				const selectedSkuCount = Object.keys(this.selectedSku).length
+				const skuTreeCount = this.skuTree.length
+				return selectedSkuCount === skuTreeCount && this.buyNum > 0 && this.stock > 0
+			},
+			// 已选SKU文字描述
+			selectedSkuText() {
+				const selected = []
+				Object.keys(this.selectedSku).forEach(key => {
+					const value = this.selectedSku[key]
+					if (value) {
+						this.skuTree.forEach(treeItem => {
+							if (treeItem.name === key) {
+								treeItem.children.forEach(leafItem => {
+									if (leafItem.id === value) {
+										selected.push(leafItem.name)
+									}
+								})
+							}
+						})
+					}
+				})
+				return selected.join(', ')
+			}
+		},
+		watch: {
+		},
+        emits: ['open', 'confirm', 'close'],
+        created() {
+            if (this.pageInline) {
+                this.show = true;
+            }
+		},
+		methods: {
+			t,
+			// 判断SKU是否被选中
+			isSelected(skuKey, skuValueId) {
+				return this.selectedSku[skuKey] === skuValueId
+			},
+			// 判断SKU是否禁用
+			isDisabled(skuKey, skuValueId) {
+				// 构造一个临时的已选中SKU对象
+				const tempSelected = { ...this.selectedSku, [skuKey]: skuValueId }
+				
+				// 检查是否还有未选择的SKU维度
+				const selectedCount = Object.keys(tempSelected).filter(key => tempSelected[key]).length
+				const totalSkuCount = this.skuTree.length
+				
+				// 如果所有SKU都已选择，则检查组合是否存在
+				if (selectedCount === totalSkuCount) {
+					return !this.getSkuComb(tempSelected)
+				}
+				
+				// 检查当前选择的SKU是否会导致无法组成有效组合
+				for (let i = 0; i < this.skuList.length; i++) {
+					const sku = this.skuList[i]
+					let match = true
+					
+					// 检查已选中的SKU是否匹配
+					for (const key in tempSelected) {
+						if (tempSelected[key] && sku[key] !== tempSelected[key]) {
+							match = false
+							break
+						}
+					}
+					
+					if (match) {
+						return false
+					}
+				}
+				
+				return true
+			},
+			// SKU点击事件
+			onSkuClick(skuKey, skuValue) {
+				// 如果是禁用状态，直接返回
+				if (this.isDisabled(skuKey, skuValue.id)) {
+					return
+				}
+				
+				// 如果已选中，则取消选中
+				if (this.selectedSku[skuKey] === skuValue.id) {
+					this.$set(this.selectedSku, skuKey, '')
+				} else {
+					this.$set(this.selectedSku, skuKey, skuValue.id)
+				}
+			},
+			// 数量改变事件
+			onNumChange(e) {
+				this.buyNum = e.value
+			},
+			// 获取选中的SKU组合
+			getSelectedSkuComb() {
+				return this.getSkuComb(this.selectedSku)
+			},
+			// 根据已选SKU获取组合信息
+			getSkuComb(selectedSku) {
+				const selected = { ...selectedSku }
+				
+				// 过滤掉空值
+				Object.keys(selected).forEach(key => {
+					if (!selected[key]) {
+						delete selected[key]
+					}
+				})
+				
+				// 检查是否所有SKU都已选择
+				if (Object.keys(selected).length !== this.skuTree.length) {
+					return null
+				}
+				
+				// 查找匹配的SKU组合
+				for (let i = 0; i < this.skuList.length; i++) {
+					const sku = this.skuList[i]
+					let match = true
+					
+					for (const key in selected) {
+						if (sku[key] !== selected[key]) {
+							match = false
+							break
+						}
+					}
+					
+					if (match) {
+						return sku
+					}
+				}
+				
+				return null
+			},
+			// 重置选择
+			reset() {
+				this.selectedSku = {}
+				this.buyNum = 1
+			},
+            open() {
+                this.show = true;
+                this.$emit('open')
+            },
+			// 关闭弹窗
+			close() {
+                this.false = true;
+				this.$emit('close')
+			},
+			// 确认选择
+			onConfirm() {
+				if (!this.canBuy) {
+					return
+				}
+				
+				const selectedSkuComb = this.getSelectedSkuComb()
+				this.$emit('confirm', {
+					sku: selectedSkuComb,
+					goodsInfo: this.goodsInfo,
+					num: this.buyNum,
+					selectedText: this.selectedSkuText
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.up-goods-sku {
+		background-color: #fff;
+		overflow: hidden;
+
+        .up-goods-sku-container {
+            padding: 4rpx 30rpx;
+        }
+		
+		&__header {
+			display: flex;
+            flex-direction: row;
+			padding: 30rpx 0;
+			position: relative;
+			
+			&__image {
+				width: 180rpx;
+				height: 180rpx;
+				border-radius: 10rpx;
+				overflow: hidden;
+				margin-right: 20rpx;
+				
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+			
+			&__info {
+				flex: 1;
+				
+				&__price {
+					display: flex;
+                    flex-direction: row;
+					align-items: baseline;
+					margin-bottom: 20rpx;
+					
+					&__symbol {
+						font-size: 24rpx;
+						color: #fa3534;
+						margin-right: 4rpx;
+					}
+					
+					&__value {
+						font-size: 36rpx;
+						color: #fa3534;
+						font-weight: bold;
+					}
+				}
+				
+				&__stock {
+					font-size: 26rpx;
+					color: #999;
+					margin-bottom: 20rpx;
+				}
+				
+				&__selected {
+					font-size: 26rpx;
+					color: #333;
+				}
+			}
+		}
+		
+		&__content {
+			max-height: 600rpx;
+			padding: 0 30rpx 30rpx 0;
+			
+			&__item {
+				margin-bottom: 30rpx;
+				
+				&__title {
+					font-size: 28rpx;
+					color: #333;
+					margin-bottom: 20rpx;
+				}
+				
+				&__list {
+					display: flex;
+                    flex-direction: row;
+					flex-wrap: wrap;
+					
+					&__item {
+						padding: 10rpx 20rpx;
+						border: 2rpx solid #eee;
+						border-radius: 10rpx;
+						margin-right: 20rpx;
+						margin-bottom: 20rpx;
+						font-size: 26rpx;
+						color: #333;
+						
+						&--active {
+							border-color: #fa3534;
+							color: #fa3534;
+						}
+						
+						&--disabled {
+							color: #ccc;
+							border-color: #eee;
+						}
+					}
+				}
+			}
+			
+			&__count {
+				display: flex;
+                flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				margin-top: 20rpx;
+				
+				&__title {
+					font-size: 28rpx;
+					color: #333;
+				}
+			}
+		}
+		
+		&__footer {
+			padding: 20rpx 0rpx 40rpx 0;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uview-plus/components/u-grid-item/gridItem.js b/uview-plus/components/u-grid-item/gridItem.js
index 1b747f4..7aff5c6 100644
--- a/uview-plus/components/u-grid-item/gridItem.js
+++ b/uview-plus/components/u-grid-item/gridItem.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:06:13
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/gridItem.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/gridItem.js
  */
 export default {
     // grid-item组件
diff --git a/uview-plus/components/u-grid-item/u-grid-item.vue b/uview-plus/components/u-grid-item/u-grid-item.vue
index 43c5ce7..cff7bd2 100644
--- a/uview-plus/components/u-grid-item/u-grid-item.vue
+++ b/uview-plus/components/u-grid-item/u-grid-item.vue
@@ -33,7 +33,7 @@
 	/**
 	 * gridItem 提示
 	 * @description 宫格组件一般用于同时展示多个同类项目的场景，可以给宫格的项目设置徽标组件(badge)，或者图标等，也可以扩展为左右滑动的轮播形式。搭配u-grid使用
-	 * @tutorial https://ijry.github.io/uview-plus/components/grid.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/grid.html
 	 * @property {String | Number}	name		宫格的name ( 默认 null )
 	 * @property {String}			bgColor		宫格的背景颜色 （默认 'transparent' ）
 	 * @property {Object}			customStyle	自定义样式，对象形式
@@ -172,7 +172,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
       $u-grid-item-hover-class-opcatiy:.5 !default;
       $u-grid-item-margin-top:1rpx !default;
       $u-grid-item-border-right-width:0.5px !default;
diff --git a/uview-plus/components/u-grid/grid.js b/uview-plus/components/u-grid/grid.js
index 60abeb7..b98f802 100644
--- a/uview-plus/components/u-grid/grid.js
+++ b/uview-plus/components/u-grid/grid.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:05:57
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/grid.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/grid.js
  */
 export default {
     // grid组件
diff --git a/uview-plus/components/u-grid/u-grid.vue b/uview-plus/components/u-grid/u-grid.vue
index fd23002..ec945fc 100644
--- a/uview-plus/components/u-grid/u-grid.vue
+++ b/uview-plus/components/u-grid/u-grid.vue
@@ -16,7 +16,7 @@
 	/**
 	 * grid 宫格布局
 	 * @description 宫格组件一般用于同时展示多个同类项目的场景，可以给宫格的项目设置徽标组件(badge)，或者图标等，也可以扩展为左右滑动的轮播形式。
-	 * @tutorial https://ijry.github.io/uview-plus/components/grid.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/grid.html
 	 * @property {String | Number}	col			宫格的列数（默认 3 ）
 	 * @property {Boolean}			border		是否显示宫格的边框（默认 false ）
 	 * @property {String}			align		宫格对齐方式，表现为数量少的时候，靠左，居中，还是靠右 （默认 'left' ）
@@ -89,7 +89,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
      $u-grid-width:100% !default;
 	.u-grid {
 		/* #ifdef APP-NVUE */
@@ -106,9 +105,9 @@
 		// 在uni-app中应尽量避免使用flex布局以外的方式,因为nvue/uvue等方案都支持flex布局
 		// 这里使用grid布局使用为目前20240409uni-app在抖音小程序开启virtualHost时有bug，存在事件失效问题。
 		/* #ifndef APP-NVUE */
-		display: grid;
+		display: grid !important;
 		grid-gap: v-bind(gap);
-		grid-template-columns: repeat(v-bind(col), 1fr);
+		grid-template-columns: repeat(v-bind(col), minmax(0, 1fr));
 		/* #endif */
 	}
 </style>
diff --git a/uview-plus/components/u-icon/icon.js b/uview-plus/components/u-icon/icon.js
index 86910f7..b500cc1 100644
--- a/uview-plus/components/u-icon/icon.js
+++ b/uview-plus/components/u-icon/icon.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 18:00:14
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/icon.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/icon.js
  */
 import config from '../../libs/config/config'
 
diff --git a/uview-plus/components/u-icon/icons.js b/uview-plus/components/u-icon/icons.js
index f4d0fe2..20b2fa0 100644
--- a/uview-plus/components/u-icon/icons.js
+++ b/uview-plus/components/u-icon/icons.js
@@ -203,6 +203,7 @@ export default {
     'uicon-empty-list': '\ue68b',
     'uicon-empty-page': '\ue627',
     'uicon-empty-order': '\ue639',
+    'uicon-empty-wifi': '\ue668',
     'uicon-man': '\ue697',
     'uicon-woman': '\ue69c',
     'uicon-man-add': '\ue61c',
diff --git a/uview-plus/components/u-icon/u-icon.vue b/uview-plus/components/u-icon/u-icon.vue
index 38afd79..5d540f6 100644
--- a/uview-plus/components/u-icon/u-icon.vue
+++ b/uview-plus/components/u-icon/u-icon.vue
@@ -1,243 +1,235 @@
 <template>
-	<view
-	    class="u-icon"
-	    @tap="clickHandler"
-	    :class="['u-icon--' + labelPos]"
-	>
-		<image
-		    class="u-icon__img"
-		    v-if="isImg"
-		    :src="name"
-		    :mode="imgMode"
-		    :style="[imgStyle, addStyle(customStyle)]"
-		></image>
-		<text
-		    v-else
-		    class="u-icon__icon"
-		    :class="uClasses"
-		    :style="[iconStyle, addStyle(customStyle)]"
-		    :hover-class="hoverClass"
-		>{{icon}}</text>
-		<!-- 这里进行空字符串判断，如果仅仅是v-if="label"，可能会出现传递0的时候，结果也无法显示 -->
-		<text
-		    v-if="label !== ''" 
-		    class="u-icon__label"
-		    :style="{
-			color: labelColor,
-			fontSize: addUnit(labelSize),
-			marginLeft: labelPos == 'right' ? addUnit(space) : 0,
-			marginTop: labelPos == 'bottom' ? addUnit(space) : 0,
-			marginRight: labelPos == 'left' ? addUnit(space) : 0,
-			marginBottom: labelPos == 'top' ? addUnit(space) : 0,
-		}"
-		>{{ label }}</text>
-	</view>
+  <view class="u-icon" @tap="clickHandler" :class="['u-icon--' + labelPos]">
+    <image
+      class="u-icon__img"
+      v-if="isImg"
+      :src="name"
+      :mode="imgMode"
+      :style="[imgStyle, addStyle(customStyle)]"
+    ></image>
+    <text
+      v-else
+      class="u-icon__icon"
+      :class="uClasses"
+      :style="[iconStyle, addStyle(customStyle)]"
+      :hover-class="hoverClass"
+      >{{ icon }}</text
+    >
+    <!-- 这里进行空字符串判断，如果仅仅是v-if="label"，可能会出现传递0的时候，结果也无法显示 -->
+    <text
+      v-if="label !== ''"
+      class="u-icon__label"
+      :style="{
+        color: labelColor,
+        fontSize: addUnit(labelSize),
+        marginLeft: labelPos == 'right' ? addUnit(space) : 0,
+        marginTop: labelPos == 'bottom' ? addUnit(space) : 0,
+        marginRight: labelPos == 'left' ? addUnit(space) : 0,
+        marginBottom: labelPos == 'top' ? addUnit(space) : 0
+      }"
+      >{{ label }}</text
+    >
+  </view>
 </template>
 
 <script>
-	// #ifdef APP-NVUE
-	// nvue通过weex的dom模块引入字体，相关文档地址如下：
-	// https://weex.apache.org/zh/docs/modules/dom.html#addrule
-	const fontUrl = 'https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf'
-	const domModule = weex.requireModule('dom')
-	domModule.addRule('fontFace', {
-		'fontFamily': "uicon-iconfont",
-		'src': `url('${fontUrl}')`
-	})
-	// #endif
+// 引入图标名称，已经对应的unicode
+import icons from './icons'
+import { props } from './props'
+import config from '../../libs/config/config'
+import { mpMixin } from '../../libs/mixin/mpMixin'
+import { mixin } from '../../libs/mixin/mixin'
+import { addUnit, addStyle } from '../../libs/function/index'
+import fontUtil from './util'
+/**
+ * icon 图标
+ * @description 基于字体的图标集，包含了大多数常见场景的图标。
+ * @tutorial https://uview-plus.jiangruyi.com/components/icon.html
+ * @property {String}			name			图标名称，见示例图标集
+ * @property {String}			color			图标颜色,可接受主题色 （默认 color['u-content-color'] ）
+ * @property {String | Number}	size			图标字体大小，单位px （默认 '16px' ）
+ * @property {Boolean}			bold			是否显示粗体 （默认 false ）
+ * @property {String | Number}	index			点击图标的时候传递事件出去的index（用于区分点击了哪一个）
+ * @property {String}			hoverClass		图标按下去的样式类，用法同uni的view组件的hoverClass参数，详情见官网
+ * @property {String}			customPrefix	自定义扩展前缀，方便用户扩展自己的图标库 （默认 'uicon' ）
+ * @property {String | Number}	label			图标右侧的label文字
+ * @property {String}			labelPos		label相对于图标的位置，只能right或bottom （默认 'right' ）
+ * @property {String | Number}	labelSize		label字体大小，单位px （默认 '15px' ）
+ * @property {String}			labelColor		图标右侧的label文字颜色 （ 默认 color['u-content-color'] ）
+ * @property {String | Number}	space			label与图标的距离，单位px （默认 '3px' ）
+ * @property {String}			imgMode			图片的mode
+ * @property {String | Number}	width			显示图片小图标时的宽度
+ * @property {String | Number}	height			显示图片小图标时的高度
+ * @property {String | Number}	top				图标在垂直方向上的定位 用于解决某些情况下，让图标垂直居中的用途  （默认 0 ）
+ * @property {Boolean}			stop			是否阻止事件传播 （默认 false ）
+ * @property {Object}			customStyle		icon的样式，对象形式
+ * @event {Function} click 点击图标时触发
+ * @event {Function} touchstart 事件触摸时触发
+ * @example <u-icon name="photo" color="#2979ff" size="28"></u-icon>
+ */
+export default {
+  name: 'u-icon',
+  beforeCreate() {
+    if (!fontUtil.params.loaded) {
+      fontUtil.loadFont()
+    }
+  },
+  data() {
+    return {}
+  },
+  emits: ['click'],
+  mixins: [mpMixin, mixin, props],
+  computed: {
+    uClasses() {
+      let classes = []
+      classes.push(this.customPrefix + '-' + this.name)
+      // uview-plus内置图标类名为u-iconfont
+      if (this.customPrefix == 'uicon') {
+        classes.push('u-iconfont')
+      } else {
+        // 不能缺少这一步，否则自定义图标会无效
+        classes.push(this.customPrefix)
+      }
+      // 主题色，通过类配置
+      if (this.color && config.type.includes(this.color)) classes.push('u-icon__icon--' + this.color)
+      // 阿里，头条，百度小程序通过数组绑定类名时，无法直接使用[a, b, c]的形式，否则无法识别
+      // 故需将其拆成一个字符串的形式，通过空格隔开各个类名
+      //#ifdef MP-ALIPAY || MP-TOUTIAO || MP-BAIDU
+      classes = classes.join(' ')
+      //#endif
+      return classes
+    },
+    iconStyle() {
+      let style = {}
+      style = {
+        fontSize: addUnit(this.size),
+        lineHeight: addUnit(this.size),
+        fontWeight: this.bold ? 'bold' : 'normal',
+        // 某些特殊情况需要设置一个到顶部的距离，才能更好的垂直居中
+        top: addUnit(this.top)
+      }
+      if (this.customPrefix !== 'uicon') {
+        style.fontFamily = this.customPrefix
+      }
+      // 非主题色值时，才当作颜色值
+      if (this.color && !config.type.includes(this.color)) style.color = this.color
 
-	// 引入图标名称，已经对应的unicode
-	import icons from './icons'
-	import { props } from './props';
-	import { mpMixin } from '../../libs/mixin/mpMixin';
-	import { mixin } from '../../libs/mixin/mixin';
-	import { addUnit, addStyle } from '../../libs/function/index';
-	import config from '../../libs/config/config';
-	/**
-	 * icon 图标
-	 * @description 基于字体的图标集，包含了大多数常见场景的图标。
-	 * @tutorial https://ijry.github.io/uview-plus/components/icon.html
-	 * @property {String}			name			图标名称，见示例图标集
-	 * @property {String}			color			图标颜色,可接受主题色 （默认 color['u-content-color'] ）
-	 * @property {String | Number}	size			图标字体大小，单位px （默认 '16px' ）
-	 * @property {Boolean}			bold			是否显示粗体 （默认 false ）
-	 * @property {String | Number}	index			点击图标的时候传递事件出去的index（用于区分点击了哪一个）
-	 * @property {String}			hoverClass		图标按下去的样式类，用法同uni的view组件的hoverClass参数，详情见官网
-	 * @property {String}			customPrefix	自定义扩展前缀，方便用户扩展自己的图标库 （默认 'uicon' ）
-	 * @property {String | Number}	label			图标右侧的label文字
-	 * @property {String}			labelPos		label相对于图标的位置，只能right或bottom （默认 'right' ）
-	 * @property {String | Number}	labelSize		label字体大小，单位px （默认 '15px' ）
-	 * @property {String}			labelColor		图标右侧的label文字颜色 （ 默认 color['u-content-color'] ）
-	 * @property {String | Number}	space			label与图标的距离，单位px （默认 '3px' ）
-	 * @property {String}			imgMode			图片的mode
-	 * @property {String | Number}	width			显示图片小图标时的宽度
-	 * @property {String | Number}	height			显示图片小图标时的高度
-	 * @property {String | Number}	top				图标在垂直方向上的定位 用于解决某些情况下，让图标垂直居中的用途  （默认 0 ）
-	 * @property {Boolean}			stop			是否阻止事件传播 （默认 false ）
-	 * @property {Object}			customStyle		icon的样式，对象形式
-	 * @event {Function} click 点击图标时触发
-	 * @event {Function} touchstart 事件触摸时触发
-	 * @example <u-icon name="photo" color="#2979ff" size="28"></u-icon>
-	 */
-	export default {
-		name: 'u-icon',
-		data() {
-			return {
-
-			}
-		},
-		emits: ['click'],
-		mixins: [mpMixin, mixin, props],
-		computed: {
-			uClasses() {
-				let classes = []
-				classes.push(this.customPrefix + '-' + this.name)
-				// uView的自定义图标类名为u-iconfont
-				if (this.customPrefix == 'uicon') {
-					classes.push('u-iconfont')
-				} else {
-					// 不能缺少这一步，否则自定义图标会无效
-					classes.push(this.customPrefix)
-				}
-				// 主题色，通过类配置
-				if (this.color && config.type.includes(this.color)) classes.push('u-icon__icon--' + this.color)
-				// 阿里，头条，百度小程序通过数组绑定类名时，无法直接使用[a, b, c]的形式，否则无法识别
-				// 故需将其拆成一个字符串的形式，通过空格隔开各个类名
-				//#ifdef MP-ALIPAY || MP-TOUTIAO || MP-BAIDU
-				classes = classes.join(' ')
-				//#endif
-				return classes
-			},
-			iconStyle() {
-				let style = {}
-				style = {
-					fontSize: addUnit(this.size),
-					lineHeight: addUnit(this.size),
-					fontWeight: this.bold ? 'bold' : 'normal',
-					// 某些特殊情况需要设置一个到顶部的距离，才能更好的垂直居中
-					top: addUnit(this.top)
-				}
-				// 非主题色值时，才当作颜色值
-				if (this.color && !config.type.includes(this.color)) style.color = this.color
-
-				return style
-			},
-			// 判断传入的name属性，是否图片路径，只要带有"/"均认为是图片形式
-			isImg() {
-				return this.name.indexOf('/') !== -1
-			},
-			imgStyle() {
-				let style = {}
-				// 如果设置width和height属性，则优先使用，否则使用size属性
-				style.width = this.width ? addUnit(this.width) : addUnit(this.size)
-				style.height = this.height ? addUnit(this.height) : addUnit(this.size)
-				return style
-			},
-			// 通过图标名，查找对应的图标
-			icon() {
-				// 使用自定义图标的时候页面上会把name属性也展示出来，所以在这里处理一下
-				if (this.customPrefix !== "uicon") return "";
-				// 如果内置的图标中找不到对应的图标，就直接返回name值，因为用户可能传入的是unicode代码
-				return icons['uicon-' + this.name] || this.name
-			}
-		},
-		methods: {
-			addStyle,
-			addUnit,
-			clickHandler(e) {
-				this.$emit('click', this.index, e)
-				// 是否阻止事件冒泡
-				this.stop && this.preventEvent(e)
-			}
-		}
-	}
+      return style
+    },
+    // 判断传入的name属性，是否图片路径，只要带有"/"均认为是图片形式
+    isImg() {
+      return this.name.indexOf('/') !== -1
+    },
+    imgStyle() {
+      let style = {}
+      // 如果设置width和height属性，则优先使用，否则使用size属性
+      style.width = this.width ? addUnit(this.width) : addUnit(this.size)
+      style.height = this.height ? addUnit(this.height) : addUnit(this.size)
+      return style
+    },
+    // 通过图标名，查找对应的图标
+    icon() {
+      // 使用自定义图标的时候页面上会把name属性也展示出来，所以在这里处理一下
+      if (this.customPrefix !== 'uicon') {
+        return config.customIcons[this.name] || this.name
+      }
+      // 如果内置的图标中找不到对应的图标，就直接返回name值，因为用户可能传入的是unicode代码
+      return icons['uicon-' + this.name] || this.name
+    }
+  },
+  methods: {
+    addStyle,
+    addUnit,
+    clickHandler(e) {
+      this.$emit('click', this.index, e)
+      // 是否阻止事件冒泡
+      this.stop && this.preventEvent(e)
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
+// 变量定义
+$u-icon-primary: $u-primary !default;
+$u-icon-success: $u-success !default;
+$u-icon-info: $u-info !default;
+$u-icon-warning: $u-warning !default;
+$u-icon-error: $u-error !default;
+$u-icon-label-line-height: 1 !default;
 
-	// 变量定义
-	$u-icon-primary: $u-primary !default;
-	$u-icon-success: $u-success !default;
-	$u-icon-info: $u-info !default;
-	$u-icon-warning: $u-warning !default;
-	$u-icon-error: $u-error !default;
-	$u-icon-label-line-height:1 !default;
+/* #ifdef APP || MP-QQ || MP-TOUTIAO || MP-BAIDU || MP-KUAISHOU || MP-XHS */
+// 2025/04/09在App/微信/支付宝/鸿蒙元服务已改用uni.loadFontFace加载字体
+@font-face {
+  font-family: 'uicon-iconfont';
+  src: url('@/static/font_2225171_8kdcwk4po24.ttf') format('truetype');
+}
+/* #endif */
 
-	/* #ifndef APP-NVUE */
-	// 非nvue下加载字体
-	@font-face {
-	  font-family: 'uicon-iconfont';
-	  src: url('@/static/font_2225171_8kdcwk4po24.ttf') format('truetype');
-	}
-	
+.u-icon {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  align-items: center;
 
-	/* #endif */
+  &--left {
+    flex-direction: row-reverse;
+    align-items: center;
+  }
 
-	.u-icon {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		align-items: center;
+  &--right {
+    flex-direction: row;
+    align-items: center;
+  }
 
-		&--left {
-			flex-direction: row-reverse;
-			align-items: center;
-		}
+  &--top {
+    flex-direction: column-reverse;
+    justify-content: center;
+  }
 
-		&--right {
-			flex-direction: row;
-			align-items: center;
-		}
+  &--bottom {
+    flex-direction: column;
+    justify-content: center;
+  }
 
-		&--top {
-			flex-direction: column-reverse;
-			justify-content: center;
-		}
+  &__icon {
+    font-family: uicon-iconfont;
+    position: relative;
+    @include flex;
+    align-items: center;
 
-		&--bottom {
-			flex-direction: column;
-			justify-content: center;
-		}
+    &--primary {
+      color: $u-icon-primary;
+    }
 
-		&__icon {
-			font-family: uicon-iconfont;
-			position: relative;
-			@include flex;
-			align-items: center;
+    &--success {
+      color: $u-icon-success;
+    }
 
-			&--primary {
-				color: $u-icon-primary;
-			}
+    &--error {
+      color: $u-icon-error;
+    }
 
-			&--success {
-				color: $u-icon-success;
-			}
+    &--warning {
+      color: $u-icon-warning;
+    }
 
-			&--error {
-				color: $u-icon-error;
-			}
+    &--info {
+      color: $u-icon-info;
+    }
+  }
 
-			&--warning {
-				color: $u-icon-warning;
-			}
+  &__img {
+    /* #ifndef APP-NVUE */
+    height: auto;
+    will-change: transform;
+    /* #endif */
+  }
 
-			&--info {
-				color: $u-icon-info;
-			}
-		}
-
-		&__img {
-			/* #ifndef APP-NVUE */
-			height: auto;
-			will-change: transform;
-			/* #endif */
-		}
-
-		&__label {
-			/* #ifndef APP-NVUE */
-			line-height: $u-icon-label-line-height;
-			/* #endif */
-		}
-	}
+  &__label {
+    /* #ifndef APP-NVUE */
+    line-height: $u-icon-label-line-height;
+    /* #endif */
+  }
+}
 </style>
diff --git a/uview-plus/components/u-icon/util.js b/uview-plus/components/u-icon/util.js
new file mode 100644
index 0000000..907f8dd
--- /dev/null
+++ b/uview-plus/components/u-icon/util.js
@@ -0,0 +1,68 @@
+import config from '../../libs/config/config';
+
+let params = {
+    loaded: false
+};
+// 加载字体方法
+const loadFont = () => {
+    // console.log('加载字体图标');
+    // 全局加载不稳定，默认关闭，需要开启可以配置loadFontOnce。
+    if (config.loadFontOnce) {
+        params.loaded = true;
+    }
+    // #ifdef APP-NVUE
+    // nvue通过weex的dom模块引入字体，相关文档地址如下：
+    // https://weex.apache.org/zh/docs/modules/dom.html#addrule
+    const domModule = weex.requireModule('dom');
+    domModule.addRule('fontFace', {
+        'fontFamily': "uicon-iconfont",
+        'src': `url('${config.iconUrl}')`
+    });
+    if (config.customIcon.family) {
+        domModule.addRule('fontFace', {
+            'fontFamily': config.customIcon.family,
+            'src': `url('${config.customIcon.url}')`
+        });
+    }
+    // #endif
+    // #ifdef APP || H5 || MP-WEIXIN || MP-ALIPAY
+    uni.loadFontFace({
+        global: true, // 是否全局生效。微信小程序 '2.10.0'起支持全局生效，需在 app.vue 中调用。
+        family: 'uicon-iconfont',
+        source: 'url("' + config.iconUrl + '")',
+        success() {
+            // console.log('内置字体图标加载成功');
+        },
+        fail() {
+            // console.error('内置字体图标加载出错');
+        }
+    });
+    if (config.customIcon.family) {
+        uni.loadFontFace({
+            global: true, // 是否全局生效。微信小程序 '2.10.0'起支持全局生效，需在 app.vue 中调用。
+            family: config.customIcon.family,
+            source: 'url("' + config.customIcon.url + '")',
+            success() {
+                // console.log('扩展字体图标加载成功');
+            },
+            fail() {
+                // console.error('扩展字体图标加载出错');
+            }
+        });
+    }
+    // #endif
+    // #ifdef APP-NVUE
+    // if (this.customFontFamily) {
+    //     domModule.addRule('fontFace', {
+    //         'fontFamily': `${this.customPrefix}-${this.customFontFamily}`,
+    //         'src': `url('${this.customFontUrl}')`
+    //     })
+    // }
+    // #endif
+    return true;
+};
+
+export default {
+    params: params,
+    loadFont
+}
diff --git a/uview-plus/components/u-image/image.js b/uview-plus/components/u-image/image.js
index 2552db6..591b676 100644
--- a/uview-plus/components/u-image/image.js
+++ b/uview-plus/components/u-image/image.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:01:51
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/image.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/image.js
  */
 export default {
     // image组件
diff --git a/uview-plus/components/u-image/u-image.vue b/uview-plus/components/u-image/u-image.vue
index 606429e..24e3b10 100644
--- a/uview-plus/components/u-image/u-image.vue
+++ b/uview-plus/components/u-image/u-image.vue
@@ -36,22 +36,25 @@
 				}"
 			>
 				<slot name="loading">
-					<u-icon
+					<up-icon
 						:name="loadingIcon"
-					></u-icon>
+					></up-icon>
 				</slot>
 			</view>
 			<view
 				v-if="showError && isError && !loading"
 				class="u-image__error"
 				:style="{
-					borderRadius: shape == 'circle' ? '50%' : addUnit(radius)
+					borderRadius: shape == 'circle' ? '50%' : addUnit(radius),
+					backgroundColor: this.bgColor,
+					width: addUnit(width),
+					height: addUnit(height)
 				}"
 			>
 				<slot name="error">
-					<u-icon
+					<up-icon
 						:name="errorIcon"
-					></u-icon>
+					></up-icon>
 				</slot>
 			</view>
 		</view>
@@ -115,7 +118,6 @@
 					if (!n) {
 						// 如果传入null或者''，或者false，或者undefined，标记为错误状态
 						this.isError = true
-						
 					} else {
 						this.isError = false;
 						this.loading = true;
@@ -132,13 +134,13 @@
 				style.height = addUnit(this.height);
 				// #endif
 				// #ifndef APP-NVUE
-				if (this.width == '100%') {
-					style.width = this.width;
+				if (this.loading || this.isError || this.width == '100%' || this.mode != 'heightFix') {
+					style.width = addUnit(this.width);
 				} else {
 					style.width = 'fit-content';
 				}
-				if (this.height == '100%') {
-					style.height = this.height;
+				if (this.loading || this.isError || this.height == '100%' || this.mode != 'widthFix') {
+					style.height = addUnit(this.height);
 				} else {
 					style.height = 'fit-content';
 				}
@@ -153,13 +155,13 @@
 				style.height = addUnit(this.height);
 				// #endif
 				// #ifndef APP-NVUE
-				if (this.width == '100%') {
-					style.width = this.width;
+				if (this.loading || this.isError || this.width == '100%' || this.mode != 'heightFix') {
+					style.width = addUnit(this.width);
 				} else {
 					style.width = 'fit-content';
 				}
-				if (this.height == '100%') {
-					style.height = this.height;
+				if (this.loading || this.isError || this.height == '100%' || this.mode != 'widthFix') {
+					style.height = addUnit(this.height);
 				} else {
 					style.height = 'fit-content';
 				}
@@ -221,17 +223,15 @@
 			// 移除图片的背景色
 			removeBgColor() {
 				// 淡入动画过渡完成后，将背景设置为透明色，否则png图片会看到灰色的背景
-				this.backgroundStyle = {
-					backgroundColor: this.bgColor || '#ffffff'
-				};
+				// this.backgroundStyle = {
+				// 	backgroundColor: this.bgColor || '#ffffff'
+				// };
 			}
 		}
 	};
 </script>
 
 <style lang="scss" scoped>
-	@import '../../libs/css/components.scss';
-
 	$u-image-error-top:0px !default;
 	$u-image-error-left:0px !default;
 	$u-image-error-width:100% !default;
diff --git a/uview-plus/components/u-index-anchor/indexAnchor.js b/uview-plus/components/u-index-anchor/indexAnchor.js
index bb20d46..f6a5705 100644
--- a/uview-plus/components/u-index-anchor/indexAnchor.js
+++ b/uview-plus/components/u-index-anchor/indexAnchor.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:13:15
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/indexAnchor.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/indexAnchor.js
  */
 export default {
     // indexAnchor 组件
@@ -13,7 +13,7 @@ export default {
         text: '',
         color: '#606266',
         size: 14,
-        bgColor: '#dedede',
+        bgColor: '#f1f1f1',
         height: 32
     }
 }
diff --git a/uview-plus/components/u-index-anchor/u-index-anchor.vue b/uview-plus/components/u-index-anchor/u-index-anchor.vue
index 91c43e9..4044d53 100644
--- a/uview-plus/components/u-index-anchor/u-index-anchor.vue
+++ b/uview-plus/components/u-index-anchor/u-index-anchor.vue
@@ -4,6 +4,7 @@
 	<!-- #endif -->
 	<view
 	    class="u-index-anchor u-border-bottom"
+		:class="{ 'u-index-anchor--sticky': parentSticky }"
 		:ref="`u-index-anchor-${text}`"
 	    :style="{
 			height: addUnit(height),
@@ -16,7 +17,7 @@
 				fontSize: addUnit(size),
 				color: color
 			}"
-		>{{ text }}</text>
+		>{{ text.name || text }}</text>
 	</view>
 	<!-- #ifdef APP-NVUE -->
 	</header>
@@ -69,15 +70,24 @@
 					return error('u-index-anchor必须要搭配u-index-item组件使用')
 				}
 				// 设置u-index-item的id为anchor的text标识符，因为非nvue下滚动列表需要依赖scroll-view滚动到元素的特性
-				indexListItem.id = this.text.charCodeAt(0)
+				if (typeof this.text == 'string') {
+					indexListItem.id = this.text.charCodeAt(0)
+				} else {
+					indexListItem.id = this.text.name.charCodeAt(0)
+				}
 				// #endif
 			}
 		},
+		computed: {
+        parentSticky() {
+            const indexList = $parent.call(this, "u-index-list");
+            return indexList ? indexList.sticky : true;
+        	},
+		},
 	}
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-index-anchor {
 		position: sticky;
@@ -87,6 +97,11 @@
 		padding-left: 15px;
 		z-index: 1;
 
+		&--sticky {
+        position: sticky;
+        top: 0;
+    	}
+
 		&__text {
 			@include flex;
 			align-items: center;
diff --git a/uview-plus/components/u-index-item/u-index-item.vue b/uview-plus/components/u-index-item/u-index-item.vue
index 13cc30f..5d9346a 100644
--- a/uview-plus/components/u-index-item/u-index-item.vue
+++ b/uview-plus/components/u-index-item/u-index-item.vue
@@ -85,6 +85,5 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	
 </style>
diff --git a/uview-plus/components/u-index-list/indexList.js b/uview-plus/components/u-index-list/indexList.js
index 4f31b37..319f1eb 100644
--- a/uview-plus/components/u-index-list/indexList.js
+++ b/uview-plus/components/u-index-list/indexList.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:13:35
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/indexList.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/indexList.js
  */
 export default {
     // indexList 组件
@@ -15,6 +15,7 @@ export default {
         indexList: [],
         sticky: true,
         customNavHeight: 0,
-        safeBottomFix: false
+        safeBottomFix: false,
+        itemMargin: '0rpx'
     }
 }
diff --git a/uview-plus/components/u-index-list/props.js b/uview-plus/components/u-index-list/props.js
index 46a1fba..07ec35f 100644
--- a/uview-plus/components/u-index-list/props.js
+++ b/uview-plus/components/u-index-list/props.js
@@ -32,5 +32,10 @@ export const props = defineMixin({
             type: Boolean,
             default: () => defProps.indexList.safeBottomFix
         },
+        //自定义下边距
+        itemMargin: {
+            type: String,
+            default: () => defProps.indexList.itemMargin
+        },
     }
 })
diff --git a/uview-plus/components/u-index-list/u-index-list.vue b/uview-plus/components/u-index-list/u-index-list.vue
index c345413..8718637 100644
--- a/uview-plus/components/u-index-list/u-index-list.vue
+++ b/uview-plus/components/u-index-list/u-index-list.vue
@@ -66,7 +66,7 @@
 				<text
 					class="u-index-list__letter__item__index"
 					:style="{color: activeIndex === index ? '#fff' : inactiveColor}"
-				>{{ item }}</text>
+				>{{ item.key || item }}</text>
 			</view>
 		</view>
 		<u-transition
@@ -87,7 +87,7 @@
 					width: addUnit(indicatorHeight)
 				}"
 			>
-				<text class="u-index-list__indicator__text">{{ uIndexList[activeIndex] }}</text>
+				<text class="u-index-list__indicator__text">{{ uIndexList[activeIndex]?.key || uIndexList[activeIndex] }}</text>
 			</view>
 		</u-transition>
 	</view>
@@ -105,7 +105,7 @@
 	import { props } from './props';
 	import { mpMixin } from '../../libs/mixin/mpMixin';
 	import { mixin } from '../../libs/mixin/mixin';
-	import { addUnit, sys, sleep, getPx } from '../../libs/function/index';
+	import { addUnit, getWindowInfo, sleep, getPx } from '../../libs/function/index';
 
 	// #ifdef APP-NVUE
 	// 由于weex为阿里的KPI业绩考核的产物，所以不支持百分比单位，这里需要通过dom查询组件的宽度
@@ -152,7 +152,7 @@
 				// scroll-view的高度
 				scrollViewHeight: 0,
 				// 系统信息
-				sys: sys(),
+				sys: {},
 				scrolling: false,
 				scrollIntoView: '',
 				pageY: 0,
@@ -188,6 +188,7 @@
 		created() {
 			this.children = []
 			this.anchors = []
+			this.sys = getWindowInfo()
 		},
 		mounted() {
 			this.init()
@@ -283,8 +284,10 @@
 				return new Promise(resolve => {
 					// 延时一定时间，以获取dom尺寸
 					// #ifndef APP-NVUE
-					this.$uGetRect('.u-index-list__scroll-view').then(size => {
-						resolve(size)
+					this.$nextTick(() => {
+						this.$uGetRect('.u-index-list__scroll-view').then(size => {
+							resolve(size)
+						})
 					})
 					// #endif
 
@@ -320,7 +323,7 @@
 					const {
 						height
 					} = size
-					const sysData = sys()
+					const sysData = getWindowInfo()
 					const windowHeight = sysData.windowHeight
 					let customNavHeight = 0
 					// 消除各端导航栏非原生和原生导致的差异，让索引列表字母对屏幕垂直居中
@@ -358,7 +361,7 @@
 				let index = this.currentIndex;
 				// 对H5的pageY进行修正，这是由于uni-app自作多情在H5中将触摸点的坐标跟H5的导航栏结合导致的问题
 				// #ifdef H5
-				// pageY += sys().windowTop
+				// pageY += getWindowInfo().windowTop
 				// #endif
 				// 对第一和最后一个字母做边界处理，因为用户可能在字母列表上触摸到两端的尽头后依然继续滑动
 				// console.log('top1', top)
@@ -388,9 +391,14 @@
 				// 如果偏移量太小，前后得出的会是同一个索引字母，为了防抖，进行返回
 				if (currentIndex === this.activeIndex) return
 				this.activeIndex = currentIndex
+				this.$emit('select', this.uIndexList[currentIndex])
 				// #ifndef APP-NVUE || MP-WEIXIN
 				// 在非nvue中，由于anchor和item都在u-index-item中，所以需要对index-item进行偏移
-				this.scrollIntoView = `u-index-item-${this.uIndexList[currentIndex].charCodeAt(0)}`
+				if (typeof this.uIndexList[currentIndex] == 'string') {
+					this.scrollIntoView = `u-index-item-${this.uIndexList[currentIndex].charCodeAt(0)}`
+				} else {
+					this.scrollIntoView = `u-index-item-${this.uIndexList[currentIndex].name.charCodeAt(0)}`
+				}
 				// #endif
 
 				// #ifdef MP-WEIXIN
@@ -405,12 +413,13 @@
 				const anchors = this.anchors
 				// 由于list组件无法获取cell的top值，这里通过header slot和各个item之间的height，模拟出类似非nvue下的位置信息
 				let children = this.children.map((item, index) => {
+					const childHeight = item.height + getPx(this.itemMargin)
 					const child = {
-						height: item.height,
+						height: childHeight,
 						top: top
 					}
 					// 进行累加，给下一个item提供计算依据
-					top = top + item.height
+					top = top + childHeight
 					// #ifdef APP-NVUE
 					// 只有nvue下，需要将锚点的高度也累加，非nvue下锚点高度是包含在index-item中的。
 					top = top + anchors[index].height
@@ -418,7 +427,7 @@
 					return child
 				})
 				// console.log('this.children[currentIndex].top', children[currentIndex].top)
-				if (children[currentIndex]?.top) {
+				if (children[currentIndex]?.top || children[currentIndex].top === 0) {
 					this.scrollTop = children[currentIndex].top - getPx(customNavHeight)
 				}
 				// #endif
@@ -476,8 +485,8 @@
 				let children = this.children
 				// #ifdef APP-NVUE
 				// nvue下获取的滚动条偏移为负数，需要转为正数
-				let sys = uni.getSystemInfoSync()
-				scrollTop = Math.abs(e.contentOffset.y) / 10	
+				let sys = getWindowInfo()
+				scrollTop = Math.abs(e.contentOffset.y) / 10
 				// console.log('native', e)
 				// #endif
 
@@ -488,12 +497,13 @@
 				const anchors = this.anchors
 				// 由于list组件无法获取cell的top值，这里通过header slot和各个item之间的height，模拟出类似非nvue下的位置信息
 				children = this.children.map((item, index) => {
+					const childHeight = item.height + getPx(this.itemMargin)
 					const child = {
-						height: item.height,
+						height: childHeight,
 						top: top
 					}
 					// 进行累加，给下一个item提供计算依据
-					top = top + item.height
+					top = top + childHeight
 					// #ifdef APP-NVUE
 					// 只有nvue下，需要将锚点的高度也累加，非nvue下锚点高度是包含在index-item中的。
 					top = top + anchors[index].height
@@ -515,7 +525,7 @@
 					if (scrollTop <= children[0].top || scrollTop >= children[len - 1].top + children[len - 1].height) {
 						this.activeIndex = -1
 						break
-					} else if (!nextItem) { 
+					} else if (!nextItem) {
 						// 当不存在下一个item时，意味着历遍到了最后一个
 						this.activeIndex = len - 1
 						break
@@ -530,7 +540,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-index-list {
 
diff --git a/uview-plus/components/u-input/input.js b/uview-plus/components/u-input/input.js
index 6c310ea..c9b66c0 100644
--- a/uview-plus/components/u-input/input.js
+++ b/uview-plus/components/u-input/input.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:13:55
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/input.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-08-20 10:21:55
+ * @FilePath     : /uview-plus/libs/config/props/input.js
  */
 export default {
 	// index 组件
@@ -43,6 +43,8 @@ export default {
 		border: 'surround',
 		readonly: false,
 		shape: 'square',
-		formatter: null
+		formatter: null,
+		cursorColor: '#53c21d',
+		passwordVisibilityToggle: true
 	}
 }
diff --git a/uview-plus/components/u-input/props.js b/uview-plus/components/u-input/props.js
index e5e343e..59ace51 100644
--- a/uview-plus/components/u-input/props.js
+++ b/uview-plus/components/u-input/props.js
@@ -44,7 +44,12 @@ export const props = defineMixin({
 		// 是否显示清除控件
 		clearable: {
 			type: Boolean,
-			default: () => defProps.input.clearable
+			default: false
+		},
+		// 是否仅在聚焦时显示清除控件
+		onlyClearableOnFocused: {
+			type: Boolean,
+			default: true
 		},
 		// 是否密码类型
 		password: {
@@ -193,6 +198,16 @@ export const props = defineMixin({
 		ignoreCompositionEvent: {
 			type: Boolean,
 			default: true
+		},
+		// 光标颜色
+		cursorColor: {
+			type: String,
+			default: () => defProps.input.cursorColor
+		},
+		// 密码类型可见性切换
+		passwordVisibilityToggle: {
+			type: Boolean,
+			default: () => defProps.input.passwordVisibilityToggle
 		}
 	}
 })
diff --git a/uview-plus/components/u-input/u-input.vue b/uview-plus/components/u-input/u-input.vue
index 69d35e2..0b1b6ec 100644
--- a/uview-plus/components/u-input/u-input.vue
+++ b/uview-plus/components/u-input/u-input.vue
@@ -6,11 +6,11 @@
                 v-if="prefixIcon || $slots.prefix"
             >
                 <slot name="prefix">
-                    <u-icon
+                    <up-icon
                         :name="prefixIcon"
                         size="18"
                         :customStyle="prefixIconStyle"
-                    ></u-icon>
+                    ></up-icon>
                 </slot>
             </view>
             <view class="u-input__content__field-wrapper" @tap="clickHandler">
@@ -21,7 +21,7 @@
                     ref="input-native"
             	    class="u-input__content__field-wrapper__field"
             	    :style="[inputStyle]"
-            	    :type="type"
+            	    :type="showPassword && 'password' == type ? 'text' : type"
             	    :focus="focus"
             	    :cursor="cursor"
             	    :value="innerValue"
@@ -34,11 +34,12 @@
             	    :confirm-type="confirmType"
             	    :confirm-hold="confirmHold"
             	    :hold-keyboard="holdKeyboard"
+                    :cursor-color="cursorColor"
             	    :cursor-spacing="cursorSpacing"
             	    :adjust-position="adjustPosition"
             	    :selection-end="selectionEnd"
             	    :selection-start="selectionStart"
-            	    :password="password || type === 'password' || false"
+            	    :password="isPassword"
                     :ignoreCompositionEvent="ignoreCompositionEvent"
             	    @input="onInput"
             	    @blur="onBlur"
@@ -53,23 +54,32 @@
                 v-if="isShowClear"
                 @click="onClear"
             >
-                <u-icon
+                <up-icon
                     name="close"
                     size="11"
                     color="#ffffff"
                     customStyle="line-height: 12px"
-                ></u-icon>
+                ></up-icon>
+            </view>
+            <view
+                class="u-input__content__subfix-password-shower"
+                v-if="(type == 'password' || password) && passwordVisibilityToggle"
+            >
+                <up-icon @click="showPassword = !showPassword"
+                    :name="showPassword ? 'eye-off' : 'eye-fill'"
+                    size="18"
+                ></up-icon>
             </view>
             <view
                 class="u-input__content__subfix-icon"
                 v-if="suffixIcon || $slots.suffix"
             >
                 <slot name="suffix">
-                    <u-icon
+                    <up-icon
                         :name="suffixIcon"
                         size="18"
                         :customStyle="suffixIconStyle"
-                    ></u-icon>
+                    ></up-icon>
                 </slot>
             </view>
         </view>
@@ -105,6 +115,7 @@ import { addStyle, addUnit, deepMerge, formValidate, $parent, sleep, os } from '
  * @property {Boolean}			autoBlur				键盘收起时，是否自动失去焦点，目前仅App3.0.0+有效 （ 默认 false ）
  * @property {Boolean}			disableDefaultPadding	是否去掉 iOS 下的默认内边距，仅微信小程序，且type=textarea时有效 （ 默认 false ）
  * @property {String ｜ Number}	cursor					指定focus时光标的位置（ 默认 140 ）
+ * @property {String }          cursorColor			    光标颜色
  * @property {String ｜ Number}	cursorSpacing			输入框聚焦时底部与键盘的距离 （ 默认 30 ）
  * @property {String ｜ Number}	selectionStart			光标起始位置，自动聚集时有效，需与selection-end搭配使用 （ 默认 -1 ）
  * @property {String ｜ Number}	selectionEnd			光标结束位置，自动聚集时有效，需与selection-start搭配使用 （ 默认 -1 ）
@@ -140,7 +151,8 @@ export default {
             // value绑定值的变化是由内部还是外部引起的
             changeFromInner: false,
 			// 过滤处理方法
-			innerFormatter: value => value
+			innerFormatter: value => value,
+            showPassword: false
         };
     },
     created() {
@@ -176,10 +188,32 @@ export default {
         }
     },
     computed: {
+        // 是否密码
+        isPassword() {
+            let ret = false;
+            if(this.password) {
+                ret = true;
+            } else if (this.type == 'password') {
+                ret = true;
+            } else {
+                ret = false;
+            }
+            if (this.showPassword) {
+                ret = false;
+            }
+            return ret;
+        },
         // 是否显示清除控件
         isShowClear() {
-            const { clearable, readonly, focused, innerValue } = this;
-            return !!clearable && !readonly && !!focused && innerValue !== "";
+            const { clearable, readonly, focused, innerValue, onlyClearableOnFocused } = this;
+            if (!clearable || readonly) {
+                return false;
+            }
+            if (onlyClearableOnFocused) {
+                return !!focused && innerValue !== "";
+            } else {
+                return innerValue !== "";
+            }
         },
         // 组件的类名
         inputClass() {
@@ -206,7 +240,7 @@ export default {
             if (this.border === "none") {
                 style.padding = "0";
             } else {
-                // 由于uni-app的iOS开发者能力有限，导致需要分开写才有效
+                // 由于uni-app的iOS端限制，导致需要分开写才有效
                 style.paddingTop = "6px";
                 style.paddingBottom = "6px";
                 style.paddingLeft = "9px";
@@ -288,14 +322,17 @@ export default {
                 if (!isOut || this.clearInput) {
                     // 标识value值的变化是由内部引起的
                     this.changeFromInner = true;
-                    this.$emit("change", value);
-
+                   
                     // #ifdef VUE3
                     this.$emit("update:modelValue", value);
                     // #endif
                     // #ifdef VUE2
                     this.$emit("input", value);
                     // #endif
+					
+					//change方法需要放在下面，否则会引起change先触发，model后变化的异常
+					this.$emit("change", value);
+					
                 }
 
                 // 尝试调用u-form的验证方法
@@ -334,8 +371,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
-
 .u-input {
     @include flex(row);
     align-items: center;
diff --git a/uview-plus/components/u-keyboard/keyboard.js b/uview-plus/components/u-keyboard/keyboard.js
index 57182bd..bf9f760 100644
--- a/uview-plus/components/u-keyboard/keyboard.js
+++ b/uview-plus/components/u-keyboard/keyboard.js
@@ -1,12 +1,13 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:07:49
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/keyboard.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/keyboard.js
  */
+import { t } from '../../libs/i18n'
 export default {
     // 键盘组件
     keyboard: {
@@ -23,8 +24,8 @@ export default {
         show: false,
         overlay: true,
         zIndex: 10075,
-        cancelText: '取消',
-        confirmText: '确定',
+        cancelText: t("up.common.cancel"),
+        confirmText: t("up.common.confirm"),
         autoChange: false
     }
 }
diff --git a/uview-plus/components/u-keyboard/u-keyboard.vue b/uview-plus/components/u-keyboard/u-keyboard.vue
index 868f0c5..5ddd400 100644
--- a/uview-plus/components/u-keyboard/u-keyboard.vue
+++ b/uview-plus/components/u-keyboard/u-keyboard.vue
@@ -75,7 +75,7 @@
 	/**
 	 * keyboard 键盘
 	 * @description 此为uViw自定义的键盘面板，内含了数字键盘，车牌号键，身份证号键盘3中模式，都有可以打乱按键顺序的选项。
-	 * @tutorial https://ijry.github.io/uview-plus/components/keyboard.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/keyboard.html
 	 * @property {String}			mode				键盘类型，见官网基本使用的说明 （默认 'number' ）
 	 * @property {Boolean}			dotDisabled			是否显示"."按键，只在mode=number时有效 （默认 false ）
 	 * @property {Boolean}			tooltip				是否显示键盘顶部工具条 （默认 true ）
@@ -132,7 +132,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-keyboard {
 
diff --git a/uview-plus/components/u-lazy-load/u-lazy-load.vue b/uview-plus/components/u-lazy-load/u-lazy-load.vue
index c49add0..0a30b44 100644
--- a/uview-plus/components/u-lazy-load/u-lazy-load.vue
+++ b/uview-plus/components/u-lazy-load/u-lazy-load.vue
@@ -19,7 +19,8 @@
 <script>
     import {
         addUnit,
-        guid
+        guid,
+        rpx2px
     } from '../../libs/function/index.js';
     /**
      * lazyLoad 懒加载
@@ -114,7 +115,7 @@
             // 将threshold从rpx转为px
             getThreshold() {
                 // 先取绝对值，因为threshold可能是负数，最后根据this.threshold是正数或者负数，重新还原
-                let thresholdPx = uni.upx2px(Math.abs(this.threshold));
+                let thresholdPx = rpx2px(Math.abs(this.threshold));
                 return this.threshold < 0 ? -thresholdPx : thresholdPx;
             },
             // 计算图片的高度，可能为auto，带%，或者直接数值
@@ -223,6 +224,10 @@
                     if (res.intersectionRatio > 0) {
                         // 懒加载状态改变
                         this.isShow = true;
+                        // 图片为空时显示错误
+                        if (!this.image) {
+                            this.loadError();
+                        }
                         // 如果图片已经加载，去掉监听，减少性能的消耗
                         this.disconnectObserver('contentObserver');
                     }
@@ -238,8 +243,6 @@
 </script>
 
 <style scoped lang="scss">
-    @import "../../libs/css/components.scss";
-
     .u-wrap {
         background-color: #eee;
         overflow: hidden;
diff --git a/uview-plus/components/u-line-progress/lineProgress.js b/uview-plus/components/u-line-progress/lineProgress.js
index cdfcb0e..74ab100 100644
--- a/uview-plus/components/u-line-progress/lineProgress.js
+++ b/uview-plus/components/u-line-progress/lineProgress.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:14:11
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/lineProgress.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/lineProgress.js
  */
 export default {
     // lineProgress 组件
@@ -14,6 +14,7 @@ export default {
         inactiveColor: '#ececec',
         percentage: 0,
         showText: true,
-        height: 12
+        height: 12,
+		fromRight: false,
     }
 }
diff --git a/uview-plus/components/u-line-progress/props.js b/uview-plus/components/u-line-progress/props.js
index 3e03e61..2690e29 100644
--- a/uview-plus/components/u-line-progress/props.js
+++ b/uview-plus/components/u-line-progress/props.js
@@ -25,6 +25,11 @@ export const props = defineMixin({
         height: {
             type: [String, Number],
             default: () => defProps.lineProgress.height
+        },
+		// 是否从右往左加载
+		fromRight: {
+            type: Boolean,
+            default: () => defProps.lineProgress.fromRight
         }
     }
 })
diff --git a/uview-plus/components/u-line-progress/u-line-progress.vue b/uview-plus/components/u-line-progress/u-line-progress.vue
index 577f877..d5a93ee 100644
--- a/uview-plus/components/u-line-progress/u-line-progress.vue
+++ b/uview-plus/components/u-line-progress/u-line-progress.vue
@@ -34,7 +34,7 @@
 	/**
 	 * lineProgress 线型进度条
 	 * @description 展示操作或任务的当前进度，比如上传文件，是一个线形的进度条。
-	 * @tutorial https://ijry.github.io/uview-plus/components/lineProgress.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/lineProgress.html
 	 * @property {String}			activeColor		激活部分的颜色 ( 默认 '#19be6b' )
 	 * @property {String}			inactiveColor	背景色 ( 默认 '#ececec' )
 	 * @property {String | Number}	percentage		进度百分比，数值 ( 默认 0 )
@@ -62,6 +62,11 @@
 				style.width = this.lineWidth
 				style.backgroundColor = this.activeColor
 				style.height = addUnit(this.height)
+				if (this.fromRight) {
+					style.right = 0;
+				} else {
+					style.left = 0;
+				}
 				return style
 			},
 			innserPercentage() {
@@ -108,7 +113,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-line-progress {
 		align-items: stretch;
@@ -127,7 +131,6 @@
 		&__line {
 			position: absolute;
 			top: 0;
-			left: 0;
 			bottom: 0;
 			align-items: center;
 			@include flex(row);
diff --git a/uview-plus/components/u-line/line.js b/uview-plus/components/u-line/line.js
index 2c87af2..c4b5dfc 100644
--- a/uview-plus/components/u-line/line.js
+++ b/uview-plus/components/u-line/line.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:04:49
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/line.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/line.js
  */
 export default {
     // line组件
diff --git a/uview-plus/components/u-line/u-line.vue b/uview-plus/components/u-line/u-line.vue
index 4acc0a0..7f86b6e 100644
--- a/uview-plus/components/u-line/u-line.vue
+++ b/uview-plus/components/u-line/u-line.vue
@@ -15,7 +15,7 @@
 	/**
 	 * line 线条
 	 * @description 此组件一般用于显示一根线条，用于分隔内容块，有横向和竖向两种模式，且能设置0.5px线条，使用也很简单
-	 * @tutorial https://ijry.github.io/uview-plus/components/line.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/line.html
 	 * @property {String}			color		线条的颜色 ( 默认 '#d6d7d9' )
 	 * @property {String | Number}	length		长度，竖向时表现为高度，横向时表现为长度，可以为百分比，带px单位的值等 ( 默认 '100%' )
 	 * @property {String}			direction	线条的方向，row-横向，col-竖向 (默认 'row' )
@@ -55,7 +55,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-line {
 		/* #ifndef APP-NVUE */
diff --git a/uview-plus/components/u-link/link.js b/uview-plus/components/u-link/link.js
index a5d0450..8c7042c 100644
--- a/uview-plus/components/u-link/link.js
+++ b/uview-plus/components/u-link/link.js
@@ -1,13 +1,14 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:45:36
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/link.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/link.js
  */
 import config from '../../libs/config/config'
+import { t } from '../../libs/i18n'
 
 const {
     color
@@ -19,7 +20,7 @@ export default {
         fontSize: 15,
         underLine: false,
         href: '',
-        mpTips: '链接已复制，请在浏览器打开',
+        mpTips: t("up.link.copyed"),
         lineColor: '',
         text: ''
     }
diff --git a/uview-plus/components/u-link/u-link.vue b/uview-plus/components/u-link/u-link.vue
index 5103893..0443f06 100644
--- a/uview-plus/components/u-link/u-link.vue
+++ b/uview-plus/components/u-link/u-link.vue
@@ -14,7 +14,7 @@
 	/**
 	 * link 超链接
 	 * @description 该组件为超链接组件，在不同平台有不同表现形式：在APP平台会通过plus环境打开内置浏览器，在小程序中把链接复制到粘贴板，同时提示信息，在H5中通过window.open打开链接。
-	 * @tutorial https://ijry.github.io/uview-plus/components/link.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/link.html
 	 * @property {String}			color		文字颜色 （默认 color['u-primary'] ）
 	 * @property {String ｜ Number}	fontSize	字体大小，单位px （默认 15 ）
 	 * @property {Boolean}			underLine	是否显示下划线 （默认 false ）
@@ -73,7 +73,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	$u-link-line-height:1 !default;
 
 	.u-link {
diff --git a/uview-plus/components/u-list-item/listItem.js b/uview-plus/components/u-list-item/listItem.js
index 7fe2166..66d5ccf 100644
--- a/uview-plus/components/u-list-item/listItem.js
+++ b/uview-plus/components/u-list-item/listItem.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:15:40
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/listItem.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/listItem.js
  */
 export default {
     // listItem 组件
diff --git a/uview-plus/components/u-list-item/u-list-item.vue b/uview-plus/components/u-list-item/u-list-item.vue
index ae30b08..f9cd709 100644
--- a/uview-plus/components/u-list-item/u-list-item.vue
+++ b/uview-plus/components/u-list-item/u-list-item.vue
@@ -19,14 +19,14 @@
 	import { props } from './props';
 	import { mpMixin } from '../../libs/mixin/mpMixin';
 	import { mixin } from '../../libs/mixin/mixin';
-	import { sys } from '../../libs/function/index';
+	import { getWindowInfo } from '../../libs/function/index';
 	// #ifdef APP-NVUE
 	const dom = uni.requireNativePlugin('dom')
 	// #endif
 	/**
 	 * List 列表
 	 * @description 该组件为高性能列表组件
-	 * @tutorial https://ijry.github.io/uview-plus/components/list.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/list.html
 	 * @property {String | Number}	anchor	用于滚动到指定item
 	 * @example <u-list-ite v-for="(item, index) in indexList" :key="index" ></u-list-item>
 	 */
@@ -39,7 +39,7 @@
 				rect: {},
 				index: 0,
 				show: true,
-				sys: sys()
+				sys: getWindowInfo()
 			}
 		},
 		computed: {
@@ -113,7 +113,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-list-item {}
 </style>
diff --git a/uview-plus/components/u-list/list.js b/uview-plus/components/u-list/list.js
index a830c32..94010e4 100644
--- a/uview-plus/components/u-list/list.js
+++ b/uview-plus/components/u-list/list.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:14:53
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/list.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/list.js
  */
 export default {
     // list 组件
diff --git a/uview-plus/components/u-list/u-list.vue b/uview-plus/components/u-list/u-list.vue
index af95ff1..726ff38 100644
--- a/uview-plus/components/u-list/u-list.vue
+++ b/uview-plus/components/u-list/u-list.vue
@@ -50,14 +50,14 @@
 	import { props } from './props';
 	import { mpMixin } from '../../libs/mixin/mpMixin';
 	import { mixin } from '../../libs/mixin/mixin';
-	import { addUnit, addStyle, deepMerge, sleep, sys } from '../../libs/function/index';
+	import { addUnit, addStyle, deepMerge, sleep, getWindowInfo } from '../../libs/function/index';
 	// #ifdef APP-NVUE
 	const dom = uni.requireNativePlugin('dom')
 	// #endif
 	/**
 	 * List 列表
 	 * @description 该组件为高性能列表组件
-	 * @tutorial https://ijry.github.io/uview-plus/components/list.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/list.html
 	 * @property {Boolean}			showScrollbar		控制是否出现滚动条，仅nvue有效 （默认 false ）
 	 * @property {String ｜ Number}	lowerThreshold		距底部多少时触发scrolltolower事件 （默认 50 ）
 	 * @property {String ｜ Number}	upperThreshold		距顶部多少时触发scrolltoupper事件，非nvue有效 （默认 0 ）
@@ -90,7 +90,7 @@
 				innerScrollTop: 0,
 				// vue下，scroll-view在上拉加载时的偏移值
 				offset: 0,
-				sys: sys()
+				sys: getWindowInfo()
 			}
 		},
 		computed: {
@@ -114,7 +114,7 @@
 			this.anchors = []
 		},
 		mounted() {},
-		emits: ["scroll", "scrolltolower", "scrolltoupper",
+		emits: ["scroll", "scrolltolower", "scroll-to-lower", "scrolltoupper", "scroll-to-upper",
 			"refresherpulling", "refresherrefresh", "refresherrestore", "refresherabort"],
 		methods: {
 			updateOffsetFromChild(top) {
@@ -145,6 +145,8 @@
 			scrolltolower(e) {
 				sleep(30).then(() => {
 					this.$emit('scrolltolower')
+					// 支付宝小程序奇怪无法触发scrolltolowerhttps://github.com/ijry/uview-plus/issues/422
+					this.$emit('scroll-to-lower')
 				})
 			},
 			// #ifndef APP-NVUE
@@ -152,6 +154,7 @@
 			scrolltoupper(e) {
 				sleep(30).then(() => {
 					this.$emit('scrolltoupper')
+					this.$emit('scroll-to-upper')
 					// 这一句很重要，能绝对保证在性功能障碍的webview，滚动条到顶时，取消偏移值，让页面置顶
 					this.offset = 0
 				})
@@ -174,7 +177,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-list {
 		@include flex(column);
diff --git a/uview-plus/components/u-loading-icon/loadingIcon.js b/uview-plus/components/u-loading-icon/loadingIcon.js
index 56cc3f2..c51a0a0 100644
--- a/uview-plus/components/u-loading-icon/loadingIcon.js
+++ b/uview-plus/components/u-loading-icon/loadingIcon.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:45:47
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/loadingIcon.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/loadingIcon.js
  */
 import config from '../../libs/config/config'
 
diff --git a/uview-plus/components/u-loading-icon/u-loading-icon.vue b/uview-plus/components/u-loading-icon/u-loading-icon.vue
index 300b774..81fb2ed 100644
--- a/uview-plus/components/u-loading-icon/u-loading-icon.vue
+++ b/uview-plus/components/u-loading-icon/u-loading-icon.vue
@@ -68,8 +68,8 @@
 	// #endif
 	/**
 	 * loading 加载动画
-	 * @description 警此组件为一个小动画，目前用在uView的loadmore加载更多和switch开关等组件的正在加载状态场景。
-	 * @tutorial https://ijry.github.io/uview-plus/components/loading.html
+	 * @description 此组件为一个小动画，目前用在uView的loadmore加载更多和switch开关等组件的正在加载状态场景。
+	 * @tutorial https://uview-plus.jiangruyi.com/components/loading.html
 	 * @property {Boolean}			show			是否显示组件  (默认 true)
 	 * @property {String}			color			动画活动区域的颜色，只对 mode = flower 模式有效（默认color['u-tips-color']）
 	 * @property {String}			textColor		提示文本的颜色（默认color['u-tips-color']）
@@ -193,7 +193,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	$u-loading-icon-color: #c8c9cc !default;
 	$u-loading-icon-text-margin-left:4px !default;
 	$u-loading-icon-text-color:$u-content-color !default;
@@ -347,3 +346,4 @@
 
 	/* #endif */
 </style>
+
diff --git a/uview-plus/components/u-loading-page/loadingPage.js b/uview-plus/components/u-loading-page/loadingPage.js
index 6ed7485..8bb017a 100644
--- a/uview-plus/components/u-loading-page/loadingPage.js
+++ b/uview-plus/components/u-loading-page/loadingPage.js
@@ -1,16 +1,17 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:00:23
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/loadingPage.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/loadingPage.js
  */
+import { t } from '../../libs/i18n'
 export default {
     // loading-page组件
     loadingPage: {
-        loadingText: '正在加载',
+        loadingText: t("up.common.loading2"),
         image: '',
         loadingMode: 'circle',
         loading: false,
diff --git a/uview-plus/components/u-loading-page/u-loading-page.vue b/uview-plus/components/u-loading-page/u-loading-page.vue
index d81dff2..6671125 100644
--- a/uview-plus/components/u-loading-page/u-loading-page.vue
+++ b/uview-plus/components/u-loading-page/u-loading-page.vue
@@ -56,7 +56,7 @@ import { addUnit } from '../../libs/function/index';
 /**
  * loadingPage 加载动画
  * @description 警此组件为一个小动画，目前用在uView的loadmore加载更多和switch开关等组件的正在加载状态场景。
- * @tutorial https://ijry.github.io/uview-plus/components/loading.html
+ * @tutorial https://uview-plus.jiangruyi.com/components/loading.html
  * @property {String | Number}	loadingText		提示内容  (默认 '正在加载' )
  * @property {String}			image			文字上方用于替换loading动画的图片
  * @property {String}			loadingMode		加载动画的模式，circle-圆形，spinner-花朵形，semicircle-半圆形 （默认 'circle' ）
@@ -83,8 +83,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
-
 $text-color: rgb(200, 200, 200) !default;
 $text-size: 19px !default;
 $u-loading-icon-margin-bottom: 10px !default;
diff --git a/uview-plus/components/u-loadmore/loadmore.js b/uview-plus/components/u-loadmore/loadmore.js
index 67c1160..79e125b 100644
--- a/uview-plus/components/u-loadmore/loadmore.js
+++ b/uview-plus/components/u-loadmore/loadmore.js
@@ -1,12 +1,13 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:15:26
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/loadmore.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/loadmore.js
  */
+import { t } from '../../libs/i18n'
 export default {
     // loadmore 组件
     loadmore: {
@@ -17,9 +18,9 @@ export default {
 		iconSize: 17,
         color: '#606266',
         loadingIcon: 'spinner',
-        loadmoreText: '加载更多',
-        loadingText: '正在加载...',
-        nomoreText: '没有更多了',
+        loadmoreText: t("up.loadmoe.loadmore"),
+        loadingText: t("up.common.loading2") + '...',
+        nomoreText: t("up.loadmoe.nomore"),
         isDot: false,
         iconColor: '#b7b7b7',
         marginTop: 10,
diff --git a/uview-plus/components/u-loadmore/u-loadmore.vue b/uview-plus/components/u-loadmore/u-loadmore.vue
index 62c99c0..f20b401 100644
--- a/uview-plus/components/u-loadmore/u-loadmore.vue
+++ b/uview-plus/components/u-loadmore/u-loadmore.vue
@@ -59,7 +59,7 @@
 	/**
 	 * loadmore 加载更多
 	 * @description 此组件一般用于标识页面底部加载数据时的状态。
-	 * @tutorial https://ijry.github.io/uview-plus/components/loadMore.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/loadMore.html
 	 * @property {String}			status			组件状态（默认 'loadmore' ）
 	 * @property {String}			bgColor			组件背景颜色，在页面是非白色时会用到（默认 'transparent' ）
 	 * @property {Boolean}			icon			加载中时是否显示图标（默认 true ）
@@ -123,7 +123,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-loadmore {
 		@include flex(row);
diff --git a/uview-plus/components/u-markdown/marked.esm.js b/uview-plus/components/u-markdown/marked.esm.js
new file mode 100644
index 0000000..c1b6a08
--- /dev/null
+++ b/uview-plus/components/u-markdown/marked.esm.js
@@ -0,0 +1,7 @@
+/**
+ * Bundled by jsDelivr using Rollup v2.79.2 and Terser v5.39.0.
+ * Original file: /npm/marked@16.1.2/lib/marked.esm.js
+ *
+ * Do NOT use SRI with dynamically generated files! More information: https://www.jsdelivr.com/using-sri-with-dynamic-files
+ */
+function e(){return{async:!1,breaks:!1,extensions:null,gfm:!0,hooks:null,pedantic:!1,renderer:null,silent:!1,tokenizer:null,walkTokens:null}}var t={async:!1,breaks:!1,extensions:null,gfm:!0,hooks:null,pedantic:!1,renderer:null,silent:!1,tokenizer:null,walkTokens:null};function n(e){t=e}var r={exec:()=>null};function s(e,t=""){let n="string"==typeof e?e:e.source,r={replace:(e,t)=>{let s="string"==typeof t?t:t.source;return s=s.replace(l.caret,"$1"),n=n.replace(e,s),r},getRegex:()=>new RegExp(n,t)};return r}var l={codeRemoveIndent:/^(?: {1,4}| {0,3}\t)/gm,outputLinkReplace:/\\([\[\]])/g,indentCodeCompensation:/^(\s+)(?:```)/,beginningSpace:/^\s+/,endingHash:/#$/,startingSpaceChar:/^ /,endingSpaceChar:/ $/,nonSpaceChar:/[^ ]/,newLineCharGlobal:/\n/g,tabCharGlobal:/\t/g,multipleSpaceGlobal:/\s+/g,blankLine:/^[ \t]*$/,doubleBlankLine:/\n[ \t]*\n[ \t]*$/,blockquoteStart:/^ {0,3}>/,blockquoteSetextReplace:/\n {0,3}((?:=+|-+) *)(?=\n|$)/g,blockquoteSetextReplace2:/^ {0,3}>[ \t]?/gm,listReplaceTabs:/^\t+/,listReplaceNesting:/^ {1,4}(?=( {4})*[^ ])/g,listIsTask:/^\[[ xX]\] /,listReplaceTask:/^\[[ xX]\] +/,anyLine:/\n.*\n/,hrefBrackets:/^<(.*)>$/,tableDelimiter:/[:|]/,tableAlignChars:/^\||\| *$/g,tableRowBlankLine:/\n[ \t]*$/,tableAlignRight:/^ *-+: *$/,tableAlignCenter:/^ *:-+: *$/,tableAlignLeft:/^ *:-+ *$/,startATag:/^<a /i,endATag:/^<\/a>/i,startPreScriptTag:/^<(pre|code|kbd|script)(\s|>)/i,endPreScriptTag:/^<\/(pre|code|kbd|script)(\s|>)/i,startAngleBracket:/^</,endAngleBracket:/>$/,pedanticHrefTitle:/^([^'"]*[^\s])\s+(['"])(.*)\2/,unicodeAlphaNumeric:/[a-zA-Z0-9\u00C0-\u02AF\u0300-\u036F\u0400-\u04FF\u0500-\u052F\u1E00-\u1EFF]/u,escapeTest:/[&<>"']/,escapeReplace:/[&<>"']/g,escapeTestNoEncode:/[<>"']|&(?!(#\d{1,7}|#[Xx][a-fA-F0-9]{1,6}|\w+);)/,escapeReplaceNoEncode:/[<>"']|&(?!(#\d{1,7}|#[Xx][a-fA-F0-9]{1,6}|\w+);)/g,unescapeTest:/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/gi,caret:/(^|[^\[])\^/g,percentDecode:/%25/g,findPipe:/\|/g,splitPipe:/ \|/,slashPipe:/\\\|/g,carriageReturn:/\r\n|\r/g,spaceLine:/^ +$/gm,notSpaceStart:/^\S*/,endingNewline:/\n$/,listItemRegex:e=>new RegExp(`^( {0,3}${e})((?:[\t ][^\\n]*)?(?:\\n|$))`),nextBulletRegex:e=>new RegExp(`^ {0,${Math.min(3,e-1)}}(?:[*+-]|\\d{1,9}[.)])((?:[ \t][^\\n]*)?(?:\\n|$))`),hrRegex:e=>new RegExp(`^ {0,${Math.min(3,e-1)}}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)`),fencesBeginRegex:e=>new RegExp(`^ {0,${Math.min(3,e-1)}}(?:\`\`\`|~~~)`),headingBeginRegex:e=>new RegExp(`^ {0,${Math.min(3,e-1)}}#`),htmlBeginRegex:e=>new RegExp(`^ {0,${Math.min(3,e-1)}}<(?:[a-z].*>|!--)`,"i")},i=/^ {0,3}((?:-[\t ]*){3,}|(?:_[ \t]*){3,}|(?:\*[ \t]*){3,})(?:\n+|$)/,a=/(?:[*+-]|\d{1,9}[.)])/,o=/^(?!bull |blockCode|fences|blockquote|heading|html|table)((?:.|\n(?!\s*?\n|bull |blockCode|fences|blockquote|heading|html|table))+?)\n {0,3}(=+|-+) *(?:\n+|$)/,c=s(o).replace(/bull/g,a).replace(/blockCode/g,/(?: {4}| {0,3}\t)/).replace(/fences/g,/ {0,3}(?:`{3,}|~{3,})/).replace(/blockquote/g,/ {0,3}>/).replace(/heading/g,/ {0,3}#{1,6}/).replace(/html/g,/ {0,3}<[^\n>]+>\n/).replace(/\|table/g,"").getRegex(),h=s(o).replace(/bull/g,a).replace(/blockCode/g,/(?: {4}| {0,3}\t)/).replace(/fences/g,/ {0,3}(?:`{3,}|~{3,})/).replace(/blockquote/g,/ {0,3}>/).replace(/heading/g,/ {0,3}#{1,6}/).replace(/html/g,/ {0,3}<[^\n>]+>\n/).replace(/table/g,/ {0,3}\|?(?:[:\- ]*\|)+[\:\- ]*\n/).getRegex(),p=/^([^\n]+(?:\n(?!hr|heading|lheading|blockquote|fences|list|html|table| +\n)[^\n]+)*)/,u=/(?!\s*\])(?:\\.|[^\[\]\\])+/,g=s(/^ {0,3}\[(label)\]: *(?:\n[ \t]*)?([^<\s][^\s]*|<.*?>)(?:(?: +(?:\n[ \t]*)?| *\n[ \t]*)(title))? *(?:\n+|$)/).replace("label",u).replace("title",/(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/).getRegex(),k=s(/^( {0,3}bull)([ \t][^\n]+?)?(?:\n|$)/).replace(/bull/g,a).getRegex(),d="address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|search|section|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul",f=/<!--(?:-?>|[\s\S]*?(?:-->|$))/,x=s("^ {0,3}(?:<(script|pre|style|textarea)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)|comment[^\\n]*(\\n+|$)|<\\?[\\s\\S]*?(?:\\?>\\n*|$)|<![A-Z][\\s\\S]*?(?:>\\n*|$)|<!\\[CDATA\\[[\\s\\S]*?(?:\\]\\]>\\n*|$)|</?(tag)(?: +|\\n|/?>)[\\s\\S]*?(?:(?:\\n[ \t]*)+\\n|$)|<(?!script|pre|style|textarea)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n[ \t]*)+\\n|$)|</(?!script|pre|style|textarea)[a-z][\\w-]*\\s*>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n[ \t]*)+\\n|$))","i").replace("comment",f).replace("tag",d).replace("attribute",/ +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex(),b=s(p).replace("hr",i).replace("heading"," {0,3}#{1,6}(?:\\s|$)").replace("|lheading","").replace("|table","").replace("blockquote"," {0,3}>").replace("fences"," {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html","</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)").replace("tag",d).getRegex(),w={blockquote:s(/^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/).replace("paragraph",b).getRegex(),code:/^((?: {4}| {0,3}\t)[^\n]+(?:\n(?:[ \t]*(?:\n|$))*)?)+/,def:g,fences:/^ {0,3}(`{3,}(?=[^`\n]*(?:\n|$))|~{3,})([^\n]*)(?:\n|$)(?:|([\s\S]*?)(?:\n|$))(?: {0,3}\1[~`]* *(?=\n|$)|$)/,heading:/^ {0,3}(#{1,6})(?=\s|$)(.*)(?:\n+|$)/,hr:i,html:x,lheading:c,list:k,newline:/^(?:[ \t]*(?:\n|$))+/,paragraph:b,table:r,text:/^[^\n]+/},m=s("^ *([^\\n ].*)\\n {0,3}((?:\\| *)?:?-+:? *(?:\\| *:?-+:? *)*(?:\\| *)?)(?:\\n((?:(?! *\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)").replace("hr",i).replace("heading"," {0,3}#{1,6}(?:\\s|$)").replace("blockquote"," {0,3}>").replace("code","(?: {4}| {0,3}\t)[^\\n]").replace("fences"," {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html","</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)").replace("tag",d).getRegex(),y={...w,lheading:h,table:m,paragraph:s(p).replace("hr",i).replace("heading"," {0,3}#{1,6}(?:\\s|$)").replace("|lheading","").replace("table",m).replace("blockquote"," {0,3}>").replace("fences"," {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html","</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)").replace("tag",d).getRegex()},$={...w,html:s("^ *(?:comment *(?:\\n|\\s*$)|<(tag)[\\s\\S]+?</\\1> *(?:\\n{2,}|\\s*$)|<tag(?:\"[^\"]*\"|'[^']*'|\\s[^'\"/>\\s]*)*?/?> *(?:\\n{2,}|\\s*$))").replace("comment",f).replace(/tag/g,"(?!(?:a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)\\b)\\w+(?!:|[^\\w\\s@]*@)\\b").getRegex(),def:/^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/,heading:/^(#{1,6})(.*)(?:\n+|$)/,fences:r,lheading:/^(.+?)\n {0,3}(=+|-+) *(?:\n+|$)/,paragraph:s(p).replace("hr",i).replace("heading"," *#{1,6} *[^\n]").replace("lheading",c).replace("|table","").replace("blockquote"," {0,3}>").replace("|fences","").replace("|list","").replace("|html","").replace("|tag","").getRegex()},R=/^( {2,}|\\)\n(?!\s*$)/,S=/[!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~·！￥……（）——《》「」『』【】、；：‘’“”，。、]/u,T=/[\s!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~·！￥……（）——《》「」『』【】、；：‘’“”，。、]/,z=/[^a-zA-Z0-9\u4e00-\u9fa5\s!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~·！￥……（）——《》「」『』【】、；：‘’“”，。、]/,A=s(/^((?![*_])punctSpace)/,"u").replace(/punctSpace/g,T).getRegex(),_=/[!"#$%&'()*+,-./:;<=>?@[\]^_`{|}·！￥……（）——《》「」『』【】、；：‘’“”，。、]/,P=/^(?:\*+(?:((?!\*)punct)|[^\s*]))|^_+(?:((?!_)punct)|([^\s_]))/,I=s(P,"u").replace(/punct/g,S).getRegex(),L=s(P,"u").replace(/punct/g,_).getRegex(),B="^[^_*]*?__[^_*]*?\\*[^_*]*?(?=__)|[^*]+(?=[^*])|(?!\\*)punct(\\*+)(?=[\\s]|$)|notPunctSpace(\\*+)(?!\\*)(?=punctSpace|$)|(?!\\*)punctSpace(\\*+)(?=notPunctSpace)|[\\s](\\*+)(?!\\*)(?=punct)|(?!\\*)punct(\\*+)(?!\\*)(?=punct)|notPunctSpace(\\*+)(?=notPunctSpace)",C=s(B,"gu").replace(/notPunctSpace/g,z).replace(/punctSpace/g,T).replace(/punct/g,S).getRegex(),q=s(B,"gu").replace(/notPunctSpace/g,/[a-zA-Z0-9\u4e00-\u9fa5~]/).replace(/punctSpace/g,/[\s!"#$%&'()*+,-./:;<=>?@[\]^_`{|}·！￥……（）——《》「」『』【】、；：‘’“”，。、]/).replace(/punct/g,_).getRegex(),E=s("^[^_*]*?\\*\\*[^_*]*?_[^_*]*?(?=\\*\\*)|[^_]+(?=[^_])|(?!_)punct(_+)(?=[\\s]|$)|notPunctSpace(_+)(?!_)(?=punctSpace|$)|(?!_)punctSpace(_+)(?=notPunctSpace)|[\\s](_+)(?!_)(?=punct)|(?!_)punct(_+)(?!_)(?=punct)","gu").replace(/notPunctSpace/g,z).replace(/punctSpace/g,T).replace(/punct/g,S).getRegex(),v=s(/\\(punct)/,"gu").replace(/punct/g,S).getRegex(),Z=s(/^<(scheme:[^\s\x00-\x1f<>]*|email)>/).replace("scheme",/[a-zA-Z][a-zA-Z0-9+.-]{1,31}/).replace("email",/[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/).getRegex(),D=s(f).replace("(?:--\x3e|$)","--\x3e").getRegex(),M=s("^comment|^</[a-zA-Z][\\w:-]*\\s*>|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>|^<\\?[\\s\\S]*?\\?>|^<![a-zA-Z]+\\s[\\s\\S]*?>|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>").replace("comment",D).replace("attribute",/\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/).getRegex(),O=/(?:\[(?:\\.|[^\[\]\\])*\]|\\.|`[^`]*`|[^\[\]\\`])*?/,Q=s(/^!?\[(label)\]\(\s*(href)(?:(?:[ \t]*(?:\n[ \t]*)?)(title))?\s*\)/).replace("label",O).replace("href",/<(?:\\.|[^\n<>\\])+>|[^ \t\n\x00-\x1f]*/).replace("title",/"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/).getRegex(),N=s(/^!?\[(label)\]\[(ref)\]/).replace("label",O).replace("ref",u).getRegex(),j=s(/^!?\[(ref)\](?:\[\])?/).replace("ref",u).getRegex(),G={_backpedal:r,anyPunctuation:v,autolink:Z,blockSkip:/\[[^[\]]*?\]\((?:\\.|[^\\\(\)]|\((?:\\.|[^\\\(\)])*\))*\)|`[^`]*?`|<(?! )[^<>]*?>/g,br:R,code:/^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/,del:r,emStrongLDelim:I,emStrongRDelimAst:C,emStrongRDelimUnd:E,escape:/^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/,link:Q,nolink:j,punctuation:A,reflink:N,reflinkSearch:s("reflink|nolink(?!\\()","g").replace("reflink",N).replace("nolink",j).getRegex(),tag:M,text:/^(`+|[^`])(?:(?= {2,}\n)|[\s\S]*?(?:(?=[\\<!\[`*_]|\b_|$)|[^ ](?= {2,}\n)))/,url:r},H={...G,link:s(/^!?\[(label)\]\((.*?)\)/).replace("label",O).getRegex(),reflink:s(/^!?\[(label)\]\s*\[([^\]]*)\]/).replace("label",O).getRegex()},W={...G,emStrongRDelimAst:q,emStrongLDelim:L,url:s(/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/,"i").replace("email",/[A-Za-z0-9._+-]+(@)[a-zA-Z0-9-_]+(?:\.[a-zA-Z0-9-_]*[a-zA-Z0-9])+(?![-_])/).getRegex(),_backpedal:/(?:[^?!.,:;*_'"~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_'"~)]+(?!$))+/,del:/^(~~?)(?=[^\s~])((?:\\.|[^\\])*?(?:\\.|[^\s~\\]))\1(?=[^~]|$)/,text:/^([`~]+|[^`~])(?:(?= {2,}\n)|(?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)|[\s\S]*?(?:(?=[\\<!\[`*~_]|\b_|https?:\/\/|ftp:\/\/|www\.|$)|[^ ](?= {2,}\n)|[^a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-](?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)))/},X={...W,br:s(R).replace("{2,}","*").getRegex(),text:s(W.text).replace("\\b_","\\b_| {2,}\\n").replace(/\{2,\}/g,"*").getRegex()},F={normal:w,gfm:y,pedantic:$},U={normal:G,gfm:W,breaks:X,pedantic:H},J={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"},K=e=>J[e];function V(e,t){if(t){if(l.escapeTest.test(e))return e.replace(l.escapeReplace,K)}else if(l.escapeTestNoEncode.test(e))return e.replace(l.escapeReplaceNoEncode,K);return e}function Y(e){try{e=encodeURI(e).replace(l.percentDecode,"%")}catch{return null}return e}function ee(e,t){let n=e.replace(l.findPipe,((e,t,n)=>{let r=!1,s=t;for(;--s>=0&&"\\"===n[s];)r=!r;return r?"|":" |"})).split(l.splitPipe),r=0;if(n[0].trim()||n.shift(),n.length>0&&!n.at(-1)?.trim()&&n.pop(),t)if(n.length>t)n.splice(t);else for(;n.length<t;)n.push("");for(;r<n.length;r++)n[r]=n[r].trim().replace(l.slashPipe,"|");return n}function te(e,t,n){let r=e.length;if(0===r)return"";let s=0;for(;s<r;){let l=e.charAt(r-s-1);if(l!==t||n){if(l===t||!n)break;s++}else s++}return e.slice(0,r-s)}function ne(e,t,n,r,s){let l=t.href,i=t.title||null,a=e[1].replace(s.other.outputLinkReplace,"$1");r.state.inLink=!0;let o={type:"!"===e[0].charAt(0)?"image":"link",raw:n,href:l,title:i,text:a,tokens:r.inlineTokens(a)};return r.state.inLink=!1,o}var re=class{options;rules;lexer;constructor(e){this.options=e||t}space(e){let t=this.rules.block.newline.exec(e);if(t&&t[0].length>0)return{type:"space",raw:t[0]}}code(e){let t=this.rules.block.code.exec(e);if(t){let e=t[0].replace(this.rules.other.codeRemoveIndent,"");return{type:"code",raw:t[0],codeBlockStyle:"indented",text:this.options.pedantic?e:te(e,"\n")}}}fences(e){let t=this.rules.block.fences.exec(e);if(t){let e=t[0],n=function(e,t,n){let r=e.match(n.other.indentCodeCompensation);if(null===r)return t;let s=r[1];return t.split("\n").map((e=>{let t=e.match(n.other.beginningSpace);if(null===t)return e;let[r]=t;return r.length>=s.length?e.slice(s.length):e})).join("\n")}(e,t[3]||"",this.rules);return{type:"code",raw:e,lang:t[2]?t[2].trim().replace(this.rules.inline.anyPunctuation,"$1"):t[2],text:n}}}heading(e){let t=this.rules.block.heading.exec(e);if(t){let e=t[2].trim();if(this.rules.other.endingHash.test(e)){let t=te(e,"#");(this.options.pedantic||!t||this.rules.other.endingSpaceChar.test(t))&&(e=t.trim())}return{type:"heading",raw:t[0],depth:t[1].length,text:e,tokens:this.lexer.inline(e)}}}hr(e){let t=this.rules.block.hr.exec(e);if(t)return{type:"hr",raw:te(t[0],"\n")}}blockquote(e){let t=this.rules.block.blockquote.exec(e);if(t){let e=te(t[0],"\n").split("\n"),n="",r="",s=[];for(;e.length>0;){let t,l=!1,i=[];for(t=0;t<e.length;t++)if(this.rules.other.blockquoteStart.test(e[t]))i.push(e[t]),l=!0;else{if(l)break;i.push(e[t])}e=e.slice(t);let a=i.join("\n"),o=a.replace(this.rules.other.blockquoteSetextReplace,"\n    $1").replace(this.rules.other.blockquoteSetextReplace2,"");n=n?`${n}\n${a}`:a,r=r?`${r}\n${o}`:o;let c=this.lexer.state.top;if(this.lexer.state.top=!0,this.lexer.blockTokens(o,s,!0),this.lexer.state.top=c,0===e.length)break;let h=s.at(-1);if("code"===h?.type)break;if("blockquote"===h?.type){let t=h,l=t.raw+"\n"+e.join("\n"),i=this.blockquote(l);s[s.length-1]=i,n=n.substring(0,n.length-t.raw.length)+i.raw,r=r.substring(0,r.length-t.text.length)+i.text;break}if("list"!==h?.type);else{let t=h,l=t.raw+"\n"+e.join("\n"),i=this.list(l);s[s.length-1]=i,n=n.substring(0,n.length-h.raw.length)+i.raw,r=r.substring(0,r.length-t.raw.length)+i.raw,e=l.substring(s.at(-1).raw.length).split("\n")}}return{type:"blockquote",raw:n,tokens:s,text:r}}}list(e){let t=this.rules.block.list.exec(e);if(t){let n=t[1].trim(),r=n.length>1,s={type:"list",raw:"",ordered:r,start:r?+n.slice(0,-1):"",loose:!1,items:[]};n=r?`\\d{1,9}\\${n.slice(-1)}`:`\\${n}`,this.options.pedantic&&(n=r?n:"[*+-]");let l=this.rules.other.listItemRegex(n),i=!1;for(;e;){let n=!1,r="",a="";if(!(t=l.exec(e))||this.rules.block.hr.test(e))break;r=t[0],e=e.substring(r.length);let o=t[2].split("\n",1)[0].replace(this.rules.other.listReplaceTabs,(e=>" ".repeat(3*e.length))),c=e.split("\n",1)[0],h=!o.trim(),p=0;if(this.options.pedantic?(p=2,a=o.trimStart()):h?p=t[1].length+1:(p=t[2].search(this.rules.other.nonSpaceChar),p=p>4?1:p,a=o.slice(p),p+=t[1].length),h&&this.rules.other.blankLine.test(c)&&(r+=c+"\n",e=e.substring(c.length+1),n=!0),!n){let t=this.rules.other.nextBulletRegex(p),n=this.rules.other.hrRegex(p),s=this.rules.other.fencesBeginRegex(p),l=this.rules.other.headingBeginRegex(p),i=this.rules.other.htmlBeginRegex(p);for(;e;){let u,g=e.split("\n",1)[0];if(c=g,this.options.pedantic?(c=c.replace(this.rules.other.listReplaceNesting,"  "),u=c):u=c.replace(this.rules.other.tabCharGlobal,"    "),s.test(c)||l.test(c)||i.test(c)||t.test(c)||n.test(c))break;if(u.search(this.rules.other.nonSpaceChar)>=p||!c.trim())a+="\n"+u.slice(p);else{if(h||o.replace(this.rules.other.tabCharGlobal,"    ").search(this.rules.other.nonSpaceChar)>=4||s.test(o)||l.test(o)||n.test(o))break;a+="\n"+c}!h&&!c.trim()&&(h=!0),r+=g+"\n",e=e.substring(g.length+1),o=u.slice(p)}}s.loose||(i?s.loose=!0:this.rules.other.doubleBlankLine.test(r)&&(i=!0));let u,g=null;this.options.gfm&&(g=this.rules.other.listIsTask.exec(a),g&&(u="[ ] "!==g[0],a=a.replace(this.rules.other.listReplaceTask,""))),s.items.push({type:"list_item",raw:r,task:!!g,checked:u,loose:!1,text:a,tokens:[]}),s.raw+=r}let a=s.items.at(-1);if(!a)return;a.raw=a.raw.trimEnd(),a.text=a.text.trimEnd(),s.raw=s.raw.trimEnd();for(let e=0;e<s.items.length;e++)if(this.lexer.state.top=!1,s.items[e].tokens=this.lexer.blockTokens(s.items[e].text,[]),!s.loose){let t=s.items[e].tokens.filter((e=>"space"===e.type)),n=t.length>0&&t.some((e=>this.rules.other.anyLine.test(e.raw)));s.loose=n}if(s.loose)for(let e=0;e<s.items.length;e++)s.items[e].loose=!0;return s}}html(e){let t=this.rules.block.html.exec(e);if(t)return{type:"html",block:!0,raw:t[0],pre:"pre"===t[1]||"script"===t[1]||"style"===t[1],text:t[0]}}def(e){let t=this.rules.block.def.exec(e);if(t){let e=t[1].toLowerCase().replace(this.rules.other.multipleSpaceGlobal," "),n=t[2]?t[2].replace(this.rules.other.hrefBrackets,"$1").replace(this.rules.inline.anyPunctuation,"$1"):"",r=t[3]?t[3].substring(1,t[3].length-1).replace(this.rules.inline.anyPunctuation,"$1"):t[3];return{type:"def",tag:e,raw:t[0],href:n,title:r}}}table(e){let t=this.rules.block.table.exec(e);if(!t||!this.rules.other.tableDelimiter.test(t[2]))return;let n=ee(t[1]),r=t[2].replace(this.rules.other.tableAlignChars,"").split("|"),s=t[3]?.trim()?t[3].replace(this.rules.other.tableRowBlankLine,"").split("\n"):[],l={type:"table",raw:t[0],header:[],align:[],rows:[]};if(n.length===r.length){for(let e of r)this.rules.other.tableAlignRight.test(e)?l.align.push("right"):this.rules.other.tableAlignCenter.test(e)?l.align.push("center"):this.rules.other.tableAlignLeft.test(e)?l.align.push("left"):l.align.push(null);for(let e=0;e<n.length;e++)l.header.push({text:n[e],tokens:this.lexer.inline(n[e]),header:!0,align:l.align[e]});for(let e of s)l.rows.push(ee(e,l.header.length).map(((e,t)=>({text:e,tokens:this.lexer.inline(e),header:!1,align:l.align[t]}))));return l}}lheading(e){let t=this.rules.block.lheading.exec(e);if(t)return{type:"heading",raw:t[0],depth:"="===t[2].charAt(0)?1:2,text:t[1],tokens:this.lexer.inline(t[1])}}paragraph(e){let t=this.rules.block.paragraph.exec(e);if(t){let e="\n"===t[1].charAt(t[1].length-1)?t[1].slice(0,-1):t[1];return{type:"paragraph",raw:t[0],text:e,tokens:this.lexer.inline(e)}}}text(e){let t=this.rules.block.text.exec(e);if(t)return{type:"text",raw:t[0],text:t[0],tokens:this.lexer.inline(t[0])}}escape(e){let t=this.rules.inline.escape.exec(e);if(t)return{type:"escape",raw:t[0],text:t[1]}}tag(e){let t=this.rules.inline.tag.exec(e);if(t)return!this.lexer.state.inLink&&this.rules.other.startATag.test(t[0])?this.lexer.state.inLink=!0:this.lexer.state.inLink&&this.rules.other.endATag.test(t[0])&&(this.lexer.state.inLink=!1),!this.lexer.state.inRawBlock&&this.rules.other.startPreScriptTag.test(t[0])?this.lexer.state.inRawBlock=!0:this.lexer.state.inRawBlock&&this.rules.other.endPreScriptTag.test(t[0])&&(this.lexer.state.inRawBlock=!1),{type:"html",raw:t[0],inLink:this.lexer.state.inLink,inRawBlock:this.lexer.state.inRawBlock,block:!1,text:t[0]}}link(e){let t=this.rules.inline.link.exec(e);if(t){let e=t[2].trim();if(!this.options.pedantic&&this.rules.other.startAngleBracket.test(e)){if(!this.rules.other.endAngleBracket.test(e))return;let t=te(e.slice(0,-1),"\\");if((e.length-t.length)%2==0)return}else{let e=function(e,t){if(-1===e.indexOf(t[1]))return-1;let n=0;for(let r=0;r<e.length;r++)if("\\"===e[r])r++;else if(e[r]===t[0])n++;else if(e[r]===t[1]&&(n--,n<0))return r;return n>0?-2:-1}(t[2],"()");if(-2===e)return;if(e>-1){let n=(0===t[0].indexOf("!")?5:4)+t[1].length+e;t[2]=t[2].substring(0,e),t[0]=t[0].substring(0,n).trim(),t[3]=""}}let n=t[2],r="";if(this.options.pedantic){let e=this.rules.other.pedanticHrefTitle.exec(n);e&&(n=e[1],r=e[3])}else r=t[3]?t[3].slice(1,-1):"";return n=n.trim(),this.rules.other.startAngleBracket.test(n)&&(n=this.options.pedantic&&!this.rules.other.endAngleBracket.test(e)?n.slice(1):n.slice(1,-1)),ne(t,{href:n&&n.replace(this.rules.inline.anyPunctuation,"$1"),title:r&&r.replace(this.rules.inline.anyPunctuation,"$1")},t[0],this.lexer,this.rules)}}reflink(e,t){let n;if((n=this.rules.inline.reflink.exec(e))||(n=this.rules.inline.nolink.exec(e))){let e=t[(n[2]||n[1]).replace(this.rules.other.multipleSpaceGlobal," ").toLowerCase()];if(!e){let e=n[0].charAt(0);return{type:"text",raw:e,text:e}}return ne(n,e,n[0],this.lexer,this.rules)}}emStrong(e,t,n=""){let r=this.rules.inline.emStrongLDelim.exec(e);if(!(!r||r[3]&&n.match(this.rules.other.unicodeAlphaNumeric))&&(!r[1]&&!r[2]||!n||this.rules.inline.punctuation.exec(n))){let n,s,l=[...r[0]].length-1,i=l,a=0,o="*"===r[0][0]?this.rules.inline.emStrongRDelimAst:this.rules.inline.emStrongRDelimUnd;for(o.lastIndex=0,t=t.slice(-1*e.length+l);null!=(r=o.exec(t));){if(n=r[1]||r[2]||r[3]||r[4]||r[5]||r[6],!n)continue;if(s=[...n].length,r[3]||r[4]){i+=s;continue}if((r[5]||r[6])&&l%3&&!((l+s)%3)){a+=s;continue}if(i-=s,i>0)continue;s=Math.min(s,s+i+a);let t=[...r[0]][0].length,o=e.slice(0,l+r.index+t+s);if(Math.min(l,s)%2){let e=o.slice(1,-1);return{type:"em",raw:o,text:e,tokens:this.lexer.inlineTokens(e)}}let c=o.slice(2,-2);return{type:"strong",raw:o,text:c,tokens:this.lexer.inlineTokens(c)}}}}codespan(e){let t=this.rules.inline.code.exec(e);if(t){let e=t[2].replace(this.rules.other.newLineCharGlobal," "),n=this.rules.other.nonSpaceChar.test(e),r=this.rules.other.startingSpaceChar.test(e)&&this.rules.other.endingSpaceChar.test(e);return n&&r&&(e=e.substring(1,e.length-1)),{type:"codespan",raw:t[0],text:e}}}br(e){let t=this.rules.inline.br.exec(e);if(t)return{type:"br",raw:t[0]}}del(e){let t=this.rules.inline.del.exec(e);if(t)return{type:"del",raw:t[0],text:t[2],tokens:this.lexer.inlineTokens(t[2])}}autolink(e){let t=this.rules.inline.autolink.exec(e);if(t){let e,n;return"@"===t[2]?(e=t[1],n="mailto:"+e):(e=t[1],n=e),{type:"link",raw:t[0],text:e,href:n,tokens:[{type:"text",raw:e,text:e}]}}}url(e){let t;if(t=this.rules.inline.url.exec(e)){let e,n;if("@"===t[2])e=t[0],n="mailto:"+e;else{let r;do{r=t[0],t[0]=this.rules.inline._backpedal.exec(t[0])?.[0]??""}while(r!==t[0]);e=t[0],n="www."===t[1]?"http://"+t[0]:t[0]}return{type:"link",raw:t[0],text:e,href:n,tokens:[{type:"text",raw:e,text:e}]}}}inlineText(e){let t=this.rules.inline.text.exec(e);if(t){let e=this.lexer.state.inRawBlock;return{type:"text",raw:t[0],text:t[0],escaped:e}}}},se=class e{tokens;options;state;tokenizer;inlineQueue;constructor(e){this.tokens=[],this.tokens.links=Object.create(null),this.options=e||t,this.options.tokenizer=this.options.tokenizer||new re,this.tokenizer=this.options.tokenizer,this.tokenizer.options=this.options,this.tokenizer.lexer=this,this.inlineQueue=[],this.state={inLink:!1,inRawBlock:!1,top:!0};let n={other:l,block:F.normal,inline:U.normal};this.options.pedantic?(n.block=F.pedantic,n.inline=U.pedantic):this.options.gfm&&(n.block=F.gfm,this.options.breaks?n.inline=U.breaks:n.inline=U.gfm),this.tokenizer.rules=n}static get rules(){return{block:F,inline:U}}static lex(t,n){return new e(n).lex(t)}static lexInline(t,n){return new e(n).inlineTokens(t)}lex(e){e=e.replace(l.carriageReturn,"\n"),this.blockTokens(e,this.tokens);for(let e=0;e<this.inlineQueue.length;e++){let t=this.inlineQueue[e];this.inlineTokens(t.src,t.tokens)}return this.inlineQueue=[],this.tokens}blockTokens(e,t=[],n=!1){for(this.options.pedantic&&(e=e.replace(l.tabCharGlobal,"    ").replace(l.spaceLine,""));e;){let r;if(this.options.extensions?.block?.some((n=>!!(r=n.call({lexer:this},e,t))&&(e=e.substring(r.raw.length),t.push(r),!0))))continue;if(r=this.tokenizer.space(e)){e=e.substring(r.raw.length);let n=t.at(-1);1===r.raw.length&&void 0!==n?n.raw+="\n":t.push(r);continue}if(r=this.tokenizer.code(e)){e=e.substring(r.raw.length);let n=t.at(-1);"paragraph"===n?.type||"text"===n?.type?(n.raw+=(n.raw.endsWith("\n")?"":"\n")+r.raw,n.text+="\n"+r.text,this.inlineQueue.at(-1).src=n.text):t.push(r);continue}if(r=this.tokenizer.fences(e)){e=e.substring(r.raw.length),t.push(r);continue}if(r=this.tokenizer.heading(e)){e=e.substring(r.raw.length),t.push(r);continue}if(r=this.tokenizer.hr(e)){e=e.substring(r.raw.length),t.push(r);continue}if(r=this.tokenizer.blockquote(e)){e=e.substring(r.raw.length),t.push(r);continue}if(r=this.tokenizer.list(e)){e=e.substring(r.raw.length),t.push(r);continue}if(r=this.tokenizer.html(e)){e=e.substring(r.raw.length),t.push(r);continue}if(r=this.tokenizer.def(e)){e=e.substring(r.raw.length);let n=t.at(-1);"paragraph"===n?.type||"text"===n?.type?(n.raw+=(n.raw.endsWith("\n")?"":"\n")+r.raw,n.text+="\n"+r.raw,this.inlineQueue.at(-1).src=n.text):this.tokens.links[r.tag]||(this.tokens.links[r.tag]={href:r.href,title:r.title});continue}if(r=this.tokenizer.table(e)){e=e.substring(r.raw.length),t.push(r);continue}if(r=this.tokenizer.lheading(e)){e=e.substring(r.raw.length),t.push(r);continue}let s=e;if(this.options.extensions?.startBlock){let t,n=1/0,r=e.slice(1);this.options.extensions.startBlock.forEach((e=>{t=e.call({lexer:this},r),"number"==typeof t&&t>=0&&(n=Math.min(n,t))})),n<1/0&&n>=0&&(s=e.substring(0,n+1))}if(this.state.top&&(r=this.tokenizer.paragraph(s))){let l=t.at(-1);n&&"paragraph"===l?.type?(l.raw+=(l.raw.endsWith("\n")?"":"\n")+r.raw,l.text+="\n"+r.text,this.inlineQueue.pop(),this.inlineQueue.at(-1).src=l.text):t.push(r),n=s.length!==e.length,e=e.substring(r.raw.length)}else if(r=this.tokenizer.text(e)){e=e.substring(r.raw.length);let n=t.at(-1);"text"===n?.type?(n.raw+=(n.raw.endsWith("\n")?"":"\n")+r.raw,n.text+="\n"+r.text,this.inlineQueue.pop(),this.inlineQueue.at(-1).src=n.text):t.push(r)}else if(e){let t="Infinite loop on byte: "+e.charCodeAt(0);if(this.options.silent){console.error(t);break}throw new Error(t)}}return this.state.top=!0,t}inline(e,t=[]){return this.inlineQueue.push({src:e,tokens:t}),t}inlineTokens(e,t=[]){let n=e,r=null;if(this.tokens.links){let e=Object.keys(this.tokens.links);if(e.length>0)for(;null!=(r=this.tokenizer.rules.inline.reflinkSearch.exec(n));)e.includes(r[0].slice(r[0].lastIndexOf("[")+1,-1))&&(n=n.slice(0,r.index)+"["+"a".repeat(r[0].length-2)+"]"+n.slice(this.tokenizer.rules.inline.reflinkSearch.lastIndex))}for(;null!=(r=this.tokenizer.rules.inline.anyPunctuation.exec(n));)n=n.slice(0,r.index)+"++"+n.slice(this.tokenizer.rules.inline.anyPunctuation.lastIndex);for(;null!=(r=this.tokenizer.rules.inline.blockSkip.exec(n));)n=n.slice(0,r.index)+"["+"a".repeat(r[0].length-2)+"]"+n.slice(this.tokenizer.rules.inline.blockSkip.lastIndex);let s=!1,l="";for(;e;){let r;if(s||(l=""),s=!1,this.options.extensions?.inline?.some((n=>!!(r=n.call({lexer:this},e,t))&&(e=e.substring(r.raw.length),t.push(r),!0))))continue;if(r=this.tokenizer.escape(e)){e=e.substring(r.raw.length),t.push(r);continue}if(r=this.tokenizer.tag(e)){e=e.substring(r.raw.length),t.push(r);continue}if(r=this.tokenizer.link(e)){e=e.substring(r.raw.length),t.push(r);continue}if(r=this.tokenizer.reflink(e,this.tokens.links)){e=e.substring(r.raw.length);let n=t.at(-1);"text"===r.type&&"text"===n?.type?(n.raw+=r.raw,n.text+=r.text):t.push(r);continue}if(r=this.tokenizer.emStrong(e,n,l)){e=e.substring(r.raw.length),t.push(r);continue}if(r=this.tokenizer.codespan(e)){e=e.substring(r.raw.length),t.push(r);continue}if(r=this.tokenizer.br(e)){e=e.substring(r.raw.length),t.push(r);continue}if(r=this.tokenizer.del(e)){e=e.substring(r.raw.length),t.push(r);continue}if(r=this.tokenizer.autolink(e)){e=e.substring(r.raw.length),t.push(r);continue}if(!this.state.inLink&&(r=this.tokenizer.url(e))){e=e.substring(r.raw.length),t.push(r);continue}let i=e;if(this.options.extensions?.startInline){let t,n=1/0,r=e.slice(1);this.options.extensions.startInline.forEach((e=>{t=e.call({lexer:this},r),"number"==typeof t&&t>=0&&(n=Math.min(n,t))})),n<1/0&&n>=0&&(i=e.substring(0,n+1))}if(r=this.tokenizer.inlineText(i)){e=e.substring(r.raw.length),"_"!==r.raw.slice(-1)&&(l=r.raw.slice(-1)),s=!0;let n=t.at(-1);"text"===n?.type?(n.raw+=r.raw,n.text+=r.text):t.push(r)}else if(e){let t="Infinite loop on byte: "+e.charCodeAt(0);if(this.options.silent){console.error(t);break}throw new Error(t)}}return t}},le=class{options;parser;constructor(e){this.options=e||t}space(e){return""}code({text:e,lang:t,escaped:n}){let r=(t||"").match(l.notSpaceStart)?.[0],s=e.replace(l.endingNewline,"")+"\n";return r?'<pre><code class="language-'+V(r)+'">'+(n?s:V(s,!0))+"</code></pre>\n":"<pre><code>"+(n?s:V(s,!0))+"</code></pre>\n"}blockquote({tokens:e}){return`<blockquote>\n${this.parser.parse(e)}</blockquote>\n`}html({text:e}){return e}heading({tokens:e,depth:t}){return`<h${t}>${this.parser.parseInline(e)}</h${t}>\n`}hr(e){return"<hr>\n"}list(e){let t=e.ordered,n=e.start,r="";for(let t=0;t<e.items.length;t++){let n=e.items[t];r+=this.listitem(n)}let s=t?"ol":"ul";return"<"+s+(t&&1!==n?' start="'+n+'"':"")+">\n"+r+"</"+s+">\n"}listitem(e){let t="";if(e.task){let n=this.checkbox({checked:!!e.checked});e.loose?"paragraph"===e.tokens[0]?.type?(e.tokens[0].text=n+" "+e.tokens[0].text,e.tokens[0].tokens&&e.tokens[0].tokens.length>0&&"text"===e.tokens[0].tokens[0].type&&(e.tokens[0].tokens[0].text=n+" "+V(e.tokens[0].tokens[0].text),e.tokens[0].tokens[0].escaped=!0)):e.tokens.unshift({type:"text",raw:n+" ",text:n+" ",escaped:!0}):t+=n+" "}return t+=this.parser.parse(e.tokens,!!e.loose),`<li>${t}</li>\n`}checkbox({checked:e}){return"<input "+(e?'checked="" ':"")+'disabled="" type="checkbox">'}paragraph({tokens:e}){return`<p>${this.parser.parseInline(e)}</p>\n`}table(e){let t="",n="";for(let t=0;t<e.header.length;t++)n+=this.tablecell(e.header[t]);t+=this.tablerow({text:n});let r="";for(let t=0;t<e.rows.length;t++){let s=e.rows[t];n="";for(let e=0;e<s.length;e++)n+=this.tablecell(s[e]);r+=this.tablerow({text:n})}return r&&(r=`<tbody>${r}</tbody>`),"<table>\n<thead>\n"+t+"</thead>\n"+r+"</table>\n"}tablerow({text:e}){return`<tr>\n${e}</tr>\n`}tablecell(e){let t=this.parser.parseInline(e.tokens),n=e.header?"th":"td";return(e.align?`<${n} align="${e.align}">`:`<${n}>`)+t+`</${n}>\n`}strong({tokens:e}){return`<strong>${this.parser.parseInline(e)}</strong>`}em({tokens:e}){return`<em>${this.parser.parseInline(e)}</em>`}codespan({text:e}){return`<code>${V(e,!0)}</code>`}br(e){return"<br>"}del({tokens:e}){return`<del>${this.parser.parseInline(e)}</del>`}link({href:e,title:t,tokens:n}){let r=this.parser.parseInline(n),s=Y(e);if(null===s)return r;let l='<a href="'+(e=s)+'"';return t&&(l+=' title="'+V(t)+'"'),l+=">"+r+"</a>",l}image({href:e,title:t,text:n,tokens:r}){r&&(n=this.parser.parseInline(r,this.parser.textRenderer));let s=Y(e);if(null===s)return V(n);let l=`<img src="${e=s}" alt="${n}"`;return t&&(l+=` title="${V(t)}"`),l+=">",l}text(e){return"tokens"in e&&e.tokens?this.parser.parseInline(e.tokens):"escaped"in e&&e.escaped?e.text:V(e.text)}},ie=class{strong({text:e}){return e}em({text:e}){return e}codespan({text:e}){return e}del({text:e}){return e}html({text:e}){return e}text({text:e}){return e}link({text:e}){return""+e}image({text:e}){return""+e}br(){return""}},ae=class e{options;renderer;textRenderer;constructor(e){this.options=e||t,this.options.renderer=this.options.renderer||new le,this.renderer=this.options.renderer,this.renderer.options=this.options,this.renderer.parser=this,this.textRenderer=new ie}static parse(t,n){return new e(n).parse(t)}static parseInline(t,n){return new e(n).parseInline(t)}parse(e,t=!0){let n="";for(let r=0;r<e.length;r++){let s=e[r];if(this.options.extensions?.renderers?.[s.type]){let e=s,t=this.options.extensions.renderers[e.type].call({parser:this},e);if(!1!==t||!["space","hr","heading","code","table","blockquote","list","html","paragraph","text"].includes(e.type)){n+=t||"";continue}}let l=s;switch(l.type){case"space":n+=this.renderer.space(l);continue;case"hr":n+=this.renderer.hr(l);continue;case"heading":n+=this.renderer.heading(l);continue;case"code":n+=this.renderer.code(l);continue;case"table":n+=this.renderer.table(l);continue;case"blockquote":n+=this.renderer.blockquote(l);continue;case"list":n+=this.renderer.list(l);continue;case"html":n+=this.renderer.html(l);continue;case"paragraph":n+=this.renderer.paragraph(l);continue;case"text":{let s=l,i=this.renderer.text(s);for(;r+1<e.length&&"text"===e[r+1].type;)s=e[++r],i+="\n"+this.renderer.text(s);n+=t?this.renderer.paragraph({type:"paragraph",raw:i,text:i,tokens:[{type:"text",raw:i,text:i,escaped:!0}]}):i;continue}default:{let e='Token with "'+l.type+'" type was not found.';if(this.options.silent)return console.error(e),"";throw new Error(e)}}}return n}parseInline(e,t=this.renderer){let n="";for(let r=0;r<e.length;r++){let s=e[r];if(this.options.extensions?.renderers?.[s.type]){let e=this.options.extensions.renderers[s.type].call({parser:this},s);if(!1!==e||!["escape","html","link","image","strong","em","codespan","br","del","text"].includes(s.type)){n+=e||"";continue}}let l=s;switch(l.type){case"escape":case"text":n+=t.text(l);break;case"html":n+=t.html(l);break;case"link":n+=t.link(l);break;case"image":n+=t.image(l);break;case"strong":n+=t.strong(l);break;case"em":n+=t.em(l);break;case"codespan":n+=t.codespan(l);break;case"br":n+=t.br(l);break;case"del":n+=t.del(l);break;default:{let e='Token with "'+l.type+'" type was not found.';if(this.options.silent)return console.error(e),"";throw new Error(e)}}}return n}},oe=class{options;block;constructor(e){this.options=e||t}static passThroughHooks=new Set(["preprocess","postprocess","processAllTokens"]);preprocess(e){return e}postprocess(e){return e}processAllTokens(e){return e}provideLexer(){return this.block?se.lex:se.lexInline}provideParser(){return this.block?ae.parse:ae.parseInline}},ce=class{defaults={async:!1,breaks:!1,extensions:null,gfm:!0,hooks:null,pedantic:!1,renderer:null,silent:!1,tokenizer:null,walkTokens:null};options=this.setOptions;parse=this.parseMarkdown(!0);parseInline=this.parseMarkdown(!1);Parser=ae;Renderer=le;TextRenderer=ie;Lexer=se;Tokenizer=re;Hooks=oe;constructor(...e){this.use(...e)}walkTokens(e,t){let n=[];for(let r of e)switch(n=n.concat(t.call(this,r)),r.type){case"table":{let e=r;for(let r of e.header)n=n.concat(this.walkTokens(r.tokens,t));for(let r of e.rows)for(let e of r)n=n.concat(this.walkTokens(e.tokens,t));break}case"list":{let e=r;n=n.concat(this.walkTokens(e.items,t));break}default:{let e=r;this.defaults.extensions?.childTokens?.[e.type]?this.defaults.extensions.childTokens[e.type].forEach((r=>{let s=e[r].flat(1/0);n=n.concat(this.walkTokens(s,t))})):e.tokens&&(n=n.concat(this.walkTokens(e.tokens,t)))}}return n}use(...e){let t=this.defaults.extensions||{renderers:{},childTokens:{}};return e.forEach((e=>{let n={...e};if(n.async=this.defaults.async||n.async||!1,e.extensions&&(e.extensions.forEach((e=>{if(!e.name)throw new Error("extension name required");if("renderer"in e){let n=t.renderers[e.name];t.renderers[e.name]=n?function(...t){let r=e.renderer.apply(this,t);return!1===r&&(r=n.apply(this,t)),r}:e.renderer}if("tokenizer"in e){if(!e.level||"block"!==e.level&&"inline"!==e.level)throw new Error("extension level must be 'block' or 'inline'");let n=t[e.level];n?n.unshift(e.tokenizer):t[e.level]=[e.tokenizer],e.start&&("block"===e.level?t.startBlock?t.startBlock.push(e.start):t.startBlock=[e.start]:"inline"===e.level&&(t.startInline?t.startInline.push(e.start):t.startInline=[e.start]))}"childTokens"in e&&e.childTokens&&(t.childTokens[e.name]=e.childTokens)})),n.extensions=t),e.renderer){let t=this.defaults.renderer||new le(this.defaults);for(let n in e.renderer){if(!(n in t))throw new Error(`renderer '${n}' does not exist`);if(["options","parser"].includes(n))continue;let r=n,s=e.renderer[r],l=t[r];t[r]=(...e)=>{let n=s.apply(t,e);return!1===n&&(n=l.apply(t,e)),n||""}}n.renderer=t}if(e.tokenizer){let t=this.defaults.tokenizer||new re(this.defaults);for(let n in e.tokenizer){if(!(n in t))throw new Error(`tokenizer '${n}' does not exist`);if(["options","rules","lexer"].includes(n))continue;let r=n,s=e.tokenizer[r],l=t[r];t[r]=(...e)=>{let n=s.apply(t,e);return!1===n&&(n=l.apply(t,e)),n}}n.tokenizer=t}if(e.hooks){let t=this.defaults.hooks||new oe;for(let n in e.hooks){if(!(n in t))throw new Error(`hook '${n}' does not exist`);if(["options","block"].includes(n))continue;let r=n,s=e.hooks[r],l=t[r];oe.passThroughHooks.has(n)?t[r]=e=>{if(this.defaults.async)return Promise.resolve(s.call(t,e)).then((e=>l.call(t,e)));let n=s.call(t,e);return l.call(t,n)}:t[r]=(...e)=>{let n=s.apply(t,e);return!1===n&&(n=l.apply(t,e)),n}}n.hooks=t}if(e.walkTokens){let t=this.defaults.walkTokens,r=e.walkTokens;n.walkTokens=function(e){let n=[];return n.push(r.call(this,e)),t&&(n=n.concat(t.call(this,e))),n}}this.defaults={...this.defaults,...n}})),this}setOptions(e){return this.defaults={...this.defaults,...e},this}lexer(e,t){return se.lex(e,t??this.defaults)}parser(e,t){return ae.parse(e,t??this.defaults)}parseMarkdown(e){return(t,n)=>{let r={...n},s={...this.defaults,...r},l=this.onError(!!s.silent,!!s.async);if(!0===this.defaults.async&&!1===r.async)return l(new Error("marked(): The async option was set to true by an extension. Remove async: false from the parse options object to return a Promise."));if(typeof t>"u"||null===t)return l(new Error("marked(): input parameter is undefined or null"));if("string"!=typeof t)return l(new Error("marked(): input parameter is of type "+Object.prototype.toString.call(t)+", string expected"));s.hooks&&(s.hooks.options=s,s.hooks.block=e);let i=s.hooks?s.hooks.provideLexer():e?se.lex:se.lexInline,a=s.hooks?s.hooks.provideParser():e?ae.parse:ae.parseInline;if(s.async)return Promise.resolve(s.hooks?s.hooks.preprocess(t):t).then((e=>i(e,s))).then((e=>s.hooks?s.hooks.processAllTokens(e):e)).then((e=>s.walkTokens?Promise.all(this.walkTokens(e,s.walkTokens)).then((()=>e)):e)).then((e=>a(e,s))).then((e=>s.hooks?s.hooks.postprocess(e):e)).catch(l);try{s.hooks&&(t=s.hooks.preprocess(t));let e=i(t,s);s.hooks&&(e=s.hooks.processAllTokens(e)),s.walkTokens&&this.walkTokens(e,s.walkTokens);let n=a(e,s);return s.hooks&&(n=s.hooks.postprocess(n)),n}catch(e){return l(e)}}}onError(e,t){return n=>{if(n.message+="\nPlease report this to https://github.com/markedjs/marked.",e){let e="<p>An error occurred:</p><pre>"+V(n.message+"",!0)+"</pre>";return t?Promise.resolve(e):e}if(t)return Promise.reject(n);throw n}}},he=new ce;function pe(e,t){return he.parse(e,t)}pe.options=pe.setOptions=function(e){return he.setOptions(e),pe.defaults=he.defaults,n(pe.defaults),pe},pe.getDefaults=e,pe.defaults=t,pe.use=function(...e){return he.use(...e),pe.defaults=he.defaults,n(pe.defaults),pe},pe.walkTokens=function(e,t){return he.walkTokens(e,t)},pe.parseInline=he.parseInline,pe.Parser=ae,pe.parser=ae.parse,pe.Renderer=le,pe.TextRenderer=ie,pe.Lexer=se,pe.lexer=se.lex,pe.Tokenizer=re,pe.Hooks=oe,pe.parse=pe;var ue=pe.options,ge=pe.setOptions,ke=pe.use,de=pe.walkTokens,fe=pe.parseInline,xe=pe,be=ae.parse,we=se.lex;export{oe as Hooks,se as Lexer,ce as Marked,ae as Parser,le as Renderer,ie as TextRenderer,re as Tokenizer,t as defaults,e as getDefaults,we as lexer,pe as marked,ue as options,xe as parse,fe as parseInline,be as parser,ge as setOptions,ke as use,de as walkTokens};export default null;
diff --git a/uview-plus/components/u-markdown/u-markdown.vue b/uview-plus/components/u-markdown/u-markdown.vue
new file mode 100644
index 0000000..8312b88
--- /dev/null
+++ b/uview-plus/components/u-markdown/u-markdown.vue
@@ -0,0 +1,300 @@
+<template>
+  <view class="up-markdown" :class="theme">
+    <up-parse :content="parsedContent" :previewImg="previewImg"></up-parse>
+  </view>
+</template>
+
+<script>
+import { marked } from './marked.esm.js';
+
+export default {
+  name: 'up-markdown',
+  props: {
+    // markdown内容
+    content: {
+      type: String,
+      default: ''
+    },
+    // 是否启用图片预览
+    previewImg: {
+      type: Boolean,
+      default: true
+    },
+    // 是否显示代码块行号
+    showLineNumber: {
+      type: Boolean,
+      default: false
+    },
+    // 主题样式 'light' | 'dark'
+    theme: {
+      type: String,
+      default: 'light'
+    }
+  },
+  data() {
+    return {
+      parsedContent: ''
+    };
+  },
+  watch: {
+    content: {
+      handler(newVal) {
+        this.parseMarkdown(newVal);
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    // 解析markdown内容
+    parseMarkdown(content) {
+      if (!content) {
+        this.parsedContent = '';
+        return;
+      }
+
+      // 使用marked解析markdown
+      let parsed = marked(content);
+      
+      // 处理代码块
+      parsed = this.handleCodeBlock(parsed);
+      
+      // 应用主题样式
+      parsed = this.applyTheme(parsed);
+      
+      this.parsedContent = parsed;
+    },
+    
+    // 处理代码块
+    handleCodeBlock(html) {
+      // 添加代码块样式和行号
+      return html.replace(/<pre><code([^>]*)>([^<]+)<\/code><\/pre>/g, (match, lang, code) => {
+        const language = lang.match(/class="language-([^"]+)"/);
+        const langClass = language ? `language-${language[1]}` : '';
+        
+        let result = `<pre class="up-markdown-code ${langClass}">`;
+        
+        if (this.showLineNumber) {
+          // 添加行号
+          const lines = code.split('\n').filter(line => line.trim() !== '');
+          result += '<span class="up-markdown-line-numbers">';
+          lines.push('');
+          lines.forEach((_, index) => {
+            result += `<span class="up-markdown-line-number">${index + 1}</span>`;
+          });
+          result += '</span>';
+        }
+        
+        result += `<code class='code-lang ${langClass}'>${code}</code></pre>`;
+        return result;
+      });
+    },
+    
+    // 应用主题样式
+    applyTheme(html) {
+      // 可以根据theme属性添加不同的样式类
+      return html;
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.up-markdown {
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+  font-size: 16px;
+  line-height: 1.6;
+  color: #333;
+  padding: 16px;
+  word-wrap: break-word;
+  
+  /* 标题样式 */
+  ::v-deep h1 {
+    font-size: 32px;
+    margin: 8px 0;
+    font-weight: bold;
+  }
+  
+  ::v-deep h2 {
+    font-size: 24px;
+    margin: 8px 0;
+    font-weight: bold;
+  }
+  
+  ::v-deep h3 {
+    font-size: 18px;
+    margin: 7px 0;
+    font-weight: bold;
+  }
+  
+  ::v-deep h4 {
+    font-size: 16px;
+    margin: 7px 0;
+    font-weight: bold;
+  }
+  
+  ::v-deep h5 {
+    font-size: 13px;
+    margin: 6px 0;
+    font-weight: bold;
+  }
+  
+  ::v-deep h6 {
+    font-size: 10px;
+    margin: 5px 0;
+    font-weight: bold;
+  }
+  
+  /* 段落样式 */
+  ::v-deep p {
+    margin: 16px 0;
+  }
+  
+  /* 链接样式 */
+  ::v-deep a {
+    color: #007AFF;
+    text-decoration: none;
+    
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+  
+  /* 列表样式 */
+  ::v-deep ul,
+  ::v-deep ol {
+    margin: 16px 0;
+    padding-left: 32px;
+    
+    li {
+      margin: 8px 0;
+    }
+  }
+  
+  ::v-deep ul li {
+    list-style-type: disc;
+  }
+  
+  ::v-deep ol li {
+    list-style-type: decimal;
+  }
+  
+  /* 引用样式 */
+  ::v-deep blockquote {
+    margin: 8px 0;
+    padding: 0 10px;
+    border-left: 4px solid #ccc;
+    color: #666;
+  }
+  
+  /* 代码样式 */
+  ::v-deep &-code {
+    font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace;
+    font-size: 14px;
+    background-color: #f6f8fa;
+    padding: 3px 6px;
+    border-radius: 3px;
+    display: flex;
+  }
+  ::v-deep .code-lang {
+    width: 100%;
+    overflow-x: auto;
+  }
+  
+  ::v-deep pre {
+    font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace;
+    font-size: 14px;
+    background-color: #f6f8fa;
+    padding: 16px;
+    overflow: auto;
+    border-radius: 6px;
+    margin: 16px 0;
+    
+    ::v-deep code {
+      background: none;
+      padding: 0;
+    }
+  }
+  
+  /* 表格样式 */
+  ::v-deep table {
+    border-collapse: collapse;
+    margin: 16px 0;
+    width: 100%;
+    
+    th,
+    td {
+      padding: 6px 13px;
+      border: 1px solid #dfe2e5;
+    }
+    
+    th {
+      font-weight: 600;
+    }
+    
+    tr:nth-child(2n) {
+      background-color: #f6f8fa;
+    }
+  }
+  
+  /* 图片样式 */
+  ::v-deep img {
+    max-width: 100%;
+    box-sizing: content-box;
+    background-color: #fff;
+    margin: 16px 0;
+  }
+  
+  /* 分割线样式 */
+  ::v-deep hr {
+    height: 1px;
+    padding: 0;
+    margin: 24px 0;
+    background-color: #e1e4e8;
+    border: 0;
+  }
+  
+  /* 深色主题 */
+  &.dark {
+    color: #ccc;
+    background-color: #1e1e1e;
+    
+    ::v-deep &-code {
+      background-color: #2d2d2d;
+      color: #dcdcdc;
+    }
+    
+    ::v-deep pre {
+      background-color: #2d2d2d;
+      color: #dcdcdc;
+    }
+
+    ::v-deep blockquote {
+        margin: 8px 0;
+        padding: 0 10px;
+        border-left: 4px solid #ccc;
+        color: #bbb;
+    }
+    
+    ::v-deep a {
+      color: #4da6ff;
+    }
+  }
+}
+
+/* 代码块行号样式 */
+::v-deep .up-markdown-line-numbers {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  padding-right: 10px;
+  margin-right: 10px;
+  border-right: 1px solid #ddd;
+  user-select: none;
+  
+  .up-markdown-line-number {
+    color: #999;
+    font-size: 14px;
+    line-height: 1.6;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/uview-plus/components/u-modal/modal.js b/uview-plus/components/u-modal/modal.js
index 02dadaa..59d8abc 100644
--- a/uview-plus/components/u-modal/modal.js
+++ b/uview-plus/components/u-modal/modal.js
@@ -1,20 +1,21 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:15:59
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/modal.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/modal.js
  */
+import { t } from '../../libs/i18n'
 export default {
     // modal 组件
     modal: {
         show: false,
         title: '',
         content: '',
-        confirmText: '确认',
-        cancelText: '取消',
+        confirmText: t("up.common.confirm"),
+        cancelText: t("up.common.cancel"),
         showConfirmButton: true,
         showCancelButton: false,
         confirmColor: '#2979ff',
@@ -26,6 +27,10 @@ export default {
         negativeTop: 0,
         width: '650rpx',
         confirmButtonShape: '',
-        contentTextAlign: 'left'
+        duration: 400,
+        contentTextAlign: 'left',
+        asyncCloseTip: t("up.common.inOperation") + '...',
+        asyncCancelClose: false,
+        contentStyle: {}
     }
 }
diff --git a/uview-plus/components/u-modal/props.js b/uview-plus/components/u-modal/props.js
index 0e7443b..0f0177b 100644
--- a/uview-plus/components/u-modal/props.js
+++ b/uview-plus/components/u-modal/props.js
@@ -82,10 +82,30 @@ export const props = defineMixin({
             type: String,
             default: () => defProps.modal.confirmButtonShape
         },
+        // 弹窗动画过度时间
+        duration: {
+            type: [Number],
+            default: defProps.modal.duration
+        },
         // 文案对齐方式
         contentTextAlign: {
             type: String,
             default: () => defProps.modal.contentTextAlign
         },
+        // 异步确定时如果点击了取消时候的提示文案
+        asyncCloseTip: {
+            type: String,
+            default: () => defProps.modal.asyncCloseTip
+        },
+        // 是否异步关闭，只对取消按钮有效
+        asyncCancelClose: {
+            type: Boolean,
+            default: () => defProps.modal.asyncCancelClose
+        },
+        // 内容样式
+        contentStyle: {
+            type: Object,
+            default: () => defProps.modal.contentStyle
+        }
     }
 })
diff --git a/uview-plus/components/u-modal/u-modal.vue b/uview-plus/components/u-modal/u-modal.vue
index ed2d578..eab8f72 100644
--- a/uview-plus/components/u-modal/u-modal.vue
+++ b/uview-plus/components/u-modal/u-modal.vue
@@ -11,7 +11,7 @@
 		}"
 		:closeOnClickOverlay="closeOnClickOverlay"
 		:safeAreaInsetBottom="false"
-		:duration="400"
+		:duration="duration"
 		@click="clickHandler"
 	>
 		<view
@@ -26,9 +26,7 @@
 			>{{ title }}</view>
 			<view
 				class="u-modal__content"
-				:style="{
-					paddingTop: `${title ? 12 : 25}px`
-				}"
+				:style="contentStyleCpu"
 			>
 				<slot>
 					<text class="u-modal__content__text" :style="{textAlign: contentTextAlign}">
@@ -89,6 +87,9 @@
 				</view>
 			</template>
 		</view>
+		<template #bottom>
+			<slot name="popupBottom"></slot>
+		</template>
 	</u-popup>
 </template>
 
@@ -100,7 +101,7 @@
 	/**
 	 * Modal 模态框
 	 * @description 弹出模态框，常用于消息提示、消息确认、在当前页面内完成特定的交互操作。
-	 * @tutorial https://ijry.github.io/uview-plus/components/modul.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/modul.html
 	 * @property {Boolean}			show				是否显示模态框，请赋值给show （默认 false ）
 	 * @property {String}			title				标题内容
 	 * @property {String}			content				模态框内容，如传入slot内容，则此参数无效
@@ -117,6 +118,7 @@
 	 * @property {String | Number}	negativeTop			往上偏移的值，给一个负的margin-top，往上偏移，避免和键盘重合的情况，单位任意，数值则默认为px单位 （默认 0 ）
 	 * @property {String | Number}	width				modal宽度，不支持百分比，可以数值，px，rpx单位 （默认 '650rpx' ）
 	 * @property {String}			confirmButtonShape	确认按钮的样式,如设置，将不会显示取消按钮
+	 * @property {Number}			duration			弹窗动画过度时间 （默认 400 ）
 	 * @event {Function} confirm	点击确认按钮时触发
 	 * @event {Function} cancel		点击取消按钮时触发
 	 * @event {Function} close		点击遮罩关闭出发，closeOnClickOverlay为true有效
@@ -137,7 +139,14 @@
 				if (n && this.loading) this.loading = false
 			}
 		},
-		emits: ["confirm", "cancel", "close", "update:show"],
+		emits: ["confirm", "cancel", "close", "update:show", 'cancelOnAsync'],
+		computed: {
+			contentStyleCpu() {
+				let style = this.contentStyle;
+				style.paddingTop = `${this.title ? 12 : 25}px`
+				return style;
+			}
+		},
 		methods: {
 			addUnit,
 			// 点击确定按钮
@@ -152,7 +161,21 @@
 			},
 			// 点击取消按钮
 			cancelHandler() {
-				this.$emit('update:show', false)
+				// 如果点击了确定按钮，确定按钮正在请求接口执行异步操作，那么限制不能取消。
+				if (this.asyncClose && this.loading) {
+					if (this.asyncCloseTip) {
+						uni.showToast({
+							title: this.asyncCloseTip,
+							icon: 'none'
+						});
+					}
+					this.$emit('cancelOnAsync')
+				} else {
+					// 如果配置了取消时异步关闭
+					if (!this.asyncCancelClose) {
+						this.$emit('update:show', false)
+					}
+				}
 				this.$emit('cancel')
 			},
 			// 点击遮罩
@@ -171,7 +194,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	$u-modal-border-radius: 6px;
 
 	.u-modal {
diff --git a/uview-plus/components/u-navbar-mini/u-navbar-mini.vue b/uview-plus/components/u-navbar-mini/u-navbar-mini.vue
index 72e4b37..be546d7 100644
--- a/uview-plus/components/u-navbar-mini/u-navbar-mini.vue
+++ b/uview-plus/components/u-navbar-mini/u-navbar-mini.vue
@@ -6,7 +6,6 @@
 			></u-status-bar>
 			<view
 				class="u-navbar-mini__content"
-				:class="[border && 'u-border-bottom']"
 				:style="{
 					height: addUnit(height),
 					backgroundColor: bgColor,
@@ -48,7 +47,7 @@
 	/**
 	 * NavbarMini 迷你导航栏
 	 * @description 此组件一般用于在全屏页面中，典型的如微信小程序左上角。
-	 * @tutorial https://ijry.github.io/uview-plus/components/navbar-mini.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/navbar-mini.html
 	 * @property {Boolean}			safeAreaInsetTop	是否开启顶部安全区适配  （默认 true ）
 	 * @property {Boolean}			placeholder			固定在顶部时，是否生成一个等高元素，以防止塌陷 （默认 false ）
 	 * @property {Boolean}			fixed				导航栏是否固定在顶部 （默认 false ）
@@ -97,7 +96,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-navbar-mini {
 
diff --git a/uview-plus/components/u-navbar/navbar.js b/uview-plus/components/u-navbar/navbar.js
index a950988..e268b35 100644
--- a/uview-plus/components/u-navbar/navbar.js
+++ b/uview-plus/components/u-navbar/navbar.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:16:18
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/navbar.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/navbar.js
  */
 import color from '../../libs/config/color'
 export default {
diff --git a/uview-plus/components/u-navbar/props.js b/uview-plus/components/u-navbar/props.js
index 5e0a632..b66f87e 100644
--- a/uview-plus/components/u-navbar/props.js
+++ b/uview-plus/components/u-navbar/props.js
@@ -58,6 +58,11 @@ export const props = defineMixin({
 			type: String,
 			default: () => defProps.navbar.bgColor
 		},
+        // 状态栏背景颜色 不写会使用背景颜色bgColor
+        statusBarBgColor: {
+            type: String,
+            default: () => ''
+        },
 		// 标题的宽度
 		titleWidth: {
 			type: [String, Number],
diff --git a/uview-plus/components/u-navbar/u-navbar.vue b/uview-plus/components/u-navbar/u-navbar.vue
index 4e5b4e4..08945f2 100644
--- a/uview-plus/components/u-navbar/u-navbar.vue
+++ b/uview-plus/components/u-navbar/u-navbar.vue
@@ -4,13 +4,13 @@
 			class="u-navbar__placeholder"
 			v-if="fixed && placeholder"
 			:style="{
-				height: addUnit(getPx(height) + sys().statusBarHeight,'px'),
+				height: addUnit(getPx(height) + getWindowInfo().statusBarHeight,'px'),
 			}"
 		></view>
 		<view :class="[fixed && 'u-navbar--fixed']">
 			<u-status-bar
 				v-if="safeAreaInsetTop"
-				:bgColor="bgColor"
+				:bgColor="statusBarBgColor ? statusBarBgColor : bgColor"
 			></u-status-bar>
 			<view
 				class="u-navbar__content"
@@ -27,12 +27,12 @@
 					@tap="leftClick"
 				>
 					<slot name="left">
-						<u-icon
+						<up-icon
 							v-if="leftIcon"
 							:name="leftIcon"
 							:size="leftIconSize"
 							:color="leftIconColor"
-						></u-icon>
+						></up-icon>
 						<text
 							v-if="leftText"
 							:style="{
@@ -57,11 +57,11 @@
 					@tap="rightClick"
 				>
 					<slot name="right">
-						<u-icon
+						<up-icon
 							v-if="rightIcon"
 							:name="rightIcon"
 							size="20"
-						></u-icon>
+						></up-icon>
 						<text
 							v-if="rightText"
 							class="u-navbar__content__right__text"
@@ -77,11 +77,12 @@
 	import { props } from './props';
 	import { mpMixin } from '../../libs/mixin/mpMixin';
 	import { mixin } from '../../libs/mixin/mixin';
-	import { addUnit, addStyle, getPx, sys } from '../../libs/function/index';
+	import config  from '../../libs/config/config';
+	import { addUnit, addStyle, getPx, getWindowInfo } from '../../libs/function/index';
 	/**
 	 * Navbar 自定义导航栏
 	 * @description 此组件一般用于在特殊情况下，需要自定义导航栏的时候用到，一般建议使用uni-app带的导航栏。
-	 * @tutorial https://ijry.github.io/uview-plus/components/navbar.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/navbar.html
 	 * @property {Boolean}			safeAreaInsetTop	是否开启顶部安全区适配  （默认 true ）
 	 * @property {Boolean}			placeholder			固定在顶部时，是否生成一个等高元素，以防止塌陷 （默认 false ）
 	 * @property {Boolean}			fixed				导航栏是否固定在顶部 （默认 false ）
@@ -93,6 +94,7 @@
 	 * @property {String}			title				导航栏标题，如设置为空字符，将会隐藏标题占位区域
 	 * @property {String}			titleColor			文字颜色 （默认 '' ）
 	 * @property {String}			bgColor				导航栏背景设置 （默认 '#ffffff' ）
+	 * @property {String}			statusBarBgColor	状态栏背景颜色 不写同导航栏背景设置
 	 * @property {String | Number}	titleWidth			导航栏标题的最大宽度，内容超出会以省略号隐藏 （默认 '400rpx' ）
 	 * @property {String | Number}	height				导航栏高度(不包括状态栏高度在内，内部自动加上)（默认 '44px' ）
 	 * @property {String | Number}	leftIconSize		左侧返回图标的大小（默认 20px ）
@@ -114,14 +116,18 @@
 		methods: {
 			addStyle,
 			addUnit,
-			sys,
+			getWindowInfo,
 			getPx,
 			// 点击左侧区域
 			leftClick() {
 				// 如果配置了autoBack，自动返回上一页
 				this.$emit('leftClick')
-				if(this.autoBack) {
-					uni.navigateBack()
+				if (config.interceptor.navbarLeftClick != null) {
+					config.interceptor.navbarLeftClick()
+				} else {
+					if(this.autoBack) {
+						uni.navigateBack()
+					}
 				}
 			},
 			// 点击右侧区域
@@ -133,7 +139,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-navbar {
 
@@ -165,7 +170,7 @@
 
 			&__left {
 				left: 0;
-				
+
 				&--hover {
 					opacity: 0.7;
 				}
diff --git a/uview-plus/components/u-no-network/noNetwork.js b/uview-plus/components/u-no-network/noNetwork.js
index 74dba1b..96bb796 100644
--- a/uview-plus/components/u-no-network/noNetwork.js
+++ b/uview-plus/components/u-no-network/noNetwork.js
@@ -1,18 +1,18 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:16:39
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/noNetwork.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/noNetwork.js
  */
+import { t } from '../../libs/i18n'
 export default {
     // noNetwork
     noNetwork: {
-        tips: '哎呀，网络信号丢失',
+        tips: t("up.noNetwork.text"),
         zIndex: '',
         image: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAASwAAAEsCAYAAAB5fY51AAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAABLKADAAQAAAABAAABLAAAAADYYILnAABAAElEQVR4Ae29CZhkV3kefNeq6m2W7tn3nl0aCbHIAgmQPGB+sLCNzSID9g9PYrAf57d/+4+DiW0cy8QBJ06c2In/PLFDHJ78+MGCGNsYgyxwIwktwEijAc1ohtmnZ+2Z7p5eq6vu9r/vuXWrq25VdVV1V3dXVX9Hmj73nv285963vvOd75yraeIEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQaD8E9PbrkvRopSMwMBBYRs+5O/yJS68cPnzYXel4tFP/jXbqjPRFEAiCQNe6Bw/6gdFn9Oy9Q90LLG2DgBBW2wyldIQIPPPCte2a5q3jtR+4ff/4wuBuXotrDwSEsNpjHKUXQODppy+udYJMEUEZgbd94DvnNwlA7YGAEFZ7jOOK78Xp06eTTkq7sxwQhmXuf/754VXl4iSstRAQwmqt8ZLWlkHg0UcD49qYfUjXfLtMtOZ7npExJu4iqZWLl7DWQUAIq3XGSlpaAYHD77q8xwuCOSUoXw8Sl0eMux977DGzQjES3AIICGG1wCBJEysj8PXnz230XXdr5RQFMYbRvWnv6w8UhMhliyGwYghr4Pjg3oEXL34ey9zyC9tiD2ml5h47dr1LN7S6CMjz/A3PvHh1Z6UyJby5EVgRhKUe7Kz/JU0LfvrJo5f+Y3MPibSuFgQGBgasYSd9l6GDsup0WS/T/9RTp9fXmU2SNwECdQ92E7S57iaMeJnPQLK6ixkDLfjlb7546RfrLkQyNBcC3dsP6oHWMd9G+V3JgwPHh7rnm1/yLQ8CbU9Y33zp0j+nZFUMb/DHmB7+SHGY3LUKAk8cObtD00xlHDrfNge+Z2ozU3c9dvx4Yr5lSL6lR6CtCWvg6OAPw9z538ZhhZRl6XrwhW8du1KX/iNejtwvPQIDR8+vSRqJ/obU7GupjdNdh2gW0ZDypJBFR6BtB2rg2OVtuub9JcmpHIpBoK1xfffLzx4f7C0XL2HNiYDp6bs9z23Ypn1fC1Y/9PCFDc3ZW2lVHIG2JKzTp4Ok7nv/G6Q054MIvda+bNb74pEgKGtwGAdL7pcfAa8vOKEZ2kyjWuLr7uDh+/qvN6o8KWdxEWhLwroyeek/g4zuqwU6kNrhyZcu/UktaSXN8iNwuL9/RuvVXtJ9PbPQ1vhmcP6t9+47u9ByJP/SIdB2hDVw9MJHQFYfrQdCph84evFX68kjaZcPAZJWwjMXRFpJ2zr91tfuvrh8vZCa54NA2xGWrunvmg8QWCJ/N4ir7fCYDxatkOeBB7an501agXbygVdvv9IK/ZQ2FiPQdi9osGbH+zRNf7y4m9Xu9Me7N9nv0HXdr5ZS4psHgXpJC9P/wDRTx0Vn1TxjWG9LGrbaUm/Fi5meSvcrkxf/Cg/ow9XqAUk91v3qHT97r6471dJKfHMi8Oyzgx1Z03t1YAQVT2MwgsC3u+yXHzi0faQ5eyGtqgWBtpOw2Ol9+/TM+sTOn8L08MtzgQCy+tOHXr3jA0JWc6HU/HF5Scssr4jXcYqfP6V/T8iq+ceyWgvbUsKKOn38eJAYyl56TAuCEr2WYei//9Crd/5GlFb81kdASVopSFrerKRlaoZj9HR+700H10+0fg+lB21NWBxe2lhNHsUpDZr27mi4dV379R9+za4/iO7Fbx8ECknLCPTsTDJ17O33bJpqnx6u7J60PWFxeAcCbMV56dJfQKf1bkMLfuGh1+76zMoe9vbuPUnLsb2DtmOe5HSxvXsrvWtLBEhaTx29+Ma27Jx0ShAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQaEsEVoQdVluO3BJ06ptHL34b1XRjp4Ch6Rq24+kmjG4Nwwg+9uA9u/73EjRBqhAEihAoe3xwUQq5WTYEzp0b3ZnV/Ncf6O/9AvY9wlh/6dy3X7ncN512Zw9BVLXjuAP4np44vnQtkZoEgVkEhLBmsWiKqwsXpjbPBOn3gRfenwnc+7GBe+zsjclvonFDS9nA9Iy/u3x9+vAP3735VPk4CRUEFhcBIazFxbfm0k9fHD7k+v4nQFaPQIrx8Gmyx/GJ0J/t7ez7mw0b9MmaC2pQQgh0/ZSm4g5TwueWWtqLt0HuVy4CQljLPPYnB0depTn+b3t+8B4t0AdBUv93h2H9xc6da0aXs2m+r1WQsLRnl7NdUvfKRkAIa5nG//r1oGtsZvjTgev/kqYHF/TA+AXoqv4npJemOEiQU1Eo2l+G0movBK1UBBPU7s9E1+ILAkuNgKwSLjXiqO/khVtvARH8dxDBRkMzPrF/V+9/BlG5y9CUqlXinHv9mRPXtvuus88L9H3JPv2zD2yXExCqAicJBIFWRwAvv3Xqwq0/Pnn+lv/K+ZvfPH3p9p5W75O0fxaBp793ce3AwIDMWmYhafiVgNtwSMsXeHp4eNXJC8Nf0PAdRCiuf/XgrnWUqsqotcvnl9DmRkCdweX4b9N7+m/ih+mbMraLM14yJVwcXItKpT1VRve+ArC3Qqn+3gM7132jKEGZm6tXg86J7OhDfuA/iHwPUpfUZSfu2L59tXxEoQxeyxkEgjKeOnLxHb4RqC+NY5H3+2953d4XlrNN7Vq3ENYij+yZwbG9jpt9GkBPQ5H9zgP9607OVeWp87cOQtn9zwJf+xDMNFfj+jryPqXpxj8c2Nn7P+SXey70lidu4IXzb0DNB4tr9751+HV7zxSHyd1CERDCWiiCc+QPjUCnsaqmZ62O5IN7N/VUNP48ee7mAZDTf4Tt049iUG4Guv4ZfNLos9UIbo7qJWoJEHjy+bP7fNsoOcnW0A0/aacef8PdG28sQTNWTBVCWIs01OfPj66BpfqTmq732UnjgT1bei+Vq4pTv7HM8Ceg2/o1qLQug7T+FaaM3IqTLZdewpoHgYEjV9fphvOj+OShWa5V+CxvZtpzv/LwG/aNl4uXsPoRwI+4uEYjAJ2GmdG8L0FK2mYa+tsrkdXZy+P7x2ZuHdW14P+BLdank9q6Qwd3rf+ckFWjR6Tx5Q2cP58K9Jm3VCIr1ogt48lO237r3//96YofeG18y9q7RFklXITxPXV+5DchKb3ZDMy37Nu5tuxG4R9cHH6b42QfAzlds+3EPXu2rfrBIjRFilwkBIIR7SHoJDurFU89ZOd680Gke6JaWomvjoBIWNUxqivFD87fej0e0n8Fwvr0/t1rnyqX+QfnRz7g+8FX8Rv8vL3auF/IqhxKzR2WCPxXqKeq3krDTdj2ierpJEUtCIgOqxaUakwzNBR0D09yiqePHOjveyOkpxLr9VMXb73V97S/h3nDXx7Y2fdPkAYbncW1IgIDxy5vM7LZt/hgrnLtxyaBrJNxv/72N+6tuNhSLp+EVUZACKsyNnXHvHL+1qcgNf2KbSXu2bt9dcmS9qlzo/fARgcmCtpzB3b1/Vg5QiuslLowENyDWDn8cSjl98PgdBviu03N+rl9/WufLEwr18uDwLdevLTF1YK3xnVZ2HI1bUxrT7z5zTuXdRP78qCyeLUKYTUI25OXbm4JPO00TBj+6I7+db8ZL3ZwMOiYdG4dA1lN9HWte2iuI2NAVPapC8O/CGPR34Ip/AZIbIMo7yX8G9QMbcS09P+2b1vf5XgdrXaPfiYns9oeLLEd8D1/B7Dp0E1jGP042pXQj7RKf546cmGzp+tv1TRf6YQD35/QO3seP3xow5IfC9QqmM23naJ0ny9ysXwgq98BWc0kVhv/Nhalbqe8kd/Fr8MOSEr3zEVWrwyO3I29hl+E9LUHGf+nAXI6sGPdd8uV2YphIKnE5IyL6bLxk7cn3bdkHHefrpvJAExMZ1uBZmqeNzXtfzUzk/m/ens7LjV7Px+8d9e1579/44l0duZtge+Np5zEEw8c2pBu9na3YvtEwmrAqNE8IZvNHsep5//yjl3r/0O8yFOXbv0QCO05gP0JGIL+fjw+uj91YeRh/Dp/PtCDM7Zpfmjvjt6Xo7hW9ycmJjaYduf7Hdf/8HTGfa3rG9rYxLSWnsloPg7fijZV8oFM2Ja2a9t6EJd7bCztvHP7us4rrdD/r3/7ct9I99jEI4cOiQ3dIg2YEFYDgOUJDFj1e8TqX7cT4kImXuQr5279A4DeBEX8ayvprU4N3rovcALot/TH13T0fXDTJn0qXk4r3k9OTm4y7a6PzjjORzOOvn1kbEqbnEprPhRzwAKzwFLHk05hv6Yd6N+o3R6beG50aPSdr3qV6IJKkVp5ITIlXOCYn4Yexr0w/DO6YXymHFlR0e5r7tsM3fxgJbI6fW1ivTeT+SsYmr54cFff+5Cu5X+hb94Merp6/J/PusGvTE6724eGJ7RpSFOkKPCUZvBPBccoHBet3Rwe13rX9tw/PjXzZ5hKvr8SfhWKkeA2REAIa4GD6p0feRdWBnvxjv2PckVhVfBf4A29uG/X2i+Ui2eYn8n8NryuDr3jPfWSFV5k44UT137eshIP2K7/64cObbheqZ6lCp+Ydt8TBO7vTM5od1+/NR4SFVhoLpKKt410lnE8LTMzo3V2dLznxLkhYgQ9obiVjEDln7mVjEodfYcpw+MAsftg/7qSDbAnb97sCSb0Yei2fqOcbovVqKNnNO8HmAE9Cv3Wp+uoWjt27HpXNqH9WTKR+kBHKqEFbvo5y3N/avfu4g23R45f3WGa1k9ZicTd0zPTf/f6O7f8dT311Jp2fHzmgJlI/N70jPPe4bEZ6Kg4qw0lqlrLiNKBiLWerpTW25PUbkPXZViW62ecHz+4d8PXojTirzwEyhq8rTwYFtRjvpX/rlwJ+iSXugPbMuyKBOHo3geRJtuT7PujcmVUCuPJlhnL/9NUqvMD2eyM5sxMaIlE4n7XML907tyNjcxHQjty4sZv66Z1xEok/xNW5n4uZSf+8sT5m++vVO58wkEu5sR09pd9w/rWyET2vReujiqygrSopn/zKZN5qMeirotKeTyolm7p/+X06Wvr51ue5Gt9BISwFjiGsLl6N6SrvylXDNTK70D4mX071pwtF88w6Jd/DG/1E1u26NOV0pQL71y3/8PJVOcHMzPTWkcCH2YGOaTTaS2RTN6f1fQvvvDK1bdnbO2JZCr1SeRfn05Pa1PTU0gXJBKW+ecnzlxvCGndhFQ1NRP8bcY1/vjS9bF1V26MwHwsVKiXa3etYVw1TNhYJ3TDjQCO42jJVMcez7J+t9YyJF37ISCEtahjGjxkGDr2DJZ31D8h5vUQJL5RPkXlUMM07u3qSGidICvkzzuSlmlZb0olrK9hD9v9JCrPC196JoPMAolFg6CV+PPj54YeyWecx8Vk2v1Q0rSfhFT18LnBmzBRyNalp5qrSuq7kiAsh4SFa7oZ9M0wzI+cPHOjZPo9V1kS1z4ICGEt4lhiCvZrSa2jol7qzPXJPk6nIGbVbWfUvcr7hO9MP97ZVXpggOu6ajplYStj7l1XvbRMXbPAbp6HzSSBlkraNknrvfVCcPt2sHYi7f3pTDb47KUbYxuvKqkKpYBXKBnV869c3WgbDEixAck0FGFFfEzJzbIsO9C1TyrcymWWsLZGIHoW2rqTzdo5dXyykz0NC8l779i5vu4zwM+eHVntGP5jqVTq/6AkVc5NZ3wNH2lVxNWZNIukMSjiNd9z0+CHp5DXAdX4SAg203w8GB5IATtODHzdK8C15kEjhXvNS9rWA11dnfcMDY9prscss48RySakrOLWqODCoIKAgkuVgsS0urtD60haeV1YYVbbtjUn6/74HXvW/11huFy3PwKzT1r797Upe3jq4sib9u9Y+wxe+vh7W1N7jx49v6ZzbffnQD4/Cj1Pfjx54XiBls6GVuTUc9mQsOIO9mPQFdkIRlz4fy5JLm2ZMOqTcJaXIqpcqnixVe+rdbZ3dbc2OT0D0wZIibHSksmklslknvx+//q3PiKnXcTQae/b+LPQ3r1t0969cOL6G7o6E09qgZegdMJBpVQ1DbKCpyUt6oPKz/4NEJalCAuZFIuEVBJd+jgLh4rvAiFqUVGkhJZMWFp3Z0obGSu/d5gSnWmavuO6h+/cvYHSobgVgoAYjrb4QPMUiGtj1/79jBMkLBwiTlMASlYzTkhWCJyTrGAyMOFkst/BoYMmuIIyGJYcMXMMdNwHPhYN1qWS1t6ZLGaKZL8yzFXTr15BooLLMugHMBRNKgW+It8y9TEcJGt4rvcRFCCEVQbFdg0Swmrxkb0+cf2XOzq73kgdFieEXF2jdEUJKQH6SVWQrNjtZDKlpTPp38U58iUbthk/Ph7sN6zg/xudSGvD4xkq6otcnnjyF0XRRTflkyC0IIJE1JG0QbqGNpMNp5xFhRTcZDNoj66988SFm5vv3LX+WkGUXLYxAuXnCW3c4XbqGs9hwjv+a9lsuN+ahOJSCoLjNDAFvVUll0p1aNPp6adTweSflEszPO48oFn+4yOTmR+6enOshKyYhzWpf/jDuuf6x2aV/qNRaPG/1d0gUXWCA0uu7GhMmkqmerEc8KOVU0lMuyFQ+Ylut562YX9Sncmf7Ojo3BDZWbGLtMkiUVXSWTFNuMqWuYG530f7+/tnGFboxsfdd9mm8XdDo9O7rg6NFq0CFqZr5DWlK9qV0fZqGvZchSuPlevB2VmG/hOV4yWm3RAQwmrhEcW64qu4ykfJho52Vp3J8quBYQooqWDKADftBd6HD+5efyoKj/zR8ew/hWXY56/cnFh7a3RCTTGjuMX0SVB9qzu1qfQM+jO3dBW1g6uVSHv/qVNX10Vh4rc3AkJYLTy+WA/8ou9kJjo7bOh+DLVFZ64TEbCyBktxI5PJZj56R//Gx+NdH5vM4vuI+p8NXh9LjU1iw3EZhXc8TyPuuV9wDaaCfBjTM06N0hVWQmHBDzvSDZ5tvqYR7ZAymh8BIazmH6OKLbzv0KZvJEz3ZzEFnEolaEtV2XEaCLKadrIz//TQnk1/EU85NuH8th8Yf4j9gMZUOrNkZEVZCnsbtTU9KW18GqcKFyjh420sd2+j33pg3F8uTsLaDwEhrBYf04O7N/2t7/o/C2FoGnsIy/YGlvAwSfCvZzLOe+8oR1ZT3u/5uvHJC9dGtJlMrfqjslXVHwjpat2aLi2rjFFLjUSrFUjlO0juddXSSXx7ICCE1QbjiHO0/hofbPgwpnDTOR2V6hWNQqGUx34890noet5yaO+Gko3Y45PO7/uB/lvnrwxrWdha1absbgxo1FWtwplXqYSJY5Nn5lU3bLHQmGA/yko0plVSSjMjIITVzKNTR9sO7dv8RSeb/T9BWmMkKv4D+YzBXuljV7yxd+zfte6VeHGKrHTz4+cv38JWmyUmKzSGG5z7VndoE7kz3uPtq+Welvhwm39weVjOyaoFsBZPI4TV4gNY2Pw79mz8KyebeRIH+VEZTaX0sf27+v794TKmCxNTzr/2NOPj5wZBVjjdYSklq6jN69dyKuhqmWztivYob+RTSkPbe/xMdlMUJn77IiCE1W5jq+s4dYEO6mzsYAmvi/+CrH7LDYxPcBq4HGTFVcG1ULLT5orS1ULIkoSFI2cMHKG8obiXcteOCAhhtdmo6gaOh4EWWlkyYU9gvHswXfgV19d/7+LVkSWfBrItJJhObL/p7elQR8fUZnEV70XxPc01sM+xrzhU7toRgZIHuh07uZL6xA3LBaYB+Ar8rBsfz34YX1j+D5eu317QNGy2xPquSE4mDuXb2IujY2AgytNE67RiKFshzuwCR5s9ZSMlsK0QEMJqq+GkBKOF5yFzRoidK5BoFCeMjM/8mG+a//Xy0Li55KYLBRiTrGjwOQ1br4VMBQuKVJeQKVPxMLlvPwSEsNpsTEECmBLSgbHUpwD1YGwse59l2p+9fmuig4fiNZIowrqq/6Xeqm9Vh9JbjcOKvqFtACX7gV8kTVZvkaRoRQSEsFpx1OZoM2iKxxuHLtDcsZlgLzYZfv7m7XSv+r7fIm234XSP/8o5ktWqzqSyZr89PoXPYDTYkZvziw0NLluKayoEyq4iNVULpTF1IaDjHHZmoAW4aep9geN8fiLt998cGYdtVp7K6iqzXGJFUCAi7jdkuapsBJKcPBwgyP8YRyV7B04Q3dDbpY3jg6gupoMNla5U41BbUN9n0sr1ScKaHwEhrOYfo7paCAW0WiWknihhW/0Tabf/6tDtxpIVSIhGnz1dSXUkDL8fSHKi4/lWPId9Kp3Vxqegp8J/m9f14D6DQ/nmb281FwgkZ1Dj7bnSSFx7ICCE1R7jmO8FJJr8jCvjeNrIxFjDJBpKVaSlXhwDw384MyucBoLAGEfHI5ptO6n1YAq4FjorH9IWjUOnFlF3pj62aui3whbI33ZGQAir/UY3XCVEvzgdw/8NcSyGUhSlpVWQrFg2p39xp0JYLyIohaXxdZ2FGofG6yi85/QS32F0Asu8URgu1+2JgCjd22xcsVElPC85169Gaa1YTkRWJKpSqooBiQQzONvq9sRULKKxtzzAEJw1api2EFZjoW3K0oSwmnJY5tcoSD09HanEDztubnfO/IopyUWC6sUmZUpW5aSqkgwgK04DxxaZrFivacCaIdAuH9zaM1rSDgloOwSEsNpoSMenvU93dXb+EE5taFivKElRqd67qrNmsqIF+yjMF/i56MV2JqadYKxXMDXM6+4Wu04pf/kQEMJaPuwbWvPticwj4Il/NnTrdl7JrqaDC5wTUle1GmdWWVCw1+JotjA6PgnThsIdQrXknF8arkJi/+R355dbcrUaArU9ha3WqxXW3tHR9C5dN//T9eEJ3aGdUwP7T0V7F86Mr0VW4mF6o2NTS/ilaB2HDmb8wA2+08AuS1FNjIAQVhMPTi1NgwRkGKbxRxMz3uaJSRzVUkumOtLwo6Zc7aOkVdEhynN9NQ1cyuNqeEqD67mX9TXGyxXbJhFthYAQVosP58S0909czfqJqzdGODVqaG/IUbCWr2p0yukfp4FUtDfeir1yl8IPUGjPHFy/fqJyKolpJwSEsFp4NEfT6Z3YBvOp8MvMc0hAi9hHNQ1cBrJil5TUZxhfXsTuSdFNhoAQVpMNSD3NMTzzU1PZYAM/ProYkg3UV5rHT8lXmA7SwnwEq4FLLVkRI04HM+n0LdvzvlEPZpK2tREQwmrR8ZucCd7hePr7rw2N5PfxLUZXON1zHKz4kb0KnIttP6Njk8tyaimbwXPrsW/yq3v3bhoqaJZctjkCQlgtOMCYCnU4GedTI+NpQ32XbxH7QOmKG5nzdIWZJz8HNkKygqI9TmSL2JSiovGVn0A39c8WBcpN2yMghNWCQ4zPc0HRbr6GEs6chJFnmfl3knZO4/hmII1B6fiFG9br0s6qAeXPp2WUrhzHeXH/jr6n5pNf8rQuAkJYLTZ2kK7Wul7w6zeGx9DyUsZovOodOizosTg1TM9k1Wogpa7lIisOF+w48E/7E5B1Y/cgtdizsBKbK6c1tNioT6X9n3MDcyePOo7OoJqrC6S0+ZIYV+GSOHxvc18PJCxXG4ed13I727axqTp9yk9rX1jutkj9S4+ASFhLj/m8axwdDdbgELxfGsLpoZyqVXPVU1QugVJUV0dC27p+FaaBWWxknq6ceAljTNMiAf/BoUMbJpewWqmqSRAQCatJBqKWZpgJ731Zx9pJM4aK0hXe5vlKVFEbKFlxs3PvqpSSqpbzKztRm+gnEkktnU6/2GFMfa4wXK5XDgJCWC0y1iAR6/Z49iOjY7C5qkG6mk+3SFQGlEP8FFdnygrNFqBsn1OxP5+K5pGHbcBhqhT8fqu/v39mHkVIljZAQAirRQYx7Wj3Zj3tddQjVVJ4l50CMjHe8mqOTJCCvmoTyIrENXx7Uinbm4Gs2PZUqkObnp76i0N7N36tWl8kvn0RaGnCGhgILKPn3B3+xKVXDh8+nPseX3sOlpt13+P4uonv71WeDqLr1ampFB8S1JrulNaHc9rTMxltcpofOeWns0rTLkeIZUHRnpm5YibMf7kc9UudzYNAyyrd8ZLpWvfgQT8w+oyevXeo++bBtaEtQd9s1/ffRsV3I6eDJCp+nourgH04UZQnhIYfWm1o8xdUGCU8/E/bil89sH3dlQUVJplbHoGWJaxnXri2HTvd1nEEcCBS3z++MLi75UejQgcmJjL92ax/gNJPo6QekhVXAbdvXI3D+XQ1Bcxiu02zTAEjKFIdHTQS/S8Hd2/4YhQm/spFoCUJ6+mnL651gkwRQRmBt33gO+c3teNQYin/oG6aKX5rcKEukqqoWN+Ij5vy81v8UATDG0WGC21jlJ96K6wKPpWd8H8jChN/ZSPQcoR1+vTppJPS7iw3bIZl7n/++eFV5eJaOczX9Z2YvM1LPxWpocBHKv8qHHdMqSphGUqqahaThfj40ITBcbLnsDj6oXvu2bS4n96JVy73TYtASxHWo48GxrUx+5Cu+XY5RH3PMzLGxF0ktXLxrRoGNVPPfNtOolIrgElLGYH2wbZqcipdIFVFlDbfGhqfj9bskCaHHS/7gTt3r73Y+BqkxFZFoKUI6/C7Lu/Bl1jmlKB8PUhcHjHufuyxx/g5lbZw+BL7bX4EoiZqyS0T0uM0j1+82QSl+ua+bhxj7GjD2LicwWkLzaarigbKsmDJ7gcTmezMBw/t3ixntUfAiK8QaBmzhq8/f26j77pbaxo3w+jetPf1B5D2RE3pmzyR4/nH+Mti4Wx1dUrCHO0lSVGqskFUnakkpn6mhu086jgYHkWTW3Wbo4Tli6L5gqYHE47vfeDufVv+YflaIjU3KwItIWEdO3a9Szc0ElDNDqcLbHjmxas7a87QxAnX9ljfxcr+Mzs29ykpi1O8iJjoR/cm5o7dnUl89LRLW93dyWmVIip+Kp7pmlWqIvQ8Mga9Gslm3Efu3LX+K008HNK0ZUSgplnGMrZPGxgYsIKeXa/TA61jPu0w0+7xBx/cd3M+eZspD0wbDgWm+RXP13cODY/jWGKuGAb48jG+agNpilbqlKZoWDqDY2AyjtNUlupzYZlKpXgaxIVMNv0zd+/d+uxcaSVuZSPQ/IT13TN34QRvZW81n6HSDdMLUqmjh9tgd//Fi8OHEl3JL3Z2dh3MzGA7XU664llVWRz/QhLjNYmsmaWp/DjCjqIDdlaZTOZZ1/A+fGj7hjP5OLkQBMog0NSE9cSRszuswNhdpt31BRnazM3U9IuPHDrUuG+419eChqU+cvzqjp7u5P9KJpMPpqc51Zv9QntLkFQBEqZluVCw/7nhaP9i376+8YIouRQEyiLQtIQ1cPT8GjOw7vE8tyFtxBrb2MBXdh579FF99g0vC0nzB548ebNHT2l/aFmJj1BPBYyav9EFLaQ+jdPAVNL8/pZ13a8qiJLLOhAAjvrTRy/d0enbF+69d0tzHFhWR/vnk7Rple6mp+9uFFkRGF8LVj/08IUN8wGp2fIcPLh+4sCu9R+F3ucj0MLf4vaVVnChqYWmdaQS2jpY2vd0djh86Vqh7c3Yxm8dudTPxaW0lrn7yJEjZW0Tm7HdC2lT0xKW1xecgHE3FDWNcb7uDh6+r/96Y0prjlIO7ur7TOD5b3ayzt9ylY0Gl83qKFXZsCXrXdOlrV3djf2LBr556JOshLDmMWhPPXV6vav5O5jVxYLUhNl3iIbV8yiqpbI0bQcP85C2Xu0l3dczC0XUN4Pzb71339mFltOM+Q/0rzu5f2fvu1zH+QDOt3uZ0pbVRMRFouJK5qqeTkhVqyBdtdUmhGV5JI4cudrpd5kHiyp3tTU/8s6r+4rC2vCmaQmLWJO0Ep65INJK2tbpt75298U2HLuiLh3oX/95L+0/kHUyvwTieiUJHVEimVzy1UKeWMqv2pCoKEVFRNXT1aHawnBx80eAZj7TwcxdAc5Gi5fiaNnNT37nCk4xaV/X1IRF2B94YHt63qQVaCcfePX2K+07fMU9U7qtHev+xE/7r3cc70O+6w1gxuV0dHZiusgvJS/O7IskRXLs6KCxqj+B26t9a3uUREWi4plbQlTFYzXvu+7tB3EIUGel/L6e3TNw5NS8zYAqldss4YvzBC9C7559drAja3qvDoyg6pwCP+KBZaVOPPjazS1vMLpQKE9fuPnawDB+EqehPwzWuAuSl8LPg90WVxhJJPWQCUmPBAWTBEz1TFUGpqO3wYYvIPgr2az35a2b1/50V6f1e1NTlVcvEzB0xRekj67usu5FmS2/crvQcaol/zeeObfTSOj91dIq28PxiaOHDx9quy8LtQxhcZBqIS0Dhkl2l/3yA4e2j1Qb2JUUD1Iyz1waOQib0vsxKXsAFvH3wMB0JySwtZC+DBPTN5BOCEnhrI1BuKe9l6tIzsVCiD6E0DOabrwI2elZ09aP7N3aNxjheXvK+a1OENa0EFYEyYL9rz072Ju03ZpNQKj7Xd899cKhNrA9LASvZTY/s9GcHoK0XsrakLS8UklLxyl+/rj+/Qfu2367sJNyTS7SuZfneO7ffweBGScu3NwAqWgrTvTc5jjBZmw87tMCfRXYKQWOgula4OiBOQUZ7DZuhrAGdQXxV0zPuCaGnkv3VPGHOpPw7+QPR62OM5HhdNddGOeX2kmCbSnC4mDlSStVTFr4eLljdHV+702vWz9R66Cu5HS5h5hmHvz3QiOxwJTRo2BGgY06dm7OVhewYGAY6s75oD+ZDs4JPY9JyqSCQ7ABqftd5VFM3/j2Ja4mtsWpJQSq6ZXu5UZTKeJnsHpohiYPRqBn04nkS2+CQWW59BK2dAjwS0Y4IHDz2ERWG8Gnwm7iK9W3sFmbvrqGPzw6gW8eTmvTM07XmTPX28KYd7EQ3rjnvv1QFHbPt3zT9DcMPHd+13zzN1s+/hC2rKOo7NjeQdsxT5LEWrYjbdLw05eHtwWe9jl0542u62HZHZIVpalY/yIlP5X3MHYddLLZfy4fmYiBhNuB509vw+rG3tKY+kOwGHLi7W/cS91jS7v4s9TSnZHGLx8CICH9lXNDX+zpWfXuycnaBV2e3e567nAm4973qv0bzy1fD5qr5oEB7KXt0u7B3Loh7yhWVfypbOalh9+wr6U3mbfklLC5Hi1pDRE4ef7Wj+EEiZ+amqpvJT2bzWjJRLIPR3n9riA5i4DZg720DSIrlsrvHXSZ9p7ZGlrzSgirNcetqVp9/vz5FJTqj6JRejTdq6eBMzNpHP9s//QrF4bvrydfO6f1JrCX1mvcXlo98Kembjotr3wXwmrnp36J+pYNeh5JdqRem83O77gxkpxtW3bgOZ/g1HKJmt3U1Rw+3D+zrc89aunagnWzpq6PdxujLz388L4F78tdbtCEsJZ7BFq8/sHBoMPX/I9hyrGgnuDUUZzrnnz7yQu3HlxQQW2Ued++fZmJ1e5LoPB5k5ZpWCPXz+08du+99zrtAI0QVjuM4jL2YcIZeh+2+9wF49MFtYJSlgmHE0g/JlLWLJQPg7RmhtyXsJ18eja0tivsXhj6xy9ve/mRR5TRcG2ZmjyViN9NPkDN3Dz1FW5z9XM4i+s1ME1YcFNpUIrVLHzJzHnwjl0bn1twgW1UwPHjxxPXpztejR0HFTc+F3YXRwxdfdM9W08D0zrs4wtLaM5rkbCac1xaolWOvurhZIPIih0OdVm2haNTfqUlAFjCRnJP4HBn+iUqz6tVa2nGpTe/etsP2o2s2G8hrGqjL/FlEQC5GHghfplSUSMdvwaEA/9+4vjpa3c2stx2KIsfUek2dr+EuXNF2xEjSJx98w/tbFt7NiGsdniSl6EPp84O3W/Z1oPzXRms1GRKWdCJdeCIlJ+vlGYlh997r+70+EPH8NHJEtLCauCph+7bmj81ox1xEsJqx1Fdij4Zxi9AT2KSYBrtslgxhOD2gWOyz7AstFzx6zFHj1mGobYUYAgC9cHge3ddK5uhjQKFsNpoMJeqK6+8cm0X6noXiWUxHA8WxAdWNyQM45HFKL8dyiRpueM7jllmMGpnjO+1w9fNaxmXxiogaqlR0jQdAkeOBPjczrnOiQ6jw88ESSOA6KT7iQzOHEvavu1pZsLQg4QPP/DdZG9Xx/vWrOr+mfR03SvtNffdxleAQIgvTzjBT0w409Mpu2faufZy+vDhw5WPMa25dEnYqggIYbXqyNXY7i/jCyvdfmaVb5hdVsLp9LJGp43j1/1A7/RdvdMwPRzEboRnLVHe9vEvL3eXBOB4ZMta22H+TiqV2LJQ26u5u6Bju44Z3J7O/Lvp6cwPmBanOwQ4uNHRTWMK21bSvh1Mm642nTWCtKkH07rnTE72aOO0XZq7bIltVQSEsFp15HLthg5J/+aJE12m3tVjOPYq1/dW4cTjHnwMYhXOce8xDd3y/PJW6OpMdsTRVy4iK/rKMR/jwvz825VIHFzT3fkx13UW/dnhRy3GJyeeHEs7n1XNibUPFvY6vtGDw5vV9w0Vofn81qGhZfDhi3HX8SfQ/3HPMse9CWcCX0gel2OIFJIt+2fRH7qWRaYJG85NxldGzV4tGayFSLQ24+q9ULyu9gJfMU5ELTn6wUISTl03NHz1KzyiJLqmX657OLLdSJgoXTO7cBxyN172blier4YCvBsFdSNXV2dC35tKJrbzfPfFdjwvC/qs9MSMxxNRsSqmT6LhUDQHE+jUBE7UnATXTuLsrRn01K2l/x6+qItiR3TNG8V59KNB0DGSfNXGUXwJY2Gm+osNhpSvEBDCasIHgVLTt75/aQ0MnXpBNb2QgNYEntfr4wu/nBYpKQLtxtdwAh0SBX3VDe7nM/Ha5vf1Fb/CURS2bCTAWWuxR229qRsbQQQbUed61LfW14JVKKsTJ5sk8WUcHbtlNANyTOhgcmAGKH7p3m1FWpqtuZCu+LByVdKHVMjpKEQrBwIW9tnpXOIH+QTDSH/D9f0bmCLewDn1I4HmwtAypPDZ/oe9oXKf/aMPsWxSs/RR13FHrURiZE1gDR86tKHEdCDMKX+XCwEhrOVCvqBeHNaW6ui11/mWDtLQ1kEiWodXE4rwYgepAPssTPCMOjIdAk94TZ8pMZjch8HjDorGFUTUAwlkh64be0A9/ZCatiDZWtOyE7ClQmIdJICJFYhA+TRV4Fo5/QIHiUvrTEbkVRCxiJfsSBbfYk87OTExXxdazY5yUgiRKfpHQ1YSkONmAZY+gV4NIeVFfCXoLNA5h/Plb5LzWAyzF+IVXdNnvO/6GcsyhjC1vmWZ7s2pO3fdOqzriy9asnJxZREoerDLppDAhiIAEtCfO3F5rW0a6z1PX4/nf53nG5RqqrpieSnULEVh8cx4E7ugH78H8tG9eP/24oVezY+pkpA8b/abhPF8le75BqdsXUtaFeaTlTI2IByEoU1l8oq1mkokcZHElIRoWmpejMMCMyCvQXyy7JjjuUcgOl4tLCzCMpTHgFpcgkViX/dH/ax2Szf8m2Yqc/MN+1r7BM/C/rfCtRDWEozSkbMjq7NTY5t13dqE6dhG3wsSqlp+C9DDi0ifLrqmT1f6BgUaPjiHN0lJAGAfvpWcI4XjiHIMF6ocO/EjmMa9HeelQ1LT1PRpoce/sJwOTCQtc+kfGQp6Uxl+9JWtmL+jNEaJ0gKBgbsygR58B4sHfwV5aliVWg3vCHv6ymHcdG868IzrVsK6pnd71+/dsmXxbD3m3/W2ybn0T1/bQFe5I8euX+9ybuqbXMPbDA7ZCKV4uMOecyz+9OfmWvj9x9zEw6JW+JuOX298WhE6qtwLEV3TL1tb/AWj7sqwfqaro/sdmcyM+vBp2XzzDEzaBiQsNH+e+eeTjQ+ohwqnG0BYhfVzNYKrkOmpyauYYH8KvD8G6RPBszrC6Jq+ystl0ghzXEZjR5+O4+iZwTh+eG7Yqa5rq/3hGzzTSkXKn4YgIITVABjBP+ZzP7i8ydasrZCetuCHvIvFRs92SEdlpnCYE2LOQi12OA7RNf1yjrphHIyE9yOXPnfNMDg70DpdTf8DWDKs5rRvMVwChAWrUgh21HzllD0NrigqlxKVC7bKQuOOWeGiuI7OTkhb6T8C/Xw3xkel9cXxj6eIxiY3Hhx3X9dHsWJwDaa3l1+zd9Mt/F4tUk/ijWnP+/DBb8++LWqvnh0c7NDGta0pO7kl6zpb8AJzEUr91kYEFdeBRCt69Nm4+AsSl6jwjVGckY6VwPwUpLhLURx9xliWvxFHi/w+zB0SWCnLsVpxnoXesSI2ngp4zmRJXPgf/0IleGH51R6uwjeX5MR76qtITh7+8N9Cp4GF7Sm8Zl1s35pVXVomm/5c1vG+Wm284njHJeJq44/FjixUAld8w7uijW6+xo3MhW2S6+oIVHumqpewglJ87+LFtcFUcqur+1vxwPcZJqYPMOyhXw6GKI4+4/GwQpjCBhe+6XDIpFb06PM+np5hhS5eXzw9bLJ2pBLGv4Fe36BU4kA6IQGw8MUY6MJywVeqDs54Z69zrWdY7jI3G1ZtUiSV6zzDI3IqLLew/wu9jspl+yywrA1pEed5QceXPT3jBb/DLrA5ua5UHZ/4eMTbFx+fwvE3DJO8fANrjlctL7giJhRx9MrfR89R+VgJ1Y6currONuwd0FNsxwtV02mPlWGLy1TxlPHf6Hh8PH9xesvw9yRM+5PIRT2ZIgVKKZxWUY/PT8aTFPji0i3m4Ed1hDWV/7uY9bNGtiGqAyorJRWSqCgdkrQiR5KddrwPlsq8xfhG6efvx8dvtiQczDdmmPaldDBxSVYeZ3GJXxUMWzxq5d4fPz7Ym7X1HTAL2A7NqtJHEQ3qtCPjw3LoxB/v+OMZ5VVzR5aHWRuErYA+y4uu6fM+Xl9J/lh7bFvbY+vmv0bWos9tsXAWSLIiaSnyApHxJz6SbFSFuXTw8i86r5vVRW1m+6IHmUREAuI0lcREP5q2ztWPrO9/YK54xsXHI56+cePvj3qBfimZNS+J5FWMcrjptThsRd4dPX9+DcwEd5iQphwozfkCwJKaLv9ewHYKeicfSudwShcnJDBBOD3MTwGRO0cqLIj73jQTaejDBYaPHTBgJ/i5+HyYijd95sFhRzkzB7yL2IrCtGwezj9nOQVTUlfPwiicifnu5J0qHHd8mXHIG6ZD7JQqIk9kJK6QwAokMWRUhMaSeJ0vcfaiXNhs7PyuwpYV51Vh+EM/Pu2M9GckpyiOuZm2Wvtom+Y4me8xPbvIIujzPu6Wbvyt1ejL3U7Sv/v754ZHsORwaX3KGdwiJhO5pzY+Mivk/urVq52jTnIXlEc78LKu8qAMx/G8kHhyOicosz0ovM3IrIDKb15HSvDoOoqv+hMLYCOWI8ash0vmufryZVcqLz4u8fym3ov1xT/EVp4UDUTn4/iS0xW+sZTMojASmLqGp64iH4FRXJQ2TKj+lv7JVRTVxwQkm9APyaboGnGMzSVR6VR87ipsVT645ovOzi5tamb6zzB1/nqzjz+s9YetwLioZW5C8jq08K9+1IxS8yQsfF6ap1WL2BK8VOaJc6NbPcPrx7wJ++hmHQUPvOaQgMJ3ETtVlERDP0wVsQ19uPgcLQyt/Dc+p4jlL6k/1xa2qVyh5ApEzEoErm/DsPOTXV3de6anq36roFyRdYWVbVSshHJEMt98saIXfIu9koplYZL6m/hUz7kS/Jt0/PE8+Jj6X/Y6k+fv2tA1BKIvB/OC8WnGAmp5dpqx3XW36fjgYK/upXbhFd+BrRlqn16MfkrspkoC4hnirYjbUVWzs4rHx8uL3cerjwt0TA4RcBcsuX8Rn97q54okVsCKJJ9YkSvy1gJR4aOtnAr6OJP+L13d+BKBKMEzHhAfgDh6yzD+vqHjTDDvYpAxLqwEfVdbE9bpIEi6V27tdLP+LnzPrWS/XrRTnz5d4e79+LNY7r4kP+Z7Jv7z1LyPL0B4Tb+ci9cXLy+eJ54e8Rw//rqqcUR+HOrgYVprJbBl5E2w63oI64J7k8mUDZLGhmAXs19ucVkxP8gKQu4ptCxbMy2TW3KAGI4u1P207ztH3CDx/7bL+Cdse8h1Zy5ev7Dp8uHD7blJuy0J69TV8XW6l92Dl3cbLG6g98idbhDgdANcY1ZY9o2N4mpNr96GRf1Da3Wui0RW69F1bWslvp81LD2xDTOGu9DhQzBc7AcYfYlkAqo6A6ozqHNBYJTESGitTGShsp0qQSxT4AcoPJQw0LBlEPhBFakHDjoLvY+XgVIyg7WK77tG8n9pvpHXBbXL+OMBd7FN6KLu+uf27esbX9RHdIkLbxvCGhgYsDb3v2a7obt7YHakpKmYiqgE2ioqJbzIOszXcSov/DAzRRNehyJKvPx4+igv/ZLKEaCkoZxUFMYXE1I8f7Xyq/UHp9CkAlfbCF3NdlhS7IQguA0N2wiJYy1ktC5IISb1Okr5jSYruy2SGlYkIkKLSC3yy/WrUWGzSnjaTUX/QEhYQuNewLCdwBFKRkpOuAfr4sBnwwfDg6B0MHagORhBHNqHw5WxTwYav6lAt/42MBLfrYZXHO9w3Ftr/B0Hp0pY+tkD29ddAz5ln8NGjddSlNPyhHV8aKjbzAS7Dd3egRcvgRHJWyrHASw9Pyp+vlSxEluH0jWAGQF9VVZMpxHVRZ/xSKQU4PR5Xy0+/sLQZCFS9DN/XKtSeh5WrL2x+sMyZv+W67+vwz5eC7oDx12rm9pakNg639B68XL3Qh+2Bm94DySxHhg0daBHSQhiCbyyyMS9SDi8RhEHyYP1qD9qak0S4VGn5VYrSTRKEkKHWYYiHuQmCYb/YKYLqS+3H5LYckxJmz6qhSYJ5yNgzgtuclESpncBfN8Fj3lgJdCSGpHcGECoxrouMoHjzO+4evLLMB1VKxJV8Wyj8Q80Ix043jnTu32hlTdkh08Yn7UWcnio9Qs3pzZm0lN7LCOxIdIZxbuQ1+lAVFFxJB7aMeUIiPkiPRPjo2v6dPF4FVjHnxi/oQK0Az/bymf5uI7ayGLj6eM63nrbF5VNXzV7nv3HViQL3JAEaSV1z0iBNJIgJBCYkSKJYbdjEiSHw7a0BI5s6QBBbINUswMUsQ6E11UojZGccA9dcZDBdQY+TgyFTgkiEKYyIBvstAQzIRk8cBJ+A2j4gZFDFWAqjAp3V5IhQYYwwUJ57ByS0QINzMYK8FyrRxt3KNbXb2qG/UVNT5wDyCt6/A0boGbdqzPA4tD21SPquWihPy1FWHjQzYs3xnZkM95ePIZd8RccBx1xez/UPowp46I4+uVcLD9/8Plq0Gfy6Jp+uez5uqPyY+UtNN5DuVQc06drpv4bIDXsjtsMpdkOSC79QK4Xog3PzwF4IBNCBiIhpBSpoE8jioqWaM2KCRuOqwLXgIQItKIe0lCYD/lZjoqgGIo0+J++SsmMKA8eqQ21qHuUh2PfzQHN6vgG6vVK8GfmQhcbr3Yff+AEi3rtdCtNF8u/eIWD2ATXx4Mg0XH1Vr/hm7sDQw8PvyvTrriKWocEE0C6oM/kJRJHrAykgj6WGlq+JUifu6YfS6pu4/UVa6AgQcXKi78ApekhcWFBwMstEkTX9MvVHw+Lt2ex+4+Pg62CxgsHEwZbAdgWIJfA+ICkfDRYtyAwWWB7Ay8F8VT/KB0bOJ4Gx/CQfUKSwZGrJJs8iZHYgB0zMB+zk8hopQ8hEcEog2ERASIBAOL5fIrVIKLxXKtzKPZLgZUckvGf+/nH5HsK0+Uz3316zeAjj3D23Lwu90w0ZwNpiZ72UnvwfO/AXIFnXfLBxLOsHn6yiLqmr3oQ04LHX9hq6TFHI6txrlYWkHj98UT1lh8vryR/rIKq6aO204drdP8hRWF3itmLUw42QnW1CSTSA2IAIXkWOBYKLWw8wjVqNkEaFqjFwLQNJhWI4ZiFoiq6QX0SbsEo6HMoWVFCYprwjw6FP65BXCSoXJwiOwpnFK9A6yiWkQhRDwA9XAfpwLS/AqnqSKP7jwapquiznXFXMn6x8Yg/X/HySvLHKqiaPlZfvf0H6BloAM/v3tpzHkJwUx59Uxb4GE5Lfnt2ZGS16SX3+F5mq4llfegtwnaSR6J5EC8hPUV6IDaS6aDnoZ5DpYe6AtdgOr4pyhXLNPH0KKCo/DDP7N+S+mI6qHzbQr7AbdgW+iylWn0l5cf6E29ftfSN6L9lGl04x30tOtMHklmLhxpClW9BL4S1T+i2uNPRp+0FflD0AN9A9LHnmHGBBfJCE3QL9ALiguoJqiu+64gDzWGIIAlhzhaSDsMV/yjJi3BxyY9khP9BXBSzEMY/AFORGMmM1yyKZfmm+ZKuJf4uMHV1THEj+o+S864E7zYd/8Dliqp2MamvPbt9uw4dY/M4DnXTuMuXx/scK9iHLcbryzfKwvOJBSGNPl10Tb8WV0xYyMFymDdXXv46Kq+ueChJQI4WlSUqf8StOf5CNdXqr9afxe8/Gm6AoLAqGKyCGLSG350ACFzKM2FvaeOseEhFOsjItdQ2S6wYYmkOdl2+CfLBvmpIV55vYY2Qn6uAxAWC40zbhxSmWArcQj0TSIiSU37mx0kgVesgLereOSz8E5EWJa6Qzyh1hZEcO7xY4Ct9WLfNvwa+5xA2h6uGP6vMPxMsZ8WNf0Gf+cOCw9usq51a5+kNG9Sn1IjJsjoO0LI7EpVra/vxhPdFs7JyjYriohlbTAKGxO1C6oJEljseOLqmTxfPX66OucJK66OUNzuDjK7p05UIbGwX25I/vrj4BYrnD0uZ/Rtvfzz9fPsPIkgkbL0DZNMFRVEHFEY2ZCBTcwMLdfCsCCVN4SwpE9YG+ARNgD24IDHYSYB1yNCYDkLRFoC8oOUG40AKQx5IYyAmlQ6SF7dDoSof0hbJiApzqLs43aPc5UG+AvVQ/4T7nGQFQiJ5kdbAkmgH2Sz0FaWB4gLrad22v4nmuvPt/yzCc1+V4t0e4z93r8PYwDCvNANxLSthkai0jmCf5+jq6y6Y4SkjTfoKprgWufj9Dg3AozBmiK7pl3H8WDH3u0YfLY6u6c/HVS2vSvsxoygyTF2q/qNenEyjJ5NJPYGPRidME1M1/JYqwyoNq32Ihu4J0z5M+WA2DoqwEI9wfmEaEhQJzPNsKNOh0jJwrfRVJqbnNOrC6IGwQFzgHiKrpCuq2kE+FizrMXWE7IWCEKemg7hSiimOQchNIC3EchqpHlBO95TshQThkwF5TL9k+Mm/MZLGzVo3AlQdLzagDle1vCYd/wU9/5Z5ZcyZPnNow/J8ZHZZCGtsbKw3rdn7nIzTx42o0WfP1cPKuYJ6XPFs5q7p8zmKx5v8cdcxDeMPOR1fj+gh4X10TV/dukiC+nJPeLy8eH1hrtm/UVvpKxcrP2oL/dlcs1eQ9PCeo73wGcp+R2Xyvlp74vH19B9EkoA2CYKUlcQqJCQj6vkoyBjh/IurcJiy4Zxy2FMptRBO7sK3kClR0UYUZAX+wMqfC1ICiYHMYBsKSQsSFKaAUEqZLoiK00ASFsgpN0UEUWE6yOkiiArE6NmUb91OWwAAEuNJREFUszCNxA0c/uBoF04W86YOarWQAYjGmHBBEIkUiXEqib025hNmInWknv6zKo77Sh3/RvcfSx5Xl4O4yr5Y7NxiuEEQFT4uvs8yrF5VvosX28LLS185vsiRHkc9YPiJtrCbJIzHyx3gJdfpl80flZWPR6qIxJghus7xjSqj4E9UNn2VvN76Csqq6XIR+48OYEeGlcAaXhLfQwxNQcgQEI9IErOOxBUuCuDLz9Arm5iyOTaYy7Jty8hAb2VCm43ZmwnwQTbgFpAWyA4SGEKhaMdgYNpngKAcpeMCAfFjYGE4yAqco3RZ0LorUqOkxVkf6AgzvFBPFbISSsOUD+WRrWijpcwbmI4Gomj4yxAIv4bPVU+q9sfxk/EP36UlfP49N3vNWr/m9CZdX/zzjDDofAoW3XHVr9NPHdB8p2+uORl/mjFLUktMbBTtkSJbpLCRxYyD5OpJps/4+DJuvq5IIgoLqfi3pLzcRuloM7QSzKImsBSWG80LVKkxkSvOkFHaCjL5QvrPN9rwvaSVtEg2ICmQCNRQkGjwnlOpNktMxdds+GxcRFrIyCmhTQMEUJjl4qwtzPbAOVC8o0DUZroGiMmBpEUfRBZ4DvRUJC4/1GOpij1ML9XU0PJdFxIZGsOpJkkOQ0YdFh5CPodKl0WfRqQkVUhTIEf1iN4GkdJU4Rx/xsJfHkpfMv4cd+IAUJb1+YdkfSU7NXp6+/bti7qquKiEdfVq0Gl2TO2DonYzAcUTCv0slCB8FuGia/q8j7iAPl30aNIPHVKq55w+00MvjFLo05WmV8H5P9XLzydVF/H0xbGl9UGfjm226B98po2u6fO+0f3H9M7SbT1h+FoS00ybSmm+5/RZHxzbwWvVHtSvNuLRR4BKl0vPtHRhWh1SESUsNBkH0qjvNiAx4MA1JDBc4yBmTPmwJArJCFM+dA1SE5XsmFIqRTzKUrZYkMio78IUkauFoW6Mcbin1GWrOR8nqOEUEUQFmuK3ZdEw6NFg92s9j3XLp0CIsAuS8VdPkcKhCZ9/KAc81x/c3NdzFjy6KHZc0YPNh7VhDg9jYnh4co9n2dvx1nLalys7Rimx2xLGigfEJBQ0Xr149FkBVb04BQiTlPAFbTiDxRGKM1pJf5AgarPKG0sQu413N07hkCANO5m0fSebtCwziW5DqMISHTRMJCDF23inYbmsauNCHq+Vn1ta5dErzKN8psP/RiIXVpAegKJQ30Y06AQSEXdAIpdL0wbTNsLpoSIeCwRJHZYBpTusIFAIlPC0iqL5AxoCcmLPQkkLdITRCc0dSFqQD1A51g4pLOXmhZCwDMO2BpH9q6ZtDoU4oKQIy5yEynFnv+mzw+0+/q3Sf5yT4aYs89zq1alLIK7wYeQANcCpgW5AOaqIARzxcudrXrMTz+cuFAxBI1Rw06eLKz3xsnDikt+Mmr9mWBlXrbySeJAlTt8MXJImXHRNv0zx2GpWZ3r0KKqzXHlRHH26+fQf+mkbg56ADjppUuihMJl7BEhGtmnj+4Phj1lEUAzjaQcgJkzcqPPmlI/yjdJV8Trf/+hbeYyP0uMS0zSVF8SEaSELxkhR6a7IC1IVHkNMBWEkCljxYQ7YXgWKrDCHw2ohJDDKSkr5Tst3TANBp7DdgkTFKSOpxYMtV2i3hXQoJjwbBo3L4oibAajdXmSbCl01PEvi6x3PetMvwfi3cv+xHpPRk8GZvo6Oq5y5FvZlvtfqQZ5v5igfH7iRdHqrn/H24McyEb6ejCUxkCwqEATi8JDNKtWRIxI6wrLj+aOyQgIqLT/KTZ+OLYnCFGHE60PdSgzIgVmcfrbt5evjYkB97VeNyv8plx/UYoChElhYgB7KtD3PAUWRpejIVNzNAjNzyDuYRqnrMF5dIx4CkTrlAJQRps2FhZIX5lqYwfFLOygTBeSmkUhDEgNvIC7MR5ML6JhozoCpn+858G1utbH4j7BRT0Z9VlZzbTyOKJCKeCjkqYbkFBJh+DXCPVcKuXKIFURlm8WBoZSFOBCYmk6i33ioT+Kw1CegEMspcFfe+M8+rRySNum/YUwm9I7TPT04NWOBDg/nwtz16xMbEp3mPswIOuI6G7wBSlynz1pQWZEIP0smIcEEWN3QsfJDn+nj9FFSPh73wilgdE2f+eOumo4pPqWI2kI/LKu4RVXLq7H/kJopRUFhnkj4joNT9KC/BlZgAIVD1I+cwASVUBgCIsF1KEQxJLpGPKHGP5LYrAs5ikREnmJ61KF4K5cG1+REVS6HC1JauGroYYcOrLWUEp6MSF0UpoZgK5hV2dgEzeNLYbMBnRQZEUPnOwGMT6GOp57Kg/0WTCMYjnsQHpDmlJFTR5IcNt/alvV1PdF5NsKcLSpGG03L6QcjnWDpeIXqgFYb//A9wGi1+fMPDeqY7nae6uvT530KKp+JebkhHJyX6Fqz33X83tCgRr1d6gXBH+XnFtEwDmEVMBfAtbK7UvHxVTb1gGLQokbFVBZMDtUJHmT+dsPxmqSRU2nkrxkWxhfbOfEVwLov4sIaonSRr1qZy6vy8xliPbn+qPjYHxSm6mJwdB357DfaVtJ/BMLeW0/ayVQSR6TA5AB7h8kwmFeRrFBUSFYkJk7GsM+F5SuiCQmFBEriCskHYcxfEM9ozBjBS/yaKD//rBzndjD3BHswAcmqwFdhOWGugCw5owwpEt9sxMlVGWQEK4GlcAOi1XAcL6eLICfdcMFmNDnH7xdO/YTCHTkxM2B6EiSPbuXmHrZO5eJy4Iu6lfo2Gu8orFfA+PM9UMjnHpBIx9v+/Q9Wm8nMfcMTE1d7u7vP4Ec6fzy1wqOGP3xI63JHjgT2/rsy/boTbMP0pe78dVUWS5wjK0VUjIqNN3kA62ZYeIcfxofXDFNFUZBTT4W6m71mWBlXrb4yWSoEYWh0jVIUdJEmzA6o18mRDN7dCplCEkK8IiP4WRAU9OO8j5wimZB3SAhKYlJEphLkJCaSEP7PEdxsfVG5UWFxP6qPPngTlvBED6IWLN8dTPmg8ocFPPRXWBdlFWqqCEmLlhAgLRtKdLaAkpQNfRUM6DUQGOUiTimNEaT7FvRVw/F6K91XG4/mHf9KPaovvJ36jzfSS1mpc6mUdhnvhZL4a0GjZsKBKK+n0+kt0AHvztCAsIzjeeAeUKVPF1l101cBWCICxcGmcPalUeHRnyguIsJYej79fFnpKxdjrKhu+spVK69Ke+OW6SXlh7Xk/8b7D5umJKY6nUiQAEmp5ZKoD5Ay8kTFzcAsJIrL+ZREYCWAaU4ubXRNP8wfpuSuGubHMwCJhSuGPCiYJIMw5GV6xkfY0Wd+WoPiBAlEhvnzNluw3SKZYTkQHIQ5J1RQDg7Lw/QQGUIdFp4wcC9KgQ/7KkxjucEHROVmc3ZaCFfEjMxUvlPvBZ0WhT1Q1zG06hQKyGPA9qEh4bPRJuO/0p//WvoPyXpa77BPr9L1mn64QiJRT0vlP3jg1oyn0/th1dnN6VOkQyh8wVRuPpLUH9GHi+sckD4vLaj43NSHLwfv8cKjbGxdgc97JUpFpIRbpovKYHTUltkpHYkyEqNYf1gWfZU+Vn+JiMZERS4qKyTAMv1hmwoItLT/aL6OL9cn8A4mknhDkR5CUuh43ExhAXjnIQVxRQ9UwnU1JM73meHISINzlY/1Ir3jwNQBtui5IpU3K2mFZbEUEhgJiHlZhkqI8rws7hPFxBHlZ5romu1CGRSv2HyQEQiLPkwefJcSk2o0mU+F8Z46KswbKd8qvRUWiq7BsuoYlF/q+Jd839p4/KNnFHhw+Fbc819r/y3dHO7qsk9D2lLPBvEq59SLXC6CYSCq1OTk5F48g+FxLyQSvvyzhFK8taaYL1ACiYdkkSOg/HVO4irmAySLlR8+yHy5wnaWysTF7YmnRxdyecMXFDcxx3KjNCUEGUtb2r4Iixwh5qebxEG58v2Hkh0ERqlLp5kClNLkngLSyF8XExrZi089SYbFm9DRg1FCbEKyoxQE8sqFkTOgTwrDVIPCP/k8qpRcGrxMEXmxnpwjUeXbhjpgA2bBNsp0HPQWOiwNOnddw5YcNIdSFyzTlUKehEbrLDxDNn7osjCXPw5FO22qgPfKHn/pf8XxxxetvSvYlX8BxBVKCdGDmPPDhz0W+Oijjxof//jHt+Hh2oko/qKqFx4l0BJQmQIwS3RNn/fxZXqGFbq4nQzimI9tKFs+S1S1KJ9XoQkEfUQwtKg98fSzefMMwmx5F28/IqK2RLjM2b54/gX0H0v6+IiDZSVgHJogfYWNzDMUpCtsUkKg4pKIUJAsnNTlkjNWzfBCPMOhi8JAiCSqPBmyMFVQ1OdctQwLywNZ5cPCpDl80D6IhjzBASQF0sUeREpSJCyE4ceSpJXbEO2612AHepaTSRn/YrtEAD3n8xV/ntv4+S96nyGRO9gccQZmEPiBK3bRi5kPHcG+v2T32n2+53bxNY8oQyWIB0SR9OmqxMeTh5lm/8azx8srEbCQNSqTpUTX+eagwCiPqiWeQAXO/olHV2tPaYUFjWCxsQJjt7MV564K6iOB2Xj1adNGa3PqDMFl4XwSSnAQCUIibqFPlwtTwbiOkoSR+JvLx3KYv9BXaSrlLyifSegQBNMFTAWhiIeFArRZnoX+8Y2EzKhbnuNlYO9wFpZXkwoH5Kmj/6qOFTz+0n8+Y4Y/2pVIcJqY35+YJ6wjEN33ZzL9kPY3hWjx6Sv+RcByLIQAZZYQJSn2C944FRF/QkvjQ31XZDcV04GVPOGl+WdJEhVGbaNPV3d7Va7ZP83U/1ACgzTjkg4gjUFvHhGWkrPAPnnBLNeFSEKKfAbzOu9yBAUdVj6cZURpZuU3XOUILioD93x2IEnxxFGc9c6M+M93cHSNZVzHquBQDeMn4x898wQ2us7pgGvAbyU8/z5e5EupVEqtJirCgp4KHxVI7sbrQIYKHyKF3+yvIvEEX8FsQNk9qXwgBpgQwNo7p9OKrukzfdzF08+WTmYrV35YF+tU8bEpYImInGtLVH+8PkzZ8iQcVpjrawXCLOHH5uo/9JmWjbXHJMQcNhVW8bOklbsumnJw7Q+cgtVK2mJxAUNNKKncp54KHuzAwnjCE01B1UIHA1A80ik/IkdIfTj6mE8MXh2sSKZhdHUd+IcDykwFLj4eMv7Fv+il75c8/xEmeHaojD+jZ4LgbsPVVvO5iutg4oSAFCCiAqVp/jrUKRU8mzVexsube05ff3tiD0Q1wkP/ojrYgeiaftiheHsjLKL4GrudTxYvb0H9h94bpzeAwCD4cAqJf5SmlBjFH5D8ChVC1Q8KyIkrjtgbE64y4lqtINJHel5Hq4q4ZdsYzsWBWaU+rkFWtFzQbiNNnWciNbT/qD4+Hitq/FdE/3mWzmvQU+W4hZZPenQuRHRNfylcvfVjpUqz0Tj6dNE1/fm4euufTx1z5am3/hr6z6lj9A9ElneKwPJ3IYEVEpqKys0YFeUhoDBP4TV/+bjVIkfqKuu8/ixC/+tqR73111V4DYnrrb+G8a+h1tkk9dY/m7MxV7XUzwdP3ApBgCYG6Co+L6/+kcB4X0g0ERFFzwXjojBc5q8ZhqOKtWEoROmLEwSWBIHowVySyqSS5kIABEYhisRFEov8SgRWGD6K9OMgq8IwBIkTBBYXASGsxcW3pUoHgfF5iIiLPv9x+03kuLxMqaqsUj1KJL4gsFgICGEtFrJtUG6OwDhtJHHhqLOl+dBAG0AnXRAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBAFBQBAQBAQBQUAQEAQEAUFAEBAEBIGVhMD/D0fV/fpMMM+gAAAAAElFTkSuQmCC'
     }
-
 }
diff --git a/uview-plus/components/u-no-network/u-no-network.vue b/uview-plus/components/u-no-network/u-no-network.vue
index 54539a5..e9dd03b 100644
--- a/uview-plus/components/u-no-network/u-no-network.vue
+++ b/uview-plus/components/u-no-network/u-no-network.vue
@@ -12,31 +12,31 @@
 		<view
 		    class="u-no-network"
 		>
-			<u-icon
+			<up-icon
 			    :name="image"
 			    size="150"
 			    imgMode="widthFit"
 			    class="u-no-network__error-icon"
-			></u-icon>
+			></up-icon>
 			<text class="u-no-network__tips">{{tips}}</text>
 			<!-- 只有APP平台，才能跳转设置页，因为需要调用plus环境 -->
 			<!-- #ifdef APP-PLUS -->
 			<view class="u-no-network__app">
-				<text class="u-no-network__app__setting">请检查网络，或前往</text>
+				<text class="u-no-network__app__setting">{{ t("up.noNetwork.pleaseCheck") }}</text>
 				<text
 				    class="u-no-network__app__to-setting"
 				    @tap="openSettings"
-				>设置</text>
+				>{{ t("up.common.settings") }}</text>
 			</view>
 			<!-- #endif -->
 			<view class="u-no-network__retry">
-				<u-button
+				<up-button
 				    size="mini"
-				    text="重试"
+				    :text="t('up.common.retry')"
 				    type="primary"
 					plain
 				    @click="retry"
-				></u-button>
+				></up-button>
 			</view>
 		</view>
 	</u-overlay>
@@ -46,16 +46,17 @@
 	import { props } from './props';
 	import { mpMixin } from '../../libs/mixin/mpMixin';
 	import { mixin } from '../../libs/mixin/mixin';
-	import { toast } from '../../libs/function/index';
+	import { toast, getDeviceInfo } from '../../libs/function/index';
+	import { t } from '../../libs/i18n'
 	/**
 	 * noNetwork 无网络提示
 	 * @description 该组件无需任何配置，引入即可，内部自动处理所有功能和事件。
-	 * @tutorial https://ijry.github.io/uview-plus/components/noNetwork.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/noNetwork.html
 	 * @property {String}			tips 	没有网络时的提示语 （默认：'哎呀，网络信号丢失' ）
 	 * @property {String | Number}	zIndex	组件的z-index值 
 	 * @property {String}			image	无网络的图片提示，可用的src地址或base64图片 
 	 * @event {Function}			retry	用户点击页面的"重试"按钮时触发
-	 * @example <u-no-network></u-no-network>
+	 * @example <up-no-network></u-no-network>
 	 */
 	export default {
 		name: "u-no-network",
@@ -67,7 +68,8 @@
 			}
 		},
 		mounted() {
-			this.isIOS = (uni.getSystemInfoSync().platform === 'ios')
+			this.isIOS = (getDeviceInfo().platform === 'ios')
+			// HarmonyOS Next 平台使用时需要添加权限 ohos.permission.GET_NETWORK_INFO
 			uni.onNetworkStatusChange((res) => {
 				this.isConnected = res.isConnected
 				this.networkType = res.networkType
@@ -82,11 +84,15 @@
 					} else {
 						this.isConnected = true
 					}
+				},
+				fail: (res) => {
+					console.log(res)
 				}
 			})
 		},
 		emits: ["disconnected", "connected"],
 		methods: {
+			t,
 			retry() {
 				// 重新检查网络
 				uni.getNetworkType({
@@ -94,10 +100,10 @@
 						this.networkType = res.networkType
 						this.emitEvent(this.networkType)
 						if (res.networkType == 'none') {
-							toast('无网络连接')
+							toast(t("up.noNetwork.disconnect"))
 							this.isConnected = false
 						} else {
-							toast('网络已连接')
+							toast(t("up.noNetwork.connect"))
 							this.isConnected = true
 						}
 					}
@@ -184,7 +190,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-no-network {
 		@include flex(column);
diff --git a/uview-plus/components/u-notice-bar/noticeBar.js b/uview-plus/components/u-notice-bar/noticeBar.js
index 5c4adde..59e930b 100644
--- a/uview-plus/components/u-notice-bar/noticeBar.js
+++ b/uview-plus/components/u-notice-bar/noticeBar.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:17:13
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/noticeBar.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/noticeBar.js
  */
 export default {
     // noticeBar
diff --git a/uview-plus/components/u-notice-bar/u-notice-bar.vue b/uview-plus/components/u-notice-bar/u-notice-bar.vue
index 7fa4bfa..32de362 100644
--- a/uview-plus/components/u-notice-bar/u-notice-bar.vue
+++ b/uview-plus/components/u-notice-bar/u-notice-bar.vue
@@ -47,7 +47,7 @@
 	/**
 	 * noticeBar 滚动通知
 	 * @description 该组件用于滚动通告场景，有多种模式可供选择
-	 * @tutorial https://ijry.github.io/uview-plus/components/noticeBar.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/noticeBar.html
 	 * @property {Array | String}	text			显示的内容，数组
 	 * @property {String}			direction		通告滚动模式，row-横向滚动，column-竖向滚动 ( 默认 'row' )
 	 * @property {Boolean}			step			direction = row时，是否使用步进形式滚动  ( 默认 false )
@@ -96,7 +96,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-notice-bar {
 		overflow: hidden;
diff --git a/uview-plus/components/u-notify/notify.js b/uview-plus/components/u-notify/notify.js
index 1042d2a..142760e 100644
--- a/uview-plus/components/u-notify/notify.js
+++ b/uview-plus/components/u-notify/notify.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:10:21
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/notify.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/notify.js
  */
 export default {
     // notify组件
diff --git a/uview-plus/components/u-notify/u-notify.vue b/uview-plus/components/u-notify/u-notify.vue
index 160d6ba..2970f4d 100644
--- a/uview-plus/components/u-notify/u-notify.vue
+++ b/uview-plus/components/u-notify/u-notify.vue
@@ -12,13 +12,13 @@
 			<u-status-bar v-if="tmpConfig.safeAreaInsetTop"></u-status-bar>
 			<view class="u-notify__warpper">
 				<slot name="icon">
-					<u-icon
+					<up-icon
 						v-if="['success', 'warning', 'error'].includes(tmpConfig.type)"
 						:name="tmpConfig.icon"
 						:color="tmpConfig.color"
 						:size="1.3 * tmpConfig.fontSize"
 						:customStyle="{marginRight: '4px'}"
-					></u-icon>
+					></up-icon>
 				</slot>
 				<text
 					class="u-notify__warpper__text"
@@ -173,7 +173,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	$u-notify-padding: 8px 10px !default;
 	$u-notify-text-font-size: 15px !default;
diff --git a/uview-plus/components/u-number-box/numberBox.js b/uview-plus/components/u-number-box/numberBox.js
index 424f0ca..8d79ab7 100644
--- a/uview-plus/components/u-number-box/numberBox.js
+++ b/uview-plus/components/u-number-box/numberBox.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:11:46
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/numberBox.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/numberBox.js
  */
 export default {
     // 步进器组件
@@ -25,11 +25,16 @@ export default {
         decimalLength: null,
         longPress: true,
         color: '#323233',
+        buttonWidth: 30,
         buttonSize: 30,
+        buttonRadius: '0px',
         bgColor: '#EBECEE',
+        disabledBgColor: '#f7f8fa',
+        inputBgColor: '#EBECEE',
         cursorSpacing: 100,
         disableMinus: false,
         disablePlus: false,
-        iconStyle: ''
+        iconStyle: '',
+        miniMode: false
     }
 }
diff --git a/uview-plus/components/u-number-box/props.js b/uview-plus/components/u-number-box/props.js
index 1c5564e..ada9952 100644
--- a/uview-plus/components/u-number-box/props.js
+++ b/uview-plus/components/u-number-box/props.js
@@ -86,16 +86,36 @@ export const props = defineMixin({
             type: String,
             default: () => defProps.numberBox.color
         },
+        // 按钮宽度
+        buttonWidth: {
+            type: [String, Number],
+            default: () => defProps.numberBox.buttonWidth
+        },
         // 按钮大小，宽高等于此值，单位px，输入框高度和此值保持一致
         buttonSize: {
             type: [String, Number],
             default: () => defProps.numberBox.buttonSize
         },
+        // 按钮圆角
+        buttonRadius: {
+            type: [String],
+            default: () => defProps.numberBox.buttonRadius
+        },
         // 输入框和按钮的背景颜色
         bgColor: {
             type: String,
             default: () => defProps.numberBox.bgColor
         },
+        // 按钮禁用背景色
+        disabledBgColor: {
+            type: String,
+            default: () => defProps.numberBox.disabledBgColor
+        },
+        // 输入框背景颜色
+        inputBgColor: {
+            type: String,
+            default: () => defProps.numberBox.inputBgColor
+        },
         // 指定光标于键盘的距离，避免键盘遮挡输入框，单位px
         cursorSpacing: {
             type: [String, Number],
@@ -115,6 +135,11 @@ export const props = defineMixin({
         iconStyle: {
             type: [Object, String],
             default: () => defProps.numberBox.iconStyle
-        }
+        },
+        // 迷你模式
+        miniMode: {
+            type: Boolean,
+            default: () => defProps.numberBox.miniMode
+        },
     }
 })
diff --git a/uview-plus/components/u-number-box/u-number-box.vue b/uview-plus/components/u-number-box/u-number-box.vue
index c0afaf9..09ae4f5 100644
--- a/uview-plus/components/u-number-box/u-number-box.vue
+++ b/uview-plus/components/u-number-box/u-number-box.vue
@@ -5,12 +5,12 @@
 		    @tap.stop="clickHandler('minus')"
 		    @touchstart="onTouchStart('minus')"
 		    @touchend.stop="clearTimeout"
-		    v-if="showMinus && $slots.minus"
+		    v-if="showMinus && !hideMinus && $slots.minus"
 		>
 			<slot name="minus" />
 		</view>
 		<view
-		    v-else-if="showMinus"
+		    v-else-if="showMinus && !hideMinus"
 		    class="u-number-box__minus cursor-pointer"
 		    @tap.stop="clickHandler('minus')"
 		    @touchstart="onTouchStart('minus')"
@@ -20,45 +20,47 @@
 		    :class="{ 'u-number-box__minus--disabled': isDisabled('minus') }"
 		    :style="[buttonStyle('minus')]"
 		>
-			<u-icon
+			<up-icon
 			    name="minus"
 			    :color="isDisabled('minus') ? '#c8c9cc' : '#323233'"
 			    size="15"
 			    bold
 				:customStyle="iconStyle"
-			></u-icon>
+			></up-icon>
 		</view>
 
-		<slot name="input">
-			<!-- #ifdef MP-WEIXIN -->
-			<input
-			    :disabled="disabledInput || disabled"
-			    :cursor-spacing="getCursorSpacing"
-			    :class="{ 'u-number-box__input--disabled': disabled || disabledInput }"
-			    :value="currentValue"
-			    class="u-number-box__input"
-			    @blur="onBlur"
-			    @focus="onFocus"
-			    @input="onInput"
-			    type="number"
-			    :style="[inputStyle]"
-			/>
-			<!-- #endif -->
-			<!-- #ifndef MP-WEIXIN -->
-			<input
-			    :disabled="disabledInput || disabled"
-			    :cursor-spacing="getCursorSpacing"
-			    :class="{ 'u-number-box__input--disabled': disabled || disabledInput }"
-			    v-model="currentValue"
-			    class="u-number-box__input"
-			    @blur="onBlur"
-			    @focus="onFocus"
-			    @input="onInput"
-			    type="number"
-			    :style="[inputStyle]"
-			/>
-			<!-- #endif -->
-		</slot>
+		<template v-if="!hideMinus">
+			<slot name="input">
+				<!-- #ifdef MP-WEIXIN -->
+				<input
+					:disabled="disabledInput || disabled"
+					:cursor-spacing="getCursorSpacing"
+					:class="{ 'u-number-box__input--disabled': disabled || disabledInput }"
+					:value="currentValue"
+					class="u-number-box__input"
+					@blur="onBlur"
+					@focus="onFocus"
+					@input="onInput"
+					type="number"
+					:style="[inputStyle]"
+				/>
+				<!-- #endif -->
+				<!-- #ifndef MP-WEIXIN -->
+				<input
+					:disabled="disabledInput || disabled"
+					:cursor-spacing="getCursorSpacing"
+					:class="{ 'u-number-box__input--disabled': disabled || disabledInput }"
+					v-model="currentValue"
+					class="u-number-box__input"
+					@blur="onBlur"
+					@focus="onFocus"
+					@input="onInput"
+					type="number"
+					:style="[inputStyle]"
+				/>
+				<!-- #endif -->
+			</slot>
+		</template>
 		<view
 		    class="u-number-box__slot cursor-pointer"
 		    @tap.stop="clickHandler('plus')"
@@ -79,13 +81,13 @@
 		    :class="{ 'u-number-box__minus--disabled': isDisabled('plus') }"
 		    :style="[buttonStyle('plus')]"
 		>
-			<u-icon
+			<up-icon
 			    name="plus"
 			    :color="isDisabled('plus') ? '#c8c9cc' : '#323233'"
 			    size="15"
 			    bold
 				:customStyle="iconStyle"
-			></u-icon>
+			></up-icon>
 		</view>
 	</view>
 </template>
@@ -164,6 +166,9 @@
 			// #endif
 		},
 		computed: {
+			hideMinus() {
+				return this.currentValue == 0 && this.miniMode == true
+			},
 			getCursorSpacing() {
 				// 判断传入的单位，如果为px单位，需要转成px
 				return getPx(this.cursorSpacing)
@@ -173,11 +178,13 @@
 				return (type) => {
 					const style = {
 						backgroundColor: this.bgColor,
+						width: addUnit(this.buttonWidth),
 						height: addUnit(this.buttonSize),
-						color: this.color
+						color: this.color,
+						borderRadius: this.buttonRadius
 					}
 					if (this.isDisabled(type)) {
-						style.backgroundColor = '#f7f8fa'
+						style.backgroundColor = this.disabledBgColor
 					}
 					return style
 				}
@@ -187,7 +194,7 @@
 				const disabled = this.disabled || this.disabledInput
 				const style = {
 					color: this.color,
-					backgroundColor: this.bgColor,
+					backgroundColor: this.inputBgColor || this.bgColor,
 					height: addUnit(this.buttonSize),
 					width: addUnit(this.inputWidth)
 				}
@@ -304,11 +311,17 @@
 					value = ''
 				} = e.detail || {}
 				// 为空返回
-				if (value === '') return
+				if (value === '') {
+					// 为空自动设为最小值
+					this.emitChange(this.min)
+					return
+				}
 				let formatted = this.filter(value)
+				// https://github.com/ijry/uview-plus/issues/613
+				this.emitChange(value);
 				// 最大允许的小数长度
 				if (this.decimalLength !== null && formatted.indexOf('.') !== -1) {
-					const pair = formatted.split('.');
+					const pair = formatted.split('.')
 					formatted = `${pair[0]}.${pair[1].slice(0, this.decimalLength)}`
 				}
 				formatted = this.format(formatted)
@@ -318,8 +331,8 @@
 				// #endif 
 			
 			},
-			// 发出change事件
-			emitChange(value) {
+			// 发出change事件，type目前只支持点击时有值，手动输入不支持。
+			emitChange(value, type = '') {
 				// 如果开启了异步变更值，则不修改内部的值，需要用户手动在外部通过v-model变更
 				if (!this.asyncChange) {
 					this.$nextTick(() => {
@@ -336,6 +349,7 @@
 				this.$emit('change', {
 					value,
 					name: this.name,
+					type: type // 当前变更类型
 				});
 			},
 			onChange() {
@@ -347,7 +361,7 @@
 				}
 				const diff = type === 'minus' ? -this.step : +this.step
 				const value = this.format(this.add(+this.currentValue, diff))
-				this.emitChange(value)
+				this.emitChange(value, type)
 				this.$emit(type)
 			},
 			// 对值扩大后进行四舍五入，再除以扩大因子，避免出现浮点数操作的精度问题
@@ -393,8 +407,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import '../../libs/css/components.scss';
-
 	$u-numberBox-hover-bgColor: #E6E6E6 !default;
 	$u-numberBox-disabled-color: #c8c9cc !default;
 	$u-numberBox-disabled-bgColor: #f7f8fa !default;
diff --git a/uview-plus/components/u-number-keyboard/numberKeyboard.js b/uview-plus/components/u-number-keyboard/numberKeyboard.js
index 7b45065..f94be24 100644
--- a/uview-plus/components/u-number-keyboard/numberKeyboard.js
+++ b/uview-plus/components/u-number-keyboard/numberKeyboard.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:08:05
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/numberKeyboard.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/numberKeyboard.js
  */
 export default {
     // 数字键盘
diff --git a/uview-plus/components/u-number-keyboard/u-number-keyboard.vue b/uview-plus/components/u-number-keyboard/u-number-keyboard.vue
index 2013bc7..2290793 100644
--- a/uview-plus/components/u-number-keyboard/u-number-keyboard.vue
+++ b/uview-plus/components/u-number-keyboard/u-number-keyboard.vue
@@ -28,11 +28,11 @@
 				@touchstart.stop="backspaceClick"
 				@touchend="clearTimer"
 			>
-				<u-icon
+				<up-icon
 					name="backspace"
 					color="#303133"
 					size="28"
-				></u-icon>
+				></up-icon>
 			</view>
 		</view>
 	</view>
@@ -134,7 +134,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	$u-number-keyboard-background-color:rgb(224, 228, 230) !default;
 	$u-number-keyboard-padding:8px 10rpx 8px 10rpx !default;
 	$u-number-keyboard-button-width:222rpx !default;
diff --git a/uview-plus/components/u-overlay/overlay.js b/uview-plus/components/u-overlay/overlay.js
index c26d068..89f1da3 100644
--- a/uview-plus/components/u-overlay/overlay.js
+++ b/uview-plus/components/u-overlay/overlay.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:06:50
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/overlay.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/overlay.js
  */
 export default {
     // overlay组件
diff --git a/uview-plus/components/u-overlay/u-overlay.vue b/uview-plus/components/u-overlay/u-overlay.vue
index 71e4342..c2c007b 100644
--- a/uview-plus/components/u-overlay/u-overlay.vue
+++ b/uview-plus/components/u-overlay/u-overlay.vue
@@ -19,7 +19,7 @@
 	/**
 	 * overlay 遮罩
 	 * @description 创建一个遮罩层，用于强调特定的页面元素，并阻止用户对遮罩下层的内容进行操作，一般用于弹窗场景
-	 * @tutorial https://ijry.github.io/uview-plus/components/overlay.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/overlay.html
 	 * @property {Boolean}			show		是否显示遮罩（默认 false ）
 	 * @property {String | Number}	zIndex		zIndex 层级（默认 10070 ）
 	 * @property {String | Number}	duration	动画时长，单位毫秒（默认 300 ）
@@ -55,7 +55,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
      $u-overlay-top:0 !default;
      $u-overlay-left:0 !default;
      $u-overlay-width:100% !default;
diff --git a/uview-plus/components/u-pagination/u-pagination.vue b/uview-plus/components/u-pagination/u-pagination.vue
new file mode 100644
index 0000000..b256aa6
--- /dev/null
+++ b/uview-plus/components/u-pagination/u-pagination.vue
@@ -0,0 +1,285 @@
+<template>
+  <view class="u-pagination">
+    <!-- 上一页按钮 -->
+    <view
+      :class="[
+        'u-pagination-btn',
+        { disabled: currentPage === 1 }
+      ]"
+      :style="{ backgroundColor: buttonBgColor, borderColor: buttonBorderColor }"
+      @click="prev"
+    >
+      <template v-if="prevText">
+        {{ prevText }}
+      </template>
+      <up-icon v-else name="arrow-left"></up-icon>
+    </view>
+
+    <!-- 页码列表 -->
+    <block v-for="page in displayedPages" :key="page" v-if="layout.includes('pager')">
+      <view
+        :class="[
+          'u-pagination-item',
+          { active: page === currentPage }
+        ]"
+        @click="goTo(page)"
+      >
+        {{ page }}
+      </view>
+    </block>
+
+    <!-- 总数显示 -->
+    <view v-if="total > 0 && layout.includes('total')" class="u-pagination-total">
+        {{ currentPage }} / {{ totalPages }}
+    </view>
+
+    <!-- 每页数量选择器 -->
+    <!-- <picker
+      v-if="layout.includes('sizes')"
+      mode="selector"
+      :range="pageSizes"
+      range-key="label"
+      :value="pageSizeIndex"
+      @change="handleSizeChange"
+      class="u-pagination-sizes"
+    >
+      <view>{{ pageSizeLabel }}</view>
+    </picker> -->
+
+    <!-- 下一页按钮 -->
+    <view
+      :class="[
+        'u-pagination-btn',
+        { disabled: currentPage === totalPages }
+      ]"
+      :style="{ backgroundColor: buttonBgColor, borderColor: buttonBorderColor }"
+      @click="next"
+    >
+      <template v-if="nextText">
+        {{ nextText }}
+      </template>
+      <up-icon v-else name="arrow-right"></up-icon>
+    </view>
+
+    <!-- 跳转输入框 -->
+    <!-- <view v-if="layout.includes('jumper')">
+      <text>前往</text>
+      <input
+        type="number"
+        class="u-pagination-jumper"
+        :value="currentPageInput"
+        @input="onInputPage"
+        @confirm="onConfirmPage"
+      />
+      <text>页</text>
+    </view> -->
+  </view>
+</template>
+
+<script>
+import { t } from '../../libs/i18n'
+export default {
+  name: 'u-pagination',
+  props: {
+    // 当前页码
+    currentPage: {
+      type: Number,
+      default: 1
+    },
+    // 每页条目数
+    pageSize: {
+      type: Number,
+      default: 10
+    },
+    // 总数据条目数
+    total: {
+      type: Number,
+      default: 0
+    },
+    // 上一页按钮文案
+    prevText: {
+      type: String,
+      default: ''
+    },
+    // 下一页按钮文案
+    nextText: {
+      type: String,
+      default: ''
+    },
+    buttonBgColor: {
+      type: String,
+      default: '#f5f7fa'
+    },
+    buttonBorderColor: {
+      type: String,
+      default: '#dcdfe6'
+    },
+    // 可选的每页条目数
+    pageSizes: {
+      type: Array,
+      default: () => [10, 20, 30, 40, 50]
+    },
+    // 布局方式（类似 el-pagination）
+    layout: {
+      type: String,
+      default: 'prev, pager, next'
+    },
+    // 是否隐藏只有一个页面时的分页控件
+    hideOnSinglePage: {
+      type: Boolean,
+      default: false
+    }
+  },
+  emits: ['update:currentPage', 'update:pageSize', 'current-change', 'size-change'],
+  data() {
+    return {
+      currentPageInput: this.currentPage + ''
+    };
+  },
+  computed: {
+    totalPages() {
+      return Math.max(1, Math.ceil(this.total / this.pageSize));
+    },
+    pageSizeIndex() {
+      const index = this.pageSizes.findIndex(size => size.value === this.pageSize);
+      return index >= 0 ? index : 0;
+    },
+    pageSizeLabel() {
+      const found = this.pageSizes.find(size => size.value === this.pageSize);
+      return found?.label || this.pageSize;
+    },
+    displayedPages() {
+        const total = this.totalPages;
+        const current = this.currentPage;
+
+        if (total <= 4) {
+            return Array.from({ length: total }, (_, i) => i + 1);
+        }
+
+        const pages = [];
+
+        // 当前页靠近头部
+        if (current <= 2) {
+            for (let i = 1; i <= 4; i++) {
+            pages.push(i);
+            }
+            pages.push('...');
+            pages.push(total);
+        }
+        // 当前页在尾部附近
+        else if (current >= total - 1) {
+            pages.push(1);
+            pages.push('...');
+            for (let i = total - 3; i <= total; i++) {
+            pages.push(i);
+            }
+        }
+        // 中间情况
+        else {
+            pages.push(1);
+            pages.push('...');
+            pages.push(current - 1);
+            pages.push(current);
+            pages.push(current + 1);
+            pages.push('...');
+            pages.push(total);
+        }
+
+        return pages;
+    }
+    // 控制是否隐藏
+  },
+  watch: {
+    currentPage(val) {
+      this.currentPageInput = val + '';
+    }
+  },
+  methods: {
+    t,
+    handleSizeChange(e) {
+      const selected = e.detail.value;
+      const size = this.pageSizes[selected]?.value || this.pageSizes[0].value;
+      this.$emit('update:pageSize', size);
+      this.$emit('size-change', size);
+    },
+    prev() {
+      if (this.currentPage > 1) {
+        this.goTo(this.currentPage - 1);
+      }
+    },
+    next() {
+      if (this.currentPage < this.totalPages) {
+        this.goTo(this.currentPage + 1);
+      }
+    },
+    goTo(page) {
+      if (page === '...' || page === this.currentPage) return;
+      this.$emit('update:currentPage', page);
+      this.$emit('current-change', page);
+    },
+    onInputPage(e) {
+      this.currentPageInput = e.detail.value;
+    },
+    onConfirmPage(e) {
+      const num = parseInt(e.detail.value);
+      if (!isNaN(num) && num >= 1 && num <= this.totalPages) {
+        this.goTo(num);
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.u-pagination {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  font-size: 14px;
+  color: #606266;
+
+  .u-pagination-total {
+    margin-right: 10px;
+  }
+
+  .u-pagination-sizes {
+    margin-right: 10px;
+    padding: 4px 4px;
+    border: 1rpx solid #dcdfe6;
+    border-radius: 4px;
+  }
+
+  .u-pagination-btn {
+    margin: 0 3px;
+    padding: 4px 4px;
+    border: 1rpx solid #dcdfe6;
+    border-radius: 4px;
+    background-color: #f5f7fa;
+    &.disabled {
+      opacity: 0.5;
+    }
+  }
+
+  .u-pagination-item {
+    margin: 0 2px;
+    padding: 4px 8px;
+    border-radius: 4px;
+    &.active {
+      background-color: #409eff;
+      color: white;
+    }
+  }
+
+  .u-pagination-jumper {
+    width: 40px;
+    height: 28px;
+    margin: 0 5px;
+    padding: 0 5px;
+    border: 1rpx solid #dcdfe6;
+    border-radius: 4px;
+    font-size: 14px;
+  }
+}
+</style>
diff --git a/uview-plus/components/u-parse/node/node.vue b/uview-plus/components/u-parse/node/node.vue
index 70a4b05..bc5b262 100644
--- a/uview-plus/components/u-parse/node/node.vue
+++ b/uview-plus/components/u-parse/node/node.vue
@@ -10,13 +10,19 @@
       <!-- #endif -->
       <!-- #ifndef H5 || (APP-PLUS && VUE2) -->
       <!-- 表格中的图片，使用 rich-text 防止大小不正确 -->
-      <rich-text v-if="n.name==='img'&&n.t" :style="'display:'+n.t" :nodes="'<img class=\'_img\' style=\''+n.attrs.style+'\' src=\''+n.attrs.src+'\'>'" :data-i="i" @tap.stop="imgTap" />
+      <rich-text v-if="n.name==='img'&&n.t" :style="'display:'+n.t" :nodes="[{attrs:{style:n.attrs.style||'',src:n.attrs.src},name:'img'}]" :data-i="i" @tap.stop="imgTap" />
       <!-- #endif -->
-      <!-- #ifndef H5 || APP-PLUS -->
-      <image v-else-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]===-1?'display:none;':'')+'width:'+(ctrl[i]||1)+'px;height:1px;'+n.attrs.style" :src="n.attrs.src" :mode="!n.h?'widthFix':(!n.w?'heightFix':'')" :lazy-load="opts[0]" :webp="n.webp" :show-menu-by-longpress="opts[3]&&!n.attrs.ignore" :image-menu-prevent="!opts[3]||n.attrs.ignore" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap" />
+      <!-- #ifdef APP-HARMONY -->
+      <image v-else-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]===-1?'display:none;':'')+'width:'+ctrl[i]+'px;'+n.attrs.style" :src="n.attrs.src||(ctrl.load?n.attrs['data-src']:'')" :mode="!n.h?'widthFix':(!n.w?'heightFix':(n.m||'scaleToFill'))" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap" />
+      <!-- #endif -->
+      <!-- #ifndef H5 || APP-PLUS || MP-KUAISHOU -->
+      <image v-else-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]===-1?'display:none;':'')+'width:'+(ctrl[i]||1)+'px;height:1px;'+n.attrs.style" :src="n.attrs.src" :mode="!n.h?'widthFix':(!n.w?'heightFix':(n.m||'scaleToFill'))" :lazy-load="opts[0]" :webp="n.webp" :show-menu-by-longpress="opts[3]&&!n.attrs.ignore" :image-menu-prevent="!opts[3]||n.attrs.ignore" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap" />
+      <!-- #endif -->
+      <!-- #ifdef MP-KUAISHOU -->
+      <image v-else-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]===-1?'display:none;':'')+n.attrs.style" :src="n.attrs.src" :lazy-load="opts[0]" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap"></image>
       <!-- #endif -->
       <!-- #ifdef APP-PLUS && VUE3 -->
-      <image v-else-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]===-1?'display:none;':'')+'width:'+(ctrl[i]||1)+'px;'+n.attrs.style" :src="n.attrs.src||(ctrl.load?n.attrs['data-src']:'')" :mode="!n.h?'widthFix':(!n.w?'heightFix':'')" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap" />
+      <image v-else-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]===-1?'display:none;':'')+'width:'+(ctrl[i]||1)+'px;'+n.attrs.style" :src="n.attrs.src||(ctrl.load?n.attrs['data-src']:'')" :mode="!n.h?'widthFix':(!n.w?'heightFix':(n.m||''))" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap" />
       <!-- #endif -->
       <!-- 文本 -->
       <!-- #ifdef MP-WEIXIN -->
@@ -25,14 +31,14 @@
       <!-- #ifndef MP-WEIXIN || MP-BAIDU || MP-ALIPAY || MP-TOUTIAO -->
       <text v-else-if="n.text" decode>{{n.text}}</text>
       <!-- #endif -->
-      <text v-else-if="n.name==='br'">\n</text>
+      <text v-else-if="n.name==='br'">{{'\n'}}</text>
       <!-- 链接 -->
       <view v-else-if="n.name==='a'" :id="n.attrs.id" :class="(n.attrs.href?'_a ':'')+n.attrs.class" hover-class="_hover" :style="'display:inline;'+n.attrs.style" :data-i="i" @tap.stop="linkTap">
         <node name="span" :childs="n.children" :opts="opts" style="display:inherit" />
       </view>
       <!-- 视频 -->
       <!-- #ifdef APP-PLUS -->
-      <view v-else-if="n.html" :id="n.attrs.id" :class="'_video '+n.attrs.class" :style="n.attrs.style" v-html="n.html" @vplay.stop="play" />
+      <view v-else-if="n.html" :id="n.attrs.id" :class="'_video '+n.attrs.class" :style="n.attrs.style" v-html="n.html" :data-i="i" @vplay.stop="play" />
       <!-- #endif -->
       <!-- #ifndef APP-PLUS -->
       <video v-else-if="n.name==='video'" :id="n.attrs.id" :class="n.attrs.class" :style="n.attrs.style" :autoplay="n.attrs.autoplay" :controls="n.attrs.controls" :loop="n.attrs.loop" :muted="n.attrs.muted" :object-fit="n.attrs['object-fit']" :poster="n.attrs.poster" :src="n.src[ctrl[i]||0]" :data-i="i" @play="play" @error="mediaError" />
@@ -61,13 +67,13 @@
           </block>
         </view>
       </view>
-
+      <!-- insert -->
       <!-- 富文本 -->
       <!-- #ifdef H5 || ((MP-WEIXIN || MP-QQ || APP-PLUS || MP-360) && VUE2) -->
       <rich-text v-else-if="!n.c&&!handler.isInline(n.name, n.attrs.style)" :id="n.attrs.id" :style="n.f" :user-select="opts[4]" :nodes="[n]" />
       <!-- #endif -->
       <!-- #ifndef H5 || ((MP-WEIXIN || MP-QQ || APP-PLUS || MP-360) && VUE2) -->
-      <rich-text v-else-if="!n.c" :id="n.attrs.id" :style="n.f+';display:inline'" :preview="false" :selectable="opts[4]" :user-select="opts[4]" :nodes="[n]" />
+      <rich-text v-else-if="!n.c" :id="n.attrs.id" :style="'display:inline;'+n.f" :preview="false" :selectable="opts[4]" :user-select="opts[4]" :nodes="[n]" />
       <!-- #endif -->
       <!-- 继续递归 -->
       <view v-else-if="n.c===2" :id="n.attrs.id" :class="'_block _'+n.name+' '+n.attrs.class" :style="n.f+';'+n.attrs.style">
@@ -106,7 +112,6 @@ module.exports = {
 }
 </script>
 <script>
-
 import node from './node'
 export default {
   name: 'node',
@@ -138,14 +143,14 @@ export default {
     opts: Array
   },
   components: {
-
-    // #ifndef (H5 || APP-PLUS) && VUE3
+    // #ifndef ((H5 || APP-PLUS) && VUE3) || APP-HARMONY
     node
     // #endif
   },
   mounted () {
     this.$nextTick(() => {
-      for (this.root = this.$parent; this.root.$options.name !== 'u-parse'; this.root = this.root.$parent);
+      // 修复可能导致死循环的问题
+      for (this.root = this?.$parent; this.root && this.root?.$options.name !== 'up-parse'; this.root = this.root?.$parent);
     })
     // #ifdef H5 || APP-PLUS
     if (this.opts[0]) {
@@ -168,14 +173,15 @@ export default {
     }
     // #endif
   },
-  beforeUnmount () {
+  beforeDestroy () {
     // #ifdef H5 || APP-PLUS
     if (this.observer) {
       this.observer.disconnect()
     }
     // #endif
   },
-  methods:{
+  emits: ['linktap', 'imgtap', 'play', 'ready', 'error'],
+  methods: {
     // #ifdef MP-WEIXIN
     toJSON () { return this },
     // #endif
@@ -184,7 +190,15 @@ export default {
      * @param {Event} e
      */
     play (e) {
-      this.root.$emit('play')
+      const i = e.currentTarget.dataset.i
+      const node = this.childs[i]
+      this.root.$emit('play', {
+        source: node.name,
+        attrs: {
+          ...node.attrs,
+          src: node.src[this.ctrl[i] || 0]
+        }
+      })
       // #ifndef APP-PLUS
       if (this.root.pauseVideo) {
         let flag = false
@@ -227,7 +241,14 @@ export default {
       // #ifdef H5 || APP-PLUS
       node.attrs.src = node.attrs.src || node.attrs['data-src']
       // #endif
-      this.root.$emit('imgTap', node.attrs)
+      // #ifndef APP-HARMONY
+      this.root.$emit('imgtap', node.attrs)
+      // #endif
+      // #ifdef APP-HARMONY
+      this.root.$emit('imgtap', {
+        ...node.attrs
+      })
+      // #endif
       // 自动预览图片
       if (this.root.previewImg) {
         uni.previewImage({
@@ -299,7 +320,7 @@ export default {
      * @description 检查是否所有图片加载完毕
      */
     checkReady () {
-      if (!this.root.lazyLoad) {
+      if (this.root && !this.root.lazyLoad) {
         this.root._unloadimgs -= 1
         if (!this.root._unloadimgs) {
           setTimeout(() => {
@@ -321,7 +342,7 @@ export default {
       const node = e.currentTarget ? this.childs[e.currentTarget.dataset.i] : {}
       const attrs = node.attrs || e
       const href = attrs.href
-      this.root.$emit('linkTap', Object.assign({
+      this.root.$emit('linktap', Object.assign({
         innerText: this.root.getText(node.children || []) // 链接内的文本内容
       }, attrs))
       if (href) {
@@ -346,6 +367,9 @@ export default {
             // #ifdef APP-PLUS
             plus.runtime.openWeb(href)
             // #endif
+            // #ifdef APP-HARMONY
+            plus.runtime.openURL(href)
+            // #endif
           }
         } else {
           // 跳转页面
@@ -407,9 +431,7 @@ export default {
 ._a {
   padding: 1.5px 0 1.5px 0;
   color: #366092;
-  /* #ifndef APP-NVUE */
   word-break: break-all;
-  /* #endif */
 }
 
 /* a 标签点击态效果 */
@@ -427,9 +449,7 @@ export default {
 /* 内部样式 */
 
 ._block {
-  /* #ifndef APP-NVUE */
   display: block;
-  /* #endif */
 }
 
 ._b,
@@ -476,9 +496,7 @@ export default {
 ._h4,
 ._h5,
 ._h6 {
-  /* #ifndef APP-NVUE */
   display: block;
-  /* #endif */
   font-weight: bold;
 }
 
@@ -500,9 +518,7 @@ export default {
 
 ._ol,
 ._ul {
-  /* #ifndef APP-NVUE */
   display: block;
-  /* #endif */
   padding-left: 40px;
   margin: 1em 0;
 }
@@ -581,4 +597,4 @@ export default {
   height: 225px;
 }
 /* #endif */
-</style>
\ No newline at end of file
+</style>
diff --git a/uview-plus/components/u-parse/parse.js b/uview-plus/components/u-parse/parse.js
index feb22b9..a70dabe 100644
--- a/uview-plus/components/u-parse/parse.js
+++ b/uview-plus/components/u-parse/parse.js
@@ -1,11 +1,11 @@
 /*
- * @Author       : LQ
+ * @Author       : jry
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:17:33
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/parse.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-05-17 17:17:33
+ * @FilePath     : /uview-plus/libs/config/props/parse.js
  */
 export default {
     // parse
diff --git a/uview-plus/components/u-parse/parser.js b/uview-plus/components/u-parse/parser.js
index c251cbf..e8fc979 100644
--- a/uview-plus/components/u-parse/parser.js
+++ b/uview-plus/components/u-parse/parser.js
@@ -71,16 +71,24 @@ const config = {
     viewbox: 'viewBox',
     attributename: 'attributeName',
     repeatcount: 'repeatCount',
-    repeatdur: 'repeatDur'
+    repeatdur: 'repeatDur',
+    foreignobject: 'foreignObject'
   }
 }
-const tagSelector={}
-const {
-  windowWidth,
+const tagSelector = {}
+let windowWidth, system
+// #ifdef MP-WEIXIN
+if (uni.canIUse('getWindowInfo')) {
+  windowWidth = uni.getWindowInfo().windowWidth
+  system = uni.getDeviceInfo().system
+} else {
+// #endif
+  const systemInfo = uni.getSystemInfoSync()
+  windowWidth = systemInfo.windowWidth
   // #ifdef MP-WEIXIN
-  system
-  // #endif
-} = uni.getSystemInfoSync()
+  system = systemInfo.system
+}
+// #endif
 const blankChar = makeMap(' ,\r,\n,\t,\f')
 let idIndex = 0
 
@@ -321,6 +329,7 @@ Parser.prototype.onTagName = function (name) {
   this.tagName = this.xml ? name : name.toLowerCase()
   if (this.tagName === 'svg') {
     this.xml = (this.xml || 0) + 1 // svg 标签内大小写敏感
+    config.ignoreTags.style = undefined // svg 标签内 style 可用
   }
 }
 
@@ -331,12 +340,18 @@ Parser.prototype.onTagName = function (name) {
  */
 Parser.prototype.onAttrName = function (name) {
   name = this.xml ? name : name.toLowerCase()
+  // #ifdef (VUE3 && (H5 || APP-PLUS)) || APP-PLUS-NVUE
+  if (name.includes('?') || name.includes(';')) {
+    this.attrName = undefined
+    return
+  }
+  // #endif
   if (name.substr(0, 5) === 'data-') {
     if (name === 'data-src' && !this.attrs.src) {
       // data-src 自动转为 src
       this.attrName = 'src'
     } else if (this.tagName === 'img' || this.tagName === 'a') {
-      // a 和 img 标签保留 data- 的属性，可以在 imgTap 和 linkTap 事件中使用
+      // a 和 img 标签保留 data- 的属性，可以在 imgtap 和 linktap 事件中使用
       this.attrName = name
     } else {
       // 剩余的移除以减小大小
@@ -457,7 +472,7 @@ Parser.prototype.onOpenTag = function (selfClose) {
           node.webp = 'T'
         }
         // data url 图片如果没有设置 original-src 默认为不可预览的小图片
-        if (attrs.src.includes('data:') && !attrs['original-src']) {
+        if (attrs.src.includes('data:') && this.options.previewImg !== 'all' && !attrs['original-src']) {
           attrs.ignore = 'T'
         }
         if (!attrs.ignore || node.webp || attrs.src.includes('cloud://')) {
@@ -551,6 +566,13 @@ Parser.prototype.onOpenTag = function (selfClose) {
       if (!isNaN(parseInt(styleObj.height)) && (!styleObj.height.includes('%') || (parent && (parent.attrs.style || '').includes('height')))) {
         node.h = 'T'
       }
+      if (node.w && node.h && styleObj['object-fit']) {
+        if (styleObj['object-fit'] === 'contain') {
+          node.m = 'aspectFit'
+        } else if (styleObj['object-fit'] === 'cover') {
+          node.m = 'aspectFill'
+        }
+      }
     } else if (node.name === 'svg') {
       siblings.push(node)
       this.stack.push(node)
@@ -677,11 +699,19 @@ Parser.prototype.popNode = function () {
         return
       }
       const name = config.svgDict[node.name] || node.name
+      if (name === 'foreignObject') {
+        for (const child of (node.children || [])) {
+          if (child.attrs && !child.attrs.xmlns) {
+            child.attrs.xmlns = 'http://www.w3.org/1999/xhtml'
+            break
+          }
+        }
+      }
       src += '<' + name
       for (const item in node.attrs) {
         const val = node.attrs[item]
         if (val) {
-          src += ` ${config.svgDict[item] || item}="${val}"`
+          src += ` ${config.svgDict[item] || item}="${val.replace(/"/g, '')}"`
         }
       }
       if (!node.children) {
@@ -703,6 +733,7 @@ Parser.prototype.popNode = function () {
     node.children = undefined
     // #endif
     this.xml = false
+    config.ignoreTags.style = true
     return
   }
 
@@ -839,6 +870,10 @@ Parser.prototype.popNode = function () {
     if (node.flag && node.c) {
       // 有 colspan 或 rowspan 且含有链接的表格通过 grid 布局实现
       styleObj.display = 'grid'
+      if (styleObj['border-collapse'] === 'collapse') {
+        styleObj['border-collapse'] = undefined
+        spacing = 0
+      }
       if (spacing) {
         styleObj['grid-gap'] = spacing + 'px'
         styleObj.padding = spacing + 'px'
@@ -856,6 +891,23 @@ Parser.prototype.popNode = function () {
         for (let i = 0; i < nodes.length; i++) {
           if (nodes[i].name === 'tr') {
             trList.push(nodes[i])
+          } else if (nodes[i].name === 'colgroup') {
+            let colI = 1
+            for (const col of (nodes[i].children || [])) {
+              if (col.name === 'col') {
+                const style = col.attrs.style || ''
+                const start = style.indexOf('width') ? style.indexOf(';width') : 0
+                // 提取出宽度
+                if (start !== -1) {
+                  let end = style.indexOf(';', start + 6)
+                  if (end === -1) {
+                    end = style.length
+                  }
+                  width[colI] = style.substring(start ? start + 7 : 6, end)
+                }
+                colI += 1
+              }
+            }
           } else {
             traversal(nodes[i].children || [])
           }
@@ -982,11 +1034,26 @@ Parser.prototype.popNode = function () {
       node.children = [table]
       attrs = table.attrs
     }
+  } else if ((node.name === 'tbody' || node.name === 'tr') && node.flag && node.c) {
+    node.flag = undefined;
+    (function traversal (nodes) {
+      for (let i = 0; i < nodes.length; i++) {
+        if (nodes[i].name === 'td') {
+          // 颜色样式设置给单元格避免丢失
+          for (const style of ['color', 'background', 'background-color']) {
+            if (styleObj[style]) {
+              nodes[i].attrs.style = style + ':' + styleObj[style] + ';' + (nodes[i].attrs.style || '')
+            }
+          }
+        } else {
+          traversal(nodes[i].children || [])
+        }
+      }
+    })(children)
   } else if ((node.name === 'td' || node.name === 'th') && (attrs.colspan || attrs.rowspan)) {
     for (let i = this.stack.length; i--;) {
-      if (this.stack[i].name === 'table') {
+      if (this.stack[i].name === 'table' || this.stack[i].name === 'tbody' || this.stack[i].name === 'tr') {
         this.stack[i].flag = 1 // 指示含有合并单元格
-        break
       }
     }
   } else if (node.name === 'ruby') {
diff --git a/uview-plus/components/u-parse/props.js b/uview-plus/components/u-parse/props.js
index 50760dc..733c2b1 100644
--- a/uview-plus/components/u-parse/props.js
+++ b/uview-plus/components/u-parse/props.js
@@ -42,7 +42,13 @@ export const props = defineMixin({
 		  type: Boolean,
 		  default: () => defProps.parse.showImgMenu
         },
-        tagStyle: Object,
-        useAnchor: null
-	  }
-}
+        tagStyle: {
+		  type: Object,
+		  default: () => {}
+        },
+        useAnchor: {
+          type: Boolean,
+          default: null
+		}
+	}
+})
diff --git a/uview-plus/components/u-parse/u-parse.vue b/uview-plus/components/u-parse/u-parse.vue
index 6d535c6..e0871fe 100644
--- a/uview-plus/components/u-parse/u-parse.vue
+++ b/uview-plus/components/u-parse/u-parse.vue
@@ -12,7 +12,7 @@
 
 <script>
 /**
- * mp-html v2.4.1
+ * mp-html v2.5.1
  * @description 富文本组件
  * @tutorial https://github.com/jin-yufeng/mp-html
  * @property {String} container-style 容器的样式
@@ -32,8 +32,8 @@
  * @property {Boolean | Number} use-anchor 是否使用锚点链接
  * @event {Function} load dom 结构加载完毕时触发
  * @event {Function} ready 所有图片加载完毕时触发
- * @event {Function} imgTap 图片被点击时触发
- * @event {Function} linkTap 链接被点击时触发
+ * @event {Function} imgtap 图片被点击时触发
+ * @event {Function} linktap 链接被点击时触发
  * @event {Function} play 音视频播放时触发
  * @event {Function} error 媒体加载出错时触发
  */
@@ -46,7 +46,7 @@ const plugins = []
 const dom = weex.requireModule('dom')
 // #endif
 export default {
-	name: 'u-parse',
+	name: 'up-parse',
 	data() {
 		return {
 			nodes: [],
@@ -103,7 +103,7 @@ export default {
 		useAnchor: [Boolean, Number]
 	},
 	// #ifdef VUE3
-	emits: ['load', 'ready', 'imgTap', 'linkTap', 'play', 'error'],
+	emits: ['load', 'ready', 'imgtap', 'linktap', 'play', 'error'],
 	// #endif
 	// #ifndef APP-PLUS-NVUE
 	components: {
@@ -410,7 +410,7 @@ export default {
 					break
 				// 图片点击
 				case 'onImgTap':
-					this.$emit('imgTap', message.attrs)
+					this.$emit('imgtap', message.attrs)
 					if (this.previewImg) {
 						uni.previewImage({
 							current: parseInt(message.attrs.i),
@@ -421,7 +421,7 @@ export default {
 				// 链接点击
 				case 'onLinkTap': {
 					const href = message.attrs.href
-					this.$emit('linkTap', message.attrs)
+					this.$emit('linktap', message.attrs)
 					if (href) {
 						// 锚点跳转
 						if (href[0] === '#') {
@@ -433,7 +433,12 @@ export default {
 						} else if (href.includes('://')) {
 							// 打开外链
 							if (this.copyLink) {
-								plus.runtime.openWeb(href)
+							    // #ifdef APP-PLUS
+                                plus.runtime.openWeb(href)
+                                // #endif
+                                // #ifdef APP-HARMONY
+                                plus.runtime.openURL(href)
+                                // #endif
 							}
 						} else {
 							uni.navigateTo({
diff --git a/uview-plus/components/u-pdf-reader/props.js b/uview-plus/components/u-pdf-reader/props.js
new file mode 100644
index 0000000..dbaa178
--- /dev/null
+++ b/uview-plus/components/u-pdf-reader/props.js
@@ -0,0 +1,19 @@
+export default {
+    props: {
+        // PDF文件地址
+        src: {
+            type: String,
+            default: ''
+        },
+        // 组件高度
+        height: {
+            type: String,
+            default: '500px'
+        },
+        // pdfjs资源域名
+        baseUrl: {
+            type: String,
+            default: 'https://uview-plus.jiangruyi.com/h5'
+        }
+    }
+}
\ No newline at end of file
diff --git a/uview-plus/components/u-pdf-reader/u-pdf-reader.vue b/uview-plus/components/u-pdf-reader/u-pdf-reader.vue
new file mode 100644
index 0000000..2ff0747
--- /dev/null
+++ b/uview-plus/components/u-pdf-reader/u-pdf-reader.vue
@@ -0,0 +1,52 @@
+<template>
+	<view class="up-pdf-reader" :style="{ height: height }">
+		<web-view :fullscreen="false"
+			:src="viewerUrl" :style="{ width: '750rpx', height: height }"
+            :webview-styles="{ width: '750rpx', height: height }"
+			frameborder="0"
+		></web-view>
+	</view>
+</template>
+
+<script>
+	import props from './props.js';
+
+	/**
+	 * pdfReader PDF阅读器
+	 * @description 基于pdf.js的PDF阅读器组件
+	 * @tutorial https://uview-plus.jiangruyi.com/components/pdfReader.html
+	 * @property {String}			src				PDF文件地址
+	 * @property {String}	        height			组件高度，默认为'700px'
+	 * @property {String}			pdfjsDomain		pdfjs资源域名，默认为'https://uview-plus.jiangruyi.com/h5'
+	 * @example <up-pdf-reader src="https://example.com/file.pdf"></up-pdf-reader>
+	 */
+	export default {
+		name: 'up-pdf-reader',
+		mixins: [props],
+        data() {
+            return {
+                baseUrlInner: 'https://uview-plus.jiangruyi.com/h5',
+                viewerUrl: ''
+            }
+        },
+        watch: {
+            baseUrl: function (val) {
+                this.baseUrl = val;
+            },
+            src: function (val) {
+                this.viewerUrl = `${this.baseUrlInner}/static/pdfjs/web/viewer.html?file=` + encodeURIComponent(val);
+            }
+        },
+        mounted() {
+            if (this.baseUrl) {
+                this.baseUrlInner = this.baseUrl;
+            }
+            this.viewerUrl = `${this.baseUrlInner}/static/pdfjs/web/viewer.html?file=` + encodeURIComponent(this.src);
+		}
+	}
+</script>
+
+<style lang="scss" scoped>	
+	.up-pdf-reader {
+	}
+</style>
\ No newline at end of file
diff --git a/uview-plus/components/u-picker-column/u-picker-column.vue b/uview-plus/components/u-picker-column/u-picker-column.vue
index a2490d9..f788634 100644
--- a/uview-plus/components/u-picker-column/u-picker-column.vue
+++ b/uview-plus/components/u-picker-column/u-picker-column.vue
@@ -25,5 +25,4 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 </style>
diff --git a/uview-plus/components/u-picker-data/u-picker-data.vue b/uview-plus/components/u-picker-data/u-picker-data.vue
new file mode 100644
index 0000000..959c811
--- /dev/null
+++ b/uview-plus/components/u-picker-data/u-picker-data.vue
@@ -0,0 +1,147 @@
+<template>
+	<view class="u-picker-data">
+		<view class="u-picker-data__trigger">
+			<slot name="trigger" :current="current"></slot>
+			<up-input
+				v-if="!$slots['trigger']"
+				:modelValue="current"
+				disabled
+				disabledColor="#ffffff"
+				:placeholder="title"
+				border="none"
+			></up-input>
+			<view @click="show = true"
+				class="u-picker-data__trigger__cover"></view>
+		</view>
+		<up-picker
+			:show="show"
+			:columns="optionsInner"
+			:keyName="labelKey"
+			:defaultIndex="defaultIndex"
+			@confirm="confirm"
+			@cancel="cancel"
+			@close="close">
+		</up-picker>
+	</view>
+</template>
+
+<script>
+import { formValidate } from '../../libs/function/index';
+export default {
+	name: 'u-picker-data',
+    props: {
+		modelValue: {
+			type: [String, Number],
+			default: ''
+		},
+		title: {
+			type: String,
+			default: ''
+		},
+		description: {
+			type: String,
+			default: ''
+		},
+		options: {
+			type: Array,
+			default: () => {
+				return []
+			}
+		},
+		valueKey: {
+			type: String,
+			default: 'id'
+		},
+		labelKey: {
+			type: String,
+			default: 'name'
+		}
+    },
+    data() {
+        return {
+			show: false,
+			current: '',
+			defaultIndex: [],
+        }
+    },
+    created() {
+		if (this.modelValue) {
+			this.options.forEach((ele, index) => {
+				if (ele[this.valueKey] == this.modelValue) {
+					this.current = ele[this.labelKey]
+					this.defaultIndex = [index]
+				}
+			})
+		} else {
+			this.clear();
+		}
+    },
+	watch: {
+		modelValue() {
+			if (this.modelValue) {
+				this.options.forEach((ele, index) => {
+					if (ele[this.valueKey] == this.modelValue) {
+						this.current = ele[this.labelKey]
+						this.defaultIndex = [index]
+					}
+				})
+			} else {
+				this.clear();
+			}
+		}
+	},
+	computed: {
+		optionsInner() {
+			return [this.options];
+		}
+	},
+    emits: ['update:modelValue', 'cancel', 'close', 'confirm'],
+    methods: {
+        hideKeyboard() {
+            uni.hideKeyboard()
+        },
+		cancel() {
+			this.show = false;
+			this.$emit('cancel')
+		},
+		close() {
+			this.$emit('close')
+		},
+		clear() {
+			this.current = '';
+			this.defaultIndex = [];
+		},
+        confirm(e) {
+			const {
+			    columnIndex,
+			    index,
+				value,
+			} = e;
+			this.show = false;
+			// console.log(value);
+            this.$emit('update:modelValue', value[0][this.valueKey]);
+			this.defaultIndex = columnIndex;
+			this.current = value[0][this.labelKey];
+			this.$emit('confirm')
+			// 表单验证
+			formValidate(this, 'change')
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+	.u-picker-data {
+		&__trigger {
+			position: relative;
+			&__cover {
+				position: absolute;
+				top: 0;
+				left: 0;
+				right: 0;
+				bottom: 0;
+				z-index:10;
+			}
+		}
+	}
+</style>
diff --git a/uview-plus/components/u-picker/picker.js b/uview-plus/components/u-picker/picker.js
index 3d4d936..61fca3e 100644
--- a/uview-plus/components/u-picker/picker.js
+++ b/uview-plus/components/u-picker/picker.js
@@ -1,12 +1,13 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:18:20
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/picker.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/picker.js
  */
+import { t } from '../../libs/i18n'
 export default {
     // picker
     picker: {
@@ -17,15 +18,25 @@ export default {
         columns: [],
         loading: false,
         itemHeight: 44,
-        cancelText: '取消',
-        confirmText: '确定',
+        cancelText: t("up.common.cancel"),
+        confirmText: t("up.common.confirm"),
         cancelColor: '#909193',
-        confirmColor: '#3c9cff',
+        confirmColor: '',
         visibleItemCount: 5,
         keyName: 'text',
+		valueName: 'value',
         closeOnClickOverlay: false,
         defaultIndex: [],
 		immediateChange: true,
 		zIndex: 10076,
+        disabled: false,
+        disabledColor: '',
+        placeholder: t("up.common.pleaseChoose"),
+        inputProps: {},
+        bgColor: '',
+        round: 0,
+        duration: 300,
+        overlayOpacity: 0.5,
+        pageInline: false
     }
 }
diff --git a/uview-plus/components/u-picker/props.js b/uview-plus/components/u-picker/props.js
index 610c70e..cb2f2ea 100644
--- a/uview-plus/components/u-picker/props.js
+++ b/uview-plus/components/u-picker/props.js
@@ -10,9 +10,27 @@ export const props = defineMixin({
             type: Boolean,
             default: false
         },
+        inputProps: {
+            type: Object,
+            default: () => {
+                return {}
+            }
+        },
+        inputBorder: {
+            type: String,
+            default: () => defProps.input.inputBorder
+        },
+        disabled: {
+            type: Boolean,
+            default: () => defProps.picker.disabled
+        },
+		disabledColor:{
+			type: String,
+			default: () => defProps.picker.disabledColor
+		},
         placeholder: {
             type: String,
-            default: () => '请选择'
+            default: () => defProps.picker.placeholder
         },
         // 是否展示picker弹窗
         show: {
@@ -79,6 +97,11 @@ export const props = defineMixin({
             type: String,
             default: () => defProps.picker.keyName
         },
+		// 选项对象中，需要获取的属性值键名
+		valueName: {
+		    type: String,
+		    default: () => defProps.picker.valueName
+		},
         // 是否允许点击遮罩关闭选择器
         closeOnClickOverlay: {
             type: Boolean,
@@ -104,5 +127,40 @@ export const props = defineMixin({
 		    type: [String, Number],
 		    default: () => defProps.picker.zIndex
 		},
+        // 弹窗背景色，设置为transparent可去除白色背景
+        bgColor: {
+            type: String,
+            default: () => defProps.picker.bgColor
+        },
+        // 是否显示圆角
+        round: {
+            type: [Boolean, String, Number],
+            default: () => defProps.picker.round
+        },
+        // 动画时长，单位ms
+        duration: {
+            type: [String, Number],
+            default: () => defProps.picker.duration
+        },
+        // 遮罩的透明度，0-1之间
+        overlayOpacity: {
+            type: [Number, String],
+            default: () => defProps.picker.overlayOpacity
+        },
+        // 是否页面内展示
+        pageInline:{
+			type: Boolean,
+			default: () => defProps.picker.pageInline
+		},
+		// 蒙层样式样式
+		maskClass: {
+			type: String,
+			defualt: ''
+		},
+		// 蒙层样式样式
+		maskStyle: {
+			type: String,
+			defualt: ''
+		}
     }
 })
diff --git a/uview-plus/components/u-picker/u-picker.vue b/uview-plus/components/u-picker/u-picker.vue
index 9b932ed..625e8db 100644
--- a/uview-plus/components/u-picker/u-picker.vue
+++ b/uview-plus/components/u-picker/u-picker.vue
@@ -1,16 +1,27 @@
 <template>
-    <view class="u-picker-warrper">
-        <view v-if="hasInput" class="u-picker-input cursor-pointer" @click="showByClickInput = !showByClickInput">
-            <slot>
-                <view>
-					{{ inputLabel && inputLabel.length ? inputLabel.join('/') : placeholder }}
-				</view>
-            </slot>
-        </view>
+    <view class="u-picker-wraper">
+		<view v-if="hasInput" class="u-picker-input cursor-pointer" @click="onShowByClickInput">
+			<slot :value="inputLabel">
+			</slot>
+			<slot name="trigger" :value="inputLabel">
+			</slot>
+			<up-input
+				v-if="!$slots['default'] && !$slots['$default'] && !$slots['trigger']"
+				:readonly="true"
+				v-model="inputLabel"
+				v-bind="inputPropsInner">
+			</up-input>
+			<cover-view class="input-cover"></cover-view>
+		</view>
 		<u-popup
 			:show="show || (hasInput && showByClickInput)"
 			:mode="popupMode"
 			:zIndex="zIndex"
+			:bgColor="bgColor"
+			:round="round"
+			:duration="duration"
+			:pageInline="pageInline"
+			:overlayOpacity="overlayOpacity"
 			@close="closeHandler"
 		>
 			<view class="u-picker">
@@ -32,11 +43,13 @@
 				<slot name="toolbar-bottom"></slot>
 				<picker-view
 					class="u-picker__view"
-					:indicatorStyle="`height: ${addUnit(itemHeight)}`"
+					:mask-class="maskClass"
+					:mask-style="maskStyle"
+					:indicatorStyle="`height: ${addUnit(itemHeight, 'px')}`"
 					:value="innerIndex"
 					:immediateChange="immediateChange"
 					:style="{
-						height: `${addUnit(visibleItemCount * itemHeight)}`
+						height: `${addUnit(visibleItemCount * itemHeight, 'px')}`
 					}"
 					@change="changeHandler"
 				>
@@ -52,8 +65,8 @@
 							v-for="(item1, index1) in item"
 							:key="index1"
 							:style="{
-								height: addUnit(itemHeight),
-								lineHeight: addUnit(itemHeight),
+								height: addUnit(itemHeight, 'px'),
+								lineHeight: addUnit(itemHeight, 'px'),
 								fontWeight: index1 === innerIndex[index] ? 'bold' : 'normal',
 								display: 'block'
 							}"
@@ -90,6 +103,10 @@
  * @property {Boolean}			closeOnClickOverlay	是否允许点击遮罩关闭选择器（默认 false ）
  * @property {Array}			defaultIndex		各列的默认索引
  * @property {Boolean}			immediateChange		是否在手指松开时立即触发change事件（默认 true ）
+ * @property {String | Number}	round				圆角值（默认 0）
+ * @property {String }	        bgColor				背景色值（默认 '' ）
+ * @property {String | Number}	duration			动画时长，单位ms （默认 300 ）
+ * @property {String | Number}	overlayDuration		遮罩层动画时长，单位ms （默认 350 ）
  * @event {Function} close		关闭选择器时触发
  * @event {Function} cancel		点击取消按钮触发
  * @event {Function} change		当选择值变化时触发
@@ -114,17 +131,10 @@ export default {
 			// 上一次的变化列索引
 			columnIndex: 0,
             showByClickInput: false,
+			currentActiveValue: [] //当前用户选中，但是还没确认的值，用户没做change操作时候，点击确认可以默认选中第一个
 		}
 	},
 	watch: {
-		// 监听默认索引的变化，重新设置对应的值
-		defaultIndex: {
-			immediate: true,
-			deep:true,
-			handler(n) {
-				this.setIndexs(n, true)
-			}
-		},
 		// 监听columns参数的变化
 		columns: {
 			immediate: true,
@@ -133,29 +143,111 @@ export default {
 				this.setColumns(n)
 			}
 		},
+		// 监听默认索引的变化，重新设置对应的值
+		defaultIndex: {
+			immediate: true,
+			deep:true,
+			handler(n,o) {
+				// 修复uniapp调用子组件直接:defaultIndex="[0]"这样写
+				// v-model的值变化时候导致defaultIndexwatch也会执行的问题
+				//单纯vue不会出现
+				if (!o || n.join("/") != o.join("/")) {
+					this.setIndexs(n, true)
+				}
+			}
+		},
+		modelValue: {
+			immediate: true,
+			deep:true,
+			handler(n,o) {
+				// 修复uniapp调用子组件直接:defaultIndex="[0]"这样写
+				// v-model的值变化时候导致defaultIndexwatch也会执行的问题
+				//单纯vue不会出现
+				if (!o || n.join("/") != o.join("/")) {
+					let arr = [];
+					if (n != null) {
+						n.forEach((element, index) => {
+							let currentCols = this.getColumnValues(index)
+							if(!Array.isArray(currentCols) && currentCols.length===0) {
+								return
+							}
+							if (typeof currentCols[0] === 'object') {
+								currentCols.forEach((item, index2) => {
+									if (item[this.valueName] == element) {
+										arr.push(index2)
+									}
+								})
+							} else {
+								currentCols.forEach((item, index2) => {
+									if (item == element) {
+										arr.push(index2)
+									}
+								})
+							}
+						});
+						// alert(arr)
+						if (arr.length == 0 && this.defaultIndex) {
+						} else {
+							this.setIndexs(arr, true)
+						}
+					}
+				}
+			}
+		}
 	},
 	emits: ['close', 'cancel', 'confirm', 'change', 'update:modelValue', 'update:show'],
     computed: {
-        inputLabel() {
-            let items = this.innerColumns.map((item, index) => item[this.innerIndex[index]])
-            let res = []
-            items.forEach(element => {
-                res.push(element[this.keyName])
-            });
-            return res
-        },
-        inputValue() {
-            let items = this.innerColumns.map((item, index) => item[this.innerIndex[index]])
-            let res = []
-            items.forEach(element => {
-                res.push(element['id'])
-            });
-            return res
-        }
+		// input的props
+		inputPropsInner() {
+			return {
+				border: this.inputBorder,
+				placeholder: this.placeholder,
+				disabled: this.disabled,
+				disabledColor: this.disabledColor,
+				...this.inputProps
+			}
+		},
+		//已选&&已确认的值显示在input上面的文案
+		inputLabel() {
+			let firstItem = this.innerColumns[0] && this.innerColumns[0][0];
+			// //区分是不是对象数组
+			if (firstItem && Object.prototype.toString.call(firstItem) === '[object Object]') {
+				let res = this.innerColumns[0].filter(item => this.modelValue.includes(item[this.valueName]))
+				res = res.map(item => item[this.keyName]);
+				return res.join("/");
+
+			} else {
+				//用户确定的值，才显示到输入框
+				return this.modelValue.join("/");
+			}
+		},
+		//已选，待确认的值
+		inputValue() {
+			let items = this.innerColumns.map((item, index) => item[this.innerIndex[index]])
+			let res = []
+			//区分是不是对象数组
+			if (items[0] && Object.prototype.toString.call(items[0]) === '[object Object]') {
+				//对象数组返回属性值集合
+				items.forEach(element => {
+					res.push(element && element[this.valueName])
+				});
+			} else {
+				//非对象数组返回元素集合
+				items.forEach((element, index) => {
+					res.push(element)
+				});
+			}
+			return res
+		}
     },
 	methods: {
 		addUnit,
 		testArray: test.array,
+		onShowByClickInput(){
+			if(!this.disabled){
+				this.showByClickInput=!this.showByClickInput;
+			}
+		},
 		// 获取item需要显示的文字，判别为对象还是文本
 		getItemText(item) {
 			if (test.object(item)) {
@@ -170,6 +262,7 @@ export default {
                 if (this.hasInput) {
                     this.showByClickInput = false
                 }
+				this.setDefault()
 				this.$emit('update:show', false)
 				this.$emit('close')
 			}
@@ -179,15 +272,37 @@ export default {
             if (this.hasInput) {
                 this.showByClickInput = false
             }
+			this.setDefault()
 			this.$emit('update:show', false)
 			this.$emit('cancel')
 		},
+		setDefault() {
+			let arr = [0]
+			if (this.lastIndex.length == 0) {
+				//如果有默认值&&默认值的数组长度是正确的，就用默认值
+				if (Array.isArray(this.defaultIndex) && this.defaultIndex.length == this.innerColumns.length) {
+					arr = [...this.defaultIndex];
+				} else {
+					//否则默认都选中第一个
+					arr = Array(this.innerColumns.length).fill(0);
+				}
+			} else {
+				arr = deepClone(this.lastIndex)
+			}
+			this.setLastIndex(arr)
+			this.setIndexs(arr)
+		},
 		// 点击工具栏的确定按钮
 		confirm() {
+			// 如果用户有没有触发过change
+			if (!this.currentActiveValue.length) {
+				this.setDefault()
+			}
             this.$emit('update:modelValue', this.inputValue)
             if (this.hasInput) {
                 this.showByClickInput = false
             }
+			this.setLastIndex(this.innerIndex)
 			this.$emit('update:show', false)
 			this.$emit('confirm', {
 				indexs: this.innerIndex,
@@ -202,10 +317,12 @@ export default {
 			} = e.detail
 			let index = 0,
 				columnIndex = 0
+			//记录用户选中但是还没确认的值
+			this.currentActiveValue = value;	
 			// 通过对比前后两次的列索引，得出当前变化的是哪一列
 			for (let i = 0; i < value.length; i++) {
 				let item = value[i]
-				if (item !== (this.lastIndex[i] || 0)) { // 把undefined转为合法假值0
+				if (item !== undefined && item !== (this.lastIndex[i] || 0)) { // 把undefined转为合法假值0
 					// 设置columnIndex为当前变化列的索引
 					columnIndex = i
 					// index则为变化列中的变化项的索引
@@ -216,11 +333,14 @@ export default {
 			this.columnIndex = columnIndex
 			const values = this.innerColumns
 			// 将当前的各项变化索引，设置为"上一次"的索引变化值
-			this.setLastIndex(value)
+			// this.setLastIndex(value)
 			this.setIndexs(value)
-
-            this.$emit('update:modelValue', this.inputValue)
-
+			//如果是非自带输入框才会在change时候触发v-model绑值的变化
+			//否则会非常的奇怪，用户未确认，值就变了
+			// if (!this.hasInput) {
+			// 	this.$emit('update:modelValue', this.inputValue)
+			// }
+			
 			this.$emit('change', {
 				// #ifndef MP-WEIXIN || MP-LARK
 				// 微信小程序不能传递this，会因为循环引用而报错
@@ -299,11 +419,21 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-picker {
 		position: relative;
-
+		&-input {
+			position: relative;
+			.input-cover {
+				opacity: 0;
+				position: absolute;
+				top: 0;
+				bottom: 0;
+				left: 0;
+				right: 0;
+				z-index:1;
+			}
+		}
 		&__view {
 
 			&__column {
diff --git a/uview-plus/components/u-popover/props.js b/uview-plus/components/u-popover/props.js
new file mode 100644
index 0000000..64f1855
--- /dev/null
+++ b/uview-plus/components/u-popover/props.js
@@ -0,0 +1,59 @@
+import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+
+export const props = defineMixin({
+    props: {
+        // 显示的文字内容
+        text: {
+            type: [String, Number],
+            default: ''
+        },
+        // 文字颜色
+        color: {
+            type: String,
+            default: '#333'
+        },
+        // 背景颜色
+        bgColor: {
+            type: String,
+            default: '#f7f7f7'
+        },
+        // 弹出框背景颜色
+        popupBgColor: {
+            type: String,
+            default: '#f7f7f7'
+        },
+        // 弹出框位置
+        placement: {
+            type: String,
+            default: 'top'
+        },
+        // 触发方式
+        triggerMode: {
+            type: String,
+            default: 'click'
+        },
+        // 是否显示 (manual模式下使用)
+        show: {
+            type: Boolean,
+            default: false
+        },
+        // z-index值
+        zIndex: {
+            type: [Number, String],
+            default: 10070
+        },
+        // 强制定位
+        forcePosition: {
+            type: Object,
+            default() {
+                return {}
+            }
+        },
+        // 弹出方向
+        direction: {
+            type: String,
+            default: 'top'
+        }
+    }
+})
diff --git a/uview-plus/components/u-popover/u-popover.vue b/uview-plus/components/u-popover/u-popover.vue
new file mode 100644
index 0000000..fb9a2dd
--- /dev/null
+++ b/uview-plus/components/u-popover/u-popover.vue
@@ -0,0 +1,95 @@
+<template>
+	<view class="up-popover">
+		<up-tooltip
+			ref="tooltip"
+			:text="text"
+			:color="color"
+			:bg-color="bgColor"
+			:popup-bg-color="popupBgColor"
+			:placement="placement"
+			:trigger-mode="triggerMode"
+			:show="show"
+			:z-index="zIndex"
+			:force-position="forcePosition"
+			:direction="direction"
+			@open="onOpen"
+			@close="onClose"
+			@click="onClick"
+		>
+			<template #trigger>
+				<slot name="trigger"></slot>
+			</template>
+			<template #content>
+				<view class="up-popover__content">
+					<slot name="content">
+						<text>{{text}}</text>
+					</slot>
+				</view>
+			</template>
+		</up-tooltip>
+	</view>
+</template>
+
+<script>
+    import { props } from './props';
+	import { mpMixin } from '../../libs/mixin/mpMixin';
+	import { mixin } from '../../libs/mixin/mixin';
+	/**
+	 * popover 气泡弹出框
+	 * @description 基于tooltip二次封装的popover组件，用于展示更丰富的内容
+	 * @tutorial https://www.uviewui.com/components/popover.html
+	 * @property {String | Number}	text			显示的文字内容
+	 * @property {String}			color			文字颜色
+	 * @property {String}			bgColor			背景颜色
+	 * @property {String}			popupBgColor	弹出框背景颜色
+	 * @property {String}			placement		弹出框位置 (top, bottom, left, right)
+	 * @property {String}			triggerMode		触发方式 (hover, click, manual)
+	 * @property {Boolean}			show			是否显示 (manual模式下使用)
+	 * @property {Number | String}	zIndex			z-index值
+	 * @property {Object}			forcePosition	强制定位 {top, left, right, bottom}
+	 * @property {String}			direction		弹出方向 (top, bottom, left, right)
+	 * @event {Function}			open			弹出框打开时触发
+	 * @event {Function}			close			弹出框关闭时触发
+	 * @event {Function}			click			点击触发器时触发
+	 * @example <up-popover text="提示内容"><template #trigger><up-button>点击</up-button></template></up-popover>
+	 */
+	export default {
+		name: 'up-popover',
+		mixins: [mpMixin, mixin, props],
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			onOpen() {
+				this.$emit('open');
+			},
+			onClose() {
+				this.$emit('close');
+			},
+			onClick() {
+				this.$emit('click');
+			},
+			// 打开popover
+			open() {
+				this.$refs.tooltip && this.$refs.tooltip.open();
+			},
+			// 关闭popover
+			close() {
+				this.$refs.tooltip && this.$refs.tooltip.close();
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>	
+	.up-popover {
+		
+		&__content {
+			@include flex;
+			align-items: center;
+			padding: 12px 16px;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uview-plus/components/u-popup/popup.js b/uview-plus/components/u-popup/popup.js
index 5440c3c..9560586 100644
--- a/uview-plus/components/u-popup/popup.js
+++ b/uview-plus/components/u-popup/popup.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:06:33
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/popup.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/popup.js
  */
 export default {
     // popup组件
@@ -21,9 +21,13 @@ export default {
         safeAreaInsetBottom: true,
         safeAreaInsetTop: false,
         closeIconPos: 'top-right',
-        round: 0,
+        round: '20px',
         zoom: true,
         bgColor: '',
-        overlayOpacity: 0.5
+        overlayOpacity: 0.5,
+        pageInline: false,
+        touchable: false,
+        minHeight: '200px',
+        maxHeight: '600px'
     }
 }
diff --git a/uview-plus/components/u-popup/props.js b/uview-plus/components/u-popup/props.js
index 78e976b..68e7c86 100644
--- a/uview-plus/components/u-popup/props.js
+++ b/uview-plus/components/u-popup/props.js
@@ -76,6 +76,26 @@ export const props = defineMixin({
         overlayOpacity: {
             type: [Number, String],
             default: () => defProps.popup.overlayOpacity
-        }
+        },
+        // 是否页面内展示
+        pageInline:{
+			type: Boolean,
+			default: () => defProps.popup.pageInline
+		},
+        // 是否页开启手势滑动
+        touchable:{
+			type: Boolean,
+			default: () => defProps.popup.touchable
+		},
+        // 手势滑动最小高度
+        minHeight:{
+			type: [String],
+			default: () => defProps.popup.minHeight
+		},
+        // 手势滑动最大高度
+        maxHeight:{
+			type: [String],
+			default: () => defProps.popup.maxHeight
+		}
     }
 })
diff --git a/uview-plus/components/u-popup/u-popup.vue b/uview-plus/components/u-popup/u-popup.vue
index bd5fa32..e66015e 100644
--- a/uview-plus/components/u-popup/u-popup.vue
+++ b/uview-plus/components/u-popup/u-popup.vue
@@ -1,7 +1,15 @@
 <template>
-	<view class="u-popup"  :class="[customClass]">
+	<view class="u-popup" :class="[customClass]"
+		:style="{width: show == false ? '0px' : '',
+			height: show == false ? '0px' : ''}">
+		<view class="u-popup__trigger">
+			<slot name="trigger">
+			</slot>
+			<view @click="open"
+				class="u-popup__trigger__cover"></view>
+		</view>
 		<u-overlay
-			:show="show"
+			:show="show && pageInline == false"
 			@click="overlayClick"
 			v-if="overlay"
 			:zIndex="zIndex"
@@ -10,9 +18,11 @@
 			:opacity="overlayOpacity"
 		></u-overlay>
 		<u-transition
-			:show="show"
+			class="u-popup__content—transition"
+			:style="contentStyleWrap"
+			:show="pageInline ? true : show"
 			:customStyle="transitionStyle"
-			:mode="position"
+			:mode="pageInline ? 'none' : position"
 			:duration="duration"
 			@afterEnter="afterEnter"
 			@click="clickHandler"
@@ -25,6 +35,18 @@
 				@touchmove.stop.prevent="noop"
 			>
 				<u-status-bar v-if="safeAreaInsetTop"></u-status-bar>
+				<!-- 增加触摸区域，用于处理手势 -->
+				<view 
+					v-if="touchable && mode === 'bottom'"
+					class="u-popup__content__touch-area"
+					@touchstart="onTouchStart"
+					@touchmove="onTouchMove"
+					@touchend="onTouchEnd"
+					@touchcancel="onTouchEnd"
+				>
+					<!-- iOS风格的横条指示器 -->
+					<view class="u-popup__content__indicator"></view>
+				</view>
 				<slot></slot>
 				<view
 					v-if="closeable"
@@ -34,15 +56,16 @@
 					hover-class="u-popup__content__close--hover"
 					hover-stay-time="150"
 				>
-					<u-icon
+					<up-icon
 						name="close"
 						color="#909399"
 						size="18"
 						bold
-					></u-icon>
+					></up-icon>
 				</view>
 				<u-safe-bottom v-if="safeAreaInsetBottom"></u-safe-bottom>
 			</view>
+			<slot name="bottom"></slot>
 		</u-transition>
 	</view>
 </template>
@@ -51,11 +74,11 @@
 	import { props } from './props';
 	import { mpMixin } from '../../libs/mixin/mpMixin';
 	import { mixin } from '../../libs/mixin/mixin';
-	import { addUnit, addStyle, deepMerge, sleep, sys } from '../../libs/function/index';
+	import { addUnit, addStyle, deepMerge, sleep, getWindowInfo } from '../../libs/function/index';
 	/**
 	 * popup 弹窗
 	 * @description 弹出层容器，用于展示弹窗、信息提示等内容，支持上、下、左、右和中部弹出。组件只提供容器，内部内容由用户自定义
-	 * @tutorial https://ijry.github.io/uview-plus/components/popup.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/popup.html
 	 * @property {Boolean}			show				是否展示弹窗 (默认 false )
 	 * @property {Boolean}			overlay				是否显示遮罩 （默认 true ）
 	 * @property {String}			mode				弹出方向（默认 'bottom' ）
@@ -69,8 +92,12 @@
 	 * @property {Boolean}			safeAreaInsetBottom	是否为iPhoneX留出底部安全距离 （默认 true ）
 	 * @property {Boolean}			safeAreaInsetTop	是否留出顶部安全距离（状态栏高度） （默认 false ）
 	 * @property {String}			closeIconPos		自定义关闭图标位置（默认 'top-right' ）
-	 * @property {String | Number}	round				圆角值（默认 0）
+	 * @property {String | Number}	round				圆角值（默认 20px）
+	 * @property {String }	        bgColor				背景色值（默认 '' ）
 	 * @property {Boolean}			zoom				当mode=center时 是否开启缩放（默认 true ）
+	 * @property {Boolean}			touchable			是否开启底部弹窗手势功能（默认 false ）
+	 * @property {String}			minHeight			最小高度，单位任意，数值默认为px（默认 '200px' ）
+	 * @property {String}			maxHeight			最大高度，单位任意，数值默认为px（默认 '80%' ）
 	 * @property {Object}			customStyle			组件的样式，对象形式
 	 * @event {Function} open 弹出层打开
 	 * @event {Function} close 弹出层收起
@@ -81,7 +108,13 @@
 		mixins: [mpMixin, mixin, props],
 		data() {
 			return {
-				overlayDuration: this.duration + 50
+				overlayDuration: this.duration + 50,
+				// 触摸相关数据
+				touchStartY: 0,
+				touchStartHeight: 0,
+				isTouching: false,
+				// 当前弹窗高度
+				currentHeight: 'auto'
 			}
 		},
 		watch: {
@@ -97,10 +130,12 @@
 		computed: {
 			transitionStyle() {
 				const style = {
-					zIndex: this.zIndex,
-					position: 'fixed',
 					display: 'flex',
 				}
+				if (!this.pageInline) {
+					style.zIndex = this.zIndex
+					style.position = 'fixed'
+				}
 				style[this.mode] = 0
 				if (this.mode === 'left') {
 					return deepMerge(style, {
@@ -133,13 +168,30 @@
 					})
 				}
 			},
+			contentStyleWrap() {
+				const style = {}
+				
+				// 处理手势滑动时的高度变化
+				if (this.mode === 'bottom' && this.touchable) {
+					if (this.currentHeight !== 'auto') {
+						style.height = this.currentHeight
+					}
+					if (this.maxHeight) {
+						style.maxHeight = addUnit(this.maxHeight)
+					}
+					if (this.minHeight) {
+						style.minHeight = addUnit(this.minHeight)
+					}
+				}
+				return style;
+			},
 			contentStyle() {
 				const style = {}
 				// 通过设备信息的safeAreaInsets值来判断是否需要预留顶部状态栏和底部安全局的位置
 				// 不使用css方案，是因为nvue不支持css的iPhoneX安全区查询属性
 				const {
 					safeAreaInsets
-				} = sys()
+				} = getWindowInfo()
 				if (this.mode !== 'center') {
 					style.flex = 1
 				}
@@ -159,6 +211,7 @@
 						style.borderRadius = value
 					} 
 				}
+				
 				return deepMerge(style, addStyle(this.customStyle))
 			},
 			position() {
@@ -188,6 +241,9 @@
 					this.$emit('close')
 				}
 			},
+			open(e) {
+				this.$emit('update:show', true)
+			},
 			close(e) {
 				this.$emit('update:show', false)
 				this.$emit('close')
@@ -227,19 +283,82 @@
 						this.retryComputedComponentRect(grandChild)
 					}
 				}
-			}
+			},
 			// #endif
+			
+			// 触摸开始
+			onTouchStart(e) {
+				if (!this.touchable || this.mode !== 'bottom') return;
+				this.isTouching = true;
+				this.touchStartY = e.touches[0].clientY;
+				// 保存当前高度
+				this.touchStartHeight = this.$el.querySelector('.u-popup__content—transition').offsetHeight;
+			},
+			
+			// 触摸移动
+			onTouchMove(e) {
+				if (!this.isTouching || !this.touchable || this.mode !== 'bottom') return;
+				const touchY = e.touches[0].clientY;
+				const deltaY = touchY - this.touchStartY;
+				
+				// 只处理向上滑动（减小高度）和向下滑动（增加高度）
+				if (deltaY !== 0) {
+					const newHeight = this.touchStartHeight - deltaY;
+					const minHeight = parseFloat(addUnit(this.minHeight)) || 200;
+					const maxHeight = this.maxHeight ? 
+						(this.maxHeight.toString().includes('%') ? 
+							getWindowInfo().windowHeight * (parseFloat(this.maxHeight) / 100) : 
+							parseFloat(addUnit(this.maxHeight))) : 
+						getWindowInfo().windowHeight * 0.8;
+					
+					// 限制高度在最小值和最大值之间
+					if (newHeight >= minHeight && newHeight <= maxHeight) {
+						this.currentHeight = newHeight + 'px';
+					}
+				}
+				
+				// 阻止默认滚动行为
+				e.preventDefault();
+			},
+			
+			// 触摸结束
+			onTouchEnd(e) {
+				if (!this.isTouching || !this.touchable || this.mode !== 'bottom') return;
+				this.isTouching = false;
+				
+				const touchY = e.changedTouches[0].clientY;
+				const deltaY = touchY - this.touchStartY;
+				const velocity = Math.abs(deltaY) / (e.timeStamp - e.changedTouches[0].timestamp); // 简单的速度计算
+				
+				// 快速向下滑动时关闭弹窗
+				if (deltaY > 100 || (deltaY > 30 && velocity > 0.5)) {
+					this.close();
+				} else {
+					// 恢复到自适应高度
+					// this.currentHeight = 'auto';
+				}
+			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	$u-popup-flex:1 !default;
 	$u-popup-content-background-color: #fff !default;
 
 	.u-popup {
 		flex: $u-popup-flex;
+		
+		&__trigger {
+			position: relative;
+			&__cover {
+				position: absolute;
+				top: 0;
+				left: 0;
+				right: 0;
+				bottom: 0;
+			}
+		}
 
 		&__content {
 			background-color: $u-popup-content-background-color;
@@ -279,6 +398,27 @@
 				border-bottom-left-radius: 10px;
 				border-bottom-right-radius: 10px;
 			}
+			
+			&__touch-area {
+				// position: absolute;
+				top: 0;
+				left: 0;
+				right: 0;
+				height: 42rpx;
+				z-index: 10;
+				/* #ifndef APP-NVUE */
+				display: flex;
+				/* #endif */
+				justify-content: center;
+				align-items: center;
+			}
+			
+			&__indicator {
+				width: 100px;
+				height: 5px;
+				border-radius: 100px;
+				background-color: #c0c4cc;
+			}
 
 			&__close {
 				position: absolute;
@@ -309,4 +449,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/uview-plus/components/u-poster/u-poster.vue b/uview-plus/components/u-poster/u-poster.vue
new file mode 100644
index 0000000..fe2b600
--- /dev/null
+++ b/uview-plus/components/u-poster/u-poster.vue
@@ -0,0 +1,629 @@
+<template>
+	<view class="up-poster">
+		<!-- canvas用于绘制海报 -->
+		<canvas 
+			v-if="showCanvas" 
+			class="up-poster__hidden-canvas" 
+			:canvas-id="canvasId" 
+			:id="canvasId"
+			:style="{ width: canvasWidth + 'px', height: canvasHeight + 'px' }">
+		</canvas>
+		<!-- 隐藏的二维码组件，用于生成二维码图片 -->
+		<up-qrcode 
+			ref="qrCode" 
+			:val="qrCodeValue" 
+			:size="qrCodeSize" 
+			:margin="0" 
+            :loadMake="false"
+			background="#ffffff"
+			foreground="#000000"
+			:class="['up-poster__hidden-qrcode', qrCodeShow ? '' : 'up-poster__hidden-qrcode--hidden']"
+		/>
+	</view>
+</template>
+
+<script>
+/**
+ * Poster 海报组件
+ * @description 用于生成海报的组件，支持文本、图片、二维码等元素
+ * @tutorial https://uview-plus.jiangruyi.com/components/poster.html
+ * 
+ * @property {Object} json 海报配置JSON数据
+ * @property {Object} json.css 海报容器样式
+ * @property {Array}  json.views 海报元素列表
+ * @property {String} json.views.type 元素类型(text/image/qrcode/view)
+ * @property {String} json.views.text 文本内容(仅text类型)
+ * @property {String} json.views.src 图片地址(仅image/qrcode类型)
+ * @property {Object} json.views.css 元素样式
+ * 
+ * @example <up-poster :json="posterJson"></up-poster>
+ */
+
+import {
+	rpx2px
+} from '../../libs/function/index.js';
+export default {
+	name: 'up-poster',
+	props: {
+		json: {
+			type: Object,
+			default: () => ({})
+		}
+	},
+	data() {
+		return {
+			canvasId: 'u-poster-canvas-' + Date.now(),
+			showCanvas: false,
+			canvasWidth: 0,
+			canvasHeight: 0,
+			// 二维码相关数据
+			qrCodeValue: '',
+			qrCodeSize: 200,
+			qrCodeShow: false,
+			// 存储多个二维码的数据
+			qrCodeMap: new Map()
+		}
+	},
+	computed: {
+		// 根据传入的css生成文本样式
+		getTextStyle() {
+			return (css) => {
+				const style = {};
+				if (css.color) style.color = css.color;
+				if (css.fontSize) style.fontSize = css.fontSize;
+				if (css.fontWeight) style.fontWeight = css.fontWeight;
+				if (css.lineHeight) style.lineHeight = css.lineHeight;
+				if (css.textAlign) style.textAlign = css.textAlign;
+				return style;
+			}
+		}
+	},
+	methods: {
+		/**
+		 * 导出海报图片
+		 * @description 根据json配置生成海报并导出为临时图片路径
+		 * @returns {Promise<Object>} 返回包含图片信息的对象
+		 * @author jry ijry@qq.com
+		 */
+		async exportImage() {
+			return new Promise(async(resolve, reject) => {
+                try {
+                    // 获取海报尺寸信息
+                    const posterSize = this.json.css;
+                    // 将rpx转换为px
+                    const width = this.convertRpxToPx(posterSize.width || '750rpx');
+                    const height = this.convertRpxToPx(posterSize.height || '1114rpx');
+                    
+                    // 设置canvas尺寸
+                    this.canvasWidth = width;
+                    this.canvasHeight = height;
+                    this.showCanvas = true;
+                    
+                    // 等待DOM更新
+                    await this.$nextTick();
+                    
+                    // 创建canvas上下文
+                    const ctx = uni.createCanvasContext(this.canvasId, this);
+                    
+                    // 绘制背景
+                    if (posterSize.background) {
+                        // 支持渐变背景色
+						if (posterSize.background.includes('linear-gradient') || posterSize.background.includes('radial-gradient')) {
+							this.drawGradientBackground(ctx, posterSize, 0, 0, width, height);
+						} else {
+							ctx.setFillStyle(posterSize.background);
+                            ctx.fillRect(0, 0, width, height);
+						}
+                    }
+                    
+                    // 绘制所有元素
+                    for (const item of this.json.views) {
+                        await this.drawItem(ctx, item, width, height);
+                    }
+                    
+                    // 绘制到canvas
+                    ctx.draw(false, () => {
+                        // 等待绘制完成
+                        setTimeout(() => {
+                            // 导出图片
+                            uni.canvasToTempFilePath({
+                                canvasId: this.canvasId,
+                                success: (res) => {
+                                    // 隐藏canvas
+                                    this.showCanvas = false;
+                                    // 返回图片路径
+                                    resolve({
+                                        width: width,
+                                        height: height,
+                                        path: res.tempFilePath,
+                                        // H5下添加blob格式
+                                        blob: this.dataURLToBlob(res.tempFilePath)
+                                    });
+                                },
+                                fail: (err) => {
+                                    // 隐藏canvas
+                                    this.showCanvas = false;
+                                    reject(new Error('导出图片失败: ' + JSON.stringify(err)));
+                                }
+                            }, this);
+                        }, 300);
+                    });
+                    
+                    // 超时处理
+                    setTimeout(() => {
+                        this.showCanvas = false;
+                        reject(new Error('导出图片超时'));
+                    }, 10000);
+                } catch (error) {
+                    this.showCanvas = false;
+                    reject(error);
+                }
+			});
+		},
+		
+		/**
+		 * 绘制单个元素
+		 * @description 根据元素类型绘制文本、图片、矩形或二维码到canvas
+		 * @param {Object} ctx canvas上下文
+		 * @param {Object} item 元素配置信息
+		 * @param {Number} canvasWidth canvas宽度
+		 * @param {Number} canvasHeight canvas高度
+		 * @returns {Promise} 绘制完成的Promise
+		 * @author jry ijry@qq.com
+		 */
+		async drawItem(ctx, item, canvasWidth, canvasHeight) {
+			const css = item.css || {};
+			const left = this.convertRpxToPx(css.left || '0rpx');
+			const top = this.convertRpxToPx(css.top || '0rpx');
+			const width = this.convertRpxToPx(css.width || '0rpx');
+			const height = this.convertRpxToPx(css.height || '0rpx');
+			
+			switch (item.type) {
+				case 'view':
+					// 绘制矩形背景
+					if (css.background) {
+						// 支持渐变背景色
+						if (css.background.includes('linear-gradient') || css.background.includes('radial-gradient')) {
+							this.drawGradientBackground(ctx, css, left, top, width, height);
+						} else {
+							ctx.setFillStyle(css.background);
+							// 处理圆角
+							if (css.radius) {
+								const radius = this.convertRpxToPx(css.radius);
+								this.drawRoundRect(ctx, left, top, width, height, radius, css.background);
+							} else {
+								ctx.fillRect(left, top, width, height);
+							}
+						}
+					}
+					break;
+					
+				case 'text':
+					// 设置文本样式
+					if (css.color) ctx.setFillStyle(css.color);
+					if (css.fontSize) {
+						const fontSize = this.convertRpxToPx(css.fontSize);
+						ctx.setFontSize(fontSize);
+					}
+					if (css.fontWeight) {
+						ctx.setLineWidth(css.fontWeight === 'bold' ? 2 : 1);
+					}
+					
+					// 处理文本换行
+					if (css.lineClamp) {
+						this.drawTextWithLineClamp(ctx, item.text, left, top, width, css);
+					} else {
+						// 修复：文本垂直居中对齐问题
+						const textBaseLine = css.fontSize ? this.convertRpxToPx(css.fontSize) / 2 : 10;
+						ctx.fillText(item.text, left, top + textBaseLine);
+					}
+					break;
+					
+				case 'image':
+					// 绘制图片
+					return new Promise((resolve) => {
+						uni.getImageInfo({
+							src: item.src,
+							success: (res) => {
+								// console.log('图片加载成功: ' + item.src, res);
+								// 处理圆角
+								if (css.radius) {
+									const radius = this.convertRpxToPx(css.radius);
+									this.clipRoundRect(ctx, left, top, width, height, radius);
+								}
+								// 不能用item.src，要用res.path。
+								ctx.drawImage(res.path, left, top, width, height);
+								// 恢复剪切区域
+								ctx.restore();
+								resolve();
+							},
+							fail: (e) => {
+								// 图片加载失败时绘制占位符
+								ctx.setFillStyle('#f5f5f5');
+								ctx.fillRect(left, top, width, height);
+								console.log('图片加载失败: ' + item.src, e);
+								resolve();
+							}
+						});
+					});
+					
+				case 'qrcode':
+					// 绘制二维码
+					if (item.text) {
+						// 使用u-qrcode生成二维码图片
+						const qrCodeImageUrl = await this.generateQRCode(item.text, width, height);
+						return new Promise((resolve) => {
+							uni.getImageInfo({
+								src: qrCodeImageUrl,
+								success: (res) => {
+									ctx.drawImage(res.path, left, top, width, height);
+									resolve();
+								},
+								fail: () => {
+									// 二维码加载失败时绘制占位符
+									ctx.setFillStyle('#f5f5f5');
+									ctx.fillRect(left, top, width, height);
+									ctx.setFillStyle('#999');
+									ctx.setFontSize(12);
+									ctx.setTextAlign('center');
+									ctx.fillText('QR', left + width/2, top + height/2);
+									ctx.setTextAlign('left');
+									resolve();
+								}
+							});
+						});
+					} else {
+						// 绘制二维码占位符
+						ctx.setFillStyle('#f5f5f5');
+						ctx.fillRect(left, top, width, height);
+						ctx.setFillStyle('#999');
+						ctx.setFontSize(12);
+						ctx.setTextAlign('center');
+						ctx.fillText('QR', left + width/2, top + height/2);
+						ctx.setTextAlign('left');
+					}
+					break;
+			}
+		},
+		
+		/**
+		 * 绘制圆角矩形
+		 * @description 绘制指定位置和尺寸的圆角矩形
+		 * @param {Object} ctx canvas上下文
+		 * @param {Number} x x坐标
+		 * @param {Number} y y坐标
+		 * @param {Number} width 宽度
+		 * @param {Number} height 高度
+		 * @param {Number} radius 圆角半径
+		 * @param {String} fillColor 填充颜色
+		 * @author jry ijry@qq.com
+		 */
+		drawRoundRect(ctx, x, y, width, height, radius, fillColor) {
+			ctx.save();
+			ctx.beginPath();
+			ctx.moveTo(x + radius, y);
+			ctx.lineTo(x + width - radius, y);
+			ctx.quadraticCurveTo(x + width, y, x + width, y + radius);
+			ctx.lineTo(x + width, y + height - radius);
+			ctx.quadraticCurveTo(x + width, y + height, x + width - radius, y + height);
+			ctx.lineTo(x + radius, y + height);
+			ctx.quadraticCurveTo(x, y + height, x, y + height - radius);
+			ctx.lineTo(x, y + radius);
+			ctx.quadraticCurveTo(x, y, x + radius, y);
+			ctx.closePath();
+			if (fillColor) {
+				ctx.setFillStyle(fillColor);
+				ctx.fill();
+			}
+			ctx.restore();
+		},
+		
+		/**
+		 * 裁剪圆角矩形区域
+		 * @description 在canvas上创建圆角矩形裁剪区域
+		 * @param {Object} ctx canvas上下文
+		 * @param {Number} x x坐标
+		 * @param {Number} y y坐标
+		 * @param {Number} width 宽度
+		 * @param {Number} height 高度
+		 * @param {Number} radius 圆角半径
+		 * @author jry ijry@qq.com
+		 */
+		clipRoundRect(ctx, x, y, width, height, radius) {
+			ctx.save();
+			ctx.beginPath();
+			ctx.arc(x + radius, y + radius, radius, Math.PI, Math.PI * 1.5);
+			ctx.lineTo(x + width - radius, y);
+			ctx.arc(x + width - radius, y + radius, radius, Math.PI * 1.5, Math.PI * 2);
+			ctx.lineTo(x + width, y + height - radius);
+			ctx.arc(x + width - radius, y + height - radius, radius, 0, Math.PI * 0.5);
+			ctx.lineTo(x + radius, y + height);
+			ctx.arc(x + radius, y + height - radius, radius, Math.PI * 0.5, Math.PI);
+			ctx.closePath();
+			ctx.clip();
+		},
+		
+		/**
+		 * 绘制带行数限制的文本
+		 * @description 绘制可控制最大行数的文本，超出部分显示省略号
+		 * @param {Object} ctx canvas上下文
+		 * @param {String} text 文本内容
+		 * @param {Number} x x坐标
+		 * @param {Number} y y坐标
+		 * @param {Number} maxWidth 最大宽度
+		 * @param {Object} css 样式配置
+		 * @author jry ijry@qq.com
+		 */
+		drawTextWithLineClamp(ctx, text, x, y, maxWidth, css) {
+            const lineClamp = parseInt(css.lineClamp) || 1;
+            const lineHeight = css.lineHeight ? this.convertRpxToPx(css.lineHeight) : 20;
+            const lines = [];
+            let currentLine = '';
+            
+            for (let i = 0; i < text.length; i++) {
+                const char = text[i];
+                const testLine = currentLine + char;
+                const metrics = ctx.measureText(testLine);
+                
+                if (metrics.width > maxWidth && currentLine !== '') {
+                    lines.push(currentLine);
+                    currentLine = char;
+                    
+                    // 如果已达最大行数，添加省略号并结束
+                    if (lines.length === lineClamp) {
+                        if (metrics.width > maxWidth) {
+                            // 添加省略号
+                            let fitLine = currentLine.substring(0, currentLine.length - 1);
+                            while (ctx.measureText(fitLine + '...').width > maxWidth && fitLine.length > 0) {
+                                fitLine = fitLine.substring(0, fitLine.length - 1);
+                            }
+                            lines[lines.length - 1] = fitLine + '...';
+                        }
+                        break;
+                    }
+                } else {
+                    currentLine = testLine;
+                }
+                
+                // 处理最后一行
+                if (i === text.length - 1 && lines.length < lineClamp) {
+                    lines.push(currentLine);
+                }
+            }
+            
+            // 绘制每一行
+            for (let i = 0; i < lines.length; i++) {
+                // 修复：正确计算文本垂直位置
+                const textBaseLine = css.fontSize ? this.convertRpxToPx(css.fontSize) / 2 : 10;
+                ctx.fillText(lines[i], x, y + (i * lineHeight) + textBaseLine);
+            }
+        },
+		
+		/**
+		 * 生成二维码图片
+		 * @description 根据文本内容生成二维码图片URL
+		 * @param {String} text 二维码内容
+		 * @param {Number} width 二维码宽度
+		 * @param {Number} height 二维码高度
+		 * @returns {Promise<String>} 二维码图片URL
+		 * @author jry ijry@qq.com
+		 */
+		generateQRCode(text, width, height) {
+			return new Promise((resolve) => {
+				// 为每个二维码生成唯一标识
+				const qrCodeKey = `${text}_${width}_${height}`;
+				
+				// 检查是否已经生成过该二维码
+				if (this.qrCodeMap.has(qrCodeKey)) {
+					resolve(this.qrCodeMap.get(qrCodeKey));
+					return;
+				}
+				
+				// 使用 u-qrcode 组件生成二维码
+				try {
+					// 设置二维码参数
+					this.qrCodeValue = text;
+					this.qrCodeSize = Math.max(width, height);
+					this.qrCodeShow = true;
+					
+					// 等待DOM更新
+					this.$nextTick(() => {
+						// 获取二维码组件实例并导出图片
+						if (this.$refs.qrCode) {
+							// 延迟一点时间确保二维码渲染完成
+							setTimeout(() => {
+								// 调用 u-qrcode 的 toTempFilePath 方法导出图片
+								this.$refs.qrCode.toTempFilePath({
+									success: (res) => {
+										// 缓存二维码图片路径
+										this.qrCodeMap.set(qrCodeKey, res.tempFilePath);
+										this.qrCodeShow = false;
+										resolve(res.tempFilePath);
+									},
+									fail: (err) => {
+										console.error('二维码生成失败:', err);
+										this.qrCodeShow = false;
+									}
+								});
+							}, 300);
+						} else {
+							// 如果没有 u-qrcode 组件，返回占位符
+							this.qrCodeShow = false;
+						}
+					});
+				} catch (error) {
+					console.error('生成二维码出错:', error);
+					this.qrCodeShow = false;
+				}
+			});
+		},
+		
+		/**
+		 * 将rpx单位转换为px
+		 * @description 根据屏幕密度将rpx单位转换为px单位
+		 * @param {String|Number} rpxValue rpx值
+		 * @returns {Number} 转换后的px值
+		 * @author jry ijry@qq.com
+		 */
+		convertRpxToPx(rpxValue) {
+			if (typeof rpxValue === 'number') return rpxValue;
+			
+			// 使用rpx2px方法
+			if (typeof rpxValue === 'string' && rpxValue.endsWith('rpx')) {
+				const value = parseFloat(rpxValue);
+				return rpx2px(value);
+			}
+			
+			return parseFloat(rpxValue) || 0;
+		},
+		
+		/**
+		 * 绘制渐变背景
+		 * @description 绘制线性渐变或径向渐变背景
+		 * @param {Object} ctx canvas上下文
+		 * @param {Object} css 样式配置
+		 * @param {Number} left 左边距
+		 * @param {Number} top 上边距
+		 * @param {Number} width 宽度
+		 * @param {Number} height 高度
+		 * @author jry ijry@qq.com
+		 */
+		drawGradientBackground(ctx, css, left, top, width, height) {
+			const background = css.background;
+			let gradient = null;
+			
+			// 处理线性渐变
+			if (background.includes('linear-gradient')) {
+				// 解析线性渐变角度和颜色
+				const angleMatch = background.match(/linear-gradient\((\d+)deg/);
+				const angle = angleMatch ? parseInt(angleMatch[1]) : 135;
+				
+				// 根据角度计算渐变起点和终点
+				let startX = left, startY = top, endX = left + width, endY = top + height;
+				
+				// 简化的角度处理（支持常见角度）
+				if (angle === 0) {
+					startX = left;
+					startY = top + height;
+					endX = left;
+					endY = top;
+				} else if (angle === 90) {
+					startX = left;
+					startY = top;
+					endX = left + width;
+					endY = top;
+				} else if (angle === 180) {
+					startX = left;
+					startY = top;
+					endX = left;
+					endY = top + height;
+				} else if (angle === 270) {
+					startX = left + width;
+					startY = top;
+					endX = left;
+					endY = top;
+				}
+				
+				gradient = ctx.createLinearGradient(startX, startY, endX, endY);
+				
+				// 解析颜色值
+				const colorMatches = background.match(/#[0-9a-fA-F]+|rgba?\([^)]+\)/g);
+				if (colorMatches && colorMatches.length >= 2) {
+					// 添加渐变色点
+					colorMatches.forEach((color, index) => {
+						const stop = index / (colorMatches.length - 1);
+						gradient.addColorStop(stop, color);
+					});
+				}
+			} 
+			// 处理径向渐变
+			else if (background.includes('radial-gradient')) {
+				// 径向渐变从中心开始
+				const centerX = left + width / 2;
+				const centerY = top + height / 2;
+				const radius = Math.min(width, height) / 2;
+				
+				gradient = ctx.createRadialGradient(centerX, centerY, 0, centerX, centerY, radius);
+				
+				// 解析颜色值
+				const colorMatches = background.match(/#[0-9a-fA-F]+|rgba?\([^)]+\)/g);
+				if (colorMatches && colorMatches.length >= 2) {
+					// 添加渐变色点
+					colorMatches.forEach((color, index) => {
+						const stop = index / (colorMatches.length - 1);
+						gradient.addColorStop(stop, color);
+					});
+				}
+			}
+			
+			if (gradient) {
+				ctx.setFillStyle(gradient);
+				// 处理圆角
+				if (css.radius) {
+					const radius = this.convertRpxToPx(css.radius);
+					this.drawRoundRect(ctx, left, top, width, height, radius, gradient);
+				} else {
+					ctx.fillRect(left, top, width, height);
+				}
+			}
+		},
+		
+		/**
+		 * 将dataURL转换为Blob
+		 * @description H5环境下将base64格式的dataURL转换为Blob对象
+		 * @param {String} dataURL base64格式的图片数据
+		 * @returns {Blob} Blob对象
+		 * @author jry ijry@qq.com
+		 */
+		dataURLToBlob(dataURL) {
+			// 检查是否为H5环境且是base64数据
+			// #ifdef H5
+			if (dataURL && dataURL.startsWith('data:image')) {
+				const parts = dataURL.split(';base64,');
+				const contentType = parts[0].split(':')[1];
+				const raw = window.atob(parts[1]);
+				const rawLength = raw.length;
+				const uInt8Array = new Uint8Array(rawLength);
+				
+				for (let i = 0; i < rawLength; ++i) {
+					uInt8Array[i] = raw.charCodeAt(i);
+				}
+				
+				return new Blob([uInt8Array], { type: contentType });
+			}
+			// #endif
+			
+			return null;
+		},
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.up-poster {
+	position: relative;
+	
+	&__canvas {
+		position: relative;
+		overflow: hidden;
+	}
+	
+	&__hidden-canvas {
+		position: fixed;
+		top: -10000px;
+		left: -10000px;
+		z-index: -1;
+	}
+	
+	&__hidden-qrcode {
+		position: fixed;
+		top: -10000px;
+		left: -10000px;
+		z-index: -1;
+		
+		&--hidden {
+			display: none;
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/uview-plus/components/u-pull-refresh/u-pull-refresh.vue b/uview-plus/components/u-pull-refresh/u-pull-refresh.vue
new file mode 100644
index 0000000..a71a27e
--- /dev/null
+++ b/uview-plus/components/u-pull-refresh/u-pull-refresh.vue
@@ -0,0 +1,334 @@
+<template>
+  <view 
+    class="u-pull-refresh"
+    @touchstart="onTouchStart"
+    @touchmove="onTouchMove"
+    @touchend="onTouchEnd"
+    @touchcancel="onTouchEnd"
+  >
+    <!-- 下拉刷新区域 -->
+    <view 
+      class="refresh-area" 
+      :style="{ height: refreshDistance + 'px' }"
+      :class="{ refreshing: isRefreshing }"
+    >
+      <!-- 不同状态的插槽 -->
+      <slot 
+        v-if="refreshStatus === 'pull'" 
+        name="pull" 
+        :distance="refreshDistance"
+        :threshold="threshold"
+      >
+        <!-- 默认下拉状态 -->
+        <view class="refresh-content">
+          <view class="refresh-indicator">
+            <up-icon name="arrow-downward" size="26px"></up-icon>
+          </view>
+          <text class="refresh-text">{{ t("up.pullRefresh.pull") }}</text>
+        </view>
+      </slot>
+      
+      <slot 
+        v-else-if="refreshStatus === 'release'" 
+        name="release" 
+        :distance="refreshDistance"
+        :threshold="threshold"
+      >
+        <!-- 默认释放状态 -->
+        <view class="refresh-content">
+          <view class="refresh-indicator">
+            <up-icon name="arrow-upward" size="26px"></up-icon>
+          </view>
+          <text class="refresh-text">{{ t("up.pullRefresh.release") }}</text>
+        </view>
+      </slot>
+      
+      <slot 
+        v-else-if="refreshStatus === 'refreshing'" 
+        name="refreshing"
+      >
+        <!-- 默认刷新中状态 -->
+        <view class="refresh-content">
+          <view class="refresh-indicator">
+            <view class="spinner"></view>
+          </view>
+          <text class="refresh-text">{{ t("up.pullRefresh.refreshing") }}...</text>
+        </view>
+      </slot>
+    </view>
+    
+    <!-- 内容区域 -->
+    <view 
+      class="refresh-content-wrapper"
+      :style="{ transform: `translateY(${contentTranslateY}px)` }"
+    >
+      <scroll-view
+        v-if="useScrollView"
+        class="scroll-wrapper"
+        :scroll-y="true"
+        :enable-back-to-top="enableBackToTop"
+        :scroll-top="scrollTop"
+        :lower-threshold="lowerThreshold"
+        @scroll="handleScroll"
+        @scrolltolower="handleScrollToLower"
+      >
+        <slot></slot>
+        
+        <!-- 使用 u-loadmore 组件实现上拉加载更多 -->
+        <u-loadmore
+          v-if="showLoadmore"
+          v-bind="loadmoreProps"
+        />
+      </scroll-view>
+      
+      <view v-else>
+        <slot></slot>
+        
+        <!-- 使用 u-loadmore 组件实现上拉加载更多 -->
+        <u-loadmore
+          v-if="showLoadmore"
+          v-bind="loadmoreProps"
+        />
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { t } from '../../libs/i18n'
+export default {
+  name: 'u-pull-refresh',
+  props: {
+    // 是否正在刷新
+    refreshing: {
+      type: Boolean,
+      default: false
+    },
+    // 下拉刷新阈值
+    threshold: {
+      type: Number,
+      default: 80
+    },
+    // 阻尼系数
+    damping: {
+      type: Number,
+      default: 0.4
+    },
+    // 最大下拉距离
+    maxDistance: {
+      type: Number,
+      default: 120
+    },
+    // 是否显示加载更多
+    showLoadmore: {
+      type: Boolean,
+      default: false
+    },
+    // u-loadmore 组件的 props 配置
+    loadmoreProps: {
+      type: Object,
+      default: () => ({
+        status: 'loadmore',
+        // loadmoreText: '加载更多',
+        // loadingText: '正在加载...',
+        // nomoreText: '没有更多了'
+      })
+    },
+    // 是否使用 scroll-view 包装内容
+    useScrollView: {
+      type: Boolean,
+      default: true
+    },
+    // scroll-view 相关属性
+    enableBackToTop: {
+      type: Boolean,
+      default: false
+    },
+    lowerThreshold: {
+      type: [Number, String],
+      default: 50
+    },
+    scrollTop: {
+      type: [Number, String],
+      default: 0
+    }
+  },
+  data() {
+    return {
+      // 下拉刷新相关
+      isRefreshing: false,
+      refreshStatus: 'pull', // pull, release, refreshing
+      refreshDistance: 0,
+      startY: 0,
+      currentY: 0,
+      touching: false,
+      
+      // 动画相关
+      contentTranslateY: 0
+    }
+  },
+  emits: ['refresh', 'loadmore', 'scroll'],
+  watch: {
+    refreshing: {
+      handler(newVal) {
+        if (!newVal) {
+          this.finishRefresh()
+        } else {
+          this.startRefresh()
+        }
+      }
+    }
+  },
+  methods: {
+    t,
+    // 触摸开始
+    onTouchStart(e) {
+      if (this.isRefreshing) return
+      
+      this.touching = true
+      this.startY = e.touches[0].pageY
+      this.currentY = this.startY
+      this.refreshStatus = 'pull'
+    },
+    
+    // 触摸移动
+    onTouchMove(e) {
+      if (!this.touching || this.isRefreshing) return
+      
+      this.currentY = e.touches[0].pageY
+      const diff = this.currentY - this.startY
+      
+      // 只有在顶部且下拉时才触发下拉刷新
+      if (diff > 0 && this.isScrollViewAtTop()) {
+        this.refreshDistance = Math.min(diff * this.damping, this.maxDistance)
+        this.contentTranslateY = this.refreshDistance
+        
+        // 更新状态
+        if (this.refreshDistance >= this.threshold) {
+          this.refreshStatus = 'release'
+        } else {
+          this.refreshStatus = 'pull'
+        }
+
+        // 阻止默认滚动行为，防止触发页面级滚动
+        e.preventDefault()
+        e.stopPropagation()
+      }
+    },
+    
+    // 触摸结束
+    onTouchEnd() {
+      if (!this.touching) return
+      
+      this.touching = false
+      
+      if (this.refreshDistance >= this.threshold && !this.isRefreshing) {
+        // 触发刷新
+        this.startRefresh()
+        this.$emit('refresh')
+      } else {
+        // 回弹
+        this.resetRefresh()
+      }
+    },
+    
+    // 开始刷新
+    startRefresh() {
+      this.isRefreshing = true
+      this.refreshStatus = 'refreshing'
+      this.refreshDistance = this.threshold
+      this.contentTranslateY = this.threshold
+    },
+    
+    // 完成刷新
+    finishRefresh() {
+      this.isRefreshing = false
+      this.refreshStatus = 'pull'
+      this.resetRefresh()
+    },
+    
+    // 重置刷新状态
+    resetRefresh() {
+      this.refreshDistance = 0
+      this.contentTranslateY = 0
+    },
+    
+    // 检查 scroll-view 是否在顶部
+    isScrollViewAtTop() {
+      // 这里可以更精确地判断，但简单起见直接返回 true
+      // 实际项目中可能需要通过 scroll 事件获取 scrollTop 判断
+      return true
+    },
+    
+    // 处理滚动事件
+    handleScroll(e) {
+      this.$emit('scroll', e)
+    },
+    
+    // 处理滚动到底部事件
+    handleScrollToLower(e) {
+      // 只有当 loadmore 状态为 loadmore 时才触发
+      if (this.showLoadmore && this.loadmoreProps.status === 'loadmore') {
+        this.$emit('loadmore')
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.u-pull-refresh {
+  position: relative;
+  height: 100%;
+  overflow: hidden;
+}
+
+.refresh-area {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  display: flex;
+  align-items: flex-end;
+  justify-content: center;
+  overflow: hidden;
+  transition: height 0.2s ease-out;
+}
+
+.refresh-content-wrapper {
+  height: 100%;
+  transition: transform 0.2s ease-out;
+}
+
+.scroll-wrapper {
+  height: 100%;
+}
+
+.refresh-content {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  padding-bottom: 10px;
+}
+
+.spinner {
+  width: 16px;
+  height: 16px;
+  border: 2px solid #f3f3f3;
+  border-top: 2px solid #666;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+
+.refresh-text {
+  font-size: 14px;
+  color: #666;
+}
+</style>
\ No newline at end of file
diff --git a/uview-plus/components/u-qrcode/qrcode.js b/uview-plus/components/u-qrcode/qrcode.js
index 7ec89fc..b420833 100644
--- a/uview-plus/components/u-qrcode/qrcode.js
+++ b/uview-plus/components/u-qrcode/qrcode.js
@@ -18,6 +18,7 @@ let QRCode = {};
             return [c0, c1];
             // 3 bytes
         } else {
+			
             c0 = 224 + (code >> 12);
             c1 = 128 + (code >> 6 & 63);
             c2 = 128 + (code & 63);
@@ -1031,12 +1032,14 @@ let QRCode = {};
             image: '',
             imageSize: 30,
             canvasId: opt.canvasId,
-            nvueContext: opt.nvueContext,
-            context: opt.context,
+			ctx: opt.ctx,
+            isNvue: opt.isNvue,
+            vuectx: opt.vuectx,
             usingComponents: opt.usingComponents,
             showLoading: opt.showLoading,
             loadingText: opt.loadingText,
         };
+
         if (typeof opt === 'string') { // 只编码ASCII字符串
             opt = {
                 text: opt
@@ -1083,8 +1086,14 @@ let QRCode = {};
             }
             return options.foreground;
         }
+
         // 创建canvas
-        let createCanvas = function (options) {
+        let createCanvas = async function (options) {
+            let isApp = false;
+            // #ifdef APP
+            isApp = true;
+            // #endif
+
             if(options.showLoading){
                 uni.showLoading({
                     title: options.loadingText,
@@ -1092,11 +1101,8 @@ let QRCode = {};
                 });
             }
             var ctx = '';
-            if (options.nvueContext) {
-                ctx = options.nvueContext;
-            } else {
-                ctx = uni.createCanvasContext(options.canvasId, options.context);
-            }
+			ctx = options.ctx;
+
             var count = qrCodeAlg.getModuleCount();
             var ratioSize = options.size;
             var ratioImgSize = options.imageSize;
@@ -1107,14 +1113,18 @@ let QRCode = {};
             for (var row = 0; row < count; row++) {
                 for (var col = 0; col < count; col++) {
                     var w = (Math.ceil((col + 1) * tileW) - Math.floor(col * tileW));
-                    var h = (Math.ceil((row + 1) * tileW) - Math.floor(row * tileW));
+                    var h = (Math.ceil((row + 1) * tileH) - Math.floor(row * tileH));
                     var foreground = getForeGround({
                         row: row,
                         col: col,
                         count: count,
                         options: options
                     });
-                    ctx.setFillStyle(qrCodeAlg.modules[row][col] ? foreground : options.background);
+                    if (options.isNvue) {
+                        ctx.setFillStyle(qrCodeAlg.modules[row][col] ? foreground : options.background);
+                    } else {
+                        ctx.fillStyle = qrCodeAlg.modules[row][col] ? foreground : options.background;
+                    }
                     ctx.fillRect(Math.round(col * tileW), Math.round(row * tileH), w, h);
                 }
             }
@@ -1122,18 +1132,33 @@ let QRCode = {};
                 var x = Number(((ratioSize - ratioImgSize) / 2).toFixed(2));
                 var y = Number(((ratioSize - ratioImgSize) / 2).toFixed(2));
                 drawRoundedRect(ctx, x, y, ratioImgSize, ratioImgSize, 2, 6, true, true)
-                ctx.drawImage(options.image, x, y, ratioImgSize, ratioImgSize);
+				options.vuectx.drawImage(options.image, x, y, ratioImgSize, ratioImgSize);
                 // 画圆角矩形
                 function drawRoundedRect(ctxi, x, y, width, height, r, lineWidth, fill, stroke) {
-                    ctxi.setLineWidth(lineWidth);
-                    ctxi.setFillStyle(options.background);
-                    ctxi.setStrokeStyle(options.background);
-                    ctxi.beginPath(); // draw top and top right corner 
+                    if (options.isNvue || isApp) {
+                        ctxi.setLineWidth(lineWidth);
+                        ctxi.setFillStyle(options.background);
+                        ctxi.setStrokeStyle(options.background);
+                    }
+                    else {
+                        ctxi.lineWidth = lineWidth;
+                        ctxi.fillStyle = options.background;
+                        ctxi.strokeStyle = options.background;
+                    }
+                    ctxi.beginPath(); // draw top and top right corner
                     ctxi.moveTo(x + r, y);
-                    ctxi.arcTo(x + width, y, x + width, y + r, r); // draw right side and bottom right corner 
-                    ctxi.arcTo(x + width, y + height, x + width - r, y + height, r); // draw bottom and bottom left corner 
-                    ctxi.arcTo(x, y + height, x, y + height - r, r); // draw left and top left corner 
-                    ctxi.arcTo(x, y, x + r, y, r);
+                    ctxi.lineTo(x + width, y); // move to top-right corner
+                    ctxi.arc(x + width - r, y + r, r, -Math.PI / 2, 0); // draw right side and bottom right corner
+
+                    ctxi.lineTo(x + width, y + height - r);
+                    ctxi.arc(x + width - r, y + height - r, r, 0, Math.PI / 2); // draw bottom and bottom left corner
+
+                    ctxi.lineTo(x + r, y + height);
+                    ctxi.arc(x + r, y + height - r, r, Math.PI / 2, Math.PI);// draw left and top left corner
+
+                    ctxi.lineTo(x, y + r);
+                    ctxi.arc(x + r, y + r, r, Math.PI, Math.PI * 3 / 2);
+
                     ctxi.closePath();
                     if (fill) {
                         ctxi.fill();
@@ -1144,58 +1169,67 @@ let QRCode = {};
                 }
             }
             setTimeout(() => {
-                ctx.draw(true, () => {
-                    // 保存到临时区域
-                    setTimeout(() => {
-                        if (options.nvueContext) {
-                            ctx.toTempFilePath(
-                                0,
-                                0,
-                                options.width,
-                                options.height,
-                                options.width,
-                                options.height,
-                                "",
-                                1,
-                                function(res) {
-                                    if (options.cbResult) {
-                                        options.cbResult(res.tempFilePath)
-                                    }
-                                }
-                            );
-                        } else {
-                            uni.canvasToTempFilePath({
-                                width: options.width,
-                                height: options.height,
-                                destWidth: options.width,
-                                destHeight: options.height,
-                                canvasId: options.canvasId,
-                                quality: Number(1),
-                                success: function (res) {
-                                    if (options.cbResult) {
-                                        // 由于官方还没有统一此接口的输出字段，所以先判定下  支付宝为 res.apFilePath
-                                        if (!empty(res.tempFilePath)) {
-                                            options.cbResult(res.tempFilePath)
-                                        } else if (!empty(res.apFilePath)) {
-                                            options.cbResult(res.apFilePath)
-                                        } else {
+                // canvas2 绘制是自动的不需要手动绘制
+                if(options.isNvue || isApp){
+                    ctx.draw(true, () => {
+                        // 保存到临时区域
+                        setTimeout(() => {
+                            if (options.isNvue) {
+                                ctx.toTempFilePath(
+                                    0,
+                                    0,
+                                    options.width,
+                                    options.height,
+                                    options.width,
+                                    options.height,
+                                    "",
+                                    1,
+                                    function(res) {
+                                        if (options.cbResult) {
                                             options.cbResult(res.tempFilePath)
                                         }
                                     }
-                                },
-                                fail: function (res) {
-                                    if (options.cbResult) {
-                                        options.cbResult(res)
-                                    }
-                                },
-                                complete: function () {
-                                    uni.hideLoading();
-                                },
-                            }, options.context);
-                        }
-                    }, options.text.length + 100);
-                });
-            }, options.usingComponents ? 0 : 150);
+                                );
+                            } else {
+                                uni.canvasToTempFilePath({
+                                    width: options.width,
+                                    height: options.height,
+                                    destWidth: options.width,
+                                    destHeight: options.height,
+                                    canvasId: options.canvasId,
+                                    quality: Number(1),
+                                    success: function (res) {
+										// console.log('绘制成功', res)
+                                        if (options.cbResult) {
+                                            // 由于官方还没有统一此接口的输出字段，所以先判定下  支付宝为 res.apFilePath
+                                            if (!empty(res.tempFilePath)) {
+                                                options.cbResult(res.tempFilePath)
+                                            } else if (!empty(res.apFilePath)) {
+                                                options.cbResult(res.apFilePath)
+                                            } else {
+                                                options.cbResult(res.tempFilePath)
+                                            }
+                                        }
+                                    },
+                                    fail: function (res) {
+										console.log('绘制失败', res)
+                                        if (options.cbResult) {
+                                            options.cbResult(res)
+                                        }
+                                    },
+                                    complete: function () {
+                                        uni.hideLoading();
+                                    },
+                                }, options.vuectx);
+                            }
+                        }, options.text.length + 100);
+                    });
+                }
+                else{
+                    options.cbResult("")
+                }
+
+            }, options.usingComponents ? 100 : 200);
         }
         createCanvas(this.options);
         // 空判定
@@ -1218,10 +1252,10 @@ let QRCode = {};
     };
     QRCode.prototype.clear = function (fn) {
         var ctx = '';
-        if (options.nvueContext) {
-            ctx = options.nvueContext;
+        if (options.isNvue) {
+            ctx = options.ctx;
         } else {
-            uni.createCanvasContext(this.options.canvasId, this.options.context)
+            uni.createCanvasContext(this.options.canvasId, this.options.vuectx)
         }
         ctx.clearRect(0, 0, this.options.size, this.options.size)
         ctx.draw(false, () => {
@@ -1232,4 +1266,4 @@ let QRCode = {};
     };
 })()
 
-export default QRCode
\ No newline at end of file
+export default QRCode
diff --git a/uview-plus/components/u-qrcode/u-qrcode.vue b/uview-plus/components/u-qrcode/u-qrcode.vue
index dc9574b..1196d4a 100644
--- a/uview-plus/components/u-qrcode/u-qrcode.vue
+++ b/uview-plus/components/u-qrcode/u-qrcode.vue
@@ -1,304 +1,548 @@
 <template>
-	<view class="u-qrcode" @longpress="longpress">
-		<view class="u-qrcode__content" @click="preview">
-			<!-- #ifndef APP-NVUE -->
-			<canvas class="u-qrcode__canvas"
-				:id="cid" :canvas-id="cid" :style="{ width: size + unit, height: size + unit }" />
-			<!-- #endif -->
-			<!-- #ifdef APP-NVUE -->
-			<gcanvas class="u-qrcode__canvas" ref="gcanvess"
-				:style="{ width: size + unit, height: size + unit }">
-			</gcanvas>
-			<!-- #endif -->
-			<view v-if="showLoading && loading" class="u-qrcode__loading"
-				:style="{ width: size + unit, height: size + unit }">
-				<up-loading-icon vertical :text="loadingText" textSize="14px"></up-loading-icon>
-			</view>
-			<!-- <image v-show="show" :src="result" :style="{ width: size + unit, height: size + unit }" /> -->
-		</view>
-		<!-- <up-action-sheet :actions="list" cancelText="取消"
-			v-model:show="popupShow" @select="selectClick">
-		</up-action-sheet> -->
-	</view>
+    <view class="u-qrcode"
+          :id="rootId"
+          :style="{
+              width: useRootHeightAndWidth ? '100%' : 'auto',
+              height: useRootHeightAndWidth ? '100%' : 'auto',
+          }"
+          @longpress="longpress">
+        <view class="u-qrcode__content" @click="preview">
+            <!-- #ifdef MP || H5 -->
+            <canvas
+                class="u-qrcode__canvas"
+                :id="cid"
+                :canvas-id="cid"
+                type="2d"
+                :style="{ width: sizeLocal + unit, height: sizeLocal + unit }" />
+            <!-- #endif -->
+
+            <!-- #ifdef APP-PLUS -->
+            <canvas
+                class="u-qrcode__canvas"
+                :id="cid"
+                :canvas-id="cid"
+                :style="{ width: sizeLocal + unit, height: sizeLocal + unit }" />
+            <!-- #endif -->
+
+            <!-- #ifdef APP-NVUE -->
+			<web-view v-if="icon != ''" ref="web" src="/static/app-plus/up-canvas/local.html"
+				:style="'width:' + sizeLocal + 'px;height:' + sizeLocal + 'px'"
+				@onPostMessage="_onMessage" />
+            <gcanvas v-else class="u-qrcode__canvas" ref="gcanvess"
+                :style="{ width: sizeLocal + unit, height: sizeLocal + unit }">
+            </gcanvas>
+            <!-- #endif -->
+            <view v-if="showLoading && loading" class="u-qrcode__loading"
+                  :style="{ width: sizeLocal + unit, height: sizeLocal + unit }">
+                <up-loading-icon vertical :text="loadingText" textSize="14px"></up-loading-icon>
+            </view>
+        </view>
+
+    </view>
 </template>
 
 <script>
 import QRCode from "./qrcode.js"
+import { sleep } from '../../libs/function/index';
 // #ifdef APP-NVUE
 // https://github.com/dcloudio/NvueCanvasDemo/blob/master/README.md
 import {
-	enable,
-	WeexBridge
+    enable,
+    WeexBridge,
+	Image as GImage
 } from '../../libs/util/gcanvas/index.js';
+import { nextTick } from "vue";
 // #endif
 let qrcode
+// 20260201不能在data中存储canvas，否则会导致在微信小程序getContext获取不到canvas对象报错Cannot read property 'type'
+let canvas = null
 export default {
-	name: "u-qrcode",
-	props: {
-		cid: {
-			type: String,
-			default: 'u-qrcode-canvas' + Math.random().toString()
-		},
-		size: {
-			type: Number,
-			default: 200
-		},
-		unit: {
-			type: String,
-			default: 'px'
-		},
-		show: {
-			type: Boolean,
-			default: true
-		},
-		val: {
-			type: String,
-			default: ''
-		},
-		background: {
-			type: String,
-			default: '#ffffff'
-		},
-		foreground: {
-			type: String,
-			default: '#000000'
-		},
-		pdground: {
-			type: String,
-			default: '#000000'
-		},
-		icon: {
-			type: String,
-			default: ''
-		},
-		iconSize: {
-			type: Number,
-			default: 40
-		},
-		lv: {
-			type: Number,
-			default: 3
-		},
-		onval: {
-			type: Boolean,
-			default: true
-		},
-		loadMake: {
-			type: Boolean,
-			default: true
-		},
-		usingComponents: {
-			type: Boolean,
-			default: true
-		},
-		showLoading: {
-			type: Boolean,
-			default: true
-		},
-		loadingText: {
-			type: String,
-			default: '生成中'
-		},
-		allowPreview: {
-			type: Boolean,
-			default: false
-		},
-	},
-	emits: ['result', 'longpress'],
-	data() {
-		return {
-			loading: false,
-			result: '',
-			popupShow: false,
-			list: [
-				{
-					name: '保存二维码',
-				}
-			],
-			ganvas: null,
-			context: '',
-			canvasObj: {}
-		}
-	},
-	mounted: function () {
-		// #ifdef APP-NVUE
-		/*获取元素引用*/
-		this.ganvas = this.$refs["gcanvess"]
-		/*通过元素引用获取canvas对象*/
-		this.canvasObj = enable(this.ganvas, {
-			bridge: WeexBridge
-		})
-		/*获取绘图所需的上下文，目前不支持3d*/
-		this.context = this.canvasObj.getContext('2d')
-		// #endif
+    name: "u-qrcode",
+    props: {
+        cid: {
+            type: String,
+            default: () => {
+				return `u-qrcode-canvas${Math.floor(Math.random() * 1000000)}`
+			}
+        },
+        size: {
+            type: Number,
+            default: 200
+        },
+        unit: {
+            type: String,
+            default: 'px'
+        },
+        show: {
+            type: Boolean,
+            default: true
+        },
+        val: {
+            type: String,
+            default: ''
+        },
+        background: {
+            type: String,
+            default: '#ffffff'
+        },
+        foreground: {
+            type: String,
+            default: '#000000'
+        },
+        pdground: {
+            type: String,
+            default: '#000000'
+        },
+        icon: {
+            type: String,
+            default: ''
+        },
+        iconSize: {
+            type: Number,
+            default: 40
+        },
+        lv: {
+            type: Number,
+            default: 3
+        },
+        onval: {
+            type: Boolean,
+            default: true
+        },
+        loadMake: {
+            type: Boolean,
+            default: true
+        },
+        usingComponents: {
+            type: Boolean,
+            default: true
+        },
+        showLoading: {
+            type: Boolean,
+            default: true
+        },
+        loadingText: {
+            type: String,
+            default: '生成中'
+        },
+        allowPreview: {
+            type: Boolean,
+            default: false
+        },
+        // 是否使用根节点宽高
+        useRootHeightAndWidth: {
+            type: Boolean,
+            default: () => false
+        },
+    },
+    emits: ['preview', 'result', 'longpressCallback'],
+    data() {
+        return {
+            loading: false,
+            result: '',
+            popupShow: false,
+            list: [
+                {
+                    name: '保存二维码',
+                }
+            ],
+            rootId: `rootId${Number(Math.random() * 100).toFixed(0)}`,
+            ganvas: null,
+            canvasObj: {},
+            sizeLocal: this.size,
+            ctx: null,
+			_ready: false
+        }
+    },
+    async mounted(){
+        // 如果使用根节点的宽高 则 重新设置 size
+        if(this.useRootHeightAndWidth){
+            await this.setNewSize()
+        }
+		canvas = await this.getCanvasNode(this.cid)
 
-		if (this.loadMake) {
-			if (!this._empty(this.val)) {
-				setTimeout(() => {
-					this._makeCode()
-				}, 0);
+		if (!canvas) return
+		// #ifdef MP
+		// 不清楚是小程序的bug还是什么原因，canvas的node节点宽高和设置的宽高不一致 重新设置下
+		canvas.width = this.sizeLocal
+		canvas.height = this.sizeLocal
+		// #endif
+        // #ifdef APP-PLUS-NVUE
+		this.isNvue = true
+		// #endif
+		this.ctx = this.getUPCanvasContext('2d')
+
+        if (this.loadMake) {
+            if (!this._empty(this.val)) {
+                setTimeout(() => {
+                    setTimeout(()=>{
+                        this._makeCode()
+                    })
+                }, 0);
+            }
+        }
+    },
+    methods: {
+		_onMessage(e) {
+			// console.log('post message', e)
+			const message = e.detail.data[0]
+			switch (message.action) {
+				// web-view 初始化完毕
+				case 'onJSBridgeReady':
+					this._ready = true
+					this.$refs.web.evalJs('setContent('+JSON.stringify(this.$props) +')')
+					break
+				// qrcodeOk
+				case 'qrcodeOk':
+					this._result(message.imageData)
+					// this.$emit('load')
+					break
 			}
-		}
-	},
-	methods: {
-		_makeCode() {
-			let that = this
-			if (!this._empty(this.val)) {
-				// #ifndef APP-NVUE
-				this.loading = true
+		},
+        _makeCode() {
+            let that = this
+			if (!canvas) return
+            if (!this._empty(this.val)) {
+                // #ifndef APP-NVUE
+                this.loading = true
 				// #endif
-				qrcode = new QRCode({
-					context: that, // 上下文环境
-					canvasId: that.cid, // canvas-id
-					nvueContext: that.context,
-					usingComponents: that.usingComponents, // 是否是自定义组件
-					showLoading: false, // 是否显示loading
-					loadingText: that.loadingText, // loading文字
-					text: that.val, // 生成内容
-					size: that.size, // 二维码大小
-					background: that.background, // 背景色
-					foreground: that.foreground, // 前景色
-					pdground: that.pdground, // 定位角点颜色
-					correctLevel: that.lv, // 容错级别
-					image: that.icon, // 二维码图标
-					imageSize: that.iconSize,// 二维码图标大小
-					cbResult: function (res) { // 生成二维码的回调
-						that._result(res)
-					},
-				});
-			} else {
-				uni.showToast({
-					title: '二维码内容不能为空',
-					icon: 'none',
-					duration: 2000
-				});
-			}
-		},
-		_clearCode() {
-			this._result('')
-			qrcode.clear()
-		},
-		_saveCode() {
-			let that = this;
-			if (this.result != "") {
-				uni.saveImageToPhotosAlbum({
-					filePath: that.result,
-					success: function () {
-						uni.showToast({
-							title: '二维码保存成功',
-							icon: 'success',
-							duration: 2000
-						});
-					}
-				});
-			}
-		},
-		preview(e) {
-			// 预览图片
-			// console.log(this.result)
-			if (this.allowPreview) {
-				uni.previewImage({
-					urls: [this.result],
-					longPressActions: {
-						itemList: ['保存二维码图片'],
-						success: function(data) {
-							// console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
-							switch (data.tapIndex) {
-								case 0:
-									that._saveCode();
-									break;
-							}
+				// nvue下时因为gcanvas的GImage不生效，因此icon模式会采用webview
+				if ((this.icon == '' && that.isNvue) || !that.isNvue) {
+					qrcode = new QRCode({
+						vuectx: that, // 上下文环境
+						canvasId: that.cid, // canvas-id
+						ctx: that.ctx,
+						isNvue: that.isNvue,
+						usingComponents: that.usingComponents, // 是否是自定义组件
+						showLoading: false, // 是否显示loading
+						loadingText: that.loadingText, // loading文字
+						text: that.val, // 生成内容
+						size: that.sizeLocal, // 二维码大小
+						background: that.background, // 背景色
+						foreground: that.foreground, // 前景色
+						pdground: that.pdground, // 定位角点颜色
+						correctLevel: that.lv, // 容错级别
+						image: that.icon, // 二维码图标
+						imageSize: that.iconSize,// 二维码图标大小
+						cbResult: function (res) { // 生成二维码的回调
+							that._result(res)
 						},
-						fail: function(err) {
-							console.log(err.errMsg);
-						}
+					});
+				}
+            } else {
+                uni.showToast({
+                    title: '二维码内容不能为空',
+                    icon: 'none',
+                    duration: 2000
+                });
+            }
+        },
+        _clearCode() {
+            this._result('')
+            qrcode.clear()
+        },
+        _saveCode() {
+            let that = this;
+            if (this.result != "") {
+                uni.saveImageToPhotosAlbum({
+                    filePath: that.result,
+                    success: function () {
+                        uni.showToast({
+                            title: '二维码保存成功',
+                            icon: 'success',
+                            duration: 2000
+                        });
+                    }
+                });
+            } else {
+				this.toTempFilePath({
+				    success: res => {
+						that.result = res.tempFilePath
+						uni.saveImageToPhotosAlbum({
+						    filePath: that.result,
+						    success: function () {
+						        uni.showToast({
+						            title: '二维码保存成功',
+						            icon: 'success',
+						            duration: 2000
+						        });
+						    }
+						});
+				    },
+				    fail: err => {
+				    }
+				})
+			}
+        },
+        preview(e) {
+            // 预览图片
+            // console.log(this.result)
+            if (this.allowPreview) {
+                uni.previewImage({
+                    urls: [this.result],
+                    longPressActions: {
+                        itemList: ['保存二维码图片'],
+                        success: function(data) {
+                            // console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+                            switch (data.tapIndex) {
+                                case 0:
+                                    that._saveCode();
+                                    break;
+                            }
+                        },
+                        fail: function(err) {
+                            console.log(err.errMsg);
+                        }
+                    }
+                });
+            }
+            this.$emit('preview', {
+                url: this.result
+            }, e)
+        },
+        async toTempFilePath({success, fail}) {
+            if (this.ct) {
+                this.ctx.toTempFilePath(
+                    0,
+                    0,
+                    this.sizeLocal,
+                    this.sizeLocal,
+                    this.sizeLocal,
+                    this.sizeLocal,
+                    "",
+                    1,
+                    res => {
+                        success(res)
+                    }
+                );
+            }
+            else {
+                // #ifdef H5
+                success({
+                    tempFilePath: this.ctx.canvas.toDataURL("image/png", 1)
+                })
+                // #endif
+
+                // #ifndef H5
+                uni.canvasToTempFilePath(
+                    {
+                        canvasId: this.cid,
+                        success :res => {
+                            success(res)
+                        },
+                        fail: fail
+                    },
+                    this)
+                // #endif
+            }
+        },
+        async longpress() {
+            this.toTempFilePath({
+                success: res => {
+                    this.$emit('longpressCallback', res.tempFilePath)
+                },
+                fail: err => {
+                }
+            })
+        },
+
+        /**
+         * 使用根节点宽高 设置新的size
+         * @return {Promise<void>}
+         */
+        async setNewSize(){
+            const rootNode = await this.getCanvasNode(this.rootId, false);
+            const { width , height } = rootNode;
+            // 将最短的设置为二维码 的size
+            if(width > height){
+                this.sizeLocal = height
+            }
+            else{
+                this.sizeLocal = width
+            }
+        },
+
+        /**
+         * 获取节点
+         * @param id 节点id
+         * @param isCanvas 是否为Canvas节点
+         * @return {Promise<unknown>}
+         */
+        async getCanvasNode(id, isCanvas = true) {
+			let that = this
+        	return new Promise((resolve, reject) => {
+        		try {
+        			// #ifdef APP-NVUE
+        			setTimeout(() => {
+        				/*获取元素引用*/
+        				this.ganvas = this.$refs["gcanvess"]
+        				/*通过元素引用获取canvas对象*/
+        				let canvasNode = enable(this.ganvas, {
+        				    bridge: WeexBridge
+        				})
+        				resolve(canvasNode)
+        			}, 200)
+        			// #endif
+        			// #ifndef APP-PLUS-NVUE
+                    const query = uni.createSelectorQuery().in(that).select(`#${id}`);
+                    query.fields({
+                            node: true,
+                            size: true
+                        })
+                        .exec((res) => {
+                            if (isCanvas) {
+                                if (res[0]?.node) {
+                                    resolve(res[0].node)
+                                } else {
+                                    resolve(false)
+                                    console.error("获取节点出错", res)
+                                }
+                            } else {
+                                resolve(res[0])
+                            }
+                        })
+        			// #endif
+        		} catch (e) {
+        			console.error("获取节点失败", e)
+        		}
+        	})
+        },
+		getUPCanvasContext() {
+			// #ifdef APP-PLUS
+			return uni.createCanvasContext(this.cid, this);
+			// #endif
+			// #ifdef APP-PLUS-NVUE || MP || H5
+			return canvas.getContext('2d');
+			// #endif
+		},
+		drawImage(url, x, y, w, h) {
+			try {
+				let img = {}
+				// #ifdef APP-NVUE
+				img = new GImage();
+				// #endif
+				
+				// #ifdef H5
+				// APP下不支持会一直卡住
+				img = new Image();
+				// #endif
+				
+				// #ifdef MP
+				// 小程序2d
+				// https://developers.weixin.qq.com/miniprogram/dev/api/canvas/Canvas.createImage.html
+				img = canvas.createImage();
+				// #endif
+				// #ifdef APP-NVUE
+				let that = this
+				// console.log(img)
+				img.onload = function(){
+					if (process.env.NODE_ENV === 'development') {
+						console.log('drawImage绘制2...')
 					}
-				});
-			}
-			this.$emit('preview', {
-				url: this.result
-			}, e)
-		},
-		longpress() {
-			this.$emit('longpress', this.result)
-		},
-		selectClick(index) {
-			switch (index) {
-				case 0:
-					alert('保存二维码')
-					this._saveCode();
-					break;
-			}
-		},
-		_result(res) {
-			this.loading = false;
-			this.result = res;
-			this.$emit('result', res);
-		},
-		_empty(v) {
-			let tp = typeof v,
-				rt = false;
-			if (tp == "number" && String(v) == "") {
-				rt = true
-			} else if (tp == "undefined") {
-				rt = true
-			} else if (tp == "object") {
-				if (JSON.stringify(v) == "{}" || JSON.stringify(v) == "[]" || v == null) rt = true
-			} else if (tp == "string") {
-				if (v == "" || v == "undefined" || v == "null" || v == "{}" || v == "[]") rt = true
-			} else if (tp == "function") {
-				rt = false
-			}
-			return rt
-		}
-	},
-	watch: {
-		size: function (n, o) {
-			if (n != o && !this._empty(n)) {
-				this.cSize = n
-				if (!this._empty(this.val)) {
-					setTimeout(() => {
-						this._makeCode()
-					}, 100);
+					that.cxt.drawImage(img, x, y, w, h);
 				}
+				// #endif
+				// #ifdef H5 || MP
+				img.onload = () => {
+					this.ctx.drawImage(img, x, y, w, h);
+				};
+				// #endif
+				img.src = url;
+				// #ifdef APP-VUE
+				this.ctx.drawImage(url, x, y, w, h);
+				// #endif
+			} catch (error) {
+				console.log('drawImage绘制出错', error)
 			}
 		},
-		val: function (n, o) {
-			if (this.onval) {
-				if (n != o && !this._empty(n)) {
-					setTimeout(() => {
-						this._makeCode()
-					}, 0);
-				}
-			}
-		}
-	},
-	computed: {
-	}
+
+        selectClick(index) {
+            switch (index) {
+                case 0:
+                    alert('保存二维码')
+                    this._saveCode();
+                    break;
+            }
+        },
+        _result(res) {
+            this.loading = false;
+            this.result = res;
+            this.$emit('result', res);
+        },
+        _empty(v) {
+            let tp = typeof v,
+                rt = false;
+            if (tp == "number" && String(v) == "") {
+                rt = true
+            } else if (tp == "undefined") {
+                rt = true
+            } else if (tp == "object") {
+                if (JSON.stringify(v) == "{}" || JSON.stringify(v) == "[]" || v == null) rt = true
+            } else if (tp == "string") {
+                if (v == "" || v == "undefined" || v == "null" || v == "{}" || v == "[]") rt = true
+            } else if (tp == "function") {
+                rt = false
+            }
+            return rt
+        },
+    },
+    watch: {
+        size: function (n, o) {
+            if (n != o && !this._empty(n)) {
+                this.cSize = n
+                if (!this._empty(this.val)) {
+                    setTimeout(() => {
+                        this._makeCode()
+                    }, 100);
+                }
+            }
+        },
+        val: function (n, o) {
+            if (this.onval) {
+                if (n != o && !this._empty(n)) {
+                    setTimeout(() => {
+                        this._makeCode()
+                    }, 0);
+                }
+            }
+        }
+    },
+    computed: {
+    }
 }
 </script>
 <style lang="scss" scoped>
 .u-qrcode {
-	&__loading {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		background-color: #f7f7f7;
-		position: absolute;
-		top: 0;
-		bottom: 0;
-		left: 0;
-		right: 0;
-	}
-	&__content {
-		position: relative;
+    &__loading {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        background-color: #f7f7f7;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+    }
 
-		&__canvas {
-			position: fixed;
-			top: -99999rpx;
-			left: -99999rpx;
-			z-index: -99999;
-		}
-	}
+    /* #ifdef MP-TOUTIAO */
+    /**字节小程序在编译时会出现一个 [hidde]:{ display: none !important; } 这个样式
+     * 会导致canvas 隐藏掉 没有找到具体原因先这样处理
+     */
+    &__canvas {
+        display: block !important;
+    }
+    /* #endif */
+
+    &__content {
+        position: relative;
+
+        &__canvas {
+            position: fixed;
+            top: -99999rpx;
+            left: -99999rpx;
+            z-index: -99999;
+        }
+    }
 }
 </style>
diff --git a/uview-plus/components/u-radio-group/radioGroup.js b/uview-plus/components/u-radio-group/radioGroup.js
index 3d73fd5..7bba89b 100644
--- a/uview-plus/components/u-radio-group/radioGroup.js
+++ b/uview-plus/components/u-radio-group/radioGroup.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
  * @LastAuthor   : CPS
- * @lastTime     : 2024-11-05 16:01:12
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/radioGroup.js
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/radioGroup.js
  */
 export default {
     // radio-group组件
diff --git a/uview-plus/components/u-radio-group/u-radio-group.vue b/uview-plus/components/u-radio-group/u-radio-group.vue
index 794c2c5..6ec9435 100644
--- a/uview-plus/components/u-radio-group/u-radio-group.vue
+++ b/uview-plus/components/u-radio-group/u-radio-group.vue
@@ -17,7 +17,7 @@
 	/**
 	 * radioRroup 单选框父组件
 	 * @description 单选框用于有一个选择，用户只能选择其中一个的场景。搭配u-radio使用
-	 * @tutorial https://ijry.github.io/uview-plus/components/radio.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/radio.html
 	 * @property {String | Number | Boolean}	value 			绑定的值
 	 * @property {Boolean}						disabled		是否禁用所有radio（默认 false ）
 	 * @property {String}						shape			外观形状，shape-方形，circle-圆形(默认 circle )
@@ -118,7 +118,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-radio-group {
 		flex: 1;
diff --git a/uview-plus/components/u-radio/radio.js b/uview-plus/components/u-radio/radio.js
index 4df200f..da4762d 100644
--- a/uview-plus/components/u-radio/radio.js
+++ b/uview-plus/components/u-radio/radio.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:02:34
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/radio.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/radio.js
  */
 export default {
     // radio组件
diff --git a/uview-plus/components/u-radio/u-radio.vue b/uview-plus/components/u-radio/u-radio.vue
index 7ce5923..372f943 100644
--- a/uview-plus/components/u-radio/u-radio.vue
+++ b/uview-plus/components/u-radio/u-radio.vue
@@ -12,7 +12,7 @@
 		    :style="[iconWrapStyle]"
 		>
 			<slot name="icon" :elIconSize="elIconSize" :elIconColor="elIconColor">
-				<u-icon
+				<up-icon
 				    class="u-radio__icon-wrap__icon"
 				    name="checkbox-mark"
 				    :size="elIconSize"
@@ -43,7 +43,7 @@
 	/**
 	 * radio 单选框
 	 * @description 单选框用于有一个选择，用户只能选择其中一个的场景。搭配u-radio-group使用
-	 * @tutorial https://ijry.github.io/uview-plus/components/radio.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/radio.html
 	 * @property {String | Number}	name			radio的名称
 	 * @property {String}			shape			形状，square为方形，circle为圆型
 	 * @property {Boolean}			disabled		是否禁用
@@ -246,7 +246,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	$u-radio-wrap-margin-right:6px !default;
 	$u-radio-wrap-font-size:20px !default;
 	$u-radio-wrap-border-width:1px !default;
diff --git a/uview-plus/components/u-rate/rate.js b/uview-plus/components/u-rate/rate.js
index d31c61a..c04ebf8 100644
--- a/uview-plus/components/u-rate/rate.js
+++ b/uview-plus/components/u-rate/rate.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:05:09
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/rate.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-18 22:43:09
+ * @FilePath     : /uview-plus/libs/config/props/rate.js
  */
 export default {
     // rate组件
diff --git a/uview-plus/components/u-rate/u-rate.vue b/uview-plus/components/u-rate/u-rate.vue
index a98322d..3a8577d 100644
--- a/uview-plus/components/u-rate/u-rate.vue
+++ b/uview-plus/components/u-rate/u-rate.vue
@@ -21,7 +21,7 @@
                     ref="u-rate__content__item__icon-wrap"
                     @tap.stop="clickHandler($event, index + 1)"
                 >
-                    <u-icon
+                    <up-icon
                         :name="
                             Math.floor(activeIndex) > index
                                 ? activeIcon
@@ -38,7 +38,7 @@
                             padding: `0 ${addUnit(gutter / 2)}`,
                         }"
                         :size="size"
-                    ></u-icon>
+                    ></up-icon>
                 </view>
                 <view
                     v-if="allowHalf"
@@ -49,7 +49,7 @@
                     }]"
                     ref="u-rate__content__item__icon-wrap"
                 >
-                    <u-icon
+                    <up-icon
                         :name="
                             Math.ceil(activeIndex) > index
                                 ? activeIcon
@@ -66,7 +66,7 @@
                             padding: `0 ${addUnit(gutter / 2)}`
                         }"
                         :size="size"
-                    ></u-icon>
+                    ></up-icon>
                 </view>
             </view>
         </view>
@@ -84,7 +84,7 @@
 	/**
 	 * rate 评分
 	 * @description 该组件一般用于满意度调查，星型评分的场景
-	 * @tutorial https://ijry.github.io/uview-plus/components/rate.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/rate.html
 	 * @property {String | Number}	value			用于v-model双向绑定选中的星星数量 (默认 1 )
 	 * @property {String | Number}	count			最多可选的星星数量 （默认 5 ）
 	 * @property {Boolean}			disabled		是否禁止用户操作 （默认 false ）
@@ -287,7 +287,6 @@
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
 $u-rate-margin: 0 !default;
 $u-rate-padding: 0 !default;
 $u-rate-item-icon-wrap-half-top: 0 !default;
@@ -320,7 +319,7 @@ $u-rate-item-icon-wrap-half-left: 0 !default;
     }
 }
 
-.u-icon {
+.up-icon {
     /* #ifndef APP-NVUE */
     box-sizing: border-box;
     /* #endif */
diff --git a/uview-plus/components/u-read-more/readMore.js b/uview-plus/components/u-read-more/readMore.js
index 09b11cc..f644f07 100644
--- a/uview-plus/components/u-read-more/readMore.js
+++ b/uview-plus/components/u-read-more/readMore.js
@@ -1,19 +1,20 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:18:41
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/readMore.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/readMore.js
  */
+import { t } from '../../libs/i18n'
 export default {
     // readMore
     readMore: {
         showHeight: 400,
         toggle: false,
-        closeText: '展开阅读全文',
-        openText: '收起',
+        closeText: t("up.readMore.expand"),
+        openText: t("up.readMore.fold"),
         color: '#2979ff',
         fontSize: 14,
         textIndent: '2em',
diff --git a/uview-plus/components/u-read-more/u-read-more.vue b/uview-plus/components/u-read-more/u-read-more.vue
index d4405c0..fec02e1 100644
--- a/uview-plus/components/u-read-more/u-read-more.vue
+++ b/uview-plus/components/u-read-more/u-read-more.vue
@@ -33,11 +33,11 @@
 					    margin="0 5px 0 0"
 					></up-text>
 					<view class="u-read-more__toggle__icon">
-						<u-icon
+						<up-icon
 						    :color="color"
 						    :size="fontSize + 2"
 						    :name="status === 'close' ? 'arrow-down' : 'arrow-up'"
-						></u-icon>
+						></up-icon>
 					</view>
 				</view>
 			</slot>
@@ -56,7 +56,7 @@
 	/**
 	 * readMore 阅读更多
 	 * @description 该组件一般用于内容较长，预先收起一部分，点击展开全部内容的场景。
-	 * @tutorial https://ijry.github.io/uview-plus/components/readMore.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/readMore.html
 	 * @property {String | Number}	showHeight	内容超出此高度才会显示展开全文按钮，单位px（默认 400 ）
 	 * @property {Boolean}			toggle		展开后是否显示收起按钮（默认 false ）
 	 * @property {String}			closeText	关闭时的提示文字（默认 '展开阅读全文' ）
@@ -140,8 +140,6 @@
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
-
 .u-read-more {
 
 	&__content {
diff --git a/uview-plus/components/u-refresh-virtual-list/u-refresh-virtual-list.vue b/uview-plus/components/u-refresh-virtual-list/u-refresh-virtual-list.vue
new file mode 100644
index 0000000..9313ac3
--- /dev/null
+++ b/uview-plus/components/u-refresh-virtual-list/u-refresh-virtual-list.vue
@@ -0,0 +1,85 @@
+<template>
+  <u-pull-refresh
+    :refreshing="refreshing"
+    :threshold="50"
+    @refresh="handleRefresh"
+  >
+    <u-virtual-list
+      ref="virtualList"
+      :list-data="listData"
+      :item-height="itemHeight"
+      :height="height"
+      :buffer="buffer"
+      :key-field="keyField"
+      :scroll-top="scrollTop"
+      @scroll="handleScroll"
+    >
+      <template #default="{ item, index }">
+        <slot :item="item" :index="index"></slot>
+      </template>
+    </u-virtual-list>
+  </u-pull-refresh>
+</template>
+
+<script>
+
+export default {
+  name: 'u-refresh-virtual-list',
+  props: {
+    // 数据源
+    listData: {
+      type: Array,
+      default: () => []
+    },
+    // 每项高度（固定高度模式）
+    itemHeight: {
+      type: Number,
+      default: 50
+    },
+    // 容器高度
+    height: {
+      type: [String, Number],
+      default: '100%'
+    },
+    // 缓冲区项数
+    buffer: {
+      type: Number,
+      default: 4
+    },
+    // 索引键名
+    keyField: {
+      type: String,
+      default: 'id'
+    }
+  },
+  data() {
+    return {
+      refreshing: false,
+      scrollTop: 0
+    }
+  },
+  methods: {
+    handleRefresh() {
+      this.refreshing = true
+      this.$emit('refresh')
+    },
+    
+    handleScroll(scrollTop) {
+      this.scrollTop = scrollTop
+      this.$emit('scroll', scrollTop)
+    },
+    
+    finishRefresh() {
+      this.refreshing = false
+    },
+    
+    scrollTo(top) {
+      this.scrollTop = top
+    },
+    
+    scrollToTop() {
+      this.scrollTo(0)
+    }
+  }
+}
+</script>
diff --git a/uview-plus/components/u-row-notice/rowNotice.js b/uview-plus/components/u-row-notice/rowNotice.js
index cd9d0a0..53fc3fb 100644
--- a/uview-plus/components/u-row-notice/rowNotice.js
+++ b/uview-plus/components/u-row-notice/rowNotice.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:19:13
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/rowNotice.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/rowNotice.js
  */
 export default {
     // rowNotice
diff --git a/uview-plus/components/u-row-notice/u-row-notice.vue b/uview-plus/components/u-row-notice/u-row-notice.vue
index 565072c..0165ba8 100644
--- a/uview-plus/components/u-row-notice/u-row-notice.vue
+++ b/uview-plus/components/u-row-notice/u-row-notice.vue
@@ -8,11 +8,11 @@
 				class="u-notice__left-icon"
 				v-if="icon"
 			>
-				<u-icon
+				<up-icon
 					:name="icon"
 					:color="color"
 					size="19"
-				></u-icon>
+				></up-icon>
 			</view>
 		</slot>
 		<view
@@ -35,19 +35,19 @@
 			class="u-notice__right-icon"
 			v-if="['link', 'closable'].includes(mode)"
 		>
-			<u-icon
+			<up-icon
 				v-if="mode === 'link'"
 				name="arrow-right"
 				:size="17"
 				:color="color"
-			></u-icon>
-			<u-icon
+			></up-icon>
+			<up-icon
 				v-if="mode === 'closable'"
 				@click="close"
 				name="close"
 				:size="16"
 				:color="color"
-			></u-icon>
+			></up-icon>
 		</view>
 	</view>
 </template>
@@ -64,7 +64,7 @@
 	/**
 	 * RowNotice 滚动通知中的水平滚动模式
 	 * @description 水平滚动
-	 * @tutorial https://ijry.github.io/uview-plus/components/noticeBar.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/noticeBar.html
 	 * @property {String | Number}	text			显示的内容，字符串
 	 * @property {String}			icon			是否显示左侧的音量图标 (默认 'volume' )
 	 * @property {String}			mode			通告模式，link-显示右箭头，closable-显示右侧关闭图标
@@ -282,7 +282,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-notice {
 		@include flex;
@@ -317,7 +316,7 @@
 				animation: u-loop-animation 10s linear infinite both;
 				/* #endif */
 				@include flex(row);
-				line-height: 100%;
+				// line-height: 100%;
 			}
 		}
 
diff --git a/uview-plus/components/u-row/row.js b/uview-plus/components/u-row/row.js
index 573a431..3363f1e 100644
--- a/uview-plus/components/u-row/row.js
+++ b/uview-plus/components/u-row/row.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:18:58
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/row.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/row.js
  */
 export default {
     // row
diff --git a/uview-plus/components/u-row/u-row.vue b/uview-plus/components/u-row/u-row.vue
index ded929b..e89a941 100644
--- a/uview-plus/components/u-row/u-row.vue
+++ b/uview-plus/components/u-row/u-row.vue
@@ -20,7 +20,7 @@
 	/**
 	 * Row 栅格系统中的行
 	 * @description 通过基础的 12 分栏，迅速简便地创建布局 
-	 * @tutorial https://ijry.github.io/uview-plus/components/layout.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/layout.html
 	 * @property {String | Number}	gutter		栅格间隔，左右各为此值的一半，单位px  (默认 0 )
 	 * @property {String}			justify		水平排列方式(微信小程序暂不支持) 可选值为`start`(或`flex-start`)、`end`(或`flex-end`)、`center`、`around`(或`space-around`)、`between`(或`space-between`)  (默认 'start' )
 	 * @property {String}			align		垂直排列方式 (默认 'center' )
@@ -89,7 +89,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	
 	.u-row {
 		@include flex;
diff --git a/uview-plus/components/u-safe-bottom/u-safe-bottom.vue b/uview-plus/components/u-safe-bottom/u-safe-bottom.vue
index b286f70..b9ea841 100644
--- a/uview-plus/components/u-safe-bottom/u-safe-bottom.vue
+++ b/uview-plus/components/u-safe-bottom/u-safe-bottom.vue
@@ -11,11 +11,11 @@
 	import { props } from "./props.js";
 	import { mpMixin } from '../../libs/mixin/mpMixin';
 	import { mixin } from '../../libs/mixin/mixin';
-	import { addStyle, deepMerge, addUnit, sys } from '../../libs/function/index';
+	import { addStyle, deepMerge, addUnit, getWindowInfo } from '../../libs/function/index';
 	/**
 	 * SafeBottom 底部安全区
 	 * @description 这个适配，主要是针对IPhone X等一些底部带指示条的机型，指示条的操作区域与页面底部存在重合，容易导致用户误操作，因此我们需要针对这些机型进行底部安全区适配。
-	 * @tutorial https://ijry.github.io/uview-plus/components/safeAreaInset.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/safeAreaInset.html
 	 * @property {type}		prop_name
 	 * @property {Object}	customStyle	定义需要用到的外部样式
 	 *
@@ -34,15 +34,15 @@
 		computed: {
 			style() {
 				const style = {};
-				// #ifdef APP-NVUE || MP-TOUTIAO
+				// #ifdef APP-NVUE || MP-TOUTIAO || MP-WEIXIN
 				// nvue下，高度使用js计算填充
-				style.height = addUnit(sys().safeAreaInsets.bottom, 'px');
+				style.height = addUnit(getWindowInfo().safeAreaInsets.bottom, 'px');
 				// #endif
 				return deepMerge(style, addStyle(this.customStyle));
 			},
 		},
 		mounted() {
-			// #ifdef APP-NVUE
+			// #ifdef APP-NVUE || MP-TOUTIAO || MP-WEIXIN
 			// 标识为是否nvue
 			this.isNvue = true;
 			// #endif
diff --git a/uview-plus/components/u-scroll-list/other.js b/uview-plus/components/u-scroll-list/other.js
deleted file mode 100644
index e69de29..0000000
diff --git a/uview-plus/components/u-scroll-list/scrollList.js b/uview-plus/components/u-scroll-list/scrollList.js
index 441e63a..15e3ae0 100644
--- a/uview-plus/components/u-scroll-list/scrollList.js
+++ b/uview-plus/components/u-scroll-list/scrollList.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:19:28
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/scrollList.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/scrollList.js
  */
 export default {
     // scrollList
diff --git a/uview-plus/components/u-scroll-list/u-scroll-list.vue b/uview-plus/components/u-scroll-list/u-scroll-list.vue
index 5f2af6b..6e80fea 100644
--- a/uview-plus/components/u-scroll-list/u-scroll-list.vue
+++ b/uview-plus/components/u-scroll-list/u-scroll-list.vue
@@ -83,7 +83,7 @@
 /**
  * scrollList 横向滚动列表
  * @description 该组件一般用于同时展示多个商品、分类的场景，也可以完成左右滑动的列表。
- * @tutorial https://ijry.github.io/uview-plus/components/scrollList.html
+ * @tutorial https://uview-plus.jiangruyi.com/components/scrollList.html
  * @property {String | Number}	indicatorWidth			指示器的整体宽度 (默认 50 )
  * @property {String | Number}	indicatorBarWidth		滑块的宽度 (默认 20 )
  * @property {Boolean}			indicator				是否显示面板指示器 (默认 true )
@@ -198,8 +198,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
-
 .u-scroll-list {
 	padding-bottom: 10px;
 
diff --git a/uview-plus/components/u-search/props.js b/uview-plus/components/u-search/props.js
index cf79927..8925ec9 100644
--- a/uview-plus/components/u-search/props.js
+++ b/uview-plus/components/u-search/props.js
@@ -1,134 +1,156 @@
 import { defineMixin } from '../../libs/vue'
 import defProps from '../../libs/config/props.js'
+
 export const props = defineMixin({
-    props: {
-        // 搜索框形状，round-圆形，square-方形
-        shape: {
-            type: String,
-            default: () => defProps.search.shape
-        },
-        // 搜索框背景色，默认值#f2f2f2
-        bgColor: {
-            type: String,
-            default: () => defProps.search.bgColor
-        },
-        // 占位提示文字
-        placeholder: {
-            type: String,
-            default: () => defProps.search.placeholder
-        },
-        // 是否启用清除控件
-        clearabled: {
-            type: Boolean,
-            default: () => defProps.search.clearabled
-        },
-        // 是否自动聚焦
-        focus: {
-            type: Boolean,
-            default: () => defProps.search.focus
-        },
-        // 是否在搜索框右侧显示取消按钮
-        showAction: {
-            type: Boolean,
-            default: () => defProps.search.showAction
-        },
-        // 右边控件的样式
-        actionStyle: {
-            type: Object,
-            default: () => defProps.search.actionStyle
-        },
-        // 取消按钮文字
-        actionText: {
-            type: String,
-            default: () => defProps.search.actionText
-        },
-        // 输入框内容对齐方式，可选值为 left|center|right
-        inputAlign: {
-            type: String,
-            default: () => defProps.search.inputAlign
-        },
-        // input输入框的样式，可以定义文字颜色，大小等，对象形式
-        inputStyle: {
-            type: Object,
-            default: () => defProps.search.inputStyle
-        },
-        // 是否启用输入框
-        disabled: {
-            type: Boolean,
-            default: () => defProps.search.disabled
-        },
-        // 边框颜色
-        borderColor: {
-            type: String,
-            default: () => defProps.search.borderColor
-        },
-        // 搜索图标的颜色，默认同输入框字体颜色
-        searchIconColor: {
-            type: String,
-            default: () => defProps.search.searchIconColor
-        },
-        // 输入框字体颜色
-        color: {
-            type: String,
-            default: () => defProps.search.color
-        },
-        // placeholder的颜色
-        placeholderColor: {
-            type: String,
-            default: () => defProps.search.placeholderColor
-        },
-        // 左边输入框的图标，可以为uView图标名称或图片路径
-        searchIcon: {
-            type: String,
-            default: () => defProps.search.searchIcon
-        },
-        searchIconSize: {
-            type: [Number, String],
-            default: () => defProps.search.searchIconSize
-        },
-        // 组件与其他上下左右元素之间的距离，带单位的字符串形式，如"30px"、"30px 20px"等写法
-        margin: {
-            type: String,
-            default: () => defProps.search.margin
-        },
-        // 开启showAction时，是否在input获取焦点时才显示
-        animation: {
-            type: Boolean,
-            default: () => defProps.search.animation
-        },
-        // 输入框的初始化内容
-        modelValue: {
-            type: String,
-            default: () => defProps.search.value
-        },
-		value: {
-		    type: String,
-		    default: () => defProps.search.value
+	props: {
+		// #ifdef VUE3
+		// 绑定的值
+		modelValue: {
+			type: [String, Number],
+			default: () => defProps.search.value
 		},
-        // 输入框最大能输入的长度，-1为不限制长度(来自uniapp文档)
-        maxlength: {
-            type: [String, Number],
-            default: () => defProps.search.maxlength
-        },
-        // 搜索框高度，单位px
-        height: {
-            type: [String, Number],
-            default: () => defProps.search.height
-        },
-        // 搜索框左侧文本
-        label: {
-            type: [String, Number, null],
-            default: () => defProps.search.label
-        },
-        // 键盘弹起时，是否自动上推页面	
-        adjustPosition: {
-            type: Boolean,
-            default: () => true
-        },
-        // 键盘收起时，是否自动失去焦点	
-        autoBlur: {
-            type: Boolean,
-            default: () => false
-        }
-    }
-})
+		// #endif
+		// #ifdef VUE2
+		// 绑定的值
+		value: {
+			type: [String, Number],
+			default: () => defProps.search.value
+		},
+		// #endif
+		// 搜索框形状，round-圆形，square-方形
+		shape: {
+			type: String,
+			default: () => defProps.search.shape
+		},
+		// 搜索框背景色
+		bgColor: {
+			type: String,
+			default: () => defProps.search.bgColor
+		},
+		// 占位提示文字
+		placeholder: {
+			type: String,
+			default: () => defProps.search.placeholder
+		},
+		// 是否启用清除控件
+		clearabled: {
+			type: Boolean,
+			default: () => defProps.search.clearabled
+		},
+		// 是否仅聚焦时显示清除控件
+		onlyClearableOnFocused: {
+			type: Boolean,
+			default: true
+		},
+		// 是否自动聚焦
+		focus: {
+			type: Boolean,
+			default: () => defProps.search.focus
+		},
+		// 是否在搜索框右侧显示取消按钮
+		showAction: {
+			type: Boolean,
+			default: () => defProps.search.showAction
+		},
+		// 右侧取消按钮文字
+		actionText: {
+			type: String,
+			default: () => defProps.search.actionText
+		},
+		// 搜索框左侧文本
+		label: {
+			type: [String, Number, null],
+			default: () => defProps.search.label
+		},
+		// 输入框内容对齐方式，可选值为：left|center|right
+		inputAlign: {
+			type: String,
+			default: () => defProps.search.inputAlign
+		},
+		// 是否启用输入框
+		disabled: {
+			type: Boolean,
+			default: () => defProps.search.disabled
+		},
+		// 开启showAction时，是否在input获取焦点时才显示
+		animation: {
+			type: Boolean,
+			default: () => defProps.search.animation
+		},
+		// 边框颜色，只要配置了颜色，才会有边框
+		borderColor: {
+			type: String,
+			default: () => defProps.search.borderColor
+		},
+		// 搜索图标的颜色，默认同输入框字体颜色
+		searchIconColor: {
+			type: String,
+			default: () => defProps.search.searchIconColor
+		},
+		// 搜索图标的大小
+		searchIconSize: {
+			type: [Number, String],
+			default: () => defProps.search.searchIconSize
+		},
+		// 输入框字体颜色
+		color: {
+			type: String,
+			default: () => defProps.search.color
+		},
+		// placeholder的颜色
+		placeholderColor: {
+			type: String,
+			default: () => defProps.search.placeholderColor
+		},
+		// 左边输入框的图标，可以为uView图标名称或图片路径
+		searchIcon: {
+			type: String,
+			default: () => defProps.search.searchIcon
+		},
+		// 组件与其他上下左右元素之间的距离，带单位的字符串形式，如"30px"
+		margin: {
+			type: String,
+			default: () => defProps.search.margin
+		},
+		// 应该是uView-plus版本新增的，用于控制搜索图标的插槽位置
+		iconPosition: {
+			type: String,
+			default: () => defProps.search.iconPosition
+		},
+		// 输入框最大能输入的长度，-1为不限制长度
+		maxlength: {
+			type: [String, Number],
+			default: () => defProps.search.maxlength
+		},
+		// 输入框高度，单位px
+		height: {
+			type: [String, Number],
+			default: () => defProps.search.height
+		},
+		// 键盘弹起时，是否自动上推页面
+		adjustPosition: {
+			type: Boolean,
+			default: () => defProps.search.adjustPosition
+		},
+		// 键盘收起时，是否自动失去焦点
+		autoBlur: {
+			type: Boolean,
+			default: () => defProps.search.autoBlur
+		},
+		// 输入框的样式，对象形式
+		inputStyle: {
+			type: Object,
+			default: () => defProps.search.inputStyle
+		},
+		// 右侧控件的样式，对象形式
+		actionStyle: {
+			type: Object,
+			default: () => defProps.search.actionStyle
+		},
+		// 自定义样式，对象形式
+		customStyle: {
+			type: Object,
+			default: () => defProps.search.customStyle
+		}
+	}
+})
\ No newline at end of file
diff --git a/uview-plus/components/u-search/search.js b/uview-plus/components/u-search/search.js
index 8f393c8..5daf277 100644
--- a/uview-plus/components/u-search/search.js
+++ b/uview-plus/components/u-search/search.js
@@ -1,23 +1,24 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:19:45
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/search.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/search.js
  */
+import { t } from '../../libs/i18n'
 export default {
     // search
     search: {
         shape: 'round',
         bgColor: '#f2f2f2',
-        placeholder: '请输入关键字',
+        placeholder: t("up.search.placeholder"),
         clearabled: true,
         focus: false,
         showAction: true,
         actionStyle: {},
-        actionText: '搜索',
+        actionText: t("up.common.search"),
         inputAlign: 'left',
         inputStyle: {},
         disabled: false,
@@ -27,11 +28,14 @@ export default {
         color: '#606266',
         placeholderColor: '#909399',
         searchIcon: 'search',
+        iconPosition: 'left',
         margin: '0',
         animation: false,
         value: '',
         maxlength: '-1',
         height: 32,
-        label: null
+        label: null,
+        adjustPosition: true,
+        autoBlur: true
     }
 }
diff --git a/uview-plus/components/u-search/u-search.vue b/uview-plus/components/u-search/u-search.vue
index c052610..8a618b1 100644
--- a/uview-plus/components/u-search/u-search.vue
+++ b/uview-plus/components/u-search/u-search.vue
@@ -1,6 +1,7 @@
 <template>
 	<view
 	    class="u-search"
+		:class="[iconPosition === 'right' && 'u-search__reverse']"
 	    @tap="clickHandler"
 	    :style="[{
 			margin: margin,
@@ -20,16 +21,16 @@
 				</slot>
 			</template>
 			<view class="u-search__content__icon">
-				<u-icon
+				<up-icon
 					@tap="clickIcon"
 				    :size="searchIconSize"
 				    :name="searchIcon"
 				    :color="searchIconColor ? searchIconColor : color"
-				></u-icon>
+				></up-icon>
 			</view>
 			<input
 			    confirm-type="search"
-			    @blur="blur"
+			    @blur="blurFunc"
 			    :value="keyword"
 			    @confirm="search"
 			    @input="inputChange"
@@ -45,6 +46,7 @@
 			    class="u-search__content__input"
 			    type="text"
 			    :style="[{
+					pointerEvents: disabled ? 'none' : 'auto',
 					textAlign: inputAlign,
 					color: color,
 					backgroundColor: bgColor,
@@ -53,16 +55,17 @@
 			/>
 			<view
 			    class="u-search__content__icon u-search__content__close"
-			    v-if="keyword && clearabled && focused"
+			    v-if="isShowClear"
 			    @click="clear"
 			>
-				<u-icon
+				<up-icon
 				    name="close"
 				    size="11"
 				    color="#ffffff"
 					customStyle="line-height: 12px"
-				></u-icon>
+				></up-icon>
 			</view>
+            <slot name="inputRight"></slot>
 		</view>
 		<text
 		    :style="[actionStyle]"
@@ -81,7 +84,7 @@
 	/**
 	 * search 搜索框
 	 * @description 搜索组件，集成了常见搜索框所需功能，用户可以一键引入，开箱即用。
-	 * @tutorial https://ijry.github.io/uview-plus/components/search.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/search.html
 	 * @property {String}			shape				搜索框形状，round-圆形，square-方形（默认 'round' ）
 	 * @property {String}			bgColor				搜索框背景颜色（默认 '#f2f2f2' ）
 	 * @property {String}			placeholder			占位文字内容（默认 '请输入关键字' ）
@@ -99,14 +102,16 @@
 	 * @property {String}			color				输入框字体颜色（默认 '#606266' ）
 	 * @property {String}			placeholderColor	placeholder的颜色（默认 '#909399' ）
 	 * @property {String}			searchIcon			输入框左边的图标，可以为uView图标名称或图片路径  (默认 'search' )
+	 * @property {String}			iconPosition		输入框图标位置，left-左边, right-右边  (默认 'left' )
 	 * @property {String}			margin				组件与其他上下左右元素之间的距离，带单位的字符串形式，如"30px"   (默认 '0' )
 	 * @property {Boolean} 			animation			是否开启动画，见上方说明（默认 false ）
 	 * @property {String}			value				输入框初始值
 	 * @property {String | Number}	maxlength			输入框最大能输入的长度，-1为不限制长度  (默认 '-1' )
 	 * @property {String | Number}	height				输入框高度，单位px（默认 64 ）
 	 * @property {String | Number}	label				搜索框左边显示内容
-	 * @property {Boolean}	        adjustPosition	    键盘弹起时，是否自动上推页面	
-	 * @property {Boolean}	        autoBlur	        键盘收起时，是否自动失去焦点		
+	 * @property {Boolean}	        adjustPosition	    键盘弹起时，是否自动上推页面
+	 * @property {Boolean}	        autoBlur	        键盘收起时，是否自动失去焦点
+	 * @property {Boolean}	        onlyClearableOnFocused	是否仅在聚焦时显示清除控件（默认 true ）
 	 * @property {Object}			customStyle			定义需要用到的外部样式
 	 *
 	 * @event {Function} change 输入框内容发生变化时触发
@@ -121,7 +126,6 @@
 		data() {
 			return {
 				keyword: '',
-				showClear: false, // 是否显示右边的清除图标
 				show: false,
 				// 标记input当前状态是否处于聚焦中，如果是，才会显示右侧的清除控件
 				focused: this.focus
@@ -161,6 +165,18 @@
 		computed: {
 			showActionBtn() {
 				return !this.animation && this.showAction
+			},
+			// 是否显示清除控件
+			isShowClear() {
+				const { clearabled, focused, keyword, onlyClearableOnFocused } = this;
+				if (!clearabled) {
+					return false;
+				}
+				if (onlyClearableOnFocused) {
+					return !!focused && keyword !== "";
+				} else {
+					return keyword !== "";
+				}
 			}
 		},
 		emits: ['clear', 'search', 'custom', 'focus', 'blur', 'click', 'clickIcon', 'update:modelValue', 'change'],
@@ -204,7 +220,7 @@
 				this.$emit('focus', this.keyword);
 			},
 			// 失去焦点
-			blur() {
+			blurFunc() {
 				// 最开始使用的是监听图标@touchstart事件，自从hx2.8.4后，此方法在微信小程序出错
 				// 这里改为监听点击事件，手点击清除图标时，同时也发生了@blur事件，导致图标消失而无法点击，这里做一个延时
 				setTimeout(() => {
@@ -230,7 +246,6 @@
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
 $u-search-content-padding: 0 10px !default;
 $u-search-label-color: $u-main-color !default;
 $u-search-label-font-size: 14px !default;
@@ -327,5 +342,13 @@ $u-search-action-margin-left: 5px !default;
 			margin-left: $u-search-action-margin-left;
 		}
 	}
+
+	&__reverse &__content__icon {
+		order: 3;
+	}
+
+	&__reverse &__content__close {
+		order: 2;
+	}
 }
 </style>
diff --git a/uview-plus/components/u-section/section.js b/uview-plus/components/u-section/section.js
index f432648..d33780e 100644
--- a/uview-plus/components/u-section/section.js
+++ b/uview-plus/components/u-section/section.js
@@ -1,17 +1,18 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:07:33
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/section.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/section.js
  */
+import { t } from '../../libs/i18n'
 export default {
     // u-section组件
     section: {
         title: '',
-        subTitle: '更多',
+        subTitle: t("up.common.more"),
         right: true,
         fontSize: 15,
         bold: true,
diff --git a/uview-plus/components/u-select/u-select.vue b/uview-plus/components/u-select/u-select.vue
new file mode 100644
index 0000000..e71e22b
--- /dev/null
+++ b/uview-plus/components/u-select/u-select.vue
@@ -0,0 +1,224 @@
+<template>
+	<view class="u-select">
+		<view class="u-select__content">
+			<view class="u-select__label" @click="openSelect">
+				<slot name="text" :currentLabel="currentLabel">
+					<text class="u-select__text" v-if="showOptionsLabel">
+						{{ currentLabel }}
+					</text>
+					<text class="u-select__text" v-else>
+						{{ label }}
+					</text>
+				</slot>
+				<slot name="icon">
+					<up-icon name="arrow-down" :size="iconSize" :color="iconColor"></up-icon>
+				</slot>
+			</view>
+			<u-overlay
+				:show="isOpen"
+				@click="overlayClick"
+				v-if="overlay"
+				:zIndex="zIndex"
+				:duration="duration + 50"
+				:customStyle="overlayStyle"
+				:opacity="overlayOpacity"
+				@touchmove.stop.prevent="noop"
+			></u-overlay>
+			<view class="u-select__options__wrap"
+				:style="{ overflowY: 'auto', zIndex: zIndex + 1, left: optionsWrapLeft, right: optionsWrapRight, maxHeight: maxHeight}">
+				<view class="u-select__options" v-if="isOpen">
+					<slot name="options">
+						<view class="u-select__options_item"
+							:class="current == item[keyName] ? 'active': ''"
+							:key="index" v-for="(item, index) in options"
+							@click="selectItem(item)">
+							<slot name="optionItem" :item="item">
+								<text class="u-select__item_text" :style="{color: itemColor}"> 
+									{{item[labelName]}}
+								</text>
+							</slot>
+						</view>
+					</slot>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { mpMixin } from '../../libs/mixin/mpMixin';
+import { mixin } from '../../libs/mixin/mixin';
+import { getWindowInfo } from '../../libs/function/index';
+export default {
+	name:"up-select",
+	mixins: [mpMixin, mixin],
+	emits: ['update:current', 'select'],
+	props: {
+		maxHeight: {
+			type: String,
+			default: '90vh'
+		},
+		overlay: {
+			type: Boolean,
+			default: true
+		},
+		overlayOpacity: {
+			type: Number,
+			default: 0.01
+		},
+		overlayStyle: {
+			type: Object,
+			default: () => {
+				return {}
+			}
+		},
+		duration: {
+			type: Number,
+			default: 300
+		},
+		label: {
+			type: String,
+			default: '选项'
+		},
+		options: {
+			type: Array,
+			default: () => {
+				return []
+			}
+		},
+		keyName: {
+			type: String,
+			default: 'id'
+		},
+		labelName: {
+			type: String,
+			default: 'name'
+		},
+		showOptionsLabel: {
+			type: Boolean,
+			default: false
+		},
+		current: {
+			type: [String, Number],
+			default: ''
+		},
+		zIndex: {
+			type: Number,
+			default: 11000
+		},
+		itemColor: {
+			type: String,
+			default: '#333333'
+		},
+		iconColor: {
+			type: String,
+			default: ''
+		},
+		iconSize: {
+			type: [String],
+			default: '13px'
+		}
+	},
+	data() {
+		return {
+			isOpen: false,
+			optionsWrapLeft: 'auto',
+			optionsWrapRight: 'auto'
+		}
+	},
+	computed: {
+		currentLabel() {
+			let name = '';
+			this.options.forEach((ele) => {
+				if (ele[this.keyName] === this.current) {
+					name = ele[this.labelName];
+				}
+			});
+			return name;
+		}
+    },
+    methods: {
+      openSelect() {
+        this.isOpen = true;
+		this.$nextTick(() => {
+			if (this.isOpen) {
+				this.adjustOptionsWrapPosition();
+			}
+		});
+      },
+	  closeSelect() {
+		this.isOpen = false;
+	  },
+	  overlayClick() {
+		  this.isOpen = false;
+	  },
+      selectItem(item) {
+        this.isOpen = false;
+        this.$emit('update:current', item[this.keyName]);
+        this.$emit('select', item);
+      },
+	  adjustOptionsWrapPosition() {
+		let wi = getWindowInfo();
+		let windowWidth = wi.windowWidth;
+		this.$uGetRect('.u-select__options__wrap').then(rect => {
+			if (rect.left + rect.width > windowWidth) {
+				// 如果右侧被遮挡，则调整到左侧
+				this.optionsWrapLeft = 'auto';
+				this.optionsWrapRight = `0px`;
+			}
+		});
+	  }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+  .u-select__content {
+    position: relative;
+    .u-select__label {
+      display: flex;
+	  justify-content: space-between;
+      /* #ifdef H5 */
+      &:hover {
+        cursor: pointer;
+      }
+      /* #endif */
+    }
+    .u-select__text {
+      margin-right: 2px;
+    }
+	.u-select__options__wrap {
+		margin-bottom: 46px;
+		position: absolute;
+		top: 20px;
+		left: 0;
+	}
+    .u-select__options {
+      min-width: 100px;
+	  box-sizing: border-box;
+      border-radius: 4px;
+      border: 1px solid #f1f1f1;
+      background-color: #fff;
+      .u-select__options_item {
+        padding: 10px 12px;
+		box-sizing: border-box;
+        width: 100%;
+        height: 100%;
+        &:hover {
+          background-color: #f7f7f7;
+        }
+        /* #ifdef H5 */
+        &:hover {
+          cursor: pointer;
+        }
+        .u-select__item_text {
+          &:hover {
+            cursor: pointer;
+          }
+        }
+        /* #endif */
+      }
+    }
+  }
+</style>
+
diff --git a/uview-plus/components/u-short-video/u-short-video.vue b/uview-plus/components/u-short-video/u-short-video.vue
new file mode 100644
index 0000000..b755043
--- /dev/null
+++ b/uview-plus/components/u-short-video/u-short-video.vue
@@ -0,0 +1,463 @@
+<template>
+	<view class="u-short-video">
+		<!-- 顶部导航区域 -->
+		<view class="u-short-video__header">
+			<slot name="menu">
+				<view class="u-short-video__header__menu">
+					<up-icon name="grid" size="24"></up-icon>
+				</view>
+			</slot>
+			
+			<up-tabs 
+				:list="tabsList" 
+				:current="currentTab"
+                lineColor="#ddd"
+                :activeStyle="{
+                    color: '#ddd',
+                    fontWeight: 400,
+                    transform: 'scale(1)'
+                }"
+                :inactiveStyle="{
+                    color: '#bbb',
+                    transform: 'scale(1)'
+                }"
+				@change="handleTabChange"
+				class="u-short-video__header__tabs"
+			></up-tabs>
+			
+			<slot name="search">
+				<view class="u-short-video__header__search">
+					<up-icon name="search" size="24"></up-icon>
+				</view>
+			</slot>
+		</view>
+		
+		<!-- 视频内容区域 -->
+		<swiper 
+			:vertical="true" 
+			:autoplay="false" 
+			@change="handleSwiperChange"
+			:current="currentVideo"
+			class="u-short-video__content"
+		>
+			<swiper-item v-for="(item, index) in videoList" :key="index">
+				<view class="u-short-video__content__item">
+					<!-- 视频播放区域 -->
+					<view class="u-short-video__content__video">
+						<video 
+							:id="'video-' + index"
+							:src="item.videoUrl" 
+							:autoplay="index === currentVideo" 
+							:controls="false"
+							:show-fullscreen-btn="false"
+							:show-play-btn="false"
+							:show-center-play-btn="false"
+							:enable-progress-gesture="true"
+							:loop="true"
+							:playback-rate="item.playbackRate || 1.0"
+							@play="onVideoPlay"
+							@pause="onVideoPause"
+							@ended="onVideoEnded"
+							@timeupdate="onTimeUpdate"
+							@loadedmetadata="onLoadedMetadata"
+							style="width: 100%; height: 100%;"
+						></video>
+						
+						<!-- 倍速设置按钮 -->
+						<!-- <view class="u-short-video__content__video__speed" @click="showSpeedOptions(index)">
+							<text class="speed-text">{{ item.playbackRate || 1.0 }}x</text>
+							<up-icon name="arrow-down" size="12" color="#fff"></up-icon>
+						</view> -->
+					</view>
+					
+					<!-- 作者信息 -->
+					<view class="u-short-video__content__author">
+						<view class="u-short-video__content__author__avatar">
+							<u-avatar :src="item.author.avatar" size="50px"></u-avatar>
+						</view>
+						<view class="u-short-video__content__author__info">
+							<text class="u-short-video__content__author__name">{{ item.author.name }}</text>
+							<text class="u-short-video__content__author__desc">{{ item.author.desc }}</text>
+						</view>
+						<view class="u-short-video__content__author__follow">
+							<up-button type="primary" size="mini">关注</up-button>
+						</view>
+					</view>
+					
+					<!-- 右侧操作区域 -->
+					<view class="u-short-video__content__actions">
+						<slot name="actions" :item="item" :index="index">
+							<view class="u-short-video__content__actions__item" @click="handleLike(item, index)">
+								<up-icon color="#eee" :name="item.isLiked ? 'thumb-up-fill' : 'thumb-up'" size="32px"></up-icon>
+								<text class="u-short-video__content__actions__text">{{ item.likeCount }}</text>
+							</view>
+							<view class="u-short-video__content__actions__item" @click="handleComment(item, index)">
+								<up-icon color="#eee" name="chat" size="32px"></up-icon>
+								<text class="u-short-video__content__actions__text">{{ item.commentCount }}</text>
+							</view>
+							<view class="u-short-video__content__actions__item" @click="handleShare(item, index)">
+								<up-icon color="#eee" name="share" size="32px"></up-icon>
+								<text class="u-short-video__content__actions__text">{{ item.shareCount }}</text>
+							</view>
+							<view class="u-short-video__content__actions__item" @click="handleCollect(item, index)">
+								<up-icon color="#eee" :name="item.isCollected ? 'bookmark-fill' : 'bookmark'" size="32px"></up-icon>
+								<text class="u-short-video__content__actions__text">{{ item.collectCount }}</text>
+							</view>
+						</slot>
+					</view>
+				</view>
+			</swiper-item>
+		</swiper>
+		
+		<!-- 倍速选择弹窗 -->
+		<up-action-sheet
+			:show="showSpeedSheet"
+			:actions="speedOptions"
+			title="播放速度"
+			@close="showSpeedSheet = false"
+			@select="selectSpeed"
+		></up-action-sheet>
+		
+		<!-- 底部导航栏 -->
+		<view class="u-short-video__footer">
+			<!-- 进度条 -->
+			<view class="u-short-video__progress" style="z-index: 999;">
+				<up-slider 
+					:value="videoList[currentVideo]?.progress" 
+					:min="0" 
+					:max="100" 
+					:step="1"
+					:show-value="false"
+                    :innerStyle="{padding: 0}"
+                    activeColor="rgba(255,255,255,0.32)"
+					inactive-color="rgba(255,255,255,0.3)"
+					block-size="6px"
+                    block-color="rgba(255,255,255,0.5)"
+					height="1px"
+					@changing="onProgressChanging"
+					@change="onProgressChange"
+				></up-slider>
+			</view>
+			
+			<slot name="tabbar">
+				<up-tabbar
+                    :fixed="true"
+                    :placeholder="true"
+                    :safeAreaInsetBottom="true"
+                    borderColor="rgba(255,255,255,0.25) !important"
+                    backgroundColor="rgba(255,255,255,0.05)"
+                >
+				<up-tabbar-item
+					@click="goNext"
+					text="首页"
+					icon="home"
+				>
+				</up-tabbar-item>
+				<up-tabbar-item
+					text="放映厅"
+					icon="photo"
+				></up-tabbar-item>
+				<up-tabbar-item
+					text="直播"
+					icon="play-right"
+				></up-tabbar-item>
+				<up-tabbar-item
+					text="我的"
+					icon="account"
+				></up-tabbar-item>
+			</up-tabbar>
+			</slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'u-short-video',
+		props: {
+			// tabs标签列表
+			tabsList: {
+				type: Array,
+				default: () => [
+					{ name: '推荐' },
+					{ name: '关注' },
+					{ name: '朋友' },
+					{ name: '本地' }
+				]
+			},
+			// 视频列表数据
+			videoList: {
+				type: Array,
+				default: () => []
+			},
+			// 当前选中的tab索引
+			currentTab: {
+				type: Number,
+				default: 0
+			},
+			// 当前播放的视频索引
+			currentVideo: {
+				type: Number,
+				default: 0
+			}
+		},
+		data() {
+			return {
+				progressValue: 0,
+				showSpeedSheet: false,
+				currentSpeedVideoIndex: 0,
+				speedOptions: [
+					{ name: '0.5x', value: 0.5 },
+					{ name: '0.75x', value: 0.75 },
+					{ name: '1.0x', value: 1.0 },
+					{ name: '1.25x', value: 1.25 },
+					{ name: '1.5x', value: 1.5 },
+					{ name: '2.0x', value: 2.0 }
+				]
+			}
+		},
+		methods: {
+			// 处理tab切换
+			handleTabChange(index) {
+				this.$emit('tabChange', index);
+			},
+			// 处理swiper切换
+			handleSwiperChange(e) {
+				const currentIndex = e.detail.current;
+				// 暂停当前播放的视频
+				this.pauseCurrentVideo();
+				// 播放新切换到的视频
+				this.$nextTick(() => {
+					this.playVideo(currentIndex);
+				});
+				this.$emit('videoChange', currentIndex);
+			},
+			// 处理点赞
+			handleLike(item, index) {
+				this.$emit('like', { item, index });
+			},
+			// 处理评论
+			handleComment(item, index) {
+				this.$emit('comment', { item, index });
+			},
+			// 处理分享
+			handleShare(item, index) {
+				this.$emit('share', { item, index });
+			},
+			// 处理收藏
+			handleCollect(item, index) {
+				this.$emit('collect', { item, index });
+			},
+			// 进度条拖动中
+			onProgressChanging(value) {
+				// 更新当前视频的进度值
+				if (this.videoList[this.currentVideo]) {
+					this.videoList[this.currentVideo]['progressValue'] = value.detail.value
+				}
+				this.$emit('progressChanging', {
+					progress: value.detail.value,
+					index: this.currentVideo
+				});
+			},
+			// 进度条值改变
+			onProgressChange(value) {
+				// 更新当前视频的进度值
+				if (this.videoList[this.currentVideo]) {
+					this.$set(this.videoList[this.currentVideo], 'progressValue', value.detail.value);
+				}
+				this.$emit('progressChange', {
+					progress: value.detail.value,
+					index: this.currentVideo
+				});
+			},
+			// 显示倍速选项
+			showSpeedOptions(index) {
+				this.currentSpeedVideoIndex = index;
+				this.showSpeedSheet = true;
+			},
+			// 选择倍速
+			selectSpeed(action) {
+				const videoContext = uni.createVideoContext('video-' + this.currentSpeedVideoIndex, this);
+				videoContext.playbackRate(action.value);
+				
+				// 更新视频倍速数据
+				this.$set(this.videoList[this.currentSpeedVideoIndex], 'playbackRate', action.value);
+				this.showSpeedSheet = false;
+			},
+			// 播放指定索引的视频
+			playVideo(index) {
+				const videoContext = uni.createVideoContext('video-' + index, this);
+				videoContext.play();
+			},
+			// 暂停当前视频
+			pauseCurrentVideo() {
+				const videoContext = uni.createVideoContext('video-' + this.currentVideo, this);
+				videoContext.pause();
+			},
+			// 视频播放事件
+			onVideoPlay(e) {
+				this.$emit('videoPlay', { index: this.currentVideo, event: e });
+			},
+			// 视频暂停事件
+			onVideoPause(e) {
+				this.$emit('videoPause', { index: this.currentVideo, event: e });
+			},
+			// 视频结束事件
+			onVideoEnded(e) {
+				this.$emit('videoEnded', { index: this.currentVideo, event: e });
+			},
+			// 视频时间更新事件
+			onTimeUpdate(e) {
+				const progress = (e.detail.currentTime / e.detail.duration) * 100;
+				if (this.videoList[this.currentVideo]) {
+					this.$set(this.videoList[this.currentVideo], 'progress', progress);
+				}
+				this.$emit('timeUpdate', { index: this.currentVideo, event: e });
+			},
+			// 视频元数据加载完成事件
+			onLoadedMetadata(e) {
+				this.$emit('loadedMetadata', { index: this.currentVideo, event: e });
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.u-short-video {
+		width: 100%;
+		height: 100vh;
+		position: relative;
+		
+		&__header {
+			position: absolute;
+			top: 0;
+			left: 0;
+			right: 0;
+			z-index: 10;
+			display: flex;
+            flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			padding: 10px 15px;
+			background-color: rgba(255, 255, 255, 0.05);
+            opacity: 1;
+			
+			&__menu, &__search {
+				width: 40px;
+				height: 40px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				color: #fff;
+			}
+			
+			&__tabs {
+				flex: 1;
+				margin: 0 10px;
+			}
+		}
+		
+		&__content {
+			width: 100%;
+			height: 100%;
+			
+			&__item {
+				width: 100%;
+				height: 100%;
+				position: relative;
+			}
+			
+			&__video {
+				width: 100%;
+				height: 100%;
+				position: relative;
+				
+				&__speed {
+					position: absolute;
+					top: 15px;
+					right: 15px;
+					z-index: 10;
+					background-color: rgba(0, 0, 0, 0.3);
+					border-radius: 20px;
+					padding: 5px 10px;
+					display: flex;
+					align-items: center;
+					
+					.speed-text {
+						color: #fff;
+						font-size: 12px;
+						margin-right: 4px;
+					}
+				}
+			}
+			
+			&__author {
+				position: absolute;
+				left: 15px;
+				bottom: 100px;
+				display: flex;
+                flex-direction: row;
+				align-items: center;
+				z-index: 10;
+				
+				&__info {
+					margin-left: 10px;
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+				}
+
+                &__name {
+						color: #eee;
+						font-size: 16px;
+						font-weight: bold;
+						margin-bottom: 5px;
+					}
+					
+					&__desc {
+						color: rgba(255, 255, 255, 0.8);
+						font-size: 14px;
+					}
+				
+				&__follow {
+					margin-left: 15px;
+				}
+			}
+			
+			&__actions {
+				position: absolute;
+				right: 15px;
+				bottom: 100px;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				z-index: 10;
+				
+				&__item {
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					margin-bottom: 20px;
+					color: #fff;
+				}
+				
+				&__text {
+					color: #fff;
+					font-size: 12px;
+					margin-top: 5px;
+				}
+			}
+		}
+		
+		&__footer {
+			position: absolute;
+			bottom: 0;
+			left: 0;
+			right: 0;
+			z-index: 10;
+		}
+		
+		&__progress {
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uview-plus/components/u-signature/u-signature.vue b/uview-plus/components/u-signature/u-signature.vue
new file mode 100644
index 0000000..d76ba34
--- /dev/null
+++ b/uview-plus/components/u-signature/u-signature.vue
@@ -0,0 +1,486 @@
+<template>
+	<view class="u-signature">
+		<view class="u-signature__canvas-wrap" :style="{background: bgColor}">
+			<up-canvas 
+				ref="signatureCanvas"
+				:canvas-id="canvasId"
+				:width="canvasWidth"
+				:height="canvasHeight"
+				:bg-color="bgColor"
+				@touchstart="touchStart" 
+				@touchmove="touchMove" 
+				@touchend="touchEnd"
+				:disable-scroll="true"
+				class="u-signature__canvas"
+				:style="{
+					width: canvasWidth + 'px',
+					height: canvasHeight + 'px',
+				}">
+			</up-canvas>
+		</view>
+		
+		<view v-if="showToolbar" class="u-signature__toolbar">
+			<view class="u-signature__toolbar-icons u-flex u-flex-x">
+				<view class="u-signature__toolbar-icon" @click="undo">
+					<up-icon name="arrow-left" size="22" :color="pathStack.length === 0 ? '#ccc' : '#999'"></up-icon>
+				</view>
+				<view class="u-signature__toolbar-icon" @click="clear">
+					<up-icon name="trash" size="25" color="#999"></up-icon>
+				</view>
+				<view class="u-signature__toolbar-icon" @click="toggleBrushSettings">
+					<up-icon name="edit-pen" size="25" color="#999"></up-icon>
+				</view>
+				<view class="u-signature__toolbar-icon" @click="toggleColorSettings">
+					<up-icon name="grid" size="24" color="#999"></up-icon>
+				</view>
+				<view class="u-signature__toolbar-icon" @click="exportSignature">
+					<up-icon name="checkmark" size="25" :color="isEmpty ? '#ccc' : '#999'"></up-icon>
+				</view>
+			</view>
+			
+			<!-- 笔画设置 -->
+			<view v-if="showBrushSettings" class="u-signature__brush-settings">
+				<view class="u-signature__progress">
+					<text class="u-signature__progress-label">{{ t("up.signature.penSize") }}:</text>
+					<up-slider 
+						v-model="lineWidth" 
+						:min="1" 
+						:max="20" 
+						:step="1"
+						@show-value="true"
+						:value-show="(lineWidth)"
+					></up-slider>
+				</view>
+			</view>
+			
+			<!-- 颜色设置 -->
+			<view v-if="showColorSettings" class="u-signature__color-settings">
+				<view class="u-signature__color-picker">
+                    <text class="u-signature__color-label">{{ t("up.signature.penColor") }}:</text>
+					<view class="u-signature__colors">
+						<view 
+							v-for="(color, index) in presetColors" 
+							:key="index"
+							class="u-signature__color-item"
+							:class="{'u-signature__color-item--active': lineColor === color}"
+							:style="{ backgroundColor: color }"
+							@click="selectColor(color)"
+						></view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { t } from '../../libs/i18n'
+	export default {
+		name: 'u-signature',
+		props: {
+			// 画布宽度
+			width: {
+				type: [String, Number],
+				default: 300
+			},
+			// 画布高度
+			height: {
+				type: [String, Number],
+				default: 200
+			},
+			// 背景颜色
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			// 默认笔画颜色
+			color: {
+				type: String,
+				default: '#000000'
+			},
+			// 默认笔画粗细
+			thickness: {
+				type: [String, Number],
+				default: 3
+			},
+			// 是否显示工具栏
+			showToolbar: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				canvasId: 'u-signature-' + Math.random().toString(36).substr(2, 9),
+				canvasWidth: 300,
+				canvasHeight: 200,
+				lineColor: '#000000',
+				lineWidth: 3,
+				isDrawing: false,
+				pathStack: [], // 存储绘制路径用于回退
+				currentPath: [], // 当前绘制路径
+				isEmpty: true,
+				presetColors: [
+					'#000000', // 黑色
+					'#ff0000', // 红色
+					'#00ff00', // 绿色
+					'#0000ff', // 蓝色
+					'#ffff00', // 黄色
+					'#00ffff', // 青色
+					'#ff00ff', // 紫色
+					'#ffffff'  // 白色
+				],
+				showBrushSettings: false,
+				showColorSettings: false,
+				lastPoint: null, // 保存上一个点的坐标
+				canvasInstance: null // 缓存canvas实例
+			}
+		},
+		mounted() {
+			// 初始化时获取canvas实例
+			this.$nextTick(() => {
+				this.getCanvasInstance();
+				this.clearCanvas();
+			});
+		},
+		watch: {
+			width: {
+				handler(newVal) {
+					this.canvasWidth = Number(newVal)
+				},
+				immediate: true
+			},
+			height: {
+				handler(newVal) {
+					this.canvasHeight = Number(newVal)
+				},
+				immediate: true
+			},
+			color: {
+				handler(newVal) {
+					this.lineColor = newVal
+				},
+				immediate: true
+			},
+			thickness: {
+				handler(newVal) {
+					this.lineWidth = Number(newVal)
+				},
+				immediate: true
+			}
+		},
+		methods: {
+			t,
+			
+			// 获取签名画布实例
+			getCanvasInstance() {
+				if (this.canvasInstance) {
+					return this.canvasInstance;
+				}
+				
+				const canvasRef = this.$refs.signatureCanvas;
+				if (canvasRef) {
+					this.canvasInstance = canvasRef;
+					return canvasRef;
+				}
+				return null;
+			},
+			
+			touchStart(e) {
+				if (!this.canvasInstance || !this.canvasInstance.ctx) {
+					this.getCanvasInstance();
+				}
+				
+				if (!this.canvasInstance || !this.canvasInstance.ctx) return;
+				
+				this.isDrawing = true;
+				this.isEmpty = false;
+				this.currentPath = [];
+				
+				const { x, y } = this.getCanvasPoint(e);
+				
+				// 设置线条样式
+				this.canvasInstance.setLineStyle(this.lineColor, this.lineWidth);
+				
+				// 开始路径
+				this.canvasInstance.beginPath();
+				this.canvasInstance.moveTo(x, y);
+				
+				// 记录起始点
+				this.currentPath.push({
+					x,
+					y,
+					type: 'start',
+					color: this.lineColor,
+					width: this.lineWidth
+				});
+				
+				// 保存上一个点
+				this.lastPoint = { x, y };
+				
+				// 阻止默认事件以提高性能
+				e.preventDefault();
+			},
+			
+			touchMove(e) {
+				if (!this.isDrawing || !this.canvasInstance || !this.canvasInstance.ctx) return;
+				
+				// 阻止默认事件以提高性能
+				e.preventDefault();
+				
+				const { x, y } = this.getCanvasPoint(e);
+				
+				// 从上一个点画线到当前点
+				this.canvasInstance.lineTo(x, y);
+				this.canvasInstance.stroke(); // 实时绘制当前线段
+				this.currentPath.push({
+					x,
+					y,
+					type: 'move'
+				});
+				this.canvasInstance.draw(false);
+				
+				// 更新上一个点
+				this.lastPoint = { x, y };
+			},
+			
+			touchEnd(e) {
+				if (!this.isDrawing || !this.canvasInstance || !this.canvasInstance.ctx) return;
+				
+				this.isDrawing = false;
+				this.canvasInstance.closePath();
+				this.lastPoint = null;
+				
+				// 将当前路径加入栈中用于回退
+				if (this.currentPath.length > 0) {
+					this.pathStack.push([...this.currentPath]);
+				}
+				
+				// 最后统一执行一次绘制
+				this.canvasInstance.draw(true);
+			},
+			
+			// 同步获取canvas坐标点（兼容处理）
+			getCanvasPoint(e) {
+				// #ifdef MP-WEIXIN
+				const touch = e.touches && e.touches[0] ? e.touches[0] : e.mp.touches[0];
+				// #endif
+				// #ifndef MP-WEIXIN
+				const touch = e.touches[0];
+				// #endif
+				
+				// 计算相对于canvas的坐标
+				// 由于无法直接获取canvas位置，这里简化处理
+				// 实际应用中可能需要通过uni.createSelectorQuery获取canvas位置
+				return {
+					x: touch.x,
+					y: touch.y
+				};
+			},
+			
+			// 选择颜色
+			selectColor(color) {
+				this.lineColor = color
+			},
+			
+			// 回退操作
+			undo() {
+				if (this.pathStack.length === 0) return
+				
+				// 弹出最后一个路径
+				this.pathStack.pop()
+				
+				// 重新绘制
+				this.redraw()
+			},
+			
+			// 重新绘制所有路径
+			redraw() {
+				if (!this.canvasInstance) {
+					this.getCanvasInstance();
+				}
+				
+				if (!this.canvasInstance) return;
+				
+				// 先清空画布
+				this.canvasInstance.clearCanvas();
+				
+				if (this.pathStack.length === 0) {
+					this.isEmpty = true;
+					return;
+				}
+				
+				this.isEmpty = false;
+				
+				// 逐个绘制路径
+				this.pathStack.forEach(path => {
+					if (path.length === 0) return;
+					
+					this.canvasInstance.beginPath();
+					
+					let lastPoint = null;
+					path.forEach((point, index) => {
+						if (index === 0 && point.type === 'start') {
+							// 设置线条样式
+							this.canvasInstance.setLineStyle(point.color, point.width);
+							this.canvasInstance.moveTo(point.x, point.y);
+							lastPoint = { x: point.x, y: point.y };
+						} else if (point.type === 'move') {
+							this.canvasInstance.lineTo(point.x, point.y);
+							lastPoint = { x: point.x, y: point.y };
+						}
+					});
+					this.canvasInstance.stroke();
+					this.canvasInstance.draw(true);
+				});
+			},
+			
+			// 清空画布内容
+			clearCanvas() {
+				if (!this.canvasInstance) {
+					this.getCanvasInstance();
+				}
+				
+				if (!this.canvasInstance) return;
+				
+				this.canvasInstance.clearCanvas();
+			},
+			
+			// 导出签名图片
+			async exportSignature() {
+				if (this.isEmpty) {
+					console.warn('签名为空，无法导出');
+					return;
+				}
+				
+				if (!this.canvasInstance) {
+					this.getCanvasInstance();
+				}
+				
+				if (!this.canvasInstance) {
+					console.error('无法获取画布实例');
+					return;
+				}
+				
+				try {
+					// 先重绘整个签名内容
+					this.redraw();
+					
+					// 导出图片
+					const imagePath = await this.canvasInstance.exportImage('png', 1);
+					this.$emit('confirm', imagePath);
+				} catch (error) {
+					console.error('导出签名图片失败:', error);
+					this.$emit('error', error);
+				}
+			},
+			
+			// 切换笔画设置显示
+			toggleBrushSettings() {
+				this.showBrushSettings = !this.showBrushSettings;
+				if (this.showBrushSettings) {
+					this.showColorSettings = false;
+				}
+			},
+			
+			// 切换颜色设置显示
+			toggleColorSettings() {
+				this.showColorSettings = !this.showColorSettings;
+				if (this.showColorSettings) {
+					this.showBrushSettings = false;
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.u-signature {
+		display: flex;
+		flex-direction: column;
+		
+		&__canvas-wrap {
+			border: 1px solid #e0e0e0;
+			border-radius: 4px;
+			overflow: hidden;
+		}
+		
+		&__canvas {
+			width: 100%;
+			height: 100%;
+		}
+		
+		&__toolbar {
+			margin-top: 5px;
+            background-color: #fff;
+		}
+		
+		&__toolbar-icons {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 1px 0;
+			// border: 1px solid #e0e0e0;
+			border-radius: 4px;
+		}
+		
+		&__toolbar-icon {
+			padding: 5px;
+		}
+		
+		&__brush-settings,
+		&__color-settings {
+			margin-top: 15px;
+			padding: 1px;
+			// border: 1px solid #e0e0e0;
+			border-radius: 4px;
+		}
+		
+		&__progress {
+			&-label {
+				display: block;
+				margin-bottom: 10px;
+				font-size: 14px;
+				color: #999;
+			}
+		}
+		
+		&__color-picker {
+			margin-bottom: 10px;
+		}
+		
+		&__color-label {
+			display: block;
+			margin-bottom: 10px;
+			font-size: 14px;
+			color: #999;
+		}
+		
+		&__colors {
+			display: flex;
+            flex-direction: row;
+			flex-wrap: wrap;
+			gap: 10px;
+		}
+		
+		&__color-item {
+			width: 30px;
+			height: 30px;
+			border-radius: 50%;
+			border: 2px solid #f0f0f0;
+			cursor: pointer;
+			
+			&--active {
+				border-color: #2979ff;
+				transform: scale(1.1);
+			}
+		}
+		
+		&__actions {
+			display: flex;
+            flex-direction: row;
+			gap: 10px;
+			justify-content: center;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uview-plus/components/u-skeleton/skeleton.js b/uview-plus/components/u-skeleton/skeleton.js
index 83b777d..6b421a9 100644
--- a/uview-plus/components/u-skeleton/skeleton.js
+++ b/uview-plus/components/u-skeleton/skeleton.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:20:14
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/skeleton.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/skeleton.js
  */
 export default {
     // skeleton
diff --git a/uview-plus/components/u-skeleton/u-skeleton.vue b/uview-plus/components/u-skeleton/u-skeleton.vue
index a34e806..3716edd 100644
--- a/uview-plus/components/u-skeleton/u-skeleton.vue
+++ b/uview-plus/components/u-skeleton/u-skeleton.vue
@@ -62,7 +62,7 @@
 	/**
 	 * Skeleton 骨架屏
 	 * @description 骨架屏一般用于页面在请求远程数据尚未完成时，页面用灰色块预显示本来的页面结构，给用户更好的体验。
-	 * @tutorial https://ijry.github.io/uview-plus/components/skeleton.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/skeleton.html
 	 * @property {Boolean}					loading		是否显示骨架占位图，设置为false将会展示子组件内容 (默认 true )
 	 * @property {Boolean}					animate		是否开启动画效果 (默认 true )
 	 * @property {String | Number}			rows		段落占位图行数 (默认 0 )
@@ -187,7 +187,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	@mixin background {
 		/* #ifdef APP-NVUE */
diff --git a/uview-plus/components/u-slider/props.js b/uview-plus/components/u-slider/props.js
index b950f31..8e0ff14 100644
--- a/uview-plus/components/u-slider/props.js
+++ b/uview-plus/components/u-slider/props.js
@@ -82,10 +82,29 @@ export const props = defineMixin({
             type: Boolean,
             default: () => defProps.slider.useNative
         },
-        // 滑块高度
+        // 滑块厚度
         height: {
             type: String,
             default: () => defProps.slider.height
+        },
+        innerStyle: {
+            type: Object,
+            default: () => defProps.slider.innerStyle
+        },
+        // 是否垂直方向
+        vertical: {
+            type: Boolean,
+            default: defProps.slider.vertical
+        },
+        // 滑块粗细，为了支持垂直模式下统一粗细参数，用size代替height。
+        size: {
+            type: [Number, String],
+            default: () => defProps.slider.size
+        },
+        // 滑块长度，水平和垂直模式的长度。
+        length: {
+            type: [Number, String],
+            default: 'auto'
         }
     }
-})
+})
\ No newline at end of file
diff --git a/uview-plus/components/u-slider/slider.js b/uview-plus/components/u-slider/slider.js
index 4e3a31a..05a0716 100644
--- a/uview-plus/components/u-slider/slider.js
+++ b/uview-plus/components/u-slider/slider.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:08:25
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/slider.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/slider.js
  */
 export default {
     // slider组件
@@ -22,6 +22,10 @@ export default {
 		disabled:false,
         blockStyle: {},
         useNative: false,
-        height: '2px'
+        height: '',
+        innerStyle: {},
+        vertical: false,
+        size: '2px',
+        length: 'auto'
     }
-}
+}
\ No newline at end of file
diff --git a/uview-plus/components/u-slider/u-slider.vue b/uview-plus/components/u-slider/u-slider.vue
index 1d11fcc..6d87fc6 100644
--- a/uview-plus/components/u-slider/u-slider.vue
+++ b/uview-plus/components/u-slider/u-slider.vue
@@ -1,21 +1,20 @@
 <template>
 	<view
 		class="u-slider"
-		:style="[addStyle(customStyle)]"
+		:style="[addStyle(customStyle), {width: vertical ? addUnit(this.blockSize): ''}]"
 	>
 		<template v-if="!useNative || isRange">
 			<view ref="u-slider-inner" class="u-slider-inner" @click="onClick"
 				@onTouchStart="onTouchStart2($event, 1)" @touchmove="onTouchMove2($event, 1)"
 				@touchend="onTouchEnd2($event, 1)" @touchcancel="onTouchEnd2($event, 1)"
-				:class="[disabled ? 'u-slider--disabled' : '']" :style="{
-					height: (isRange && showValue) ? (getPx(blockSize) + 24) + 'px' : (getPx(blockSize)) + 'px',
-				}"
+				:class="[disabled ? 'u-slider--disabled' : '']" :style="innerStyleCpu"
 			>
 				<view ref="u-slider__base"
 					class="u-slider__base"
 					:style="[
 						{
-							height: height,
+							width: vertical ? addUnit(sizeLocal) : addUnit(length),
+							height: vertical ? addUnit(length) : addUnit(sizeLocal),
 							backgroundColor: inactiveColor
 						}
 					]"
@@ -27,8 +26,6 @@
 					:style="[
 						barStyle,
 						{
-							height: height,
-							marginTop: '-' + height,
 							backgroundColor: activeColor
 						}
 					]"
@@ -39,8 +36,6 @@
 					:style="[
 						barStyle0,
 						{
-							height: height,
-							marginTop: '-' + height,
 							backgroundColor: inactiveColor
 						}
 					]"
@@ -57,8 +52,8 @@
 				<template v-if="isRange">
 					<view class="u-slider__button-wrap u-slider__button-wrap-0" @touchstart="onTouchStart($event, 0)"
 						@touchmove="onTouchMove($event, 0)" @touchend="onTouchEnd($event, 0)"
-						@touchcancel="onTouchEnd($event, 0)" :style="{left: (getPx(barStyle0.width) + getPx(blockSize)/2) + 'px'}">
-						<slot v-if="$slots.default  || $slots.$default"/>
+						@touchcancel="onTouchEnd($event, 0)" :style="touchButtonStyle(barStyle0)">
+						<slot name="min" v-if="$slots.min || $slots.$min"/>
 						<view v-else class="u-slider__button" :style="[blockStyle, {
 							height: getPx(blockSize, true),
 							width: getPx(blockSize, true),
@@ -68,8 +63,9 @@
 				</template>
 				<view class="u-slider__button-wrap" @touchstart="onTouchStart"
 					@touchmove="onTouchMove" @touchend="onTouchEnd"
-					@touchcancel="onTouchEnd" :style="{left: (getPx(barStyle.width) + getPx(blockSize)/2) + 'px'}">
-					<slot v-if="$slots.default  || $slots.$default"/>
+					@touchcancel="onTouchEnd" :style="touchButtonStyle(barStyle)">
+					<slot name="max" v-if="isRange && ($slots.max || $slots.$max)"/>
+					<slot v-else-if="$slots.default || $slots.$default"/>
 					<view v-else class="u-slider__button" :style="[blockStyle, {
 						height: getPx(blockSize, true),
 						width: getPx(blockSize, true),
@@ -77,7 +73,9 @@
 					}]"></view>
 				</view>
 			</view>
-			<view class="u-slider__show-value" v-if="showValue && !isRange">{{ modelValue }}</view>
+			<view class="u-slider__show-value" v-if="showValue && !isRange">
+				{{ modelValue }}
+			</view>
 		</template>
 		<slider
 			class="u-slider__native"
@@ -99,10 +97,10 @@
 </template>
 
 <script>
-	import { props } from './props';
-	import { mpMixin } from '../../libs/mixin/mpMixin';
-	import { mixin } from '../../libs/mixin/mixin';
-	import { addStyle, getPx, sleep } from '../../libs/function/index.js';
+	import { props } from './props'
+	import { mpMixin } from '../../libs/mixin/mpMixin'
+	import { mixin } from '../../libs/mixin/mixin'
+	import { addUnit, addStyle, getPx, sleep } from '../../libs/function/index.js'
 	// #ifdef APP-NVUE
 	const dom = uni.requireNativePlugin('dom')
 	// #endif
@@ -131,34 +129,91 @@
 		data() {
 			return {
 				startX: 0,
+				startY: 0,
 				status: 'end',
 				newValue: 0,
 				distanceX: 0,
+				distanceY: 0,
 				startValue0: 0,
 				startValue: 0,
 				barStyle0: {},
 				barStyle: {},
 				sliderRect: {
 					left: 0,
-					width: 0
-				}
+					top: 0,
+					width: 0,
+					height: 0
+				},
+				sizeLocal: '2px'
 			};
 		},
 		watch: {
 			// #ifdef VUE3
 			modelValue(n) {
 				// 只有在非滑动状态时，才可以通过value更新滑块值，这里监听，是为了让用户触发
-				if(this.status == 'end') this.updateValue(this.modelValue, false);
+				if (this.status == 'end') {
+					const $crtFmtValue = this.updateValue(this.modelValue, false);
+					this.$emit('change', $crtFmtValue);
+				}
 			},
 			// #endif
 			// #ifdef VUE2
 			value(n) {
 				// 只有在非滑动状态时，才可以通过value更新滑块值，这里监听，是为了让用户触发
-				if(this.status == 'end') this.updateValue(this.value, false);
-			}
+				if (this.status == 'end') {
+					const $crtFmtValue = this.updateValue(this.value, false);
+					this.$emit('change', $crtFmtValue);
+				}
+			},
 			// #endif
+			rangeValue:{
+            	handler(n){
+					if (this.status == 'end') {
+						this.updateValue(this.rangeValue[0], false, 0);
+						this.updateValue(this.rangeValue[1], false, 1);
+						this.$emit('change', this.rangeValue);
+					}
+            	},
+            	deep:true
+        	}
 		},
-		created() {
+		mounted() {
+			if (this.height != '') {
+				this.sizeLocal = val
+			} else {
+				this.sizeLocal = this.size
+			}
+		},
+		computed: {
+			touchButtonStyle() {
+				return (barStyle) => {
+					let style = {}
+					if (this.blockSize) {
+						if (this.vertical) {
+							style.top = (getPx(barStyle.height) ) + 'px'
+						} else {
+							if (barStyle.width) {
+								style.left = (getPx(barStyle.width) + getPx(this.blockSize)/2) + 'px'
+								// console.log(style)
+							}
+						}
+					}
+					return style
+				}
+			},
+			innerStyleCpu() {
+				let style = {...this.innerStyle};
+				if (this.vertical) {
+					style.flexDirection = 'row'
+					style.height = this.length
+					style.padding = '0'
+					style.width = (this.isRange && this.showValue) ? (getPx(this.blockSize) + 24) + 'px' : (getPx(this.blockSize)) + 'px';
+				} else {
+					style.flexDirection = 'column'
+					style.height = (this.isRange && this.showValue) ? (getPx(this.blockSize) + 24) + 'px' : (getPx(this.blockSize)) + 'px';
+				}
+				return style;
+			}
 		},
 		async mounted() {
 			// 获取滑块条的尺寸信息
@@ -180,8 +235,10 @@
 					dom.getComponentRect(ref, (res) => {
 						// console.log(res)
 						this.sliderRect = {
+							top: res.size.top,
 							left: res.size.left,
-							width: res.size.width
+							width: res.size.width,
+							height: res.size.height
 						};
 						this.init()
 					})
@@ -189,6 +246,7 @@
 			}
 		},
 		methods: {
+			addUnit,
 			addStyle,
 			getPx,
 			init() {
@@ -237,10 +295,12 @@
 			onTouchStart(event, index = 1) {
 				if (this.disabled) return;
 				this.startX = 0;
+				this.startY = 0;
 				// 触摸点集
 				let touches = event.touches[0];
 				// 触摸点到屏幕左边的距离
 				this.startX = touches.clientX;
+				this.startY = touches.clientY;
 				// 此处的this.modelValue虽为props值，但是通过$emit('update:modelValue')进行了修改
 				if (this.isRange) {
 					this.startValue0 = this.format(this.rangeValue[0], 0);
@@ -255,21 +315,33 @@
 				}
 				// 标示当前的状态为开始触摸滑动
 				this.status = 'start';
+				// console.log('start', this.startValue)
 
 				let clientX = 0;
+				let clientY = 0;
 				// #ifndef APP-NVUE
 				clientX = touches.clientX;
+				clientY = touches.clientY;
 				// #endif
 				// #ifdef APP-NVUE
 				clientX = touches.screenX;
+				clientY = touches.screenY;
 				// #endif
-				this.distanceX = clientX - this.sliderRect.left;
-				// 获得移动距离对整个滑块的值，此为带有多位小数的值，不能用此更新视图
-				// 否则造成通信阻塞，需要每改变一个step值时修改一次视图
-				this.newValue = ((this.distanceX / this.sliderRect.width) * (this.max - this.min)) + parseFloat(this.min);
+				if (this.vertical) {
+					this.distanceY = clientY - this.sliderRect.top;
+					// 获得移动距离对整个滑块的值，此为带有多位小数的值，不能用此更新视图
+					// 否则造成通信阻塞，需要每改变一个step值时修改一次视图
+					this.newValue = ((this.distanceY / this.sliderRect.height) * (this.max - this.min)) + parseFloat(this.min);
+				} else {
+					this.distanceX = clientX - this.sliderRect.left;
+					// 获得移动距离对整个滑块的值，此为带有多位小数的值，不能用此更新视图
+					// 否则造成通信阻塞，需要每改变一个step值时修改一次视图
+					this.newValue = ((this.distanceX / this.sliderRect.width) * (this.max - this.min)) + parseFloat(this.min);
+				}
+				
 				this.status = 'moving';
 				// 发出moving事件
-				$crtFmtValue = this.updateValue(this.newValue, true, index);
+				let $crtFmtValue = this.updateValue(this.newValue, true, index);
 				this.$emit('changing', $crtFmtValue);
 			},
 			onTouchMove(event, index = 1) {
@@ -281,25 +353,35 @@
 				// console.log('touchs', touches)
 				// 滑块的左边不一定跟屏幕左边接壤，所以需要减去最外层父元素的左边值
 				let clientX = 0;
+				let clientY = 0;
 				// #ifndef APP-NVUE
 				clientX = touches.clientX;
+				clientY = touches.clientY;
 				// #endif
 				// #ifdef APP-NVUE
 				clientX = touches.screenX;
+				clientY = touches.screenY;
 				// #endif
-				this.distanceX = clientX - this.sliderRect.left;
-				// 获得移动距离对整个滑块的值，此为带有多位小数的值，不能用此更新视图
-				// 否则造成通信阻塞，需要每改变一个step值时修改一次视图
-				this.newValue = ((this.distanceX / this.sliderRect.width) * (this.max - this.min)) + parseFloat(this.min);
+				if (this.vertical) {
+					this.distanceY = clientY - this.sliderRect.top;
+					// 获得移动距离对整个滑块的值，此为带有多位小数的值，不能用此更新视图
+					// 否则造成通信阻塞，需要每改变一个step值时修改一次视图
+					this.newValue = ((this.distanceY / this.sliderRect.height) * (this.max - this.min)) + parseFloat(this.min);
+				} else {
+					this.distanceX = clientX - this.sliderRect.left;
+					// 获得移动距离对整个滑块的值，此为带有多位小数的值，不能用此更新视图
+					// 否则造成通信阻塞，需要每改变一个step值时修改一次视图
+					this.newValue = ((this.distanceX / this.sliderRect.width) * (this.max - this.min)) + parseFloat(this.min);
+				}
 				this.status = 'moving';
 				// 发出moving事件
-				$crtFmtValue = this.updateValue(this.newValue, true, index);
+				let $crtFmtValue = this.updateValue(this.newValue, true, index);
 				this.$emit('changing', $crtFmtValue);
 			},
 			onTouchEnd(event, index = 1) {
 				if (this.disabled) return;
 				if (this.status === 'moving') {
-					$crtFmtValue = this.updateValue(this.newValue, false, index);
+					let $crtFmtValue = this.updateValue(this.newValue, false, index);
 					this.$emit('change', $crtFmtValue);
 				}
 				this.status = 'end';
@@ -326,23 +408,40 @@
 				// console.log('click', event)
 				// #ifndef APP-NVUE
 				// nvue下暂时无法获取坐标
-				let clientX = event.detail.x - this.sliderRect.left
-				this.newValue = ((clientX / this.sliderRect.width) * (this.max - this.min)) + parseFloat(this.min);
-				this.updateValue(this.newValue, false, 1);
+				if (this.vertical) {
+					let clientY = event.detail.y - this.sliderRect.top
+					// console.log(this.sliderRect.top, event.detail.y)
+					this.newValue = ((clientY / this.sliderRect.height) * (this.max - this.min)) + parseFloat(this.min)
+					this.updateValue(this.newValue, false, 1)
+				} else {
+					let clientX = event.detail.x - this.sliderRect.left
+					this.newValue = ((clientX / this.sliderRect.width) * (this.max - this.min)) + parseFloat(this.min)
+					this.updateValue(this.newValue, false, 1)
+				}
 				// #endif
 			},
 			updateValue(value, drag, index = 1) {
 				// 去掉小数部分，同时也是对step步进的处理
-				let valueFormat = this.format(value, index);
+				let valueFormat = this.format(value, index)
 				// 不允许滑动的值超过max最大值
 				if(valueFormat > this.max ) {
 					valueFormat = this.max
 				}
 				// 设置移动的距离，不能用百分比，因为NVUE不支持。
-				let width = Math.min((valueFormat - this.min) / (this.max - this.min) * this.sliderRect.width, this.sliderRect.width)
-				let barStyle = {
-					width: width + 'px'
-				};
+				let sliderLength = 0
+				let barStyle = {}
+				if (this.vertical) {
+					sliderLength = Math.min((valueFormat - this.min) / (this.max - this.min) * this.sliderRect.height, this.sliderRect.height)
+					barStyle['height'] = addUnit(sliderLength)
+					barStyle['width'] = addUnit(this.sizeLocal)
+					barStyle['marginLeft'] = '-' + getPx(this.sizeLocal, true)
+				} else {
+					sliderLength = Math.min((valueFormat - this.min) / (this.max - this.min) * this.sliderRect.width, this.sliderRect.width)
+					barStyle['width'] = addUnit(sliderLength)
+					barStyle['height'] = addUnit(this.sizeLocal)
+					barStyle['marginTop'] = '-' + getPx(this.sizeLocal, true)
+				}
+				
 				// 移动期间无需过渡动画
 				if (drag == true) {
 					barStyle.transition = 'none';
@@ -377,7 +476,7 @@
 					return this.rangeValue
 				} else {
 					return valueFormat
-				} 
+				}
 			},
 			format(value, index = 1) {
 				// 将小数变成整数，为了减少对视图的更新，造成视图层与逻辑层的阻塞
@@ -410,7 +509,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	.u-slider {
 		position: relative;
 		display: flex;
diff --git a/uview-plus/components/u-status-bar/props.js b/uview-plus/components/u-status-bar/props.js
index 930cb53..d3bf7ee 100644
--- a/uview-plus/components/u-status-bar/props.js
+++ b/uview-plus/components/u-status-bar/props.js
@@ -5,6 +5,11 @@ export const props = defineMixin({
         bgColor: {
             type: String,
             default: () => defProps.statusBar.bgColor
-        }
+        },
+		// 状态栏获取得高度
+		height: {
+			type: Number,
+			default: () => defProps.statusBar.height
+		}
     }
 })
diff --git a/uview-plus/components/u-status-bar/statusBar.js b/uview-plus/components/u-status-bar/statusBar.js
index d237a83..d5ad536 100644
--- a/uview-plus/components/u-status-bar/statusBar.js
+++ b/uview-plus/components/u-status-bar/statusBar.js
@@ -1,15 +1,16 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:20:39
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/statusBar.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/statusBar.js
  */
 export default {
     // statusBar
     statusBar: {
-        bgColor: 'transparent'
+        bgColor: 'transparent',
+		height: 0
     }
 }
diff --git a/uview-plus/components/u-status-bar/u-status-bar.vue b/uview-plus/components/u-status-bar/u-status-bar.vue
index c461883..582ba6a 100644
--- a/uview-plus/components/u-status-bar/u-status-bar.vue
+++ b/uview-plus/components/u-status-bar/u-status-bar.vue
@@ -12,7 +12,7 @@
 	import { props } from './props';
 	import { mpMixin } from '../../libs/mixin/mpMixin';
 	import { mixin } from '../../libs/mixin/mixin';
-	import { addUnit, addStyle, deepMerge, sys } from '../../libs/function/index';
+	import { addUnit, addStyle, deepMerge, getWindowInfo } from '../../libs/function/index';
 	/**
 	 * StatbusBar 状态栏占位
 	 * @description 本组件主要用于状态填充，比如在自定导航栏的时候，它会自动适配一个恰当的状态栏高度。
@@ -26,16 +26,26 @@
 		mixins: [mpMixin, mixin, props],
 		data() {
 			return {
-				// #ifdef H5
-				isH5: true
-				// #endif
+				isH5: false
 			}
 		},
+		created() {
+			// #ifdef H5
+			this.isH5 = true
+			// #endif
+		},
+		emits: ['update:height'],
 		computed: {
 			style() {
 				const style = {}
 				// 状态栏高度，由于某些安卓和微信开发工具无法识别css的顶部状态栏变量，所以使用js获取的方式
-				style.height = addUnit(sys().statusBarHeight, 'px')
+				let sheight = getWindowInfo().statusBarHeight
+				this.$emit('update:height', sheight)
+				if (sheight == 0) {
+					this.isH5 = true
+				} else {
+					style.height = addUnit(sheight, 'px')
+				}
 				style.backgroundColor = this.bgColor
 				return deepMerge(style, addStyle(this.customStyle))
 			}
diff --git a/uview-plus/components/u-steps-item/stepsItem.js b/uview-plus/components/u-steps-item/stepsItem.js
index 5dba8f4..0f82a1c 100644
--- a/uview-plus/components/u-steps-item/stepsItem.js
+++ b/uview-plus/components/u-steps-item/stepsItem.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:12:55
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/stepsItem.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/stepsItem.js
  */
 export default {
     // steps-item组件
diff --git a/uview-plus/components/u-steps-item/u-steps-item.vue b/uview-plus/components/u-steps-item/u-steps-item.vue
index c3e1dea..b4faad8 100644
--- a/uview-plus/components/u-steps-item/u-steps-item.vue
+++ b/uview-plus/components/u-steps-item/u-steps-item.vue
@@ -12,10 +12,10 @@
 
 				</view>
 				<view class="u-steps-item__wrapper__icon" v-else-if="parentData.activeIcon || parentData.inactiveIcon">
-					<u-icon :name="index <= parentData.current ? parentData.activeIcon : parentData.inactiveIcon"
+					<up-icon :name="index <= parentData.current ? parentData.activeIcon : parentData.inactiveIcon"
 						:size="iconSize"
 						:color="index <= parentData.current ? parentData.activeColor : parentData.inactiveColor">
-					</u-icon>
+					</up-icon>
 				</view>
 				<view v-else :style="{
 						backgroundColor: statusClass === 'process' ? parentData.activeColor : 'transparent',
@@ -25,18 +25,30 @@
 						class="u-steps-item__wrapper__circle__text" :style="{
 							color: index == parentData.current ? '#ffffff' : parentData.inactiveColor
 						}">{{ index + 1}}</text>
-					<u-icon v-else :color="statusClass === 'error' ? 'error' : parentData.activeColor" size="12"
-						:name="statusClass === 'error' ? 'close' : 'checkmark'"></u-icon>
+					<up-icon v-else :color="statusClass === 'error' ? 'error' : parentData.activeColor" size="12"
+						:name="statusClass === 'error' ? 'close' : 'checkmark'"></up-icon>
 				</view>
 			</slot>
 		</view>
-		<view class="u-steps-item__content" :class="[`u-steps-item__content--${parentData.direction}`]"
+		<view class="u-steps-item__content" :class="[`u-steps-item__content--${parentData.direction}`,
+			parentData.current == index ? 'u-steps-item__content--current' : '']"
 			:style="[contentStyle]">
-			<up-text :text="title" :type="parentData.current == index ? 'main' : 'content'" lineHeight="20px"
-				:size="parentData.current == index ? 14 : 13"></up-text>
-			<slot name="desc">
-				<up-text :text="desc" type="tips" size="12"></up-text>
+			<slot name="content" :index="index">
 			</slot>
+			<template v-if="!$slots['content']">
+				<view class="u-steps-item__content__title">
+					<slot name="title">
+					</slot>
+					<up-text v-if="!$slots['title']" :text="title" lineHeight="20px"
+						:type="parentData.current == index ? 'main' : 'content'"
+						:size="parentData.current == index ? 14 : 13"></up-text>
+				</view>
+				<view class="u-steps-item__content__desc">
+					<slot name="desc">
+					</slot>
+					<up-text v-if="!$slots['desc']" :text="desc" type="tips" size="12"></up-text>
+				</view>
+			</template>
 		</view>
 		<!-- <view
 		    class="u-steps-item__line"
@@ -217,7 +229,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-steps-item {
 		flex: 1;
@@ -303,6 +314,12 @@
 			@include flex;
 			flex: 1;
 
+			&__title {
+				// #ifdef H5
+				cursor: pointer;
+				// #endif
+			}
+
 			&--row {
 				flex-direction: column;
 				align-items: center;
diff --git a/uview-plus/components/u-steps/steps.js b/uview-plus/components/u-steps/steps.js
index 881c39e..61c63cd 100644
--- a/uview-plus/components/u-steps/steps.js
+++ b/uview-plus/components/u-steps/steps.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:12:37
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/steps.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/steps.js
  */
 export default {
     // steps组件
diff --git a/uview-plus/components/u-steps/u-steps.vue b/uview-plus/components/u-steps/u-steps.vue
index 7f48cb3..255e2b7 100644
--- a/uview-plus/components/u-steps/u-steps.vue
+++ b/uview-plus/components/u-steps/u-steps.vue
@@ -21,7 +21,7 @@
 	 * @property {String}			activeColor		激活状态颜色 (默认 '#3c9cff' )
 	 * @property {String}			inactiveColor	未激活状态颜色 (默认 '#969799' )
 	 * @property {String}			activeIcon		激活状态的图标
-	 * @property {String}			inactiveIcon	未激活状态图标 
+	 * @property {String}			inactiveIcon	未激活状态图标
 	 * @property {Boolean}			dot				是否显示点类型 (默认 false )
 	 * @example <u-steps current="0"><u-steps-item title="已出库" desc="10:35" ></u-steps-item></u-steps>
 	 */
@@ -36,13 +36,13 @@
 			children() {
 				this.updateChildData()
 			},
-			parentData() {
+			parentDataCpu() {
 				this.updateChildData()
 			}
 		},
 		computed: {
 			// 监听参数的变化，通过watch中，手动去更新子组件的数据，否则子组件不会自动变化
-			parentData() {
+			parentDataCpu() {
 				return [this.current, this.direction, this.activeColor, this.inactiveColor, this.activeIcon, this.inactiveIcon, this.dot]
 			}
 		},
@@ -69,7 +69,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-steps {
 		@include flex;
@@ -85,6 +84,11 @@
 			display: grid;
 			grid-template-columns: repeat(auto-fit, minmax(100px, 1fr));
 			/* #endif */
+
+            //微信小程序优化的比抖音的好 因此微信小程序使用flex布局
+            /* #ifdef MP-WEIXIN */
+            display: flex !important;
+            /* #endif */
 		}
 	}
 </style>
diff --git a/uview-plus/components/u-sticky/sticky.js b/uview-plus/components/u-sticky/sticky.js
index b034604..683c36b 100644
--- a/uview-plus/components/u-sticky/sticky.js
+++ b/uview-plus/components/u-sticky/sticky.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:01:30
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/sticky.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/sticky.js
  */
 export default {
     // sticky组件
diff --git a/uview-plus/components/u-sticky/u-sticky.vue b/uview-plus/components/u-sticky/u-sticky.vue
index 7c3eb5e..d074026 100644
--- a/uview-plus/components/u-sticky/u-sticky.vue
+++ b/uview-plus/components/u-sticky/u-sticky.vue
@@ -1,10 +1,10 @@
 <template>
 	<view
 		class="u-sticky"
-		:id="elId"
 		:style="[style]"
 	>
 		<view
+		:id="elId"
 			:style="[stickyContent]"
 			class="u-sticky__content"
 		>
@@ -17,12 +17,12 @@
 	import { props } from './props';
 	import { mpMixin } from '../../libs/mixin/mpMixin';
 	import { mixin } from '../../libs/mixin/mixin';
-	import { addUnit, addStyle, deepMerge, getPx, guid, sys, os } from '../../libs/function/index';
+	import { addUnit, addStyle, deepMerge, getPx, guid, getDeviceInfo, os } from '../../libs/function/index';
 	import zIndex from '../../libs/config/zIndex';
 	/**
 	 * sticky 吸顶
 	 * @description 该组件与CSS中position: sticky属性实现的效果一致，当组件达到预设的到顶部距离时， 就会固定在指定位置，组件位置大于预设的顶部距离时，会重新按照正常的布局排列。
-	 * @tutorial https://ijry.github.io/uview-plus/components/sticky.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/sticky.html
 	 * @property {String ｜ Number}	offsetTop		吸顶时与顶部的距离，单位px（默认 0 ）
 	 * @property {String ｜ Number}	customNavHeight	自定义导航栏的高度 （h5 默认44  其他默认 0 ）
 	 * @property {Boolean}			disabled		是否开启吸顶功能 （默认 false ）
@@ -90,6 +90,11 @@
 		mounted() {
 			this.init()
 		},
+		watch: {
+			offsetTop(nval) {
+				this.getStickyTop()
+			}
+		},
 		methods: {
 			init() {
 				this.getStickyTop()
@@ -114,7 +119,7 @@
 			observeContent() {
 				// 先断掉之前的观察
 				this.disconnectObserver('contentObserver')
-				const contentObserver = uni.createIntersectionObserver({
+				const contentObserver = uni.createIntersectionObserver(this,{
 					// 检测的区间范围
 					thresholds: [0.95, 0.98, 1]
 				})
@@ -150,7 +155,7 @@
 				// #endif
 
 				// 如果安卓版本高于8.0，依然认为是支持css sticky的(因为安卓7在某些机型，可能不支持sticky)
-				if (os() === 'android' && Number(sys().system) > 8) {
+				if (os() === 'android' && Number(getDeviceInfo().system) > 8) {
 					this.cssSticky = true
 				}
 
diff --git a/uview-plus/components/u-subsection/props.js b/uview-plus/components/u-subsection/props.js
index 684afcc..799f518 100644
--- a/uview-plus/components/u-subsection/props.js
+++ b/uview-plus/components/u-subsection/props.js
@@ -1,5 +1,6 @@
-import { defineMixin } from '../../libs/vue'
+import {defineMixin} from '../../libs/vue'
 import defProps from '../../libs/config/props.js'
+
 export const props = defineMixin({
     props: {
         // tab的数据
@@ -42,10 +43,25 @@ export const props = defineMixin({
             type: String,
             default: () => defProps.subsection.bgColor
         },
-		// 从list元素对象中读取的键名
-		keyName: {
-			type: String,
-			default: () => defProps.subsection.keyName
-		}
+        // 从list元素对象中读取的键名
+        keyName: {
+            type: String,
+            default: () => defProps.subsection.keyName
+        },
+        // 从`list`元素对象中读取激活时的颜色  如果存在字段 优先级大于 activeColor
+        activeColorKeyName: {
+            type: String,
+            default: () => defProps.subsection.activeColorKeyName
+        },
+        // 从`list`元素对象中读取未激活时的颜色 如果存在字段 优先级大于 inactiveColor
+        inactiveColorKeyName: {
+            type: String,
+            default: () => defProps.subsection.inactiveColorKeyName
+        },
+        // 是否禁用
+        disabled: {
+            type: Boolean,
+            default: () => defProps.subsection.disabled
+        }
     }
 })
diff --git a/uview-plus/components/u-subsection/subsection.js b/uview-plus/components/u-subsection/subsection.js
index 9a165ff..1e3ef53 100644
--- a/uview-plus/components/u-subsection/subsection.js
+++ b/uview-plus/components/u-subsection/subsection.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:12:20
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/subsection.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/subsection.js
  */
 export default {
     // subsection组件
@@ -18,6 +18,9 @@ export default {
         fontSize: 12,
         bold: true,
         bgColor: '#eeeeef',
-		keyName: 'name'
+        keyName: 'name',
+        activeColorKeyName: 'activeColorKey',
+        inactiveColorKeyName: 'inactiveColorKey',
+        disabled: false,
     }
 }
diff --git a/uview-plus/components/u-subsection/u-subsection.vue b/uview-plus/components/u-subsection/u-subsection.vue
index 37fb4b5..4aacc24 100644
--- a/uview-plus/components/u-subsection/u-subsection.vue
+++ b/uview-plus/components/u-subsection/u-subsection.vue
@@ -31,6 +31,7 @@
                     'u-subsection__item--no-border-right',
                 index === 0 && 'u-subsection__item--first',
                 index === list.length - 1 && 'u-subsection__item--last',
+                getTextViewDisableClass(index),
             ]"
             :ref="`u-subsection__item--${index}`"
             :style="[itemStyle(index)]"
@@ -40,7 +41,8 @@
         >
             <text
                 class="u-subsection__item__text"
-                :style="[textStyle(index)]"
+                :class="[disabled ? 'u-subsection--disabled' : '']"
+                :style="[textStyle(index,item)]"
                 >{{ getText(item) }}</text
             >
         </view>
@@ -59,17 +61,20 @@ import { addStyle, addUnit, sleep } from '../../libs/function/index';
 /**
  * Subsection 分段器
  * @description 该分段器一般用于用户从几个选项中选择某一个的场景
- * @tutorial https://ijry.github.io/uview-plus/components/subsection.html
- * @property {Array}			list			tab的数据
- * @property {String ｜ Number}	current			当前活动的tab的index（默认 0 ）
- * @property {String}			activeColor		激活时的颜色（默认 '#3c9cff' ）
- * @property {String}			inactiveColor	未激活时的颜色（默认 '#303133' ）
- * @property {String}			mode			模式选择，mode=button为按钮形式，mode=subsection时为分段模式（默认 'button' ）
- * @property {String ｜ Number}	fontSize		字体大小，单位px（默认 12 ）
- * @property {Boolean}			bold			激活选项的字体是否加粗（默认 true ）
- * @property {String}			bgColor			组件背景颜色，mode为button时有效（默认 '#eeeeef' ）
- * @property {Object}			customStyle		定义需要用到的外部样式
- * @property {String}	        keyName	        从`list`元素对象中读取的键名（默认 'name' ）
+ * @tutorial https://uview-plus.jiangruyi.com/components/subsection.html
+ * @property {Array}			list			        tab的数据
+ * @property {String ｜ Number}	current			        当前活动的tab的index（默认 0 ）
+ * @property {String}			activeColor		        激活时的颜色（默认 '#3c9cff' ）
+ * @property {String}			inactiveColor	        未激活时的颜色（默认 '#303133' ）
+ * @property {String}			mode			        模式选择，mode=button为按钮形式，mode=subsection时为分段模式（默认 'button' ）
+ * @property {String ｜ Number}	fontSize		        字体大小，单位px（默认 12 ）
+ * @property {Boolean}			bold			        激活选项的字体是否加粗（默认 true ）
+ * @property {String}			bgColor			        组件背景颜色，mode为button时有效（默认 '#eeeeef' ）
+ * @property {Object}			customStyle		        定义需要用到的外部样式
+ * @property {String}	        keyName	                从`list`元素对象中读取的键名（默认 'name' ）
+ * @property {String}	        activeColorKeyName      从`list`元素对象中读取激活时的颜色（默认 'activeColorKey' ）  如果存在字段 优先级大于 activeColor
+ * @property {String}	        inactiveColorKeyName    从`list`元素对象中读取未激活时的颜色 （默认 'inactiveColorKey' ）如果存在字段 优先级大于 inactiveColor
+ * @property {Boolean}	        disabled                是否禁用分段器 （默认 false ）
  *
  * @event {Function} change		分段器选项发生改变时触发  回调 index：选项的index索引值，从0开始
  * @example <u-subsection :list="list" :current="curNow" @change="sectionChange"></u-subsection>
@@ -96,7 +101,7 @@ export default {
             immediate: true,
             handler(n) {
                 if (n !== this.innerCurrent) {
-                    this.innerCurrent = n
+                    this.innerCurrent = Number(n)
                 }
                 // #ifdef APP-NVUE
                 // 在安卓nvue上，如果通过translateX进行位移，到最后一个时，会导致右侧无法绘制圆角
@@ -158,22 +163,46 @@ export default {
             };
         },
         // 分段器文字颜色
-        textStyle(index) {
-            return (index) => {
+        textStyle(index,item) {
+            return (index,item) => {
                 const style = {};
                 style.fontWeight =
                     this.bold && this.innerCurrent === index ? "bold" : "normal";
                 style.fontSize = addUnit(this.fontSize);
+
+                let activeColorTemp = null;
+                let inactiveColorTemp = null;
+                // 如果是对象并且设置了对应的背景色字段 则优先使用设置的字段
+                if(typeof item === 'object' && item[this.activeColorKeyName]){
+                    activeColorTemp = item[this.activeColorKeyName];
+                }
+                if(typeof item === 'object' && item[this.inactiveColorKeyName]){
+                    inactiveColorTemp = item[this.inactiveColorKeyName];
+                }
+
                 // subsection模式下，激活时默认为白色的文字
                 if (this.mode === "subsection") {
-                    style.color =
-                        this.innerCurrent === index ? "#fff" : this.inactiveColor;
-                } else {
+                    // 判断当前是否激活
+                    if(this.innerCurrent === index){
+                        // 判断当前是否有自定义的颜色
+                        style.color = activeColorTemp ? activeColorTemp : '#FFF'
+                        // style.color = activeColorTemp ? activeColorTemp : this.activeColor
+                    }
+                    else{
+                        // 判断当前是否有自定义的颜色
+                        style.color = inactiveColorTemp ? inactiveColorTemp : this.inactiveColor;
+                    }
+                }
+                else {
                     // button模式下，激活时文字颜色默认为activeColor
-                    style.color =
-                        this.innerCurrent === index
-                            ? this.activeColor
-                            : this.inactiveColor;
+                    if(this.innerCurrent === index){
+                        // 判断当前是否有自定义的颜色
+                        style.color = activeColorTemp ? activeColorTemp : this.activeColor
+                    }
+                    else{
+                        // 判断当前是否有自定义的颜色
+                        style.color = inactiveColorTemp ? inactiveColorTemp : this.inactiveColor;
+                    }
                 }
                 return style;
             };
@@ -181,15 +210,19 @@ export default {
     },
     mounted() {
         this.init();
+        // #ifndef APP || MP-WEIXIN || MP-LARK|| MP-QQ || H5
         this.windowResizeCallback = (res) => {
             this.init();
         }
         uni.onWindowResize(this.windowResizeCallback)
+        // #endif
     },
     beforeUnmount() {
+        // #ifndef APP || MP-WEIXIN || MP-LARK|| MP-QQ || H5
         uni.offWindowResize(this.windowResizeCallback)
+        // #endif
     },
-	emits: ["change"],
+	emits: ["change", "update:current"],
     methods: {
         addStyle,
         init() {
@@ -217,16 +250,36 @@ export default {
             // #endif
         },
         clickHandler(index) {
-            this.innerCurrent = index
+            // 防止某些平台 css 无法阻止点击事件 在此处拦截
+            if(this.disabled){
+                return
+            }
+            this.innerCurrent = index;
+			this.$emit('update:current', index);
             this.$emit("change", index);
         },
+        /**
+         * 获取当前文字区域的 class禁用样式
+         * @param index
+         */
+        getTextViewDisableClass(index){
+            // 禁用状态下
+            if(this.disabled){
+                // 判断模式
+                if(this.mode === 'button'){
+                    return 'item-button--disabled'
+                }
+                else{
+                    return 'item-subsection--disabled'
+                }
+            }
+            return '';
+        }
     },
 };
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
-
 .u-subsection {
     @include flex;
     position: relative;
@@ -314,5 +367,39 @@ export default {
             transition-duration: 0.3s;
         }
     }
+
+    // 禁用标志
+    //
+    //&--subsectio--disabled{
+    //    cursor: no-drop;
+    //    background: #FFFFFF !important;
+    //    color: #BDBDBD !important;
+    //    border-color: #BDBDBD !important;
+    //}
+    //
+    //&--button--disabled{
+    //    cursor: no-drop;
+    //    color: #BDBDBD !important;
+    //    border-color: #BDBDBD !important;
+    //}
+
+}
+
+.item-button--disabled{
+    cursor: no-drop;
+    color: #BDBDBD !important;
+    border-color: #BDBDBD !important;
+    text{
+        color: #BDBDBD !important;
+    }
+}
+.item-subsection--disabled{
+    cursor: no-drop;
+    background: #FFFFFF !important;
+    color: #BDBDBD !important;
+    border-color: #BDBDBD !important;
+    text{
+        color: #BDBDBD !important;
+    }
 }
 </style>
diff --git a/uview-plus/components/u-swipe-action-item/swipeActionItem.js b/uview-plus/components/u-swipe-action-item/swipeActionItem.js
index 4b2cdf6..f6afb44 100644
--- a/uview-plus/components/u-swipe-action-item/swipeActionItem.js
+++ b/uview-plus/components/u-swipe-action-item/swipeActionItem.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:01:13
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/swipeActionItem.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/swipeActionItem.js
  */
 export default {
     // swipeActionItem 组件
diff --git a/uview-plus/components/u-swipe-action-item/u-swipe-action-item.vue b/uview-plus/components/u-swipe-action-item/u-swipe-action-item.vue
index d655166..f8a718d 100644
--- a/uview-plus/components/u-swipe-action-item/u-swipe-action-item.vue
+++ b/uview-plus/components/u-swipe-action-item/u-swipe-action-item.vue
@@ -14,12 +14,12 @@
 							borderRadius: item.style && item.style.borderRadius ? item.style.borderRadius : '0',
 							padding: item.style && item.style.borderRadius ? '0' : '0 15px',
 						}, item.style]">
-						<u-icon v-if="item.icon" :name="item.icon"
+						<up-icon v-if="item.icon" :name="item.icon"
 							:color="item.style && item.style.color ? item.style.color : '#ffffff'"
 							:size="item.iconSize ? addUnit(item.iconSize) : item.style && item.style.fontSize ? getPx(item.style.fontSize) * 1.2 : 17"
 							:customStyle="{
 								marginRight: item.text ? '2px' : 0
-							}"></u-icon>
+							}"></up-icon>
 						<text v-if="item.text" class="u-swipe-action-item__right__button__wrapper__text u-line-1"
 							:style="[{
 								color: item.style && item.style.color ? item.style.color : '#ffffff',
@@ -76,7 +76,7 @@
 	/**
 	 * SwipeActionItem 滑动单元格子组件
 	 * @description 该组件一般用于左滑唤出操作菜单的场景，用的最多的是左滑删除操作
-	 * @tutorial https://ijry.github.io/uview-plus/components/swipeAction.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/swipeAction.html
 	 * @property {Boolean}			show			控制打开或者关闭（默认 false ）
 	 * @property {String | Number}	index			标识符，如果是v-for，可用index索引
 	 * @property {Boolean}			disabled		是否禁用（默认 false ）
@@ -201,7 +201,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-swipe-action-item {
 		position: relative;
diff --git a/uview-plus/components/u-swipe-action/swipeAction.js b/uview-plus/components/u-swipe-action/swipeAction.js
index 25051b8..253fbfc 100644
--- a/uview-plus/components/u-swipe-action/swipeAction.js
+++ b/uview-plus/components/u-swipe-action/swipeAction.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:00:42
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/swipeAction.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/swipeAction.js
  */
 export default {
     // swipe-action组件
diff --git a/uview-plus/components/u-swipe-action/u-swipe-action.vue b/uview-plus/components/u-swipe-action/u-swipe-action.vue
index 1cc1ff6..6f0f5ae 100644
--- a/uview-plus/components/u-swipe-action/u-swipe-action.vue
+++ b/uview-plus/components/u-swipe-action/u-swipe-action.vue
@@ -11,7 +11,7 @@
 	/**
 	 * SwipeAction 滑动单元格 
 	 * @description 该组件一般用于左滑唤出操作菜单的场景，用的最多的是左滑删除操作
-	 * @tutorial https://ijry.github.io/uview-plus/components/swipeAction.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/swipeAction.html
 	 * @property {Boolean}	autoClose	是否自动关闭其他swipe按钮组
 	 * @event {Function(index)}	click	点击组件时触发
 	 * @example	<u-swipe-action><u-swipe-action-item :rightOptions="options1" ></u-swipe-action-item></u-swipe-action>
diff --git a/uview-plus/components/u-swiper-indicator/swipterIndicator.js b/uview-plus/components/u-swiper-indicator/swipterIndicator.js
index 4b59e6e..c474f1c 100644
--- a/uview-plus/components/u-swiper-indicator/swipterIndicator.js
+++ b/uview-plus/components/u-swiper-indicator/swipterIndicator.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:22:07
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/swiperIndicator.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/swiperIndicator.js
  */
 export default {
     // swiperIndicator 组件
diff --git a/uview-plus/components/u-swiper-indicator/u-swiper-indicator.vue b/uview-plus/components/u-swiper-indicator/u-swiper-indicator.vue
index 7820d47..f485153 100644
--- a/uview-plus/components/u-swiper-indicator/u-swiper-indicator.vue
+++ b/uview-plus/components/u-swiper-indicator/u-swiper-indicator.vue
@@ -38,7 +38,7 @@
 	/**
 	 * SwiperIndicator 轮播图指示器
 	 * @description 该组件一般用于导航轮播，广告展示等场景,可开箱即用，
-	 * @tutorial https://ijry.github.io/uview-plus/components/swiper.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/swiper.html
 	 * @property {String | Number}	length					轮播的长度（默认 0 ）
 	 * @property {String | Number}	current					当前处于活动状态的轮播的索引（默认 0 ）
 	 * @property {String}			indicatorActiveColor	指示器非激活颜色
@@ -79,7 +79,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-swiper-indicator {
 
diff --git a/uview-plus/components/u-swiper/swiper.js b/uview-plus/components/u-swiper/swiper.js
index 59af537..2574c75 100644
--- a/uview-plus/components/u-swiper/swiper.js
+++ b/uview-plus/components/u-swiper/swiper.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:21:38
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/swiper.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/swiper.js
  */
 export default {
     // swiper 组件
diff --git a/uview-plus/components/u-swiper/u-swiper.vue b/uview-plus/components/u-swiper/u-swiper.vue
index 11fea9a..a872ba7 100644
--- a/uview-plus/components/u-swiper/u-swiper.vue
+++ b/uview-plus/components/u-swiper/u-swiper.vue
@@ -30,7 +30,7 @@
 			:previousMargin="addUnit(previousMargin)"
 			:nextMargin="addUnit(nextMargin)"
 			:acceleration="acceleration"
-			:displayMultipleItems="displayMultipleItems"
+			:displayMultipleItems="list.length > 0 ? displayMultipleItems : 0"
 			:easingFunction="easingFunction"
 		>
 			<swiper-item
@@ -100,7 +100,7 @@
 	/**
 	 * Swiper 轮播图
 	 * @description 该组件一般用于导航轮播，广告展示等场景,可开箱即用，
-	 * @tutorial https://ijry.github.io/uview-plus/components/swiper.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/swiper.html
 	 * @property {Array}			list					轮播图数据
 	 * @property {Boolean}			indicator				是否显示面板指示器（默认 false ）
 	 * @property {String}			indicatorActiveColor	指示器非激活颜色（默认 '#FFFFFF' ）
@@ -214,7 +214,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	
 	.u-swiper__wrapper {
 		flex: 1;
diff --git a/uview-plus/components/u-switch/switch.js b/uview-plus/components/u-switch/switch.js
index e6400b4..2aeb351 100644
--- a/uview-plus/components/u-switch/switch.js
+++ b/uview-plus/components/u-switch/switch.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:22:24
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/switch.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/switch.js
  */
 export default {
     // switch
diff --git a/uview-plus/components/u-switch/u-switch.vue b/uview-plus/components/u-switch/u-switch.vue
index e486041..7ad5821 100644
--- a/uview-plus/components/u-switch/u-switch.vue
+++ b/uview-plus/components/u-switch/u-switch.vue
@@ -45,7 +45,7 @@
 	/**
 	 * switch 开关选择器
 	 * @description 选择开关一般用于只有两个选择，且只能选其一的场景。
-	 * @tutorial https://ijry.github.io/uview-plus/components/switch.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/switch.html
 	 * @property {Boolean}						loading			是否处于加载中（默认 false ）
 	 * @property {Boolean}						disabled		是否禁用（默认 false ）
 	 * @property {String | Number}				size			开关尺寸，单位px （默认 25 ）
@@ -165,7 +165,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-switch {
 		@include flex(row);
diff --git a/uview-plus/components/u-tabbar-item/props.js b/uview-plus/components/u-tabbar-item/props.js
index ae33b62..9d208aa 100644
--- a/uview-plus/components/u-tabbar-item/props.js
+++ b/uview-plus/components/u-tabbar-item/props.js
@@ -7,7 +7,7 @@ export const props = defineMixin({
             type: [String, Number, null],
             default: () => defProps.tabbarItem.name
         },
-        // uView内置图标或者绝对路径的图片
+        // uview-plus内置图标或者绝对路径的图片
         icon: {
             icon: String,
             default: () => defProps.tabbarItem.icon
@@ -31,7 +31,11 @@ export const props = defineMixin({
         badgeStyle: {
             type: [Object, String],
             default: () => defProps.tabbarItem.badgeStyle
+        },
+        // 模式，默认普通模式，midButton中间按钮模式
+        mode: {
+            type: String,
+            default: () => defProps.tabbarItem.mode
         }
-
     }
 })
diff --git a/uview-plus/components/u-tabbar-item/tabbarItem.js b/uview-plus/components/u-tabbar-item/tabbarItem.js
index d036ce5..4f19759 100644
--- a/uview-plus/components/u-tabbar-item/tabbarItem.js
+++ b/uview-plus/components/u-tabbar-item/tabbarItem.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:22:55
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/tabbarItem.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/tabbarItem.js
  */
 export default {
     //
@@ -15,6 +15,7 @@ export default {
         badge: null,
         dot: false,
         text: '',
-        badgeStyle: 'top: 6px;right:2px;'
+        badgeStyle: 'top: 6px;right:2px;',
+        mode: ''
     }
 }
diff --git a/uview-plus/components/u-tabbar-item/u-tabbar-item.vue b/uview-plus/components/u-tabbar-item/u-tabbar-item.vue
index baa19fc..8efe459 100644
--- a/uview-plus/components/u-tabbar-item/u-tabbar-item.vue
+++ b/uview-plus/components/u-tabbar-item/u-tabbar-item.vue
@@ -2,15 +2,21 @@
 	<view
 	    class="u-tabbar-item"
 	    :style="[addStyle(customStyle)]"
+	    :class="[isMidButton ? 'u-tabbar-item--mid-button' : '']"
 	    @tap="clickHandler"
 	>
-		<view class="u-tabbar-item__icon">
-			<u-icon
+		<view 
+			class="u-tabbar-item__icon"
+			:class="[isMidButton ? 'u-tabbar-item__icon--mid-button' : '']"
+		>
+			<view class="u-tabbar-item--mid-button-cover" v-if="isMidButton">
+			</view>
+			<up-icon
 			    v-if="icon"
 			    :name="icon"
 			    :color="isActive? parentData.activeColor : parentData.inactiveColor"
-			    :size="20"
-			></u-icon>
+			    :size="isMidButton ? 26 : 20"
+			></up-icon>
 			<template v-else>
 				<slot
 				    v-if="isActive"
@@ -50,7 +56,7 @@
 	/**
 	 * TabbarItem 底部导航栏子组件
 	 * @description 此组件提供了自定义tabbar的能力。
-	 * @tutorial https://ijry.github.io/uview-plus/components/tabbar.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/tabbar.html
 	 * @property {String | Number}	name		item标签的名称，作为与u-tabbar的value参数匹配的标识符
 	 * @property {String}			icon		uView内置图标或者绝对路径的图片
 	 * @property {String | Number}	badge		右上角的角标提示信息
@@ -78,6 +84,12 @@
 		options: {
 		    virtualHost: true //将自定义节点设置成虚拟的，更加接近Vue组件的表现。我们不希望自定义组件的这个节点本身可以设置样式、响应 flex 布局等
 		},
+		computed: {
+			// 计算是否为中间按钮
+			isMidButton() {
+				return this.mode === 'midButton';
+			}
+		},
 		created() {
 			this.init()
 		},
@@ -88,7 +100,7 @@
 				// 支付宝小程序不支持provide/inject，所以使用这个方法获取整个父组件，在created定义，避免循环引用
 				this.updateParentData()
 				if (!this.parent) {
-					error('u-tabbar-item必须搭配u-tabbar组件使用')
+					error('up-tabbar-item必须搭配up-tabbar组件使用')
 				}
 				// 本子组件在u-tabbar的children数组中的索引
 				const index = this.parent.children.indexOf(this)
@@ -120,7 +132,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	.u-tabbar-item {
 		@include flex(column);
 		align-items: center;
@@ -147,6 +158,34 @@
 			color: $u-content-color;
 		}
 	}
+	
+	// 中间按钮样式
+	.u-tabbar-item--mid-button {
+		/* #ifndef APP-NVUE */
+		transform: translateY(-10px);
+		/* #endif */
+	}
+	
+	.u-tabbar-item--mid-button-cover {
+		background-color: #fff;
+		position: absolute;
+		top: 22px;
+		left: -10px;
+		// right: -10px;
+		width: 90px;
+		bottom: 0;
+	}
+	
+	.u-tabbar-item__icon--mid-button {
+		width: 70px;
+		height: 70px;
+		border-radius: 100px;
+		background-color: #ffffff;
+		box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 
 	/* #ifdef MP */
 	// 由于小程序都使用shadow DOM形式实现，需要给影子宿主设置flex: 1才能让其撑开
@@ -155,4 +194,4 @@
 		width: 100%;
 	}
 	/* #endif */
-</style>
+</style>
\ No newline at end of file
diff --git a/uview-plus/components/u-tabbar/props.js b/uview-plus/components/u-tabbar/props.js
index 8ce1d2f..2645a2e 100644
--- a/uview-plus/components/u-tabbar/props.js
+++ b/uview-plus/components/u-tabbar/props.js
@@ -18,6 +18,11 @@ export const props = defineMixin({
             type: Boolean,
             default: () => defProps.tabbar.border
         },
+        // 上方边框颜色
+        borderColor: {
+            type: String,
+            default: () => defProps.tabbar.borderColor
+        },
         // 元素层级z-index
         zIndex: {
             type: [String, Number],
@@ -42,6 +47,11 @@ export const props = defineMixin({
         placeholder: {
             type: Boolean,
             default: () => defProps.tabbar.placeholder
+        },
+        // 背景色
+        backgroundColor: {
+            type: String,
+            default: () => defProps.tabbar.backgroundColor
         }
     }
 })
diff --git a/uview-plus/components/u-tabbar/tabbar.js b/uview-plus/components/u-tabbar/tabbar.js
index 187112d..4818e9f 100644
--- a/uview-plus/components/u-tabbar/tabbar.js
+++ b/uview-plus/components/u-tabbar/tabbar.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:22:40
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/tabbar.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/tabbar.js
  */
 export default {
     // tabbar
@@ -17,6 +17,8 @@ export default {
         activeColor: '#1989fa',
         inactiveColor: '#7d7e80',
         fixed: true,
-        placeholder: true
+        placeholder: true,
+        borderColor: '',
+        backgroundColor: ''
     }
 }
diff --git a/uview-plus/components/u-tabbar/u-tabbar.vue b/uview-plus/components/u-tabbar/u-tabbar.vue
index d67a634..c05d8a2 100644
--- a/uview-plus/components/u-tabbar/u-tabbar.vue
+++ b/uview-plus/components/u-tabbar/u-tabbar.vue
@@ -33,7 +33,7 @@
 	/**
 	 * Tabbar 底部导航栏
 	 * @description 此组件提供了自定义tabbar的能力。
-	 * @tutorial https://ijry.github.io/uview-plus/components/tabbar.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/tabbar.html
 	 * @property {String | Number}	value				当前匹配项的name
 	 * @property {Boolean}			safeAreaInsetBottom	是否为iPhoneX留出底部安全距离（默认 true ）
 	 * @property {Boolean}			border				是否显示上方边框（默认 true ）
@@ -42,6 +42,7 @@
 	 * @property {String}			inactiveColor		未选中标签的颜色（默认 '#7d7e80' ）
 	 * @property {Boolean}			fixed				是否固定在底部（默认 true ）
 	 * @property {Boolean}			placeholder			fixed定位固定在底部时，是否生成一个等高元素防止塌陷（默认 true ）
+	 * @property {String}			backgroundColor		背景色（默认 '#ffffff' ）
 	 * @property {Object}			customStyle			定义需要用到的外部样式
 	 * 
 	 * @example <u-tabbar :value="value2" :placeholder="false" @change="name => value2 = name" :fixed="false" :safeAreaInsetBottom="false"><u-tabbar-item text="首页" icon="home" dot ></u-tabbar-item></u-tabbar>
@@ -59,6 +60,12 @@
 				const style = {
 					zIndex: this.zIndex
 				}
+				if (this.borderColor) {
+					style.borderColor = this.borderColor + ' !important'
+				}
+				if (this.backgroundColor) {
+					style.backgroundColor = this.backgroundColor
+				}
 				// 合并来自父组件的customStyle样式
 				return deepMerge(style, addStyle(this.customStyle))
 			},
@@ -117,7 +124,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-tabbar {
 		@include flex(column);
diff --git a/uview-plus/components/u-table/u-table.vue b/uview-plus/components/u-table/u-table.vue
index 8bf5af7..18773a1 100644
--- a/uview-plus/components/u-table/u-table.vue
+++ b/uview-plus/components/u-table/u-table.vue
@@ -1,6 +1,8 @@
 <template>
-	<view class="u-table">
-		
+	<view class="u-table" :style="[tableStyle]">
+		<template v-if="show">
+			<slot />
+		</template>
 	</view>
 </template>
 
@@ -11,21 +13,92 @@
 	/**
 	 * Table 表格 
 	 * @description 表格组件一般用于展示大量结构化数据的场景 本组件标签类似HTML的table表格，由table、tr、th、td四个组件组成
-	 * @tutorial https://ijry.github.io/uview-plus/components/table.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/table.html
+	 * @property {String} border-color 表格边框的颜色（默认#e4e7ed）
+	 * @property {String} bg-color 表格的背景颜色（默认#ffffff）
+	 * @property {String} align 单元格的内容对齐方式，作用类似css的text-align（默认center）
+	 * @property {String} padding 单元格的内边距，同css的padding写法（默认10rpx 0）
+	 * @property {String Number} font-size 单元格字体大小，单位rpx（默认28）
+	 * @property {String} color 单元格字体颜色（默认#606266）
+	 * @property {Object} th-style th单元格的样式，对象形式(将th所需参数放在table组件，是为了避免每一个th组件要写一遍）
+	 * @event {Function} click 点击组件时触发
+	 * @event {Function} close 点击关闭按钮时触发
 	 * @example <u-table><u-tr><u-th>学校</u-th </u-tr> <u-tr><u-td>浙江大学</u-td> </u-tr> <u-tr><u-td>清华大学</u-td> </u-tr></u-table>
 	 */
 	export default {
 		name: 'u-table',
 		mixins: [mpMixin, mixin, props],
+		props: {
+			borderColor: {
+				type: String,
+				default: '#e4e7ed'
+			},
+			align: {
+				type: String,
+				default: 'center'
+			},
+			// td的内边距
+			padding: {
+				type: String,
+				default: '5px 3px'
+			},
+			// 字体大小
+			fontSize: {
+				type: [String],
+				default: '14px'
+			},
+			// 字体颜色
+			color: {
+				type: String,
+				default: '#606266'
+			},
+			// th的自定义样式
+			thStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// table的背景颜色
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			}
+		},
 		data() {
 			return {
-				
+				show: true
+			}
+		},
+		watch: {
+			align() {
+				this.change();
+			},
+			borderColor() {
+				this.change();
+			}
+		},
+		computed: {
+			tableStyle() {
+				let style = {};
+				style.borderLeft = `solid 1px ${this.borderColor}`;
+				style.borderTop = `solid 1px ${this.borderColor}`;
+				style.backgroundColor = this.bgColor;;
+				return style;
+			}
+		},
+		methods: {
+			change() {
+				this.show = false;
+				this.$nextTick(() => {
+					this.show = true;
+				});
+				// this.$forceUpdate();
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	
 </style>
diff --git a/uview-plus/components/u-table2/tableRow.vue b/uview-plus/components/u-table2/tableRow.vue
new file mode 100644
index 0000000..6f7b8cd
--- /dev/null
+++ b/uview-plus/components/u-table2/tableRow.vue
@@ -0,0 +1,328 @@
+<style lang="scss" scoped>
+.u-table-row {
+    display: flex;
+    flex-direction: row;
+    position: relative;
+}
+
+// 添加border样式支持
+.u-table-border {
+    border-top: 1px solid #ebeef5;
+    border-left: 1px solid #ebeef5;
+    border-right: 1px solid #ebeef5;
+    .u-table-cell {
+        border-right: 1px solid #ebeef5;
+    }
+    
+    .u-table-cell:last-child {
+        border-right: none;
+    }
+}
+
+.u-table-cell {
+    flex: 1;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    padding: 10px 1px;
+    font-size: 14px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    line-height: 1.1;
+    border-bottom: 1px solid #ebeef5;
+    &.u-text-left {
+        justify-content: flex-start;
+        text-align: left;
+    }
+    &.u-text-center {
+        justify-content: center;
+        text-align: center;
+    }
+    &.u-text-right {
+        justify-content: flex-end;
+        text-align: right;
+    }
+}
+
+.u-table-row-zebra {
+    background-color: #fafafa;
+}
+
+.u-table-row-highlight {
+    background-color: #f5f7fa;
+}
+
+.u-table-empty {
+    text-align: center;
+    padding: 20px;
+    color: #999;
+}
+
+// 隐藏被合并的单元格
+.u-table-cell-hidden {
+    opacity: 0;
+}
+
+// 合并单元格样式
+.u-table-cell-merged {
+    z-index: 1;
+}
+</style>
+<template>
+    <view class="u-table-row u-table-row-child"
+        :class="[highlightCurrentRow && currentRow === row ? 'u-table-row-highlight' : '',
+        rowClassName ? rowClassName(row, rowIndex) : '',
+        stripe && rowIndex % 2 === 1 ? 'u-table-row-zebra' : ''
+        ]" :style="{height: rowHeight}" @click="handleRowClick(row)">
+        <view v-for="(col, colIndex) in columns" :key="col.key" 
+            class="u-table-cell"
+            :class="[col.align ? 'u-text-' + col.align : '',
+                cellClassName ? cellClassName(row, col) : '',
+                getFixedClass(col),
+                getCellSpanClass(rowIndex, colIndex)
+            ]"
+            :style="[cellStyleInner({row: row, column: col, rowIndex: rowIndex, columnIndex: colIndex, level: level}), getCellSpanStyle(rowIndex, colIndex)]">
+                <!-- 复选框列 -->
+                <view v-if="col.type === 'selection'">
+                    <checkbox :checked="isSelected(row)"
+                        @click.stop="$emit('toggleSelect', row)" />
+                </view>
+                <template v-else>
+                    <!-- 在mainCol列显示展开图标 -->
+                    <view v-if="col.key === computedMainCol && hasTree"
+                        @click.stop="toggleExpand(row)" :style="{width: expandWidth}">
+                        <view v-if="row.children && row.children.length > 0">
+                            {{ isExpanded(row) ? '▼' : '▶' }}
+                        </view>
+                    </view>
+                    <slot name="cellChild" :row="row" :column="col" :prow="parentRow"
+                        :rowIndex="rowIndex" :columnIndex="colIndex" :level="level">
+                        <view class="u-table-cell_content">
+                            {{ row[col.key] }}
+                        </view>
+                    </slot>
+                </template>
+        </view>
+    </view>
+    <!-- 递归渲染更深层的子级 -->
+        <template v-if="isExpanded(row) && row[treeProps.children] && row[treeProps.children].length">
+            <template v-for="(rowChild, childIndex) in row[treeProps.children]" :key="rowChild[rowKey] || childIndex">
+                <table-row 
+                    :row="rowChild" 
+                    :rowIndex="childIndex"
+                    :parent-row="row"
+                    :columns="columns"
+                    :tree-props="treeProps"
+                    :row-key="rowKey"
+                    :expanded-keys="expandedKeys"
+                    :cell-style-inner="cellStyleInner"
+                    :is-expanded="isExpanded"
+                    :row-class-name="rowClassName"
+                    :stripe="stripe"
+                    :cell-class-name="cellClassName"
+                    :get-fixed-class="getFixedClass"
+                    :highlight-current-row="highlightCurrentRow"
+                    :current-row="currentRow"
+                    :handle-row-click="handleRowClick"
+                    :toggle-expand="toggleExpand"
+                    :level="level + 1"
+                    :rowHeight="rowHeight"
+                    :hasTree="hasTree"
+                    :selectedRows="selectedRows"
+                    :expandWidth="expandWidth"
+                    :computed-main-col="computedMainCol"
+                    :span-method="spanMethod"
+                    @toggle-select="$emit('toggleSelect', $event)"
+                    @row-click="$emit('rowClick', $event)"
+                    @toggle-expand="$emit('toggleExpand', $event)"
+                >
+                <template v-slot:cellChild="scope">
+                    <slot name="cellChild" :row="scope.row" :column="scope.column" :prow="scope.prow"
+                        :rowIndex="scope.rowIndex" :columnIndex="scope.columnIndex" :level="level">
+                    </slot>                      
+                </template>
+                </table-row>
+            </template>
+        </template>
+</template>
+
+<script>
+export default {
+    name: 'tableRow',
+    props: {
+        row: {
+            type: Object,
+            required: true
+        },
+        rowIndex: {
+            type: Number,
+            required: true
+        },
+        parentRow: {
+            type: Object,
+            default: null
+        },
+        columns: {
+            type: Array,
+            required: true
+        },
+        treeProps: {
+            type: Object,
+            required: true
+        },
+        rowKey: {
+            type: String,
+            required: true
+        },
+        expandedKeys: {
+            type: Array,
+            required: true
+        },
+        cellStyleInner: {
+            type: Function,
+            required: true
+        },
+        isExpanded: {
+            type: Function,
+            required: true
+        },
+        rowClassName: {
+            type: Function,
+            default: null
+        },
+        stripe: {
+            type: Boolean,
+            default: false
+        },
+        cellClassName: {
+            type: Function,
+            default: null
+        },
+        getFixedClass: {
+            type: Function,
+            required: true
+        },
+        highlightCurrentRow: {
+            type: Boolean,
+            default: false
+        },
+        currentRow: {
+            type: Object,
+            default: null
+        },
+        handleRowClick: {
+            type: Function,
+            required: true
+        },
+        toggleExpand: {
+            type: Function,
+            required: true
+        },
+        level: {
+            type: Number,
+            required: true
+        },
+        // 添加computedMainCol属性
+        computedMainCol: {
+            type: String,
+            required: true
+        },
+        expandWidth: {
+            type: String,
+            required: true
+        },
+        hasTree: {
+            type: Boolean,
+            required: false
+        },
+        selectedRows: {
+            type: Array,
+            required: false
+        },
+        rowHeight: {
+            type: String,
+            required: true
+        },
+        // 添加spanMethod属性
+        spanMethod: {
+            type: Function,
+            default: null
+        }
+    },
+    emits: ['rowClick', 'toggleExpand', 'toggleSelect'],
+    methods: {
+        isSelected(row) {
+            return this.selectedRows.some(r => r[this.rowKey] === row[this.rowKey]);
+        },
+        // 获取单元格的合并信息
+        getCellSpan(rowIndex, columnIndex) {
+            if (typeof this.spanMethod !== 'function') {
+                return { rowspan: 1, colspan: 1 };
+            }
+            
+            const row = this.row;
+            const column = this.columns[columnIndex];
+            
+            const result = this.spanMethod({
+                row,
+                column,
+                rowIndex,
+                columnIndex
+            });
+            
+            if (Array.isArray(result)) {
+                const [rowspan, colspan] = result;
+                return { rowspan: rowspan != null ? rowspan : 1, colspan: colspan != null ? colspan : 1 };
+            } else if (typeof result === 'object') {
+                return {
+                    rowspan: rowspan != null ? rowspan : 1,
+                    colspan: colspan != null ? colspan : 1
+                };
+            }
+            
+            return { rowspan: 1, colspan: 1 };
+        },
+        // 获取单元格的样式类
+        getCellSpanClass(rowIndex, columnIndex) {
+            const span = this.getCellSpan(rowIndex, columnIndex);
+            
+            // 如果rowspan为0或colspan为0，表示该单元格被合并，需要隐藏
+            if (span.rowspan === 0 || span.colspan === 0) {
+                return 'u-table-cell-hidden';
+            } else if (span.rowspan > 1 || span.colspan > 1) {
+                // 如果有合并，添加合并样式类
+                return 'u-table-cell-merged';
+            }
+            
+            return '';
+        },
+        // 获取单元格的样式
+        getCellSpanStyle(rowIndex, columnIndex) {
+            const span = this.getCellSpan(rowIndex, columnIndex);
+            const style = {};
+            
+            // 设置rowspan
+            if (span.rowspan > 1) {
+                // 正确计算合并后的高度
+                const currentHeight = parseInt(this.rowHeight);
+                if (!isNaN(currentHeight)) {
+                    style.height = `${span.rowspan * currentHeight}px`;
+                }
+            }
+            
+            // 设置colspan
+            if (span.colspan > 1) {
+                style.flex = span.colspan;
+            }
+            
+            // 如果rowspan为0或colspan为0，表示该单元格被合并，需要隐藏
+            if (span.rowspan === 0 || span.colspan === 0) {
+                style.display = 'none';
+            }
+            
+            return style;
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/uview-plus/components/u-table2/u-table2.vue b/uview-plus/components/u-table2/u-table2.vue
new file mode 100644
index 0000000..db075b5
--- /dev/null
+++ b/uview-plus/components/u-table2/u-table2.vue
@@ -0,0 +1,756 @@
+<template>
+    <view class="u-table2" :class="{ 'u-table-border': border }">
+        <scroll-view scroll-x scroll-y class="u-table2-content"
+            :style="{ height: height ? addUnit(height) : 'auto' }"
+            @scroll="onScroll">
+            <!-- 表头 -->
+            <view v-if="showHeader" class="u-table-header"
+                :class="{ 'u-table-sticky': fixedHeader }"
+                :style="{minWidth: scrollWidth}">
+                <view class="u-table-row">
+                    <view v-for="(col, colIndex) in columns" :key="col.key" class="u-table-cell"
+                        :class="[col.headerAlign ? 'u-text-' + col.headerAlign : (col.align ? 'u-text-' + col.align : '') ,
+                            headerCellClassName ? headerCellClassName(col) : '',
+                            getFixedClass(col)
+                        ]" :style="headerColStyle(col)" @click="handleHeaderClick(col)">
+                        <slot name="header" :column="col" :columnIndex="colIndex" :level="1">
+                        </slot>
+                        <text v-if="!$slots['header']">{{ col.title }}</text>
+                        <template v-if="col.sortable">
+                            <slot name="headerSort" :sortStatus="getSortValue(col.key)" :column="col"
+                                :columnIndex="colIndex" :level="1">
+                            </slot>
+                            <view v-if="!$slots['headerSort']">
+                                {{ getSortIcon(col.key) }}
+                            </view>
+                        </template>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 表体 -->
+            <view class="u-table-body" :style="{ minWidth: scrollWidth, maxHeight: maxHeight ? maxHeight + 'px' : 'none' }">
+                <template v-if="data && data.length > 0">
+                    <table-row 
+                        v-for="(row, rowIndex) in sortedData"
+                        :key="row[rowKey] || rowIndex"
+                        :row="row" 
+                        :rowIndex="rowIndex"
+                        :parent-row="null"
+                        :columns="columns"
+                        :tree-props="treeProps"
+                        :row-key="rowKey"
+                        :expanded-keys="expandedKeys"
+                        :cell-style-inner="cellStyleInner"
+                        :is-expanded="isExpanded"
+                        :row-class-name="rowClassName"
+                        :stripe="stripe"
+                        :cell-class-name="cellClassName"
+                        :get-fixed-class="getFixedClass"
+                        :highlight-current-row="highlightCurrentRow"
+                        :current-row="currentRow"
+                        :handle-row-click="handleRowClick"
+                        :toggle-expand="toggleExpand"
+                        :level="1"
+                        :rowHeight="rowHeight"
+                        :hasTree="hasTree"
+                        :selectedRows="selectedRows"
+                        :expandWidth="expandWidth"
+                        :computedMainCol="computedMainCol"
+                        :span-method="spanMethod"
+                        @toggle-select="toggleSelect"
+                        @row-click="handleRowClick"
+                        @toggle-expand="toggleExpand"
+                    >
+                        <template v-slot:cellChild="scope">
+                            <slot name="cell" :row="scope.row" :column="scope.column" :prow="scope.prow"
+                                :rowIndex="scope.rowIndex" :columnIndex="scope.columnIndex" :level="scope.level">
+                            </slot>                      
+                        </template>
+                    </table-row>
+                </template>
+                <template v-else>
+                    <slot name="empty">
+                    </slot>
+                    <view v-if="!$slots['empty']" class="u-table-empty">{{ emptyText }}</view>
+                </template>
+            </view>
+        </scroll-view>
+        
+        <!-- 固定列浮动视图 -->
+        <view v-if="showFixedColumnShadow" class="u-table-fixed-shadow" :style="{ height: tableHeight }">
+            <!-- 表头 -->
+            <view v-if="showHeader" class="u-table-header" :class="{ 'u-table-sticky': fixedHeader }" :style="{minWidth: scrollWidth}">
+                <view class="u-table-row" :style="{height: headerHeight}">
+                    <view v-for="(col, colIndex) in visibleFixedLeftColumns" :key="col.key" class="u-table-cell"
+                        :style="headerColStyle(col)"
+                        :class="[col.align ? 'u-text-' + col.align : '',
+                            headerCellClassName ? headerCellClassName(col) : '',
+                            getFixedClass(col)
+                        ]" @click="handleHeaderClick(col)">
+                        <slot name="header" :column="col" :columnIndex="colIndex" :level="1">
+                        </slot>
+                        <text v-if="!$slots['header']">{{ col.title }}</text>
+                        <template v-if="col.sortable">
+                            <slot name="headerSort" :sortStatus="getSortValue(col.key)" :column="col"
+                                :columnIndex="colIndex" :level="1">
+                            </slot>
+                            <view v-if="!$slots['headerSort']">
+                                {{ getSortIcon(col.key) }}
+                            </view>
+                        </template>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 表体 -->
+            <view class="u-table-body" :style="{ minWidth: scrollWidth, maxHeight: maxHeight ? maxHeight + 'px' : 'none' }">
+                <template v-if="data && data.length > 0">
+                    <template v-for="(row, rowIndex) in sortedData" :key="row[rowKey] || rowIndex">
+                        <!-- 子级渲染 (递归组件) -->
+                        <table-row 
+                            :row="row" 
+                            :rowIndex="rowIndex"
+                            :parent-row="null"
+                            :columns="visibleFixedLeftColumns"
+                            :tree-props="treeProps"
+                            :row-key="rowKey"
+                            :expanded-keys="expandedKeys"
+                            :cell-style-inner="cellStyleInner"
+                            :is-expanded="isExpanded"
+                            :row-class-name="rowClassName"
+                            :stripe="stripe"
+                            :cell-class-name="cellClassName"
+                            :get-fixed-class="getFixedClass"
+                            :highlight-current-row="highlightCurrentRow"
+                            :current-row="currentRow"
+                            :handle-row-click="handleRowClick"
+                            :toggle-expand="toggleExpand"
+                            :level="1"
+                            :rowHeight="rowHeight"
+                            :hasTree="hasTree"
+                            :selectedRows="selectedRows"
+                            :expandWidth="expandWidth"
+                            :computedMainCol="computedMainCol"
+                            :span-method="spanMethod"
+                            @toggle-select="toggleSelect"
+                            @row-click="handleRowClick"
+                            @toggle-expand="toggleExpand"
+                        >
+                            <template v-slot:cellChild="scope">
+                                <slot name="cell" :row="scope.row" :column="scope.column" :prow="scope.prow"
+                                    :rowIndex="scope.rowIndex" :columnIndex="scope.columnIndex" :level="scope.level">
+                                </slot>                      
+                            </template>
+                        </table-row>
+                    </template>
+                </template>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import { addUnit, sleep } from '../../libs/function/index';
+import tableRow from './tableRow.vue'; // 引入递归组件
+
+export default {
+    name: 'u-table2',
+    components: {
+        tableRow // 注册递归组件
+    },
+    props: {
+        data: {
+            type: Array,
+            required: true,
+            default: () => {
+                return []
+            }
+        },
+        columns: {
+            type: Array,
+            required: true,
+            default: () => {
+                return []
+            },
+            validator: cols =>
+                cols.every(col =>
+                    ['default', 'selection', 'expand'].includes(col.type || 'default')
+                )
+        },
+        stripe: {
+            type: Boolean,
+            default: false
+        },
+        border: {
+            type: Boolean,
+            default: false
+        },
+        height: {
+            type: [String, Number],
+            default: null
+        },
+        maxHeight: {
+            type: [String, Number],
+            default: null
+        },
+        showHeader: {
+            type: Boolean,
+            default: true
+        },
+        highlightCurrentRow: {
+            type: Boolean,
+            default: false
+        },
+        rowKey: {
+            type: String,
+            default: 'id'
+        },
+        currentRowKey: {
+            type: [String, Number],
+            default: null
+        },
+        rowStyle: {
+            type: Object,
+            default: () => ({})
+        },
+        cellClassName: {
+            type: Function,
+            default: null
+        },
+		cellStyle: {
+		    type: Function,
+		    default: null
+		},
+        headerCellClassName: {
+            type: Function,
+            default: null
+        },
+        rowClassName: {
+            type: Function,
+            default: null
+        },
+        context: {
+            type: Object,
+            default: null
+        },
+        showOverflowTooltip: {
+            type: Boolean,
+            default: false
+        },
+        lazy: {
+            type: Boolean,
+            default: false
+        },
+        load: {
+            type: Function,
+            default: null
+        },
+        treeProps: {
+            type: Object,
+            default: () => ({
+                children: 'children',
+                hasChildren: 'hasChildren'
+            })
+        },
+        defaultExpandAll: {
+            type: Boolean,
+            default: false
+        },
+        expandRowKeys: {
+            type: Array,
+            default: () => []
+        },
+        sortOrders: {
+            type: Array,
+            default: () => ['ascending', 'descending']
+        },
+        sortable: {
+            type: [Boolean, String],
+            default: false
+        },
+        multiSort: {
+            type: Boolean,
+            default: false
+        },
+        sortBy: {
+            type: String,
+            default: null
+        },
+        sortMethod: {
+            type: Function,
+            default: null
+        },
+        filters: {
+            type: Object,
+            default: () => ({})
+        },
+        fixedHeader: {
+            type: Boolean,
+            default: true
+        },
+        emptyText: {
+            type: String,
+            default: '暂无数据'
+        },
+        // 添加mainCol属性，用于指定树形结构展开控制图标所在的列
+        mainCol: {
+            type: String,
+            default: ''
+        },
+        expandWidth: {
+            type: String,
+            default: '25px'
+        },
+        rowHeight: {
+            type: String,
+            default: '36px'
+        },
+        // 添加spanMethod属性，用于合并单元格
+        spanMethod: {
+            type: Function,
+            default: null
+        }
+    },
+    emits: [
+        'select', 'select-all', 'selection-change',
+        'cell-click', 'row-click', 'row-dblclick',
+        'header-click', 'sort-change', 'filter-change',
+        'current-change', 'expand-change'
+    ],
+    data() {
+        return {
+            scrollWidth: 'auto',
+            // 将setup中的ref转换为data属性
+            expandedKeys: [...this.expandRowKeys],
+            selectedRows: [],
+            sortConditions: [],
+            currentRow: null,
+            scrollLeft: 0, // 新增滚动位置数据
+            showFixedColumnShadow: false, // 是否显示固定列阴影
+            fixedLeftColumns: [], // 左侧固定列
+            tableHeight: 'auto', // 表格高度
+            headerHeight: 'auto', // 新增表头高度属性
+            hasTree: false // 新增属性，用于判断是否存在树形结构
+        }
+    },
+    mounted() {
+        this.getComponentWidth()
+        // 处理currentRowKey初始化
+        if (this.currentRowKey !== null) {
+            const found = this.data.find(item => item[this.rowKey] === this.currentRowKey);
+            if (found) {
+                this.currentRow = found;
+            }
+        }
+        // 获取固定列
+        this.fixedLeftColumns = this.columns.filter(col => col.fixed === 'left');
+    },
+    computed: {
+        // 将setup中的computed转换为computed属性
+        filteredData() {
+            return this.data.filter(row => {
+                return Object.keys(this.filters).every(key => {
+                    const filter = this.filters[key];
+                    if (!filter) return true;
+                    return row[key]?.toString().includes(filter.toString());
+                });
+            });
+        },
+        sortedData() {
+            if (!this.sortConditions.length) return this.filteredData;
+
+            const data = [...this.filteredData];
+
+            return data.sort((a, b) => {
+                for (const condition of this.sortConditions) {
+                    const { field, order } = condition;
+                    let valA = a[field];
+                    let valB = b[field];
+
+                    if (this.sortMethod) {
+                        const result = this.sortMethod(a, b, field);
+                        if (result !== 0) return result * (order === 'ascending' ? 1 : -1);
+                    }
+
+                    if (valA < valB) return order === 'ascending' ? -1 : 1;
+                    if (valA > valB) return order === 'ascending' ? 1 : -1;
+                }
+                return 0;
+            });
+        },
+        // 计算当前应该显示的固定左侧列
+        visibleFixedLeftColumns() {
+            if (this.scrollLeft <= 0) {
+                return [];
+            }
+            
+            let totalWidth = 0;
+            let fixedWidth = 0;
+            const visibleColumns = [];
+            
+            // 遍历所有列，不仅仅是固定列
+            for (let i = 0; i < this.columns.length; i++) {
+                const col = this.columns[i];
+                const colWidth = col.width ? parseInt(col.width) : 100; // 默认宽度100px
+                
+                // 如果是固定列且滚动位置足够显示该列
+                if (col.fixed === 'left' && this.scrollLeft > totalWidth - fixedWidth) {
+                    visibleColumns.push(col);
+                    fixedWidth += colWidth;
+                }
+                
+                totalWidth += colWidth;
+            }
+            
+            return visibleColumns;
+        },
+        // 获取mainCol的值，如果未设置则默认为第一列的key
+        computedMainCol() {
+            if (this.mainCol) {
+                return this.mainCol;
+            }
+            // 修改为排除有type值的列
+            const validColumns = this.columns.filter(col => !col.type);
+            let mainCol = validColumns && validColumns.length > 0 ? validColumns[0].key : '';
+            // console.log('mainCol', mainCol)
+            return mainCol;
+        }
+    },
+    watch: {
+        // 将setup中的watch转换为watch属性
+        expandRowKeys: {
+            handler(newVal) {
+                this.expandedKeys = [...newVal];
+            },
+            immediate: true
+        },
+        currentRowKey: {
+            handler(newVal) {
+                const found = this.data.find(item => item[this.rowKey] === newVal);
+                if (found) {
+                    this.currentRow = found;
+                }
+            },
+            immediate: true
+        },
+        columns: {
+            handler() {
+                // this.fixedLeftColumns = this.columns.filter(col => col.fixed === 'left');
+            },
+            deep: true,
+            immediate: false
+        }
+    },
+    methods: {
+        addUnit,
+        onScroll(e) {
+            this.scrollLeft = e.detail.scrollLeft;
+            // 获取所有左侧固定列
+            this.fixedLeftColumns = this.columns.filter(col => col.fixed === 'left');
+            // 计算是否需要显示固定列阴影
+            if (this.fixedLeftColumns.length > 0) {
+                this.showFixedColumnShadow = this.scrollLeft > 0;
+            }
+        },
+        
+        getFixedShadowStyle(col, index) {
+            let style = {
+                width: col.width ? addUnit(col.width) : 'auto',
+            };
+            
+            if (col?.style) {
+                style = {...style, ...col?.style};
+            }
+            
+            return style;
+        },
+        
+        getFixedClass(col) {
+            return ''; // 不再使用原来的固定列样式类
+        },
+        
+        headerColStyle(col) {
+            let style = {
+                width: col.width ? addUnit(col.width) : 'auto',
+                flex: col.width ? 'none' : 1
+            };
+            if (col?.style) {
+                style = {...style, ...col?.style};
+            }
+            return style;
+        },
+        
+		setCellStyle(e) {
+			this.cellStyle = e
+		},
+		cellStyleInner(scope) {
+			let style = {
+				width: scope.column?.width ? addUnit(scope.column.width) : 'auto',
+				flex: scope.column?.width ? 'none' : 1
+			};
+            // 只有展开列设置padding
+            if (scope.column.key == this.computedMainCol) {
+                style.paddingLeft = (16 * (scope.level -1 )) + 2 + 'px'
+            }
+			if (this.cellStyle != null) {
+				let styleCalc = this.cellStyle(scope)
+				if (styleCalc != null) {
+					style = {...style, ...styleCalc}
+				}
+			}
+			return style;
+		},
+        // 获取组件的宽度
+		async getComponentWidth() {
+			// 延时一定时间，以获取dom尺寸
+			await sleep(30)
+			this.$uGetRect('.u-table-row').then(size => {
+				this.scrollWidth = size.width + 'px'
+			})
+            
+            // 获取表头高度并设置
+            this.$uGetRect('.u-table-header').then(size => {
+                if (size.height) {
+                    this.headerHeight = size.height + 'px';
+                }
+            })
+            
+            // 遍历数据列表第一层判断是否存在树形结构
+            this.hasTree = this.sortedData.some(item => {
+                return item[this.treeProps.children] && item[this.treeProps.children].length > 0;
+            });
+		},
+        // 将setup中的函数转换为methods
+        handleRowClick(row) {
+            if (this.highlightCurrentRow) {
+                const oldRow = this.currentRow;
+                this.currentRow = row;
+                this.$emit('current-change', row, oldRow);
+            }
+            this.$emit('row-click', row);
+        },
+        handleHeaderClick(column) {
+            if (!column.sortable) return;
+
+            const index = this.sortConditions.findIndex(c => c.field === column.key);
+            let newOrder = 'ascending';
+
+            if (index >= 0) {
+                if (this.sortConditions[index].order === 'ascending') {
+                    newOrder = 'descending';
+                } else {
+                    this.sortConditions.splice(index, 1);
+                    this.$emit('sort-change', this.sortConditions);
+                    return;
+                }
+            }
+
+            if (!this.multiSort) {
+                this.sortConditions = [{ field: column.key, order: newOrder }];
+            } else {
+                if (index >= 0) {
+                    this.sortConditions[index].order = newOrder;
+                } else {
+                    this.sortConditions.push({ field: column.key, order: newOrder });
+                }
+            }
+
+            this.$emit('sort-change', this.sortConditions);
+        },
+        getSortIcon(field) {
+            const cond = this.sortConditions.find(c => c.field === field);
+            if (!cond) return '';
+            return cond.order === 'ascending' ? '↑' : '↓';
+        },
+        getSortValue(field) {
+            const cond = this.sortConditions.find(c => c.field === field);
+            if (!cond) return '';
+            return cond.order === 'ascending';
+        },
+        toggleSelect(row) {
+            const index = this.selectedRows.findIndex(r => r[this.rowKey] === row[this.rowKey]);
+            if (index >= 0) {
+                // 取消选中当前行及其所有子节点
+                this.selectedRows.splice(index, 1);
+                // 递归取消所有子节点
+                this.unselectChildren(row);
+            } else {
+                // 选中当前行及其所有子节点
+                this.selectedRows.push(row);
+                // 递归选中所有子节点
+                this.selectChildren(row);
+            }
+            console.log(this.selectedRows)
+            this.$emit('selection-change', this.selectedRows);
+            this.$emit('select', row);
+        },
+        toggleExpand(row) {
+            // console.log(row)
+            const key = row[this.rowKey];
+            const index = this.expandedKeys.indexOf(key);
+            if (index === -1) {
+                this.expandedKeys.push(key);
+            } else {
+                this.expandedKeys.splice(index, 1);
+            }
+            this.$emit('expand-change', this.expandedKeys);
+        },
+        isExpanded(row) {
+            if (!row) {
+                return false;
+            }
+            return this.expandedKeys.includes(row[this.rowKey]);
+        },
+        // 新增方法：递归选中所有子节点
+        selectChildren(row) {
+            const children = row[this.treeProps.children];
+            if (children && children.length > 0) {
+                children.forEach(child => {
+                    // 检查是否已选中，避免重复添加
+                    const childIndex = this.selectedRows.findIndex(r => r[this.rowKey] === child[this.rowKey]);
+                    if (childIndex === -1) {
+                        this.selectedRows.push(child);
+                    }
+                    // 递归处理子节点的子节点
+                    this.selectChildren(child);
+                });
+            }
+        },
+        // 新增方法：递归取消选中所有子节点
+        unselectChildren(row) {
+            const children = row[this.treeProps.children];
+            if (children && children.length > 0) {
+                children.forEach(child => {
+                    const childIndex = this.selectedRows.findIndex(r => r[this.rowKey] === child[this.rowKey]);
+                    if (childIndex >= 0) {
+                        this.selectedRows.splice(childIndex, 1);
+                    }
+                    // 递归处理子节点的子节点
+                    this.unselectChildren(child);
+                });
+            }
+        },
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+.u-table2 {
+    width: auto;
+    overflow: auto;
+    white-space: nowrap;
+    position: relative;
+
+    .u-table-header {
+        min-width: 100% !important;
+        width: fit-content;
+        background-color: #f5f7fa;
+    }
+
+    .u-table-body {
+        min-width: 100% !important;
+        width: fit-content;
+        position: relative;
+    }
+
+    .u-table-sticky {
+        position: sticky;
+        top: 0;
+        z-index: 10;
+    }
+
+    .u-table-row {
+        display: flex;
+        flex-direction: row;
+        overflow: hidden;
+        position: relative;
+        // min-height: 40px;
+    }
+
+    // 添加border样式支持
+    &.u-table-border {
+        border-top: 1px solid #ebeef5;
+        border-left: 1px solid #ebeef5;
+        border-right: 1px solid #ebeef5;
+        .u-table-cell {
+            border-right: 1px solid #ebeef5;
+        }
+        
+        .u-table-cell:last-child {
+            border-right: none;
+        }
+    }
+
+    .u-table-cell {
+        flex: 1;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        padding: 10px 1px;
+        font-size: 14px;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        line-height: 1.1;
+        border-bottom: 1px solid #ebeef5;
+        &.u-text-left {
+            justify-content: flex-start;
+            text-align: left;
+        }
+        &.u-text-center {
+            justify-content: center;
+            text-align: center;
+        }
+        &.u-text-right {
+            justify-content: flex-end;
+            text-align: right;
+        }
+    }
+
+    .u-table-row-zebra {
+        background-color: #fafafa;
+    }
+
+    .u-table-row-highlight {
+        background-color: #f5f7fa;
+    }
+
+    .u-table-empty {
+        text-align: center;
+        padding: 20px;
+        color: #999;
+    }
+}
+
+// 固定列浮动视图
+.u-table-fixed-shadow {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: auto;
+    z-index: 20;
+    box-shadow: 2px 0 5px rgba(0, 0, 0, 0.15);
+    overflow: hidden;
+    background-color: #ffffff;
+}
+
+// .u-table-fixed-row {
+//     display: flex;
+//     flex-direction: row;
+//     align-items: center;
+//     border-bottom: 1rpx solid #ebeef5;
+//     position: relative;
+// }
+
+// 为固定列也添加border样式支持
+.u-table-fixed-shadow .u-table-border {
+    .u-table-cell {
+        border-right: 1rpx solid #ebeef5;
+    }
+    
+    .u-table-cell:last-child {
+        border-right: none;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/uview-plus/components/u-tabs-item/u-tabs-item.vue b/uview-plus/components/u-tabs-item/u-tabs-item.vue
index 3ba1db0..58d9cc5 100644
--- a/uview-plus/components/u-tabs-item/u-tabs-item.vue
+++ b/uview-plus/components/u-tabs-item/u-tabs-item.vue
@@ -11,7 +11,7 @@
 	/**
 	 * TabsItem  tabs标签组件的自组件
 	 * @description tabs标签组件，在标签多的时候，可以配置为左右滑动，标签少的时候，可以禁止滑动。 该组件的一个特点是配置为滚动模式时，激活的tab会自动移动到组件的中间位置。
-	 * @tutorial https://ijry.github.io/uview-plus/components/tabs.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/tabs.html
 	 * @property {type}	prop_name
 	 * @event {Function()} 
 	 * @example 
diff --git a/uview-plus/components/u-tabs/props.js b/uview-plus/components/u-tabs/props.js
index bce1598..5684818 100644
--- a/uview-plus/components/u-tabs/props.js
+++ b/uview-plus/components/u-tabs/props.js
@@ -61,6 +61,11 @@ export const props = defineMixin({
 		keyName: {
 			type: String,
 			default: () => defProps.tabs.keyName
-		}
+		},
+        // 左侧图标样式
+        iconStyle: {
+            type: [String, Object],
+            default: () => defProps.tabs.iconStyle
+        }
     }
 })
diff --git a/uview-plus/components/u-tabs/tabs.js b/uview-plus/components/u-tabs/tabs.js
index 817e2d2..089512f 100644
--- a/uview-plus/components/u-tabs/tabs.js
+++ b/uview-plus/components/u-tabs/tabs.js
@@ -1,18 +1,18 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:23:14
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/tabs.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/tabs.js
  */
 export default {
     //
     tabs: {
         duration: 300,
         list: [],
-        lineColor: '#3c9cff',
+        lineColor: '',
         activeStyle: {
             color: '#303133'
         },
@@ -27,6 +27,7 @@ export default {
         },
         scrollable: true,
 		current: 0,
-		keyName: 'name'
+		keyName: 'name',
+        iconStyle: {}
     }
 }
diff --git a/uview-plus/components/u-tabs/u-tabs.vue b/uview-plus/components/u-tabs/u-tabs.vue
index 8a37d9f..109f894 100644
--- a/uview-plus/components/u-tabs/u-tabs.vue
+++ b/uview-plus/components/u-tabs/u-tabs.vue
@@ -3,38 +3,28 @@
 		<view class="u-tabs__wrapper">
 			<slot name="left" />
 			<view class="u-tabs__wrapper__scroll-view-wrapper">
-				<scroll-view
-					:scroll-x="scrollable"
-					:scroll-left="scrollLeft"
-					scroll-with-animation
-					class="u-tabs__wrapper__scroll-view"
-					:show-scrollbar="false"
-					ref="u-tabs__wrapper__scroll-view"
-				>
-					<view
-						class="u-tabs__wrapper__nav"
-						ref="u-tabs__wrapper__nav"
-					>
-						<view
-							class="u-tabs__wrapper__nav__item"
-							v-for="(item, index) in list"
-							:key="index"
-							@tap="clickHandler(item, index)"
-							@longpress="longPressHandler(item,index)"
+				<scroll-view :scroll-x="scrollable" :scroll-left="scrollLeft" scroll-with-animation
+					class="u-tabs__wrapper__scroll-view" :show-scrollbar="false" ref="u-tabs__wrapper__scroll-view">
+					<view class="u-tabs__wrapper__nav" ref="u-tabs__wrapper__nav">
+						<view class="u-tabs__wrapper__nav__item" v-for="(item, index) in tabList" :key="index"
+							@tap="clickHandler(item, index)" @longpress="longPressHandler(item,index)"
 							:ref="`u-tabs__wrapper__nav__item-${index}`"
-							:style="[addStyle(itemStyle), {flex: scrollable ? '' : 1}]"
-							:class="[`u-tabs__wrapper__nav__item-${index}`, item.disabled && 'u-tabs__wrapper__nav__item--disabled']"
-						>
+							:style="[addStyle(itemStyle), {flex: scrollable ? '' : 1}]" :class="[`u-tabs__wrapper__nav__item-${index}`,
+								item.disabled && 'u-tabs__wrapper__nav__item--disabled',
+								innerCurrent == index ? 'u-tabs__wrapper__nav__item-active' : '']">
+							<slot v-if="$slots.icon" name="icon" :item="item" :keyName="keyName" :index="index" />
+							<template v-else>
+								<view class="u-tabs__wrapper__nav__item__prefix-icon" v-if="item.icon">
+									<up-icon :name="item.icon" :customStyle="addStyle(iconStyle)"></up-icon>
+								</view>
+							</template>
 							<slot v-if="$slots.content" name="content" :item="item" :keyName="keyName" :index="index" />
-							<slot v-else-if="!$slots.content && ($slots.default || $slots.$default)"
-								:item="item" :keyName="keyName" :index="index" />
-							<text v-else
-								:class="[item.disabled && 'u-tabs__wrapper__nav__item__text--disabled']"
+							<slot v-else-if="!$slots.content && ($slots.default || $slots.$default)" :item="item"
+								:keyName="keyName" :index="index" />
+							<text v-else :class="[item.disabled && 'u-tabs__wrapper__nav__item__text--disabled']"
 								class="u-tabs__wrapper__nav__item__text"
-								:style="[textStyle(index)]"
-							>{{ item[keyName] }}</text>
-							<u-badge
-								:show="!!(item.badge && (item.badge.show || item.badge.isDot || item.badge.value))"
+								:style="[textStyle(index)]">{{ item[keyName] }}</text>
+							<u-badge :show="!!(item.badge && (item.badge.show || item.badge.isDot || item.badge.value))"
 								:isDot="item.badge && item.badge.isDot || propsBadge.isDot"
 								:value="item.badge && item.badge.value || propsBadge.value"
 								:max="item.badge && item.badge.max || propsBadge.max"
@@ -45,35 +35,28 @@
 								:shape="item.badge && item.badge.shape || propsBadge.shape"
 								:numberType="item.badge && item.badge.numberType || propsBadge.numberType"
 								:inverted="item.badge && item.badge.inverted || propsBadge.inverted"
-								customStyle="margin-left: 4px;"
-							></u-badge>
+								customStyle="margin-left: 4px;"></u-badge>
 						</view>
 						<!-- #ifdef APP-NVUE -->
-						<view
-							class="u-tabs__wrapper__nav__line"
-							ref="u-tabs__wrapper__nav__line"
-							:style="[{
+						<view class="u-tabs__wrapper__nav__line" ref="u-tabs__wrapper__nav__line" :style="[{
 								width: addUnit(lineWidth),
 								height: addUnit(lineHeight),
 								background: lineColor,
 								backgroundSize: lineBgSize,
-							}]"
-						>
+							}]">
 						</view>
 						<!-- #endif -->
 						<!-- #ifndef APP-NVUE -->
-						<view
-							class="u-tabs__wrapper__nav__line"
-							ref="u-tabs__wrapper__nav__line"
+						<view class="u-tabs__wrapper__nav__line" ref="u-tabs__wrapper__nav__line"
 							:style="[{
 								width: addUnit(lineWidth),
 								transform: `translate(${lineOffsetLeft}px)`,
-								transitionDuration: `${firstTime ? 0 : duration}ms`,
+								transitionDuration: `${duration}ms`,
 								height: addUnit(lineHeight),
 								background: lineColor,
 								backgroundSize: lineBgSize,
-							}]"
-						>
+								display: lineShow ? 'block': 'none'
+							}]">
 						</view>
 						<!-- #endif -->
 					</view>
@@ -89,15 +72,29 @@
 	const animation = uni.requireNativePlugin('animation')
 	const dom = uni.requireNativePlugin('dom')
 	// #endif
-	import { props } from './props';
-	import { mpMixin } from '../../libs/mixin/mpMixin';
-	import { mixin } from '../../libs/mixin/mixin';
+	import {
+		props
+	} from './props';
+	import {
+		mpMixin
+	} from '../../libs/mixin/mpMixin';
+	import {
+		mixin
+	} from '../../libs/mixin/mixin';
 	import defProps from '../../libs/config/props.js'
-	import { addUnit, addStyle, deepMerge, getPx, sleep, sys } from '../../libs/function/index';
+	import {
+		addUnit,
+		addStyle,
+		deepMerge,
+		deepClone,
+		getPx,
+		sleep,
+		getWindowInfo
+	} from '../../libs/function/index';
 	/**
 	 * Tabs 标签
 	 * @description tabs标签组件，在标签多的时候，可以配置为左右滑动，标签少的时候，可以禁止滑动。 该组件的一个特点是配置为滚动模式时，激活的tab会自动移动到组件的中间位置。
-	 * @tutorial https://ijry.github.io/uview-plus/components/tabs.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/tabs.html
 	 * @property {String | Number}	duration			滑块移动一次所需的时间，单位秒（默认 200 ）
 	 * @property {String | Number}	swierWidth			swiper的宽度（默认 '750rpx' ）
 	 * @property {String}	keyName	 从`list`元素对象中读取的键名（默认 'name' ）
@@ -111,10 +108,11 @@
 		mixins: [mpMixin, mixin, props],
 		data() {
 			return {
-				firstTime: true,
+				tabList: [],
 				scrollLeft: 0,
 				scrollViewWidth: 0,
 				lineOffsetLeft: 0,
+				lineShow: false,
 				tabsRect: {
 					left: 0
 				},
@@ -125,7 +123,7 @@
 		watch: {
 			current: {
 				immediate: true,
-				handler (newValue, oldValue) {
+				handler(newValue, oldValue) {
 					// 内外部值不相等时，才尝试移动滑块
 					if (newValue !== this.innerCurrent) {
 						if (typeof newValue == 'string') {
@@ -140,10 +138,16 @@
 				}
 			},
 			// list变化时，重新渲染list各项信息
-			list() {
-				this.$nextTick(() => {
-					this.resize()
-				})
+			list: {
+				handler(newValue, oldValue) {
+					// 重新拷贝一份list用于增加其他额外信息处理后导致重复监听的死循环
+					this.tabList = deepClone(newValue);
+					this.$nextTick(() => {
+						this.resize()
+					})
+				},
+				immediate: true,
+				deep: true,
 			}
 		},
 		computed: {
@@ -151,11 +155,11 @@
 				return index => {
 					const style = {}
 					// 取当期是否激活的样式
-					const customeStyle = (index == this.innerCurrent)
-						? addStyle(this.activeStyle) 
-						: addStyle(this.inactiveStyle)
+					const customeStyle = (index == this.innerCurrent) ?
+						addStyle(this.activeStyle) :
+						addStyle(this.inactiveStyle)
 					// 如果当前菜单被禁用，则加上对应颜色，需要在此做处理，是因为nvue下，无法在style样式中通过!import覆盖标签的内联样式
-					if (this.list[index].disabled) {
+					if (this.tabList[index].disabled) {
 						style.color = '#c8c9cc'
 					}
 					return deepMerge(customeStyle, style)
@@ -167,35 +171,37 @@
 		},
 		async mounted() {
 			this.init()
+			this.windowResizeCallback = (res) => {
+				this.init()
+			}
+			uni.onWindowResize(this.windowResizeCallback)
+		},
+		beforeUnmount() {
+			uni.offWindowResize(this.windowResizeCallback)
 		},
 		emits: ['click', 'longPress', 'change', 'update:current'],
 		methods: {
 			addStyle,
 			addUnit,
 			setLineLeft() {
-				const tabItem = this.list[this.innerCurrent];
+				const tabItem = this.tabList[this.innerCurrent];
 				if (!tabItem) {
 					return;
 				}
 				// 获取滑块该移动的位置
-				let lineOffsetLeft = this.list
+				let lineOffsetLeft = this.tabList
 					.slice(0, this.innerCurrent)
 					.reduce((total, curr) => total + curr.rect.width, 0);
-                // 获取下划线的数值px表示法
+				// 获取下划线的数值px表示法
 				const lineWidth = getPx(this.lineWidth);
 				this.lineOffsetLeft = lineOffsetLeft + (tabItem.rect.width - lineWidth) / 2
 				// #ifdef APP-NVUE
 				// 第一次移动滑块，无需过渡时间
-				this.animation(this.lineOffsetLeft, this.firstTime ? 0 : parseInt(this.duration))
+				this.animation(this.lineOffsetLeft, parseInt(this.duration))
 				// #endif
 
-				// 如果是第一次执行此方法，让滑块在初始化时，瞬间滑动到第一个tab item的中间
-				// 这里需要一个定时器，因为在非nvue下，是直接通过style绑定过渡时间，需要等其过渡完成后，再设置为false(非第一次移动滑块)
-				if (this.firstTime) {
-					setTimeout(() => {
-						this.firstTime = false
-					}, 10);
-				}
+				// 如果是第一次执行此方法，滑块默认不显示，在加载完成后进行显示
+				if (!this.lineShow) this.lineShow = true;
 			},
 			// nvue下设置滑块的位置
 			animation(x, duration = 0) {
@@ -218,8 +224,12 @@
 				}, index)
 				// 如果disabled状态，返回
 				if (item.disabled) return
+				// 如果点击当前不触发change
+				if (this.innerCurrent == index) return
 				this.innerCurrent = index
-				this.resize()
+				this.$nextTick(() => {
+					this.resize()
+				})
 				this.$emit('update:current', index)
 				this.$emit('change', {
 					...item,
@@ -241,17 +251,17 @@
 			setScrollLeft() {
 				// 当前活动tab的布局信息，有tab菜单的width和left(为元素左边界到父元素左边界的距离)等信息
 				if (this.innerCurrent < 0) {
-                    this.innerCurrent = 0;
-                }
-				const tabRect = this.list[this.innerCurrent]
+					this.innerCurrent = 0;
+				}
+				const tabRect = this.tabList[this.innerCurrent]
 				// 累加得到当前item到左边的距离
-				const offsetLeft = this.list
+				const offsetLeft = this.tabList
 					.slice(0, this.innerCurrent)
 					.reduce((total, curr) => {
 						return total + curr.rect.width
 					}, 0)
 				// 此处为屏幕宽度
-				const windowWidth = sys().windowWidth
+				const windowWidth = getWindowInfo().windowWidth
 				// 将活动的tabs-item移动到屏幕正中间，实际上是对scroll-view的移动
 				let scrollLeft = offsetLeft - (this.tabsRect.width - tabRect.rect.width) / 2 - (windowWidth - this.tabsRect
 					.right) / 2 + this.tabsRect.left / 2
@@ -262,13 +272,14 @@
 			// 获取所有标签的尺寸
 			resize() {
 				// 如果不存在list，则不处理
-				if(this.list.length === 0) {
+				if (this.tabList.length === 0) {
 					return
 				}
 				Promise.all([this.getTabsRect(), this.getAllItemRect()]).then(([tabsRect, itemRect = []]) => {
 					// 兼容在swiper组件中使用
 					if (tabsRect.left > tabsRect.width) {
-						tabsRect.right = tabsRect.right - Math.floor(tabsRect.left / tabsRect.width) * tabsRect.width
+						tabsRect.right = tabsRect.right - Math.floor(tabsRect.left / tabsRect.width) * tabsRect
+							.width
 						tabsRect.left = tabsRect.left % tabsRect.width
 					}
 					// console.log(tabsRect)
@@ -278,7 +289,7 @@
 						// 计算scroll-view的宽度，这里
 						this.scrollViewWidth += item.width
 						// 另外计算每一个item的中心点X轴坐标
-						this.list[index].rect = item
+						this.tabList[index].rect = item
 					})
 					// 获取了tabs的尺寸之后，设置滑块的位置
 					this.setLineLeft()
@@ -294,15 +305,15 @@
 			// 获取所有标签的尺寸
 			getAllItemRect() {
 				return new Promise(resolve => {
-					const promiseAllArr = this.list.map((item, index) => this.queryRect(
-						`u-tabs__wrapper__nav__item-${index}`, true))
-					Promise.all(promiseAllArr).then(sizes => resolve(sizes))
+					const promiseAllArr = this.tabList.map((item, index) => this.queryRect(
+						`u-tabs__wrapper__nav__item-${index}`, true));
+					Promise.all(promiseAllArr).then(sizes => resolve(sizes));
 				})
 			},
 			// 获取各个标签的尺寸
 			queryRect(el, item) {
 				// #ifndef APP-NVUE
-				// $uGetRect为uView自带的节点查询简化方法，详见文档介绍：https://ijry.github.io/uview-plus/js/getRect.html
+				// $uGetRect为uView自带的节点查询简化方法，详见文档介绍：https://uview-plus.jiangruyi.com/js/getRect.html
 				// 组件内部一般用this.$uGetRect，对外的为uni.$u.getRect，二者功能一致，名称不同
 				return new Promise(resolve => {
 					this.$uGetRect(`.${el}`).then(size => {
@@ -326,8 +337,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
-
 	.u-tabs {
 
 		&__wrapper {
@@ -368,7 +377,7 @@
 					&__text {
 						font-size: 15px;
 						color: $u-content-color;
-                        white-space: nowrap !important;
+						white-space: nowrap !important;
 
 						&--disabled {
 							color: $u-disabled-color !important;
diff --git a/uview-plus/components/u-tag/props.js b/uview-plus/components/u-tag/props.js
index 998a5f2..a752b14 100644
--- a/uview-plus/components/u-tag/props.js
+++ b/uview-plus/components/u-tag/props.js
@@ -82,9 +82,35 @@ export const props = defineMixin({
             type: String,
             default: () => defProps.tag.icon,
 		},
-		iconColor: {
+        // 图标颜色
+        iconColor: {
             type: String,
-            default: () => defProps.tag.iconColor
-        }
+            default: () => defProps.tag.iconColor,
+		},
+        // 自定义尺寸字体大小
+		textSize: {
+            type: String,
+            default: () => defProps.tag.textSize
+        },
+        // 自定义尺寸高度
+        height: {
+            type: String,
+            default: () => defProps.tag.height
+        },
+        // 自定义尺寸padding
+        padding: {
+            type: String,
+            default: () => defProps.tag.padding
+        },
+        // 自定义尺寸
+        borderRadius: {
+            type: String,
+            default: () => defProps.tag.borderRadius
+        },
+        // 自动计算背景色
+        autoBgColor: {
+            type: Number,
+            default: () => defProps.tag.autoBgColor
+        },
     }
 })
diff --git a/uview-plus/components/u-tag/tag.js b/uview-plus/components/u-tag/tag.js
index e686e50..7faca9f 100644
--- a/uview-plus/components/u-tag/tag.js
+++ b/uview-plus/components/u-tag/tag.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:23:37
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/tag.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/tag.js
  */
 export default {
 	// tag 组件
@@ -25,6 +25,11 @@ export default {
 		closable: false,
 		show: true,
 		icon: '',
-		iconColor: ''
+		iconColor: '',
+		textSize: '',
+		height: '',
+		padding: '',
+		borderRadius: '',
+		autoBgColor: 0
 	}
 }
\ No newline at end of file
diff --git a/uview-plus/components/u-tag/u-tag.vue b/uview-plus/components/u-tag/u-tag.vue
index dd4d714..96de2bb 100644
--- a/uview-plus/components/u-tag/u-tag.vue
+++ b/uview-plus/components/u-tag/u-tag.vue
@@ -24,23 +24,37 @@
 							:src="icon"
 							:style="[imgStyle]"
 						></image>
-						<u-icon
+						<up-icon
 							v-else
 							:color="elIconColor"
 							:name="icon"
 							:size="iconSize"
-						></u-icon>
+						></up-icon>
 					</view>
 				</slot>
-				<text
-					class="u-tag__text"
-					:style="[textColor]"
-					:class="[`u-tag__text--${type}`, plain && `u-tag__text--${type}--plain`, `u-tag__text--${size}`]"
-				>
-					<slot>
-						{{ text }}
+				<view class="u-tag__content">
+					<slot name="content">
 					</slot>
-				</text>
+					<template v-if="!$slots.content">
+						<text
+							v-if="!$slots.default && !$slots.$default"
+							class="u-tag__text"
+							:style="[textColor]"
+							:class="[`u-tag__text--${type}`, plain && `u-tag__text--${type}--plain`, `u-tag__text--${size}`]"
+						>
+							{{ text }}
+						</text>
+						<text
+							v-else
+							class="u-tag__text"
+							:style="[textColor]"
+							:class="[`u-tag__text--${type}`, plain && `u-tag__text--${type}--plain`, `u-tag__text--${size}`]"
+						>
+							<slot>
+							</slot>
+						</text>
+					</template>
+				</view>
 			</view>
 			<view
 				class="u-tag__close"
@@ -49,11 +63,11 @@
 				@tap.stop="closeHandler"
 				:style="{backgroundColor: closeColor}"
 			>
-				<u-icon
+				<up-icon
 					name="close"
 					:size="closeSize"
 					color="#ffffff"
-				></u-icon>
+				></up-icon>
 			</view>
 		</view>
 	</u-transition>
@@ -64,10 +78,11 @@
 	import { mpMixin } from '../../libs/mixin/mpMixin';
 	import { mixin } from '../../libs/mixin/mixin';
 	import test from '../../libs/function/test';
+	import { addUnit, genLightColor } from '../../libs/function/index';
 	/**
 	 * Tag 标签
 	 * @description tag组件一般用于标记和选择，我们提供了更加丰富的表现形式，能够较全面的涵盖您的使用场景
-	 * @tutorial https://ijry.github.io/uview-plus/components/tag.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/tag.html
 	 * @property {String}			type		标签类型info、primary、success、warning、error （默认 'primary' ）
 	 * @property {Boolean | String}	disabled	不可用（默认 false ）
 	 * @property {String}			size		标签的大小，large，medium，mini （默认 'medium' ）
@@ -107,6 +122,19 @@
 				if(this.borderColor) {
 					style.borderColor = this.borderColor
 				}
+				if (this.height) {
+					style.height = addUnit(this.height)
+					style.lineHeight = addUnit(this.height)
+				}
+				if (this.padding) {
+					style.padding = this.padding
+				}
+				if (this.borderRadius) {
+					style.borderRadius = addUnit(this.borderRadius)
+				}
+				if (this.autoBgColor > 0 && this.color) {
+					style.backgroundColor = this.getBagColor(this.color)
+				}
 				return style
 			},
 			// nvue下，文本颜色无法继承父元素
@@ -115,6 +143,9 @@
 				if (this.color) {
 					style.color = this.color
 				}
+				if (this.textSize) {
+					style.textSize = addUnit(this.textSize)
+				}
 				return style
 			},
 			imgStyle() {
@@ -149,6 +180,10 @@
 			// 点击标签
 			clickHandler() {
 				this.$emit('click', this.name)
+			},
+			// 根据颜色计算浅色作为背景
+			getBagColor(darkColor) {
+				return genLightColor(darkColor, this.autoBgColor)
 			}
 		}
 	}
@@ -158,7 +193,6 @@
 	lang="scss"
 	scoped
 >
-	@import "../../libs/css/components.scss";
 
 	.u-tag-wrapper {
 		position: relative;
diff --git a/uview-plus/components/u-td/u-td.vue b/uview-plus/components/u-td/u-td.vue
index 257e87e..599a674 100644
--- a/uview-plus/components/u-td/u-td.vue
+++ b/uview-plus/components/u-td/u-td.vue
@@ -1,6 +1,6 @@
 <template>
-	<view class="u-td">
-		
+	<view class="u-td" :style="[tdStyle]">
+		<slot></slot>
 	</view>
 </template>
 
@@ -8,6 +8,7 @@
 	import { props } from './props';
 	import { mpMixin } from '../../libs/mixin/mpMixin';
 	import { mixin } from '../../libs/mixin/mixin';
+	import { addUnit, $parent } from '../../libs/function/index';
 	/** 
 	 * Td 表格中的单元格
 	 * @description 
@@ -19,15 +20,79 @@
 	export default {
 		name: 'u-td',
 		mixins: [mpMixin, mixin, props],
+		props: {
+			// 宽度，百分比或者具体带单位的值，如30%， 200rpx等，一般使用百分比
+			width: {
+				type: [String],
+				default: 'auto'
+			},
+			textAlign: {
+				type: String,
+				default: ''
+			},
+			fontSize: {
+				type: String,
+				default: ''
+			},
+			borderColor: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: ''
+			}
+		},
 		data() {
 			return {
-				
+				tdStyle: {
+					
+				}
+			}
+		},
+		created() {
+			this.parent = false;
+		},
+		mounted() {
+			this.parent = $parent.call(this, 'u-table');
+			if (this.parent) {
+				// 将父组件的相关参数，合并到本组件
+				let style = {};
+				if (this.width != "auto") style.flex = `0 0 ${this.width}`;
+				style.textAlign = this.parent.align;
+				style.fontSize = addUnit(this.parent.fontSize);
+				style.padding = this.parent.padding;
+				style.borderBottom = `solid 1px ${this.parent.borderColor}`;
+				style.borderRight = `solid 1px ${this.parent.borderColor}`;
+				style.color = this.parent.color;
+				if (this.textAlign != '') {
+					style.textAlign = this.textAlign;
+				}
+				if (this.fontSize != '') {
+					style.fontSize = this.fontSize;
+				}
+				if (this.borderColor != '') {
+					style.borderColor = this.borderColor;
+				}
+				if (this.color != '') {
+					style.color = this.color;
+				}
+				this.tdStyle = style;
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
-	
+	.u-td {
+		@include flex;
+		flex-direction: column;
+		flex: 1;
+		justify-content: center;
+		font-size: 14px;
+		color: $u-content-color;
+		align-self: stretch;
+		box-sizing: border-box;
+		height: 100%;
+	}
 </style>
diff --git a/uview-plus/components/u-text/text.js b/uview-plus/components/u-text/text.js
index e61b059..b6329f3 100644
--- a/uview-plus/components/u-text/text.js
+++ b/uview-plus/components/u-text/text.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:23:58
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/text.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/text.js
  */
 export default {
     // text 组件
diff --git a/uview-plus/components/u-text/u-text.vue b/uview-plus/components/u-text/u-text.vue
index d852eed..6d76e68 100644
--- a/uview-plus/components/u-text/u-text.vue
+++ b/uview-plus/components/u-text/u-text.vue
@@ -13,10 +13,10 @@
             >￥</text
         >
         <view class="u-text__prefix-icon" v-if="prefixIcon">
-            <u-icon
+            <up-icon
                 :name="prefixIcon"
                 :customStyle="addStyle(iconStyle)"
-            ></u-icon>
+            ></up-icon>
         </view>
         <u-link
             v-if="mode === 'link'" class="u-text__value"
@@ -59,10 +59,10 @@
             >{{ value }}</text
         >
         <view class="u-text__suffix-icon" v-if="suffixIcon">
-            <u-icon
+            <up-icon
                 :name="suffixIcon"
                 :customStyle="addStyle(iconStyle)"
-            ></u-icon>
+            ></up-icon>
         </view>
     </view>
 </template>
@@ -78,7 +78,7 @@ import { addStyle, addUnit, deepMerge } from '../../libs/function/index';
 /**
  * Text 文本
  * @description 此组件集成了文本类在项目中的常用功能，包括状态，拨打电话，格式化日期，*替换，超链接...等功能。 您大可不必在使用特殊文本时自己定义，text组件几乎涵盖您能使用的大部分场景。
- * @tutorial https://ijry.github.io/uview-plus/components/loading.html
+ * @tutorial https://uview-plus.jiangruyi.com/components/loading.html
  * @property {String} 					type		主题颜色
  * @property {Boolean} 					show		是否显示（默认 true ）
  * @property {String | Number}			text		显示的值
@@ -175,8 +175,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../../libs/css/components.scss';
-
 .u-text {
     @include flex(row);
     align-items: center;
diff --git a/uview-plus/components/u-textarea/textarea.js b/uview-plus/components/u-textarea/textarea.js
index 44519f9..08c009b 100644
--- a/uview-plus/components/u-textarea/textarea.js
+++ b/uview-plus/components/u-textarea/textarea.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:24:32
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/textarea.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/textarea.js
  */
 export default {
 	// textarea 组件
diff --git a/uview-plus/components/u-textarea/u-textarea.vue b/uview-plus/components/u-textarea/u-textarea.vue
index ae2d6b7..b6a3449 100644
--- a/uview-plus/components/u-textarea/u-textarea.vue
+++ b/uview-plus/components/u-textarea/u-textarea.vue
@@ -3,9 +3,9 @@
         <textarea
             class="u-textarea__field"
             :value="innerValue"
-            :style="{ height: addUnit(height) }"
+            :style="fieldStyle"
             :placeholder="placeholder"
-            :placeholder-style="addStyle(placeholderStyle, 'string')"
+            :placeholder-style="addStyle(placeholderStyle, typeof placeholderStyle === 'string' ? 'string' : 'object')"
             :placeholder-class="placeholderClass"
             :disabled="disabled"
             :focus="focus"
@@ -50,7 +50,7 @@ import { addStyle, addUnit, deepMerge, formValidate, os } from '../../libs/funct
 /**
  * Textarea 文本域
  * @description 文本域此组件满足了可能出现的表单信息补充，编辑等实际逻辑的功能，内置了字数校验等
- * @tutorial https://ijry.github.io/uview-plus/components/textarea.html
+ * @tutorial https://uview-plus.jiangruyi.com/components/textarea.html
  *
  * @property {String | Number} 		value					输入框的内容
  * @property {String | Number}		placeholder				输入框为空时占位符
@@ -146,6 +146,15 @@ export default {
         // #endif
 	},
     computed: {
+		fieldStyle() {
+			let style = {};
+			style['height'] = addUnit(this.height);
+			if (this.autoHeight) {
+				style['height'] = 'auto';
+				style['minHeight'] = addUnit(this.height);
+			}
+			return style;
+		},
         // 组件的类名
         textareaClass() {
             let classes = [],
@@ -236,8 +245,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
-
 .u-textarea {
     border-radius: 4px;
     background-color: #fff;
diff --git a/uview-plus/components/u-th/props.js b/uview-plus/components/u-th/props.js
new file mode 100644
index 0000000..a37e438
--- /dev/null
+++ b/uview-plus/components/u-th/props.js
@@ -0,0 +1,7 @@
+import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+export const props = defineMixin({
+    props: {
+
+    }
+})
diff --git a/uview-plus/components/u-th/u-th.vue b/uview-plus/components/u-th/u-th.vue
new file mode 100644
index 0000000..fe3a9f8
--- /dev/null
+++ b/uview-plus/components/u-th/u-th.vue
@@ -0,0 +1,66 @@
+<template>
+	<view class="u-th" :style="[thStyle]">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	import { props } from './props';
+	import { mpMixin } from '../../libs/mixin/mpMixin';
+	import { mixin } from '../../libs/mixin/mixin';
+	import { addUnit, $parent } from '../../libs/function/index';
+	/** 
+	 * Td 表格中的单元格
+	 * @description 
+	 * @tutorial url
+	 * @property {String | Number} 
+	 * @event {Function}
+	 * @example
+	 */
+	export default {
+		name: 'u-th',
+		mixins: [mpMixin, mixin, props],
+		props: {
+			// 宽度，百分比或者具体带单位的值，如30%， 200rpx等，一般使用百分比
+			width: {
+				type: [String],
+				default: ''
+			}
+		},
+		data() {
+			return {
+				thStyle: {}
+			}
+		},
+		created() {
+			this.parent = false;
+		},
+		mounted() {
+			this.parent = $parent.call(this, 'u-table');
+			if (this.parent) {
+				// 将父组件的相关参数，合并到本组件
+				let style = {};
+				if (this.width) style.flex = `0 0 ${this.width}`;
+				style.textAlign = this.parent.align;
+				style.padding = this.parent.padding;
+				style.borderBottom = `solid 1px ${this.parent.borderColor}`;
+				style.borderRight = `solid 1px ${this.parent.borderColor}`;
+				Object.assign(style, this.parent.thStyle);
+				this.thStyle = style;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.u-th {
+		@include flex;
+		flex-direction: column;
+		flex: 1;
+		justify-content: center;
+		font-size: 28rpx;
+		color: $u-main-color;
+		font-weight: bold;
+		background-color: rgb(245, 246, 248);
+	}
+</style>
diff --git a/uview-plus/components/u-title/u-title.vue b/uview-plus/components/u-title/u-title.vue
new file mode 100644
index 0000000..7e19030
--- /dev/null
+++ b/uview-plus/components/u-title/u-title.vue
@@ -0,0 +1,36 @@
+<style scoped lang="scss">
+    .u-title {
+		.u-title-prefix {
+		    width: 4px;
+		    height: 18px;
+		    border-radius: 2px;
+		    background: $u-primary;
+		    margin-right: 12px;
+		    margin-right :10px;
+		}
+    }
+</style>
+<template>
+    <view class="u-title u-flex-row u-flex-y-center">
+        <slot name="prefix">
+            <view class="u-title-prefix">
+            </view>
+        </slot>
+        <slot></slot>
+    </view>
+</template>
+<script>
+export default {
+    name: 'u-title',
+    props: {
+    },
+    data() {
+        return {
+        }
+    },
+    created: function () {
+    },
+    methods: {
+    }
+}
+</script>
diff --git a/uview-plus/components/u-toast/toast.js b/uview-plus/components/u-toast/toast.js
index 2dd2ed1..19134b7 100644
--- a/uview-plus/components/u-toast/toast.js
+++ b/uview-plus/components/u-toast/toast.js
@@ -1,18 +1,18 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:07:07
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/toast.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/toast.js
  */
 export default {
     // toast组件
     toast: {
         zIndex: 10090,
         loading: false,
-        text: '',
+        message: '',
         icon: '',
         type: '',
         loadingMode: '',
diff --git a/uview-plus/components/u-toast/u-toast.vue b/uview-plus/components/u-toast/u-toast.vue
index b03e1d3..ec0597c 100644
--- a/uview-plus/components/u-toast/u-toast.vue
+++ b/uview-plus/components/u-toast/u-toast.vue
@@ -2,7 +2,7 @@
 	<view class="u-toast">
 		<u-overlay
 			:show="isShow"
-			:zIndex="tmpConfig.overlay ? 10070 : -1"
+			:zIndex="tmpConfig.overlay ? tmpConfig.zIndex : -1"
 			:custom-style="overlayStyle"
 		>
 			<view
@@ -17,13 +17,13 @@
 					inactiveColor="rgb(120, 120, 120)"
 					size="25"
 				></u-loading-icon>
-				<u-icon
+				<up-icon
 					v-else-if="tmpConfig.type !== 'defalut' && iconName"
 					:name="iconName"
 					size="17"
 					:color="tmpConfig.type"
 					:customStyle="iconStyle"
-				></u-icon>
+				></up-icon>
 				<u-gap
 					v-if="tmpConfig.type === 'loading' || tmpConfig.loading"
 					height="12"
@@ -42,13 +42,13 @@
 <script>
 	import { mpMixin } from '../../libs/mixin/mpMixin';
 	import { mixin } from '../../libs/mixin/mixin';
-	import { os, sys, deepMerge, type2icon } from '../../libs/function/index';
+	import { os, getWindowInfo, deepMerge, type2icon } from '../../libs/function/index';
 	import color from '../../libs/config/color';
 	import { hexToRgb } from '../../libs/function/colorGradient';
 	/**
 	 * toast 消息提示
 	 * @description 此组件表现形式类似uni的uni.showToastAPI，但也有不同的地方。
-	 * @tutorial https://ijry.github.io/uview-plus/components/toast.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/toast.html
 	 * @property {String | Number}	zIndex		toast展示时的zIndex值 (默认 10090 )
 	 * @property {Boolean}			loading		是否加载中 （默认 false ）
 	 * @property {String | Number}	message		显示的文字内容
@@ -77,6 +77,7 @@
 				config: {
 					message: '', // 显示文本
 					type: '', // 主题类型，primary，success，error，warning，black
+					zIndex: 10090, // 层级
 					duration: 2000, // 显示的时间，毫秒
 					icon: true, // 显示的图标
 					position: 'center', // toast出现的位置
@@ -136,7 +137,7 @@
 			},
 			// 内容盒子的样式
 			contentStyle() {
-				const windowHeight = sys().windowHeight, style = {}
+				const windowHeight = getWindowInfo().windowHeight, style = {}
 				let value = 0
 				// 根据top和bottom，对Y轴进行窗体高度的百分比偏移
 				if(this.tmpConfig.position === 'top') {
@@ -193,7 +194,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	$u-toast-color:#fff !default;
 	$u-toast-border-radius:4px !default;
@@ -203,7 +203,7 @@
 	$u-toast-loading-border-padding: 20px 20px !default;
 	$u-toast-content-text-color:#fff !default;
 	$u-toast-content-text-font-size:15px !default;
-	$u-toast-u-icon:10rpx !default;
+	$u-toast-up-icon:10rpx !default;
 	$u-toast-u-type-primary-color:$u-primary !default;
 	$u-toast-u-type-primary-background-color:#ecf5ff !default;
 	$u-toast-u-type-primary-border-color:rgb(215, 234, 254) !default;
diff --git a/uview-plus/components/u-toolbar/toolbar.js b/uview-plus/components/u-toolbar/toolbar.js
index 3289967..3b5a188 100644
--- a/uview-plus/components/u-toolbar/toolbar.js
+++ b/uview-plus/components/u-toolbar/toolbar.js
@@ -1,20 +1,21 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:24:55
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/toolbar.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/toolbar.js
  */
+import { t } from '../../libs/i18n'
 export default {
     // toolbar 组件
     toolbar: {
         show: true,
-        cancelText: '取消',
-        confirmText: '确认',
+        cancelText: t('up.common.cancel'),
+        confirmText: t('up.common.confirm'),
         cancelColor: '#909193',
-        confirmColor: '#3c9cff',
+        confirmColor: '',
         title: ''
     }
 
diff --git a/uview-plus/components/u-toolbar/u-toolbar.vue b/uview-plus/components/u-toolbar/u-toolbar.vue
index 68e9f36..aabf43d 100644
--- a/uview-plus/components/u-toolbar/u-toolbar.vue
+++ b/uview-plus/components/u-toolbar/u-toolbar.vue
@@ -55,7 +55,7 @@
 	/**
 	 * Toolbar 工具条
 	 * @description 
-	 * @tutorial https://ijry.github.io/uview-plus/components/toolbar.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/toolbar.html
 	 * @property {Boolean}	show			是否展示工具条（默认 true ）
 	 * @property {String}	cancelText		取消按钮的文字（默认 '取消' ）
 	 * @property {String}	confirmText		确认按钮的文字（默认 '确认' ）
@@ -86,7 +86,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-toolbar {
 		height: 42px;
@@ -106,6 +105,7 @@
 			color: $u-main-color;
 			padding: 0 60rpx;
 			font-size: 16px;
+			font-weight: bold;
 			flex: 1;
 			text-align: center;
 		}
diff --git a/uview-plus/components/u-tooltip/props.js b/uview-plus/components/u-tooltip/props.js
index 9eaf570..121a6f8 100644
--- a/uview-plus/components/u-tooltip/props.js
+++ b/uview-plus/components/u-tooltip/props.js
@@ -27,7 +27,12 @@ export const props = defineMixin({
             type: String,
             default: () => defProps.tooltip.bgColor
         },
-        // 弹出提示的方向，top-上方，bottom-下方
+        // 弹出提示框的背景色
+        popupBgColor: {
+            type: String,
+            default: () => defProps.tooltip.popupBgColor
+        },
+        // 弹出提示的方向，top-上方，bottom-下方，left-左方，right-右方
         direction: {
             type: String,
             default: () => defProps.tooltip.direction
@@ -56,6 +61,16 @@ export const props = defineMixin({
         showToast: {
             type: Boolean,
             default: () => defProps.tooltip.showToast
+        },
+        // 触发方式，可选值：longpress/click
+        triggerMode: {
+            type: String,
+            default: () => defProps.tooltip.triggerMode
+        },
+        // 强制定位
+        forcePosition: {
+            type: Object,
+            default: () => defProps.tooltip.forcePosition
         }
     }
-})
+})
\ No newline at end of file
diff --git a/uview-plus/components/u-tooltip/tooltip.js b/uview-plus/components/u-tooltip/tooltip.js
index 875604d..54d7681 100644
--- a/uview-plus/components/u-tooltip/tooltip.js
+++ b/uview-plus/components/u-tooltip/tooltip.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:25:14
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/tooltip.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/tooltip.js
  */
 export default {
     // tooltip 组件
@@ -20,6 +20,9 @@ export default {
         showCopy: true,
         buttons: [],
         overlay: true,
-        showToast: true
+        showToast: true,
+        popupBgColor: '',
+        triggerMode: 'longpress',
+        forcePosition: {}
     }
 }
diff --git a/uview-plus/components/u-tooltip/u-tooltip.vue b/uview-plus/components/u-tooltip/u-tooltip.vue
index 61407a6..c7f452f 100644
--- a/uview-plus/components/u-tooltip/u-tooltip.vue
+++ b/uview-plus/components/u-tooltip/u-tooltip.vue
@@ -9,27 +9,29 @@
 			@click="overlayClickHandler"
 		></u-overlay>
 		<view class="u-tooltip__wrapper">
-			<text
-				class="u-tooltip__wrapper__text"
-				:id="textId"
-				:ref="textId"
-				:userSelect="false"
-				:selectable="false"
-				@longpress.stop="longpressHandler"
-				:style="{
-					color: color,
-					backgroundColor: bgColor && showTooltip && tooltipTop !== -10000 ? bgColor : 'transparent'
-				}"
-			>{{ text }}</text>
+			<view class="u-tooltip__trigger" :id="textId"
+				:ref="textId" @click.stop="clickHander"
+				@longpress.stop="longpressHandler">
+				<slot name="trigger"></slot>
+				<text v-if="!$slots['trigger']"
+					class="u-tooltip__wrapper__text"
+					:userSelect="false"
+					:selectable="false"
+					:style="{
+						color: color,
+						backgroundColor: bgColor && showTooltip && tooltipTop !== -10000 ? bgColor : 'transparent'
+					}"
+				>{{ text }}</text>
+			</view>
 			<u-transition
 				mode="fade"
 				:show="showTooltip"
 				duration="300"
 				:customStyle="{
 					position: 'absolute', 
-					top: addUnit(tooltipTop),
+					top: addUnit(tooltipTop, 'px'),
 					zIndex: zIndex,
-					...tooltipStyle
+					...tooltipStyleCpu
 				}"
 			>
 				<view
@@ -44,44 +46,52 @@
 						:style="[indicatorStyle, {
 							width: addUnit(indicatorWidth),
 							height: addUnit(indicatorWidth),
+							backgroundColor: popupBgColor
 						}]"
 					>
 						<!-- 由于nvue不支持三角形绘制，这里就做一个四方形，再旋转45deg，得到露出的一个三角 -->
 					</view>
-					<view class="u-tooltip__wrapper__popup__list">
-						<view
-							v-if="showCopy"
-							class="u-tooltip__wrapper__popup__list__btn"
-							hover-class="u-tooltip__wrapper__popup__list__btn--hover"
-							@tap="setClipboardData"
-						>
-							<text
-								class="u-tooltip__wrapper__popup__list__btn__text"
-							>复制</text>
-						</view>
-						<u-line
-							direction="column"
-							color="#8d8e90"
-							v-if="showCopy && buttons.length > 0"
-							length="18"
-						></u-line>
-						<block v-for="(item , index) in buttons" :key="index">
+					<view class="u-tooltip__wrapper__popup__list" :style="{
+						backgroundColor: popupBgColor,
+						color: color
+					}">
+						<slot name="content"></slot>
+						<template v-if="!$slots['content']">
 							<view
+								v-if="showCopy"
 								class="u-tooltip__wrapper__popup__list__btn"
 								hover-class="u-tooltip__wrapper__popup__list__btn--hover"
+								:style="{backgroundColor: popupBgColor}"
+								@tap="setClipboardData"
 							>
 								<text
 									class="u-tooltip__wrapper__popup__list__btn__text"
-									@tap="btnClickHandler(index)"
-								>{{ item }}</text>
+								>复制</text>
 							</view>
 							<u-line
 								direction="column"
 								color="#8d8e90"
-								v-if="index < buttons.length - 1"
+								v-if="showCopy && buttons.length > 0"
 								length="18"
 							></u-line>
-						</block>
+							<block v-for="(item , index) in buttons" :key="index">
+								<view
+									class="u-tooltip__wrapper__popup__list__btn"
+									hover-class="u-tooltip__wrapper__popup__list__btn--hover"
+								>
+									<text
+										class="u-tooltip__wrapper__popup__list__btn__text"
+										@tap="btnClickHandler(index)"
+									>{{ item }}</text>
+								</view>
+								<u-line
+									direction="column"
+									color="#8d8e90"
+									v-if="index < buttons.length - 1"
+									length="18"
+								></u-line>
+							</block>
+						</template>
 					</view>
 				</view>
 			</u-transition>
@@ -93,25 +103,26 @@
 	import { props } from './props';
 	import { mpMixin } from '../../libs/mixin/mpMixin';
 	import { mixin } from '../../libs/mixin/mixin';
-	import { addStyle, addUnit, getPx, guid, toast, sleep, sys } from '../../libs/function/index';
+	import { addStyle, addUnit, getPx, guid, toast, sleep, getWindowInfo } from '../../libs/function/index';
 	// #ifdef APP-NVUE 
 	const dom = uni.requireNativePlugin('dom')
 	// #endif
 	/**
 	 * Tooltip 
 	 * @description 
-	 * @tutorial https://ijry.github.io/uview-plus/components/tooltip.html
-	 * @property {String | Number}	text		需要显示的提示文字
-	 * @property {String | Number}	copyText	点击复制按钮时，复制的文本，为空则使用text值
-	 * @property {String | Number}	size		文本大小（默认 14 ）
-	 * @property {String}			color		字体颜色（默认 '#606266' ）
-	 * @property {String}			bgColor		弹出提示框时，文本的背景色（默认 'transparent' ）
-	 * @property {String}			direction	弹出提示的方向，top-上方，bottom-下方（默认 'top' ）
-	 * @property {String | Number}	zIndex		弹出提示的z-index，nvue无效（默认 10071 ）
-	 * @property {Boolean}			showCopy	是否显示复制按钮（默认 true ）
-	 * @property {Array}			buttons		扩展的按钮组
-	 * @property {Boolean}			overlay		是否显示透明遮罩以防止触摸穿透（默认 true ）
-	 * @property {Object}			customStyle	定义需要用到的外部样式
+	 * @tutorial https://uview-plus.jiangruyi.com/components/tooltip.html
+	 * @property {String | Number}	text		 需要显示的提示文字
+	 * @property {String | Number}	copyText	 点击复制按钮时，复制的文本，为空则使用text值
+	 * @property {String | Number}	size		 文本大小（默认 14 ）
+	 * @property {String}			color		 字体颜色（默认 '#606266' ）
+	 * @property {String}			bgColor		 弹出提示框时，文本的背景色（默认 'transparent' ）
+	 * @property {String}			popupBgColor 弹出提示框的背景色
+	 * @property {String}			direction	 弹出提示的方向，top-上方，bottom-下方（默认 'top' ）
+	 * @property {String | Number}	zIndex		 弹出提示的z-index，nvue无效（默认 10071 ）
+	 * @property {Boolean}			showCopy	 是否显示复制按钮（默认 true ）
+	 * @property {Array}			buttons		 扩展的按钮组
+	 * @property {Boolean}			overlay		 是否显示透明遮罩以防止触摸穿透（默认 true ）
+	 * @property {Object}			customStyle	 定义需要用到的外部样式
 	 * 
 	 * @event {Function} 
 	 * @example 
@@ -134,7 +145,7 @@
 					left: 0
 				},
 				// 文本的位置信息
-				textInfo: {
+				triggerInfo: {
 					width: 0,
 					left: 0
 				},
@@ -144,11 +155,14 @@
 				screenGap: 12,
 				// 三角形指示器的宽高，由于对元素进行了角度旋转，精确计算指示器位置时，需要用到其尺寸信息
 				indicatorWidth: 14,
+				tooltipStyle: {},
+				calcReacted: false
 			}
 		},
 		watch: {
-			propsChange() {
-				this.getElRect()
+			async propsChange() {
+				await this.getElRect()
+				// this.getTooltipStyle();
 			}
 		},
 		computed: {
@@ -158,35 +172,59 @@
 				return [this.text, this.buttons]
 			},
 			// 计算气泡和指示器的位置信息
-			tooltipStyle() {
-				const style = {
-						transform: `translateY(${this.direction === 'top' ? '-100%' : '100%'})`,
-					},
-					sysInfo = sys()
-				if (this.tooltipInfo.width / 2 > this.textInfo.left + this.textInfo.width / 2 - this.screenGap) {
-					this.indicatorStyle = {}
-					style.left = `-${addUnit(this.textInfo.left - this.screenGap)}`
-					this.indicatorStyle.left = addUnit(this.textInfo.width / 2 - getPx(style.left) - this.indicatorWidth /
-						2)
-				} else if (this.tooltipInfo.width / 2 > sysInfo.windowWidth - this.textInfo.right + this.textInfo.width / 2 -
-					this.screenGap) {
-					this.indicatorStyle = {}
-					style.right = `-${addUnit(sysInfo.windowWidth - this.textInfo.right - this.screenGap)}`
-					this.indicatorStyle.right = addUnit(this.textInfo.width / 2 - getPx(style.right) - this
-						.indicatorWidth / 2)
-				} else {
-					const left = Math.abs(this.textInfo.width / 2 - this.tooltipInfo.width / 2)
-					style.left = this.textInfo.width > this.tooltipInfo.width ? addUnit(left) : -addUnit(left)
-					this.indicatorStyle = {}
+			tooltipStyleCpu() {
+				if (!this.calcReacted) {
+					return {}
 				}
-				if (this.direction === 'top') {
-					style.marginTop = '-10px'
-					this.indicatorStyle.bottom = '-4px'
-				} else {
-					style.marginBottom = '-10px'
-					this.indicatorStyle.top = '-4px'
+				const style = {},
+					sysInfo = getWindowInfo()
+				if (this.direction === 'left') {
+					// 右侧显示逻辑
+					style.transform = ``
+					// 垂直居中对齐
+					style.top = '-' + addUnit((this.triggerInfo.height - this.tooltipInfo.height) / 2, 'px')
+					style.right = addUnit(this.triggerInfo.width + this.indicatorWidth, 'px')
+					this.indicatorStyle = {}
+					this.indicatorStyle.right = '-4px'
+					this.indicatorStyle.top = addUnit((this.tooltipInfo.height - this.indicatorWidth) / 2, 'px')
+				} else if (this.direction === 'right') {
+					// 右侧显示逻辑
+					style.transform = ``
+					// 垂直居中对齐
+					style.top = '-' + addUnit((this.triggerInfo.height - this.tooltipInfo.height) / 2, 'px')
+					style.left = addUnit(this.triggerInfo.width + this.indicatorWidth, 'px')
+					this.indicatorStyle = {}
+					this.indicatorStyle.left = '-4px'
+					this.indicatorStyle.top = addUnit((this.triggerInfo.height - this.indicatorWidth) / 2, 'px')
+				} else if (this.direction === 'top' || this.direction === 'bottom') { 
+					style.transform = `translateY(${this.direction === 'top' ? '-100%' : '100%'})`
+					if (this.tooltipInfo.width / 2 > this.triggerInfo.left + this.triggerInfo.width / 2 - this.screenGap) {
+						this.indicatorStyle = {}
+						style.left = `-${addUnit(this.triggerInfo.left - this.screenGap)}`
+						this.indicatorStyle.left = addUnit(this.triggerInfo.width / 2 - getPx(style.left) - this.indicatorWidth /
+							2, 'px')
+					} else if (this.tooltipInfo.width / 2 > sysInfo.windowWidth - this.triggerInfo.right + this.triggerInfo.width / 2 -
+						this.screenGap) {
+						this.indicatorStyle = {}
+						style.right = `-${addUnit(sysInfo.windowWidth - this.triggerInfo.right - this.screenGap)}`
+						this.indicatorStyle.right = addUnit(this.triggerInfo.width / 2 - getPx(style.right) - this
+							.indicatorWidth / 2)
+					} else {
+						const left = Math.abs(this.triggerInfo.width / 2 - this.tooltipInfo.width / 2)
+						style.left = this.triggerInfo.width > this.tooltipInfo.width ? addUnit(left) : -addUnit(left)
+						this.indicatorStyle = {}
+					}
+					if (this.direction === 'top') {
+						style.marginTop = '-10px'
+						this.indicatorStyle.bottom = '-4px'
+					} else {
+						style.marginBottom = '-10px'
+						this.indicatorStyle.top = '-4px'
+					}
 				}
-				return style
+				let styleMerge = {...style, ...this.forcePosition}
+				this.tooltipStyle = styleMerge
+				return styleMerge
 			}
 		},
 		mounted() {
@@ -196,13 +234,25 @@
 		methods: {
 			addStyle,
 			addUnit,
-			init() {
-				this.getElRect()
+			async init() {
+				await this.getElRect()
+				// this.getTooltipStyle();
+			},
+			// 点击触发事件
+			async clickHander() {
+				// this.getTooltipStyle();
+				if (this.triggerMode == 'click') {
+					this.tooltipTop = 0
+					this.showTooltip = true
+				}
 			},
 			// 长按触发事件
 			async longpressHandler() {
-				this.tooltipTop = 0
-				this.showTooltip = true
+				// this.getTooltipStyle();
+				if (this.triggerMode == 'longpress') {
+					this.tooltipTop = 0
+					this.showTooltip = true
+				}
 			},
 			// 点击透明遮罩
 			overlayClickHandler() {
@@ -217,7 +267,7 @@
 			// 查询内容高度
 			queryRect(ref) {
 				// #ifndef APP-NVUE
-				// $uGetRect为uView自带的节点查询简化方法，详见文档介绍：https://ijry.github.io/uview-plus/js/getRect.html
+				// $uGetRect为uview-plus自带的节点查询简化方法，详见文档介绍：https://uview-plus.jiangruyi.com/js/getRect.html
 				// 组件内部一般用this.$uGetRect，对外的为uni.$u.getRect，二者功能一致，名称不同
 				return new Promise(resolve => {
 					this.$uGetRect(`#${ref}`).then(size => {
@@ -238,17 +288,19 @@
 			},
 			// 元素尺寸
 			getElRect() {
-				// 调用之前，先将指示器调整到屏幕外，方便获取尺寸
-				this.showTooltip = true
-				this.tooltipTop = -10000
-				sleep(500).then(() => {
-					this.queryRect(this.tooltipId).then(size => {
-						this.tooltipInfo = size
+				return new Promise(async(resolve) => {
+					// 调用之前，先将指示器调整到屏幕外，方便获取尺寸
+					this.showTooltip = true
+					this.tooltipTop = -10000
+					sleep(500).then(async () => {
+						this.tooltipInfo = await this.queryRect(this.tooltipId)
 						// 获取气泡尺寸之后，将其隐藏，为了让下次切换气泡显示与隐藏时，有淡入淡出的效果
 						this.showTooltip = false
-					})
-					this.queryRect(this.textId).then(size => {
-						this.textInfo = size
+						this.triggerInfo = await this.queryRect(this.textId)
+						sleep(500).then(() => {
+							this.calcReacted = true
+						})
+						resolve()
 					})
 				})
 			},
@@ -276,7 +328,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-tooltip {
 		position: relative;
@@ -299,6 +350,7 @@
 
 				&__list {
 					background-color: #060607;
+					color: #FFFFFF;
 					position: relative;
 					flex: 1;
 					border-radius: 5px;
@@ -339,4 +391,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/uview-plus/components/u-tr/u-tr.vue b/uview-plus/components/u-tr/u-tr.vue
index fa0d3bd..23f13b4 100644
--- a/uview-plus/components/u-tr/u-tr.vue
+++ b/uview-plus/components/u-tr/u-tr.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="u-tr">
-		
+		<slot></slot>
 	</view>
 </template>
 
@@ -28,6 +28,7 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
-	
+	.u-tr {
+		@include flex;
+	}
 </style>
diff --git a/uview-plus/components/u-transition/transition.js b/uview-plus/components/u-transition/transition.js
index 0fad118..7d2bd5d 100644
--- a/uview-plus/components/u-transition/transition.js
+++ b/uview-plus/components/u-transition/transition.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:59:00
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/transition.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/transition.js
  */
 export default {
     // transition动画组件的props
diff --git a/uview-plus/components/u-transition/u-transition.vue b/uview-plus/components/u-transition/u-transition.vue
index 7fa94d1..8e0551b 100644
--- a/uview-plus/components/u-transition/u-transition.vue
+++ b/uview-plus/components/u-transition/u-transition.vue
@@ -85,11 +85,122 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../../libs/css/components.scss';
-
 /* #ifndef APP-NVUE */
 // vue版本动画相关的样式抽离在外部文件
-@import './vue.ani-style.scss';
+// @use './vue.ani-style.scss' as *;
+/**
+ * vue版本动画内置的动画模式有如下：
+ * fade：淡入
+ * zoom：缩放
+ * fade-zoom：缩放淡入
+ * fade-up：上滑淡入
+ * fade-down：下滑淡入
+ * fade-left：左滑淡入
+ * fade-right：右滑淡入
+ * slide-up：上滑进入
+ * slide-down：下滑进入
+ * slide-left：左滑进入
+ * slide-right：右滑进入
+ */
+
+ $u-zoom-scale: scale(0.95);
+
+.u-fade-enter-active,
+.u-fade-leave-active {
+	transition-property: opacity;
+}
+
+.u-fade-enter,
+.u-fade-leave-to {
+	opacity: 0
+}
+
+.u-fade-zoom-enter,
+.u-fade-zoom-leave-to {
+	transform: $u-zoom-scale;
+	opacity: 0;
+}
+
+.u-fade-zoom-enter-active,
+.u-fade-zoom-leave-active {
+	transition-property: transform, opacity;
+}
+
+.u-fade-down-enter-active,
+.u-fade-down-leave-active,
+.u-fade-left-enter-active,
+.u-fade-left-leave-active,
+.u-fade-right-enter-active,
+.u-fade-right-leave-active,
+.u-fade-up-enter-active,
+.u-fade-up-leave-active {
+	transition-property: opacity, transform;
+}
+
+.u-fade-up-enter,
+.u-fade-up-leave-to {
+	transform: translate3d(0, 100%, 0);
+	opacity: 0
+}
+
+.u-fade-down-enter,
+.u-fade-down-leave-to {
+	transform: translate3d(0, -100%, 0);
+	opacity: 0
+}
+
+.u-fade-left-enter,
+.u-fade-left-leave-to {
+	transform: translate3d(-100%, 0, 0);
+	opacity: 0
+}
+
+.u-fade-right-enter,
+.u-fade-right-leave-to {
+	transform: translate3d(100%, 0, 0);
+	opacity: 0
+}
+
+.u-slide-down-enter-active,
+.u-slide-down-leave-active,
+.u-slide-left-enter-active,
+.u-slide-left-leave-active,
+.u-slide-right-enter-active,
+.u-slide-right-leave-active,
+.u-slide-up-enter-active,
+.u-slide-up-leave-active {
+	transition-property: transform;
+}
+
+.u-slide-up-enter,
+.u-slide-up-leave-to {
+	transform: translate3d(0, 100%, 0)
+}
+
+.u-slide-down-enter,
+.u-slide-down-leave-to {
+	transform: translate3d(0, -100%, 0)
+}
+
+.u-slide-left-enter,
+.u-slide-left-leave-to {
+	transform: translate3d(-100%, 0, 0)
+}
+
+.u-slide-right-enter,
+.u-slide-right-leave-to {
+	transform: translate3d(100%, 0, 0)
+}
+
+.u-zoom-enter-active,
+.u-zoom-leave-active {
+	transition-property: transform
+}
+
+.u-zoom-enter,
+.u-zoom-leave-to {
+	transform: $u-zoom-scale
+}
 /* #endif */
 
 .u-transition {}
diff --git a/uview-plus/components/u-tree/tree-node.vue b/uview-plus/components/u-tree/tree-node.vue
new file mode 100644
index 0000000..f82d9e3
--- /dev/null
+++ b/uview-plus/components/u-tree/tree-node.vue
@@ -0,0 +1,128 @@
+<template>
+  <view class="u-tree-node" :style="{ paddingLeft: depth * 20 + 'px' }">
+    <view class="u-tree-node-content" @click="toggle">
+      <!-- <text v-if="hasChildren" class="u-tree-node-toggle">
+        {{ node.expanded ? '▼' : '▶' }}
+      </text> -->
+      <up-icon v-if="hasChildren" class="u-tree-node-toggle"
+       :name="node.expanded ? 'arrow-down-fill' : 'play-right-fill'" size="12" />
+      <up-checkbox
+        v-if="showCheckbox"
+        usedAlone
+        :size="12"
+        :checked="node.checked"
+        @change="toggleCheck"
+        style="margin-right: 10px;"
+      />
+      <slot :nodeData="node" :level="depth + 1">
+        {{ node[props.label] }}
+      </slot>
+    </view>
+    <view v-if="hasChildren && (node.expanded === undefined ? true : node.expanded)"
+      class="u-tree-node-children"
+      :style="{ paddingLeft: (depth + 1) * 20 + 'px' }">
+      <tree-node
+        v-for="child in node[props.children]"
+        :key="child[props.nodeKey]"
+        :node="child"
+        :props="props"
+        :show-checkbox="showCheckbox"
+        :check-strictly="checkStrictly"
+        :expand-on-click-node="expandOnClickNode"
+        :depth="depth + 1"
+        @node-click="$emit('node-click', $event)"
+        @check-change="$emit('check-change', $event)">
+        <template #default="{ nodeData, level }">
+            <slot name="default" :nodeData="nodeData" :level="level"></slot>
+        </template>
+      </tree-node>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'tree-node',
+  props: {
+    node: {
+      type: Object,
+      required: true
+    },
+    props: {
+      type: Object,
+      required: true
+    },
+    showCheckbox: {
+      type: Boolean,
+      default: false
+    },
+    checkStrictly: {
+      type: Boolean,
+      default: false
+    },
+    expandOnClickNode: {
+      type: Boolean,
+      default: true
+    },
+    depth: {
+        type: Number,
+        default: 0
+    }
+  },
+  computed: {
+    hasChildren() {
+      return this.node[this.props.children] && this.node[this.props.children].length > 0;
+    },
+    isExpanded() {
+        return this.node.expanded === undefined ? false : this.node.expanded;
+    }
+  },
+  emits: ['node-click', 'check-change'],
+  methods: {
+    toggle() {
+      if (this.expandOnClickNode && this.hasChildren) {
+        this.node.expanded = !this.node.expanded;
+      }
+      this.$emit('node-click', this.node);
+    },
+    toggleCheck(checked) {
+      this.node.checked = checked;
+      if (!this.checkStrictly) {
+        this.updateChildCheckStatus(this.node, checked);
+        this.updateParentCheckStatus(this.node);
+      }
+      this.$emit('check-change', this.node);
+    },
+    updateChildCheckStatus(node, checked) {
+      if (node[this.props.children]) {
+        node[this.props.children].forEach(child => {
+          child.checked = checked;
+          this.updateChildCheckStatus(child, checked);
+        });
+      }
+    },
+    updateParentCheckStatus(node) {
+      let parent = this.$parent;
+      while (parent && parent.node) {
+        const allChecked = parent.node[this.props.children].every(
+          child => child.checked
+        );
+        parent.node.checked = allChecked;
+        parent = parent.$parent;
+      }
+    }
+  }
+};
+</script>
+
+<style scoped>
+.u-tree-node-content {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  padding-left: 20px;
+}
+.u-tree-node-toggle {
+  margin-right: 5px;
+}
+</style>
\ No newline at end of file
diff --git a/uview-plus/components/u-tree/u-tree.vue b/uview-plus/components/u-tree/u-tree.vue
new file mode 100644
index 0000000..a0e9114
--- /dev/null
+++ b/uview-plus/components/u-tree/u-tree.vue
@@ -0,0 +1,117 @@
+<template>
+  <view class="u-tree">
+    <tree-node
+      v-for="node in treeData"
+      :key="node[props.nodeKey]"
+      :node="node"
+      :props="props"
+      :show-checkbox="showCheckbox"
+      :check-strictly="checkStrictly"
+      :expand-on-click-node="expandOnClickNode"
+      @node-click="handleNodeClick"
+      @check-change="$emit('check-change', $event)">
+      <template #default="{ nodeData, level }">
+        <slot :node="nodeData" :level="level"></slot>
+      </template>
+    </tree-node>
+  </view>
+</template>
+
+<script>
+import TreeNode from './tree-node.vue';
+
+export default {
+  name: 'u-tree',
+  components: { TreeNode },
+  props: {
+    data: {
+      type: Array,
+      required: true
+    },
+    props: {
+      type: Object,
+      default: () => ({
+        label: 'label',
+        children: 'children',
+        nodeKey: 'id'
+      })
+    },
+    showCheckbox: {
+      type: Boolean,
+      default: false
+    },
+    defaultExpandAll: {
+      type: Boolean,
+      default: false
+    },
+    expandOnClickNode: {
+      type: Boolean,
+      default: true
+    },
+    checkStrictly: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      treeData: []
+    };
+  },
+  created() {
+    this.initTree();
+  },
+  watch: {
+    data: {
+      handler(newVal) {
+        this.treeData = JSON.parse(JSON.stringify(newVal));
+        this.initExpandedState(this.treeData, this.defaultExpandAll);
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  emits: ['node-click', 'check-change'],
+  methods: {
+    initTree() {
+      this.treeData = JSON.parse(JSON.stringify(this.data));
+      this.initExpandedState(this.treeData, this.defaultExpandAll);
+    },
+    initExpandedState(nodes, expanded) {
+      nodes.forEach(node => {
+        node.expanded = expanded;
+        if (node[this.props.children]) {
+          this.initExpandedState(node[this.props.children], expanded);
+        }
+      });
+    },
+    handleNodeClick(node) {
+      this.$emit('node-click', node);
+    },
+    /**
+     * 直接递归 treeData 获取所有 checked 的节点
+     */
+    getCheckedNodes() {
+        const traverse = (nodes) => {
+            let result = [];
+            nodes.forEach(node => {
+            if (node.checked) {
+                result.push(node);
+            }
+            if (node[this.props.children] && node[this.props.children].length > 0) {
+                result = result.concat(traverse(node[this.props.children]));
+            }
+            });
+            return result;
+        };
+        return traverse(this.treeData);
+    }
+  }
+};
+</script>
+
+<style scoped>
+.u-tree {
+  font-size: 28rpx;
+}
+</style>
\ No newline at end of file
diff --git a/uview-plus/components/u-upload/props.js b/uview-plus/components/u-upload/props.js
index b157320..529a4b2 100644
--- a/uview-plus/components/u-upload/props.js
+++ b/uview-plus/components/u-upload/props.js
@@ -56,7 +56,7 @@ export const props = defineMixin({
             type: Function,
             default: null
         },
-        // 是否显示组件自带的图片预览功能
+        // 是否显示组件自带的图片&视频预览功能
         previewFullImage: {
             type: Boolean,
             default: () => defProps.upload.previewFullImage
@@ -125,6 +125,52 @@ export const props = defineMixin({
         previewImage: {
             type: Boolean,
             default: () => defProps.upload.previewImage
-        }
+        },
+		// 是否自动删除
+		autoDelete: {
+		    type: Boolean,
+		    default: () => defProps.upload.autoDelete
+		},
+		// 是否自动上传需要传递action指定地址
+		autoUpload: {
+		    type: Boolean,
+		    default: () => defProps.upload.autoUpload
+		},
+		// 自动上传接口地址
+		autoUploadApi: {
+		    type: String,
+		    default: () => defProps.upload.autoUploadApi
+		},
+		// 自动上传驱动，local/oss/cos/kodo
+		autoUploadDriver: {
+		    type: String,
+		    default: () => defProps.upload.autoUploadDriver
+		},
+		// 自动上传授权接口，比如oss的签名接口。
+		autoUploadAuthUrl: {
+		    type: String,
+		    default: () => defProps.upload.autoUploadAuthUrl
+		},
+		// 自动上传携带的header
+		autoUploadHeader: {
+		    type: Object,
+		    default: () => {
+				return defProps.upload.autoUploadHeader
+			}
+		},
+		// 本地计算视频封面
+		getVideoThumb: {
+		    type: Boolean,
+		    default: () => defProps.upload.getVideoThumb
+		},
+        // 自定义自动上传后处理
+        customAfterAutoUpload: {
+		    type: Boolean,
+		    default: () => defProps.upload.customAfterAutoUpload
+		},
+        videoPreviewObjectFit: {
+		    type: String,
+		    default: () => defProps.upload.videoPreviewObjectFit
+		},
     }
 })
diff --git a/uview-plus/components/u-upload/u-upload.vue b/uview-plus/components/u-upload/u-upload.vue
index c49155a..91fff93 100644
--- a/uview-plus/components/u-upload/u-upload.vue
+++ b/uview-plus/components/u-upload/u-upload.vue
@@ -1,576 +1,927 @@
 <template>
-  <view class="u-upload" :style="[addStyle(customStyle)]">
-    <view class="u-upload__wrap">
-      <template v-if="previewImage">
-        <view class="u-upload__wrap__preview" v-for="(item, index) in lists" :key="index">
-          <image
-            v-if="item.isImage || (item.type && item.type === 'image')"
-            :src="item.thumb || item.url"
-            :mode="imageMode"
-            class="u-upload__wrap__preview__image"
-            @tap="onPreviewImage(item, index)"
-            :style="[
-              {
-                width: addUnit(width),
-                height: addUnit(height)
-              }
-            ]"
-          />
-          <view v-else class="u-upload__wrap__preview__other" @tap="onClickPreview(item, index)">
-            <u-icon
-              color="#80CBF9"
-              size="26"
-              :name="item.isVideo || (item.type && item.type === 'video') ? 'movie' : 'folder'"
-            ></u-icon>
-            <text class="u-upload__wrap__preview__other__text">
-              {{ item.isVideo || (item.type && item.type === 'video') ? '视频' : '文件' }}
-            </text>
-          </view>
-          <view class="u-upload__status" v-if="item.status === 'uploading' || item.status === 'failed'">
-            <view class="u-upload__status__icon">
-              <u-icon v-if="item.status === 'failed'" name="close-circle" color="#ffffff" size="25" />
-              <u-loading-icon size="22" mode="circle" color="#ffffff" v-else />
-            </view>
-            <text v-if="item.message" class="u-upload__status__message">{{ item.message }}</text>
-          </view>
-          <view
-            class="u-upload__deletable"
-            v-if="item.status !== 'uploading' && (deletable || item.deletable)"
-            @tap.stop="deleteItem(index)"
-          >
-            <view class="u-upload__deletable__icon">
-              <u-icon name="close" color="#ffffff" size="18"></u-icon>
-            </view>
-          </view>
-          <view class="u-upload__success" v-if="item.status === 'success'">
-            <!-- #ifdef APP-NVUE -->
-            <image :src="successIcon" class="u-upload__success__icon"></image>
-            <!-- #endif -->
-            <!-- #ifndef APP-NVUE -->
-            <view class="u-upload__success__icon">
-              <u-icon name="checkmark" color="#ffffff" size="12"></u-icon>
-            </view>
-            <!-- #endif -->
-          </view>
-        </view>
-      </template>
-
-      <template v-if="isInCount">
-        <view v-if="$slots.trigger" @tap="chooseFile">
-          <slot name="trigger" />
-        </view>
-        <view v-else-if="!$slots.trigger && ($slots.default || $slots.$default)" @tap="chooseFile">
-          <slot />
-        </view>
-        <view
-          v-else
-          class="u-upload__button"
-          :hover-class="!disabled ? 'u-upload__button--hover' : ''"
-          hover-stay-time="150"
-          @tap="chooseFile"
-          :class="[disabled && 'u-upload__button--disabled']"
-          :style="[
-            {
-              width: addUnit(width),
-              height: addUnit(height)
-            }
-          ]"
-        >
-          <u-icon :name="uploadIcon" size="26" :color="uploadIconColor"></u-icon>
-          <text v-if="uploadText" class="u-upload__button__text">{{ uploadText }}</text>
-        </view>
-      </template>
-    </view>
-  </view>
+	<view class="u-upload" :style="[addStyle(customStyle)]">
+		<view class="u-upload__wrap" >
+			<template v-if="previewImage">
+				<view
+				    class="u-upload__wrap__preview"
+				    v-for="(item, index) in lists"
+				    :key="index"
+				>
+					<image
+					    v-if="item.isImage || (item.type && item.type === 'image')"
+					    :src="item.thumb || item.url"
+					    :mode="imageMode"
+					    class="u-upload__wrap__preview__image"
+					    @tap="onClickPreview(item, index)"
+						:style="[{
+							width: addUnit(width),
+							height: addUnit(height)
+						}]"
+					/>
+					<view class="u-upload__wrap__preview__video"
+						:style="{
+							width: addUnit(width),
+							height: addUnit(height)
+						}"
+						v-else-if="(item.isVideo || (item.type && item.type === 'video')) && getVideoThumb">
+						<image
+							v-if="item.thumb"
+						    :src="item.thumb"
+						    :mode="imageMode"
+						    class="u-upload__wrap__preview__image"
+						    @tap="onClickPreview(item, index)"
+							:style="[{
+								width: addUnit(width),
+								height: addUnit(height)
+							}]"
+						/>
+						<up-icon
+							v-else
+						    color="#80CBF9"
+						    size="26"
+						    :name="item.isVideo || (item.type && item.type === 'video') ? 'movie' : 'file-text'"
+						></up-icon>
+						<view v-if="item.status === 'success'"
+							class="u-upload__wrap__play"
+							@tap="onClickPreview(item, index)">
+							<slot name="playIcon"></slot>
+							<up-icon v-if="!$slots['playIcon']"
+								class="u-upload__wrap__play__icon"
+								name="play-right" size="22px"></up-icon>
+						</view>
+					</view>
+					<view
+					    v-else
+					    class="u-upload__wrap__preview__other"
+						@tap="onClickPreview(item, index)"
+						:style="[{
+							width: addUnit(width),
+							height: addUnit(height)
+						}]"
+					>
+						<up-icon
+						    color="#80CBF9"
+						    size="26"
+						    :name="item.isVideo || (item.type && item.type === 'video') ? 'movie' : 'folder'"
+						></up-icon>
+						<text class="u-upload__wrap__preview__other__text">
+							{{item.isVideo || (item.type && item.type === 'video') ? item.name || t("up.common.video") : item.name || t("up.common.file")}}
+						</text>
+					</view>
+					<view
+					    class="u-upload__status"
+					    v-if="item.status === 'uploading' || item.status === 'failed'"
+					>
+						<view class="u-upload__status__icon">
+							<up-icon
+							    v-if="item.status === 'failed'"
+							    name="close-circle"
+							    color="#ffffff"
+							    size="25"
+							/>
+							<u-loading-icon
+							    size="22"
+							    mode="circle"
+							    v-else
+							/>
+						</view>
+						<text
+						    v-if="item.message"
+						    class="u-upload__status__message"
+						>{{ item.message }}</text>
+						<up-gap class="u-upload__progress" height="3px"
+							:style="{width: item.progress + '%'}"></up-gap>
+					</view>
+					<view
+					    class="u-upload__deletable"
+					    v-if="item.status !== 'uploading' && (deletable || item.deletable)"
+					    @tap.stop="deleteItem(index)"
+					>
+						<view class="u-upload__deletable__icon">
+							<up-icon
+							    name="close"
+							    color="#ffffff"
+							    size="10"
+							></up-icon>
+						</view>
+					</view>
+					<slot name="success">
+						<view
+							class="u-upload__success"
+							v-if="item.status === 'success'"
+						>
+							<!-- #ifdef APP-NVUE -->
+							<image
+								:src="successIcon"
+								class="u-upload__success__icon"
+							></image>
+							<!-- #endif -->
+							<!-- #ifndef APP-NVUE -->
+							<view class="u-upload__success__icon">
+								<up-icon
+									name="checkmark"
+									color="#ffffff"
+									size="12"
+								></up-icon>
+							</view>
+							<!-- #endif -->
+						</view>
+					</slot>
+				</view>
+			</template>
+			<canvas id="myCanvas" type="2d"
+				style="width: 100px; height: 150px;display: none;"></canvas>
+			<template v-if="isInCount">
+				<view
+				    v-if="$slots.trigger"
+				    @tap="chooseFile"
+				>
+					<slot name="trigger" />
+				</view>
+				<view
+				    v-else-if="!$slots.trigger && ($slots.default || $slots.$default)"
+				    @tap="chooseFile"
+				>
+					<slot />
+				</view>
+				<view
+				    v-else
+				    class="u-upload__button"
+				    :hover-class="!disabled ? 'u-upload__button--hover' : ''"
+				    hover-stay-time="150"
+				    @tap="chooseFile"
+				    :class="[disabled && 'u-upload__button--disabled']"
+					:style="[{
+						width: addUnit(width),
+						height: addUnit(height)
+					}]"
+				>
+					<up-icon
+					    :name="uploadIcon"
+					    size="26"
+					    :color="uploadIconColor"
+					></up-icon>
+					<text
+					    v-if="uploadText"
+					    class="u-upload__button__text"
+					>{{ uploadText }}</text>
+				</view>
+			</template>
+		</view>
+		<up-popup
+			mode="center"
+			v-model:show="popupShow">
+			<video id="myVideo" v-if="popupShow"
+				:src="currentItemIndex >= 0 ? lists[currentItemIndex].url : ''"
+				@error="videoErrorCallback" show-center-play-btn
+				:object-fit='videoPreviewObjectFit' show-fullscreen-btn='true'
+				enable-play-gesture controls
+				:autoplay="true" auto-pause-if-open-native
+				@loadedmetadata="loadedVideoMetadata"
+				:initial-time='0.1'>
+			</video>
+		</up-popup>
+	</view>
 </template>
 
 <script>
-import { chooseFile } from './utils'
-import { mixinUpload } from './mixin'
-import { props } from './props'
-import { mpMixin } from '../../libs/mixin/mpMixin'
-import { mixin } from '../../libs/mixin/mixin'
-import { addStyle, addUnit, toast } from '../../libs/function/index'
-import test from '../../libs/function/test'
-/**
- * upload 上传
- * @description 该组件用于上传图片场景
- * @tutorial https://uview-plus.jiangruyi.com/components/upload.html
- * @property {String}			accept				接受的文件类型, 可选值为all media image file video （默认 'image' ）
- * @property {String | Array}	capture				图片或视频拾取模式，当accept为image类型时设置capture可选额外camera可以直接调起摄像头（默认 ['album', 'camera'] ）
- * @property {Boolean}			compressed			当accept为video时生效，是否压缩视频，默认为true（默认 true ）
- * @property {String}			camera				当accept为video时生效，可选值为back或front（默认 'back' ）
- * @property {Number}			maxDuration			当accept为video时生效，拍摄视频最长拍摄时间，单位秒（默认 60 ）
- * @property {String}			uploadIcon			上传区域的图标，只能内置图标（默认 'camera-fill' ）
- * @property {String}			uploadIconColor		上传区域的图标的字体颜色，只能内置图标（默认 #D3D4D6 ）
- * @property {Boolean}			useBeforeRead		是否开启文件读取前事件（默认 false ）
- * @property {Boolean}			previewFullImage	是否显示组件自带的图片预览功能（默认 true ）
- * @property {String | Number}	maxCount			最大上传数量（默认 52 ）
- * @property {Boolean}			disabled			是否启用（默认 false ）
- * @property {String}			imageMode			预览上传的图片时的裁剪模式，和image组件mode属性一致（默认 'aspectFill' ）
- * @property {String}			name				标识符，可以在回调函数的第二项参数中获取
- * @property {Array}			sizeType			所选的图片的尺寸, 可选值为original compressed（默认 ['original', 'compressed'] ）
- * @property {Boolean}			multiple			是否开启图片多选，部分安卓机型不支持 （默认 false ）
- * @property {Boolean}			deletable			是否展示删除按钮（默认 true ）
- * @property {String | Number}	maxSize				文件大小限制，单位为byte （默认 Number.MAX_VALUE ）
- * @property {Array}			fileList			显示已上传的文件列表
- * @property {String}			uploadText			上传区域的提示文字
- * @property {String | Number}	width				内部预览图片区域和选择图片按钮的区域宽度（默认 80 ）
- * @property {String | Number}	height				内部预览图片区域和选择图片按钮的区域高度（默认 80 ）
- * @property {Object}			customStyle			组件的样式，对象形式
- * @event {Function} afterRead		读取后的处理函数
- * @event {Function} beforeRead		读取前的处理函数
- * @event {Function} oversize		文件超出大小限制
- * @event {Function} clickPreview	点击预览图片
- * @event {Function} delete 		删除图片
- * @example <u-upload :action="action" :fileList="fileList" ></u-upload>
- */
-export default {
-  name: 'u-upload',
-  mixins: [mpMixin, mixin, mixinUpload, props],
-  data() {
-    return {
-      // #ifdef APP-NVUE
-      successIcon:
-        'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAKKADAAQAAAABAAAAKAAAAAB65masAAACP0lEQVRYCc3YXygsURwH8K/dpcWyG3LF5u/6/+dKVylSypuUl6uUPMifKMWL8oKEB1EUT1KeUPdR3uTNUsSLxb2udG/cbvInNuvf2rVnazZ/ZndmZ87snjM1Z+Z3zpzfp9+Z5mEAhlvjRtZgCKs+gnPAOcAkkMOR4jEHfItjDvgRxxSQD8cM0BuOCaAvXNCBQrigAsXgggYUiwsK0B9cwIH+4gIKlIILGFAqLiBAOTjFgXJxigJp4BQD0sIpAqSJow6kjSNAFTnRaHJwLenD6Mud52VQAcrBfTd2oyq+HtGaGGWAcnAVcXWoM3bCZrdi+ncPfaAcXE5UKVpdW/vitGPqqAtn98d0gXJwX7Qp6MmegUYVhvmTIezdmHlxJCjpHRTCFerLkRRu4k0aqdajN3sWOo0BK//msHa+xDuPC/oNFMKRhTtM4xjIX0SCNpXL4+7VIaHuyiWEp2L7ahWLf8fejfPdqPmC3mJicORZUp1CQzm+GiphvljGk+PBvWRbxii+xVTj5M6CiZ/tsDufvaXyxEUDxeLIyvu3m0iOyEFWVAkydcVYdyFrE9tQk9iMq6f/GNlvwt3LjQfh60LUrw9/cFyyMJUW/XkLSNMV4Mi6C5ML+ui4x5ClAX9sB9w0wV6wglJwJCv5fOxcr6EstgbGiEw4XcfUry4cWrcEUW8n+ARKxXEJHhw2WG43UKSvwI/TSZgvl7kh0b3XLZaLEy0QmMgLZAVH7J+ALOE+AVnDvQOyiPMAWcW5gSzjCPAV+78S5WE0GrQAAAAASUVORK5CYII=',
-      // #endif
-      lists: [],
-      isInCount: true
-    }
-  },
-  watch: {
-    // 监听文件列表的变化，重新整理内部数据
-    fileList: {
-      handler() {
-        this.formatFileList()
-      },
-      immediate: true,
-      deep: true
-    },
-    deletable(newVal) {
-      this.formatFileList()
-    },
-    maxCount(newVal) {
-      this.formatFileList()
-    },
-    accept(newVal) {
-      this.formatFileList()
-    }
-  },
-  // #ifdef VUE3
-  emits: ['error', 'beforeRead', 'oversize', 'afterRead', 'delete', 'clickPreview'],
-  // #endif
-  methods: {
-    addUnit,
-    addStyle,
-    formatFileList() {
-      const { fileList = [], maxCount } = this
-      const lists = fileList.map(item =>
-        Object.assign(Object.assign({}, item), {
-          // 如果item.url为本地选择的blob文件的话，无法判断其为video还是image，此处优先通过accept做判断处理
-          isImage: this.accept === 'image' || test.image(item.url || item.thumb),
-          isVideo: this.accept === 'video' || test.video(item.url || item.thumb),
-          deletable: typeof item.deletable === 'boolean' ? item.deletable : this.deletable
-        })
-      )
-      this.lists = lists
-      this.isInCount = lists.length < maxCount
-    },
-    chooseFile() {
-      const { maxCount, multiple, lists, disabled } = this
-      if (disabled) return
-      // 如果用户传入的是字符串，需要格式化成数组
-      let capture
-      try {
-        capture = test.array(this.capture) ? this.capture : this.capture.split(',')
-      } catch (e) {
-        capture = []
-      }
-      chooseFile(
-        Object.assign(
-          {
-            accept: this.accept,
-            extension: this.extension,
-            multiple: this.multiple,
-            capture: capture,
-            compressed: this.compressed,
-            maxDuration: this.maxDuration,
-            sizeType: this.sizeType,
-            camera: this.camera
-          },
-          {
-            maxCount: maxCount - lists.length
-          }
-        )
-      )
-        .then(res => {
-          this.onBeforeRead(multiple ? res : res[0])
-        })
-        .catch(error => {
-          this.$emit('error', error)
-        })
-    },
-    // 文件读取之前
-    onBeforeRead(file) {
-      const { beforeRead, useBeforeRead } = this
-      let res = true
-      // beforeRead是否为一个方法
-      if (test.func(beforeRead)) {
-        // 如果用户定义了此方法，则去执行此方法，并传入读取的文件回调
-        res = beforeRead(file, this.getDetail())
-      }
-      if (useBeforeRead) {
-        res = new Promise((resolve, reject) => {
-          this.$emit(
-            'beforeRead',
-            Object.assign(
-              Object.assign(
-                {
-                  file
-                },
-                this.getDetail()
-              ),
-              {
-                callback: ok => {
-                  ok ? resolve() : reject()
+	import {
+		chooseFile
+	} from './utils';
+	import { mixinUpload } from './mixin';
+	import { props } from './props';
+	import { mpMixin } from '../../libs/mixin/mpMixin';
+	import { mixin } from '../../libs/mixin/mixin';
+	import { addStyle, addUnit, toast } from '../../libs/function/index';
+	import test from '../../libs/function/test';
+	import { t } from '../../libs/i18n'
+	/**
+	 * upload 上传
+	 * @description 该组件用于上传图片场景
+	 * @tutorial https://uview-plus.jiangruyi.com/components/upload.html
+	 * @property {String}			accept				接受的文件类型, 可选值为all media image file video （默认 'image' ）
+	 * @property {String | Array}	capture				图片或视频拾取模式，当accept为image类型时设置capture可选额外camera可以直接调起摄像头（默认 ['album', 'camera'] ）
+	 * @property {Array}			extension			选择文件的后缀名，暂只支持.zip、.png等，不支持application/msword等值
+	 * @property {Boolean}			compressed			当accept为video时生效，是否压缩视频，默认为true（默认 true ）
+	 * @property {String}			camera				当accept为video时生效，可选值为back或front（默认 'back' ）
+	 * @property {Number}			maxDuration			当accept为video时生效，拍摄视频最长拍摄时间，单位秒（默认 60 ）
+	 * @property {String}			uploadIcon			上传区域的图标，只能内置图标（默认 'camera-fill' ）
+	 * @property {String}			uploadIconColor		上传区域的图标的字体颜色，只能内置图标（默认 #D3D4D6 ）
+	 * @property {Boolean}			useBeforeRead		是否开启文件读取前事件（默认 false ）
+	 * @property {Boolean}			previewFullImage	是否显示组件自带的图片预览功能（默认 true ）
+	 * @property {String | Number}	maxCount			最大上传数量（默认 52 ）
+	 * @property {Boolean}			disabled			是否启用（默认 false ）
+	 * @property {String}			imageMode			预览上传的图片时的裁剪模式，和image组件mode属性一致（默认 'aspectFill' ）
+	 * @property {String}			name				标识符，可以在回调函数的第二项参数中获取
+	 * @property {Array}			sizeType			所选的图片的尺寸, 可选值为original compressed（默认 ['original', 'compressed'] ）
+	 * @property {Boolean}			multiple			是否开启图片多选，部分安卓机型不支持 （默认 false ）
+	 * @property {Boolean}			deletable			是否展示删除按钮（默认 true ）
+	 * @property {String | Number}	maxSize				文件大小限制，单位为byte （默认 Number.MAX_VALUE ）
+	 * @property {Array}			fileList			显示已上传的文件列表
+	 * @property {String}			uploadText			上传区域的提示文字
+	 * @property {String | Number}	width				内部预览图片区域和选择图片按钮的区域宽度（默认 80 ）
+	 * @property {String | Number}	height				内部预览图片区域和选择图片按钮的区域高度（默认 80 ）
+	 * @property {Object}			customStyle			组件的样式，对象形式
+	 * @event {Function} afterRead		读取后的处理函数
+	 * @event {Function} beforeRead		读取前的处理函数
+	 * @event {Function} oversize		文件超出大小限制
+	 * @event {Function} clickPreview	点击预览图片
+	 * @event {Function} delete 		删除图片
+	 * @example <u-upload :action="action" :fileList="fileList" ></u-upload>
+	 */
+	export default {
+		name: "u-upload",
+		mixins: [mpMixin, mixin, mixinUpload, props],
+		data() {
+			return {
+				// #ifdef APP-NVUE
+				successIcon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAKKADAAQAAAABAAAAKAAAAAB65masAAACP0lEQVRYCc3YXygsURwH8K/dpcWyG3LF5u/6/+dKVylSypuUl6uUPMifKMWL8oKEB1EUT1KeUPdR3uTNUsSLxb2udG/cbvInNuvf2rVnazZ/ZndmZ87snjM1Z+Z3zpzfp9+Z5mEAhlvjRtZgCKs+gnPAOcAkkMOR4jEHfItjDvgRxxSQD8cM0BuOCaAvXNCBQrigAsXgggYUiwsK0B9cwIH+4gIKlIILGFAqLiBAOTjFgXJxigJp4BQD0sIpAqSJow6kjSNAFTnRaHJwLenD6Mud52VQAcrBfTd2oyq+HtGaGGWAcnAVcXWoM3bCZrdi+ncPfaAcXE5UKVpdW/vitGPqqAtn98d0gXJwX7Qp6MmegUYVhvmTIezdmHlxJCjpHRTCFerLkRRu4k0aqdajN3sWOo0BK//msHa+xDuPC/oNFMKRhTtM4xjIX0SCNpXL4+7VIaHuyiWEp2L7ahWLf8fejfPdqPmC3mJicORZUp1CQzm+GiphvljGk+PBvWRbxii+xVTj5M6CiZ/tsDufvaXyxEUDxeLIyvu3m0iOyEFWVAkydcVYdyFrE9tQk9iMq6f/GNlvwt3LjQfh60LUrw9/cFyyMJUW/XkLSNMV4Mi6C5ML+ui4x5ClAX9sB9w0wV6wglJwJCv5fOxcr6EstgbGiEw4XcfUry4cWrcEUW8n+ARKxXEJHhw2WG43UKSvwI/TSZgvl7kh0b3XLZaLEy0QmMgLZAVH7J+ALOE+AVnDvQOyiPMAWcW5gSzjCPAV+78S5WE0GrQAAAAASUVORK5CYII=',
+				// #endif
+				lists: [],
+				isInCount: true,
+				popupShow: false,
+				currentItemIndex: -1
+			}
+		},
+		watch: {
+			// 监听文件列表的变化，重新整理内部数据
+			fileList: {
+				handler() {
+					this.formatFileList()
+				},
+				immediate: true,
+				deep: true,
+			},
+			deletable(newVal) {
+				this.formatFileList()
+			},
+			maxCount(newVal) {
+				this.formatFileList()
+			},
+			accept(newVal) {
+				this.formatFileList()
+			},
+			popupShow(newVal) {
+				if (!newVal) {
+					this.currentItemIndex = -1;
+				}
+			}
+		},
+		// #ifdef VUE3
+		emits: ['error', 'beforeRead', 'oversize', 'afterRead', 'delete', 'clickPreview', 'update:fileList', 'afterAutoUpload'],
+		// #endif
+		methods: {
+			t,
+			addUnit,
+			addStyle,
+			videoErrorCallback() {},
+			loadedVideoMetadata(e) {
+				if (this.currentItemIndex < 0) {
+					return;
+				}
+				if (this.autoUploadDriver != 'local') {
+					return;
+				}
+				if (!this.getVideoThumb) {
+					return;
+				}
+				// 截取第一帧作为封面，oss等云存储场景直接使用拼接参数。
+				let w = this.lists[this.currentItemIndex].width;
+				let h = this.lists[this.currentItemIndex].height;
+				const dpr = uni.getSystemInfoSync().pixelRatio;
+				uni.createSelectorQuery().select('#myVideo').context(res => {
+					console.log('select video', res)
+					const myVideo = res.context
+					uni.createSelectorQuery()
+					  .select('#myCanvas')
+					  .fields({ node: true, size: true })
+					  .exec(([res]) => {
+						console.log('select canvas', res)
+						const ctx1 = res[0].node.getContext('2d')
+						res[0].node.width = w * dpr
+						res[0].node.height = h * dpr
+						// Draw the first frame and export it as an image
+						// myVideo.onPlay(() => {
+							setTimeout(() => {
+								captureFirstFrame()
+							}, 500)
+						// })
+						const captureFirstFrame = () => {
+							ctx1.drawImage(myVideo, 0, 0, w * dpr, h * dpr)
+							wx.canvasToTempFilePath({
+								canvas: res[0].node,
+								success: (result) => {
+									console.log('First frame image path:', result
+										.tempFilePath)
+									// Now you can use the image path (result.tempFilePath)
+									this.fileList['currentItemIndex'].thumb = result.tempFilePath
+								},
+								fail: (err) => {
+									console.error('Failed to export image:', err)
+								}
+							})
+						}
+
+						// Capture the first frame
+						setInterval(() => {
+							ctx1.drawImage(myVideo, 0, 0, w * dpr, h * dpr);
+						}, 1000 / 24)
+					}).exec()
+				}).exec()
+			},
+			formatFileList() {
+				const {
+					fileList = [], maxCount
+				} = this;
+				const lists = fileList.map((item) => {
+					const name = item.name || item.url || item.thumb
+					return Object.assign(Object.assign({}, item), {
+						// 如果item.url为本地选择的blob文件的话，无法判断其为video还是image，此处优先通过accept做判断处理
+						isImage: item.name ? test.image(item.name) : (this.accept === 'image' || test.image(name)),
+						isVideo: item.name ? test.video(item.name) : (this.accept === 'video' || test.video(name)),
+						deletable: typeof item.deletable === 'boolean' ? item.deletable : this.deletable,
+					})
+				});
+				this.lists = lists
+				this.isInCount = lists.length < maxCount
+			},
+			chooseFile(params) {
+				const {
+					maxCount,
+					multiple,
+					lists,
+					disabled
+				} = this;
+				if (disabled) return Promise.reject();
+				const chooseParams = Object.assign({
+					accept: this.accept,
+					extension: this.extension,
+					multiple: this.multiple,
+					capture: this.capture,
+					compressed: this.compressed,
+					maxDuration: this.maxDuration,
+					sizeType: this.sizeType,
+					camera: this.camera,
+				}, {
+					maxCount: maxCount - lists.length,
+					...params
+				})
+				return chooseFile(chooseParams)
+					.then((res) => {
+						const result = chooseParams.multiple ? res : res[0]
+						this.onBeforeRead(result);
+						return result
+					})
+					.catch((error) => {
+						this.$emit('error', error);
+					});
+			},
+			// 文件读取之前
+			onBeforeRead(file) {
+				const {
+					beforeRead,
+					useBeforeRead,
+				} = this;
+				let res = file
+				// beforeRead是否为一个方法
+				if (test.func(beforeRead)) {
+					// 如果用户定义了此方法，则去执行此方法，并传入读取的文件回调
+					res = beforeRead(file, this.getDetail());
+				}
+				if (useBeforeRead) {
+					res = new Promise((resolve, reject) => {
+						this.$emit(
+							'beforeRead',
+							Object.assign(Object.assign({
+								file
+							}, this.getDetail()), {
+								callback: (ok) => {
+									ok ? resolve() : reject();
+								},
+							})
+						);
+					});
+				}
+				if (test.promise(res)) {
+					res.then((data) => this.onAfterRead(data || file));
+				} else {
+					this.onAfterRead(res || file);
+				}
+			},
+			getDetail(index) {
+				return {
+					name: this.name,
+					index: index == null ? this.fileList.length : index,
+				};
+			},
+			async onAfterRead(file) {
+				const {
+					maxSize,
+					afterRead
+				} = this;
+				const oversize = Array.isArray(file) ?
+					file.some((item) => item.size > maxSize) :
+					file.size > maxSize;
+				if (oversize) {
+					uni.showToast({
+						title: t("up.upload.sizeExceed")
+					})
+					this.$emit('oversize', Object.assign({
+						file
+					}, this.getDetail()));
+					return;
+				}
+				let len = this.fileList.length;
+				if (this.autoUpload) {
+					// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
+					let lists = [].concat(file);
+					let fileListLen = this.fileList.length;
+					lists.map((item) => {
+						this.fileList.push({
+							...item,
+							status: 'uploading',
+							message: t("up.upload.uploading"),
+							progress: 0
+						});
+					});
+					let that = this;
+					this.$emit('update:fileList', this.fileList);
+					for (let i = 0; i < lists.length; i++) {
+						let j = i;
+						let result = '';
+						switch(this.autoUploadDriver) {
+							case 'cos': // 腾讯云
+								break;
+							case 'kodo': // 七牛云
+								break;
+							case 'oss':
+							case 'upload_oss':
+								// 阿里云前端直传
+								// 获取签名
+								console.log()
+								let formData = {};
+								let ret = await uni.request({
+									url: this.autoUploadAuthUrl,
+									method: 'get',
+									header: this.autoUploadHeader,
+									data: {
+										filename: lists[j].name
+									}
+								});
+								// console.log(ret);
+								let res0 = ret.data;
+								if (res0.code == 200) {
+									// 路径 + 文件名 + 扩展名
+									// 不传递filename就要拼接key
+									// res0.data.params.key = res0.data.params.dir + res0.data.params.uniqidName + fileExt;
+									formData = res0.data.params;
+								} else {
+									uni.showToast({
+										title: res0.msg,
+										duration: 1500
+									});
+									return;
+								}
+								var uploadTask = uni.uploadFile({
+									url: res0.data.params.host,
+									filePath: lists[j].url,
+									name: 'file',
+									// fileType: 'video', // 仅支付宝小程序，且必填。
+									// header: header,
+									formData: formData,
+									success: (uploadFileRes) => {
+										let thumb = '';
+										let afterPromise = '';
+										if (that.customAfterAutoUpload) {
+											afterPromise = new Promise((resolve, reject) => {
+												that.$emit(
+													'afterAutoUpload',
+													Object.assign(res0, {
+														callback: (r) => {
+															r.url ? resolve(r) : reject();
+														},
+													})
+												);
+											});
+										}
+										if (test.promise(afterPromise)) {
+											afterPromise.then((data) => that.succcessUpload(len + j, data.url, data.thumb));
+										} else {
+											result = res0.data.params.host + '/' + res0.data.params.key;
+											if (that.accept === 'video' || test.video(result)) {
+												thumb = result + '?x-oss-process=video/snapshot,t_10000,m_fast';
+											}
+											that.succcessUpload(len + j, result, thumb);
+										}
+									}
+								});
+								uploadTask.onProgressUpdate((res) => {
+									that.updateUpload(len + j, {
+										progress: res.progress
+									});
+									// console.log('上传进度' + res.progress);
+									// console.log('已经上传的数据长度' + res.totalBytesSent);
+									// console.log('预期需要上传的数据总长度' + res.totalBytesExpectedToSend);
+								});
+								break;
+							case 'local':
+							default:
+								// 服务器本机上传
+								var uploadTask = uni.uploadFile({
+									url: this.autoUploadApi,
+									filePath: lists[j].url,
+									name: 'file',
+									// fileType: 'video', // 仅支付宝小程序，且必填。
+									header: this.autoUploadHeader,
+									success: (uploadFileRes) => {
+										let res0 = uploadFileRes.data;
+										let afterPromise = '';
+										if (that.customAfterAutoUpload) {
+											afterPromise = new Promise((resolve, reject) => {
+												that.$emit(
+													'afterAutoUpload',
+													Object.assign(res0, {
+														callback: (r) => {
+															r.url ? resolve(r) : reject();
+														}
+													})
+												);
+											});
+										}
+										if (test.promise(afterPromise)) {
+											afterPromise.then((data) => that.succcessUpload(len + j, data.url));
+										} else {
+											if (res0.code != 200) {
+												uni.showToast({
+													title: res0.msg
+												});
+											} else {
+												result = res0.data.url;
+												that.succcessUpload(len + j, result);
+											}
+										}
+									}
+								});
+								uploadTask.onProgressUpdate((res) => {
+									that.updateUpload(len + j, {
+										progress: res.progress
+									});
+									// console.log('上传进度' + res.progress);
+									// console.log('已经上传的数据长度' + res.totalBytesSent);
+									// console.log('预期需要上传的数据总长度' + res.totalBytesExpectedToSend);
+								});
+								break;
+						}
+					}
+				} else {
+					if (typeof afterRead === 'function') {
+						afterRead(file, this.getDetail());
+					}
+					this.$emit('afterRead', Object.assign({
+						file
+					}, this.getDetail()));
+				}
+			},
+			updateUpload(index, param) {
+				let item = this.fileList[index];
+				this.fileList.splice(index, 1, {
+					...item,
+					// 注意这里不判断会出现succcessUpload先执行又被覆盖的问题
+					status: param.progress == 100 ? 'success' : 'uploading',
+					message: '',
+					progress: param.progress
+				});
+				this.$emit('update:fileList', this.fileList);
+			},
+			succcessUpload(index, url, thumb = '') {
+				let item = this.fileList[index];
+				this.fileList.splice(index, 1, {
+					...item,
+					status: 'success',
+					message: '',
+					url: url,
+					progress: 100,
+					thumb: thumb
+				});
+				this.$emit('update:fileList', this.fileList);
+			},
+			deleteItem(index) {
+				if (this.autoDelete) {
+					this.fileList.splice(index, 1);
+					this.$emit('update:fileList', this.fileList);
+				} else {
+					this.$emit(
+						'delete',
+						Object.assign(Object.assign({}, this.getDetail(index)), {
+							file: this.fileList[index],
+						})
+					);
+				}
+			},
+			// 预览图片
+			onPreviewImage(previewItem, index) {
+				if (!previewItem.isImage || !this.previewFullImage) return
+                let current = 0;
+                const urls = [];
+                let imageIndex = 0;
+                for (var i = 0; i < this.lists.length; i++) {
+                    const item = this.lists[i];
+                    if (item.isImage || (item.type && item.type === 'image')) {
+                        urls.push(item.url || item.thumb);
+                        if (i === index) {
+                            current = imageIndex;
+                        }
+                        imageIndex += 1;
+                    }
                 }
-              }
-            )
-          )
-        })
-      }
-      if (!res) {
-        return
-      }
-      if (test.promise(res)) {
-        res.then(data => this.onAfterRead(data || file))
-      } else {
-        this.onAfterRead(file)
-      }
-    },
-    getDetail(index) {
-      return {
-        name: this.name,
-        index: index == null ? this.fileList.length : index
-      }
-    },
-    onAfterRead(file) {
-      const { maxSize, afterRead } = this
-      const oversize = Array.isArray(file) ? file.some(item => item.size > maxSize) : file.size > maxSize
-      if (oversize) {
-        this.$emit(
-          'oversize',
-          Object.assign(
-            {
-              file
-            },
-            this.getDetail()
-          )
-        )
-        return
-      }
-      if (typeof afterRead === 'function') {
-        afterRead(file, this.getDetail())
-      }
-      this.$emit(
-        'afterRead',
-        Object.assign(
-          {
-            file
-          },
-          this.getDetail()
-        )
-      )
-    },
-    deleteItem(index) {
-      uni.showModal({
-        title: '提示',
-        content: '您确定要删除该图片吗？',
-        success: res => {
-          if (res.confirm) {
-            this.$emit(
-              'delete',
-              Object.assign(Object.assign({}, this.getDetail(index)), {
-                file: this.fileList[index]
-              })
-            )
-          }
-        }
-      })
-    },
-    // 预览图片
-    onPreviewImage(previewItem, index) {
-      if (!previewItem.isImage || !this.previewFullImage) return
-      let current = 0
-      const urls = []
-      let imageIndex = 0
-      for (var i = 0; i < this.lists.length; i++) {
-        const item = this.lists[i]
-        if (item.isImage || (item.type && item.type === 'image')) {
-          urls.push(item.url || item.thumb)
-          if (i === index) {
-            current = imageIndex
-          }
-          imageIndex += 1
-        }
-      }
-      if (urls.length < 1) {
-        return
-      }
-      uni.previewImage({
-        urls: urls,
-        current: current,
-        fail() {
-          toast('预览图片失败')
-        }
-      })
-    },
-    onPreviewVideo(index) {
-      if (!this.previewFullImage) return
-      let current = 0
-      const sources = []
-      let videoIndex = 0
-      for (var i = 0; i < this.lists.length; i++) {
-        const item = this.lists[i]
-        if (item.isVideo || (item.type && item.type === 'video')) {
-          sources.push(
-            Object.assign(Object.assign({}, item), {
-              type: 'video'
-            })
-          )
-          if (i === index) {
-            current = videoIndex
-          }
-          videoIndex += 1
-        }
-      }
-      if (sources.length < 1) {
-        return
-      }
-      // #ifdef MP-WEIXIN
-      wx.previewMedia({
-        sources: sources,
-        current: current,
-        fail() {
-          toast('预览视频失败')
-        }
-      })
-      // #endif
-    },
-    onClickPreview(item, index) {
-      if (!this.previewFullImage) return
-      switch (item.type) {
-        case 'video':
-          this.onPreviewVideo(index)
-          break
-        default:
-          break
-      }
-      this.$emit('clickPreview', Object.assign(Object.assign({}, item), this.getDetail(index)))
-    }
-  }
-}
+                if (urls.length < 1) {
+                    return;
+                }
+				uni.previewImage({
+                    urls: urls,
+                    current: current,
+					fail() {
+						toast(t("up.upload.previewImageFail"))
+					},
+				});
+			},
+			onPreviewVideo(previewItem, index) {
+				if (!this.previewFullImage) return;
+                let current = 0;
+                const sources = [];
+                let videoIndex = 0;
+                for (var i = 0; i < this.lists.length; i++) {
+                    const item = this.lists[i];
+                    if (item.isVideo || (item.type && item.type === 'video')) {
+                        sources.push(Object.assign(Object.assign({}, item), {
+                            type: 'video'
+                        }));
+                        if (i === index) {
+                            current = videoIndex;
+                        }
+                        videoIndex += 1;
+                    }
+                }
+                if (sources.length < 1) {
+                    return;
+                }
+				// #ifndef MP-WEIXIN
+				this.popupShow = true;
+				this.currentItemIndex = index;
+				console.log(this.lists[this.currentItemIndex])
+				// #endif
+				// #ifdef MP-WEIXIN
+				wx.previewMedia({
+					sources: sources,
+					current: current,
+					fail() {
+						toast(t("up.upload.previewVideoFail"))
+					},
+				});
+				// #endif
+			},
+			onClickPreview(item, index) {
+				if (this.previewFullImage) {
+					switch (item.type) {
+						case 'image':
+							this.onPreviewImage(item, index);
+							break;
+						case 'video':
+							this.onPreviewVideo(item, index);
+							break;
+						default:
+							break;
+					}
+				}
+				this.$emit(
+					'clickPreview',
+					Object.assign(Object.assign({}, item), this.getDetail(index))
+				);
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-@import '../../libs/css/components.scss';
-$u-upload-preview-border-radius: 2px !default;
-$u-upload-preview-margin: 0 8px 8px 0 !default;
-$u-upload-image-width: 80px !default;
-$u-upload-image-height: $u-upload-image-width;
-$u-upload-other-bgColor: rgb(242, 242, 242) !default;
-$u-upload-other-flex: 1 !default;
-$u-upload-text-font-size: 11px !default;
-$u-upload-text-color: $u-tips-color !default;
-$u-upload-text-margin-top: 2px !default;
-$u-upload-deletable-right: 0 !default;
-$u-upload-deletable-top: 0 !default;
-$u-upload-deletable-bgColor: rgb(55, 55, 55) !default;
-$u-upload-deletable-height: 20px !default;
-$u-upload-deletable-width: $u-upload-deletable-height;
-$u-upload-deletable-boder-bottom-left-radius: 100px !default;
-$u-upload-deletable-zIndex: 3 !default;
-$u-upload-success-bottom: 0 !default;
-$u-upload-success-right: 0 !default;
-$u-upload-success-border-style: solid !default;
-$u-upload-success-border-top-color: transparent !default;
-$u-upload-success-border-left-color: transparent !default;
-$u-upload-success-border-bottom-color: $u-success !default;
-$u-upload-success-border-right-color: $u-upload-success-border-bottom-color;
-$u-upload-success-border-width: 9px !default;
-$u-upload-icon-top: 0px !default;
-$u-upload-icon-right: 0px !default;
-$u-upload-icon-h5-top: 1px !default;
-$u-upload-icon-h5-right: 0 !default;
-$u-upload-icon-width: 16px !default;
-$u-upload-icon-height: $u-upload-icon-width;
-$u-upload-success-icon-bottom: -10px !default;
-$u-upload-success-icon-right: -10px !default;
-$u-upload-status-right: 0 !default;
-$u-upload-status-left: 0 !default;
-$u-upload-status-bottom: 0 !default;
-$u-upload-status-top: 0 !default;
-$u-upload-status-bgColor: rgba(0, 0, 0, 0.5) !default;
-$u-upload-status-icon-Zindex: 1 !default;
-$u-upload-message-font-size: 12px !default;
-$u-upload-message-color: #ffffff !default;
-$u-upload-message-margin-top: 5px !default;
-$u-upload-button-width: 80px !default;
-$u-upload-button-height: $u-upload-button-width;
-$u-upload-button-bgColor: rgb(244, 245, 247) !default;
-$u-upload-button-border-radius: 2px !default;
-$u-upload-botton-margin: 0 8px 8px 0 !default;
-$u-upload-text-font-size: 11px !default;
-$u-upload-text-color: $u-tips-color !default;
-$u-upload-text-margin-top: 2px !default;
-$u-upload-hover-bgColor: rgb(230, 231, 233) !default;
-$u-upload-disabled-opacity: 0.5 !default;
+	$u-upload-preview-border-radius: 2px !default;
+	$u-upload-preview-margin: 0 8px 8px 0 !default;
+	$u-upload-image-width:80px !default;
+	$u-upload-image-height:$u-upload-image-width;
+	$u-upload-other-bgColor: rgb(242, 242, 242) !default;
+	$u-upload-other-flex:1 !default;
+	$u-upload-text-font-size:11px !default;
+	$u-upload-text-color:$u-tips-color !default;
+	$u-upload-text-margin-top:2px !default;
+	$u-upload-deletable-right:0 !default;
+	$u-upload-deletable-top:0 !default;
+	$u-upload-deletable-bgColor:rgb(55, 55, 55) !default;
+	$u-upload-deletable-height:14px !default;
+	$u-upload-deletable-width:$u-upload-deletable-height;
+	$u-upload-deletable-boder-bottom-left-radius:100px !default;
+	$u-upload-deletable-zIndex:3 !default;
+	$u-upload-success-bottom:0 !default;
+	$u-upload-success-right:0 !default;
+	$u-upload-success-border-style:solid !default;
+	$u-upload-success-border-top-color:transparent !default;
+	$u-upload-success-border-left-color:transparent !default;
+	$u-upload-success-border-bottom-color: $u-success !default;
+	$u-upload-success-border-right-color:$u-upload-success-border-bottom-color;
+	$u-upload-success-border-width:9px !default;
+	$u-upload-icon-top:0px !default;
+	$u-upload-icon-right:0px !default;
+	$u-upload-icon-h5-top:1px !default;
+	$u-upload-icon-h5-right:0 !default;
+	$u-upload-icon-width:16px !default;
+	$u-upload-icon-height:$u-upload-icon-width;
+	$u-upload-success-icon-bottom:-10px !default;
+	$u-upload-success-icon-right:-10px !default;
+	$u-upload-status-right:0 !default;
+	$u-upload-status-left:0 !default;
+	$u-upload-status-bottom:0 !default;
+	$u-upload-status-top:0 !default;
+	$u-upload-status-bgColor:rgba(0, 0, 0, 0.5) !default;
+	$u-upload-status-icon-Zindex:1 !default;
+	$u-upload-message-font-size:12px !default;
+	$u-upload-message-color:#FFFFFF !default;
+	$u-upload-message-margin-top:5px !default;
+	$u-upload-button-width:80px !default;
+	$u-upload-button-height:$u-upload-button-width;
+	$u-upload-button-bgColor:rgb(244, 245, 247) !default;
+	$u-upload-button-border-radius:2px !default;
+	$u-upload-botton-margin: 0 8px 8px 0 !default;
+	$u-upload-text-font-size:11px !default;
+	$u-upload-text-color:$u-tips-color !default;
+	$u-upload-text-margin-top: 2px !default;
+	$u-upload-hover-bgColor:rgb(230, 231, 233) !default;
+	$u-upload-disabled-opacity:.5 !default;
 
-.u-upload {
-  @include flex(column);
-  flex: 1;
+	.u-upload {
+		@include flex(column);
+		flex: 1;
 
-  &__wrap {
-    @include flex;
-    flex-wrap: wrap;
-    flex: 1;
+		&__wrap {
+			@include flex;
+			flex-wrap: wrap;
+			flex: 1;
 
-    &__preview {
-      border-radius: $u-upload-preview-border-radius;
-      margin: $u-upload-preview-margin;
-      position: relative;
-      overflow: hidden;
-      @include flex;
+			&__preview {
+				border-radius: $u-upload-preview-border-radius;
+				margin: $u-upload-preview-margin;
+				position: relative;
+				overflow: hidden;
+				@include flex;
 
-      &__image {
-        width: $u-upload-image-width;
-        height: $u-upload-image-height;
-      }
+				&__image {
+					width: $u-upload-image-width;
+					height: $u-upload-image-height;
+				}
 
-      &__other {
-        width: $u-upload-image-width;
-        height: $u-upload-image-height;
-        background-color: $u-upload-other-bgColor;
-        flex: $u-upload-other-flex;
-        @include flex(column);
-        justify-content: center;
-        align-items: center;
+				&__video,
+				&__other {
+					width: $u-upload-image-width;
+					height: $u-upload-image-height;
+					background-color: $u-upload-other-bgColor;
+					flex: $u-upload-other-flex;
+					@include flex(column);
+					justify-content: center;
+					align-items: center;
 
-        &__text {
-          font-size: $u-upload-text-font-size;
-          color: $u-upload-text-color;
-          margin-top: $u-upload-text-margin-top;
-        }
-      }
-    }
-  }
+					&__text {
+						font-size: $u-upload-text-font-size;
+						color: $u-upload-text-color;
+						margin-top: $u-upload-text-margin-top;
+					}
+				}
+			}
+		}
+		&__wrap__play {
+			position: absolute;
+			top: 0px;
+			left: 0px;
+			bottom: 0px;
+			right: 0px;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			&__icon {
+				background: #fff;
+				border-radius: 100px;
+				opacity: 0.8;
+			};
+		}
 
-  &__deletable {
-    position: absolute;
-    top: $u-upload-deletable-top;
-    right: $u-upload-deletable-right;
-    background-color: $u-upload-deletable-bgColor;
-    height: $u-upload-deletable-height;
-    width: $u-upload-deletable-width;
-    @include flex;
-    border-bottom-left-radius: $u-upload-deletable-boder-bottom-left-radius;
-    align-items: center;
-    justify-content: center;
-    z-index: $u-upload-deletable-zIndex;
+		&__deletable {
+			position: absolute;
+			top: $u-upload-deletable-top;
+			right: $u-upload-deletable-right;
+			background-color: $u-upload-deletable-bgColor;
+			height: $u-upload-deletable-height;
+			width: $u-upload-deletable-width;
+			@include flex;
+			border-bottom-left-radius: $u-upload-deletable-boder-bottom-left-radius;
+			align-items: center;
+			justify-content: center;
+			z-index: $u-upload-deletable-zIndex;
 
-    &__icon {
-      position: absolute;
-      transform: scale(0.7);
-      top: $u-upload-icon-top;
-      right: $u-upload-icon-right;
-      /* #ifdef H5 */
-      top: $u-upload-icon-h5-top;
-      right: $u-upload-icon-h5-right;
-      /* #endif */
-    }
-  }
+			&__icon {
+				position: absolute;
+				transform: scale(0.7);
+				top: $u-upload-icon-top;
+				right: $u-upload-icon-right;
+				/* #ifdef H5 */
+				top: $u-upload-icon-h5-top;
+				right: $u-upload-icon-h5-right;
+				/* #endif */
+			}
+		}
 
-  &__success {
-    position: absolute;
-    bottom: $u-upload-success-bottom;
-    right: $u-upload-success-right;
-    @include flex;
-    // 由于weex(nvue)为阿里巴巴的KPI(部门业绩考核)的laji产物，不支持css绘制三角形
-    // 所以在nvue下使用图片，非nvue下使用css实现
-    /* #ifndef APP-NVUE */
-    border-style: $u-upload-success-border-style;
-    border-top-color: $u-upload-success-border-top-color;
-    border-left-color: $u-upload-success-border-left-color;
-    border-bottom-color: $u-upload-success-border-bottom-color;
-    border-right-color: $u-upload-success-border-right-color;
-    border-width: $u-upload-success-border-width;
-    align-items: center;
-    justify-content: center;
-    /* #endif */
+		&__success {
+			position: absolute;
+			bottom: $u-upload-success-bottom;
+			right: $u-upload-success-right;
+			@include flex;
+			// 由于weex(nvue)为阿里巴巴的KPI(部门业绩考核)的laji产物，不支持css绘制三角形
+			// 所以在nvue下使用图片，非nvue下使用css实现
+			/* #ifndef APP-NVUE */
+			border-style: $u-upload-success-border-style;
+			border-top-color: $u-upload-success-border-top-color;
+			border-left-color: $u-upload-success-border-left-color;
+			border-bottom-color: $u-upload-success-border-bottom-color;
+			border-right-color: $u-upload-success-border-right-color;
+			border-width: $u-upload-success-border-width;
+			align-items: center;
+			justify-content: center;
+			/* #endif */
 
-    &__icon {
-      /* #ifndef APP-NVUE */
-      position: absolute;
-      transform: scale(0.7);
-      bottom: $u-upload-success-icon-bottom;
-      right: $u-upload-success-icon-right;
-      /* #endif */
-      /* #ifdef APP-NVUE */
-      width: $u-upload-icon-width;
-      height: $u-upload-icon-height;
-      /* #endif */
-    }
-  }
+			&__icon {
+				/* #ifndef APP-NVUE */
+				position: absolute;
+				transform: scale(0.7);
+				bottom: $u-upload-success-icon-bottom;
+				right: $u-upload-success-icon-right;
+				/* #endif */
+				/* #ifdef APP-NVUE */
+				width: $u-upload-icon-width;
+				height: $u-upload-icon-height;
+				/* #endif */
+			}
+		}
+		&__progress {
+			background-color: $u-primary !important;
+			position: absolute;
+			bottom: 0;
+			left: 0;
+		}
 
-  &__status {
-    position: absolute;
-    top: $u-upload-status-top;
-    bottom: $u-upload-status-bottom;
-    left: $u-upload-status-left;
-    right: $u-upload-status-right;
-    background-color: $u-upload-status-bgColor;
-    @include flex(column);
-    align-items: center;
-    justify-content: center;
+		&__status {
+			position: absolute;
+			top: $u-upload-status-top;
+			bottom: $u-upload-status-bottom;
+			left: $u-upload-status-left;
+			right: $u-upload-status-right;
+			background-color: $u-upload-status-bgColor;
+			@include flex(column);
+			align-items: center;
+			justify-content: center;
 
-    &__icon {
-      position: relative;
-      z-index: $u-upload-status-icon-Zindex;
-    }
+			&__icon {
+				position: relative;
+				z-index: $u-upload-status-icon-Zindex;
+			}
 
-    &__message {
-      font-size: $u-upload-message-font-size;
-      color: $u-upload-message-color;
-      margin-top: $u-upload-message-margin-top;
-    }
-  }
+			&__message {
+				font-size: $u-upload-message-font-size;
+				color: $u-upload-message-color;
+				margin-top: $u-upload-message-margin-top;
+			}
+		}
 
-  &__button {
-    @include flex(column);
-    align-items: center;
-    justify-content: center;
-    width: $u-upload-button-width;
-    height: $u-upload-button-height;
-    background-color: $u-upload-button-bgColor;
-    border-radius: $u-upload-button-border-radius;
-    margin: $u-upload-botton-margin;
-    /* #ifndef APP-NVUE */
-    box-sizing: border-box;
-    /* #endif */
+		&__button {
+			@include flex(column);
+			align-items: center;
+			justify-content: center;
+			width: $u-upload-button-width;
+			height: $u-upload-button-height;
+			background-color: $u-upload-button-bgColor;
+			border-radius: $u-upload-button-border-radius;
+			margin: $u-upload-botton-margin;
+			/* #ifndef APP-NVUE */
+			box-sizing: border-box;
+			/* #endif */
 
-    &__text {
-      font-size: $u-upload-text-font-size;
-      color: $u-upload-text-color;
-      margin-top: $u-upload-text-margin-top;
-    }
+			&__text {
+				font-size: $u-upload-text-font-size;
+				color: $u-upload-text-color;
+				margin-top: $u-upload-text-margin-top;
+			}
 
-    &--hover {
-      background-color: $u-upload-hover-bgColor;
-    }
+			&--hover {
+				background-color: $u-upload-hover-bgColor;
+			}
 
-    &--disabled {
-      opacity: $u-upload-disabled-opacity;
-    }
-  }
-}
+			&--disabled {
+				opacity: $u-upload-disabled-opacity;
+			}
+		}
+	}
 </style>
diff --git a/uview-plus/components/u-upload/upload.js b/uview-plus/components/u-upload/upload.js
index c727c27..74a0835 100644
--- a/uview-plus/components/u-upload/upload.js
+++ b/uview-plus/components/u-upload/upload.js
@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:09:50
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/upload.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/upload.js
  */
 export default {
 	// upload组件
@@ -32,6 +32,15 @@ export default {
 		uploadText: '',
 		width: 80,
 		height: 80,
-		previewImage: true
+		previewImage: true,
+		autoDelete: false,
+		autoUpload: false,
+		autoUploadApi: '',
+		autoUploadAuthUrl: '',
+		autoUploadDriver: '',
+		autoUploadHeader: {},
+		getVideoThumb: false,
+		customAfterAutoUpload: false,
+		videoPreviewObjectFit: 'cover'
 	}
 }
diff --git a/uview-plus/components/u-upload/utils.js b/uview-plus/components/u-upload/utils.js
index 64e46d1..8a31cca 100644
--- a/uview-plus/components/u-upload/utils.js
+++ b/uview-plus/components/u-upload/utils.js
@@ -1,3 +1,4 @@
+import test from '../../libs/function/test'
 function pickExclude(obj, keys) {
 	// 某些情况下，type可能会为
     if (!['[object Object]', '[object File]'].includes(Object.prototype.toString.call(obj))) {
@@ -22,10 +23,14 @@ function formatImage(res) {
 		name: item.name,
 		file: item
 		// #endif
+		// #ifndef H5
+		name: item.path.split('/').pop() + '.png',
+		// #endif
     }))
 }
 
 function formatVideo(res) {
+	// console.log(res)
     return [
         {
             ...pickExclude(res, ['tempFilePath', 'thumbTempFilePath', 'errMsg']),
@@ -33,10 +38,15 @@ function formatVideo(res) {
             url: res.tempFilePath,
             thumb: res.thumbTempFilePath,
 			size: res.size,
+			width: res.width || 0, // APP 2.1.0+、H5、微信小程序、京东小程序
+			height: res.height || 0, // APP 2.1.0+、H5、微信小程序、京东小程序
 			// #ifdef H5
 			name: res.name,
 			file: res
 			// #endif
+			// #ifndef H5
+			name: res.tempFilePath.split('/').pop() + '.mp4',
+			// #endif
         }
     ]
 }
@@ -51,6 +61,9 @@ function formatMedia(res) {
 		// #ifdef H5
 		file: item
 		// #endif
+		// #ifndef H5
+		name: item.tempFilePath.split('/').pop() + (res.type === 'video' ? '.mp4': '.png'),
+		// #endif
     }))
 }
 
@@ -77,6 +90,11 @@ export function chooseFile({
     maxCount,
     extension
 }) {
+    try {
+        capture = test.array(capture) ? capture : capture.split(',');
+    } catch(e) {
+        capture = [];
+    }
     return new Promise((resolve, reject) => {
         switch (accept) {
         case 'image':
@@ -112,32 +130,28 @@ export function chooseFile({
                 fail: reject
             })
             break
-            // #ifdef MP-WEIXIN || H5
-            // 只有微信小程序才支持chooseMessageFile接口
+        // #ifdef MP-WEIXIN || H5
+        // 只有微信小程序才支持chooseMessageFile接口
         case 'file':
-            // #ifdef MP-WEIXIN
-            wx.chooseMessageFile({
-                count: multiple ? maxCount : 1,
-                type: accept,
-                success: (res) => resolve(formatFile(res)),
-                fail: reject
-            })
-            // #endif
-            // #ifdef H5
-            // 需要hx2.9.9以上才支持uni.chooseFile
             let params = {
                 count: multiple ? maxCount : 1,
                 type: accept,
                 success: (res) => resolve(formatFile(res)),
                 fail: reject
             }
+            // Array<string>根据文件拓展名过滤，仅 type==file 时有效。每一项都不能是空字符串。默认不过滤。
             if (extension.length && extension.length > 0) {
                 params.extension = extension
             }
+            // #ifdef MP-WEIXIN
+            wx.chooseMessageFile(params)
+            // #endif
+            // #ifdef H5
+            // 需要hx2.9.9以上才支持uni.chooseFile
             uni.chooseFile(params)
             // #endif
             break
-				// #endif
+		// #endif
 		default: 
 			// 此为保底选项，在accept不为上面任意一项的时候选取全部文件
 			// #ifdef MP-WEIXIN
diff --git a/uview-plus/components/u-view/u-view.vue b/uview-plus/components/u-view/u-view.vue
index efb2f1d..c7846d2 100644
--- a/uview-plus/components/u-view/u-view.vue
+++ b/uview-plus/components/u-view/u-view.vue
@@ -23,7 +23,7 @@ import { addStyle, addUnit, deepMerge } from '../../libs/function/index';
 /**
  * View 视图
  * @description 对View默认标签的封装
- * @tutorial https://ijry.github.io/uview-plus/components/view.html
+ * @tutorial https://uview-plus.jiangruyi.com/components/view.html
  * @property {String} 					bgColor		背景颜色
  * @event {Function} click  点击触发事件
  * @example <up-view></up-view>
@@ -66,8 +66,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../../libs/css/components.scss';
-
 .u-view {
 }
 </style>
diff --git a/uview-plus/components/u-virtual-list/u-virtual-list.vue b/uview-plus/components/u-virtual-list/u-virtual-list.vue
new file mode 100644
index 0000000..c4dd8fa
--- /dev/null
+++ b/uview-plus/components/u-virtual-list/u-virtual-list.vue
@@ -0,0 +1,253 @@
+<template>
+  <view class="u-virtual-list" :style="{ height: addUnit(height) }" ref="container">
+    <scroll-view
+      class="virtual-scroll-container"
+      :scroll-y="true"
+      :scroll-top="scrollTop"
+      :style="{ height: '100%' }"
+      @scroll="handleScroll"
+    >
+    <!-- @touchmove.stop.prevent="handleTouchMove" -->
+      <view class="scroll-content">
+        <!-- 顶部占位 -->
+        <view :style="{ height: topPlaceholderHeight + 'px' }"></view>
+        
+        <!-- 可见项 -->
+        <view 
+          v-for="item in visibleItems" 
+          :key="getItemKey(item)"
+          class="list-item"
+          :style="{ height: itemHeight + 'px' }"
+        >
+          <slot :item="item" :index="item._virtualIndex"></slot>
+        </view>
+        
+        <!-- 底部占位 -->
+        <view :style="{ height: bottomPlaceholderHeight + 'px' }"></view>
+      </view>
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+import { addUnit } from '../../libs/function/index.js'
+
+export default {
+  name: 'u-virtual-list',
+  props: {
+    // 数据源
+    listData: {
+      type: Array,
+      default: () => []
+    },
+    // 每项高度（固定高度模式）
+    itemHeight: {
+      type: Number,
+      default: 50
+    },
+    // 容器高度
+    height: {
+      type: [String, Number],
+      default: '100%'
+    },
+    // 缓冲区项数
+    buffer: {
+      type: Number,
+      default: 4
+    },
+    // 索引键名
+    keyField: {
+      type: String,
+      default: 'id'
+    },
+    // 当前滚动位置
+    scrollTop: {
+      type: Number,
+      default: 0
+    }
+  },
+  data() {
+    return {
+      // 起始索引
+      startIndex: 0,
+      // 容器实际高度
+      containerHeight: 0
+    }
+  },
+  computed: {
+    // 可视区域显示的项数（根据容器实际高度自动计算）
+    remain() {
+      if (this.containerHeight <= 0) {
+        // 默认值，防止除以0
+        return Math.ceil(500 / this.itemHeight) || 10
+      }
+      const calculated = Math.ceil(this.containerHeight / this.itemHeight)
+      // 确保至少显示一些项
+      return Math.max(1, calculated)
+    },
+    // 可视项数量
+    visibleCount() {
+      return this.remain + this.buffer
+    },
+    // 可视项
+    visibleItems() {
+      const start = Math.max(0, this.startIndex - Math.floor(this.buffer / 2))
+      const end = Math.min(this.listData.length, start + this.visibleCount)
+      
+      return this.listData.slice(start, end).map((item, index) => {
+        return {
+          ...item,
+          _virtualIndex: start + index
+        }
+      })
+    },
+    // 顶部占位高度
+    topPlaceholderHeight() {
+      const start = Math.max(0, this.startIndex - Math.floor(this.buffer / 2))
+      return start * this.itemHeight
+    },
+    // 底部占位高度
+    bottomPlaceholderHeight() {
+      const start = Math.max(0, this.startIndex - Math.floor(this.buffer / 2))
+      const end = Math.min(this.listData.length, start + this.visibleCount)
+      return (this.listData.length - end) * this.itemHeight
+    }
+  },
+  emits: ['update:scrollTop', 'scroll'],
+  watch: {
+    listData: {
+      handler() {
+        this.updateVisibleItems()
+      },
+      immediate: true
+    },
+    scrollTop: {
+      handler(newVal) {
+        this.updateVisibleItems()
+      }
+    }
+  },
+  mounted() {
+    this.measureContainerHeight()
+  },
+  methods: {
+    addUnit,
+    
+    // 测量容器高度
+    measureContainerHeight() {
+      // 使用 uni.createSelectorQuery 获取实际高度
+      this.$nextTick(() => {
+        // #ifdef H5
+        if (this.$refs.container) {
+          const element = this.$refs.container.$el || this.$refs.container
+          this.containerHeight = element.offsetHeight || 500
+        }
+        // #endif
+        
+        // #ifndef H5
+        const query = uni.createSelectorQuery().in(this)
+        query.select('.u-virtual-list').boundingClientRect(rect => {
+          if (rect) {
+            this.containerHeight = rect.height || 500
+          } else {
+            // 如果无法获取实际高度，使用默认计算
+            this.containerHeight = this.calculateDefaultHeight()
+          }
+        }).exec()
+        // #endif
+      })
+    },
+    
+    // 计算默认高度
+    calculateDefaultHeight() {
+      const height = this.height
+      if (typeof height === 'number') {
+        return height
+      }
+      
+      if (typeof height === 'string') {
+        if (height.includes('px')) {
+          return parseInt(height) || 500
+        } else if (height.includes('vh')) {
+          // 处理视口高度单位
+          const vh = parseInt(height)
+          return isNaN(vh) ? 500 : (vh / 100) * this.getViewportHeight()
+        } else if (height.includes('%')) {
+          // 百分比高度，使用默认值
+          return 500
+        } else {
+          const num = parseInt(height)
+          return isNaN(num) ? 500 : num
+        }
+      }
+      
+      return 500
+    },
+    
+    // 获取视口高度
+    getViewportHeight() {
+      // #ifdef H5
+      return window.innerHeight
+      // #endif
+      
+      // #ifndef H5
+      try {
+        const res = uni.getSystemInfoSync()
+        return res.windowHeight
+      } catch (e) {
+        return 600 // 默认值
+      }
+      // #endif
+    },
+    
+    getItemKey(item) {
+      return item[this.keyField] !== undefined ? item[this.keyField] : item._virtualIndex
+    },
+    
+    // 更新可视项
+    updateVisibleItems() {
+      const index = Math.floor(this.scrollTop / this.itemHeight)
+      this.startIndex = Math.max(0, index)
+    },
+    
+    // 处理滚动
+    handleScroll(e) {
+      const scrollTop = e.detail.scrollTop
+      this.$emit('update:scrollTop', scrollTop)
+      this.$emit('scroll', scrollTop)
+    },
+    
+    // 处理触摸移动，阻止事件冒泡
+    handleTouchMove(e) {
+      // 阻止触摸移动事件冒泡到父级，防止触发页面滚动
+      e.stopPropagation()
+    },
+    
+    // 获取可见项范围
+    getVisibleRange() {
+      const start = Math.max(0, this.startIndex - Math.floor(this.buffer / 2))
+      const end = Math.min(this.listData.length, start + this.visibleCount)
+      return { start, end }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.u-virtual-list {
+  position: relative;
+  overflow: hidden;
+}
+
+.virtual-scroll-container {
+  height: 100%;
+}
+
+.scroll-content {
+  position: relative;
+}
+
+.list-item {
+  will-change: transform;
+}
+</style>
\ No newline at end of file
diff --git a/uview-plus/components/u-waterfall/u-waterfall.vue b/uview-plus/components/u-waterfall/u-waterfall.vue
index 507acfa..b0c793d 100644
--- a/uview-plus/components/u-waterfall/u-waterfall.vue
+++ b/uview-plus/components/u-waterfall/u-waterfall.vue
@@ -1,25 +1,41 @@
 <template>
     <view class="u-waterfall">
-        <view ref="u-left-column" id="u-left-column" class="u-column">
-            <slot name="left" :leftList="leftList"></slot>
-        </view>
-        <view ref="u-right-column" id="u-right-column" class="u-column">
-            <slot name="right" :rightList="rightList"></slot>
+        <!-- 新增支持多列布局 -->
+        <view 
+            v-for="(column, index) in columnList" 
+            :key="index"
+            :ref="`u-column-${index}`"
+            :id="`u-column-${index}`"
+            class="u-column"
+        >
+            <slot name="column"
+                :colIndex="index" 
+                :colList="column">
+            </slot>
+            <slot name="left"
+                :colIndex="index" 
+                :leftList="column">
+            </slot>
+            <template v-if="!$slots['left'] && !$slots['column']" v-for="(item, itemIndex) in column" :key="itemIndex">
+                <slot :item="item" :itemIndex="itemIndex"></slot>
+            </template>
         </view>
     </view>
 </template>
 
 <script>
     /**
-     * waterfall 瀑布流
-     * @description 这是一个瀑布流形式的组件，内容分为左右两列，结合uview的懒加载组件效果更佳。相较于某些只是奇偶数左右分别，或者没有利用vue作用域插槽的做法，uview的瀑布流实现了真正的 组件化，搭配LazyLoad 懒加载和loadMore 加载更多组件，让您开箱即用，眼前一亮。
+     * waterfall 瀴布流
+     * @description 这是一个瀑布流形式的组件，对原组件进行升级已经支持自定义列数模式，便于适配不同屏幕。搭配loadMore 加载更多组件，让您开箱即用，眼前一亮。
      * @tutorial https://uview-plus.jiangruyi.com/components/waterfall.html
      * @property {Array} flow-list 用于渲染的数据
      * @property {String Number} add-time 单条数据添加到队列的时间间隔，单位ms，见上方注意事项说明（默认200）
+     * @property {String Number} columns 瀑布流列数，默认为2，设置为auto时自动根据屏幕宽度调整列数
      * @example <u-waterfall :flowList="flowList"></u-waterfall>
      */
     import { mpMixin } from '../../libs/mixin/mpMixin';
 	import { mixin } from '../../libs/mixin/mixin';
+    import { sleep } from '../../libs/function/index';
     export default {
         name: "u-waterfall",
         props: {
@@ -43,7 +59,7 @@
                 }
             },
             // #endif
-            // 每次向结构插入数据的时间间隔，间隔越长，越能保证两列高度相近，但是对用户体验越不好
+            // 每次向结构插入数据的时间间隔，单位ms
             // 单位ms
             addTime: {
                 type: [Number, String],
@@ -54,41 +70,98 @@
             idKey: {
                 type: String,
                 default: 'id'
+            },
+            // 瀑布流列数
+            columns: {
+                type: [Number, String],
+                default: 2
+            },
+            // 瀑布流最小列数
+            columnsMin: {
+                type: [Number, String],
+                default: 2
+            },
+            // 最小列宽
+            minColumnWidth: {
+                type: Number,
+                default: 230
             }
         },
         mixins: [mpMixin, mixin],
         data() {
             return {
-                leftList: [],
-                rightList: [],
-                tempList: [],
-                children: []
+                columnList: [[]], // 存储每列的数据
+                children: [],
+                // 用于标记是否已经初始化
+                initialized: false,
+                windowWidth: 375,
+                windowHeight: 0
             }
         },
         watch: {
-            copyFlowList(nVal, oVal) {
-                if (!nVal || nVal.length == 0) {
-                    this.clear();
-                    // console.log('clear');
-                } else {
-                    // 取差值，即这一次数组变化新增的部分
-                    let startIndex = Array.isArray(oVal) && oVal.length > 0 ? oVal.length : 0;
-                    // 拼接上原有数据
-                    this.tempList = this.tempList.concat(this.cloneData(nVal.slice(startIndex)));
-                    this.splitData();
-                }
+            copyFlowList: {
+                handler(nVal, oVal) {
+                    if (!nVal || nVal.length == 0) {
+                        this.clear(false);
+                    } else {
+                        if (this.columnList.length == 1) {
+                            this.initColumnList()
+                        }
+                        // 取差值，即这一次数组变化新增的部分
+                        let startIndex = Array.isArray(oVal) && oVal.length > 0 ? oVal.length : 0;
+                        // 直接处理数据，不再使用tempList和splitData
+                        this.handleData(nVal.slice(startIndex));
+                    }
+                },
+                immediate: true
+            },
+            columns: {
+                handler() {
+                    this.initColumnList();
+                    // 重新分配数据
+                    if (this.copyFlowList.length > 0) {
+                        this.redistributeData();
+                    }
+                },
+                immediate: false
             }
         },
-        mounted() {
-            this.tempList = this.cloneData(this.copyFlowList);
-            this.splitData();
+        created() { 
+            this.initColumnList();
         },
+        mounted() {
+            this.initialized = true;
+            // 添加窗口大小变化监听
+            // #ifdef H5
+            if (this.columns === 'auto') {
+                uni.onWindowResize(this.handleWindowResize);
+            }
+            // #endif
+        },
+        // 添加beforeUnmount生命周期清理事件监听
+        // #ifdef VUE3
+        beforeUnmount() {
+            // #ifdef H5
+            if (this.columns === 'auto') {
+                uni.offWindowResize(this.handleWindowResize);
+            }
+            // #endif
+        },
+        // #endif
+        // #ifdef VUE2
+        beforeDestroy() {
+            // #ifdef H5
+            if (this.columns === 'auto') {
+                window.removeEventListener('resize', this.handleWindowResize);
+            }
+            // #endif
+        },
+        // #endif
         computed: {
             // 破坏flowList变量的引用，否则watch的结果新旧值是一样的
             copyFlowList() {
                 // #ifdef VUE3
                 if (!this.modelValue || this.modelValue.length == 0) {
-                    this.clear();
                     // console.log('clear');
                     return [];
                 } else {
@@ -100,117 +173,214 @@
                 // #endif
             }
         },
-        emits: ['update:modelValue'],
+        emits: ['update:modelValue', 'after-add-one', 'after-add-all'],
         methods: {
-            async splitData() {
-                if (!this.tempList.length) return;
-                let leftRect = await this.$uGetRect('#u-left-column');
-                let rightRect = await this.$uGetRect('#u-right-column');
-                // 如果左边小于或等于右边，就添加到左边，否则添加到右边
-                let item = this.tempList[0];
-                // 解决多次快速上拉后，可能数据会乱的问题，因为经过上面的两个await节点查询阻塞一定时间，加上后面的定时器干扰
-                // 数组可能变成[]，导致此item值可能为undefined
-                if (!item) return;
-                if (leftRect.height < rightRect.height) {
-                    this.leftList.push(item);
-                } else if (leftRect.height > rightRect.height) {
-                    this.rightList.push(item);
-                } else {
-                    // 这里是为了保证第一和第二张添加时，左右都能有内容
-                    // 因为添加第一张，实际队列的高度可能还是0，这时需要根据队列元素长度判断下一个该放哪边
-                    if (this.leftList.length <= this.rightList.length) {
-                        this.leftList.push(item);
-                    } else {
-                        this.rightList.push(item);
+            // 初始化列数据数组
+            initColumnList() {
+                this.windowWidth = uni.getSystemInfoSync().windowWidth;
+                const cols = this.getColumnsCount();
+                // console.log(cols)
+                this.columnList = Array.from({ length: cols }, () => []);
+            },
+            
+            // 获取列数，支持auto模式
+            getColumnsCount() {
+                if (this.columns === 'auto') {
+                    // 列间距为10rpx(约等于7px)
+                    const columnGap = 7;
+                    // 计算可容纳的列数
+                    let columnCount = Math.max(1, Math.floor(this.windowWidth / (this.minColumnWidth + columnGap)));
+                    if (columnCount < this.columnsMin) {
+                        columnCount = this.columnsMin
+                    }
+                    return columnCount;
+                }
+                return parseInt(this.columns) || 2;
+            },
+            
+            // 窗口大小变化处理函数
+            handleWindowResize(res) {
+                this.windowWidth = res.size.windowWidth
+                this.windowHeight = res.size.windowHeight
+                // 防抖处理，避免频繁触发
+                if (this.resizeTimer) {
+                    clearTimeout(this.resizeTimer);
+                }
+                this.resizeTimer = setTimeout(() => {
+                    const newColumnsCount = this.getColumnsCount();
+                    const oldColumnsCount = this.columnList.length;
+                    
+                    // 只有列数发生变化时才重新分配数据
+                    if (newColumnsCount !== oldColumnsCount) {
+                        this.redistributeData();
+                    }
+                }, 300);
+            },
+            
+            // 重新分配所有数据
+            async redistributeData() {
+                // 清空所有列
+                this.initColumnList();
+                // 保存所有数据
+                const allData = this.cloneData(this.copyFlowList);
+                // 重新分配数据
+                this.handleData(allData);
+            },
+            
+            // 处理新增数据
+            async handleData(newData) {
+                if (!newData || newData.length === 0) return;
+                
+                // 初始化列高度数组
+                const columnHeights = new Array(this.columnList.length).fill(0);
+                
+                // 获取各列当前高度
+                for (let i = 0; i < this.columnList.length; i++) {
+                    try {
+                        const rect = await this.$uGetRect(`#u-column-${i}`);
+                        // console.log(`#u-column-${i}`, rect.height)
+                        columnHeights[i] = rect.height || 0;
+                    } catch (e) {
+                        columnHeights[i] = 0;
                     }
                 }
-                // 移除临时列表的第一项
-                this.tempList.splice(0, 1);
-                // 如果临时数组还有数据，继续循环
-                if (this.tempList.length) {
-                    setTimeout(() => {
-                        this.splitData();
-                    }, this.addTime)
+                
+                // 分配新数据到最短的列
+                for (let item of newData) {
+                    const minHeightIndex = columnHeights.indexOf(Math.min(...columnHeights));
+                    // console.log('this.columnList', this.columnList)
+                    this.columnList[minHeightIndex].push(item);
+                    
+                    // 获取实际渲染后的元素高度而不是估算
+                    await sleep(this.addTime)
+                    await this.$nextTick(async () => {
+                        try {
+                            const rect = await this.$uGetRect(`#u-column-${minHeightIndex}`);
+                            // console.log(`#u-column-${minHeightIndex}`, rect.height)
+                            if (rect.height) {
+                                columnHeights[minHeightIndex] = rect.height;
+                                // 加载一个后置事件
+                                this.$emit('after-add-one', {
+                                    ...item,
+                                    height: rect.height
+                                });
+                            }
+                        } catch (e) {
+                            // console.log(e)
+                            // columnHeights[i] = 0;
+                        }
+                    });
+                    // this.$nextTick(async () => {
+                    //     try {
+                    //         // 等待DOM更新后获取实际高度
+                    //         const lastIndex = this.columnList[minHeightIndex].length - 1;
+                    //         const el = this.$refs[`u-column-${minHeightIndex}`][0].children[lastIndex];
+                    //         if (el) {
+                    //             const rect = await this.$uGetRect(el);
+                    //             const actualHeight = rect.height || 100;
+                    //             columnHeights[minHeightIndex] += actualHeight;
+                    //         } else {
+                    //             // 备用方案：如果无法获取实际高度，则使用默认值
+                    //             columnHeights[minHeightIndex] += 100;
+                    //         }
+                    //     } catch (e) {
+                    //         // 出错时使用默认高度
+                    //         console.log(e)
+                    //         columnHeights[minHeightIndex] += 100;
+                    //     }
+                    // });
                 }
+                // 加载所有后置事件
+                this.$emit('after-add-all', {
+                    columnHeights: columnHeights,
+                    newData: newData
+                });
             },
+
             // 复制而不是引用对象和数组
             cloneData(data) {
                 return JSON.parse(JSON.stringify(data));
             },
+            
             // 清空数据列表
-            clear() {
-                this.leftList = [];
-                this.rightList = [];
+            clear(bak = true) {
+                this.initColumnList();
                 // 同时清除父组件列表中的数据
-                // #ifdef VUE2
-                this.$emit('input', []);
-                // #endif
-                // #ifdef VUE3
-                this.$emit('update:modelValue', []);
-                // #endif
-                this.tempList = [];
+                if (bak) {
+                    // #ifdef VUE2
+                    this.$emit('input', []);
+                    // #endif
+                    // #ifdef VUE3
+                    this.$emit('update:modelValue', []);
+                    // #endif
+                }
             },
+            
             // 清除某一条指定的数据，根据id实现
             remove(id) {
-                // 如果findIndex找不到合适的条件，就会返回-1
-                let index = -1;
-                index = this.leftList.findIndex(val => val[this.idKey] == id);
-                if (index != -1) {
-                    // 如果index不等于-1，说明已经找到了要找的id，根据index索引删除这一条数据
-                    this.leftList.splice(index, 1);
-                } else {
-                    // 同理于上方面的方法
-                    index = this.rightList.findIndex(val => val[this.idKey] == id);
-                    if (index != -1) this.rightList.splice(index, 1);
+                // 遍历所有列查找并删除数据
+                for (let i = 0; i < this.columnList.length; i++) {
+                    const index = this.columnList[i].findIndex(val => val[this.idKey] == id);
+                    if (index !== -1) {
+                        this.columnList[i].splice(index, 1);
+                        break;
+                    }
                 }
+                
                 // 同时清除父组件的数据中的对应id的条目
                 // #ifdef VUE2
-                index = this.value.findIndex(val => val[this.idKey] == id);
-                if (index != -1) this.$emit('input', this.value.splice(index, 1));
+                const valueIndex = this.value.findIndex(val => val[this.idKey] == id);
+                if (valueIndex !== -1) {
+                    const newValue = this.cloneData(this.value);
+                    newValue.splice(valueIndex, 1);
+                    this.$emit('input', newValue);
+                }
                 // #endif
                 // #ifdef VUE3
-                index = this.modelValue.findIndex(val => val[this.idKey] == id);
-                if (index != -1) this.$emit('update:modelValue', this.modelValue.splice(index, 1));
+                const modelValueIndex = this.modelValue.findIndex(val => val[this.idKey] == id);
+                if (modelValueIndex !== -1) {
+                    const newModelValue = this.cloneData(this.modelValue);
+                    newModelValue.splice(modelValueIndex, 1);
+                    this.$emit('update:modelValue', newModelValue);
+                }
                 // #endif
             },
+            
             // 修改某条数据的某个属性
             modify(id, key, value) {
-                // 如果findIndex找不到合适的条件，就会返回-1
-                let index = -1;
-                index = this.leftList.findIndex(val => val[this.idKey] == id);
-                if (index != -1) {
-                    // 如果index不等于-1，说明已经找到了要找的id，修改对应key的值
-                    this.leftList[index][key] = value;
-                } else {
-                    // 同理于上方面的方法
-                    index = this.rightList.findIndex(val => val[this.idKey] == id);
-                    if (index != -1) this.rightList[index][key] = value;
+                let found = false;
+                let targetItem = null;
+                
+                // 在所有列中查找数据
+                for (let i = 0; i < this.columnList.length; i++) {
+                    const index = this.columnList[i].findIndex(val => val[this.idKey] == id);
+                    if (index !== -1) {
+                        // 修改对应key的值
+                        this.columnList[i][index][key] = value;
+                        targetItem = this.columnList[i][index];
+                        found = true;
+                        break;
+                    }
                 }
-                // 修改父组件的数据中的对应id的条目
-                // #ifdef VUE2
-                index = this.value.findIndex(val => val[this.idKey] == id);
-                // #endif
-                // #ifdef VUE3
-                index = this.modelValue.findIndex(val => val[this.idKey] == id);
-                // #endif
-                if (index != -1) {
-                    // 首先复制一份value的数据
+                
+                if (found && targetItem) {
+                    // 修改父组件的数据中的对应id的条目
                     // #ifdef VUE2
-                    let data = this.cloneData(this.value);
+                    const valueIndex = this.value.findIndex(val => val[this.idKey] == id);
+                    if (valueIndex !== -1) {
+                        let data = this.cloneData(this.value);
+                        data[valueIndex][key] = value;
+                        this.$emit('input', data);
+                    }
                     // #endif
                     // #ifdef VUE3
-                    let data = this.cloneData(this.modelValue);
+                    const modelValueIndex = this.modelValue.findIndex(val => val[this.idKey] == id);
+                    if (modelValueIndex !== -1) {
+                        let data = this.cloneData(this.modelValue);
+                        data[modelValueIndex][key] = value;
+                        this.$emit('update:modelValue', data);
+                    }
                     // #endif
-                    // 修改对应索引的key属性的值为value
-                    data[index][key] = value;
-                    // 修改父组件通过v-model绑定的变量的值
-                    // #ifdef VUE2
-                    this.$emit('input', data);
-                    // #endif
-                    // #ifdef VUE3
-                    this.$emit('update:modelValue', data);
-                    // #endif
-
                 }
             }
         }
@@ -218,8 +388,6 @@
 </script>
 
 <style lang="scss" scoped>
-    @import "../../libs/css/components.scss";
-
     .u-waterfall {
         @include flex;
         flex-direction: row;
@@ -234,6 +402,10 @@
         /* #ifndef APP-NVUE */
         height: 100%;
         /* #endif */
+        // 添加列之间的间距
+        &:not(:first-child) {
+            margin-left: 10rpx;
+        }
     }
 
     .u-image {
diff --git a/uview-plus/index.js b/uview-plus/index.js
index 62c49b8..254e91f 100644
--- a/uview-plus/index.js
+++ b/uview-plus/index.js
@@ -5,8 +5,6 @@
 import { mixin } from './libs/mixin/mixin.js'
 // 小程序特有的mixin
 import { mpMixin } from './libs/mixin/mpMixin.js'
-// 全局挂载引入http相关请求拦截插件
-import Request from './libs/luch-request'
 
 // 路由封装
 import route from './libs/util/route.js'
@@ -19,8 +17,12 @@ import test from './libs/function/test.js'
 import debounce from './libs/function/debounce.js'
 // 节流方法
 import throttle from './libs/function/throttle.js'
+// 浮点计算
+import calc from './libs/function/calc.js'
+// 浮点计算
+import digit from './libs/function/digit.js'
 // 公共文件写入的方法
-import index from './libs/function/index.js'
+import index, { rpx2px } from './libs/function/index.js'
 
 // 配置信息
 import config from './libs/config/config.js'
@@ -33,10 +35,18 @@ import color from './libs/config/color.js'
 // 平台
 import platform from './libs/function/platform'
 
+// http
+import http from './libs/function/http.js'
+
+// fontUtil
+import fontUtil from './components/u-icon/util.js';
+
+// i18n
+import i18n, { t } from './libs/i18n/index.js'
+
 // 导出
-const http = new Request()
 let themeType = ['primary', 'success', 'error', 'warning', 'info'];
-export { route, http, debounce, throttle, platform, themeType, mixin, mpMixin, props, color, test, zIndex }
+export { route, http, debounce, throttle, calc, digit, platform, themeType, mixin, mpMixin, props, color, test, zIndex, fontUtil, i18n , rpx2px, t}
 export * from './libs/function/index.js'
 export * from './libs/function/colorGradient.js'
 
@@ -69,9 +79,10 @@ const $u = {
     zIndex,
     debounce,
     throttle,
+	calc,
     mixin,
     mpMixin,
-    props,
+    // props,
     ...index,
     color,
     platform
@@ -81,7 +92,15 @@ export const mount$u = function() {
     uni.$u = $u
 }
 
-// #ifdef H5
+function toCamelCase(str) {
+    return str.replace(/-([a-z])/g, function(match, group1) {
+      return group1.toUpperCase();
+    }).replace(/^[a-z]/, function(match) {
+      return match.toUpperCase();
+    });
+}
+
+// #ifdef APP || H5
 const importFn = import.meta.glob('./components/u-*/u-*.vue', { eager: true })
 let components = [];
 
@@ -99,21 +118,28 @@ for (const key in importFn) {
 }
 // #endif
 
-function toCamelCase(str) {
-    return str.replace(/-([a-z])/g, function(match, group1) {
-      return group1.toUpperCase();
-    }).replace(/^[a-z]/, function(match) {
-      return match.toUpperCase();
-    });
-}
-
-const install = (Vue) => {
-    // #ifdef H5
+const install = (Vue, upuiParams = '') => {
+    // #ifdef APP || H5
     components.forEach(function(component) {
         const name = component.name.replace(/u-([a-zA-Z0-9-_]+)/g, 'up-$1');
+		if (name != component.name) {
+			Vue.component(component.name, component); 
+		}
         Vue.component(name, component); 
     });
     // #endif
+	
+	// 初始化
+	if (upuiParams) {
+		uni.upuiParams = upuiParams
+		let temp = upuiParams()
+		if (temp.httpIns) {
+			temp.httpIns(http)
+		}
+		if (temp.options) {
+			setConfig(temp.options)
+		}
+	}
 
     // 同时挂载到uni和Vue.prototype中
     // $u挂载到uni对象上
diff --git a/uview-plus/index.scss b/uview-plus/index.scss
index b1585f4..964827e 100644
--- a/uview-plus/index.scss
+++ b/uview-plus/index.scss
@@ -1,5 +1,6 @@
 // 引入公共基础类
 @import "./libs/css/common.scss";
+@import "./libs/css/components.scss";
 @import "./libs/css/flex.scss";
 @import "./libs/css/color.scss";
 
diff --git a/uview-plus/libs/config/config.js b/uview-plus/libs/config/config.js
index da18b0c..e8fae46 100644
--- a/uview-plus/libs/config/config.js
+++ b/uview-plus/libs/config/config.js
@@ -2,7 +2,7 @@ const version = '3'
 
 // 开发环境才提示，生产环境不会提示
 if (process.env.NODE_ENV === 'development') {
-	console.log(`\n %c uview-plus V${version} %c https://ijry.github.io/uview-plus/ \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0;', 'color: #3c9cff;background: #ffffff; padding:5px 0;');
+	console.log(`\n %c uview-plus V${version} %c https://uview-plus.jiangruyi.com/ \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0;', 'color: #3c9cff;background: #ffffff; padding:5px 0;');
 }
 
 export default {
@@ -37,6 +37,20 @@ export default {
         'up-tips-color': '#909399',
         'up-light-color': '#c0c4cc'
     },
+    // 字体图标地址
+    iconUrl: 'https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf',
+     // 自定义图标
+    customIcon: {
+        family: '',
+        url: ''
+    },
+    customIcons: {}, // 自定义图标与unicode对应关系
 	// 默认单位，可以通过配置为rpx，那么在用于传入组件大小参数为数值时，就默认为rpx
-	unit: 'px'
+	unit: 'px',
+	// 拦截器
+	interceptor: {
+		navbarLeftClick: null
+	},
+    // 只加载一次字体
+    loadFontOnce: false
 }
diff --git a/uview-plus/libs/config/props.js b/uview-plus/libs/config/props.js
index d59c1cd..84dcf7d 100644
--- a/uview-plus/libs/config/props.js
+++ b/uview-plus/libs/config/props.js
@@ -4,7 +4,14 @@
  * 无需在每个引入组件的页面中都配置一次
  */
 import config from './config'
-
+// 各个需要fixed的地方的z-index配置文件
+import zIndex from './zIndex.js'
+// 关于颜色的配置，特殊场景使用
+import color from './color.js'
+// http
+import http from '../function/http.js'
+import { shallowMerge } from '../function/index.js'
+// 组件props
 import ActionSheet from '../../components/u-action-sheet/actionSheet'
 import Album from '../../components/u-album/album'
 import Alert from '../../components/u-alert/alert'
@@ -15,6 +22,7 @@ import Badge from '../../components/u-badge/badge'
 import Button from '../../components/u-button/button'
 import Calendar from '../../components/u-calendar/calendar'
 import CarKeyboard from '../../components/u-car-keyboard/carKeyboard'
+import Card from '../../components/u-card/card'
 import Cell from '../../components/u-cell/cell'
 import CellGroup from '../../components/u-cell-group/cellGroup'
 import Checkbox from '../../components/u-checkbox/checkbox'
@@ -32,7 +40,7 @@ import DatetimePicker from '../../components/u-datetime-picker/datetimePicker'
 import Divider from '../../components/u-divider/divider'
 import Empty from '../../components/u-empty/empty'
 import Form from '../../components/u-form/form'
-import GormItem from '../../components/u-form-item/formItem'
+import FormItem from '../../components/u-form-item/formItem'
 import Gap from '../../components/u-gap/gap'
 import Grid from '../../components/u-grid/grid'
 import GridItem from '../../components/u-grid-item/gridItem'
@@ -94,11 +102,7 @@ import Tooltip from '../../components/u-tooltip/tooltip'
 import Transition from '../../components/u-transition/transition'
 import Upload from '../../components/u-upload/upload'
 
-const {
-    color
-} = config
-
-export default {
+const props = {
     ...ActionSheet,
     ...Album,
     ...Alert,
@@ -109,6 +113,7 @@ export default {
     ...Button,
     ...Calendar,
     ...CarKeyboard,
+    ...Card,
     ...Cell,
     ...CellGroup,
     ...Checkbox,
@@ -126,7 +131,7 @@ export default {
     ...Divider,
     ...Empty,
     ...Form,
-    ...GormItem,
+    ...FormItem,
     ...Gap,
     ...Grid,
     ...GridItem,
@@ -188,3 +193,24 @@ export default {
     ...Transition,
     ...Upload
 }
+
+function setConfig(configs) {
+	shallowMerge(config, configs.config || {})
+	shallowMerge(props, configs.props || {})
+	shallowMerge(color, configs.color || {})
+	shallowMerge(zIndex, configs.zIndex || {})
+}
+
+// 初始化自定义配置
+if (uni && uni.upuiParams) {
+	console.log('setting uview-plus')
+	let temp = uni.upuiParams()
+	if (temp.httpIns) {
+		temp.httpIns(http)
+	}
+	if (temp.options) {
+		setConfig(temp.options)
+	}
+}
+
+export default props
diff --git a/uview-plus/libs/css/common.scss b/uview-plus/libs/css/common.scss
index dd8ed64..f6a3ae2 100644
--- a/uview-plus/libs/css/common.scss
+++ b/uview-plus/libs/css/common.scss
@@ -13,7 +13,7 @@
 
 		/* #ifndef APP-NVUE */
 		// vue下，单行和多行显示省略号需要单独处理
-		@if $i == '1' {
+		@if $i == 1 {
 			overflow: hidden;
 			white-space: nowrap;
 			text-overflow: ellipsis;
diff --git a/uview-plus/libs/css/components.scss b/uview-plus/libs/css/components.scss
index c461a04..6610774 100644
--- a/uview-plus/libs/css/components.scss
+++ b/uview-plus/libs/css/components.scss
@@ -9,6 +9,7 @@
 // swiper-item,
 .u-empty,
 .u-empty__wrap,
+.u-transition,
 .u-tabs,
 .u-tabs__wrapper,
 .u-tabs__wrapper__scroll-view-wrapper,
@@ -17,6 +18,7 @@
 .u-tabs__wrapper__nav__line,
 .up-empty,
 .up-empty__wrap,
+.up-transition,
 .up-tabs,
 .up-tabs__wrapper,
 .up-tabs__wrapper__scroll-view-wrapper,
diff --git a/uview-plus/libs/css/flex.scss b/uview-plus/libs/css/flex.scss
index 152baec..9638661 100644
--- a/uview-plus/libs/css/flex.scss
+++ b/uview-plus/libs/css/flex.scss
@@ -35,6 +35,8 @@
 .up-flex-row,
 .up-flex-x {
 	@include flex;
+	display: flex !important;
+	flex-direction: row !important;
 }
 
 .u-flex-y,
@@ -42,25 +44,27 @@
 .up-flex-y,
 .up-flex-column {
 	@include flex(column);
+	display: flex !important;
+	flex-direction: column !important;
 }
 
 .u-flex-x-center,
 .up-flex-x-center {
 	@include flex;
-	justify-content: center;
+	justify-content: center !important;
 }
 
 .u-flex-xy-center,
 .up-flex-xy-center {
 	@include flex;
-	justify-content: center;
-	align-items: center;
+	justify-content: center !important;
+	align-items: center !important;
 }
 
 .u-flex-y-center,
 .up-flex-y-center {
 	@include flex;
-	align-items: center;
+	align-items: center !important;
 }
 
 .u-flex-x-left,
@@ -72,14 +76,14 @@
 .u-flex-row-reverse,
 .up-flex-x-reverse,
 .up-flex-row-reverse  {
-	flex-direction: row-reverse;
+	flex-direction: row-reverse !important;
 }
 
 .u-flex-y-reverse,
 .u-flex-column-reverse,
 .up-flex-y-reverse,
 .up-flex-column-reverse {
-	flex-direction: column-reverse;
+	flex-direction: column-reverse !important;
 }
 
 /* #ifndef APP-NVUE */
@@ -91,20 +95,20 @@
 .up-flex.up-flex-reverse,
 .up-flex-row.up-flex-reverse,
 .up-flex-x.up-flex-reverse {
-	flex-direction: row-reverse;
+	flex-direction: row-reverse !important;
 }
 
 .u-flex-column.u-flex-reverse,
 .u-flex-y.u-flex-reverse,
 .up-flex-column.up-flex-reverse,
 .up-flex-y.up-flex-reverse {
-	flex-direction: column-reverse;
+	flex-direction: column-reverse !important;
 }
 
 // 自动伸缩
 .u-flex-fill,
 .up-flex-fill {
-	flex: 1 1 auto;
+	flex: 1 1 auto !important;
 }
 
 // 边界自动伸缩
@@ -156,75 +160,75 @@
 // 换行
 .u-flex-wrap,
 .up-flex-wrap {
-	flex-wrap: wrap;
+	flex-wrap: wrap !important;
 }
 
 // 反向换行
 .u-flex-wrap-reverse,
 .up-flex-wrap-reverse {
-	flex-wrap: wrap-reverse;
+	flex-wrap: wrap-reverse !important;
 }
 
 // 主轴起点对齐
 .u-flex-start,
 .up-flex-start {
-	justify-content: flex-start;
+	justify-content: flex-start !important;
 }
 
 // 主轴中间对齐
 .u-flex-center,
 .up-flex-center {
-	justify-content: center;
+	justify-content: center !important;
 }
 
 // 主轴终点对齐
 .u-flex-end,
 .up-flex-end {
-	justify-content: flex-end;
+	justify-content: flex-end !important;
 }
 
 // 主轴等比间距
 .u-flex-between,
 .up-flex-between {
-	justify-content: space-between;
+	justify-content: space-between !important;
 }
 
 // 主轴均分间距
 .u-flex-around,
 .up-flex-around {
-	justify-content: space-around;
+	justify-content: space-around !important;
 }
 
 // 交叉轴起点对齐
 .u-flex-items-start,
 .up-flex-items-start {
-	align-items: flex-start;
+	align-items: flex-start !important;
 }
 
 // 交叉轴中间对齐
 .u-flex-items-center,
 .up-flex-items-center {
-	align-items: center;
+	align-items: center !important;
 }
 
 // 交叉轴终点对齐
 .u-flex-items-end,
 .up-flex-items-end {
-	align-items: flex-end;
+	align-items: flex-end !important;
 }
 
 // 交叉轴第一行文字基线对齐
 .u-flex-items-baseline,
 .up-flex-items-baseline {
 	/* #ifndef APP-NVUE */
-	align-items: baseline;
+	align-items: baseline !important;
 	/* #endif */
 }
 
 // 交叉轴方向拉伸对齐
 .u-flex-items-stretch,
 .up-flex-items-stretch {
-	align-items: stretch;
+	align-items: stretch !important;
 }
 
 
@@ -234,31 +238,31 @@
 /* #ifndef APP-NVUE */
 .u-flex-self-start,
 .up-flex-self-start {
-	align-self: flex-start;
+	align-self: flex-start !important;
 }
 
 // 子元素交叉轴居中对齐
 .u-flex-self-center,
 .up-flex-self-center {
-	align-self: center;
+	align-self: center !important;
 }
 
 // 子元素交叉轴终点对齐
 .u-flex-self-end,
 .up-flex-self-end {
-	align-self: flex-end;
+	align-self: flex-end !important;
 }
 
 // 子元素交叉轴第一行文字基线对齐
 .u-flex-self-baseline,
 .up-flex-self-baseline {
-	align-self: baseline;
+	align-self: baseline !important;
 }
 
 // 子元素交叉轴方向拉伸对齐
 .u-flex-self-stretch,
 .up-flex-self-stretch {
-	align-self: stretch;
+	align-self: stretch !important;
 }
 /* #endif */
 // 多轴交叉时的对齐方式
@@ -267,52 +271,52 @@
 /* #ifndef APP-NVUE */
 .u-flex-content-start,
 .up-flex-content-start {
-	align-content: flex-start;
+	align-content: flex-start !important;
 }
 
 // 居中对齐
 .u-flex-content-center,
 .up-flex-content-center {
-	align-content: center;
+	align-content: center !important;
 }
 
 // 终点对齐
 .u-flex-content-end,
 .up-flex-content-end {
-	align-content: flex-end;
+	align-content: flex-end !important;
 }
 
 // 两端对齐
 .u-flex-content-between,
 .up-flex-content-between {
-	align-content: space-between;
+	align-content: space-between !important;
 }
 
 // 均分间距
 .u-flex-content-around,
 .up-flex-content-around {
-	align-content: space-around;
+	align-content: space-around !important;
 }
 
 // 全部居中对齐
 .u-flex-middle,
 .up-flex-middle {
-	justify-content: center;
-	align-items: center;
-	align-self: center;
-	align-content: center;
+	justify-content: center !important;
+	align-items: center !important;
+	align-self: center !important;
+	align-content: center !important;
 }
 
 // 是否可以放大
 .u-flex-grow,
 .up-flex-grow {
-	flex-grow: 1;
+	flex-grow: 1 !important;
 }
 
 // 是否可以缩小
 .u-flex-shrink,
 .up-flex-shrink {
-	flex-shrink: 1;
+	flex-shrink: 1 !important;
 }
 
 /* #endif */
@@ -362,3 +366,4 @@
 		}
 	}
 }
+
diff --git a/uview-plus/libs/function/calc.js b/uview-plus/libs/function/calc.js
new file mode 100644
index 0000000..3cd9288
--- /dev/null
+++ b/uview-plus/libs/function/calc.js
@@ -0,0 +1,64 @@
+// 浮点数加法
+export function add (arg1, arg2) {
+	var r1, r2, m
+		try {
+			r1 = arg1.toString().split('.')[1].length
+		} catch (e) {
+			r1 = 0
+		}
+		try {
+			r2 = arg2.toString().split('.')[1].length
+		} catch (e) {
+			r2 = 0
+		}
+		m = Math.pow(10, Math.max(r1, r2))
+	return (arg1 * m + arg2 * m) / m
+}
+// 浮点数减法
+export function sub (arg1, arg2) {
+	var r1, r2, m, n
+		try {
+		  r1 = arg1.toString().split('.')[1].length
+		} catch (e) {
+		  r1 = 0
+		}
+		try {
+		  r2 = arg2.toString().split('.')[1].length
+		} catch (e) {
+		  r2 = 0
+		}
+		m = Math.pow(10, Math.max(r1, r2))
+		n = (r1 >= r2) ? r1 : r2
+	return Math.abs(((arg1 * m - arg2 * m) / m).toFixed(n))
+}
+//浮点乘法
+export function mul (a, b) {
+	var c = 0,
+		d = a.toString(),
+		e = b.toString();
+	try {
+		c += d.split(".")[1].length;
+	} catch (f) {}
+	try {
+		c += e.split(".")[1].length;
+	} catch (f) {}
+	return Number(d.replace(".", "")) * Number(e.replace(".", "")) / Math.pow(10, c);
+}
+//浮点除法
+export function div (a, b) {
+	var c, d, e = 0,
+		f = 0;
+	try {
+		e = a.toString().split(".")[1].length;
+	} catch (g) {}
+	try {
+		f = b.toString().split(".")[1].length;
+	} catch (g) {}
+	return c = Number(a.toString().replace(".", "")), d = Number(b.toString().replace(".", "")), xyutil.mul(c / d, Math.pow(10, f - e));
+}
+export default {
+	add,
+	sub,
+	mul,
+	div
+}
diff --git a/uview-plus/libs/function/http.js b/uview-plus/libs/function/http.js
new file mode 100644
index 0000000..f4e8f66
--- /dev/null
+++ b/uview-plus/libs/function/http.js
@@ -0,0 +1,4 @@
+// 全局挂载引入http相关请求拦截插件
+import Request from '../luch-request'
+const http = new Request()
+export default http
diff --git a/uview-plus/libs/function/index.js b/uview-plus/libs/function/index.js
index 5ada59a..7d71082 100644
--- a/uview-plus/libs/function/index.js
+++ b/uview-plus/libs/function/index.js
@@ -32,6 +32,20 @@ export function getPx(value, unit = false) {
 	return unit ? `${parseInt(value)}px` : parseInt(value)
 }
 
+/**
+ * @description 用于统一rpx2px方法，因uni-app现有API未统一。
+ * @param {number} value 用户传递值的rpx值
+ * @returns {number}
+ */
+export function rpx2px(value) {
+	// #ifdef APP
+	return uni.upx2px(value)
+	// #endif
+	// #ifndef APP
+	return uni.rpx2px(value)
+	// #endif
+}
+
 /**
  * @description 进行延时，以达到可以简写代码的目的 比如: await uni.$u.sleep(20)将会阻塞20ms
  * @param {number} value 堵塞时间 单位ms 毫秒
@@ -50,7 +64,12 @@ export function sleep(value = 30) {
  * @link 运行期判断平台 https://uniapp.dcloud.io/frame?id=判断平台
  */
 export function os() {
+	// #ifdef APP || H5 || MP-WEIXIN
+	return uni.getDeviceInfo().platform.toLowerCase()
+	// #endif
+	// #ifndef APP || H5 || MP-WEIXIN
 	return uni.getSystemInfoSync().platform.toLowerCase()
+	// #endif
 }
 /**
  * @description 获取系统信息同步接口
@@ -59,6 +78,26 @@ export function os() {
 export function sys() {
 	return uni.getSystemInfoSync()
 }
+export function getWindowInfo() {
+	let ret = {}
+	// #ifdef APP || H5 || MP-WEIXIN
+	ret = uni.getWindowInfo()
+	// #endif
+	// #ifndef APP || H5 || MP-WEIXIN
+	ret = sys()
+	// #endif
+	return ret
+}
+export function getDeviceInfo() {
+	let ret = {}
+	// #ifdef APP || H5 || MP-WEIXIN
+	ret = uni.getDeviceInfo()
+	// #endif
+	// #ifndef APP || H5 || MP-WEIXIN
+	ret = sys()
+	// #endif
+	return ret
+}
 
 /**
  * @description 取一个区间数
@@ -119,8 +158,13 @@ export function $parent(name = undefined) {
 	// 通过while历遍，这里主要是为了H5需要多层解析的问题
 	while (parent) {
 		// 父组件
-        name = name.replace(/up-([a-zA-Z0-9-_]+)/g, 'u-$1')        
-		if (parent.$options && parent.$options.name !== name) {
+		let name2 = ''
+		if (name.startsWith('up-')) {
+			name2 = name.replace(/up-([a-zA-Z0-9-_]+)/g, 'u-$1') 
+		} else if (name.startsWith('u-')) {
+			name2 = name.replace(/u-([a-zA-Z0-9-_]+)/g, 'up-$1') 
+		}     
+		if (parent.$options && parent.$options.name !== name && parent.$options.name !== name2) {
 			// 如果组件的name不相等，继续上一级寻找
 			parent = parent.$parent
 		} else {
@@ -336,6 +380,10 @@ export function timeFormat(dateTime = null, formatStr = 'yyyy-mm-dd') {
   else if (typeof dateTime === 'string' && /^\d+$/.test(dateTime.trim())) {
     date = new Date(Number(dateTime))
   }
+  // 检查是否为UTC格式的时间字符串 (2024-12-18T02:25:31.432Z)
+  else if (typeof dateTime === 'string' && /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/.test(dateTime)) {
+    date = new Date(dateTime)
+  }
   // 其他都认为符合 RFC 2822 规范
   else {
     // 处理平台性差异，在Safari/Webkit中，new Date仅支持/作为分割符的字符串时间
@@ -602,8 +650,8 @@ export function padZero(value) {
  * @param {*} event
  */
 export function formValidate(instance, event) {
-	const formItem = $parent.call(instance, 'u-form-item')
-	const form = $parent.call(instance, 'u-form')
+	const formItem = $parent.call(instance, 'up-form-item')
+	const form = $parent.call(instance, 'up-form')
 	// 如果发生变化的input或者textarea等，其父组件中有u-form-item或者u-form等，就执行form的validate方法
 	// 同时将form-item的pros传递给form，让其进行精确对象验证
 	if (formItem && form) {
@@ -705,12 +753,100 @@ export function getValueByPath(obj, path) {
     }, obj);
 }
 
+/**
+ * 生成同色系浅色背景色
+ * @param {string} textColor - 支持 #RGB、#RRGGBB、rgb()、rgba() 格式
+ * @param {number} [lightness=85] - 目标亮度百分比（默认85%）
+ * @returns {string} 十六进制颜色值
+ */
+export function genLightColor(textColor, lightness = 95) {
+	// 手动解析颜色值（避免使用document）
+	const rgb = parseColorWithoutDOM(textColor);
+	
+	// RGB转HSL色域
+	const hsl = rgbToHsl(rgb.r, rgb.g, rgb.b);
+	
+	// 生成浅色背景
+	const bgHsl = {
+	  h: hsl.h,
+	  s: hsl.s,
+	  l: Math.min(lightness, 95)
+	};
+	
+	return hslToHex(bgHsl.h, bgHsl.s, bgHsl.l);
+  }
+  
+  /* 手动解析颜色字符串（兼容uni-app环境） */
+  function parseColorWithoutDOM(colorStr) {
+	// 统一转小写处理
+	const str = colorStr.toLowerCase().trim();
+	
+	// 处理十六进制格式
+	if (str.startsWith('#')) {
+	  const hex = str.replace('#', '');
+	  const fullHex = hex.length === 3 ? 
+		hex.split('').map(c => c + c).join('') : hex;
+		
+	  return {
+		r: parseInt(fullHex.substring(0,2), 16),
+		g: parseInt(fullHex.substring(2,4), 16),
+		b: parseInt(fullHex.substring(4,6), 16)
+	  };
+	}
+	
+	// 处理rgb/rgba格式
+	const rgbMatch = str.match(/rgba?\((\d+),\s*(\d+),\s*(\d+)/);
+	if (rgbMatch) {
+	  return {
+		r: +rgbMatch[1],
+		g: +rgbMatch[2],
+		b: +rgbMatch[3]
+	  };
+	}
+	
+	throw new Error('Invalid color format');
+  }
+
+// 辅助函数：RGB 转 HSL（色相、饱和度、亮度）
+function rgbToHsl(r, g, b) {
+ r /= 255, g /= 255, b /= 255;
+ const max = Math.max(r, g, b), min = Math.min(r, g, b);
+ let h, s, l = (max + min) / 2;
+
+ if (max === min) {
+   h = s = 0; // achromatic
+ } else {
+   const d = max - min;
+   s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+   switch (max) {
+	 case r: h = (g - b) / d + (g < b ? 6 : 0); break;
+	 case g: h = (b - r) / d + 2; break;
+	 case b: h = (r - g) / d + 4; break;
+   }
+   h = (h * 60).toFixed(1);
+ }
+ return { h: +h, s: +(s * 100).toFixed(1), l: +(l * 100).toFixed(1) };
+}
+
+// 辅助函数：HSL 转十六进制
+function hslToHex(h, s, l) {
+ l /= 100;
+ const a = s * Math.min(l, 1 - l) / 100;
+ const f = n => {
+   const k = (n + h / 30) % 12;
+   const color = l - a * Math.max(Math.min(k - 3, 9 - k, 1), -1);
+   return Math.round(255 * color).toString(16).padStart(2, '0');
+ };
+ return `#${f(0)}${f(8)}${f(4)}`;
+}
+
 export default {
 	range,
 	getPx,
 	sleep,
 	os,
 	sys,
+	getWindowInfo,
 	random,
 	guid,
 	$parent,
@@ -736,5 +872,7 @@ export default {
 	page,
 	pages,
 	getValueByPath,
-	// setConfig
+	genLightColor,
+	rpx2px
 }
+
diff --git a/uview-plus/libs/function/test.js b/uview-plus/libs/function/test.js
index 35d1879..579b976 100644
--- a/uview-plus/libs/function/test.js
+++ b/uview-plus/libs/function/test.js
@@ -237,6 +237,13 @@ export function object(value) {
     return Object.prototype.toString.call(value) === '[object Object]'
 }
 
+/**
+ * 是否是Promise对象
+ */
+export function objectPromise(value) {
+    return Object.prototype.toString.call(value) === '[object Promise]';
+}
+
 /**
  * 是否短信验证码
  */
@@ -257,7 +264,7 @@ export function func(value) {
  * @param {Object} value
  */
 export function promise(value) {
-    return object(value) && func(value.then) && func(value.catch)
+    return objectPromise(value) && func(value.then) && func(value.catch)
 }
 
 /** 是否图片格式
diff --git a/uview-plus/libs/i18n/index.js b/uview-plus/libs/i18n/index.js
new file mode 100644
index 0000000..09234cf
--- /dev/null
+++ b/uview-plus/libs/i18n/index.js
@@ -0,0 +1,54 @@
+import zhHans from './locales/zh-Hans.json'
+import zhHant from './locales/zh-Hant.json'
+import en from './locales/en.json'
+import es from './locales/es.json'
+import fr from './locales/fr.json'
+import de from './locales/de.json'
+import ko from './locales/ko.json'
+import ja from './locales/ja.json'
+import ru from './locales/ru.json'
+
+let settings = {
+    lang: uni.getLocale(),
+    locales: {
+        en,
+        es,
+        fr,
+        de,
+        ko,
+        ja,
+        ru,
+        'zh-Hant': zhHant,
+        'zh-Hans': zhHans
+    }
+};
+
+uni.onLocaleChange((locale) => {
+    settings.lang = locale;
+})
+
+/**
+ * 多语言方法
+ */
+export function t(value, params = {}) {
+    // console.log(settings.locales[settings.lang])
+    if (value) {
+        let lang = settings.lang
+        if (!settings.locales[settings.lang]) {
+            lang = 'zh-Hans'
+        }
+        let result = settings.locales[lang][value] || value;
+        // 替换{xxx}格式的变量
+        Object.keys(params).forEach(key => {
+            const reg = new RegExp(`{${key}}`, 'g');
+            result = result.replace(reg, params[key]);
+        });
+        return result;
+    } else {
+        return value;
+    }
+}
+
+export default {
+    settings: settings
+}
diff --git a/uview-plus/libs/i18n/locales/de.json b/uview-plus/libs/i18n/locales/de.json
new file mode 100644
index 0000000..0ffc53c
--- /dev/null
+++ b/uview-plus/libs/i18n/locales/de.json
@@ -0,0 +1,85 @@
+{
+    "up.common.cancel": "Abbrechen",
+    "up.common.confirm": "Bestätigen",
+    "up.common.start": "Start",
+    "up.common.end": "Ende",
+    "up.common.stop": "Stopp",
+    "up.common.copy": "Kopieren",
+    "up.common.none": "Keine",
+    "up.common.tip": "Hinweis",
+    "up.common.success": "Erfolg",
+    "up.common.fail": "Fehlgeschlagen",
+    "up.common.close": "Schließen",
+    "up.common.preview": "Vorschau",
+    "up.common.re-select": "Erneut auswählen",
+    "up.common.rotate": "Drehen",
+    "up.common.pleaseChoose": "Bitte wählen",
+    "up.common.loading": "Laden",
+    "up.common.loading2": "Wird geladen",
+    "up.common.inOperation": "In Bearbeitung",
+    "up.common.settings": "Einstellungen",
+    "up.common.retry": "Wiederholen",
+    "up.common.search": "Suchen",
+    "up.common.more": "Mehr",
+    "up.common.video": "Video",
+    "up.common.file": "Datei",
+    "up.week.one": "Mo",
+    "up.week.two": "Di",
+    "up.week.three": "Mi",
+    "up.week.four": "Do",
+    "up.week.five": "Fr",
+    "up.week.six": "Sa",
+    "up.week.seven": "So",
+    "up.barcode.error": "Barcode-Generierung fehlgeschlagen",
+    "up.calendar.chooseDates": "Datumsauswahl",
+    "up.calendar.disabled": "Dieses Datum ist deaktiviert",
+    "up.calendar.daysExceed": "Die Anzahl der ausgewählten Tage darf {days} Tage nicht überschreiten",
+    "up.cityLocate.locateCity": "Stadt lokalisieren",
+    "up.cityLocate.fail": "Lokalisierung fehlgeschlagen, bitte klicken Sie zum Wiederholen.",
+    "up.cityLocate.locating": "Lokalisierung läuft",
+    "up.code.send": "Bestätigungscode erhalten",
+    "up.code.resendAfter": "Erneut senden in X Sekunden",
+    "up.code.resend": "Erneut senden",
+    "up.cropper.emptyWidhtOrHeight": "Breite oder Höhe des Zuschneidebereichs nicht festgelegt",
+    "up.empty.car": "Warenkorb ist leer",
+    "up.empty.page": "Seite existiert nicht",
+    "up.empty.search": "Keine Suchergebnisse",
+    "up.empty.address": "Keine Lieferadresse",
+    "up.empty.wifi": "Kein WLAN",
+    "up.empty.order": "Bestellungen sind leer",
+    "up.empty.coupon": "Keine Gutscheine",
+    "up.empty.favor": "Keine Favoriten",
+    "up.empty.permission": "Keine Berechtigung",
+    "up.empty.history": "Kein Verlauf",
+    "up.empty.news": "Keine Nachrichtenliste",
+    "up.empty.message": "Nachrichtenliste ist leer",
+    "up.empty.list": "Liste ist leer",
+    "up.empty.data": "Daten sind leer",
+    "up.empty.comment": "Keine Kommentare",
+    "up.link.copyed": "Link kopiert, bitte im Browser öffnen",
+    "up.loadmoe.loadmore": "Mehr laden",
+    "up.loadmoe.nomore": "Keine weiteren Daten",
+    "up.noNetwork.text": "Ups, Netzwerksignal verloren",
+    "up.noNetwork.pleaseCheck": "Bitte überprüfen Sie das Netzwerk oder gehen Sie zu",
+    "up.noNetwork.connect": "Netzwerk verbunden",
+    "up.noNetwork.disconnect": "Keine Netzwerkverbindung",
+    "up.pagination.previous": "Vorherige Seite",
+    "up.pagination.next": "Nächste Seite",
+    "up.pullRefresh.pull": "Zum Aktualisieren nach unten ziehen",
+    "up.pullRefresh.release": "Loslassen zum Aktualisieren",
+    "up.pullRefresh.refreshing": "Aktualisierung läuft",
+    "up.readMore.expand": "Erweitern zum vollständigen Lesen",
+    "up.readMore.fold": "Einklappen",
+    "up.search.placeholder": "Bitte Schlüsselwort eingeben",
+    "up.signature.penSize": "Strichstärke",
+    "up.signature.penColor": "Strichfarbe",
+    "up.upload.sizeExceed": "Größenbegrenzung überschritten",
+    "up.upload.uploading": "Upload läuft",
+    "up.upload.previewImageFail": "Bildvorschau fehlgeschlagen",
+    "up.upload.previewVideoFail": "Videovorschau fehlgeschlagen",
+    "up.goodsSku.stock": "Lagerbestand",
+    "up.goodsSku.price": "Preis",
+    "up.goodsSku.amount": "Stück",
+    "up.goodsSku.choosed": "Ausgewählt",
+    "up.goodsSku.buyAmount": "Anzahl"
+}
diff --git a/uview-plus/libs/i18n/locales/en.json b/uview-plus/libs/i18n/locales/en.json
new file mode 100644
index 0000000..1a7cc93
--- /dev/null
+++ b/uview-plus/libs/i18n/locales/en.json
@@ -0,0 +1,85 @@
+{
+    "up.common.cancel": "Cancel",
+    "up.common.confirm": "Confirm",
+    "up.common.start": "Start",
+    "up.common.end": "End",
+    "up.common.stop": "Stop",
+    "up.common.copy": "Copy",
+    "up.common.none": "None",
+    "up.common.tip": "Tip",
+    "up.common.success": "Success",
+    "up.common.fail": "Fail",
+    "up.common.close": "Close",
+    "up.common.preview": "Preview",
+    "up.common.re-select": "Re-select",
+    "up.common.rotate": "Rotate",
+    "up.common.pleaseChoose": "Please choose",
+    "up.common.loading": "Loading",
+    "up.common.loading2": "Loading",
+    "up.common.inOperation": "In operation",
+    "up.common.settings": "Settings",
+    "up.common.retry": "Retry",
+    "up.common.search": "Search",
+    "up.common.more": "More",
+    "up.common.video": "Video",
+    "up.common.file": "File",
+    "up.week.one": "Mon",
+    "up.week.two": "Tue",
+    "up.week.three": "Wed",
+    "up.week.four": "Thu",
+    "up.week.five": "Fri",
+    "up.week.six": "Sat",
+    "up.week.seven": "Sun",
+    "up.barcode.error": "Failed to generate barcode",
+    "up.calendar.chooseDates": "Date selection",
+    "up.calendar.disabled": "This date is disabled",
+    "up.calendar.daysExceed": "The number of selected days cannot exceed {days} days",
+    "up.cityLocate.locateCity": "Locate city",
+    "up.cityLocate.fail": "Location failed, please click to retry.",
+    "up.cityLocate.locating": "Locating",
+    "up.code.send": "Get verification code",
+    "up.code.resendAfter": "Resend after X seconds",
+    "up.code.resend": "Resend",
+    "up.cropper.emptyWidhtOrHeight": "The width or height of the cropping box is not set",
+    "up.empty.car": "Shopping cart is empty",
+    "up.empty.page": "Page not found",
+    "up.empty.search": "No search results",
+    "up.empty.address": "No shipping address",
+    "up.empty.wifi": "No WiFi",
+    "up.empty.order": "Order is empty",
+    "up.empty.coupon": "No coupons",
+    "up.empty.favor": "No favorites",
+    "up.empty.permission": "No permission",
+    "up.empty.history": "No history",
+    "up.empty.news": "No news list",
+    "up.empty.message": "Message list is empty",
+    "up.empty.list": "List is empty",
+    "up.empty.data": "Data is empty",
+    "up.empty.comment": "No comments",
+    "up.link.copyed": "Link copied, please open in browser",
+    "up.loadmoe.loadmore": "Load more",
+    "up.loadmoe.nomore": "No more",
+    "up.noNetwork.text": "Oops, network signal lost",
+    "up.noNetwork.pleaseCheck": "Please check the network, or go to",
+    "up.noNetwork.connect": "Network connected",
+    "up.noNetwork.disconnect": "No network connection",
+    "up.pagination.previous": "Previous",
+    "up.pagination.next": "Next",
+    "up.pullRefresh.pull": "Pull to refresh",
+    "up.pullRefresh.release": "Release to refresh",
+    "up.pullRefresh.refreshing": "Refreshing",
+    "up.readMore.expand": "Expand to read more",
+    "up.readMore.fold": "Collapse",
+    "up.search.placeholder": "Please enter keywords",
+    "up.signature.penSize": "Stroke size",
+    "up.signature.penColor": "Stroke color",
+    "up.upload.sizeExceed": "Size limit exceeded",
+    "up.upload.uploading": "Uploading",
+    "up.upload.previewImageFail": "Failed to preview image",
+    "up.upload.previewVideoFail": "Failed to preview video",
+    "up.goodsSku.stock": "Stock",
+    "up.goodsSku.price": "Price",
+    "up.goodsSku.amount": "Items",
+    "up.goodsSku.choosed": "Selected",
+    "up.goodsSku.buyAmount": "Quantity"
+}
\ No newline at end of file
diff --git a/uview-plus/libs/i18n/locales/es.json b/uview-plus/libs/i18n/locales/es.json
new file mode 100644
index 0000000..de08574
--- /dev/null
+++ b/uview-plus/libs/i18n/locales/es.json
@@ -0,0 +1,85 @@
+{
+    "up.common.cancel": "Cancelar",
+    "up.common.confirm": "Confirmar",
+    "up.common.start": "Iniciar",
+    "up.common.end": "Finalizar",
+    "up.common.stop": "Detener",
+    "up.common.copy": "Copiar",
+    "up.common.none": "Ninguno",
+    "up.common.tip": "Consejo",
+    "up.common.success": "Éxito",
+    "up.common.fail": "Fallido",
+    "up.common.close": "Cerrar",
+    "up.common.preview": "Vista previa",
+    "up.common.re-select": "Re seleccionar",
+    "up.common.rotate": "Rotar",
+    "up.common.pleaseChoose": "Por favor seleccione",
+    "up.common.loading": "Cargando",
+    "up.common.loading2": "Cargando",
+    "up.common.inOperation": "En operación",
+    "up.common.settings": "Configuración",
+    "up.common.retry": "Reintentar",
+    "up.common.search": "Buscar",
+    "up.common.more": "Más",
+    "up.common.video": "Vídeo",
+    "up.common.file": "Archivo",
+    "up.week.one": "Lun",
+    "up.week.two": "Mar",
+    "up.week.three": "Mié",
+    "up.week.four": "Jue",
+    "up.week.five": "Vie",
+    "up.week.six": "Sáb",
+    "up.week.seven": "Dom",
+    "up.barcode.error": "Error al generar código de barras",
+    "up.calendar.chooseDates": "Selección de fecha",
+    "up.calendar.disabled": "Esta fecha está deshabilitada",
+    "up.calendar.daysExceed": "Los días seleccionados no pueden exceder {days} días",
+    "up.cityLocate.locateCity": "Localizar ciudad",
+    "up.cityLocate.fail": "Error de localización, haga clic para reintentar.",
+    "up.cityLocate.locating": "Localizando",
+    "up.code.send": "Obtener código de verificación",
+    "up.code.resendAfter": "Reenviar en X segundos",
+    "up.code.resend": "Reenviar",
+    "up.cropper.emptyWidhtOrHeight": "El ancho o alto del recorte no está configurado",
+    "up.empty.car": "Carrito de compras vacío",
+    "up.empty.page": "Página no encontrada",
+    "up.empty.search": "Sin resultados de búsqueda",
+    "up.empty.address": "Sin dirección de envío",
+    "up.empty.wifi": "Sin WiFi",
+    "up.empty.order": "Pedido vacío",
+    "up.empty.coupon": "Sin cupones",
+    "up.empty.favor": "Sin favoritos",
+    "up.empty.permission": "Sin permisos",
+    "up.empty.history": "Sin historial",
+    "up.empty.news": "Sin noticias",
+    "up.empty.message": "Lista de mensajes vacía",
+    "up.empty.list": "Lista vacía",
+    "up.empty.data": "Datos vacíos",
+    "up.empty.comment": "Sin comentarios",
+    "up.link.copyed": "Enlace copiado, por favor abra en el navegador",
+    "up.loadmoe.loadmore": "Cargar más",
+    "up.loadmoe.nomore": "No hay más",
+    "up.noNetwork.text": "¡Ups! Se perdió la señal de red",
+    "up.noNetwork.pleaseCheck": "Por favor verifique la red, o vaya a",
+    "up.noNetwork.connect": "Red conectada",
+    "up.noNetwork.disconnect": "Sin conexión a internet",
+    "up.pagination.previous": "Página anterior",
+    "up.pagination.next": "Página siguiente",
+    "up.pullRefresh.pull": "Deslizar hacia abajo para actualizar",
+    "up.pullRefresh.release": "Soltar para actualizar",
+    "up.pullRefresh.refreshing": "Actualizando",
+    "up.readMore.expand": "Expandir para leer más",
+    "up.readMore.fold": "Contraer",
+    "up.search.placeholder": "Ingrese palabra clave",
+    "up.signature.penSize": "Tamaño del trazo",
+    "up.signature.penColor": "Color del trazo",
+    "up.upload.sizeExceed": "Excede el límite de tamaño",
+    "up.upload.uploading": "Subiendo",
+    "up.upload.previewImageFail": "Error al previsualizar imagen",
+    "up.upload.previewVideoFail": "Error al previsualizar vídeo",
+    "up.goodsSku.stock": "Inventario",
+    "up.goodsSku.price": "Precio",
+    "up.goodsSku.amount": "Piezas",
+    "up.goodsSku.choosed": "Seleccionado",
+    "up.goodsSku.buyAmount": "Cantidad"
+}
diff --git a/uview-plus/libs/i18n/locales/fr.json b/uview-plus/libs/i18n/locales/fr.json
new file mode 100644
index 0000000..65e5ec6
--- /dev/null
+++ b/uview-plus/libs/i18n/locales/fr.json
@@ -0,0 +1,85 @@
+{
+    "up.common.cancel": "Annuler",
+    "up.common.confirm": "Confirmer",
+    "up.common.start": "Démarrer",
+    "up.common.end": "Terminer",
+    "up.common.stop": "Arrêter",
+    "up.common.copy": "Copier",
+    "up.common.none": "Aucun",
+    "up.common.tip": "Conseil",
+    "up.common.success": "Succès",
+    "up.common.fail": "Échec",
+    "up.common.close": "Fermer",
+    "up.common.preview": "Aperçu",
+    "up.common.re-select": "Resélectionner",
+    "up.common.rotate": "Rotation",
+    "up.common.pleaseChoose": "Veuillez choisir",
+    "up.common.loading": "Chargement",
+    "up.common.loading2": "Chargement en cours",
+    "up.common.inOperation": "En cours d'opération",
+    "up.common.settings": "Paramètres",
+    "up.common.retry": "Réessayer",
+    "up.common.search": "Rechercher",
+    "up.common.more": "Plus",
+    "up.common.video": "Vidéo",
+    "up.common.file": "Fichier",
+    "up.week.one": "Lun",
+    "up.week.two": "Mar",
+    "up.week.three": "Mer",
+    "up.week.four": "Jeu",
+    "up.week.five": "Ven",
+    "up.week.six": "Sam",
+    "up.week.seven": "Dim",
+    "up.barcode.error": "Échec de génération du code-barres",
+    "up.calendar.chooseDates": "Sélection de dates",
+    "up.calendar.disabled": "Cette date est désactivée",
+    "up.calendar.daysExceed": "Le nombre de jours sélectionnés ne peut pas dépasser {days} jours",
+    "up.cityLocate.locateCity": "Localiser la ville",
+    "up.cityLocate.fail": "Échec de localisation, veuillez cliquer pour réessayer.",
+    "up.cityLocate.locating": "Localisation en cours",
+    "up.code.send": "Obtenir le code de vérification",
+    "up.code.resendAfter": "Renvoyer dans X secondes",
+    "up.code.resend": "Renvoyer",
+    "up.cropper.emptyWidhtOrHeight": "La largeur ou la hauteur de recadrage n'est pas définie",
+    "up.empty.car": "Panier vide",
+    "up.empty.page": "Page introuvable",
+    "up.empty.search": "Aucun résultat de recherche",
+    "up.empty.address": "Aucune adresse de livraison",
+    "up.empty.wifi": "Aucun Wi-Fi",
+    "up.empty.order": "Commande vide",
+    "up.empty.coupon": "Aucun coupon",
+    "up.empty.favor": "Aucun favori",
+    "up.empty.permission": "Aucune autorisation",
+    "up.empty.history": "Aucun historique",
+    "up.empty.news": "Aucune actualité",
+    "up.empty.message": "Liste de messages vide",
+    "up.empty.list": "Liste vide",
+    "up.empty.data": "Données vides",
+    "up.empty.comment": "Aucun commentaire",
+    "up.link.copyed": "Lien copié, veuillez ouvrir dans le navigateur",
+    "up.loadmoe.loadmore": "Charger plus",
+    "up.loadmoe.nomore": "Plus de contenu",
+    "up.noNetwork.text": "Oups, le signal réseau est perdu",
+    "up.noNetwork.pleaseCheck": "Veuillez vérifier le réseau, ou aller à",
+    "up.noNetwork.connect": "Réseau connecté",
+    "up.noNetwork.disconnect": "Aucune connexion réseau",
+    "up.pagination.previous": "Page précédente",
+    "up.pagination.next": "Page suivante",
+    "up.pullRefresh.pull": "Tirer pour actualiser",
+    "up.pullRefresh.release": "Relâcher pour actualiser",
+    "up.pullRefresh.refreshing": "Actualisation en cours",
+    "up.readMore.expand": "Développer pour lire la suite",
+    "up.readMore.fold": "Réduire",
+    "up.search.placeholder": "Veuillez saisir un mot-clé",
+    "up.signature.penSize": "Taille du trait",
+    "up.signature.penColor": "Couleur du trait",
+    "up.upload.sizeExceed": "Dépassement de la limite de taille",
+    "up.upload.uploading": "Téléchargement en cours",
+    "up.upload.previewImageFail": "Échec de l'aperçu de l'image",
+    "up.upload.previewVideoFail": "Échec de l'aperçu de la vidéo",
+    "up.goodsSku.stock": "Stock",
+    "up.goodsSku.price": "Prix",
+    "up.goodsSku.amount": "Pièces",
+    "up.goodsSku.choosed": "Sélectionné",
+    "up.goodsSku.buyAmount": "Quantité"
+}
\ No newline at end of file
diff --git a/uview-plus/libs/i18n/locales/ja.json b/uview-plus/libs/i18n/locales/ja.json
new file mode 100644
index 0000000..965561c
--- /dev/null
+++ b/uview-plus/libs/i18n/locales/ja.json
@@ -0,0 +1,85 @@
+{
+    "up.common.cancel": "キャンセル",
+    "up.common.confirm": "確認",
+    "up.common.start": "開始",
+    "up.common.end": "終了",
+    "up.common.stop": "停止",
+    "up.common.copy": "コピー",
+    "up.common.none": "なし",
+    "up.common.tip": "ヒント",
+    "up.common.success": "成功",
+    "up.common.fail": "失敗",
+    "up.common.close": "閉じる",
+    "up.common.preview": "プレビュー",
+    "up.common.re-select": "再選択",
+    "up.common.rotate": "回転",
+    "up.common.pleaseChoose": "選択してください",
+    "up.common.loading": "読み込み中",
+    "up.common.loading2": "読み込み中",
+    "up.common.inOperation": "操作中",
+    "up.common.settings": "設定",
+    "up.common.retry": "再試行",
+    "up.common.search": "検索",
+    "up.common.more": "もっと見る",
+    "up.common.video": "ビデオ",
+    "up.common.file": "ファイル",
+    "up.week.one": "月",
+    "up.week.two": "火",
+    "up.week.three": "水",
+    "up.week.four": "木",
+    "up.week.five": "金",
+    "up.week.six": "土",
+    "up.week.seven": "日",
+    "up.barcode.error": "バーコードの生成に失敗しました",
+    "up.calendar.chooseDates": "日付選択",
+    "up.calendar.disabled": "この日付は無効です",
+    "up.calendar.daysExceed": "選択日数は{days}日を超えることはできません",
+    "up.cityLocate.locateCity": "都市の位置を特定",
+    "up.cityLocate.fail": "位置特定に失敗しました。再試行するにはクリックしてください。",
+    "up.cityLocate.locating": "位置特定中",
+    "up.code.send": "認証コードを取得",
+    "up.code.resendAfter": "X秒後に再送信",
+    "up.code.resend": "再送信",
+    "up.cropper.emptyWidhtOrHeight": "切り抜き枠の幅または高さが設定されていません",
+    "up.empty.car": "ショッピングカートは空です",
+    "up.empty.page": "ページが存在しません",
+    "up.empty.search": "検索結果がありません",
+    "up.empty.address": "配送先住所がありません",
+    "up.empty.wifi": "Wi-Fiがありません",
+    "up.empty.order": "注文がありません",
+    "up.empty.coupon": "クーポンがありません",
+    "up.empty.favor": "お気に入りがありません",
+    "up.empty.permission": "権限がありません",
+    "up.empty.history": "履歴がありません",
+    "up.empty.news": "ニュースがありません",
+    "up.empty.message": "メッセージがありません",
+    "up.empty.list": "リストが空です",
+    "up.empty.data": "データがありません",
+    "up.empty.comment": "コメントがありません",
+    "up.link.copyed": "リンクがコピーされました。ブラウザで開いてください",
+    "up.loadmoe.loadmore": "さらに読み込む",
+    "up.loadmoe.nomore": "これ以上データがありません",
+    "up.noNetwork.text": "ネットワーク信号が失われました",
+    "up.noNetwork.pleaseCheck": "ネットワークを確認するか、移動してください",
+    "up.noNetwork.connect": "ネットワーク接続済み",
+    "up.noNetwork.disconnect": "ネットワーク未接続",
+    "up.pagination.previous": "前へ",
+    "up.pagination.next": "次へ",
+    "up.pullRefresh.pull": "引き下げて更新",
+    "up.pullRefresh.release": "指を離して更新",
+    "up.pullRefresh.refreshing": "更新中",
+    "up.readMore.expand": "全文表示",
+    "up.readMore.fold": "折りたたむ",
+    "up.search.placeholder": "キーワードを入力してください",
+    "up.signature.penSize": "線の太さ",
+    "up.signature.penColor": "線の色",
+    "up.upload.sizeExceed": "サイズ制限を超えています",
+    "up.upload.uploading": "アップロード中",
+    "up.upload.previewImageFail": "画像プレビュー失敗",
+    "up.upload.previewVideoFail": "ビデオプレビュー失敗",
+    "up.goodsSku.stock": "在庫",
+    "up.goodsSku.price": "価格",
+    "up.goodsSku.amount": "個",
+    "up.goodsSku.choosed": "選択済み",
+    "up.goodsSku.buyAmount": "購入数量"
+}
diff --git a/uview-plus/libs/i18n/locales/ko.json b/uview-plus/libs/i18n/locales/ko.json
new file mode 100644
index 0000000..7e3c838
--- /dev/null
+++ b/uview-plus/libs/i18n/locales/ko.json
@@ -0,0 +1,85 @@
+{
+    "up.common.cancel": "취소",
+    "up.common.confirm": "확인",
+    "up.common.start": "시작",
+    "up.common.end": "종료",
+    "up.common.stop": "정지",
+    "up.common.copy": "복사",
+    "up.common.none": "없음",
+    "up.common.tip": "팁",
+    "up.common.success": "성공",
+    "up.common.fail": "실패",
+    "up.common.close": "닫기",
+    "up.common.preview": "미리보기",
+    "up.common.re-select": "재선택",
+    "up.common.rotate": "회전",
+    "up.common.pleaseChoose": "선택해주세요",
+    "up.common.loading": "로딩중",
+    "up.common.loading2": "로딩중",
+    "up.common.inOperation": "작업중",
+    "up.common.settings": "설정",
+    "up.common.retry": "재시도",
+    "up.common.search": "검색",
+    "up.common.more": "더보기",
+    "up.common.video": "비디오",
+    "up.common.file": "파일",
+    "up.week.one": "월",
+    "up.week.two": "화",
+    "up.week.three": "수",
+    "up.week.four": "목",
+    "up.week.five": "금",
+    "up.week.six": "토",
+    "up.week.seven": "일",
+    "up.barcode.error": "바코드 생성 실패",
+    "up.calendar.chooseDates": "날짜 선택",
+    "up.calendar.disabled": "해당 날짜는 사용할 수 없습니다",
+    "up.calendar.daysExceed": "선택한 날짜 수가 {days}일을 초과할 수 없습니다",
+    "up.cityLocate.locateCity": "도시 위치 찾기",
+    "up.cityLocate.fail": "위치 찾기 실패, 다시 시도하려면 클릭하세요.",
+    "up.cityLocate.locating": "위치 찾는 중",
+    "up.code.send": "인증코드 받기",
+    "up.code.resendAfter": "X초 후 재전송",
+    "up.code.resend": "재전송",
+    "up.cropper.emptyWidhtOrHeight": "자르기 영역의 너비 또는 높이가 설정되지 않았습니다",
+    "up.empty.car": "장바구니가 비어 있습니다",
+    "up.empty.page": "페이지가 존재하지 않습니다",
+    "up.empty.search": "검색 결과가 없습니다",
+    "up.empty.address": "배송 주소가 없습니다",
+    "up.empty.wifi": "Wi-Fi가 없습니다",
+    "up.empty.order": "주문이 없습니다",
+    "up.empty.coupon": "쿠폰이 없습니다",
+    "up.empty.favor": "즐겨찾기가 없습니다",
+    "up.empty.permission": "권한이 없습니다",
+    "up.empty.history": "기록이 없습니다",
+    "up.empty.news": "뉴스가 없습니다",
+    "up.empty.message": "메시지가 없습니다",
+    "up.empty.list": "목록이 비어 있습니다",
+    "up.empty.data": "데이터가 없습니다",
+    "up.empty.comment": "댓글이 없습니다",
+    "up.link.copyed": "링크가 복사되었습니다. 브라우저에서 열어주세요",
+    "up.loadmoe.loadmore": "더 불러오기",
+    "up.loadmoe.nomore": "더 이상 데이터가 없습니다",
+    "up.noNetwork.text": "네트워크 신호가 없습니다",
+    "up.noNetwork.pleaseCheck": "네트워크를 확인하거나 이동하세요",
+    "up.noNetwork.connect": "네트워크 연결됨",
+    "up.noNetwork.disconnect": "네트워크 연결 끊김",
+    "up.pagination.previous": "이전 페이지",
+    "up.pagination.next": "다음 페이지",
+    "up.pullRefresh.pull": "당겨서 새로고침",
+    "up.pullRefresh.release": "놓아서 새로고침",
+    "up.pullRefresh.refreshing": "새로고침 중",
+    "up.readMore.expand": "펼쳐서 전체 보기",
+    "up.readMore.fold": "접기",
+    "up.search.placeholder": "키워드를 입력하세요",
+    "up.signature.penSize": "선 굵기",
+    "up.signature.penColor": "선 색상",
+    "up.upload.sizeExceed": "용량 제한 초과",
+    "up.upload.uploading": "업로드 중",
+    "up.upload.previewImageFail": "이미지 미리보기 실패",
+    "up.upload.previewVideoFail": "비디오 미리보기 실패",
+    "up.goodsSku.stock": "재고",
+    "up.goodsSku.price": "가격",
+    "up.goodsSku.amount": "개",
+    "up.goodsSku.choosed": "선택됨",
+    "up.goodsSku.buyAmount": "구매 수량"
+}
diff --git a/uview-plus/libs/i18n/locales/ru.json b/uview-plus/libs/i18n/locales/ru.json
new file mode 100644
index 0000000..4ee2528
--- /dev/null
+++ b/uview-plus/libs/i18n/locales/ru.json
@@ -0,0 +1,85 @@
+{
+    "up.common.cancel": "Отмена",
+    "up.common.confirm": "Подтвердить",
+    "up.common.start": "Начало",
+    "up.common.end": "Конец",
+    "up.common.stop": "Стоп",
+    "up.common.copy": "Копировать",
+    "up.common.none": "Нет",
+    "up.common.tip": "Подсказка",
+    "up.common.success": "Успех",
+    "up.common.fail": "Ошибка",
+    "up.common.close": "Закрыть",
+    "up.common.preview": "Предпросмотр",
+    "up.common.re-select": "Выбрать снова",
+    "up.common.rotate": "Повернуть",
+    "up.common.pleaseChoose": "Пожалуйста, выберите",
+    "up.common.loading": "Загрузка",
+    "up.common.loading2": "Загружается",
+    "up.common.inOperation": "В процессе",
+    "up.common.settings": "Настройки",
+    "up.common.retry": "Повторить",
+    "up.common.search": "Поиск",
+    "up.common.more": "Больше",
+    "up.common.video": "Видео",
+    "up.common.file": "Файл",
+    "up.week.one": "Пн",
+    "up.week.two": "Вт",
+    "up.week.three": "Ср",
+    "up.week.four": "Чт",
+    "up.week.five": "Пт",
+    "up.week.six": "Сб",
+    "up.week.seven": "Вс",
+    "up.barcode.error": "Ошибка генерации штрихкода",
+    "up.calendar.chooseDates": "Выбор даты",
+    "up.calendar.disabled": "Эта дата отключена",
+    "up.calendar.daysExceed": "Количество выбранных дней не может превышать {days} дней",
+    "up.cityLocate.locateCity": "Определение города",
+    "up.cityLocate.fail": "Ошибка определения местоположения, нажмите для повтора.",
+    "up.cityLocate.locating": "Определение местоположения",
+    "up.code.send": "Получить код подтверждения",
+    "up.code.resendAfter": "Повторная отправка через X секунд",
+    "up.code.resend": "Отправить снова",
+    "up.cropper.emptyWidhtOrHeight": "Ширина или высота области обрезки не задана",
+    "up.empty.car": "Корзина пуста",
+    "up.empty.page": "Страница не существует",
+    "up.empty.search": "Нет результатов поиска",
+    "up.empty.address": "Нет адреса доставки",
+    "up.empty.wifi": "Нет Wi-Fi",
+    "up.empty.order": "Заказы отсутствуют",
+    "up.empty.coupon": "Нет купонов",
+    "up.empty.favor": "Нет избранного",
+    "up.empty.permission": "Нет разрешения",
+    "up.empty.history": "Нет истории",
+    "up.empty.news": "Нет новостей",
+    "up.empty.message": "Список сообщений пуст",
+    "up.empty.list": "Список пуст",
+    "up.empty.data": "Нет данных",
+    "up.empty.comment": "Нет комментариев",
+    "up.link.copyed": "Ссылка скопирована, откройте в браузере",
+    "up.loadmoe.loadmore": "Загрузить еще",
+    "up.loadmoe.nomore": "Больше нет данных",
+    "up.noNetwork.text": "Ой, потеряно сетевое соединение",
+    "up.noNetwork.pleaseCheck": "Проверьте сеть или перейдите к",
+    "up.noNetwork.connect": "Сеть подключена",
+    "up.noNetwork.disconnect": "Нет сетевого подключения",
+    "up.pagination.previous": "Предыдущая страница",
+    "up.pagination.next": "Следующая страница",
+    "up.pullRefresh.pull": "Потяните вниз для обновления",
+    "up.pullRefresh.release": "Отпустите для обновления",
+    "up.pullRefresh.refreshing": "Обновление",
+    "up.readMore.expand": "Развернуть для полного чтения",
+    "up.readMore.fold": "Свернуть",
+    "up.search.placeholder": "Введите ключевое слово",
+    "up.signature.penSize": "Размер штриха",
+    "up.signature.penColor": "Цвет штриха",
+    "up.upload.sizeExceed": "Превышен лимит размера",
+    "up.upload.uploading": "Загрузка",
+    "up.upload.previewImageFail": "Ошибка предпросмотра изображения",
+    "up.upload.previewVideoFail": "Ошибка предпросмотра видео",
+    "up.goodsSku.stock": "Запас",
+    "up.goodsSku.price": "Цена",
+    "up.goodsSku.amount": "Штук",
+    "up.goodsSku.choosed": "Выбрано",
+    "up.goodsSku.buyAmount": "Количество"
+}
diff --git a/uview-plus/libs/i18n/locales/th.json b/uview-plus/libs/i18n/locales/th.json
new file mode 100644
index 0000000..8d23888
--- /dev/null
+++ b/uview-plus/libs/i18n/locales/th.json
@@ -0,0 +1,85 @@
+{
+    "up.common.cancel": "ยกเลิก",
+    "up.common.confirm": "ยืนยัน",
+    "up.common.start": "เริ่มต้น",
+    "up.common.end": "สิ้นสุด",
+    "up.common.stop": "หยุด",
+    "up.common.copy": "คัดลอก",
+    "up.common.none": "ไม่มี",
+    "up.common.tip": "คำแนะนำ",
+    "up.common.success": "สำเร็จ",
+    "up.common.fail": "ล้มเหลว",
+    "up.common.close": "ปิด",
+    "up.common.preview": "ดูตัวอย่าง",
+    "up.common.re-select": "เลือกใหม่",
+    "up.common.rotate": "หมุน",
+    "up.common.pleaseChoose": "กรุณาเลือก",
+    "up.common.loading": "กำลังโหลด",
+    "up.common.loading2": "กำลังโหลด",
+    "up.common.inOperation": "กำลังดำเนินการ",
+    "up.common.settings": "การตั้งค่า",
+    "up.common.retry": "ลองใหม่",
+    "up.common.search": "ค้นหา",
+    "up.common.more": "เพิ่มเติม",
+    "up.common.video": "วิดีโอ",
+    "up.common.file": "ไฟล์",
+    "up.week.one": "จันทร์",
+    "up.week.two": "อังคาร",
+    "up.week.three": "พุธ",
+    "up.week.four": "พฤหัสบดี",
+    "up.week.five": "ศุกร์",
+    "up.week.six": "เสาร์",
+    "up.week.seven": "อาทิตย์",
+    "up.barcode.error": "สร้างบาร์โค้ดไม่สำเร็จ",
+    "up.calendar.chooseDates": "เลือกวันที่",
+    "up.calendar.disabled": "วันที่นี้ถูกปิดการใช้งาน",
+    "up.calendar.daysExceed": "จำนวนวันที่เลือกต้องไม่เกิน {days} วัน",
+    "up.cityLocate.locateCity": "ระบุตำแหน่งเมือง",
+    "up.cityLocate.fail": "การระบุตำแหน่งล้มเหลว กรุณาคลิกเพื่อลองใหม่",
+    "up.cityLocate.locating": "กำลังระบุตำแหน่ง",
+    "up.code.send": "รับรหัสยืนยัน",
+    "up.code.resendAfter": "ส่งใหม่ใน X วินาที",
+    "up.code.resend": "ส่งใหม่",
+    "up.cropper.emptyWidhtOrHeight": "ไม่ได้ตั้งค่าความกว้างหรือความสูงของกรอบตัดภาพ",
+    "up.empty.car": "รถเข็นว่างเปล่า",
+    "up.empty.page": "ไม่มีหน้านี้",
+    "up.empty.search": "ไม่มีผลลัพธ์การค้นหา",
+    "up.empty.address": "ไม่มีที่อยู่จัดส่ง",
+    "up.empty.wifi": "ไม่มี WiFi",
+    "up.empty.order": "ไม่มีคำสั่งซื้อ",
+    "up.empty.coupon": "ไม่มีคูปอง",
+    "up.empty.favor": "ไม่มีรายการโปรด",
+    "up.empty.permission": "ไม่มีสิทธิ์",
+    "up.empty.history": "ไม่มีประวัติ",
+    "up.empty.news": "ไม่มีรายการข่าว",
+    "up.empty.message": "รายการข้อความว่างเปล่า",
+    "up.empty.list": "รายการว่างเปล่า",
+    "up.empty.data": "ข้อมูลว่างเปล่า",
+    "up.empty.comment": "ไม่มีความคิดเห็น",
+    "up.link.copyed": "คัดลอกลิงก์แล้ว กรุณาเปิดในเบราว์เซอร์",
+    "up.loadmoe.loadmore": "โหลดเพิ่มเติม",
+    "up.loadmoe.nomore": "ไม่มีข้อมูลเพิ่มเติม",
+    "up.noNetwork.text": "อ๊ะ ขาดการเชื่อมต่อเครือข่าย",
+    "up.noNetwork.pleaseCheck": "กรุณาตรวจสอบเครือข่าย หรือไปที่",
+    "up.noNetwork.connect": "เชื่อมต่อเครือข่ายแล้ว",
+    "up.noNetwork.disconnect": "ไม่มีการเชื่อมต่อเครือข่าย",
+    "up.pagination.previous": "หน้าก่อนหน้า",
+    "up.pagination.next": "หน้าถัดไป",
+    "up.pullRefresh.pull": "ดึงเพื่อรีเฟรช",
+    "up.pullRefresh.release": "ปล่อยเพื่อรีเฟรช",
+    "up.pullRefresh.refreshing": "กำลังรีเฟรช",
+    "up.readMore.expand": "ขยายเพื่ออ่านทั้งหมด",
+    "up.readMore.fold": "ย่อ",
+    "up.search.placeholder": "กรุณาใส่คำสำคัญ",
+    "up.signature.penSize": "ขนาดเส้น",
+    "up.signature.penColor": "สีเส้น",
+    "up.upload.sizeExceed": "เกินขนาดที่กำหนด",
+    "up.upload.uploading": "กำลังอัปโหลด",
+    "up.upload.previewImageFail": "ดูตัวอย่างภาพไม่สำเร็จ",
+    "up.upload.previewVideoFail": "ดูตัวอย่างวิดีโอไม่สำเร็จ",
+    "up.goodsSku.stock": "สินค้าคงคลัง",
+    "up.goodsSku.price": "ราคา",
+    "up.goodsSku.amount": "ชิ้น",
+    "up.goodsSku.choosed": "เลือกแล้ว",
+    "up.goodsSku.buyAmount": "จำนวน"
+}
diff --git a/uview-plus/libs/i18n/locales/zh-Hans.json b/uview-plus/libs/i18n/locales/zh-Hans.json
new file mode 100644
index 0000000..b474ff4
--- /dev/null
+++ b/uview-plus/libs/i18n/locales/zh-Hans.json
@@ -0,0 +1,85 @@
+{
+    "up.common.cancel": "取消",
+    "up.common.confirm": "确定",
+    "up.common.start": "开始",
+    "up.common.end": "结束",
+    "up.common.stop": "停止",
+    "up.common.copy": "复制",
+    "up.common.none": "暂无",
+    "up.common.tip": "提示",
+    "up.common.success": "成功",
+    "up.common.fail": "失败",
+    "up.common.close": "关闭",
+    "up.common.preview": "预览",
+    "up.common.re-select": "重选",
+    "up.common.rotate": "旋转",
+    "up.common.pleaseChoose": "请选择",
+    "up.common.loading": "加载中",
+    "up.common.loading2": "正在加载",
+    "up.common.inOperation": "操作中",
+    "up.common.settings": "设置",
+    "up.common.retry": "重试",
+    "up.common.search": "搜索",
+    "up.common.more": "更多",
+    "up.common.video": "视频",
+    "up.common.file": "文件",
+    "up.week.one": "一",
+    "up.week.two": "二",
+    "up.week.three": "三",
+    "up.week.four": "四",
+    "up.week.five": "五",
+    "up.week.six": "六",
+    "up.week.seven": "日",
+    "up.barcode.error": "生成条码失败",
+    "up.calendar.chooseDates": "日期选择",
+    "up.calendar.disabled": "该日期已禁用",
+    "up.calendar.daysExceed": "选择天数不能超过{days}天",
+    "up.cityLocate.locateCity": "定位城市",
+    "up.cityLocate.fail": "定位失败，请点击重试。",
+    "up.cityLocate.locating": "定位中",
+    "up.code.send": "获取验证码",
+    "up.code.resendAfter": "X秒重新获取",
+    "up.code.resend": "重新获取",
+    "up.cropper.emptyWidhtOrHeight": "裁剪框的宽或高没有设置",
+    "up.empty.car": "购物车为空",
+    "up.empty.page": "页面不存在",
+    "up.empty.search": "没有搜索结果",
+    "up.empty.address": "没有收货地址",
+    "up.empty.wifi": "没有WiFi",
+    "up.empty.order": "订单为空",
+    "up.empty.coupon": "没有优惠券",
+    "up.empty.favor": "暂无收藏",
+    "up.empty.permission": "无权限",
+    "up.empty.history": "无历史记录",
+    "up.empty.news": "无新闻列表",
+    "up.empty.message": "消息列表为空",
+    "up.empty.list": "列表为空",
+    "up.empty.data": "数据为空",
+    "up.empty.comment": "暂无评论",
+    "up.link.copyed": "链接已复制，请在浏览器打开",
+    "up.loadmoe.loadmore": "加载更多",
+    "up.loadmoe.nomore": "没有更多了",
+    "up.noNetwork.text": "哎呀，网络信号丢失",
+    "up.noNetwork.pleaseCheck": "请检查网络，或前往",
+    "up.noNetwork.connect": "网络已连接",
+    "up.noNetwork.disconnect": "无网络连接",
+    "up.pagination.previous": "上一页",
+    "up.pagination.next": "下一页",
+    "up.pullRefresh.pull": "下拉刷新",
+    "up.pullRefresh.release": "释放刷新",
+    "up.pullRefresh.refreshing": "正在刷新",
+    "up.readMore.expand": "展开阅读全文",
+    "up.readMore.fold": "收起",
+    "up.search.placeholder": "请输入关键字",
+    "up.signature.penSize": "笔画大小",
+    "up.signature.penColor": "笔画颜色",
+    "up.upload.sizeExceed": "超过大小限制",
+    "up.upload.uploading": "上传中",
+    "up.upload.previewImageFail": "预览图片失败",
+    "up.upload.previewVideoFail": "预览视频失败",
+    "up.goodsSku.stock": "库存",
+    "up.goodsSku.price": "价格",
+    "up.goodsSku.amount": "件",
+    "up.goodsSku.choosed": "已选",
+    "up.goodsSku.buyAmount": "购买数量"
+}
diff --git a/uview-plus/libs/i18n/locales/zh-Hant.json b/uview-plus/libs/i18n/locales/zh-Hant.json
new file mode 100644
index 0000000..48e780b
--- /dev/null
+++ b/uview-plus/libs/i18n/locales/zh-Hant.json
@@ -0,0 +1,85 @@
+{
+    "up.common.cancel": "取消",
+    "up.common.confirm": "確定",
+    "up.common.start": "開始",
+    "up.common.end": "結束",
+    "up.common.stop": "停止",
+    "up.common.copy": "複製",
+    "up.common.none": "暫無",
+    "up.common.tip": "提示",
+    "up.common.success": "成功",
+    "up.common.fail": "失敗",
+    "up.common.close": "關閉",
+    "up.common.preview": "預覽",
+    "up.common.re-select": "重選",
+    "up.common.rotate": "旋轉",
+    "up.common.pleaseChoose": "請選擇",
+    "up.common.loading": "加載中",
+    "up.common.loading2": "正在加載",
+    "up.common.inOperation": "操作中",
+    "up.common.settings": "設置",
+    "up.common.retry": "重試",
+    "up.common.search": "搜索",
+    "up.common.more": "更多",
+    "up.common.video": "視頻",
+    "up.common.file": "文件",
+    "up.week.one": "一",
+    "up.week.two": "二",
+    "up.week.three": "三",
+    "up.week.four": "四",
+    "up.week.five": "五",
+    "up.week.six": "六",
+    "up.week.seven": "日",
+    "up.barcode.error": "生成條碼失敗",
+    "up.calendar.chooseDates": "日期選擇",
+    "up.calendar.disabled": "該日期已禁用",
+    "up.calendar.daysExceed": "選擇天數不能超過{days}天",
+    "up.cityLocate.locateCity": "定位城市",
+    "up.cityLocate.fail": "定位失敗，請點擊重試。",
+    "up.cityLocate.locating": "定位中",
+    "up.code.send": "獲取驗證碼",
+    "up.code.resendAfter": "X秒重新獲取",
+    "up.code.resend": "重新獲取",
+    "up.cropper.emptyWidhtOrHeight": "裁剪框的寬或高沒有設置",
+    "up.empty.car": "購物車為空",
+    "up.empty.page": "頁面不存在",
+    "up.empty.search": "沒有搜索結果",
+    "up.empty.address": "沒有收貨地址",
+    "up.empty.wifi": "沒有WiFi",
+    "up.empty.order": "訂單為空",
+    "up.empty.coupon": "沒有優惠券",
+    "up.empty.favor": "暫無收藏",
+    "up.empty.permission": "無權限",
+    "up.empty.history": "無歷史記錄",
+    "up.empty.news": "無新聞列表",
+    "up.empty.message": "消息列表為空",
+    "up.empty.list": "列表為空",
+    "up.empty.data": "數據為空",
+    "up.empty.comment": "暫無評論",
+    "up.link.copyed": "鏈接已複製，請在瀏覽器打開",
+    "up.loadmoe.loadmore": "加載更多",
+    "up.loadmoe.nomore": "沒有更多了",
+    "up.noNetwork.text": "哎呀，網絡信號丟失",
+    "up.noNetwork.pleaseCheck": "請檢查網絡，或前往",
+    "up.noNetwork.connect": "網絡已連接",
+    "up.noNetwork.disconnect": "無網絡連接",
+    "up.pagination.previous": "上一頁",
+    "up.pagination.next": "下一頁",
+    "up.pullRefresh.pull": "下拉刷新",
+    "up.pullRefresh.release": "釋放刷新",
+    "up.pullRefresh.refreshing": "正在刷新",
+    "up.readMore.expand": "展開閱讀全文",
+    "up.readMore.fold": "收起",
+    "up.search.placeholder": "請輸入關鍵字",
+    "up.signature.penSize": "筆畫大小",
+    "up.signature.penColor": "筆畫顏色",
+    "up.upload.sizeExceed": "超過大小限制",
+    "up.upload.uploading": "上傳中",
+    "up.upload.previewImageFail": "預覽圖片失敗",
+    "up.upload.previewVideoFail": "預覽視頻失敗",
+    "up.goodsSku.stock": "庫存",
+    "up.goodsSku.price": "價格",
+    "up.goodsSku.amount": "件",
+    "up.goodsSku.choosed": "已選",
+    "up.goodsSku.buyAmount": "購買數量"
+}
diff --git a/uview-plus/libs/luch-request/core/Request.js b/uview-plus/libs/luch-request/core/Request.js
index cc48566..11e6dd5 100644
--- a/uview-plus/libs/luch-request/core/Request.js
+++ b/uview-plus/libs/luch-request/core/Request.js
@@ -34,6 +34,7 @@ export default class Request {
    * @param {Function(statusCode):Boolean} arg.validateStatus - 全局默认的自定义验证器。默认statusCode >= 200 && statusCode < 300
    */
     constructor(arg = {}) {
+		// console.info('初始化luch-request')
         if (!isPlainObject(arg)) {
             arg = {}
             console.warn('设置全局参数必须接收一个Object')
diff --git a/uview-plus/libs/util/gcanvas/bridge/bridge-weex.js b/uview-plus/libs/util/gcanvas/bridge/bridge-weex.js
index 27086ec..d556b95 100644
--- a/uview-plus/libs/util/gcanvas/bridge/bridge-weex.js
+++ b/uview-plus/libs/util/gcanvas/bridge/bridge-weex.js
@@ -22,7 +22,6 @@ const logCommand = (function () {
     }
     const logCommand = (id, cmds) => {
         const mId = cmds.split(',')[0];
-        const mName = queryMethod(mId);
         console.log(`=== callNative - componentId:${id}; method: ${mName}; cmds: ${cmds}`);
     }
     return logCommand;
@@ -214,7 +213,9 @@ const GBridge = {
     },
 
     perloadImage([url, id], callback) {
+		console.log('********************asda**********')
         GCanvasModule.preLoadImage([url, id], function (image) {
+			console.log('********************asda2**********')
             image.url = url;
             image.id = id;
             callback(image);
diff --git a/uview-plus/libs/util/gcanvas/env/image.js b/uview-plus/libs/util/gcanvas/env/image.js
index 9499a51..810e5e0 100644
--- a/uview-plus/libs/util/gcanvas/env/image.js
+++ b/uview-plus/libs/util/gcanvas/env/image.js
@@ -1,5 +1,6 @@
 let incId = 1;
 
+import GBridge from '../bridge/bridge-weex.js'
 const noop = function () { };
 
 class GImage {
@@ -42,22 +43,29 @@ class GImage {
         }
 
         this._src = v;
-
-        GImage.GBridge.perloadImage([this._src, this._id], (data) => {
-            if (typeof data === 'string') {
-                data = JSON.parse(data);
-            }
-            if (data.error) {
-                var evt = { type: 'error', target: this };
-                this.onerror(evt);
-            } else {
-                this.complete = true;
-                this.width = typeof data.width === 'number' ? data.width : 0;
-                this.height = typeof data.height === 'number' ? data.height : 0;
-                var evt = { type: 'load', target: this };
-                this.onload(evt);
-            }
-        });
+		try {
+			GBridge.perloadImage([this._src, this._id], (data) => {
+				if (process.env.NODE_ENV === 'development') {
+					console.log('****GBridge.perloadImage****')
+				}
+				if (typeof data === 'string') {
+					data = JSON.parse(data);
+				}
+				
+				if (data.error) {
+					var evt = { type: 'error', target: this };
+					this.onerror(evt);
+				} else {
+					this.complete = true;
+					this.width = typeof data.width === 'number' ? data.width : 0;
+					this.height = typeof data.height === 'number' ? data.height : 0;
+					var evt = { type: 'load', target: this };
+					this.onload(evt);
+				}
+			});
+		} catch (error) {
+			console.log('perloadImage fail', error)
+		}
     }
 
     addEventListener(name, listener) {
diff --git a/uview-plus/package.json b/uview-plus/package.json
index dd47475..8678c66 100644
--- a/uview-plus/package.json
+++ b/uview-plus/package.json
@@ -1,96 +1,109 @@
 {
-	"id": "uview-plus",
-	"name": "uview-plus",
-	"displayName": "零云®uview-plus3.0重磅发布，全面的Vue3鸿蒙移动组件库。",
-	"version": "3.3.57",
-	"description": "零云®uview-plus已兼容vue3，全面的组件和便捷的工具会让您信手拈来，如鱼得水",
-	"keywords": [
-        "uview",
-        "uview-plus",
-        "ui",
-        "ui",
-        "uni-app",
-        "uni-app",
-        "ui",
-        "可视化设计"
-    ],
-    "main": "index.js",
-	"repository": "https://github.com/ijry/uview-plus",
-	"engines": {
-		"HBuilderX": "^3.1.0"
-	},
-    "dcloudext": {
-        "sale": {
-			"regular": {
-				"price": "0.00"
-			},
-			"sourcecode": {
-				"price": "0.00"
-			}
-		},
-		"contact": {
-			"qq": "598821125"
-		},
-		"declaration": {
-			"ads": "无",
-			"data": "无",
-			"permissions": "无"
-		},
-        "npmurl": "https://www.npmjs.com/package/uview-plus",
-        "type": "component-vue"
-	},
-	"uni_modules": {
-		"dependencies": [],
-		"encrypt": [],
-		"platforms": {
-			"cloud": {
-				"tcb": "y",
-                "aliyun": "y",
-                "alipay": "n"
-			},
-			"client": {
-				"Vue": {
-					"vue2": "n",
-					"vue3": "y"
-				},
-				"App": {
-                    "app-vue": "y",
-                    "app-nvue": "y",
-                    "app-harmony": "u",
-                    "app-uvue": "u"
-                },
-				"H5-mobile": {
-					"Safari": "y",
-					"Android Browser": "y",
-					"微信浏览器(Android)": "y",
-					"QQ浏览器(Android)": "y"
-				},
-				"H5-pc": {
-					"Chrome": "y",
-					"IE": "y",
-					"Edge": "y",
-					"Firefox": "y",
-					"Safari": "y"
-				},
-				"小程序": {
-					"微信": "y",
-					"阿里": "y",
-					"百度": "y",
-					"字节跳动": "y",
-					"QQ": "y"
-				},
-				"快应用": {
-					"华为": "y",
-					"联盟": "y"
-				}
-			}
-		}
-	},
-	"dependencies": {
-		"clipboard": "^2.0.11",
-		"dayjs": "^1.11.3"
-	},
-	"publishConfig": {
-	    "registry": "https://registry.npmjs.org/"
-	}
-}
+  "id": "uview-plus",
+  "name": "uview-plus",
+  "displayName": "零云®uview-plus3.0重磅发布，全面的Vue3鸿蒙跨端移动组件库，组件丰富维护更新稳定。",
+  "version": "3.7.20",
+  "description": "零云®uview-plus已兼容vue3支持多语言，120+全面的组件和便捷的工具会让您信手拈来。近期新增拖动排序、条码、图片裁剪、下拉刷新、虚拟列表、签名、Markdown等。",
+  "keywords": [
+    "uview",
+    "uview-plus",
+    "ui",
+    "echarts",
+    "ui",
+    "可视化"
+],
+  "main": "index.js",
+  "repository": "https://github.com/ijry/uview-plus",
+  "engines": {
+    "HBuilderX": "^3.1.0",
+    "uni-app": "^4.66",
+    "uni-app-x": ""
+  },
+  "dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": "598821125"
+    },
+    "declaration": {
+      "ads": "请注意本插件开发文档包含弹窗广告每日展示一次，源码纯净无广告。",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/uview-plus",
+    "type": "component-vue",
+    "darkmode": "x",
+    "i18n": "√",
+    "widescreen": "x"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "√",
+        "aliyun": "√",
+        "alipay": "√"
+      },
+      "client": {
+        "uni-app": {
+          "vue": {
+            "vue2": "-",
+            "vue3": "√"
+          },
+          "web": {
+            "safari": "√",
+            "chrome": "√"
+          },
+          "app": {
+            "vue": "√",
+            "nvue": "√",
+            "android": "√",
+            "ios": "√",
+            "harmony": "√"
+          },
+          "mp": {
+            "weixin": "√",
+            "alipay": "√",
+            "toutiao": "√",
+            "baidu": "-",
+            "kuaishou": "-",
+            "jd": "-",
+            "harmony": "√",
+            "qq": "√",
+            "lark": "-"
+          },
+          "quickapp": {
+            "huawei": "-",
+            "union": "-"
+          }
+        },
+        "uni-app-x": {
+          "web": {
+            "safari": "-",
+            "chrome": "-"
+          },
+          "app": {
+            "android": "-",
+            "ios": "-",
+            "harmony": "-"
+          },
+          "mp": {
+            "weixin": "-"
+          }
+        }
+      }
+    }
+  },
+  "dependencies": {
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  }
+}
\ No newline at end of file
diff --git a/uview-plus/types/comps.d.ts b/uview-plus/types/comps.d.ts
index 2b90704..22fd434 100644
--- a/uview-plus/types/comps.d.ts
+++ b/uview-plus/types/comps.d.ts
@@ -95,6 +95,7 @@ declare module 'vue' {
     ['up-transition']: typeof import('./comps/transition')['Transition']
     ['up-status-bar']: typeof import('./comps/statusBar')['StatusBar']
     ['up-safe-bottom']: typeof import('./comps/safeBottom')['SafeBottom']
+    ['up-qrcode']: typeof import('./comps/qrcode')['Qrcode']
   }
 }
 
diff --git a/uview-plus/types/comps/actionSheet.d.ts b/uview-plus/types/comps/actionSheet.d.ts
index 12c3ae1..81b3527 100644
--- a/uview-plus/types/comps/actionSheet.d.ts
+++ b/uview-plus/types/comps/actionSheet.d.ts
@@ -26,7 +26,7 @@ declare interface ActionSheetProps {
   /**
    * 点击某个菜单项时是否关闭弹窗
    */
-  closeOnClickAction?: string
+  closeOnClickAction?: boolean
   /**
    * 是否开启底部安全区适配
    * @default false
@@ -78,7 +78,7 @@ declare interface ActionSheetProps {
   /**
    * 点击ActionSheet列表项时触发
    */
-  onSelect?: () => any
+  onSelect?: (e: any) => any
   /**
    * 点击取消按钮时触发
    */
diff --git a/uview-plus/types/comps/modal.d.ts b/uview-plus/types/comps/modal.d.ts
index b9e2b57..e91c813 100644
--- a/uview-plus/types/comps/modal.d.ts
+++ b/uview-plus/types/comps/modal.d.ts
@@ -100,7 +100,7 @@ declare interface ModalSlots {
   /**
    * 传入自定义按钮，用于在微信小程序弹窗通过按钮授权的场景
    */
-  ['confirm-button']?: () => any
+  ['confirmButton']?: () => any
 }
 
 declare interface _Modal {
diff --git a/uview-plus/types/comps/navbar.d.ts b/uview-plus/types/comps/navbar.d.ts
index b44b2a8..eb15a90 100644
--- a/uview-plus/types/comps/navbar.d.ts
+++ b/uview-plus/types/comps/navbar.d.ts
@@ -47,6 +47,11 @@ declare interface NavbarProps {
    * @default"#fff
    */
   bgColor?: string
+  /**
+   * 状态栏背景颜色 不写同导航栏背景设置
+   * @default bgColor
+   */
+  statusBarBgColor?: string
   /**
    * 导航栏标题的最大宽度，内容超出会以省略号隐藏，单位rpx
    * @default "400rpx"
diff --git a/uview-plus/types/comps/qrcode.d.ts b/uview-plus/types/comps/qrcode.d.ts
new file mode 100644
index 0000000..f4ae62e
--- /dev/null
+++ b/uview-plus/types/comps/qrcode.d.ts
@@ -0,0 +1,77 @@
+import {AllowedComponentProps, VNodeProps} from './_common'
+
+declare interface QrcodeProps {
+    /**
+     * 实例ID字符串(必须)
+     */
+    cid: string
+
+    /**
+     * 二维码大小
+     * @default 200
+     */
+    size?: number
+
+    /**
+     * 二维码内容
+     */
+    val: string
+
+    /**
+     * 背景色
+     * @default "#ffffff"
+     */
+    background?: string
+
+    /**
+     * 前景色
+     * @default "#000000"
+     */
+    foreground?: string
+
+    /**
+     * 二维码中间图标
+     * @default "#000000"
+     */
+    icon?: string
+
+    /**
+     * 显示加载状态
+     * @default true
+     */
+    showLoading?: boolean
+
+    /**
+     * 加载中提示语
+     * @default "二维码生成中"
+     */
+    loadingText?: string
+
+    /**
+     * 使用根节点的宽高 设置为true会导致size失效
+     * @default false
+     */
+    useRootHeightAndWidth: boolean
+
+    /**
+     * 二维码生成成功回调事件
+     */
+    result?: () => any
+
+    /**
+     * 长按触发事件
+     * @param url 二维码本地生成url
+     */
+    longpressCallback?: (url: string) => any
+
+}
+
+declare interface _Qrcode {
+    new(): {
+        $props: AllowedComponentProps &
+            VNodeProps &
+            QrcodeProps
+    }
+}
+
+export declare const Qrcode: _Qrcode
diff --git a/uview-plus/types/comps/radio.d.ts b/uview-plus/types/comps/radio.d.ts
index 2175418..fac42e9 100644
--- a/uview-plus/types/comps/radio.d.ts
+++ b/uview-plus/types/comps/radio.d.ts
@@ -60,9 +60,13 @@ declare interface RadioProps {
 
 declare interface RadioSlots {
   /**
-   * 自定义修改label内容
+   * 自定义icon内容
    */
-  ['default']?: () => any
+  ['icon']?: () => any
+  /**
+   * 自定义label内容
+   */
+  ['label']?: () => any
 }
 
 declare interface _Radio {
diff --git a/uview-plus/types/comps/search.d.ts b/uview-plus/types/comps/search.d.ts
index 26c3337..d5e4bed 100644
--- a/uview-plus/types/comps/search.d.ts
+++ b/uview-plus/types/comps/search.d.ts
@@ -89,6 +89,11 @@ declare interface SearchProps {
    * @default "search"
    */
   searchIcon?: string
+  /**
+   * 输入框图标位置，left-左边，right-右边
+   * @default "left"
+   */
+  iconPosition?: 'left' | 'right'
   /**
    * 组件与其他上下左右元素之间的距离，带单位的字符串形式，如"30rpx"、"30rpx 20rpx"等写法
    * @default "0"
@@ -156,11 +161,19 @@ declare interface SearchProps {
   onClickIcon?: () => any
 }
 
+declare interface SearchSlots {
+    /**
+     * 修改输入框区域内部右侧内容 类似于左侧图标区域
+     */
+    ['inputRight']?: () => any
+}
+
 declare interface _Search {
   new (): {
     $props: AllowedComponentProps &
       VNodeProps &
       SearchProps
+    $slots: SearchSlots
   }
 }
 
diff --git a/uview-plus/types/comps/subsection.d.ts b/uview-plus/types/comps/subsection.d.ts
index c98fc1e..e8a30b3 100644
--- a/uview-plus/types/comps/subsection.d.ts
+++ b/uview-plus/types/comps/subsection.d.ts
@@ -46,6 +46,22 @@ declare interface SubsectionProps {
    * @default "name"
    */
   keyName?: string
+
+  /**
+   * 从`list`元素对象中读取激活时的颜色  如果存在字段 优先级大于 activeColor
+   * @default activeColorKey
+   */
+  activeColorKeyName?: string
+  /**
+   * 从`list`元素对象中读取未激活时的颜色 如果存在字段 优先级大于 inactiveColor
+   * @default inactiveColorKey
+   */
+  inactiveColorKeyName?: string
+  /**
+   * 是否禁用
+   * @default false
+   */
+  disabled?: boolean
   /**
    * 分段器选项发生改变时触发
    * @param index 选项的index索引值，从0开始
diff --git a/uview-plus/types/comps/toast.d.ts b/uview-plus/types/comps/toast.d.ts
index 0fa115c..592f299 100644
--- a/uview-plus/types/comps/toast.d.ts
+++ b/uview-plus/types/comps/toast.d.ts
@@ -1,6 +1,10 @@
 import { AllowedComponentProps, VNodeProps } from './_common'
 
 declare interface ToastProps {
+  /**
+   * 层级
+   */
+  zIndex?: string | number
   /**
    * 是否加载中
    * @default false
@@ -43,7 +47,7 @@ declare interface _ToastRef {
   /**
    * 显示toast，如需一进入页面就显示toast，请在onReady生命周期调用
    */
-  show: () => void
+  show: (options: ToastProps) => void
 }
 
 declare interface _Toast {
diff --git a/uview-plus/types/comps/upload.d.ts b/uview-plus/types/comps/upload.d.ts
index 7699168..89d64d8 100644
--- a/uview-plus/types/comps/upload.d.ts
+++ b/uview-plus/types/comps/upload.d.ts
@@ -1,6 +1,33 @@
 import { AllowedComponentProps, VNodeProps } from './_common'
 import { ImageMode } from './image';
 
+type BaseFileInfo = {
+    type: string
+    url: string
+    name: string
+    size: number
+    file: File
+    [key: string]: any
+}
+
+type ImageFileInfo = BaseFileInfo & {
+    type: 'image'
+    thumb: string
+}
+
+type VideoFileInfo = BaseFileInfo & {
+    type: 'video'
+    thumb: string
+    width: number
+    height: number
+}
+
+type MediaFileInfo = BaseFileInfo & {
+    thumb: string
+}
+
+type FileInfo = BaseFileInfo | ImageFileInfo | VideoFileInfo | MediaFileInfo
+
 declare interface UploadProps {
   /**
    * 接受的文件类型，file只支持H5（只有微信小程序才支持把accept配置为all、media）
@@ -12,6 +39,10 @@ declare interface UploadProps {
    * @default ["album", "camera"]
    */
   capture?: 'album' | 'camera' | ('album' | 'camera')[]
+  /**
+   * 选择文件的后缀名，暂只支持.zip、.png等，不支持application/msword等值
+   */
+  extension?: string [];
   /**
    * 当accept为video时生效，是否压缩视频，默认为true
    * @default true
@@ -131,6 +162,11 @@ declare interface UploadProps {
   onDelete?: (index, file, name) => any
 }
 
+type ChooseFileParams = Pick<
+  UploadProps,
+  'accept' | 'multiple' | 'capture' | 'compressed' | 'maxDuration' | 'sizeType' | 'camera' | 'maxCount' | 'extension'
+>;
+
 declare interface UploadSlots {
   /**
    * 自定义上传样式
@@ -147,6 +183,11 @@ declare interface _UploadRef {
    * 读取前的处理函数
    */
   beforeRead: (file, lists, name) => any
+  /**
+   * 触发文件选择器
+   */
+  chooseFile(params: ChooseFileParams & { multiple: true }): Promise<FileInfo[]>;
+  chooseFile(params?: ChooseFileParams & { multiple?: false }): Promise<FileInfo>;
 }
 
 declare interface _Upload {
diff --git a/uview-plus/types/func.d.ts b/uview-plus/types/func.d.ts
new file mode 100644
index 0000000..1ec2918
--- /dev/null
+++ b/uview-plus/types/func.d.ts
@@ -0,0 +1,317 @@
+export interface RouteParam {
+  type: "navigateTo" | "redirect" | "switchTab" | "reLaunch" | "navigateBack";
+  /** 路由地址 */
+  url: string;
+  /** navigateBack页面后退时,回退的层数 */
+  delta?: number;
+  /** 传递的参数 */
+  params?: {};
+  /** 窗口动画,只在APP有效 */
+  animationType?: string;
+  /** 窗口动画持续时间,单位毫秒,只在APP有效 */
+  animationDuration?: number;
+  /** 是否需要拦截 */
+  intercept?: boolean;
+}
+
+export interface test {
+  /** 邮箱格式校验 */
+  email(email: string): boolean;
+  /** 手机号校验 */
+  mobile(phone: number): boolean;
+  /** url路径验证 */
+  url(value: string): boolean;
+  /** 验证日期格式 */
+  date(value: string | number): boolean;
+  /** 验证ISO类型的日期格式 YYYY-MM-DD | YYYY/MM/DD */
+  dateISO(value: string): boolean;
+  /** 验证十进制数字 */
+  number(value: number): boolean;
+  /** 验证字符串 */
+  string(value: string): boolean;
+  /** 验证整数 */
+  digits(value: number): boolean;
+  /** 验证身份证号码 */
+  idCard(value: string | number): boolean;
+  /** 是否车牌号 */
+  carNo(value: string): boolean;
+  /** 金额,只允许2位小数 */
+  amount(value: string | number): boolean;
+  /** 校验是否是中文 */
+  chinese(value: any): boolean;
+  /** 校验是否是字母 */
+  letter(value: any): boolean;
+  /** 校验字母或者数字 */
+  enOrNum(value: any): boolean;
+  /** 验证是否包含某个值 */
+  contains(source: string, value: string): boolean;
+  /** 验证一个值范围[min, max] */
+  range(value: string, between: number[]): boolean;
+  /** 验证一个长度范围[min, max] */
+  rangeLength(value: string, between: number[]): boolean;
+  /** 是否固定电话 */
+  landline(value: string | number): boolean;
+  /** 判断是否为空 */
+  empty(value: string | number | undefined | boolean | object | null): boolean;
+  /** 是否json字符串 */
+  jsonString(value: string): boolean;
+  /** 是否数组 */
+  array(value: any): boolean;
+  /** 是否对象 */
+  object(value: any): boolean;
+  /** 是否短信验证码 */
+  code(value: any, len: number): boolean;
+  /** 是否函数方法 */
+  func(value: any): boolean;
+  /** 是否promise对象 */
+  promise(value: any): boolean;
+  /** 是否图片格式 */
+  image(value: string): boolean;
+  /** 是否视频格式 */
+  video(value: string): boolean;
+  /** 是否为正则对象 */
+  regExp(value: any): boolean;
+}
+
+export interface Func {
+  /**
+   * 此方法用于限制value的大小
+   * - 如果其在min和max之间，则不变；
+   * - 如果其小于min，则取min值；
+   * - 如果其大于max，则取max值。
+   * @param min 最小值，默认 0
+   * @param max 最大值，默认 0
+   * @param value 当前值，默认 0
+   */
+  range(min?: number, max?: number, value?: number): number;
+
+  /**
+   * 用于获取用户传递值的px值
+   * - 如果用户传递了number，直接返回
+   * - 如果用户传递了"xxpx"或者"xxrpx"，取出其数值部分
+   * - 如果是"xxxrpx"还需要用过uni.rpx2px进行转换
+   * @param value 数值或带单位的字符串
+   * @param unit 是否返回带 px 的字符串
+   */
+  getPx(value: number | string, unit?: boolean): number | string;
+
+  /**
+   * 用于统一rpx2px方法，因uni-app现有API未统一。
+   * @param value rpx 值
+   */
+  rpx2px(value: number): number;
+
+  /**
+   * 进行延时，以达到可以简写代码的目的 比如: await uni.$u.sleep(20)将会阻塞20ms
+   * @param value 延时时间（ms），默认 30
+   */
+  sleep(value?: number): Promise<void>;
+
+  /**
+   * 运行期判断平台
+   * @returns 平台名称（小写）
+   * @link 运行期判断平台 https://uniapp.dcloud.io/frame?id=判断平台
+   */
+  os(): string;
+
+  /**
+   * 获取系统信息（同步）
+   * @link 获取系统信息同步接口 https://uniapp.dcloud.io/api/system/info?id=getsysteminfosync
+   */
+  sys(): UniApp.GetSystemInfoResult;
+
+  /**
+   * 获取一个区间内的随机整数
+   * @param min 最小值
+   * @param max 最大值
+   */
+  random(min: number, max: number): number;
+
+  /**
+   * 生成 uuid
+   * @param len uuid 长度，默认 32
+   * @param firstU 是否以 u 开头，默认 true
+   * @param radix 生成uuid的基数(意味着返回的字符串都是这个基数),2-二进制,8-八进制,10-十进制,16-十六进制
+   */
+  guid(len?: number, firstU?: boolean, radix?: number | null): string;
+
+  /**
+   * 获取父组件的参数，因为支付宝小程序不支持provide/inject的写法
+   *  this.$parent在非H5中，可以准确获取到父组件，但是在H5中，需要多次this.$parent.$parent.xxx
+   * 这里默认值等于undefined有它的含义，因为最顶层元素(组件)的$parent就是undefined，意味着不传name
+   * 值(默认为undefined)，就是查找最顶层的$parent
+   * @param name 父组件 name
+   */
+  $parent(this: any, name?: string): any | false;
+
+  /**
+   * 样式转换
+   * - string → object
+   * - object → string
+   * @param customStyle 样式字符串或对象
+   * @param target 转换的目的，object-转为对象，string-转为字符串
+   */
+  addStyle(
+    customStyle: Record<string, any> | string,
+    target?: "object" | "string"
+  ): Record<string, any> | string;
+
+  /**
+   * 添加单位，如果有rpx，upx，%，px等单位结尾或者值为auto，直接返回，否则加上px单位结尾
+   * @param value 值（数字 / auto / 字符串）
+   * @param unit 单位，默认使用 config.unit
+   */
+  addUnit(value?: string | number, unit?: string): string;
+
+  /**
+   * 深度克隆
+   * @param obj 需要深度克隆的对象
+   */
+  deepClone<T extends object>(obj: T): T;
+
+  /**
+   * 深度合并对象
+   * @param target 需要拷贝的对象
+   * @param source 拷贝的来源对象
+   * @returns {object|boolean} 深度合并后的对象或者false（入参有不是对象）
+   */
+  deepMerge<T extends object, U extends object>(
+    target: T,
+    source: U
+  ): (T & U) | false;
+
+  /**
+   * JS对象深度合并
+   * @param {object} target 需要拷贝的对象
+   * @param {object} source 拷贝的来源对象
+   * @returns {object|boolean} 深度合并后的对象或者false（入参有不是对象）
+   */
+  shallowMerge<T extends object, U extends object>(
+    target: T,
+    source: U
+  ): (T & U) | false;
+
+  /**
+   * 打乱数组
+   * @param array 原数组
+   */
+  randomArray<T>(array: T[]): T[];
+
+  /**
+   * 时间格式化
+   * @param dateTime 时间戳 / 字符串
+   * @param formatStr fmt 格式化规则 yyyy:mm:dd|yyyy:mm|yyyy年mm月dd日|yyyy年mm月dd日 hh时MM分等,可自定义组合 默认yyyy-mm-dd
+   */
+  timeFormat(dateTime?: string | number | null, formatStr?: string): string;
+
+  /**
+   * 时间转“多久之前”
+   * @param timestamp 时间戳
+   * @param format 格式化规则如果为时间格式字符串，超出一定时间范围，返回固定的时间格式；如果为布尔值false，无论什么时间，都返回多久以前的格式
+   */
+  timeFrom(timestamp?: string | number | null, format?: string | false): string;
+
+  /**
+   * 去除空格
+   * @param str 原字符串
+   * @param pos 去除位置
+   */
+  trim(str: string, pos?: "both" | "left" | "right" | "all"): string;
+
+  /**
+   * 对象转 URL 参数
+   * @param data 参数对象
+   * @param isPrefix 是否自动加上"?"
+   * @param arrayFormat 数组格式
+   */
+  queryParams(
+    data?: Record<string, any>,
+    isPrefix?: boolean,
+    arrayFormat?: "indices" | "brackets" | "repeat" | "comma"
+  ): string;
+
+  /**
+   * 显示消息提示框
+   * @param title 提示内容
+   * @param duration 持续时间
+   */
+  toast(title: string, duration?: number): void;
+
+  /**
+   * 数字格式化
+   * @param number 要格式化的数字
+   * @param decimals 保留几位小数
+   * @param decimalPoint 小数点符号
+   * @param thousandsSeparator 千分位符号
+   * @returns 格式化后的数字
+   */
+  priceFormat(
+    number: string | number,
+    decimals?: number,
+    decimalPoint?: string,
+    thousandsSeparator?: string
+  ): string;
+
+  /**
+   * 生成同色系浅色背景
+   * @param textColor 文本颜色
+   * @param lightness 亮度百分比
+   */
+  genLightColor(textColor: string, lightness?: number): string;
+
+  /**
+   * 防抖函数
+   * @param func 触发回调执行的函数
+   * @param wait 时间间隔，单位ms
+   * @param immediate 在开始还是结束处触发，如非特殊情况，一般默认为false即可
+   */
+  debounce(
+    func: (...rest: any[]) => any,
+    wait?: number,
+    immediate?: boolean
+  ): void;
+
+  /**
+   * 节流函数
+   * @param func 触发回调执行的函数
+   * @param wait 时间间隔，单位ms
+   * @param immediate 在开始还是结束处触发，如非特殊情况，一般默认为false即可
+   */
+  throttle(
+    func: (...rest: any[]) => any,
+    wait?: number,
+    immediate?: boolean
+  ): void;
+
+  /**
+   * 求两个颜色之间的渐变值
+   * @param {string} startColor 开始的颜色
+   * @param {string} endColor 结束的颜色
+   * @param {number} step 颜色等分的份额
+   */
+  colorGradient(startColor: string, endColor: string, step: number): any[];
+
+  /**
+   * 将hex表示方式转换为rgb
+   * @param color "#000000"-> "rgb(0,0,0)" | "rgb(0,0,0)" -> "#000000"
+   * @param str 是否返回颜色数组 true -> 不返回
+   * @returns
+   */
+  hexToRgb(color: string, str?: boolean): any[];
+
+  /**
+   * 将rgb表示方式转换为hex
+   */
+  rgbToHex(color: string): string;
+
+  /**
+   * 十六进制转换为rgb或rgba
+   * @param color
+   * @param alpha 透明度
+   * @returns  rgba（255，255，255，0.5）字符串
+   */
+  colorToRgba(color: string, alpha: number): string;
+
+  /** 路由跳转 */
+  route(url: string | RouteParam): void;
+}
diff --git a/uview-plus/types/index.d.ts b/uview-plus/types/index.d.ts
index 62528cd..bd643cf 100644
--- a/uview-plus/types/index.d.ts
+++ b/uview-plus/types/index.d.ts
@@ -1,84 +1,51 @@
 /// <reference path="./comps.d.ts" />
+type Func = import('./func').Func
 declare module 'uview-plus' {
-	export function install(): void  //必要
-	interface test {
-		/** 邮箱格式校验 */
-		email(email: string): boolean
-		/** 手机号校验 */
-		mobile(phone: number): boolean;
-		/** url路径验证 */
-		url(value: string): boolean;
-		/** 验证日期格式 */
-		date(value: string | number): boolean;
-		/** 验证ISO类型的日期格式 YYYY-MM-DD | YYYY/MM/DD */
-		dateISO(value: string): boolean;
-		/** 验证十进制数字 */
-		number(value: number): boolean;
-		/** 验证字符串 */
-		string(value: string): boolean;
-		/** 验证整数 */
-		digits(value: number): boolean;
-		/** 验证身份证号码 */
-		idCard(value: string | number): boolean;
-		/** 是否车牌号 */
-		carNo(value: string): boolean;
-		/** 金额,只允许2位小数 */
-		amount(value: string | number): boolean;
-		/** 校验是否是中文 */
-		chinese(value: any): boolean;
-		/** 校验是否是字母 */
-		letter(value: any): boolean;
-		/** 校验字母或者数字 */
-		enOrNum(value: any): boolean;
-		/** 验证是否包含某个值 */
-		contains(source: string, value: string): boolean;
-		/** 验证一个值范围[min, max] */
-		range(value: string, between: number[]): boolean;
-		/** 验证一个长度范围[min, max] */
-		rangeLength(value: string, between: number[]): boolean;
-		/** 是否固定电话 */
-		landline(value: string | number): boolean;
-		/** 判断是否为空 */
-		empty(value: string | number | undefined | boolean | object | null): boolean;
-		/** 是否json字符串 */
-		jsonString(value: string): boolean;
-		/** 是否数组 */
-		array(value: any): boolean;
-		/** 是否对象 */
-		object(value: any): boolean;
-		/** 是否短信验证码 */
-		code(value: any, len: number): boolean;
-		/** 是否函数方法 */
-		func(value: any): boolean;
-		/** 是否promise对象 */
-		promise(value: any): boolean;
-		/** 是否图片格式 */
-		image(value: string): boolean;
-		/** 是否视频格式 */
-		video(value: string): boolean;
-		/** 是否为正则对象 */
-		regExp(value: any): boolean;
-	}
-	interface RouteParam {
-		type: 'navigateTo' | 'redirect' | 'switchTab' | 'reLaunch' | 'navigateBack';
-		/** 路由地址 */
-		url: string;
-		/** navigateBack页面后退时,回退的层数 */
-		delta?: number;
-		/** 传递的参数 */
-		params?: {};
-		/** 窗口动画,只在APP有效 */
-		animationType?: string;
-		/** 窗口动画持续时间,单位毫秒,只在APP有效 */
-		animationDuration?: number;
-		/** 是否需要拦截 */
-		intercept?: boolean;
-	}
+  export function install(
+    vm: import('vue').App,
+    upuiParams?: () => {
+      httpIns?: (http: HttpRequest) => void;
+      options?: Partial<GlobalConfig>;
+    }
+  ): void; //必要
+	type test = import('./func').test
+	type RouteParam = import('./func').RouteParam
+	type HttpRequest = InstanceType<typeof import('../libs/luch-request')['default']>
 	interface Config {
 		v: string;
 		version: string;
 		color: Partial<Color>;
-		unit: 'px' | 'rpx'
+		/**
+		 * - 修改默认单位，相当于执行 uni.$u.config.unit = 'rpx'
+		 * - 组件的很多单位仍然为px并非配置不生效，而是rpx配置目前无法做到修改Vue单文件组件中的Css/Sass中写死的px单位。
+		 * - 这个配置主要用于prop传参时的单位修改，比如<up-image width="80"></up-image>中的80会是rpx单位。
+		 * - 如果需要全局组件样式变为rpx，可以尝试使用postcss等第三方插件转换。
+		 * @default 'px'
+		 */
+		unit: 'px' | 'rpx';
+		/** 
+		 * 只加载一次字体图标
+		 * @default false
+		 */
+		loadFontOnce: boolean;
+		/** 
+		 * 扩充自定义字体图标
+		 * @version 3.4.14
+		 */
+		customIcon: {
+			/** 字体族名称 */
+			family: string;
+			/** ttf文件远程链接 */
+			url: string;
+		};
+		/** 
+		 * unicode映射表，为了更直观书写，语义更明确
+		 * - 如'light-mode': '\ue66c'
+		 * - <up-icon customPrefix="xyicon" name="light-mode"></up-icon>
+		 */
+		customIcons: {
+			[key: string]: string
+		}
 	}
 	interface Color {
 		primary: string,
@@ -97,36 +64,10 @@ declare module 'uview-plus' {
 		config: Partial<Config>;
 		props: {};
 	}
-	interface $u {
-		route: (url: string | RouteParam) => void;
-		/**
-		  * 求两个颜色之间的渐变值
-		  * @param {string} startColor 开始的颜色
-		  * @param {string} endColor 结束的颜色
-		  * @param {number} step 颜色等分的份额
-		  */
-		colorGradient: (startColor: string, endColor: string, step: number) => any[];
-		/**
-		 * 将hex表示方式转换为rgb
-		 * @param color "#000000"-> "rgb(0,0,0)" | "rgb(0,0,0)" -> "#000000"
-		 * @param str 是否返回颜色数组 true -> 不返回
-		 * @returns 
-		 */
-		hexToRgb: (color: string, str?: boolean) => any[];
-		/**
-		 * 将rgb表示方式转换为hex
-		 */
-		rgbToHex: (color: string) => string;
-		/**
-		 * 十六进制转换为rgb或rgba
-		 * @param color 
-		 * @param alpha 透明度
-		 * @returns  rgba（255，255，255，0.5）字符串
-		 */
-		colorToRgba: (color: string, alpha: number) => string;
+	interface $u extends Func {
 		test: test;
 		type: {},
-		http: {},
+		http: HttpRequest,
 		config: Config;
 		zIndex: {
 			toast: number;
@@ -139,8 +80,6 @@ declare module 'uview-plus' {
 			sticky: number;
 			indexListSticky: number;
 		},
-		debounce: (func, wait, immediate) => void;
-		throttle: (func, wait, immediate) => void;
 		mixin: {},
 		mpMixin: {},
 		props: {},
@@ -149,6 +88,35 @@ declare module 'uview-plus' {
 	}
 
 	export function setConfig(config: Partial<GlobalConfig>): void;
+	// 可单独导入使用,也可以在 uni.$u 中使用
+	export const test: $u['test']
+	export const http: $u['http']
+	export const config: $u['config']
+	export const platform: $u['platform']
+	export const range: $u['range']
+	export const getPx: $u['getPx']
+	export const rpx2px: $u['rpx2px']
+	export const sleep: $u['sleep']
+	export const os: $u['os']
+	export const sys: $u['sys']
+	export const random: $u['random']
+	export const guid: $u['guid']
+	export const addStyle: $u['addStyle']
+	export const addUnit: $u['addUnit']
+	export const timeFormat: $u['timeFormat']
+	export const timeFrom: $u['timeFrom']
+	export const trim: $u['trim']
+	export const queryParams: $u['queryParams']
+	export const toast: $u['toast']
+	export const priceFormat: $u['priceFormat']
+	export const genLightColor: $u['genLightColor']
+	export const debounce: $u['debounce']
+	export const throttle: $u['throttle']
+	export const colorGradient: $u['colorGradient']
+	export const hexToRgb: $u['hexToRgb']
+	export const rgbToHex: $u['rgbToHex']
+	export const colorToRgba: $u['colorToRgba']
+	export const route: $u['route']
 
 	global {
 		interface Uni {