diff --git a/common/api/market/birthdayGift.js b/common/api/market/birthdayGift.js
new file mode 100644
index 0000000..96b3a8e
--- /dev/null
+++ b/common/api/market/birthdayGift.js
@@ -0,0 +1,11 @@
+// 引入 request 文件
+import request from "@/common/api/request.js";
+import { prveUrl } from "./config.js";
+
+export const config = (data) => {
+  return request({
+    url: prveUrl + "/user/birthdayGift",
+    method: "get",
+    data: data,
+  });
+};
diff --git a/common/api/market/discountActivity.js b/common/api/market/discountActivity.js
new file mode 100644
index 0000000..443b867
--- /dev/null
+++ b/common/api/market/discountActivity.js
@@ -0,0 +1,11 @@
+// 引入 request 文件
+import request from "@/common/api/request.js";
+import { prveUrl } from "./config.js";
+
+export const config = (data) => {
+  return request({
+    url: prveUrl + "/user/discountActivity",
+    method: "get",
+    data: data,
+  });
+};
diff --git a/common/api/market/distribution.js b/common/api/market/distribution.js
new file mode 100644
index 0000000..7ad74cc
--- /dev/null
+++ b/common/api/market/distribution.js
@@ -0,0 +1,149 @@
+// 引入 request 文件
+import request from "@/common/api/request.js";
+import { prveUrl } from "./config.js";
+
+export const pay = (data) => {
+  let platformType = "";
+  let payType = "";
+  // #ifdef APP-PLUS
+  platformType = "APP";
+  // #endif
+  // #ifdef H5
+  platformType = "H5";
+  // #endif
+  // #ifdef MP-WEIXIN
+  platformType = "WX";
+  platformType = "wechat";
+  payType = "wechatPay";
+  // #endif
+  // #ifdef MP-ALIPAY
+  platformType = "alipay";
+  payType = "aliPay";
+  // #endif
+
+
+  return request({
+    url: prveUrl + "/user/distribution/pay",
+    method: "post",
+    data: { platformType, payType, ...data },
+  });
+};
+
+export const centerUser = (data) => {
+  return request({
+    url: prveUrl + "/user/distribution/centerUser",
+    method: "post",
+    data: data,
+  });
+};
+export const activates = (data) => {
+  return request({
+    url: prveUrl + "/user/distribution/centerUser/activates",
+    method: "get",
+    data: data,
+  });
+};
+export const unActivates = (data) => {
+  return request({
+    url: prveUrl + "/user/distribution/centerUser/unActivates",
+    method: "get",
+    data: data,
+  });
+};
+export const centerConfig = (data) => {
+  return request({
+    url: prveUrl + "/user/distribution/centerConfig",
+    method: "get",
+    data: data,
+  });
+};
+
+
+// 绑定邀请用户
+export const bindInviteUser = (data) => {
+  return request({
+    url: prveUrl + "/user/distribution/bindInviteUser",
+    method: "post",
+    data: data,
+  });
+};
+
+export const childUser = (data) => {
+  return request({
+    url: prveUrl + "/user/distribution/childUser",
+    method: "get",
+    data: data,
+  });
+};
+export const inviteUser = (data) => {
+  return request({
+    url: prveUrl + "/user/distribution/inviteUser",
+    method: "get",
+    data: data,
+  });
+};
+
+// 提现
+export const withdraw = (data) => {
+  return request({
+    url: prveUrl + "/user/distribution/withdraw",
+    method: "post",
+    data: data,
+  });
+};
+
+// 提现详情
+export const withdrawDetail = (data) => {
+  return request({
+    url: prveUrl + "/user/distribution/withdraw/detail",
+    method: "get",
+    data: data,
+  });
+};
+//提现记录
+export const withdrawFlow = (data) => {
+  return request({
+    url: prveUrl + "/user/distribution/withdraw/flow",
+    method: "get",
+    data: data,
+  });
+};
+
+// 实名认证
+export const realNameAuth = (data) => {
+  return request({
+    url: prveUrl + "/user/distribution/realNameAuth",
+    method: "post",
+    data: data,
+  });
+};
+
+
+// 收益明细
+export const getIncomeDetails = (data) => {
+  return request({
+    url: prveUrl + "/user/distribution/distributionFlow",
+    method: "get",
+    data: data,
+  });
+};
+
+// 获取邀请码
+export const getInviteCode = (data) => {
+  return request({
+    url: prveUrl + "/user/distribution/getInviteCode",
+    method: "get",
+    data: data,
+  });
+};
+
+// 获取配置
+export const getConfig = (data) => {
+  return request({
+    url: prveUrl + "/user/distribution/getConfig",
+    method: "get",
+    data: data,
+  });
+};
+
+
diff --git a/common/api/market/drainageConfig.js b/common/api/market/drainageConfig.js
new file mode 100644
index 0000000..c25d08a
--- /dev/null
+++ b/common/api/market/drainageConfig.js
@@ -0,0 +1,11 @@
+// 引入 request 文件
+import request from "@/common/api/request.js";
+import { prveUrl } from "./config.js";
+
+export const config = (data) => {
+  return request({
+    url: prveUrl + "/user/drainageConfig",
+    method: "get",
+    data: data,
+  });
+};
diff --git a/common/api/market/exchange.js b/common/api/market/exchange.js
new file mode 100644
index 0000000..5ec7b26
--- /dev/null
+++ b/common/api/market/exchange.js
@@ -0,0 +1,18 @@
+// 引入 request 文件
+import request from '@/common/api/request.js'
+import {prveUrl} from './config.js'
+
+export const exchange = (data) => {
+    return request({
+        url: prveUrl + '/user/redemption/exchange',
+        method: 'post',
+        data: data
+    })
+}
+export const redemption = (data) => {
+    return request({
+        url: prveUrl + '/user/redemption',
+        method: 'get',
+        data: data
+    })
+}
diff --git a/common/api/market/limitTimeDiscount.js b/common/api/market/limitTimeDiscount.js
new file mode 100644
index 0000000..9d861d0
--- /dev/null
+++ b/common/api/market/limitTimeDiscount.js
@@ -0,0 +1,11 @@
+// 引入 request 文件
+import request from '@/common/api/request.js'
+import {prveUrl} from './config.js'
+
+export const getConfig = (data) => {
+    return request({
+        url: prveUrl + '/user/limitTimeDiscount',
+        method: 'get',
+        data: data
+    })
+}
diff --git a/common/api/market/suggest.js b/common/api/market/suggest.js
new file mode 100644
index 0000000..a478c40
--- /dev/null
+++ b/common/api/market/suggest.js
@@ -0,0 +1,11 @@
+// 引入 request 文件
+import request from '@/common/api/request.js'
+import {prveUrl} from './config.js'
+
+export const getGoods = (data) => {
+    return request({
+        url: prveUrl + '/user/suggest',
+        method: 'get',
+        data: data
+    })
+}
diff --git a/common/api/order/index.js b/common/api/order/index.js
index 173a445..a500f17 100644
--- a/common/api/order/index.js
+++ b/common/api/order/index.js
@@ -135,4 +135,18 @@ export const rechargePayOrder = (data) => {
 			...data
 		}
 	})
-}
\ No newline at end of file
+}
+
+//分销员支付订单
+export const distributionLtPayOrder = (data) => {
+	return request({
+		url: url + '/pay/distribution/ltPayOrder',
+		method: 'post',
+		data: {
+			platformType,
+			payType,
+			openId: uni.cache.get('userInfo').wechatOpenId,
+			...data
+		}
+	})
+}
diff --git a/common/api/request.js b/common/api/request.js
index 6e62009..adda8b2 100644
--- a/common/api/request.js
+++ b/common/api/request.js
@@ -1,120 +1,138 @@
 export default (params) => {
-	let url = params.url;
-	let method = params.method || "get";
-	let data = params.data || {};
-	let type = params.type || 1;
-	let toast = params.toast || true;
-	let token=uni.cache.get('token') || '';
-	const shopId=uni.cache.get('shopId')*1;
-	const userInfo=uni.cache.get('userInfo')||{};
-	// #ifdef H5
-	token="21f0a0b10e1d40ce9c6464037fedb792"
-	// #endif
-	let header = {
-		version: uni.conf.version,
-		type: uni.getSystemInfoSync().platform,
-		// #ifdef APP-PLUS
-		platformType: 'APP',
-		// #endif
-		// #ifdef H5
-		platformType: 'H5',
-		// #endif
-		// #ifdef MP-WEIXIN
-		platformType: 'WX',
-		// #endif
-		// #ifdef MP-ALIPAY
-		platformType: 'ALI',
-		// #endif
-		token,
-		id: userInfo.id || '',
-		shopId:shopId  || '',
-		userId: userInfo.id || '',
-	}
-	if (toast) {
-		uni.showLoading({
-			title: '加载中',
-			mask: true
-		})
-	}
-	return new Promise((resolve, reject) => {
-		const timeoutDuration = params.timeout || 10000; // 可以通过 params 传入超时时间，默认 10 秒
-		uni.request({
-			url: uni.conf.baseUrl + url,
-			method: method,
-			header: header,
-			data: data,
-			timeout: timeoutDuration,
-			success(response) {
-				const res = response.data
-				// 根据返回的状态码做出对应的操作
-				//获取成功
-				if (res.code == 200) {
-					uni.hideLoading();
-					uni.hideToast();
-					resolve(res.data ? res.data : true);
-				} else {
-					switch (res.code) {
-						case '501':
-							uni.cache.remove('shopId')
-							// uni.showToast({
-							// 	title: '',
-							// 	icon: "none",
-							// 	success: () => {
+  let url = params.url;
+  let method = params.method || "get";
+  let data = params.data || {};
+  let type = params.type || 1;
+  let toast = params.toast || true;
+  let token = uni.cache.get("token") || "";
+  const shopId = uni.cache.get("shopId") * 1;
+  const userInfo = uni.cache.get("userInfo") || {};
+  // #ifdef H5
+  token = "21f0a0b10e1d40ce9c6464037fedb792";
+  // #endif
+  let header = {
+    version: uni.conf.version,
+    type: uni.getSystemInfoSync().platform,
+    // #ifdef APP-PLUS
+    platformType: "APP",
+    // #endif
+    // #ifdef H5
+    platformType: "H5",
+    // #endif
+    // #ifdef MP-WEIXIN
+    platformType: "WX",
+    // #endif
+    // #ifdef MP-ALIPAY
+    platformType: "ALI",
+    // #endif
+    token,
+    id: userInfo.id || "",
+    shopId: shopId || "",
+    userId: userInfo.id || "",
+  };
+  if (toast) {
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+  }
+  return new Promise((resolve, reject) => {
+    const timeoutDuration = params.timeout || 10000; // 可以通过 params 传入超时时间，默认 10 秒
+    uni.request({
+      url: uni.conf.baseUrl + url,
+      method: method,
+      header: header,
+      data: data,
+      timeout: timeoutDuration,
+      success(response) {
+        const res = response.data;
+        // 根据返回的状态码做出对应的操作
+        //获取成功
+        if (res.code == 200) {
+          uni.hideLoading();
+          uni.hideToast();
+          resolve(res.data ? res.data : true);
+        } else {
+          switch (res.code) {
+            case "501":
+              uni.cache.remove("shopId");
+              // uni.showToast({
+              // 	title: '',
+              // 	icon: "none",
+              // 	success: () => {
 
-							// 	}
-							// })
-							setTimeout(() => {
-								uni.reLaunch({
-									url: "/pages/index/index",
-								})
-							}, 1000);
-							break;
-						case 404:
-							uni.showToast({
-								title: '请求地址不存在...',
-								duration: 2000,
-							})
-							break;
-						default:
-							// 是否提示
-							if (toast) {
-								uni.showToast({
-									title: res.message || res.msg || res.error,
-									icon: "none",
-									success: () => {
-										setTimeout(res => {
-											reject(false);
-										}, 1000)
-									}
-								})
-							}
-							break;
-					}
-				}
-			},
-			fail(err) {
-				if (err.errMsg.indexOf('request:fail') !== -1) {
-					if (err.errMsg.indexOf('timeout') !== -1) {
-						if (toast) {
-							uni.showToast({
-								title: `请求超时，请稍后重试`,
-								icon: "error",
-								duration: 2000
-							});
-						}
-					}
-				}
-				reject(err);
-			},
-			complete() {
-				// 不管成功还是失败都会执行
-				setTimeout(res => {
-					uni.hideLoading();
-					uni.hideToast();
-				}, 10000)
-
-			}
-		});
-	}).catch((e) => {
-	});
-};
\ No newline at end of file
+              // 	}
+              // })
+              setTimeout(() => {
+                uni.reLaunch({
+                  url: "/pages/index/index",
+                });
+              }, 1000);
+              break;
+            case 404:
+              uni.showToast({
+                title: "请求地址不存在...",
+                duration: 2000,
+              });
+              break;
+            default:
+              // 是否提示
+              if (toast) {
+                uni.showToast({
+                  title: (() => {
+                    // 1. 获取原始提示文本（兜底空字符串避免报错）
+                    const originMsg = res.message || res.msg || res.error || "";
+                    // 2. 定义要匹配的前缀
+                    const exceptionPrefix = "Exception:";
+                    // 3. 判断是否包含目标前缀
+                    if (originMsg.includes(exceptionPrefix)) {
+                      // 截取前缀后的内容 → 去除首尾空格 → 限制最大20个字符
+                      return originMsg
+                        .slice(
+                          originMsg.indexOf(exceptionPrefix) +
+                            exceptionPrefix.length
+                        )
+                        .trim()
+                        .slice(0, 20);
+                    } else {
+                      // 不包含则按原逻辑截取前20个字符
+                      return originMsg.slice(0, 20);
+                    }
+                  })(),
+                  icon: "none",
+                  success: () => {
+                    // 修复：去掉多余的 res 参数（避免覆盖外层 res）
+                    setTimeout(() => {
+                      reject(false);
+                    }, 1000);
+                  },
+                });
+              }
+              break;
+          }
+        }
+      },
+      fail(err) {
+        if (err.errMsg.indexOf("request:fail") !== -1) {
+          if (err.errMsg.indexOf("timeout") !== -1) {
+            if (toast) {
+              uni.showToast({
+                title: `请求超时，请稍后重试`,
+                icon: "error",
+                duration: 2000,
+              });
+            }
+          }
+        }
+        reject(err);
+      },
+      complete() {
+        // 不管成功还是失败都会执行
+        setTimeout((res) => {
+          uni.hideLoading();
+          uni.hideToast();
+        }, 10000);
+      },
+    });
+  }).catch((e) => {});
+};
diff --git a/common/config.js b/common/config.js
new file mode 100644
index 0000000..7c72342
--- /dev/null
+++ b/common/config.js
@@ -0,0 +1,54 @@
+// const debug = process.env.NODE_ENV == 'development' ? true : false;
+const debug = true;
+// #ifdef H5
+const proxyApi = "/api";
+// #endif
+
+// #ifdef MP-WEIXIN || APP || MP-ALIPAY
+const proxyApi = "http://192.168.1.42"; // 调试地址
+const proxyApiwws = "ws://192.168.1.42:2348"; // 调试地址
+// #endif
+
+// #ifdef H5
+const baseUrl = debug ? proxyApi : "http://192.168.1.42";
+const baseUrlwws = "ws://192.168.1.42:2348";
+// #endif
+
+// #ifdef APP || MP-WEIXIN || MP-ALIPAY
+const baseUrl = debug ? proxyApi : "https://cashier.sxczgkj.com"; // 线上
+const baseUrlwws = debug ? proxyApiwws : "wss://czgeatws.sxczgkj.com/wss"; // 线上
+// #endif
+
+const version = "100";
+const autoRemoveCache = {
+  count: 100000,
+  size: 100000,
+};
+ uni.conf = {
+  debug,
+  baseUrl,
+  version,
+  autoRemoveCache,
+  baseUrlwws,
+};
+
+export const changeEnv = (env) => {
+  if (env === "test") {
+    uni.conf = {
+      debug: true,
+      baseUrl: "http://192.168.1.42",
+      version: 100,
+      autoRemoveCache,
+      baseUrlwws: "ws://192.168.1.42:2348",
+    };
+  }
+  if (env === "prod") {
+    uni.conf = {
+      debug: false,
+      baseUrl: "https://cashier.sxczgkj.com",
+      version: 100,
+      autoRemoveCache,
+      baseUrlwws: "wss://czgeatws.sxczgkj.com/wss",
+    };
+  }
+};
diff --git a/common/css/common.scss b/common/css/common.scss
index 349114d..eee4645 100644
--- a/common/css/common.scss
+++ b/common/css/common.scss
@@ -74,6 +74,9 @@ page,
 	.font-700{
 		font-weight: 700;
 	}
+	.font-bold{
+		font-weight: 700;
+	}
 	.font-14{
 		font-size: 14px;
 	}
@@ -94,4 +97,22 @@ page,
 	}
 	.u-col-center{
 		align-items: center;
+	}
+	.justify-between{
+		justify-content: space-between;
+	}
+	.justify-center{
+		justify-content: center;
+	}
+	.u-flex-col{
+		flex-direction: column!important;
+	}
+	.min-h-100vh{
+		min-height: 100vh;
+	}
+	.bg-gray{
+		background-color: #F7F7F7;
+	}
+	.align-center{
+		align-items: center;
 	}
\ No newline at end of file
diff --git a/components/birthday-modal.vue b/components/birthday-modal.vue
new file mode 100644
index 0000000..0d8d86b
--- /dev/null
+++ b/components/birthday-modal.vue
@@ -0,0 +1,545 @@
+<template>
+  <view>
+    <up-popup
+      :show="show"
+      bgColor="transparent"
+      :safeAreaInsetBottom="false"
+      @close="close"
+      mode="center"
+    >
+      <view class="container">
+        <view
+          class="content"
+          :style="contentStyle"
+          :class="`content${currentPage}`"
+        >
+          <!-- 顶部标题图 -->
+          <view class="top">
+            <image class="image" :src="imageList.gift" mode="widthFix"></image>
+          </view>
+
+          <!-- 优惠券列表 -->
+          <view class="list">
+            <view
+              class="item"
+              :style="kuangStyle"
+              v-for="(item, index) in couponList"
+              :key="index"
+            >
+              <!-- <view class="kuang">
+                <image
+                  class="kuang-img"
+                  :src="imageList.kuang"
+                  mode="aspectFit"
+                ></image>
+              </view> -->
+              <!-- 优惠券金额 -->
+              <view>
+                <template
+                  v-if="
+                    item.couponInfo.couponType == 3 ||
+                    item.couponInfo.couponType == 1
+                  "
+                >
+                  <text class="big-title">{{
+                    returnTitle(item.couponInfo)
+                  }}</text>
+                  <text class="u-m-l-12 small-title">
+                    {{ returnSmallTitle(item.couponInfo) }}
+                  </text>
+                </template>
+                <template v-else>
+                  <text class="big-title" style="font-size: 48rpx">{{
+                    returnTitle(item.couponInfo)
+                  }}</text>
+                </template>
+              </view>
+              <!-- 优惠券名称与领取按钮 -->
+              <view class="u-flex u-row-between u-m-t-16">
+                <view>
+                  <text class="title">{{ item.couponInfo.title }}</text>
+                  <text class="num">x{{ item.num }}</text>
+                </view>
+                <button class="lingqu" @click="handleReceive(item)">
+                  立即领取
+                </button>
+              </view>
+              <!-- 有效期（替换硬编码，用接口返回数据） -->
+              <view class="u-m-t-10 time">
+                有效期至：{{ formatDate(item.couponInfo.validStartTime) }}-{{
+                  formatDate(item.couponInfo.validEndTime)
+                }}
+              </view>
+            </view>
+          </view>
+
+          <!-- 分页控制（左右箭头+页码） -->
+          <view
+            class="u-flex u-row-center u-m-t-16"
+            v-if="allCoupons.length > 3"
+          >
+            <!-- 左箭头：当前页>1可点击 -->
+            <view
+              @click="handlePrevPage"
+              class="page-arrow"
+              :class="{ disabled: currentPage === 1 }"
+            >
+              <up-icon
+                name="arrow-left"
+                size="12"
+                :color="currentPage === 1 ? '#999' : '#000'"
+              ></up-icon>
+            </view>
+            <!-- 页码列表：点击切换+当前页高亮 -->
+            <view class="u-flex page-nums">
+              <view
+                v-for="(num, index) in pageNums"
+                :key="index"
+                class="item"
+                :class="{ active: currentPage === num }"
+                @click="handleClickPage(num)"
+              >
+                {{ num }}
+              </view>
+            </view>
+            <!-- 右箭头：当前页<总页数可点击 -->
+            <view
+              @click="handleNextPage"
+              class="page-arrow"
+              :class="{ disabled: currentPage === totalPages }"
+            >
+              <up-icon
+                name="arrow-right"
+                size="12"
+                :color="currentPage === totalPages ? '#999' : '#000'"
+              ></up-icon>
+            </view>
+          </view>
+
+          <!-- 底部一键领取按钮 -->
+          <view class="btn-wrap" :class="{ 'u-m-t-18': allCoupons.length > 3 }">
+            <image
+              @click="handleReceiveAll"
+              class="btn-img"
+              :src="imageList.btn"
+              mode="widthFix"
+            ></image>
+          </view>
+        </view>
+      </view>
+    </up-popup>
+  </view>
+</template>
+  
+  <script setup>
+import _ from "lodash";
+import dayjs from "dayjs";
+import { onMounted, ref, reactive, computed } from "vue";
+import * as birthdayGiftApi from "@/common/api/market/birthdayGift.js";
+
+// 1. 分页核心配置
+const currentPage = ref(1); // 当前页码
+const pageSize = ref(3); // 每页显示条数
+const allCoupons = ref([]); // 存储全部优惠券（用于分页截取）
+const couponList = ref([]); // 当前页优惠券列表
+const pageNums = ref([]); // 页码数组（如[1,2,3]）
+const totalPages = computed(() => {
+  // 计算总页数：向上取整（如5条数据→2页）
+  return Math.ceil(allCoupons.value.length / pageSize.value);
+});
+
+// 2. 图片资源（修复bg2地址缺失的"g"）
+const imageList = reactive({
+  btn: "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/493b459f8c944057be72750c12c4cd1a.png",
+  gift: "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/112d2433378349b4a26ab311b8d3bac4.png",
+  kuang:
+    "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/bb5e2d5ed73c455d9b6e9b4ac0e86192.png",
+  bg1: "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/847f9aea44d64b15b35caf8967f3d63f.png",
+  bg2: "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/2f704eef2e3d484d8862673131ae3989.png", // 修复：.pn→.png
+  bg3: "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/7ab43d1ef2fc490d80165d18795a93f3.png",
+});
+
+// 3. 背景图（随当前页切换）
+const bgUrl = ref(imageList.bg1);
+const contentStyle = computed(() => ({
+  backgroundImage: `url(${bgUrl.value})`,
+  backgroundSize: "100% 100%", // 确保背景图铺满容器
+}));
+const kuangStyle = computed(() => ({
+  backgroundImage: `url(${imageList.kuang})`,
+}));
+
+// 4. 弹窗状态与props
+const show = ref(false);
+const props = defineProps({
+  getMode: {
+    type: String,
+    default: "eat",
+  },
+});
+
+// ---------------------- 分页核心逻辑 ----------------------
+/**
+ * 1. 生成页码数组（如总数据5条→[1,2]）
+ */
+const generatePageNums = () => {
+  pageNums.value = Array.from({ length: totalPages.value }, (_, i) => i + 1);
+};
+
+/**
+ * 2. 更新当前页优惠券列表（根据当前页截取数据）
+ */
+const updateCouponList = () => {
+  const startIdx = (currentPage.value - 1) * pageSize.value;
+  const endIdx = startIdx + pageSize.value;
+  couponList.value = allCoupons.value.slice(startIdx, endIdx);
+  // 同步切换背景图（当前页对应bg1/bg2/bg3）
+  bgUrl.value = imageList[`bg${currentPage.value}`] || imageList.bg1;
+};
+
+/**
+ * 3. 上一页切换
+ */
+const handlePrevPage = () => {
+  if (currentPage.value > 1) {
+    currentPage.value--;
+    updateCouponList();
+  }
+};
+
+/**
+ * 4. 下一页切换
+ */
+const handleNextPage = () => {
+  if (currentPage.value < totalPages.value) {
+    currentPage.value++;
+    updateCouponList();
+  }
+};
+
+/**
+ * 5. 点击页码切换
+ */
+const handleClickPage = (num) => {
+  currentPage.value = num;
+  updateCouponList();
+};
+
+// ---------------------- 数据与交互逻辑 ----------------------
+/**
+ * 1. 格式化日期（YYYY.MM.DD）
+ */
+const formatDate = (dateStr) => {
+  return dateStr ? dayjs(dateStr).format("YYYY.MM.DD") : ""; // 默认兜底日期
+};
+
+/**
+ * 2. 单个优惠券领取
+ */
+const handleReceive = async (item) => {
+  close();
+  uni.showToast({ title: "领取成功！去「我的优惠券」查看", icon: "none" });
+};
+
+/**
+ * 3. 底部一键领取（领取当前页所有优惠券）
+ */
+const handleReceiveAll = async () => {
+  if (couponList.value.length === 0) {
+    uni.showToast({ title: "当前页无优惠券可领", icon: "none" });
+    return;
+  }
+  close();
+  uni.showToast({ title: "领取成功！去「我的优惠券」查看", icon: "none" });
+};
+
+/**
+ * 4. 初始化获取优惠券数据
+ */
+const getCouponPopupAjax = async () => {
+  try {
+    const shopId = uni.cache.get("shopId");
+    const res = await birthdayGiftApi.config({ shopId });
+    if (res&&res.length) {
+      // 处理有效期格式（固定有效期规则）
+      allCoupons.value = res.map((item) => {
+        if (item.validType === "fixed") {
+          item.validStartTime = dayjs()
+            .add(item.daysToTakeEffect, "day")
+            .format("YYYY-MM-DD HH:mm:ss");
+          item.validEndTime = dayjs()
+            .add(+item.daysToTakeEffect + +item.validDays, "day")
+            .format("YYYY-MM-DD HH:mm:ss");
+        }
+        return item;
+      });
+      // 初始化分页：生成页码→更新列表→显示弹窗
+      generatePageNums();
+      updateCouponList();
+      show.value = true;
+    }else{
+        close();
+    }
+  } catch (error) {
+    console.error("获取优惠券失败：", error);
+  }
+};
+
+// 页面挂载时初始化
+onMounted(() => {
+  getCouponPopupAjax();
+});
+
+function returnTitle(coupon) {
+  if (coupon.couponType == 1) {
+    return `￥${coupon.discountAmount}`;
+  }
+  if (coupon.couponType == 2) {
+    return `商品兑换券`;
+  }
+  if (coupon.couponType == 3) {
+    const discountRate = coupon.discountRate / 10;
+    return `${discountRate}折券`;
+  }
+  if (coupon.couponType == 4) {
+    return `第二件半价券`;
+  }
+  if (coupon.couponType == 6) {
+    return `买一送一券`;
+  }
+}
+
+function returnSmallTitle(coupon) {
+  if (coupon.couponType == 1) {
+    return `满${coupon.fullAmount || 0}可用`;
+  }
+  if (coupon.couponType == 3) {
+    return `满${coupon.fullAmount || 0}可用`;
+  }
+}
+
+const emit = defineEmits(["close"]);
+
+function close() {
+  show.value = false;
+  emit("close");
+}
+</script>
+  
+<style scoped lang="scss">
+// 基础容器样式
+.container {
+  width: 100vw;
+  height: 100vh;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 52rpx;
+
+  .content {
+    width: 100%;
+    position: relative;
+    margin: auto;
+    min-height: 836rpx;
+    padding: 0 28rpx 62rpx;
+    border-radius: 16rpx;
+    overflow: hidden;
+
+    // 分页箭头样式（添加禁用态）
+    .page-arrow {
+      cursor: pointer;
+      width: 64rpx;
+      height: 64rpx;
+      box-sizing: border-box;
+      color: #000;
+      background-color: #fff;
+      border: 1px solid #d9d9d9;
+      font-size: 14px;
+      line-height: 60rpx;
+      padding: 0 14rpx;
+      border-radius: 4rpx;
+      overflow: hidden;
+      cursor: pointer;
+      transition: all 0.2s;
+      margin: 0 16rpx;
+      display: flex;
+      justify-content: center;
+      align-content: center;
+      &.disabled {
+        cursor: not-allowed;
+      }
+    }
+
+    // 页码样式（当前页高亮）
+    .page-nums {
+      display: flex;
+      gap: 16rpx;
+      .item {
+        width: 64rpx;
+        height: 64rpx;
+        box-sizing: border-box;
+        color: #000;
+        background-color: #fff;
+        border: 1px solid #d9d9d9;
+        font-size: 14px;
+        line-height: 64rpx;
+        padding: 0 4rpx;
+        border-radius: 4rpx;
+        overflow: hidden;
+        cursor: pointer;
+        transition: all 0.2s;
+        text-align: center;
+        &.active {
+          border-color: #1890ff;
+          color: #1890ff;
+          font-weight: 500;
+        }
+        &:active:not(.active) {
+          background-color: #f5f5f5;
+        }
+      }
+    }
+
+    // 底部按钮容器
+    .btn-wrap {
+      margin: 28rpx 0 0;
+      margin-top: 30rpx;
+      .btn-img {
+        width: 100%;
+        height: 100%;
+        cursor: pointer;
+        &:active {
+          opacity: 0.9;
+        }
+      }
+    }
+  }
+}
+
+// 顶部标题图
+.top {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  z-index: 1;
+  .image {
+    width: 100%;
+  }
+}
+
+// 优惠券列表样式
+.list {
+  margin-top: 332rpx;
+  position: relative;
+  z-index: 2;
+  .item {
+    position: relative;
+    padding: 32rpx 12rpx 36rpx 36rpx;
+    background-size: 100% 100%;
+    background-position: center;
+    overflow: hidden;
+    margin-top: 36rpx;
+    box-sizing: border-box;
+
+    // 优惠券边框图
+    .kuang {
+      position: absolute;
+      left: 0;
+      right: 0;
+      top: 0;
+      bottom: 0;
+      z-index: -1;
+      .kuang-img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+
+    // 金额样式
+    .big-title {
+      color: #f05a82;
+      font-size: 36px;
+      font-weight: 600;
+    }
+    .small-title {
+      color: #f05a82;
+      font-size: 16px;
+      font-weight: 600;
+    }
+
+    // 名称与数量
+    .title {
+      color: #333;
+      font-size: 16px;
+      font-weight: 400;
+      padding-bottom: 10rpx;
+      border-bottom: 4rpx dashed #fd8293;
+    }
+    .num {
+      color: #f05a82;
+      font-size: 20px;
+      font-weight: 400;
+      line-height: 22px;
+      margin-left: 16rpx;
+    }
+
+    // 有效期
+    .time {
+      color: #666; // 调整颜色更柔和
+      font-size: 14px;
+      font-weight: 400;
+    }
+  }
+}
+
+// 领取按钮样式
+.lingqu {
+  padding: 12rpx 20rpx; // 加宽内边距，点击区域更大
+  border-radius: 14rpx;
+  background: #fd8293;
+  color: #fff;
+  font-size: 28rpx;
+  font-weight: 400;
+  line-height: 1;
+  border: none;
+  outline: none;
+  margin: 0;
+  cursor: pointer;
+  &:active {
+    background: #f07080; // 点击深色反馈
+  }
+}
+
+// 工具类样式（补充缺失的flex基础样式）
+.u-flex {
+  display: flex;
+}
+.u-row-center {
+  align-items: center;
+  justify-content: center;
+}
+.u-row-between {
+  justify-content: space-between;
+}
+.u-m-t-10 {
+  margin-top: 10rpx;
+}
+.u-m-t-16 {
+  margin-top: 16rpx;
+}
+.u-m-t-20 {
+  margin-top: 20rpx;
+}
+.u-m-t-30 {
+  margin-top: 30rpx;
+}
+.u-m-x-16 {
+  margin-left: 16rpx;
+  margin-right: 16rpx;
+}
+.u-m-l-12 {
+  margin-left: 12rpx;
+}
+</style>
\ No newline at end of file
diff --git a/components/coupon-modal.vue b/components/coupon-modal.vue
index 987b94e..c290f44 100644
--- a/components/coupon-modal.vue
+++ b/components/coupon-modal.vue
@@ -1,6 +1,6 @@
 <!-- 首页优惠券弹窗 -->
 <template>
-	<up-popup :show="show" bgColor="transparent">
+	<up-popup :show="show" bgColor="transparent" @close="close">
 		<view class="container">
 			<view class="content" :class="`content${currentNum}`">
 				<image class="bg" :src="bgUrl" mode="widthFix"></image>
@@ -141,6 +141,8 @@ async function getCouponPopupAjax() {
 				bgUrl.value = bgUrlList.value[1];
 				currentNum.value = 1;
 			}
+		}else{
+			close()
 		}
 	} catch (error) {
 		console.log(error);
@@ -157,7 +159,7 @@ async function getHandle() {
 		const res = await receivePopUp({
 			getMode: props.getMode
 		});
-		show.value = false;
+		close()
 		uni.showToast({
 			title: '已领取，请在我的优惠券中查看',
 			icon: 'none'
@@ -167,6 +169,12 @@ async function getHandle() {
 	}
 	uni.hideLoading();
 }
+const emit=defineEmits(['close'])
+
+function close() {
+  show.value = false;
+  emit('close');
+}
 
 onMounted(() => {
 	getCouponPopupAjax();
diff --git a/components/date-range-picker/README.md b/components/date-range-picker/README.md
new file mode 100644
index 0000000..4b9f5ec
--- /dev/null
+++ b/components/date-range-picker/README.md
@@ -0,0 +1,52 @@
+#时间范围选择器
+#### 参数文档
+
+| 参数 | 说明 | 类型 | 默认值 | 其他 |
+| :---- | :---- | :---- | :---- | :---- |
+| show | 显示选择器 | Boolean | false | - |
+| defaultDate | 默认日期 | String | - | 不传则默认今天 |
+| minYear | 最小年份 | Number | 1990 | - |
+| themeColor | 主题色 | String | #43b983 | - |
+| startText | 开始时间文字 | String | 开始时间 | - |
+| endText | 结束时间文字 | String | 结束时间 | - |
+
+#### case
+```vue
+<template>
+	<view style="padding: 30rpx;">
+		<view style="margin-top: 30rpx" @click="show=true">
+			显示日期选择器
+		</view>
+		<view style="margin-top: 30rpx">
+			所选日期 {{ date.join(',') }}
+		</view>
+		<dateRangePicker
+			:show="show"
+			:minYear="2022"
+			@close="show=false"
+			@confirm="confirm"
+		>
+		</dateRangePicker>
+	</view>
+</template>
+
+<script>
+	import dateRangePicker from '@/components/date-range-picker/date-range-picker.vue'
+	export default {
+		components: {dateRangePicker},
+		data() {
+			return {
+				show: false,
+				date: []
+			}
+		},
+		methods: {
+			confirm(v) {
+				console.log(v);
+				this.date = v
+			}
+		}
+	}
+</script>
+
+```
diff --git a/components/date-range-picker/date-range-picker.vue b/components/date-range-picker/date-range-picker.vue
new file mode 100644
index 0000000..b686d19
--- /dev/null
+++ b/components/date-range-picker/date-range-picker.vue
@@ -0,0 +1,342 @@
+<template>
+	<view :class="{'remark':show}" :style="{'--theme-color': themeColor}" @click="close" @touchmove.stop.prevent="returnHandle">
+		<view class="picker-box" :class="{show: show}">
+			<view class="operate-box" @touchmove.stop.prevent="returnHandle" @tap.stop="returnHandle">
+				<view @click="touchSelect(0)" class="time-item" :style="{color:touchIndex?'#303030':themeColor}">
+					<view class="label">{{ startText }}</view>
+					<view class="date">{{ resultDate[0] }}</view>
+				</view>
+				<view>至</view>
+				<view @click="touchSelect(1)" class="time-item" :style="{color:touchIndex?themeColor:'#303030'}">
+					<view class="label">{{ endText }}</view>
+					<view class="date">{{ resultDate[1] }}</view>
+				</view>
+			</view>
+			<picker-view 
+				:value="pickerValue" 
+				@change="pickerChange" 
+				class="picker-view" 
+				:immediate-change="true"
+				indicator-class="select-line"
+				:indicator-style="indicatorStyle"
+				mask-style="background: transparent"
+				@tap.stop="returnHandle"
+			>
+				<picker-view-column class="column-left">
+					<view class="picker-item" :class="index == pickerValue[0] ? 'picker-select' : ''" v-for="(item, index) in years" :key="index">
+						{{ item }}年
+					</view>
+				</picker-view-column>
+				<picker-view-column class="column-center">
+					<view class="picker-item" :class="index == pickerValue[1] ? 'picker-select' : ''" v-for="(item, index) in months" :key="index">
+						{{ item }}月
+					</view>
+				</picker-view-column>
+				<picker-view-column class="column-right" v-if="days.length > 0">
+					<view class="picker-item" :class="index == pickerValue[2] ? 'picker-select' : ''" v-for="(item, index) in days" :key="index">
+						{{ item }}日
+					</view>
+				</picker-view-column>
+			</picker-view>
+			<view class="button-group">
+				<view class="item cancel" @click.stop="close">取消</view>
+				<view class="item confirm" @click.stop="pickerConfirm">确认</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	const date = new Date();
+	const years = [];
+	const currentYear = date.getFullYear();
+	const months = [];
+	const currentMonth = date.getMonth() + 1;
+	const currentDay = date.getDate();
+
+	export default {
+		name: 'dateRangePicker',
+		props: {
+			show: {
+				type: Boolean,
+				default: false
+			},
+			defaultDate: {
+				type: Array,
+				default: () => []
+			},
+			minYear: {
+				type: Number,
+				default: 1990,
+			},
+			themeColor: {
+				type: String,
+				default: '#43b983'
+			},
+			startText: {
+				type: String,
+				default: '开始时间'
+			},
+			endText: {
+				type: String,
+				default: '结束时间'
+			}
+		},
+		data() {
+			for (let i = this.minYear; i <= currentYear; i++) {
+				years.push(i);
+			}
+			for (let i = 1; i <= 12; i++) {
+				months.push(this.padStart(i));
+			}
+			return {
+				indicatorStyle: `height: ${uni.upx2px(84)}px`,
+				touchIndex: 0,
+				year: currentYear,
+				month: currentMonth,
+				day: currentDay,
+				years,
+				months,
+				days: [],
+				pickerValue: [],
+				resultDate: []
+			};
+		},
+		mounted() {
+			this.setDate()
+		},
+		methods: {
+			returnHandle() {},
+			setDate() {
+				if (this.defaultDate.length > 0) {
+					const date = this.defaultDate[0]
+					this.resultDate = this.defaultDate
+					this.setPicker(date)
+				} else {
+					const month = this.month.toString().padStart(2, 0)
+					const day = this.day.toString().padStart(2, 0)
+					const nowTime = `${this.year}-${month}-${day}`
+					this.resultDate = [nowTime, nowTime]
+					this.setPicker(nowTime)
+				}
+			},
+			setPicker(date) {
+				const splitVal = date.split('-')
+				const year = this.years.indexOf(Number(splitVal[0]))
+				const month = Number(splitVal[1]) - 1
+				const day = Number(splitVal[2]) - 1
+				this.pickerChange({
+					detail: {
+						value: [year, month, day]
+					}
+				})
+			},
+			touchSelect(val) {
+				const date = this.resultDate[val]
+				this.touchIndex = val
+				this.setPicker(date)
+			},
+			getDateTime(date) {
+				const year = this.years[date[0]]
+				const month = this.months[Number(date[1])] || this.padStart(currentMonth)
+				const day = this.days[Number(date[2])] || this.padStart(currentDay)
+				
+				this.resultDate[this.touchIndex] = `${year}-${month}-${day}`
+			},
+			pickerChange(e) {
+				const currents = e.detail.value
+
+				// 月份处理，限制到当前月份
+				if (this.years[currents[0]] === currentYear) {
+					const allmonths = JSON.parse(JSON.stringify(months))
+					const m = allmonths.splice(0, currentMonth)
+					this.months = m
+					if(currents[1] > currentMonth - 1) {
+						currents[1] = currentMonth - 1
+					}
+				} else {
+					this.months = months
+				}
+
+				// 日期天数处理
+				let days = []
+				if (currents[1] + 1 === 2) {
+					if (
+						((currents[0] + this.minYear) % 4 === 0 &&
+							(currents[0] + this.minYear) % 100 !== 0) ||
+						(currents[0] + this.minYear) % 400 === 0
+					) {
+						for (let i = 1; i < 30; i++) {
+							days.push(this.padStart(i))
+						}
+					} else {
+						for (let i = 1; i < 29; i++) {
+							days.push(this.padStart(i))
+						}
+					}
+				} else if ([4, 6, 9, 11].some((item) => currents[1] + 1 === item)) {
+					for (let i = 1; i < 31; i++) {
+						days.push(this.padStart(i))
+					}
+				} else if ([1, 3, 5, 7, 8, 10, 12].some((item) => currents[1] + 1 === item)) {
+					for (let i = 1; i < 32; i++) {
+						days.push(this.padStart(i))
+					}
+				}
+				// 限制到当前日期
+				if (this.years[currents[0]] === currentYear && this.months[currents[1]]*1 === currentMonth) {
+					days = days.splice(0, currentDay)
+					if(currents[2] > currentDay - 1) {
+						currents[2] = currentDay - 1
+					}
+				}
+				this.days = days
+				this.pickerValue = currents
+				this.getDateTime(currents)
+			},
+			close() {
+				this.$emit('close', false)
+			},
+			pickerConfirm() {
+				const { resultDate } = this
+				let startTime = new Date(resultDate[0]).getTime()
+				let endTime = new Date(resultDate[1]).getTime()
+				let nowTime = endTime
+				if (startTime <= endTime && endTime <= nowTime) {
+					this.$emit('confirm', resultDate)
+					this.close()
+					return
+				}
+				if (startTime > endTime) {
+					uni.showToast({
+						title: '开始时间应小于结束时间',
+						icon: 'none',
+						duration: 3500
+					})
+				}
+				if (endTime > nowTime) {
+					uni.showToast({
+						title: '请正确选择时间范围',
+						icon: 'none'
+					})
+				}
+				
+			},
+			padStart(val) {
+				return val.toString().padStart(2, 0)
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	::v-deep.column-left,
+	::v-deep.column-center,
+	::v-deep.column-right {
+		.select-line {
+			background: #F9FAFC;
+			z-index: -1;
+			&::before, &::after {
+				border: none ;
+			}
+		}
+	}
+	
+	::v-deep.column-left .select-line {
+		border-radius: 42rpx 0 0 42rpx;
+	}
+	
+	::v-deep.column-right .select-line {
+		border-radius: 0 42rpx 42rpx 0;
+	}
+	
+	.remark {
+		position: fixed;
+		z-index: 998;
+		top: 0;
+		right: 0;
+		left: 0;
+		bottom: 0;
+		background: rgba(0, 0, 0, 0.6);
+	}
+
+	.picker-box {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		transition: all 0.3s ease;
+		transform: translateY(100%);
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		background-color: #FFFFFF;
+		z-index: 998;
+		border-radius: 24rpx 24rpx 0 0;
+		overflow: hidden;
+		padding-bottom: calc(40rpx + constant(safe-area-inset-bottom)/2) !important;
+		padding-bottom: calc(40rpx + env(safe-area-inset-bottom)/2) !important;
+		&.show {
+			transform: translateY(0);
+		}
+
+		.operate-box {
+			display: flex;
+			align-items: center;
+			justify-content: space-around;
+			padding: 34rpx 30rpx 20rpx;
+			background-color: #FFFFFF;
+			text-align: center;
+			border-bottom: 2rpx solid #f6f6f6;
+			.label {
+				font-size: 26rpx;
+			}
+			.date {
+				font-size: 32rpx;
+			}
+		}
+		
+		.picker-view {
+			width: 100%;
+			height: 420rpx;
+			background-color: #FFFFFF;
+
+			.picker-item {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				text-align: center;
+				transition: all 0.2s ease;
+				height: 84rpx;
+				line-height: 84rpx;
+				font-size: 32rpx;
+				color: rgba(94, 104, 128, 0.6);
+				&.picker-select {
+					color: var(--theme-color);
+					font-size: 38rpx;
+					transition: all 0.2s ease;
+				}
+			}
+		}
+		
+		.button-group {
+			display: flex;
+			justify-content: space-around;
+			margin-top: 30rpx;
+			.item {
+				width: 280rpx;
+				height: 84rpx;
+				text-align: center;
+				line-height: 84rpx;
+				border-radius: 42rpx;
+				&.cancel {
+					background: #f8f8f8;
+					color: #333;
+				}
+				&.confirm {
+					background: var(--theme-color);
+					color: #fff;
+				}
+			}
+		}
+	}
+
+</style>
\ No newline at end of file
diff --git a/components/devetools.vue b/components/devetools.vue
new file mode 100644
index 0000000..2e8b22d
--- /dev/null
+++ b/components/devetools.vue
@@ -0,0 +1,382 @@
+<template>
+  <view class="floating-widget" v-if="show">
+    <!-- 悬浮按钮 -->
+    <view
+      class="floating-btn"
+      @click="togglePopup"
+      :style="{
+        backgroundColor: btnColor,
+        width: `${btnSize}px`,
+        height: `${btnSize}px`,
+        transform: `translateX(${currentOffsetX}px) translateY(${currentOffsetY}px)`,
+      }"
+      :class="{ active: isPopupVisible }"
+      @touchstart="touchstart"
+      @touchmove="touchmove"
+      @touchend="touchend"
+    >
+      <up-icon
+        name="plus"
+        size="24"
+        color="#ffffff"
+        :class="{ rotate: isPopupVisible }"
+      ></up-icon>
+    </view>
+
+    <!-- 操作弹窗 -->
+    <view
+      class="popup"
+      v-if="isPopupVisible"
+      :class="{ show: isPopupVisible }"
+      :style="{
+        transform: `translateX(${currentOffsetX}px) translateY(${currentOffsetY}px)`,
+      }"
+    >
+      <view class="popup-arrow"></view>
+      <view class="popup-content">
+        <view
+          class="popup-item"
+        >
+          <text class="item-text">
+            <text>  当前环境:</text>
+            <text  style="color: rgb(255, 0, 0);">   {{  uni.conf.debug ? "测试环境" : "生产环境" }}</text>
+        </text>
+        </view>
+        <view
+          class="popup-item"
+          v-for="(item, index) in operations"
+          :key="index"
+          @click="handleOperation(item.action)"
+        >
+          <text class="item-text">{{ item.name }}</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 点击外部关闭遮罩 -->
+    <view class="overlay" v-if="isPopupVisible" @click="closePopup"></view>
+  </view>
+</template>
+  
+  <script setup>
+import { ref, defineProps, defineEmits, computed } from "vue";
+import { changeEnv } from "@/common/config.js";
+import { Storelogin } from "@/stores/user.js";
+const show = computed(() => {
+  // trial
+  const sysInfo = uni.getAccountInfoSync();
+  if (
+    sysInfo &&
+    sysInfo.miniProgram &&
+    sysInfo.miniProgram.envVersion == "develop"
+  ) {
+    return true;
+  }
+  return false;
+});
+
+// 核心修改1：新增“历史累积偏移量”变量（保存上一次拖拽后的最终位置）
+const lastOffsetX = ref(0); // 历史X偏移累积值
+const lastOffsetY = ref(0); // 历史Y偏移累积值
+const currentOffsetX = ref(0); // 当前拖拽的实时偏移（基于历史值）
+const currentOffsetY = ref(0); // 当前拖拽的实时偏移（基于历史值）
+
+const startX = ref(0);
+const startY = ref(0);
+
+// 核心修改2：touchstart - 基于历史偏移量初始化当前拖拽起点
+function touchstart(e) {
+  const touch = e.touches[0];
+  startX.value = touch.clientX;
+  startY.value = touch.clientY;
+  // 关键：当前拖拽的起点 = 上一次拖拽的终点（历史累积偏移量）
+  currentOffsetX.value = lastOffsetX.value;
+  currentOffsetY.value = lastOffsetY.value;
+}
+
+// 核心修改3：touchmove - 实时计算“历史偏移量 + 当前拖拽距离”
+function touchmove(e) {
+  const touch = e.touches[0];
+  // 当前拖拽的相对距离 = 现在触摸点 - 拖拽起点
+  const moveX = touch.clientX - startX.value;
+  const moveY = touch.clientY - startY.value;
+  // 实时偏移 = 历史累积偏移 + 当前相对移动距离（位置连续）
+  currentOffsetX.value = lastOffsetX.value + moveX;
+  currentOffsetY.value = lastOffsetY.value + moveY;
+}
+
+// 核心修改4：touchend - 保存当前拖拽终点为历史偏移量（供下次使用）
+function touchend() {
+  // 关键：将本次拖拽的最终位置保存为历史值
+  lastOffsetX.value = currentOffsetX.value;
+  lastOffsetY.value = currentOffsetY.value;
+}
+
+// 定义组件属性
+const props = defineProps({
+  // 操作选项列表
+  operations: {
+    type: Array,
+    default: () => [
+      {
+        name: "切换为测试环境",
+        icon: "arrowup",
+        action: "test",
+        color: "#007aff",
+      },
+      {
+        name: "切换为正式环境",
+        icon: "arrowup",
+        action: "prod",
+        color: "#007aff",
+      },
+      {
+        name: "复制token",
+        icon: "arrowup",
+        action: "token",
+        color: "#007aff",
+      },
+      {
+        name: "复制用户信息",
+        icon: "userInfo",
+        action: "userInfo",
+        color: "#52c41a",
+      },
+      {
+        name: "获取登录code",
+        icon: "userInfo",
+        action: "getLoginCode",
+        color: "#52c41a",
+      },
+      {
+        name: "复制当前门店信息",
+        icon: "userInfo",
+        action: "copyStoreInfo",
+        color: "#52c41a",
+      },
+      {
+        name: "复制当前门店用户信息",
+        icon: "userInfo",
+        action: "copyStoreUserInfo",
+        color: "#52c41a",
+      },
+    ],
+  },
+  // 悬浮按钮颜色
+  btnColor: {
+    type: String,
+    default: "#007aff",
+  },
+  // 悬浮按钮大小(px)
+  btnSize: {
+    type: Number,
+    default: 60,
+  },
+  // 弹窗距离底部的距离
+  bottomDistance: {
+    type: Number,
+    default: 20,
+  },
+  // 弹窗距离右侧的距离
+  rightDistance: {
+    type: Number,
+    default: 20,
+  },
+});
+
+// 定义组件事件
+const emit = defineEmits(["onOperation", "onOpen", "onClose"]);
+
+// 弹窗显示状态
+const isPopupVisible = ref(false);
+
+// 切换弹窗显示/隐藏
+const togglePopup = () => {
+  isPopupVisible.value = !isPopupVisible.value;
+  if (isPopupVisible.value) {
+    emit("onOpen");
+  } else {
+    emit("onClose");
+  }
+};
+
+// 关闭弹窗
+const closePopup = () => {
+  if (isPopupVisible.value) {
+    isPopupVisible.value = false;
+    emit("onClose");
+  }
+};
+
+async function getWxloginCode() {
+  return new Promise((resolve, reject) => {
+    uni.login({
+      success: (res) => {
+        if (res.code) {
+          resolve(res.code);
+        } else {
+          console.log("获取登录凭证（code）失败！" + res.errMsg);
+          reject(res.errMsg);
+        }
+      },
+    });
+  });
+}
+const storelogin = Storelogin();
+
+// 处理操作选择
+const handleOperation = async (action) => {
+  let data = "";
+
+  if (action == "prod" || action == "test") {
+    changeEnv(action);
+    emit("onOperation", action);
+    uni.showToast({
+      title: "切换成功",
+      icon: "success",
+    });
+    uni.clearStorageSync();
+
+    await storelogin.actionslogin();
+    setTimeout(() => {
+      uni.reLaunch({
+        url: "/pages/index/index",
+      });
+    }, 1500);
+
+    closePopup();
+    return;
+  }
+  if (action == "token") {
+    data = uni.cache.get("token");
+  }
+  if (action == "userInfo") {
+    data = JSON.stringify(uni.cache.get("userInfo"));
+  }
+  if (action == "getLoginCode") {
+    data = await getWxloginCode();
+  }
+  if (action == "copyStoreInfo") {
+    data = JSON.stringify(uni.cache.get("shopInfo"));
+  }
+  if (action == "copyStoreUserInfo") {
+    data = JSON.stringify(uni.cache.get("shopUserInfo"));
+  }
+  console.log("data", data);
+  if (data) {
+    uni.setClipboardData({
+      data: data,
+      success: function () {},
+    });
+  }
+
+  emit("onOperation", action);
+  closePopup();
+};
+</script>
+  
+  <style scoped>
+.floating-widget {
+  position: fixed;
+  right: v-bind(rightDistance + "px");
+  bottom: v-bind(bottomDistance + "px");
+  z-index: 9999;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+}
+
+/* 悬浮按钮样式 */
+.floating-btn {
+  border-radius: 50%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: linear-gradient(98deg, #fe6d1100 40.64%, #ffd1b4 105.2%),
+    linear-gradient(259deg, #fe6d11 50.14%, #ffd1b4 114.93%);
+  box-shadow: 0 0.4375rem 0.95rem 0 #fe8b435e;
+  cursor: pointer;
+  /*transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1); */
+  z-index: 1001;
+}
+
+.floating-btn.active {
+  box-shadow: 0 6px 16px rgba(0, 0, 0, 0.2);
+  transform: scale(1.05);
+}
+
+.floating-btn .rotate {
+  transform: rotate(45deg);
+  transition: transform 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+/* 弹窗样式 */
+.popup {
+  position: absolute;
+  bottom: calc(100% + 15px);
+  right: 0;
+  min-width: 180px;
+  background-color: #ffffff;
+  border-radius: 12px;
+  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
+  opacity: 0;
+  transform: translateY(10px) scale(0.95);
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+  z-index: 1000;
+  pointer-events: none;
+}
+
+.popup.show {
+  opacity: 1;
+  transform: translateY(0) scale(1);
+  pointer-events: auto;
+}
+
+/* 弹窗箭头 */
+.popup-arrow {
+  position: absolute;
+  right: 20px;
+  bottom: -8px;
+  width: 16px;
+  height: 16px;
+  background-color: #ffffff;
+  transform: rotate(45deg);
+  box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.05);
+}
+
+.popup-content {
+  padding: 8px 0;
+  position: relative;
+  z-index: 1;
+}
+
+/* 操作选项样式 */
+.popup-item {
+  display: flex;
+  align-items: center;
+  padding: 12px 20px;
+  cursor: pointer;
+  transition: background-color 0.2s ease;
+}
+
+.popup-item:hover {
+  background-color: #f5f7fa;
+}
+
+.item-text {
+  font-size: 14px;
+  color: #333333;
+  line-height: 1;
+}
+
+/* 遮罩层样式 */
+.overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0);
+  z-index: 999;
+}
+</style>
\ No newline at end of file
diff --git a/components/drainage.vue b/components/drainage.vue
new file mode 100644
index 0000000..297888b
--- /dev/null
+++ b/components/drainage.vue
@@ -0,0 +1,112 @@
+<template>
+  <view>
+    <!-- 私域引流 -->
+    <up-popup
+      :show="showPreview"
+      mode="center"
+      round="16rpx"
+      closeOnClickOverlay
+      @close="close"
+      :safeAreaInsetBottom="false"
+    >
+      <view class="preview-box">
+        <view class="u-flex" style="align-items: stretch">
+          <view
+            class="u-flex-1 u-p-r-24 u-flex u-flex-col"
+            style="align-items: start; justify-content: space-between"
+          >
+            <view>
+              <view class="font-14 font-bold color-333">{{
+                drainageConfig.title
+              }}</view>
+              <view class="u-m-t-16 font-12 color-666">{{
+                drainageConfig.content
+              }}</view>
+            </view>
+
+            <view class="color-999 font-12 u-m-t-16">{{
+              drainageConfig.note
+            }}</view>
+          </view>
+
+          <image
+            :show-menu-by-longpress="true"
+            :src="drainageConfig.qrCode"
+            style="width: 240rpx; height: 240rpx"
+            mode="aspectFit"
+          ></image>
+        </view>
+
+        <view class="close" @click="close">
+          <up-icon name="close-circle" size="34" color="#fff"></up-icon>
+        </view>
+      </view>
+    </up-popup>
+  </view>
+</template>
+
+<script setup>
+import * as drainageConfigApi from "@/common/api/market/drainageConfig.js";
+import { ref, reactive, computed, watch, onMounted } from "vue";
+
+const showPreview = defineModel({
+  type: Boolean,
+  default: false,
+});
+const emit = defineEmits(["close"]);
+
+function close() {
+  showPreview.value = false;
+  emit("close");
+}
+const drainageConfig = ref({});
+async function getDrainageConfig() {
+  const shopId = uni.cache.get("shopId");
+  const drainageConfigRes = await drainageConfigApi.config({
+    shopId: shopId,
+  });
+  drainageConfig.value = drainageConfigRes;
+  if (drainageConfig.value.isEnable) {
+    showPreview.value = true;
+  } else {
+    close();
+  }
+}
+// onMounted(() => {
+//   getDrainageConfig();
+// });
+watch(
+  () => showPreview.value,
+  (newVal) => {
+    if (newVal) {
+      getDrainageConfig();
+    }
+  }
+);
+</script>
+
+<style scoped lang="scss">
+.u-flex-col {
+  flex-direction: column;
+}
+.preview {
+  padding: 8rpx 32rpx;
+  border-radius: 12rpx;
+  background: $my-main-color;
+  color: #ffffff;
+  font-size: 28rpx;
+  font-weight: 400;
+  line-height: 40rpx;
+}
+.preview-box {
+  width: 700rpx;
+  padding: 32rpx 28rpx;
+  position: relative;
+  .close {
+    position: absolute;
+    left: 50%;
+    bottom: -100rpx;
+    transform: translateX(-50%);
+  }
+}
+</style>
\ No newline at end of file
diff --git a/components/goods-price.vue b/components/goods-price.vue
new file mode 100644
index 0000000..83eb9f8
--- /dev/null
+++ b/components/goods-price.vue
@@ -0,0 +1,75 @@
+<template>
+  <block v-if="limitDiscount && limitDiscount.id" class="limit-price">
+    <text>
+      {{ returnPrice() }}
+    </text>
+  </block>
+
+  <text v-else>
+    <block
+      v-if="
+        shopUserInfo.isMemberPrice == 1 &&
+        shopUserInfo.isVip == 1 &&
+        cart.memberPrice * 1 > 0
+      "
+      class="memberPrice"
+    >
+      <text>
+        {{ cart.memberPrice }}
+      </text>
+    </block>
+
+    <text v-else class="salePrice">{{ cart.salePrice }}</text>
+  </text>
+</template>
+
+<script setup>
+import BigNumber from "bignumber.js";
+import * as orderUtils from "@/utils/order-utils.js";
+
+function returnPrice() {
+  return orderUtils.returnPrice({
+    goods: props.cart,
+    shopInfo: props.shopInfo,
+    limitTimeDiscountRes: props.limitDiscount,
+    shopUserInfo: props.shopUserInfo,
+    idKey: props.idKey,
+  });
+}
+
+const props = defineProps({
+  //购物车
+  cart: {
+    type: Object,
+    default: () => {},
+  },
+  idKey: {
+    type: String,
+    default: "id",
+  },
+  //限时折扣
+  limitDiscount: {
+    type: Object,
+    default: () => {},
+  },
+  //店铺用户信息
+  shopUserInfo: {
+    type: Object,
+    default: () => {},
+  },
+  //店铺信息
+  shopInfo: {
+    type: Object,
+    default: () => {},
+  },
+});
+</script>
+
+<style  lang="scss">
+.old-price {
+  color: #999;
+  font-size: 24rpx;
+  text-decoration: line-through;
+  margin-left: 8rpx;
+}
+</style>
\ No newline at end of file
diff --git a/components/modal-list.vue b/components/modal-list.vue
new file mode 100644
index 0000000..49d1714
--- /dev/null
+++ b/components/modal-list.vue
@@ -0,0 +1,57 @@
+<template>
+  <view>
+    <!-- 生成公众号二维码 -->
+    <we-qrcode @generate="(e) => qrcodeResult(e)"></we-qrcode>
+    <officialAccount
+      followIndex="eat"
+      :wechatAcQrcode="wechatAcQrcode"
+      v-if="showOfficialAccount"
+      @close="modelClose($event, 'officialAccount')"
+    />
+    <couponModal
+      v-if="showCoupon"
+      getMode="eat"
+      @close="modelClose($event, 'coupon')"
+    />
+    <birthdayGift
+      v-if="showBirthdayGift"
+      @close="modelClose($event, 'birthdayGift')"
+    />
+  </view>
+</template>
+<script setup>
+import weQrcode from "@/components/wechat-ac-qrcode.vue";
+
+import { ref, watch, computed, reactive, toRaw } from "vue";
+import couponModal from "@/components/coupon-modal.vue";
+import birthdayGift from "@/components/birthday-modal.vue";
+import officialAccount from "@/components/official-account.vue";
+//弹窗列表
+const list = ref([]);
+
+const showBirthdayGift = ref(true);
+const showCoupon = ref(false);
+const showOfficialAccount = ref(false);
+
+function modelClose(e, type) {
+  console.log("modelClose", type);
+  if (type == "birthdayGift") {
+    showCoupon.value = true;
+    return;
+  }
+  if (type == "coupon") {
+    showOfficialAccount.value = true;
+    return;
+  }
+  if (type == "officialAccount") {
+    return;
+  }
+}
+const wechatAcQrcode = ref("");
+const userinfo = uni.cache.get("userInfo") || {};
+const codeVal = ref(userinfo.wechatAcQrcode || "");
+function qrcodeResult(e) {
+  wechatAcQrcode.value = e;
+}
+</script>
+
diff --git a/components/official-account.vue b/components/official-account.vue
new file mode 100644
index 0000000..7ac27ba
--- /dev/null
+++ b/components/official-account.vue
@@ -0,0 +1,133 @@
+<template>
+  <view>
+    <up-popup :show="show" bgColor="transparent" mode="center" @close="close">
+      <view class="container">
+        <view class="content">
+          <image class="bg" :src="bgUrl" mode="widthFix"></image>
+          <view class="info">
+            <view class="u-flex u-row-center">
+              <image
+                :show-menu-by-longpress="true"
+                :src="wechatAcQrcode"
+                style="height: 240rpx"
+                mode="heightFix"
+              ></image>
+            </view>
+            <view
+              class="color-999 font-12 text-center u-m-t-10"
+              style="line-height: 36rpx"
+              >长按识别关注，更多优惠不能错过</view
+            >
+          </view>
+          <view class="close" @click="close">
+            <up-icon name="close-circle" size="34" color="#fff"></up-icon>
+          </view>
+        </view>
+      </view>
+    </up-popup>
+  </view>
+</template>
+
+<script setup>
+import _ from "lodash";
+import dayjs from "dayjs";
+import { onMounted, ref, watch } from "vue";
+import { string } from "../uni_modules/uview-plus/libs/function/test";
+
+const bgUrl = ref(
+  "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/41239c8852874aa39d1f106e45456e10.png"
+);
+
+const show = ref(false);
+const code = ref(
+  "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240408/4d6e818a01f145a898d8c2368f4b5ad1.jpg"
+);
+const props = defineProps({
+  followIndex: {
+    type: string,
+    default: "", // 公众号关注位置 mine-我的 order-订单 eat-就餐
+  },
+  wechatAcQrcode: {
+    type: string,
+    default: "", // 微信公众号二维码
+  },
+});
+const emit = defineEmits(["close"]);
+
+function close() {
+  show.value = false;
+  emit("close");
+}
+function init() {
+  const followIndex = uni.cache.get("followIndex");
+  if (props.wechatAcQrcode && props.followIndex == followIndex) {
+    show.value = true;
+  }
+}
+watch(() => props.wechatAcQrcode, init);
+onMounted(() => {
+  init();
+});
+</script>
+
+<style scoped lang="scss">
+.u-row-center {
+  justify-content: center;
+}
+.container {
+  width: 100vw;
+  height: 100vh;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 54rpx;
+  .content {
+    width: 100%;
+    position: relative;
+    .close {
+      position: absolute;
+      left: 50%;
+      bottom: -100rpx;
+      transform: translateX(-50%);
+    }
+    .bg {
+      width: 100%;
+      height: 100%;
+    }
+    .info {
+      position: absolute;
+      bottom: 86rpx;
+      left: 60rpx;
+      right: 60rpx;
+    }
+    .btn-wrap {
+      width: 60%;
+      position: absolute;
+      left: 20%;
+      &.btn-wrap1 {
+        bottom: 74upx;
+      }
+      &.btn-wrap2 {
+        bottom: 74upx;
+      }
+      &.btn-wrap3 {
+        bottom: 38upx;
+      }
+      .btn-img {
+        width: 100%;
+      }
+      .t {
+        font-size: 42upx;
+        font-weight: bold;
+        color: #b43a14;
+        position: absolute;
+        top: 44%;
+        left: 54%;
+        white-space: nowrap;
+        transform: translate(-50%, -50%);
+      }
+    }
+  }
+}
+</style>
diff --git a/components/order-finish-modal.vue b/components/order-finish-modal.vue
new file mode 100644
index 0000000..8f6e73a
--- /dev/null
+++ b/components/order-finish-modal.vue
@@ -0,0 +1,43 @@
+<template>
+  <view>
+    <!-- 生成公众号二维码 -->
+    <we-qrcode @generate="(e) => qrcodeResult(e)"></we-qrcode>
+
+    <officialAccount
+      followIndex="order"
+      :wechatAcQrcode="wechatAcQrcode"
+      v-if="showOfficialAccount"
+      @close="modelClose($event, 'officialAccount')"
+    />
+    <Drainage  v-model="showDrainage" @close="modelClose($event, 'drainage')" />
+  </view>
+</template>
+  <script setup>
+import weQrcode from "@/components/wechat-ac-qrcode.vue";
+
+import { ref, watch, computed, reactive, toRaw } from "vue";
+import officialAccount from "@/components/official-account.vue";
+import Drainage from "@/components/drainage.vue";
+
+const showDrainage = defineModel({
+  type: Boolean,
+  default: false,
+});
+const showOfficialAccount = ref(false);
+
+function modelClose(e, type) {
+  console.log("modelClose", type);
+  if (type == "drainage") {
+    showOfficialAccount.value = true;
+    return;
+  }
+}
+const wechatAcQrcode = ref("");
+const userinfo = uni.cache.get("userInfo") || {};
+const codeVal = ref(userinfo.wechatAcQrcode || "");
+console.log("codeVal", codeVal.value);
+function qrcodeResult(e) {
+  wechatAcQrcode.value = e;
+}
+</script>
+
diff --git a/components/payPassword.vue b/components/payPassword.vue
index 0bde54c..9098732 100644
--- a/components/payPassword.vue
+++ b/components/payPassword.vue
@@ -48,6 +48,7 @@
 			password.value += num;
 		}
 		if (password.value.length === 6) {
+			console.log('密码输入完成：', password.value);
 			emits('inputComplete', password.value);
 			password.value = ''
 		}
@@ -56,7 +57,7 @@
 	// 关闭模态框
 	const closeModal = () => {
 		emits('close');
-		password = '';
+		password.value = '';
 	};
 	// 将方法暴露给父组件
 	defineExpose({
diff --git a/components/paymentMethod copy.vue b/components/paymentMethod copy.vue
new file mode 100644
index 0000000..84e0447
--- /dev/null
+++ b/components/paymentMethod copy.vue	
@@ -0,0 +1,260 @@
+<template>
+	<!-- 支付方式 -->
+	<view class="paymentMethod">
+		<view class="paymentMethod_content">
+			<view class="paymentMethod_title">支付方式</view>
+			<up-radio-group v-model="radiovalue" iconPlacement="right" @change="groupChanges" :size="28"
+				placement="column">
+				<block v-for="(item,index) in paymentMethodList" :key="index">
+					<view class="method_list" @click="groupChanges(item.type)" :class="{disabled:returnDisabled(item)}"
+						v-if="(index+1) == radiovalue?!changeFreeenable:true">
+						<view class="method_list_top">
+							<view class="method_list_top_left">
+								<image class="icon" :src="item.url" mode="aspectFill" />
+								<view class="method_list_top_cen">
+									<view class="name"> {{ item.name }} </view>
+									<view class="method_list_bom" v-if="item.type == 1">
+										<text class="balance">
+											当前余额￥{{orderVIP?(orderVIP.amount||0):0}}</text>
+										<text class="topUpNow" @click="goRecharge">去充值</text>
+									</view>
+								</view>
+							</view>
+							<up-radio :disabled="returnDisabled(item)" activeColor="#E8AD7B" icon-size="18" size="18" :name="item.type">
+							</up-radio>
+						</view>
+					</view>
+				</block>
+			</up-radio-group>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		reactive,
+		defineProps,
+		computed,
+		defineEmits,
+		watch,
+		watchEffect,
+		defineExpose
+	} from 'vue'
+
+	const props = defineProps({
+		rechargeFreeChecked: {
+			type: Boolean,
+			default: false
+		},
+		payAmount: {
+			type: Number,
+			default: 0
+		},
+		freeCheck: {
+			type: Boolean,
+			default: false
+		},
+		changeFreeenable: {
+			type: Boolean,
+			default: false
+		},
+		disablePayType: {
+			type: Array,
+			default: () => {
+				return []
+			}
+		}
+
+	});
+
+	function returnDisabled(item) {
+		if (props.disablePayType.includes(item.name)) {
+			return true
+		}else{
+			return false
+		}
+	}
+
+	const orderVIP = ref(null)
+	const emits = defineEmits(['customevent', 'groupChange']);
+	watchEffect(() => {
+		orderVIP.value = uni.cache.get('orderVIP')
+	})
+
+	const orderVIPfun = (data) => {
+		orderVIP.value = data
+	}
+
+	const paymentMethodList = ref([
+		// #ifdef MP-WEIXIN
+		{
+			name: "微信支付",
+			type: 2,
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png",
+			payType: 'wechatPay'
+		},
+		// #endif
+		// #ifdef MP-ALIPAY
+		{
+			name: "支付宝支付",
+			type: 3,
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/alipay.png",
+			payType: 'aliPay'
+		},
+		// #endif
+		{
+			name: "余额支付",
+			type: 1,
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/wechat.png",
+			payType: 'accountPay'
+		}
+	])
+
+
+	const paymentMethodName = ref([{
+			name: "余额支付",
+			type: 1,
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/wechat.png",
+			payType: 'accountPay'
+		},
+		{
+			name: "微信支付",
+			type: 2,
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png",
+			payType: 'wechatPay'
+		},
+		{
+			name: "支付宝支付",
+			type: 3,
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/alipay.png",
+			payType: 'aliPay'
+		},
+	])
+
+	const radiovalue = ref(2) // 支付方式
+
+	const ispws = ref(false) // 输入支付密码
+
+	const storeInfo = ref({})
+
+	// * 监听支付方式切换
+	const groupChanges = (type) => {
+		if (props.freeCheck && type == 1) {
+			return;
+		}
+		const item=paymentMethodList.value.find(v=>v.type==type)
+		if(item&&returnDisabled(item)){
+			 uni.showToast({
+				title:"当前支付方式不可用",
+				icon:'none'
+			})
+			return
+		}
+		// if (props.payAmount <= 0 && type != 1) {
+		// 	return;
+		// }
+		radiovalue.value = type;
+		let name = paymentMethodName.value[type - 1].name;
+
+		emits("groupChange", paymentMethodName.value[type - 1])
+	}
+
+	// 去充值
+	const goRecharge = () => {
+		if (orderVIP.value.isVip) {
+			uni.navigateTo({
+				url: '/pages/user/member/czzx?shopId=' + orderVIP.value.shopId
+			})
+			return
+		}
+		uni.navigateTo({
+			url: '/user/vip/buy-vip?shopId=' + orderVIP.value.shopId
+		})
+
+		// uni.pro.navigateTo('user/member/index', {
+		// 	shopId: orderVIP.value.shopId
+		// })
+	}
+	// 将方法暴露给父组件
+	defineExpose({
+		groupChanges,
+		orderVIPfun
+	});
+</script>
+
+<style lang="scss">
+	.paymentMethod {
+		box-sizing: border-box;
+		margin-top: 30rpx;
+		border-radius: 18rpx;
+
+		.paymentMethod_content {
+			background-color: #fff;
+			border-radius: 22rpx;
+			padding: 30rpx 30rpx 0 30rpx;
+			box-sizing: border-box;
+
+			.paymentMethod_title {
+				font-weight: 500;
+				font-size: 32rpx;
+				color: #333333;
+				box-sizing: border-box;
+			}
+
+			.method_list {
+				padding: 40rpx 0;
+				box-sizing: border-box;
+				&.disabled{
+					opacity: .6;
+				}
+				.method_list_top {
+					display: flex;
+					justify-content: space-between;
+
+					.method_list_top_left {
+						display: flex;
+						align-items: center;
+
+						.icon {
+							width: 54.67rpx !important;
+							height: 48rpx !important;
+							margin-right: 22rpx;
+						}
+
+						.name {
+							font-size: 32rpx;
+							font-weight: 500;
+							color: #333;
+						}
+
+						.method_list_top_cen {
+							display: flex;
+							flex-direction: column;
+						}
+					}
+
+				}
+
+				.method_list_bom {
+					display: flex;
+					align-items: center;
+
+					.balance {
+						margin-right: 20rpx;
+						font-size: 24rpx;
+					}
+
+					.topUpNow {
+						color: #FF803D;
+						font-size: 28rpx;
+					}
+				}
+			}
+
+			.method_list:nth-child(odd) {
+				border-bottom: 2rpx solid #e5e5e5;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/paymentMethod.vue b/components/paymentMethod.vue
index 84e0447..3a9d438 100644
--- a/components/paymentMethod.vue
+++ b/components/paymentMethod.vue
@@ -1,260 +1,302 @@
 <template>
-	<!-- 支付方式 -->
-	<view class="paymentMethod">
-		<view class="paymentMethod_content">
-			<view class="paymentMethod_title">支付方式</view>
-			<up-radio-group v-model="radiovalue" iconPlacement="right" @change="groupChanges" :size="28"
-				placement="column">
-				<block v-for="(item,index) in paymentMethodList" :key="index">
-					<view class="method_list" @click="groupChanges(item.type)" :class="{disabled:returnDisabled(item)}"
-						v-if="(index+1) == radiovalue?!changeFreeenable:true">
-						<view class="method_list_top">
-							<view class="method_list_top_left">
-								<image class="icon" :src="item.url" mode="aspectFill" />
-								<view class="method_list_top_cen">
-									<view class="name"> {{ item.name }} </view>
-									<view class="method_list_bom" v-if="item.type == 1">
-										<text class="balance">
-											当前余额￥{{orderVIP?(orderVIP.amount||0):0}}</text>
-										<text class="topUpNow" @click="goRecharge">去充值</text>
-									</view>
-								</view>
-							</view>
-							<up-radio :disabled="returnDisabled(item)" activeColor="#E8AD7B" icon-size="18" size="18" :name="item.type">
-							</up-radio>
-						</view>
-					</view>
-				</block>
-			</up-radio-group>
-		</view>
-	</view>
+  <!-- 支付方式 -->
+  <view class="paymentMethod">
+    <view class="paymentMethod_content">
+      <view class="paymentMethod_title">支付方式</view>
+      <up-radio-group
+        v-model="radiovalue.type"
+        iconPlacement="right"
+        @change="groupChanges"
+        :size="28"
+        placement="column"
+      >
+        <block v-for="(item, index) in paymentMethodList" :key="index">
+          <view
+            class="method_list"
+            @click="groupChanges(item.type)"
+            :class="{ disabled: returnDisabled(item) }"
+          >
+            <view class="method_list_top">
+              <view class="method_list_top_left">
+                <image class="icon" :src="item.url" mode="aspectFill" />
+                <view class="method_list_top_cen">
+                  <view class="name"> {{ item.name }} </view>
+                  <view class="method_list_bom" v-if="item.type == 1">
+                    <text class="balance">
+                      当前余额￥{{ orderVIP ? orderVIP.amount || 0 : 0 }}</text
+                    >
+                    <text class="topUpNow" @click="goRecharge">去充值</text>
+                  </view>
+                </view>
+              </view>
+              <up-radio
+                :disabled="returnDisabled(item)"
+                activeColor="#E8AD7B"
+                icon-size="18"
+                size="18"
+                :name="item.type"
+              >
+              </up-radio>
+            </view>
+          </view>
+        </block>
+      </up-radio-group>
+    </view>
+  </view>
 </template>
 
 <script setup>
-	import {
-		ref,
-		reactive,
-		defineProps,
-		computed,
-		defineEmits,
-		watch,
-		watchEffect,
-		defineExpose
-	} from 'vue'
+import {
+  ref,
+  reactive,
+  defineProps,
+  computed,
+  defineEmits,
+  watch,
+  watchEffect,
+  defineExpose,
+} from "vue";
 
-	const props = defineProps({
-		rechargeFreeChecked: {
-			type: Boolean,
-			default: false
-		},
-		payAmount: {
-			type: Number,
-			default: 0
-		},
-		freeCheck: {
-			type: Boolean,
-			default: false
-		},
-		changeFreeenable: {
-			type: Boolean,
-			default: false
-		},
-		disablePayType: {
-			type: Array,
-			default: () => {
-				return []
-			}
-		}
+const props = defineProps({
+  rechargeFreeChecked: {
+    type: Boolean,
+    default: false,
+  },
+  payAmount: {
+    type: Number,
+    default: 0,
+  },
+  freeCheck: {
+    type: Boolean,
+    default: false,
+  },
+  changeFreeenable: {
+    type: Boolean,
+    default: false,
+  },
+  disablePayType: {
+    type: Array,
+    default: () => {
+      return [];
+    },
+  },
+});
 
-	});
+function returnDisabled(item) {
+  if (props.disablePayType.includes(item.name)) {
+    return true;
+  } else {
+    return false;
+  }
+}
 
-	function returnDisabled(item) {
-		if (props.disablePayType.includes(item.name)) {
-			return true
-		}else{
-			return false
-		}
-	}
+const orderVIP = ref(null);
+const emits = defineEmits(["customevent", "groupChange"]);
+watchEffect(() => {
+  orderVIP.value = uni.cache.get("orderVIP");
+});
 
-	const orderVIP = ref(null)
-	const emits = defineEmits(['customevent', 'groupChange']);
-	watchEffect(() => {
-		orderVIP.value = uni.cache.get('orderVIP')
-	})
+const orderVIPfun = (data) => {
+  orderVIP.value = data;
+};
 
-	const orderVIPfun = (data) => {
-		orderVIP.value = data
-	}
+const paymentMethodList = ref([
+  // #ifdef MP-WEIXIN
+  {
+    name: "微信支付",
+    type: 2,
+    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png",
+    payType: "wechatPay",
+  },
+  // #endif
+  // #ifdef MP-ALIPAY
+  {
+    name: "支付宝支付",
+    type: 3,
+    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/alipay.png",
+    payType: "aliPay",
+  },
+  // #endif
+  {
+    name: "余额支付",
+    type: 1,
+    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/wechat.png",
+    payType: "accountPay",
+  },
+]);
 
-	const paymentMethodList = ref([
-		// #ifdef MP-WEIXIN
-		{
-			name: "微信支付",
-			type: 2,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png",
-			payType: 'wechatPay'
-		},
-		// #endif
-		// #ifdef MP-ALIPAY
-		{
-			name: "支付宝支付",
-			type: 3,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/alipay.png",
-			payType: 'aliPay'
-		},
-		// #endif
-		{
-			name: "余额支付",
-			type: 1,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/wechat.png",
-			payType: 'accountPay'
-		}
-	])
+const paymentMethodName = ref([
+  {
+    name: "余额支付",
+    type: 1,
+    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/wechat.png",
+    payType: "accountPay",
+  },
+  {
+    name: "微信支付",
+    type: 2,
+    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png",
+    payType: "wechatPay",
+  },
+  {
+    name: "支付宝支付",
+    type: 3,
+    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/alipay.png",
+    payType: "aliPay",
+  },
+]);
 
+// const radiovalue = ref(2); // 支付方式
+const radiovalue = defineModel({
+  type: Object,
+  default: () => {
+    return {
+      name: "微信支付",
+      type: 2,
+      url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png",
+      payType: "wechatPay",
+    };
+  },
+});
 
-	const paymentMethodName = ref([{
-			name: "余额支付",
-			type: 1,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/wechat.png",
-			payType: 'accountPay'
-		},
-		{
-			name: "微信支付",
-			type: 2,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png",
-			payType: 'wechatPay'
-		},
-		{
-			name: "支付宝支付",
-			type: 3,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/alipay.png",
-			payType: 'aliPay'
-		},
-	])
+watch(
+  () => props.disablePayType,
+  (newval) => {
 
-	const radiovalue = ref(2) // 支付方式
+    const canUsePayType = paymentMethodList.value.filter((item) => {
+      return  !newval.includes(item.name);
+    });
+    if (canUsePayType.find((v) => v.type == radiovalue.value.type)) {
+      return;
+    }
+    radiovalue.value = canUsePayType[0];
+  },
+  {
+    immediate: true,
+  }
+);
 
-	const ispws = ref(false) // 输入支付密码
+// * 监听支付方式切换
+const groupChanges = (type) => {
+  if (props.freeCheck && type == 1) {
+    return;
+  }
+  const item = paymentMethodList.value.find((v) => v.type == type);
 
-	const storeInfo = ref({})
+  if (item && returnDisabled(item)) {
+    uni.showToast({
+      title: "当前支付方式不可用",
+      icon: "none",
+    });
+    return;
+  }
+  // if (props.payAmount <= 0 && type != 1) {
+  // 	return;
+  // }
+  radiovalue.value = item;
+  emits("groupChange", paymentMethodName.value[type - 1]);
+};
 
-	// * 监听支付方式切换
-	const groupChanges = (type) => {
-		if (props.freeCheck && type == 1) {
-			return;
-		}
-		const item=paymentMethodList.value.find(v=>v.type==type)
-		if(item&&returnDisabled(item)){
-			 uni.showToast({
-				title:"当前支付方式不可用",
-				icon:'none'
-			})
-			return
-		}
-		// if (props.payAmount <= 0 && type != 1) {
-		// 	return;
-		// }
-		radiovalue.value = type;
-		let name = paymentMethodName.value[type - 1].name;
+// 去充值
+const goRecharge = () => {
+  if (props.disablePayType.includes("余额支付")) {
+    return;
+  }
+  uni.navigateTo({
+    url: "/pages/user/member/czzx?shopId=" + orderVIP.value.shopId,
+  });
+  // if (orderVIP.value.isVip) {
+  //   uni.navigateTo({
+  //     url: "/pages/user/member/czzx?shopId=" + orderVIP.value.shopId,
+  //   });
+  //   return;
+  // }
+  // uni.navigateTo({
+  //   url: "/user/vip/buy-vip?shopId=" + orderVIP.value.shopId,
+  // });
 
-		emits("groupChange", paymentMethodName.value[type - 1])
-	}
-
-	// 去充值
-	const goRecharge = () => {
-		if (orderVIP.value.isVip) {
-			uni.navigateTo({
-				url: '/pages/user/member/czzx?shopId=' + orderVIP.value.shopId
-			})
-			return
-		}
-		uni.navigateTo({
-			url: '/user/vip/buy-vip?shopId=' + orderVIP.value.shopId
-		})
-
-		// uni.pro.navigateTo('user/member/index', {
-		// 	shopId: orderVIP.value.shopId
-		// })
-	}
-	// 将方法暴露给父组件
-	defineExpose({
-		groupChanges,
-		orderVIPfun
-	});
+  // uni.pro.navigateTo('user/member/index', {
+  // 	shopId: orderVIP.value.shopId
+  // })
+};
+// 将方法暴露给父组件
+defineExpose({
+  groupChanges,
+  orderVIPfun,
+});
 </script>
 
 <style lang="scss">
-	.paymentMethod {
-		box-sizing: border-box;
-		margin-top: 30rpx;
-		border-radius: 18rpx;
+.paymentMethod {
+  box-sizing: border-box;
+  margin-top: 30rpx;
+  border-radius: 18rpx;
 
-		.paymentMethod_content {
-			background-color: #fff;
-			border-radius: 22rpx;
-			padding: 30rpx 30rpx 0 30rpx;
-			box-sizing: border-box;
+  .paymentMethod_content {
+    background-color: #fff;
+    border-radius: 22rpx;
+    padding: 30rpx 30rpx 0 30rpx;
+    box-sizing: border-box;
 
-			.paymentMethod_title {
-				font-weight: 500;
-				font-size: 32rpx;
-				color: #333333;
-				box-sizing: border-box;
-			}
+    .paymentMethod_title {
+      font-weight: 500;
+      font-size: 32rpx;
+      color: #333333;
+      box-sizing: border-box;
+    }
 
-			.method_list {
-				padding: 40rpx 0;
-				box-sizing: border-box;
-				&.disabled{
-					opacity: .6;
-				}
-				.method_list_top {
-					display: flex;
-					justify-content: space-between;
+    .method_list {
+      padding: 40rpx 0;
+      box-sizing: border-box;
+      &.disabled {
+        opacity: 0.6;
+      }
+      .method_list_top {
+        display: flex;
+        justify-content: space-between;
 
-					.method_list_top_left {
-						display: flex;
-						align-items: center;
+        .method_list_top_left {
+          display: flex;
+          align-items: center;
 
-						.icon {
-							width: 54.67rpx !important;
-							height: 48rpx !important;
-							margin-right: 22rpx;
-						}
+          .icon {
+            width: 54.67rpx !important;
+            height: 48rpx !important;
+            margin-right: 22rpx;
+          }
 
-						.name {
-							font-size: 32rpx;
-							font-weight: 500;
-							color: #333;
-						}
+          .name {
+            font-size: 32rpx;
+            font-weight: 500;
+            color: #333;
+          }
 
-						.method_list_top_cen {
-							display: flex;
-							flex-direction: column;
-						}
-					}
+          .method_list_top_cen {
+            display: flex;
+            flex-direction: column;
+          }
+        }
+      }
 
-				}
+      .method_list_bom {
+        display: flex;
+        align-items: center;
 
-				.method_list_bom {
-					display: flex;
-					align-items: center;
+        .balance {
+          margin-right: 20rpx;
+          font-size: 24rpx;
+        }
 
-					.balance {
-						margin-right: 20rpx;
-						font-size: 24rpx;
-					}
+        .topUpNow {
+          color: #ff803d;
+          font-size: 28rpx;
+        }
+      }
+    }
 
-					.topUpNow {
-						color: #FF803D;
-						font-size: 28rpx;
-					}
-				}
-			}
-
-			.method_list:nth-child(odd) {
-				border-bottom: 2rpx solid #e5e5e5;
-			}
-		}
-	}
+    .method_list:nth-child(odd) {
+      border-bottom: 2rpx solid #e5e5e5;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/components/poster-maker.vue b/components/poster-maker.vue
new file mode 100644
index 0000000..5dc0348
--- /dev/null
+++ b/components/poster-maker.vue
@@ -0,0 +1,3 @@
+<template>
+  <view></view>
+</template>
\ No newline at end of file
diff --git a/components/wechat-ac-qrcode.vue b/components/wechat-ac-qrcode.vue
new file mode 100644
index 0000000..16d9491
--- /dev/null
+++ b/components/wechat-ac-qrcode.vue
@@ -0,0 +1,52 @@
+<template>
+  <view>
+    <!-- 生成公众号二维码 -->
+
+    <view class="qrcode-box" v-if="codeOptions.code">
+      <w-qrcode
+        :options="codeOptions"
+        ref="wQrcode"
+        @generate="(e) => qrcodeResult(e)"
+      ></w-qrcode>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import wQrcode from "@/uni_modules/wmf-code/components/w-qrcode/w-qrcode.vue";
+import { onMounted ,ref} from "vue";
+const codeOptions = ref({
+  size: 200,
+  code: "",
+});
+
+onMounted(() => {
+  // 页面加载完成后生成二维码
+  const userInfo = uni.cache.get("userInfo") || {};
+  const wechatAcQrcode = userInfo.wechatAcQrcode || "";
+  if(!userInfo.isAc){
+    codeOptions.value.code = wechatAcQrcode;
+  }
+});
+const emit = defineEmits(["generate"]);
+function qrcodeResult(e) {
+  const userInfo = uni.cache.get("userInfo") || {};
+  if(!userInfo.isAc){
+    emit("generate", e.img.tempFilePath);
+
+  }
+
+}
+</script>
+
+<style scoped>
+.qrcode-box {
+  position: relative;
+  overflow: hidden;
+  left: -400px;
+  width: 1px;
+  height: 1px;
+  opacity: 0;
+  z-index: -1;
+}
+</style>
\ No newline at end of file
diff --git a/components/xb-swiper-preview/images/icon-back.png b/components/xb-swiper-preview/images/icon-back.png
new file mode 100644
index 0000000..f030354
Binary files /dev/null and b/components/xb-swiper-preview/images/icon-back.png differ
diff --git a/components/xb-swiper-preview/index.vue b/components/xb-swiper-preview/index.vue
new file mode 100644
index 0000000..64a45b5
--- /dev/null
+++ b/components/xb-swiper-preview/index.vue
@@ -0,0 +1,385 @@
+<template>
+  <view class="swiper-content" v-if="visable">
+    <view class="hander-top p-lr-32 w-s flex-j-sb--a-ct">
+      <view class="icon-back-wrap" @click="onBack">
+        <image class="icon-back" src="./images/icon-back.png" mode="widthFix" />
+      </view>
+      <view class="count">{{ currentImg + 1 }} / {{ imgs.length }}</view>
+    </view>
+
+    <swiper
+      class="swiper-img"
+      :current="currentImg"
+      :duration="300"
+      @change="changeSwiper"
+    >
+      <swiper-item
+        class="swiper-item"
+        v-for="(item, index) in imgs"
+        :key="index"
+      >
+        <view class="img-page">
+          <movable-area scale-area>
+            <movable-view
+              direction="all"
+              scale="true"
+              scale-min="1"
+              scale-max="4"
+              @click.stop="onBack"
+
+            >
+              <image
+              @click.stop="()=>{}"
+                class="max-img"
+                :src="item"
+                :lazy-load="true"
+                mode="aspectFill"
+              />
+            </movable-view>
+          </movable-area>
+        </view>
+      </swiper-item>
+    </swiper>
+    <view class="item-bottom" v-if="false">
+      <scroll-view
+        class="scroll-view_H"
+        :scroll-x="true"
+        :scroll-into-view="scrollTopIndex"
+        :scroll-with-animation="true"
+        scroll-left="20"
+      >
+        <view
+          class="img-page-box scroll-view-item_H"
+          :class="currentImg == index ? 'img-page-checked' : ''"
+          v-for="(item, index) in imgs"
+          :key="index"
+          :id="`scrollToIndex${index}`"
+          @click.stop="toImg(index)"
+        >
+          <image class="img" :src="item" mode="aspectFill" />
+        </view>
+      </scroll-view>
+    </view>
+
+    <view class="pop" v-if="isPop">
+      <view class="item" @click.stop="share()">分享图片</view>
+      <!-- #ifndef H5 -->
+      <view class="item" @click.stop="saveImg(false)">保存图片</view>
+      <view class="item" @click.stop="saveImg(true)">保存全部图片</view>
+      <!-- #endif -->
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    imgs: {
+      type: [],
+      default: () => [],
+    },
+    visable: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  emits: ['update:visable'],
+  data() {
+    return {
+      currentImg: 0,
+      isPop: false,
+      scrollTopIndex: "",
+
+      isScale: false,
+      isCollect: false,
+      isLike: false,
+    };
+  },
+  onLoad(options) {
+    // let { imgs, current } = options;
+    // this.imgs = JSON.parse(imgs);
+    // this.currentImg = current;
+  },
+  methods: {
+    changeSwiper(e) {
+      this.currentImg = e.detail.current;
+      console.log("e", e);
+
+      this.scrollTopIndex = `scrollToIndex${e.detail.current}`;
+    },
+    toImg(index) {
+      this.currentImg = index;
+    },
+    onBack() {
+      this.$emit('update:visable', false);
+    },
+    share() {
+      uni.downloadFile({
+        // 下面一行时拼接预览PDF的地址！！！
+        url: this.imgs[this.currentImg],
+        success: function (res) {
+          var filePath = res.tempFilePath;
+          if (!filePath) return;
+          uni.openDocument({
+            filePath: filePath,
+            success: function (res) {
+              console.log(res);
+              console.log("打开文档成功");
+            },
+          });
+        },
+      });
+    },
+    saveImg(isAll = false) {
+      const that = this;
+      if (!isAll) {
+        uni.downloadFile({
+          url: this.imgs[this.currentImg],
+          success: (res) => {
+            if (res.statusCode === 200) {
+              uni.saveImageToPhotosAlbum({
+                filePath: res.tempFilePath,
+                success: function () {
+                  uni.showToast({
+                    icon: "none",
+                    title: "保存成功",
+                  });
+                  that.isPop = false;
+                },
+                fail: function () {},
+              });
+            } else {
+            }
+          },
+        });
+        return;
+      }
+      this.imgs.forEach((item) => {
+        uni.downloadFile({
+          url: item,
+          success: (res) => {
+            if (res.statusCode === 200) {
+              uni.saveImageToPhotosAlbum({
+                filePath: res.tempFilePath,
+                success: function () {
+                  uni.showToast({
+                    icon: "none",
+                    title: "保存全部成功",
+                  });
+                  that.isPop = false;
+                },
+                fail: function () {},
+              });
+            } else {
+            }
+          },
+        });
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.swiper-content {
+  width: 100vw;
+  top: 0;
+  height: 100vh;
+  position: fixed;
+  background: #000;
+  z-index: 99999;
+}
+movable-view {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  width: 100%;
+  height: 100%;
+}
+
+movable-area {
+  position: fixed;
+
+  overflow: hidden;
+
+  width: 100%;
+  height: 100%;
+
+  transform: scale();
+}
+
+movable-view image {
+  width: 100%;
+}
+
+uni-image > img {
+  z-index: -1 !important;
+}
+
+.hander-top {
+  position: absolute;
+  z-index: 1000;
+  top: 48rpx;
+  left: 0;
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+  padding: 0 32rpx;
+  box-sizing: border-box;
+  .icon-back-wrap {
+    width: 64rpx;
+    height: 64rpx;
+    .icon-back {
+      width: 64rpx;
+      height: 64rpx;
+    }
+  }
+
+  .count {
+    box-sizing: border-box;
+    padding: 8rpx 24rpx;
+
+    color: #fff;
+    border-radius: 24rpx;
+    background: rgba(0, 0, 0, 0.4);
+
+    font-size: 28rpx;
+  }
+}
+
+.swiper-img {
+  width: 100vw;
+  height: 100vh;
+
+  background-color: #000;
+
+  .swiper-item {
+    width: 100vw;
+    height: 100vh;
+
+    .img-page {
+      display: flex;
+      align-items: center;
+
+      width: 100vw;
+      height: 100vh;
+
+      .max-img {
+        // width: 100%;
+        // height: 100%;
+      }
+    }
+  }
+}
+
+.handle-wrap {
+  position: absolute;
+  z-index: 100;
+  bottom: 40rpx;
+  left: 0;
+
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  padding: 32rpx;
+  box-sizing: border-box;
+  image {
+    width: 64rpx;
+    height: 64rpx;
+  }
+
+  width: 100%;
+}
+
+.item-bottom {
+  position: fixed;
+  z-index: 9999;
+  bottom: 110rpx;
+  left: 0rpx;
+
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+
+  width: 100vw;
+
+  //  height: 200rpx;
+  padding: 30rpx;
+
+  transition: ease-in-out 0.3s;
+}
+
+.small-list-page {
+  min-height: 60rpx;
+}
+
+.scroll-Y {
+  height: 300rpx;
+}
+
+.scroll-view_H {
+  width: 100%;
+  box-sizing: border-box;
+  padding-right: 32rpx;
+  white-space: nowrap;
+}
+
+.scroll-view-item_H {
+  display: inline-block;
+
+  margin-right: 10rpx;
+
+  transition: ease-in 0.1s;
+  transform: scale(0.8);
+
+  border-radius: 11rpx;
+  background: #c2c2c2;
+
+  &:last-child {
+    margin-right: 0;
+  }
+
+  .img {
+    display: block;
+
+    width: 160rpx;
+    height: 272rpx;
+  }
+}
+
+.img-page-checked {
+  transform: translateY(-28rpx) scale(1);
+}
+
+.pop {
+  position: fixed;
+  z-index: 999999;
+  top: 50%;
+  left: 50%;
+
+  overflow: hidden;
+
+  width: 500rpx;
+
+  transform: translate(-50%, -50%);
+
+  border-radius: 20rpx;
+  background-color: #fff;
+
+  .item {
+    height: 100rpx;
+    padding: 0 50rpx;
+
+    transition: all 0.2s;
+
+    border-radius: 20rpx;
+
+    line-height: 100rpx;
+
+    &:active {
+      background-color: #eee;
+    }
+  }
+}
+</style>
diff --git a/distribution/components/commission.vue b/distribution/components/commission.vue
new file mode 100644
index 0000000..4e90d5f
--- /dev/null
+++ b/distribution/components/commission.vue
@@ -0,0 +1,107 @@
+<template>
+  <view>
+    <up-popup
+      :show="show"
+      @close="close"
+      mode="center"
+      :safe-area-inset-bottom="false"
+    >
+      <view class="u-flex top justify-between u-p-32">
+        <text class="title">{{ tipsType }}</text>
+        <up-icon name="close" @click="close"></up-icon>
+      </view>
+      <scroll-view style="width: 500rpx; max-height: 60vh">
+        <view class="u-p-30 font-14" style="width: 500rpx">
+          <template v-if="tipsType == '等级分成比例'">
+            <view class="u-flex justify-between font-bold u-m-b-20">
+              <view>等级</view>
+              <view>分成比例</view>
+            </view>
+            <view
+              class="u-m-b-10"
+              v-for="(item, index) in props.levelConfigList"
+              :key="index"
+            >
+              <view class="u-flex justify-between">
+                <view> {{ item.level }}({{ item.name }}) </view>
+                <view class="color-666"> {{ item.levelOneCommission }}% </view>
+              </view>
+            </view>
+          </template>
+          <template v-if="tipsType == '等级升级条件'">
+            <view class="u-flex justify-between font-bold u-m-b-20">
+              <view>等级</view>
+              <view v-if="config.upgradeType != 'not_upgrade'">升级条件</view>
+            </view>
+            <view
+              class="u-m-b-10"
+              v-for="(item, index) in props.levelConfigList"
+              :key="index"
+            >
+              <view class="u-flex justify-between">
+                <view>
+                  <text>
+                    {{ item.level }}
+                  </text>
+                  <text>({{ item.name }}) </text>
+                </view>
+                <view v-if="config.upgradeType != 'not_upgrade'"
+                  >{{ returnTiaojain(item) }}
+                </view>
+              </view>
+            </view>
+          </template>
+        </view>
+      </scroll-view>
+    </up-popup>
+  </view>
+</template>
+
+
+<script setup>
+import { ref, computed } from "vue";
+
+const show = defineModel({
+  type: Boolean,
+  default: false,
+});
+const props = defineProps({
+  tipsType: {
+    type: String,
+    default: "",
+  },
+  config: {
+    type: Object,
+    default: () => {},
+  },
+  levelConfigList: {
+    type: Array,
+    default: () => [],
+  },
+});
+function close() {
+  show.value = false;
+}
+function returnTiaojain(item) {
+  if (props.config.upgradeType === "not_upgrade") {
+    return "";
+  }
+  if (props.config.upgradeType == "cost") {
+    return `订单金额满${item.costAmount}元`;
+  }
+  if (props.config.upgradeType == "invite") {
+    return `邀请${item.inviteCount}人`;
+  }
+}
+</script>
+
+<style  lang="scss">
+.title {
+  color: #000000;
+  font-size: 32rpx;
+  font-weight: 700;
+}
+.top {
+  border-bottom: 2rpx solid #ededed;
+}
+</style>
\ No newline at end of file
diff --git a/distribution/components/rule.vue b/distribution/components/rule.vue
new file mode 100644
index 0000000..3058db4
--- /dev/null
+++ b/distribution/components/rule.vue
@@ -0,0 +1,137 @@
+<template>
+  <view>
+    <up-popup
+      :show="show"
+      @close="close"
+      mode="center"
+      :safe-area-inset-bottom="false"
+    >
+      <view class="u-flex top justify-between u-p-32">
+        <text class="title">规则说明</text>
+        <up-icon name="close" @click="close"></up-icon>
+      </view>
+      <scroll-view style="width: 500rpx; max-height: 60vh">
+        <view class="u-p-30 font-14" style="width: 500rpx">
+          <view class="font-12 color-666 u-m-t-16">
+            <view>
+              <view> 我的收益什么时候可以到账？</view>
+              <view> 分销的结算时长为{{ config.settlementDay || 0 }}天</view>
+            </view>
+
+            <view class="u-m-t-40" v-if="nextLvMoney">
+              <view>怎么样才能升级分销员等级？</view>
+              <template
+                v-if="
+                  config.upgradeType != 'not_upgrade' &&
+                  config.levelConfigList &&
+                  config.levelConfigList.length >= 2
+                "
+              >
+                <template v-if="config.upgradeType == 'invite'">
+                  <view
+                    >邀请的有效人数达到{{
+                      config.inviteCount || 0
+                    }}人即可升级</view
+                  >
+                  <view class="u-m-t-40"> 什么是有效邀请人数？</view>
+                  <view> 被邀请人在店铺消费过，即有一笔订单完成才算有效</view>
+                </template>
+
+                <template v-if="config.upgradeType == 'cost'&&nextLvMoney">
+                  <view> 消费金额总计达到{{ nextLvMoney }}元即可升级</view>
+                </template>
+              </template>
+              <template v-else>
+                <view>请联系商家</view>
+              </template>
+            </view>
+            <view class="u-m-t-40" v-if="config.upgradeType == 'cost'">
+              <view>消费金额如何计算？</view>
+              <view
+                >消费金额是计算您和您邀请的人在店铺消费的总金额，但退款订单不计入</view
+              >
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+    </up-popup>
+  </view>
+</template>
+
+
+<script setup>
+import { ref, computed } from "vue";
+
+const show = defineModel({
+  type: Boolean,
+  default: false,
+});
+const props = defineProps({
+  tipsType: {
+    type: String,
+    default: "",
+  },
+  config: {
+    type: Object,
+    default: () => {},
+  },
+  distributionUser: {
+    type: Object,
+    default: () => {},
+  },
+});
+function close() {
+  show.value = false;
+}
+const nextLvMoney = computed(() => {
+  let nextLv = undefined;
+  if (
+    !props.distributionUser ||
+    !props.config ||
+    !props.config.levelConfigList ||
+    !props.config.levelConfigList.length
+  ) {
+    return "";
+  }
+  if (!props.distributionUser || !props.distributionUser.distributionId) {
+    nextLv = props.config.levelConfigList[0];
+  } else {
+    nextLv = props.config.levelConfigList.find(
+      (v) => v.level == props.distributionUser.level + 1
+    );
+  }
+
+  if (nextLv) {
+    if (props.config.upgradeType == "cost") {
+      return nextLv.costAmount;
+    }
+    if (props.config.upgradeType == "invite") {
+      return nextLv.inviteCount;
+    }
+  }
+  return "";
+});
+
+const juNextLvMoney = computed(() => {
+  if (!nextLvMoney.value) {
+    return "";
+  }
+  if (props.config.upgradeType == "cost" && props.distributionUser) {
+    return nextLvMoney.value - (props.distributionUser.consumeAmount || 0);
+  }
+  if (props.config.upgradeType == "invite" && props.distributionUser) {
+    return nextLvMoney.value - (props.config.inviteCount || 0);
+  }
+});
+</script>
+
+<style  lang="scss">
+.title {
+  color: #000000;
+  font-size: 32rpx;
+  font-weight: 700;
+}
+.top {
+  border-bottom: 2rpx solid #ededed;
+}
+</style>
\ No newline at end of file
diff --git a/distribution/components/tips-popup.vue b/distribution/components/tips-popup.vue
new file mode 100644
index 0000000..c6f8228
--- /dev/null
+++ b/distribution/components/tips-popup.vue
@@ -0,0 +1,57 @@
+<template>
+  <view>
+    <up-popup
+      :show="show"
+      @close="close"
+      mode="center"
+      :safe-area-inset-bottom="false"
+    >
+      <view class="u-flex top justify-between u-p-32">
+        <text class="title">{{props.tipsType}}</text>
+        <up-icon name="close" @click="close"></up-icon>
+      </view>
+      <view class="u-p-30 font-14" style="width: 500rpx">
+        {{ popupText }}
+      </view>
+    </up-popup>
+  </view>
+</template>
+
+
+<script setup>
+import { ref, computed } from "vue";
+
+const show = defineModel({
+  type: Boolean,
+  default: false,
+});
+const props = defineProps({
+  tipsType: {
+    type: String,
+    default: "",
+  },
+});
+function close() {
+  show.value = false;
+}
+
+const popupText = computed(() => {
+  if (props.tipsType === "总收益") {
+    return "总收益：即您在所有店铺通过分销获得总金额，包括待入账金额，但不包含已退款订单";
+  }
+  if (props.tipsType === "待入账") {
+    return "待入账：即已通过订单分销获得但未达到结算时间的金额，结算时间达到后将会计入可提现金额";
+  }
+});
+</script>
+
+<style  lang="scss">
+  .title {
+    color: #000000;
+    font-size: 32rpx;
+    font-weight: 700;
+  }
+  .top {
+    border-bottom: 2rpx solid #ededed;
+  }
+</style>
\ No newline at end of file
diff --git a/distribution/income-details/index.vue b/distribution/income-details/index.vue
new file mode 100644
index 0000000..cebd4e1
--- /dev/null
+++ b/distribution/income-details/index.vue
@@ -0,0 +1,660 @@
+<template>
+  <view class="container">
+    <view class="header-wrap">
+      <view class="u-flex" style="justify-content: flex-end"> </view>
+      <view class="search-wrap">
+        <view class="input-wrap" @click="showStatus = true">
+          <view class="icon right">
+            <u-icon name="arrow-down" size="12"></u-icon>
+          </view>
+          <input
+            v-model="querForm.statusName"
+            class="ipt right"
+            type="text"
+            placeholder="全部"
+            placeholder-style="font-size: 28rpx"
+            disabled
+          />
+        </view>
+        <view class="input-wrap" @click="showTimeArea = true">
+          <view class="icon right">
+            <u-icon name="arrow-down" size="12"></u-icon>
+          </view>
+          <input
+            v-model="querForm.timeArea"
+            class="ipt right"
+            type="text"
+            placeholder="选择日期范围"
+            placeholder-style="font-size: 28rpx"
+            disabled
+          />
+        </view>
+        <view class="input-wrap" @click="show = true">
+          <view class="icon right">
+            <u-icon name="arrow-down" size="12"></u-icon>
+          </view>
+          <input
+            v-model="querForm.shopName"
+            class="ipt right"
+            type="text"
+            placeholder="全部店铺"
+            placeholder-style="font-size: 28rpx"
+            disabled
+          />
+        </view>
+      </view>
+    </view>
+    <view>
+      <view
+        class="u-p-t-16 u-p-b-20 u-flex u-p-l-28 u-p-r-28"
+        style="align-items: baseline; justify-content: flex-end"
+      >
+        <text class="color-666 font-12"> 总计：</text>
+        <text class="font-16 color-333 font-700" v-if="centerUserInfo">
+          {{ centerUserInfo.totalIncome }}</text
+        >
+      </view>
+
+      <view class="list">
+        <view v-for="(item, index) in state.records" :key="index" class="item">
+          <view class="u-flex justify-between">
+            <view>
+              <text class="color-666">来源：</text>
+              <text class="color-333 font-700">{{ item.shopName }}</text>
+            </view>
+            <view>
+              <text class="color-666" v-if="item.status == 'pending'"
+                >待入账</text
+              >
+              <text class="color-666" v-if="item.status == 'success'"
+                >已入账</text
+              >
+              <text class="color-666" v-if="item.status == 'refund'"
+                >已退款</text
+              >
+            </view>
+          </view>
+          <view class="u-flex justify-between u-m-t-16">
+            <view>
+              <text class="color-666">订单：</text>
+              <text class="color-333 font-700">{{ item.orderNo }}</text>
+            </view>
+            <view class="money">
+              <text class="money reduce" v-if="item.status == 'refund'"
+                >-{{ item.rewardAmount }}</text
+              >
+
+              <text class="money" v-else>+{{ item.rewardAmount }}</text>
+              <text class="tag" v-if="item.status == 'refund'">订单退款</text>
+              <text class="tag" v-else-if="item.level == 1"
+                >(订单一级分成)</text
+              >
+              <text class="tag" v-else-if="item.level == 2"
+                >(订单二级分成)</text
+              >
+            </view>
+          </view>
+          <view class="u-flex justify-between u-m-t-16">
+            <view>
+              <text class="color-666">时间：</text>
+              <text class="color-333 font-700">{{ item.createTime }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <u-loadmore :status="isEnd ? 'nomore' : 'loading'"></u-loadmore>
+    <u-popup :show="show" round="20" closeable @close="show = false">
+      <view class="shoplist-popup">
+        <view class="title">
+          <text class="t">店铺列表</text>
+        </view>
+        <scroll-view
+          class="popup-list"
+          direction="vertical"
+          @scrollend="scrollBottom"
+        >
+          <view
+            class="item"
+            v-for="item in shopList"
+            :key="item.shopId"
+            @click="selectShopHandle(item)"
+          >
+            <text class="t">{{ item.shopName }}</text>
+            <text class="intro">地址：{{ item.shopAddress }}</text>
+          </view>
+          <u-loadmore status="nomore"></u-loadmore>
+        </scroll-view>
+      </view>
+    </u-popup>
+
+    <up-action-sheet
+      cancelText="取消"
+      :actions="statusList"
+      title="选择状态"
+      :show="showStatus"
+      closeOnClickAction
+      @close="showStatus = false"
+      @select="selectStatusHandle"
+      round="16"
+    ></up-action-sheet>
+
+    <dateAreaSel
+      :show="showTimeArea"
+      :minYear="2022"
+      @close="showTimeArea = false"
+      @confirm="confirmTimeArea"
+    ></dateAreaSel>
+  </view>
+</template>
+
+<script setup>
+import dayjs from "dayjs";
+import dateAreaSel from "@/components/date-range-picker/date-range-picker.vue";
+import { ref, reactive, onMounted, computed, watch } from "vue";
+import * as distributionApi from "@/common/api/market/distribution.js";
+
+import {
+  onLoad,
+  onReady,
+  onShow,
+  onPageScroll,
+  onReachBottom,
+} from "@dcloudio/uni-app";
+import {
+  APIcouponfindByUserId,
+  APIfindCoupon,
+  getCouponShops,
+} from "@/common/api/member.js";
+
+const show = ref(false);
+const showTimeArea = ref(false);
+
+const querForm = ref({
+  shopId: "",
+  shopName: "",
+  statusActiveIndex: 0,
+  status: "",
+  statusName: "",
+  startTime: "",
+  timeArea: "",
+  endTime: "",
+  page: 1,
+});
+
+function confirmTimeArea(e) {
+  querForm.value.date = e;
+  querForm.value.startTime = e[0];
+  querForm.value.endTime = e[1];
+  querForm.value.timeArea = e[0] + "-" + e[1];
+}
+
+// 状态
+const statusList = ref([
+  {
+    value: "pending",
+    name: "待入账",
+    color: "#333",
+    fontSize: "16",
+  },
+  {
+    value: "success",
+    name: "已入账",
+    color: "#333",
+    fontSize: "16",
+  },
+  {
+    value: "refund",
+    name: "已退款",
+    color: "#333",
+    fontSize: "16",
+  },
+]);
+const returnStatusName = () => {
+  let name = "";
+  statusList.value.forEach((item) => {
+    if (item.value == querForm.value.status) {
+      name = item.name;
+    }
+  });
+  return name;
+};
+function selectStatusHandle(e) {
+  console.log(e);
+  querForm.value.status = e.value;
+  querForm.value.statusName = returnStatusName();
+}
+
+onReachBottom(() => {
+  console.log("到底了");
+  if (!isEnd.value) {
+    console.log("没有跟多了");
+    querForm.value.page++;
+    getIncomeDetailsAjax();
+  }
+});
+
+const showStatus = ref(false);
+
+// 店铺列表滚动到底部了
+function scrollBottom() {
+  console.log("店铺列表滚动到底部了");
+}
+
+// 选择店铺
+function selectShopHandle(item) {
+  querForm.value.shopId = item.shopId;
+  querForm.value.shopName = item.shopName;
+  show.value = false;
+}
+// 获取当前店铺会员信息
+const shopList = ref([]);
+async function getCouponShopsAjax() {
+  try {
+    const res = await distributionApi.activates({ page: 1, size: 999 });
+    shopList.value = res.records || [];
+  } catch (error) {
+    console.log(error);
+  }
+}
+
+// 获取收益明细
+const state = reactive({
+  records: [],
+  totalRow: 0,
+});
+const isEnd = ref(false);
+async function getIncomeDetailsAjax() {
+  try {
+    const ajaxQuery = {
+      shopId: querForm.value.shopId,
+      startTime: querForm.value.startTime
+        ? `${querForm.value.startTime} 00:00:00`
+        : "",
+      endTime: querForm.value.endTime
+        ? `${querForm.value.endTime} 23:59:59`
+        : "",
+      status: querForm.value.status,
+      page: querForm.value.page,
+    };
+    console.log("ajaxQuery,", ajaxQuery);
+    const res = await distributionApi.getIncomeDetails(ajaxQuery);
+    if (res) {
+      if (querForm.value.page == 1) {
+        Object.assign(state, res);
+      } else {
+        state.totalPage = res.totalPage * 1;
+        state.records.push(...(res.records || []));
+      }
+      isEnd.value = querForm.value.page >= res.totalPage * 1;
+    }
+  } catch (error) {
+    console.log(error);
+  }
+}
+
+const centerUserInfo = ref({});
+async function centerUser() {
+  const res = await distributionApi.centerUser();
+  centerUserInfo.value = res;
+}
+onShow(() => {});
+
+onLoad(async (opt) => {
+  await getCouponShopsAjax();
+
+  console.log(opt);
+  if (opt.name) {
+    const findItem = statusList.value.find((item) => item.name == opt.name);
+    if (findItem) {
+      querForm.value.status = findItem.value;
+      querForm.value.statusName = findItem.name;
+    }
+  }
+  if (opt.shopId) {
+    querForm.value.shopId = opt.shopId;
+    const findItem = couponShops.value.find((item) => item.id == opt.shopId);
+    querForm.value.shopName = findItem.shopName || "";
+  }
+  centerUser();
+  getIncomeDetailsAjax();
+});
+
+watch(
+  () => querForm.value.status,
+  (newVal, oldVal) => {
+    querForm.value.page = 1;
+    isEnd.value = false;
+    getIncomeDetailsAjax();
+  }
+);
+watch(
+  () => querForm.value.shopId,
+  (newVal, oldVal) => {
+    querForm.value.page = 1;
+    isEnd.value = false;
+    getIncomeDetailsAjax();
+  }
+);
+watch(
+  () => querForm.value.startTime,
+  (newVal, oldVal) => {
+    querForm.value.page = 1;
+    isEnd.value = false;
+    getIncomeDetailsAjax();
+  }
+);
+watch(
+  () => querForm.value.endTime,
+  (newVal, oldVal) => {
+    querForm.value.page = 1;
+    isEnd.value = false;
+    getIncomeDetailsAjax();
+  }
+);
+</script>
+
+<style>
+page {
+  background-color: #f7f7f7;
+}
+</style>
+<style scoped lang="scss">
+.container {
+  padding: 130rpx 0 28upx;
+}
+.list {
+  font-size: 28rpx;
+  .item {
+    background-color: #fff;
+    padding: 32rpx 28rpx 32rpx 36rpx;
+    margin-bottom: 16rpx;
+    .money {
+      line-height: 44rpx;
+      color: #fe7e00;
+      font-size: 48rpx;
+      font-weight: 700;
+      position: relative;
+      &.reduce {
+        color: #ff1c1c;
+      }
+      .tag {
+        position: absolute;
+        font-weight: 400;
+        right: 0;
+        top: 100%;
+        font-size: 28rpx;
+        white-space: nowrap;
+        color: #999;
+        transform: translateY(10rpx);
+      }
+    }
+  }
+}
+.header-wrap {
+  width: 100%;
+  background-color: #fff;
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 99;
+  padding: 28upx;
+  .search-wrap {
+    display: flex;
+    gap: 20upx;
+    .input-wrap {
+      height: 70upx;
+      border: 1px solid #ececec;
+      border-radius: 8upx;
+      position: relative;
+      box-sizing: border-box;
+      &:nth-child(1) {
+        width: 170rpx;
+      }
+      &:nth-child(2) {
+        flex: 1;
+      }
+      &:nth-child(3) {
+        width: 226rpx;
+      }
+      .icon {
+        position: absolute;
+        top: 50%;
+        transform: translateY(-50%);
+        &.left {
+          left: 14upx;
+        }
+        &.right {
+          right: 14upx;
+        }
+      }
+      .ipt {
+        width: 100%;
+        height: 100%;
+        font-size: 28rpx;
+        &.left {
+          padding-left: 68upx;
+        }
+        &.right {
+          padding: 0 56upx 0 24upx;
+        }
+      }
+    }
+  }
+  .status-wrap {
+    display: flex;
+    padding-top: 28upx;
+    position: relative;
+    .icon-wrap {
+      height: 12upx;
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      transition: all 0.3s ease-in-out;
+      .active-icon {
+        width: 24upx;
+        height: 12upx;
+        z-index: 9;
+      }
+    }
+    .item {
+      flex: 1;
+      height: 80upx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      .t {
+        font-size: 32upx;
+        color: #666666;
+        transition: all 0.3s ease-in-out 0.1s;
+      }
+      &.active {
+        .t {
+          color: #e3ad7f;
+        }
+      }
+    }
+  }
+}
+.list-wrap {
+  padding-top: 28upx;
+  .item {
+    border-radius: 18upx;
+    background-color: #fff;
+    padding: 28upx;
+    &:not(:first-child) {
+      margin-top: 28upx;
+    }
+    .top {
+      display: flex;
+      align-items: center;
+      padding-bottom: 28upx;
+      .icon {
+        $size: 140upx;
+        width: $size;
+        height: $size;
+        margin-right: 28upx;
+      }
+      .info {
+        flex: 1;
+        display: flex;
+        justify-content: center;
+        flex-direction: column;
+        gap: 8upx;
+        padding-left: 28upx;
+        position: relative;
+        &::after {
+          $height: 100upx;
+          content: "";
+          height: $height;
+          border-left: 1upx solid #f7f7f7;
+          position: absolute;
+          top: 50%;
+          margin-top: $height * 0.5 * -1;
+          left: 0;
+        }
+        .view {
+          flex: 1;
+          &.name {
+            font-size: 32upx;
+            color: #333;
+          }
+          &.time {
+            .t {
+              font-size: 24upx;
+              color: #999;
+            }
+          }
+        }
+      }
+      .btn {
+        width: 120upx;
+        height: 48upx;
+        border-radius: 48upx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background-color: #333;
+        .t {
+          font-size: 24upx;
+          color: #fff;
+        }
+        &.disabled {
+          background-color: #f8f8f8;
+          .t {
+            color: #999999;
+          }
+        }
+      }
+    }
+    .btm {
+      display: flex;
+      align-items: center;
+      padding: 28upx 0 14upx;
+      border-top: 1upx solid #f7f7f7;
+      .left {
+        flex: 1;
+        height: 40upx;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        font-size: 24upx;
+        color: #999;
+      }
+      .right {
+        flex: 1;
+        display: flex;
+        align-items: center;
+        padding-left: 28upx;
+        justify-content: flex-end;
+        .t {
+          font-size: 24upx;
+          color: #333;
+        }
+      }
+    }
+  }
+}
+.shoplist-popup {
+  padding: 0 28upx 28upx;
+  .title {
+    padding: 28upx 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .t {
+      font-size: 32upx;
+      font-weight: bold;
+      color: #333;
+    }
+  }
+  .popup-list {
+    max-height: 50vh;
+    .item {
+      padding: 28upx;
+      border-radius: 12upx;
+      background-color: #f7f7f7;
+      margin-bottom: 28upx;
+      display: flex;
+      flex-direction: column;
+      padding: 28upx;
+      .t {
+        font-size: 28upx;
+        font-weight: bold;
+        color: #333;
+        /* 必须设置宽度 */
+        width: 600upx; /* 或具体像素值 */
+
+        /* 关键属性 */
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 1; /* 显示2行 */
+        overflow: hidden;
+
+        /* 文本溢出省略号 */
+        text-overflow: ellipsis;
+
+        /* 可选：防止行高度，确保计算准确 */
+        line-height: 1.5;
+        word-break: break-all; /* 允许在单词内换行 */
+        word-wrap: break-word; /* 允许长单词或URL换行 */
+      }
+      .intro {
+        font-size: 28upx;
+        color: #999;
+        /* 必须设置宽度 */
+        width: 600upx; /* 或具体像素值 */
+
+        /* 关键属性 */
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2; /* 显示2行 */
+        overflow: hidden;
+
+        /* 文本溢出省略号 */
+        text-overflow: ellipsis;
+
+        /* 可选：防止行高度，确保计算准确 */
+        line-height: 1.5;
+        word-break: break-all; /* 允许在单词内换行 */
+        word-wrap: break-word; /* 允许长单词或URL换行 */
+      }
+    }
+    .ul {
+      .li {
+        color: #999;
+        font-size: 28upx;
+        padding: 8upx 0;
+        .t {
+          color: #999;
+          font-size: 28upx;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/distribution/index.vue b/distribution/index.vue
new file mode 100644
index 0000000..6753150
--- /dev/null
+++ b/distribution/index.vue
@@ -0,0 +1,338 @@
+<template>
+  <view>
+    <up-navbar
+      bg-color="transparent"
+      title="分销中心"
+      @leftClick="back"
+      :fixed="true"
+    ></up-navbar>
+    <view class="top">
+      <image class="top_bg" src="/distribution/static/top_bg.png"></image>
+      <view class="top_content">
+        <view class="u-flex justify-between">
+          <view>
+            <view class="u-flex">
+              <text class="font-12 color-666 u-m-r-6" @click="toShouyiDetail('')"
+                >总收益</text
+              >
+              <up-icon
+                name="question-circle"
+                size="12"
+                color="#666"
+                @click="questionClick('总收益')"
+              ></up-icon>
+            </view>
+            <view class="price" @click="toShouyiDetail('')">{{
+              state.totalIncome
+            }}</view>
+          </view>
+          <view>
+            <view class="u-flex">
+              <text class="font-12 color-666 u-m-r-6" @click="toShouyiDetail('待入账')"
+                >待入账</text
+              >
+              <up-icon
+                name="question-circle"
+                size="12"
+                color="#666"
+                @click="questionClick('待入账')"
+              ></up-icon>
+            </view>
+            <view class="price" @click="toShouyiDetail('待入账')">{{
+              state.pendingIncome
+            }}</view>
+          </view>
+        </view>
+        <view class="u-flex justify-between u-m-t-16">
+          <view>
+            <view class="u-flex">
+              <text class="font-12 color-666 u-m-r-6" @click="toTixian"
+                >可提现金额</text
+              >
+            </view>
+            <view class="u-flex" style="align-items: baseline">
+              <text class="price">{{ state.cashOutAmount }}</text>
+              <view class="u-flex" @click="toTixian">
+                <text class="font-12 color-666 u-m-r-6 u-m-l-6">去提现</text>
+                <up-icon
+                  name="arrow-right"
+                  size="12"
+                  color="#666"
+                  @click="toTixian"
+                ></up-icon>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="bottom">
+      <view class="u-flex">
+        <view class="title">我的分销</view>
+      </view>
+      <view class="u-m-t-36 small-title"
+        >已成为{{ state.activates.totalRow }}家店铺的分销员</view
+      >
+      <view class="list">
+        <view
+          v-for="(item, index) in state.activates.records"
+          @click="toShopDetail(item, 'activates')"
+          :key="index"
+          class="shop-item"
+        >
+          <up-image
+            width="104rpx"
+            height="104rpx"
+            radius="8rpx"
+            :src="item.coverImg"
+          ></up-image>
+          <view class="u-flex-1 u-m-l-14">
+            <view class="u-flex justify-between">
+              <view>
+                <view class="shop-name">{{ item.shopName }}</view>
+                <view class="address u-line-1 u-m-t-16">{{
+                  item.shopAddress
+                }}</view>
+              </view>
+              <view>
+                <view class="shouyi">收益</view>
+                <view class="price">¥{{ item.income || "0.00" }}</view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view
+          v-if="state.activates.totalRow > 0"
+          class="u-flex justify-center font-12 color-666"
+          style="align-items: baseline"
+          @click="toShopList('activates')"
+        >
+          <view>查看全部店铺</view>
+          <up-icon name="arrow-right" size="12" color="#666"></up-icon>
+        </view>
+      </view>
+
+      <view class="u-flex u-m-t-32">
+        <view class="title">更多店铺解锁</view>
+      </view>
+      <view class="list">
+        <view
+          v-for="(item, index) in state.unActivates.records"
+          :key="index"
+          class="shop-item"
+          @click="toShopDetail(item, 'unActivates')"
+        >
+          <up-image
+            width="104rpx"
+            height="104rpx"
+            radius="8rpx"
+            :src="item.coverImg"
+          ></up-image>
+          <view class="u-flex-1 u-m-l-14">
+            <view class="u-flex justify-between align-center">
+              <view>
+                <view class="shop-name">{{ item.shopName }}</view>
+                <view class="u-flex">
+                  <view class="tag" v-if="item.labelContent">{{
+                    item.labelContent
+                  }}</view>
+                </view>
+                <view class="address u-line-1">{{ item.shopAddress }}</view>
+              </view>
+              <view class="u-flex u-flex-col justify-center">
+                <view class="fufei" v-if="item.openType == 'pay'"
+                  >付费开通</view
+                >
+                <view class="fufei" v-else-if="item.openType == 'manual'"
+                  >手动开通</view
+                >
+                <template v-else-if="item.openType == 'auto'">
+                  <view class="font-12 color-333 font-700">自动开通</view>
+                  <view class="u-m-t-8 color-666 font-12"
+                    >还差{{
+                      item.shopInviteCount - item.userInviteCount
+                    }}人开通</view
+                  >
+                </template>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view
+          v-if="state.activates.totalRow > 0"
+          class="u-flex justify-center font-12 color-666"
+          style="align-items: baseline"
+          @click="toShopList('unActivates')"
+        >
+          <view>查看全部店铺</view>
+          <up-icon name="arrow-right" size="12" color="#666"></up-icon>
+        </view>
+      </view>
+    </view>
+
+    <TipsPopup v-model="showPopup" :tips-type="tipsType"></TipsPopup>
+  </view>
+</template>
+
+<script setup>
+import { ref, reactive } from "vue";
+import { onShow } from "@dcloudio/uni-app";
+import TipsPopup from "./components/tips-popup.vue";
+import * as distributionApi from "@/common/api/market/distribution.js";
+const showPopup = ref(false);
+const popupText = ref("");
+const tipsType = ref("");
+function questionClick(title) {
+  if (title == "总收益") {
+    tipsType.value = "总收益";
+  }
+  if (title == "待入账") {
+    tipsType.value = "待入账";
+  }
+  showPopup.value = true;
+}
+function back() {
+  uni.navigateBack({
+    delta: 1,
+  });
+}
+
+function toShouyiDetail(name) {
+  uni.navigateTo({
+    url: "/distribution/income-details/index?name="+name,
+  });
+}
+
+function toShopDetail(item, type) {
+  uni.navigateTo({
+    url:
+      "/distribution/shop-detail/index?shopId=" + item.shopId + "&type=" + type,
+  });
+}
+
+function toTixian() {
+  uni.navigateTo({
+    url: "/distribution/withdraw/index",
+  });
+}
+function toShopList(type) {
+  uni.navigateTo({
+    url: "/distribution/shop-list/index?type=" + type,
+  });
+}
+const state = reactive({
+  totalIncome: 0,
+  pendingIncome: 0,
+  cashOutAmount: 0,
+  totalIncome: 0,
+  activates: {
+    totalRow: 0,
+    records: [],
+  },
+  unActivates: {
+    totalRow: 0,
+    records: [],
+  },
+});
+async function init() {
+  const res = await distributionApi.centerUser();
+  if (res) {
+    Object.assign(state, res);
+  }
+}
+onShow(init);
+</script>
+
+<style scoped lang="scss">
+.list {
+  .shop-item {
+    padding: 16rpx 0;
+    border-top: 2rpx solid #ededed;
+    font-size: 24rpx;
+    color: #666;
+    display: flex;
+    align-items: center;
+    &:first-child {
+      border-top: none;
+    }
+    .fufei {
+      color: #e8ad7b;
+    }
+    .tag {
+      font-size: 24rpx;
+      color: #ff1c1c;
+      background-color: #ffe4e4;
+      padding: 8rpx 20rpx;
+      border-radius: 8rpx;
+    }
+    .shop-name {
+    }
+    .address {
+      max-width: 390rpx;
+    }
+    .shouyi {
+      font-size: 24rpx;
+      color: #666;
+      text-align: center;
+    }
+    .price {
+      font-size: 20rpx;
+      color: #333;
+      font-weight: 500;
+    }
+  }
+}
+
+.price {
+  font-weight: 700;
+  color: #333;
+  font-size: 40rpx;
+  margin-top: 16rpx;
+}
+.top {
+  position: relative;
+  .top_content {
+    background-color: #faf7f4;
+    position: absolute;
+    left: 28rpx;
+    right: 28rpx;
+    bottom: 0;
+    padding: 32rpx 106rpx 32rpx 56rpx;
+    border-radius: 24rpx 24rpx 0 0;
+  }
+}
+.top_bg {
+  width: 100%;
+  height: 530rpx;
+}
+.bottom {
+  padding: 34rpx 28rpx;
+}
+.title {
+  font-size: 32rpx;
+  font-weight: 700;
+  color: #333;
+  position: relative;
+  overflow: hidden;
+  &::after {
+    display: block;
+    content: "";
+    position: absolute;
+    right: 0;
+    bottom: 4rpx;
+    background-color: #9ee708;
+    border-radius: 10rpx;
+    z-index: -1;
+    width: 94.2rpx;
+    height: 13.98rpx;
+    flex-shrink: 0;
+    stroke-width: 4rpx;
+    stroke: #9ee708d6;
+  }
+}
+.small-title {
+  font-size: 28rpx;
+  font-weight: 700;
+  color: #333;
+}
+</style>
\ No newline at end of file
diff --git a/distribution/poster.vue b/distribution/poster.vue
new file mode 100644
index 0000000..a5a3218
--- /dev/null
+++ b/distribution/poster.vue
@@ -0,0 +1,279 @@
+<template>
+  <view class="poster-page">
+    <view class="preview-container" v-if="posterUrl">
+      <image :src="posterUrl" mode="widthFix" class="poster-img"></image>
+      <button class="save-btn" @click="saveToAlbum">保存到相册</button>
+    </view>
+    <button class="generate-btn" @click="generatePoster" v-if="!posterUrl">生成海报</button>
+    <canvas
+      id="posterCanvas"
+      type="2d"
+      :style="{ width: canvasWidth + 'px', height: canvasHeight + 'px' }"
+      class="canvas-hidden"
+    ></canvas>
+  </view>
+</template>
+
+<script setup>
+import { ref, getCurrentInstance } from 'vue'
+import { onReady } from '@dcloudio/uni-app'
+
+// 基础变量（不变）
+const canvasWidth = ref(375)
+const canvasHeight = ref(667)
+const posterUrl = ref('')
+let canvasNode = null
+let ctx = null
+const instance = getCurrentInstance()
+
+// 海报配置（不变）
+const posterConfig = {
+  bgImage: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/677c4a5ae43a45eb98c0ae1a6d242021.png',
+  title: { text: '限时优惠活动', x: 20, y: 40, fontSize: 24, color: '#fff', fontWeight: 'bold' },
+  desc: { text: '全场商品满200减50，限时3天', x: 20, y: 80, fontSize: 16, color: '#fff' },
+  mainImage: { url: 'https://img.yzcdn.cn/vant/apple-1.jpg', x: 20, y: 120, width: 335, height: 335, radius: 10 },
+  qrcode: { url: 'https://czg-oss.oss-cn-hangzhou.aliyuncs.com/catering/store/HQ200龙虾仔.JPG', x: 265, y: 500, width: 90, height: 90 },
+  footerText: { text: '扫码立即参与活动', x: 20, y: 550, fontSize: 14, color: '#333' }
+}
+
+// 初始化 Canvas（不变）
+onReady(() => {
+  const query = uni.createSelectorQuery().in(instance)
+  query
+    .select('#posterCanvas')
+    .fields({ node: true, size: true })
+    .exec((res) => {
+      if (!res[0] || !res[0].node) {
+        console.error('未找到 Canvas 节点')
+        uni.showToast({ title: 'Canvas节点初始化失败', icon: 'none' })
+        return
+      }
+      canvasNode = res[0].node
+      canvasNode.width = canvasWidth.value
+      canvasNode.height = canvasHeight.value
+      ctx = canvasNode.getContext('2d')
+      if (!ctx) {
+        console.error('获取 2D 上下文失败')
+        uni.showToast({ title: 'Canvas上下文初始化失败', icon: 'none' })
+      }
+    })
+})
+
+// 绘制背景（依赖修复后的 drawImage）
+const drawBackground = () => {
+  return new Promise((resolve, reject) => {
+    if (!posterConfig.bgImage) return reject('无背景图')
+    drawImage({
+      url: posterConfig.bgImage,
+      x: 0,
+      y: 0,
+      width: canvasWidth.value,
+      height: canvasHeight.value
+    }).then(resolve).catch(reject)
+  })
+}
+
+// 绘制文字（不变）
+const drawText = (options) => {
+  const { text, x, y, fontSize, color, fontWeight = 'normal', fontFamily = 'sans-serif' } = options
+  ctx.font = `${fontWeight} ${fontSize}px ${fontFamily}`
+  ctx.fillStyle = color
+  ctx.fillText(text, x, y)
+}
+
+// 绘制圆角矩形（不变）
+const drawRoundRect = (x, y, width, height, radius) => {
+  ctx.beginPath()
+  ctx.moveTo(x + radius, y)
+  ctx.arcTo(x + width, y, x + width, y + height, radius)
+  ctx.arcTo(x + width, y + height, x, y + height, radius)
+  ctx.arcTo(x, y + height, x, y, radius)
+  ctx.arcTo(x, y, x + width, y, radius)
+  ctx.closePath()
+}
+
+// ---------------------- 核心修复：drawImage 方法（无需 Image 实例） ----------------------
+const drawImage = (options) => {
+  return new Promise((resolve, reject) => {
+    const { url, x, y, width, height, radius = 0 } = options
+    if (!url) return reject('图片路径为空')
+    if (width <= 0 || height <= 0) return reject(`图片尺寸无效：${width}x${height}`)
+    // 关键：确保 canvasNode 已初始化（否则无法创建图片对象）
+    if (!canvasNode) return reject('Canvas 节点未初始化，无法创建图片对象')
+
+    // 1. 获取图片临时路径（不变）
+    uni.getImageInfo({
+      src: url,
+      success: (imgInfo) => {
+        if (imgInfo.width <= 0 || imgInfo.height <= 0) {
+          return reject(`无效图片：${url}`)
+        }
+
+        // 2. 关键修复：用 Canvas 节点的 createImage() 方法创建图片对象
+        // 这是微信小程序 Canvas 2D 节点原生支持的方法，类型完全匹配
+        const image = canvasNode.createImage()
+
+        // 3. 监听图片加载完成（接口与标准 Image 一致）
+        image.onload = () => {
+          try {
+            if (radius > 0) {
+              ctx.save()
+              drawRoundRect(x, y, width, height, radius)
+              ctx.clip()
+            }
+
+            // 4. 绘制图片：传入 Canvas 节点创建的图片实例（类型匹配）
+            ctx.drawImage(image, x, y, width, height)
+
+            if (radius > 0) ctx.restore()
+            resolve()
+          } catch (drawErr) {
+            reject(`绘制图片失败：${drawErr.message}`)
+          }
+        }
+
+        // 监听加载失败
+        image.onerror = (err) => {
+          reject(`图片加载失败：${err.message || '未知错误'}`)
+        }
+
+        // 5. 赋值临时路径，触发加载
+        image.src = imgInfo.path
+      },
+      fail: (err) => {
+        reject(`获取图片信息失败：${err.errMsg}（路径：${url}）`)
+      }
+    })
+  })
+}
+
+// 生成海报（不变）
+const generatePoster = async () => {
+  try {
+    if (!canvasNode || !ctx) throw new Error('Canvas 未初始化完成')
+    ctx.clearRect(0, 0, canvasWidth.value, canvasHeight.value)
+
+    // 绘制背景（失败则用纯色兜底）
+    await drawBackground().catch(() => {
+      ctx.fillStyle = '#f5f5f5'
+      ctx.fillRect(0, 0, canvasWidth.value, canvasHeight.value)
+    })
+
+    // 绘制文字
+    drawText(posterConfig.title)
+    drawText(posterConfig.desc)
+    drawText(posterConfig.footerText)
+
+    // 绘制图片（主图 + 二维码）
+    await drawImage(posterConfig.mainImage)
+    await drawImage(posterConfig.qrcode)
+
+    // 延迟确保绘制生效
+    await new Promise(resolve => setTimeout(resolve, 200))
+    await convertToImage()
+    uni.showToast({ title: '海报生成成功', icon: 'success' })
+  } catch (err) {
+    console.error('生成失败：', err)
+    uni.showToast({ title: `生成失败：${err.message}`, icon: 'none' })
+  }
+}
+
+// 转图片（不变）
+const convertToImage = () => {
+  return new Promise((resolve, reject) => {
+    if (!canvasNode) return reject('Canvas 节点不存在')
+    uni.canvasToTempFilePath({
+      canvas: canvasNode,
+      width: canvasWidth.value,
+      height: canvasHeight.value,
+      destWidth: canvasWidth.value * 2,
+      destHeight: canvasHeight.value * 2,
+      success: (res) => {
+        posterUrl.value = res.tempFilePath
+        resolve()
+      },
+      fail: (err) => {
+        reject(`转图片失败：${err.errMsg}`)
+      }
+    }, instance)
+  })
+}
+
+// 保存相册相关方法（不变）
+const saveToAlbum = () => {
+  if (!posterUrl.value) return
+  uni.getSetting({
+    success: (res) => {
+      if (!res.authSetting['scope.writePhotosAlbum']) {
+        uni.authorize({
+          scope: 'scope.writePhotosAlbum',
+          success: saveImage,
+          fail: () => {
+            uni.showModal({
+              title: '权限申请',
+              content: '需要相册权限才能保存海报',
+              success: (modalRes) => modalRes.confirm && uni.openSetting()
+            })
+          }
+        })
+      } else {
+        saveImage()
+      }
+    }
+  })
+}
+
+const saveImage = () => {
+  uni.saveImageToPhotosAlbum({
+    filePath: posterUrl.value,
+    success: () => uni.showToast({ title: '保存成功', icon: 'success' }),
+    fail: (err) => {
+      console.error('保存失败：', err)
+      uni.showToast({ title: '保存失败', icon: 'none' })
+    }
+  })
+}
+</script>
+
+<style scoped>
+/* 样式不变 */
+.poster-page {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 20rpx;
+}
+.canvas-hidden {
+  position: absolute;
+  left: -9999rpx;
+  top: -9999rpx;
+  z-index: -1;
+  width: 375px;
+  height: 667px;
+}
+.preview-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+}
+.poster-img {
+  width: 100%;
+  border-radius: 16rpx;
+  box-shadow: 0 4rpx 10rpx rgba(0, 0, 0, 0.1);
+}
+.generate-btn, .save-btn {
+  width: 600rpx;
+  height: 88rpx;
+  line-height: 88rpx;
+  margin-top: 40rpx;
+  background-color: #07c160;
+  color: #ffffff;
+  font-size: 32rpx;
+  border-radius: 44rpx;
+}
+.save-btn {
+  background-color: #1677ff;
+  margin-top: 20rpx;
+}
+</style>
\ No newline at end of file
diff --git a/distribution/shiming/index.vue b/distribution/shiming/index.vue
new file mode 100644
index 0000000..fc7d249
--- /dev/null
+++ b/distribution/shiming/index.vue
@@ -0,0 +1,132 @@
+<template>
+  <view class="min-h-100vh bg-gray">
+    <view class="box">
+      <view class="u-flex">
+        <view class="title">姓名</view>
+        <view class="u-flex-1 input-box">
+          <input
+            type="text"
+            v-model="form.realName"
+            class="input"
+            placeholder="请输入姓名"
+          />
+        </view>
+      </view>
+      <view class="u-flex u-m-t-32">
+        <view class="title">身份证号</view>
+        <view class="u-flex-1 input-box">
+          <input
+            type="text"
+            v-model="form.idCard"
+            class="input"
+            placeholder="请输入身份证号"
+          />
+        </view>
+      </view>
+      <view class="tips">请输入和当前微信账号为同一实名，否则将会提现失败</view>
+    </view>
+    <view class="u-m-t-60 u-p-l-28 u-p-r-28">
+      <view class="submit" @click="submit">提交</view>
+      <view class="cancel" @click="cancel">取消</view>
+    </view>
+  </view>
+</template>
+<script setup>
+import { realNameAuth } from "@/common/api/market/distribution";
+import { ref, reactive } from "vue";
+import {validateName,validateIdCard} from "@/utils/util.js"
+const form = reactive({
+  realName: "",
+  idCard: "",
+});
+const userInfo = ref(uni.cache.get("userInfo") || {});
+form.realName=userInfo.value.realName
+form.idCard=userInfo.value.idCard
+
+async function submit() {
+  const validNameResult = validateName(form.realName)
+  if(!validNameResult.valid){
+    return uni.showToast({
+      title: validNameResult.msg,
+      icon: "none",
+      duration: 1500,
+    })
+  }
+  const validIdCardResult = validateIdCard(form.idCard)
+  if(!validIdCardResult.valid){
+    return uni.showToast({
+      title: validIdCardResult.msg,
+      icon: "none",
+      duration: 1500,
+    })
+  }
+
+  const res = await realNameAuth({ ...form, id: userInfo.value.id });
+  if (res) {
+    uni.showToast({
+      title: "修改成功",
+      icon: "none",
+      duration: 1500,
+    });
+    setTimeout(() => {
+      uni.navigateBack({
+        delta: 1,
+      });
+    }, 1500);
+  }
+}
+function cancel() {
+  uni.navigateBack({
+    delta: 1,
+  });
+}
+</script>
+
+
+<style scoped lang="scss">
+.min-h-100vh {
+  padding: 32rpx 28rpx;
+}
+.tips {
+  font-size: 24rpx;
+  line-height: 40rpx;
+  color: #ff1c1c;
+  margin-top: 32rpx;
+}
+.box {
+  background-color: #fff;
+  padding: 32rpx 28rpx;
+  font-size: 28rpx;
+  border-radius: 16rpx;
+  color: #333;
+  .title {
+    min-width: 160rpx;
+  }
+  .input-box {
+    border-bottom: 2rpx solid #ededed;
+    .input {
+    }
+  }
+}
+.submit {
+  background: #ffd158;
+  border-radius: 100rpx;
+  padding: 22rpx 288rpx;
+  font-size: 32rpx;
+  line-height: 46rpx;
+  color: #ffffff;
+  text-align: center;
+  font-weight: 700;
+  white-space: nowrap;
+}
+.cancel {
+  color: #999999;
+  white-space: nowrap;
+
+  border-radius: 100rpx;
+  padding: 22rpx 288rpx;
+  font-size: 32rpx;
+  line-height: 46rpx;
+  text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/distribution/shop-detail/components/bind-shangji.vue b/distribution/shop-detail/components/bind-shangji.vue
new file mode 100644
index 0000000..6b3489d
--- /dev/null
+++ b/distribution/shop-detail/components/bind-shangji.vue
@@ -0,0 +1,119 @@
+<template>
+  <view class="">
+    <up-popup
+      :show="show"
+      bgColor="transparent"
+      :safeAreaInsetBottom="false"
+      :closeOnClickOverlay="false"
+      @close="close"
+      mode="center"
+    >
+      <view class="box">
+        <view class="u-flex top justify-between u-p-32">
+          <text class="title">绑定上级</text>
+          <up-icon name="close" @click="close"></up-icon>
+        </view>
+        <view class="info">
+          <view class="u-flex u-col-center">
+            <view class="color-333 small-title">上级邀请码</view>
+            <view class="u-m-l-32 u-flex-1 border">
+              <input placeholder="请输入上级邀请码" v-model="code" />
+            </view>
+            <image src="/distribution/static/scan.svg" class="u-m-l-10" style="width: 60rpx; height: 60rpx;" @click="saoma"></image>
+          </view>
+
+          <view class="u-m-t-32 u-flex u-col-center" style="gap: 54rpx">
+            <view class="cancel" @click="close">取消</view>
+            <view class="confirm" @click="confirm">确认</view>
+          </view>
+        </view>
+      </view>
+    </up-popup>
+  </view>
+</template>
+  
+  <script setup>
+import { ref } from "vue";
+
+
+const show = defineModel({
+  type: Boolean,
+  default: false,
+});
+const code = ref("");
+const emits = defineEmits(["cancel", "confirm"]);
+function close() {
+  show.value = false;
+  emits("cancel");
+}
+function confirm() {
+  if (code.value == "") {
+    uni.showToast({
+      title: "请输入上级邀请码",
+      icon: "none",
+    });
+    return;
+  }
+  show.value = false;
+  emits("confirm", code.value);
+}
+function saoma(){
+  uni.scanCode({
+    success: (res) => {
+      code.value = res.result;
+    },
+  });
+}
+</script>
+  <style lang="scss" scoped>
+.border {
+  border: 2rpx solid #d9d9d9;
+  padding: 18rpx;
+  border-radius: 4rpx;
+}
+.box {
+  width: 586rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+  overflow: hidden;
+  .title {
+    color: #000000;
+    font-size: 32rpx;
+    font-weight: 700;
+  }
+  .top {
+    border-bottom: 2rpx solid #ededed;
+  }
+  .info {
+    padding: 32rpx 40rpx 40rpx 40rpx;
+    font-size: 28rpx;
+  }
+  .small-title {
+    min-width: 84rpx;
+    text-align: right;
+  }
+}
+
+.cancel {
+  padding: 14rpx 76rpx;
+  border-radius: 36rpx;
+  border: 2rpx solid #e8ad7b;
+  color: #e8ad7b;
+  font-size: 32rpx;
+  font-weight: 400;
+  white-space: nowrap;
+  line-height: 48rpx;
+}
+.confirm {
+  padding: 14rpx 76rpx;
+  border-radius: 36rpx;
+  background-color: #e8ad7b;
+  border: 2rpx solid #e8ad7b;
+  color: #fff;
+  font-size: 32rpx;
+  font-weight: 400;
+  line-height: 48rpx;
+  white-space: nowrap;
+}
+</style>
+  
\ No newline at end of file
diff --git a/distribution/shop-detail/components/share-popup.vue b/distribution/shop-detail/components/share-popup.vue
new file mode 100644
index 0000000..97dee80
--- /dev/null
+++ b/distribution/shop-detail/components/share-popup.vue
@@ -0,0 +1,184 @@
+<template>
+  <view class="">
+    <view class="w-qrcode">
+      <w-qrcode
+        :options="codeOptions"
+        :opacity="0"
+        ref="wQrcode"
+        @generate="(e) => qrcodeResult(e)"
+      ></w-qrcode>
+    </view>
+
+    <up-popup
+      :show="show"
+      bgColor="transparent"
+      :safeAreaInsetBottom="false"
+      :closeOnClickOverlay="true"
+      @close="close"
+      mode="center"
+    >
+      <view class="box">
+        <view class="info">
+          <view class="u-flex justify-center">
+            <up-avatar size="214rpx" :src="shopUserInfo.headImg"></up-avatar>
+          </view>
+          <view
+            class="u-m-t-48 font-14 font-700 color-333 text-center line-height-54"
+          >
+            <view>{{ shopUserInfo.nickName }} </view>
+            <view>{{ desensitizePhone(shopUserInfo.phone) }}</view>
+          </view>
+          <view class="u-m-t-16 font-14 line-height-54 text-center">
+            <text class="color-666">邀请码</text>
+            <text class="u-m-l-16 u-m-r-16 color-333 font-16 font-700">{{
+              inviteCode
+            }}</text>
+            <text class="" style="color: #fe6d11" @click="copyCode">复制</text>
+          </view>
+          <view class="u-flex justify-center" style="margin-top: 90rpx">
+            <!-- <w-qrcode
+              :options="codeOptions"
+              :opacity="1"
+              ref="wQrcode"
+              @generate="(e) => qrcodeResult(e)"
+            ></w-qrcode> -->
+            <up-image width="322rpx" height="322rpx" :src="code"></up-image>
+          </view>
+
+          <view class="u-m-t-60 u-flex u-col-center justify-center">
+            <view class="confirm" @click="save">保存图片</view>
+          </view>
+        </view>
+      </view>
+    </up-popup>
+  </view>
+</template>
+    
+    <script setup>
+import wQrcode from "@/uni_modules/wmf-code/components/w-qrcode/w-qrcode.vue";
+import {desensitizePhone} from "@/utils/util.js";
+import { ref } from "vue";
+const props = defineProps({
+  inviteCode: {
+    type: String,
+    default: "",
+  },
+  shopUserInfo: {
+    type: Object,
+    default: () => {},
+  },
+});
+const codeOptions = ref({
+  size: 200,
+  code: props.inviteCode,
+});
+function copyCode() {
+  uni.setClipboardData({
+    data: props.inviteCode,
+    success: function () {
+      console.log("success");
+    },
+  });
+}
+const code = ref("");
+
+function qrcodeResult(e) {
+  console.log("qrcodeResult", e);
+  code.value = e.img.tempFilePath;
+  console.log("code", code.value);
+}
+
+const show = defineModel({
+  type: Boolean,
+  default: false,
+});
+const emits = defineEmits(["cancel", "confirm"]);
+function close() {
+  show.value = false;
+  emits("cancel");
+}
+function save() {
+  show.value = false;
+
+  uni.saveImageToPhotosAlbum({
+    filePath: code.value,
+    success: function () {
+      uni.showToast({
+        title: "保存成功",
+      });
+    },
+    fail: function () {
+      uni.showToast({
+        title: "保存失败",
+      });
+    },
+  });
+
+  emits("confirm", code.value);
+}
+</script>
+
+<style lang="scss" scoped>
+:deep(.info .canvas) {
+  opacity: 1;
+}
+.border {
+  border: 2rpx solid #d9d9d9;
+  padding: 18rpx;
+  border-radius: 4rpx;
+}
+.box {
+  width: 638rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+  overflow: hidden;
+  .title {
+    color: #000000;
+    font-size: 32rpx;
+    font-weight: 700;
+  }
+  .top {
+    border-bottom: 2rpx solid #ededed;
+  }
+  .info {
+    padding: 96rpx 40rpx 96rpx 40rpx;
+    font-size: 28rpx;
+  }
+  .small-title {
+    min-width: 84rpx;
+    text-align: right;
+  }
+}
+
+.cancel {
+  padding: 14rpx 76rpx;
+  border-radius: 36rpx;
+  border: 2rpx solid #e8ad7b;
+  color: #e8ad7b;
+  font-size: 32rpx;
+  font-weight: 400;
+  white-space: nowrap;
+  line-height: 48rpx;
+}
+.confirm {
+  padding: 14rpx 76rpx;
+  border-radius: 16rpx;
+  background-color: #e8ad7b;
+  border: 2rpx solid #e8ad7b;
+  color: #fff;
+  font-size: 32rpx;
+  font-weight: 400;
+  line-height: 48rpx;
+  white-space: nowrap;
+}
+.line-height-54 {
+  line-height: 54rpx;
+}
+.w-qrcode {
+  position: fixed;
+  left: -9999px;
+  top: -9999px;
+  z-index: -1;
+}
+</style>
+    
\ No newline at end of file
diff --git a/distribution/shop-detail/index.vue b/distribution/shop-detail/index.vue
new file mode 100644
index 0000000..59aa06f
--- /dev/null
+++ b/distribution/shop-detail/index.vue
@@ -0,0 +1,905 @@
+<template>
+  <view class="min-h-100vh bg-gray">
+    <up-navbar
+      bg-color="transparent"
+      title="分销中心"
+      @leftClick="back"
+      :fixed="true"
+    ></up-navbar>
+    <view class="top">
+      <image
+        class="top_bg"
+        src="/distribution/static/top_bg.png"
+        :style="imageStyle"
+      ></image>
+      <view class="box" :class="{ type1: isActivated }">
+        <view class="u-flex align-center justify-between">
+          <view class="u-flex align-center">
+            <!-- <up-avatar size="62rpx" /> -->
+            <text class="u-m-l-14 font-14 color-333 font-700">{{
+              state.shopName
+            }}</text>
+          </view>
+          <view>
+            <template v-if="state.parentPhone">
+              <view class="font-12 color-666">
+                上级：{{ state.parentName }}{{ state.parentPhone }}
+              </view>
+            </template>
+            <template v-if="!state.parentPhone">
+              <view class="bind" @click="showBindShangji = true">
+                绑定上级
+              </view>
+            </template>
+          </view>
+        </view>
+
+        <view
+          class="top_content type1 u-m-t-32"
+          v-if="state.distributionUser && state.distributionUser.level"
+        >
+          <view class="font-14">
+            <view class="u-flex align-center">
+              <text class="color-666">我的分销等级：</text>
+              <text
+                class="color-333 font-700 u-m-r-6"
+                v-if="state.distributionUser"
+                >{{ state.distributionUser.level }}级
+                {{ state.distributionUser.levelName }}</text
+              >
+              <up-icon
+                name="question-circle"
+                size="24rpx"
+                color="#666"
+                @click="questionClick('等级升级条件')"
+              />
+            </view>
+            <view
+              class="u-m-t-28 u-flex align-center"
+              v-if="
+                juNextLvMoney &&
+                state.distributionUser &&
+                state.distributionUser.isAssignLevel == 0
+              "
+            >
+              <text class="color-666">距离下一级还差：</text>
+              <text class="color-333 font-700 u-m-r-18"
+                >{{ juNextLvMoney }}
+              </text>
+              <text class="color-333 font-700 u-m-r-18"
+                >{{ config.upgradeType == "cost" ? "元" : "人" }}
+              </text>
+              <!-- <up-icon
+                name="question-circle"
+                size="24rpx"
+                color="#666"
+                @click="showRule = true"
+              /> -->
+            </view>
+            <view class="u-flex u-m-t-28">
+              <view class="u-flex-1">
+                <view class="u-flex align-center">
+                  <text
+                    class="u-m-r-10 font-12 color-666"
+                    @click="toShouyiDetail('')"
+                    >总收益</text
+                  >
+                  <up-icon
+                    name="question-circle"
+                    size="24rpx"
+                    color="#666"
+                    @click="questionClick('总收益')"
+                  />
+                </view>
+                <view
+                  class="u-m-t-16 price"
+                  @click="toShouyiDetail('')"
+                  v-if="state.distributionUser"
+                  >{{ state.distributionUser.totalIncome }}</view
+                >
+              </view>
+              <view class="u-flex-1">
+                <view class="u-flex align-center">
+                  <text
+                    class="u-m-r-10 font-12 color-666"
+                    @click="toShouyiDetail('待入账')"
+                    >待入账</text
+                  >
+                  <up-icon
+                    name="question-circle"
+                    size="24rpx"
+                    color="#666"
+                    @click="questionClick('待入账')"
+                  />
+                </view>
+                <view
+                  class="u-m-t-16 price"
+                  @click="toShouyiDetail('待入账')"
+                  v-if="state.distributionUser"
+                  >{{ state.distributionUser.pendingIncome }}</view
+                >
+              </view>
+            </view>
+          </view>
+        </view>
+        <template v-else>
+          <view class="top_content u-m-t-32" v-if="config">
+            <template v-if="config.openType == 'auto'">
+              <view class="color-333 font-16 font-700"> 如何成为分销员 </view>
+              <view class="u-m-t-16 color-666 font-14">
+                <view> 需要邀请人数：{{ config.inviteCount }}人</view>
+                <view
+                  >是否需要邀请人数下单：{{
+                    config.inviteConsume ? "是" : "否"
+                  }}
+                </view>
+                <view
+                  >每人可获得的分销奖励次数：{{
+                    config.rewardCount == -1
+                      ? "永久"
+                      : config.rewardCount + "次"
+                  }}
+                </view>
+              </view>
+            </template>
+            <template v-if="config.openType == 'pay'">
+              <view class="color-333 font-16 font-700 text-center">
+                如何成为分销员
+              </view>
+              <view class="u-m-t-16 color-666 font-14 text-center">
+                <view
+                  >只需付费{{ config.payAmount || "" }}元，即可成为分销员</view
+                >
+              </view>
+            </template>
+            <template v-if="config.openType == 'manual'">
+              <view class="color-333 font-16 font-700 text-center">
+                如何成为分销员
+              </view>
+              <view class="u-m-t-16 color-666 font-14 text-center">
+                <view>请联系商家咨询详情</view>
+              </view>
+            </template>
+          </view>
+        </template>
+      </view>
+    </view>
+
+    <view class="bottom type1" v-if="isActivated">
+      <view class="u-flex justify-between align-center">
+        <view class="u-flex align-center">
+          <view class="color-333 font-16 u-m-r-6"
+            >我的邀请（{{ inviteUserRes.totalRow }}）</view
+          >
+          <up-icon
+            name="question-circle"
+            size="24rpx"
+            @click="showRule = true"
+            color="#666"
+          />
+        </view>
+        <view class="font-10 color-999 u-flex align-center">
+          <text
+            >分成比例{{ state.distributionUser.levelOneCommission || 0 }}%</text
+          >
+          <up-icon
+            name="question-circle"
+            size="24rpx"
+            color="#666"
+            @click="questionClick('等级分成比例')"
+          />
+        </view>
+      </view>
+
+      <view class="tabs" v-if="false">
+        <view
+          class="tabs-item"
+          :class="{ active: activeTab == 'distributor' }"
+          @click="activeTab = 'distributor'"
+          >分销员</view
+        >
+        <view
+          class="tabs-item"
+          :class="{ active: activeTab == 'inviter' }"
+          @click="activeTab = 'inviter'"
+          >邀请人</view
+        >
+      </view>
+
+      <view class="u-m-t-48 font-14">
+        <view class="u-flex justify-between color-333">
+          <view>用户</view>
+          <view>获得利益(元)</view>
+          <view>邀请时间</view>
+        </view>
+        <view class="u-m-t-16">
+          <view
+            v-for="(item, index) in userList"
+            :key="index"
+            class="u-flex justify-between align-center recoder-item color-666 font-12"
+          >
+            <view class="">
+              <view class="u-line-1" style="max-width: 160rpx">
+                <text>
+                  {{ item.shopUserName }}
+                </text>
+              </view>
+              <view class="u-line-1" style="max-width: 160rpx">
+                <text v-if="item.levelName"> ( {{ item.levelName }}) </text>
+              </view>
+
+              <view>{{ desensitizePhone(item.shopUserPhone) }}</view>
+            </view>
+            <view>
+              <text>{{ item.oneIncome }}</text>
+              <text v-if="item.distributionLevelName"
+                >（{{ item.distributionLevelName }}）</text
+              >
+            </view>
+            <view>
+              <text v-if="item.inviteTime">{{
+                item.inviteTime.split(" ")[0]
+              }}</text>
+              <text style="color: #fff" v-else>{{ "yyyy-MM-dd" }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <template v-else>
+      <view class="bottom" v-if="config">
+        <view class="u-flex">
+          <view class="title">规则说明</view>
+        </view>
+        <view>
+          <view class="font-12 color-666 u-m-t-16">
+            <view>
+              <view> 我的收益什么时候可以到账？</view>
+              <view> 分销的结算时长为{{ config.settlementDay || 0 }}天</view>
+            </view>
+            <template
+              v-if="
+                config.upgradeType != 'not_upgrade' &&
+                config.levelConfigList &&
+                config.levelConfigList.length >= 2
+              "
+            >
+              <view class="u-m-t-40">
+                <view>怎么样才能升级分销员等级？</view>
+
+                <template v-if="config.upgradeType == 'invite' && nextLvMoney">
+                  <view>邀请的有效人数达到{{ nextLvMoney }}人即可升级</view>
+                  <view class="u-m-t-40"> 什么是有效邀请人数？</view>
+                  <view> 被邀请人在店铺消费过，即有一笔订单完成才算有效</view>
+                </template>
+                <template v-if="config.upgradeType == 'cost' && nextLvMoney">
+                  <view> 消费金额总计达到{{ nextLvMoney }}元即可升级</view>
+                </template>
+
+                <template v-else>
+                  <view>请联系商家</view>
+                </template>
+              </view>
+            </template>
+
+            <view class="u-m-t-40" v-if="config.upgradeType == 'cost'">
+              <view>消费金额如何计算？</view>
+              <view
+                >消费金额是计算您和您邀请的人在店铺消费的总金额，但退款订单不计入</view
+              >
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="parse-html">
+        <up-parse :content="content"></up-parse>
+      </view>
+      <view style="height: 240rpx"></view>
+    </template>
+
+    <view
+      class="tips u-m-t-32"
+      v-if="state.distributionUser && state.distributionUser.status"
+      >您的分销员身份已取消，不再获得分成有疑问可联系商家</view
+    >
+
+    <view class="u-flex justify-center bottom-btn" v-if="showInviteCode">
+      <view class="copy" @click="copyCode">
+        <view>复制邀请码</view>
+        <view v-if="inviteCode">{{ inviteCode }}</view>
+      </view>
+      <view class="u-flex u-flex-col justify-center">
+        <view class="share" @click="showSharePopup = true">分享邀请</view>
+      </view>
+    </view>
+
+    <view
+      class="buy"
+      v-if="config.openType == 'pay' && config.payAmount && !isActivated"
+      @click="buy"
+    >
+      付费{{ config.payAmount }}元开通
+    </view>
+
+    <bindShangji
+      v-model="showBindShangji"
+      @confirm="confirmBindShangji"
+    ></bindShangji>
+    <sharePopup
+      v-model="showSharePopup"
+      v-if="
+        (state.distributionUser && state.distributionUser.inviteCode) ||
+        inviteCode
+      "
+      :inviteCode="
+        state.distributionUser ? state.distributionUser.inviteCode : inviteCode
+      "
+      :shopUserInfo="shopUserInfo"
+    ></sharePopup>
+
+    <TipsPopup v-model="showPopup" :tips-type="tipsType"></TipsPopup>
+    <commissionPopup
+      :tipsType="commissionTipsType"
+      v-model="showCommission"
+      :config="config"
+      :levelConfigList="config.levelConfigList || []"
+    ></commissionPopup>
+    <rulePopup
+      v-model="showRule"
+      :config="config"
+      :distributionUser="state.distributionUser"
+    ></rulePopup>
+  </view>
+</template>
+    
+<script setup>
+import bindShangji from "./components/bind-shangji.vue";
+import sharePopup from "./components/share-popup.vue";
+import TipsPopup from "../components/tips-popup.vue";
+import commissionPopup from "../components/commission.vue";
+import rulePopup from "../components/rule.vue";
+import { desensitizePhone } from "@/utils/util.js";
+import BigNumber from "bignumber.js";
+import * as distributionApi from "@/common/api/market/distribution.js";
+import { distributionLtPayOrder } from "@/common/api/order/index.js";
+import { APIshopUserInfo } from "@/common/api/member.js";
+import { pay } from "@/utils/pay.js";
+import { onLoad, onReachBottom } from "@dcloudio/uni-app";
+const showBindShangji = ref(false);
+const showSharePopup = ref(false);
+import { ref, reactive, computed, watch } from "vue";
+const content = ref("");
+const showPopup = ref(false);
+const showRule = ref(false);
+const showCommission = ref(false);
+const tipsType = ref("");
+const commissionTipsType = ref("");
+
+function toShouyiDetail(name) {
+  uni.navigateTo({
+    url:
+      "/distribution/income-details/index?name=" +
+      name +
+      "&shopId=" +
+      options.shopId,
+  });
+}
+function questionClick(title) {
+  if (title == "总收益") {
+    tipsType.value = "总收益";
+    showPopup.value = true;
+  }
+  if (title == "待入账") {
+    tipsType.value = "待入账";
+    showPopup.value = true;
+  }
+  if (title == "等级分成比例") {
+    commissionTipsType.value = "等级分成比例";
+    showCommission.value = true;
+  }
+  if (title == "等级升级条件") {
+    commissionTipsType.value = "等级升级条件";
+    showCommission.value = true;
+  }
+}
+function back() {
+  uni.navigateBack({
+    delta: 1,
+  });
+}
+
+async function confirmBindShangji(code) {
+  const res = await distributionApi.bindInviteUser({
+    shopId: options.shopId,
+    inviteCode: code,
+    id: shopUserInfo.value.id,
+  });
+  if (res) {
+    uni.showToast({
+      title: "绑定成功",
+      icon: "none",
+    });
+    setTimeout(() => {
+      init();
+    }, 1500);
+  }
+  // else {
+  //   uni.showToast({
+  //     title: "绑定失败",
+  //     icon: "none",
+  //   });
+  // }
+}
+function copyCode() {
+  uni.setClipboardData({
+    data: inviteCode.value,
+    success: function () {
+      console.log("success");
+    },
+  });
+}
+
+const shopUserInfo = ref();
+const config = reactive({});
+//邀请码
+const inviteCode = ref("");
+async function init() {
+  const shopUserRes = await APIshopUserInfo({
+    shopId: options.shopId,
+  });
+
+  const configRes = await distributionApi.getConfig({
+    shopId: options.shopId,
+  });
+  Object.assign(config, configRes);
+
+  if (shopUserRes) {
+    shopUserInfo.value = shopUserRes;
+  }
+  if (configRes && configRes.openType == "auto") {
+    const codeRes = await distributionApi.getInviteCode({
+      shopId: options.shopId,
+      shopUserId: shopUserRes.id,
+    });
+    if (codeRes) {
+      inviteCode.value = codeRes;
+    }
+  }
+
+  const res = await distributionApi.centerConfig({
+    shopId: options.shopId,
+  });
+  if (res) {
+    if (res.distributionId) {
+      options.type = "activates";
+    }
+    Object.assign(state, res);
+    if (res.distributionUser) {
+      inviteCode.value = res.distributionUser.inviteCode;
+    }
+    content.value = res.config ? res.config.notActivatedPage : "";
+  }
+}
+const options = reactive({ type: "" });
+const imageStyle = computed(() => {
+  return {
+    height: isActivated.value ? "580rpx" : "580rpx",
+  };
+});
+
+async function buy() {
+  const res = await distributionLtPayOrder({
+    shopId: options.shopId,
+    userId: uni.cache.get("userInfo") ? uni.cache.get("userInfo").id : "",
+    returnUrl: "",
+    buyerRemark: "",
+    amount: "",
+    remark: "",
+    code: "",
+  });
+  const payRes = await pay(res);
+  if (payRes) {
+    uni.showToast({
+      title: "购买成功",
+      icon: "none",
+    });
+    setTimeout(() => {
+      init();
+      getRecoders();
+    }, 1500);
+  }
+}
+
+const state = reactive({
+  parentPhone: "",
+  parentName: "",
+  shopName: "",
+});
+
+const query = reactive({
+  page: 1,
+  size: 10,
+});
+const isEnd = ref(false);
+const activeTab = ref("inviter");
+const userList = ref([]);
+
+const inviteUserRes = reactive({
+  records: [],
+  totalRow: 0,
+  totalPage: 0,
+});
+async function getRecoders() {
+  if (state.config) return;
+  const ajaxQuery = {
+    ...query,
+    shopId: options.shopId,
+  };
+  if (activeTab.value == "distributor") {
+    ajaxQuery.parentId = state.distributionUser.distributionId;
+  } else {
+    ajaxQuery.id = state.distributionUser.distributionId;
+  }
+  const res =
+    activeTab.value == "distributor"
+      ? await distributionApi.childUser(ajaxQuery)
+      : await distributionApi.inviteUser(ajaxQuery);
+  if (res) {
+    Object.assign(inviteUserRes, res);
+    if (query.page == 1) {
+      userList.value = res.records || [];
+    } else {
+      userList.value.push(...(res.records || []));
+    }
+    isEnd.value = query.page >= res.totalPage * 1;
+  }
+}
+const nextLvMoney = computed(() => {
+  let nextLv = undefined;
+
+  if (!config.levelConfigList || !config.levelConfigList.length) {
+    return "";
+  }
+  const nowLevel = state.distributionUser
+    ? state.distributionUser.level || 1
+    : 1;
+  if (!nowLevel) {
+    nextLv = config.levelConfigList[0];
+  } else {
+    nextLv = config.levelConfigList.find((v) => v.level == nowLevel + 1);
+  }
+
+  if (nextLv) {
+    if (config.upgradeType == "cost") {
+      return nextLv.costAmount;
+    }
+    if (config.upgradeType == "invite") {
+      return nextLv.inviteCount;
+    }
+  }
+  return "";
+});
+
+const juNextLvMoney = computed(() => {
+  if (!nextLvMoney.value) {
+    return "";
+  }
+  let total = 0;
+  if (config.upgradeType == "cost" && state.distributionUser) {
+    total = new BigNumber(nextLvMoney.value).minus(state.distributionUser.consumeAmount || 0).toNumber();
+  }
+  if (config.upgradeType == "invite" && state.distributionUser) {
+    total = new BigNumber(nextLvMoney.value).minus(config.inviteCount || 0).toNumber();
+  }
+  return Math.max(total, 0);
+});
+//是否显示邀请码
+
+const showInviteCode = computed(() => {
+  if (config.upgradeType == "invite") {
+    return true;
+  }
+  if (
+    config.openType == "manual" &&
+    (!state.distributionUser || !state.distributionUser.level)
+  ) {
+    return false;
+  }
+  if (
+    state.distributionUser &&
+    state.distributionUser.level &&
+    inviteCode.value
+  ) {
+    return true;
+  }
+  if (!state.distributionUser && config.openType == "manual") {
+    return true;
+  }
+  return false;
+});
+
+//是否已成为分销员
+const isActivated = computed(() => {
+  return state.distributionUser && state.distributionUser.level;
+});
+watch(
+  () => activeTab.value,
+  (newVal, oldVal) => {
+    query.page = 1;
+    isEnd.value = false;
+    if (newVal != oldVal) {
+      getRecoders();
+    }
+  }
+);
+
+function parseQueryString(queryString) {
+  const queryParams = queryString.split("&").map((param) => param.split("="));
+  const params = {};
+  for (const [key, value] of queryParams) {
+    params[key] = value;
+  }
+  return params;
+}
+onLoad(async (opt) => {
+  if (opt.q) {
+    const q = decodeURIComponent(opt.q);
+    const params = parseQueryString(q.split("?")[1]);
+    Object.assign(options, params);
+  } else {
+    Object.assign(options, opt);
+  }
+  console.log(options);
+  await init();
+  getRecoders();
+});
+
+onReachBottom(async () => {
+  if (!isEnd.value) {
+    query.page++;
+    await getRecoders();
+  }
+});
+</script>
+    
+<style scoped lang="scss">
+.input-number-box {
+  width: 428rpx;
+  padding-bottom: 10rpx;
+  border-bottom: 1px solid #999;
+  font-size: 28rpx;
+  align-items: baseline;
+  .fuhao {
+    font-size: 64rpx;
+    color: #333;
+  }
+  .input-number {
+    flex: 1;
+    height: 100%;
+    font-size: 28rpx;
+    color: #333;
+    padding-left: 24rpx;
+    padding-right: 10rpx;
+  }
+  .all-in {
+    font-size: 28rpx;
+    color: #fe7e00;
+  }
+}
+.list {
+  .shop-item {
+    padding: 32rpx 28rpx;
+    border-bottom: 2rpx solid #ededed;
+    font-size: 28rpx;
+    color: #666;
+    display: flex;
+    align-items: center;
+    &:last-child {
+      border-bottom: none;
+    }
+    .fufei {
+      color: #e8ad7b;
+    }
+    .tag {
+      font-size: 24rpx;
+      color: #ff1c1c;
+      background-color: #ffe4e4;
+      padding: 8rpx 20rpx;
+      border-radius: 8rpx;
+    }
+    .name {
+      color: #333;
+      font-weight: 700;
+    }
+    .shouxufei {
+    }
+    .shouyi {
+      font-size: 24rpx;
+      color: #666;
+      text-align: center;
+    }
+  }
+}
+.status {
+  font-size: 28rpx;
+  font-weight: 700;
+  text-align: right;
+  color: #333333;
+  &.fail {
+    color: #ff1c1c;
+  }
+}
+.lingqu {
+  font-size: 28rpx;
+  border-radius: 8rpx;
+  background: #fe6d11;
+  padding: 8rpx 16rpx;
+  color: #ffffff;
+}
+.price {
+  font-weight: 700;
+  font-size: 40rpx;
+  color: #333;
+}
+.top {
+  position: relative;
+  .box {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    padding: 28rpx 28rpx 52rpx 28rpx;
+    &.type1 {
+      padding-bottom: 0;
+    }
+  }
+  .top_content {
+    border: 1px solid rgba(255, 255, 255, 0.8);
+    border-radius: 16rpx;
+    flex-shrink: 0;
+    fill: #ffffff3b;
+    stroke-width: 2rpx;
+    padding: 32rpx 28rpx;
+    stroke: #fff;
+    filter: drop-shadow(2rpx -4rpx 13.4rpx #ff6f0124);
+    backdrop-filter: blur(5.1rpx);
+    &.type1 {
+      filter: none;
+      border: none;
+      background-color: #fcf5ed;
+      border-radius: 36rpx 36rpx 0 0;
+      padding: 32rpx 36rpx;
+    }
+  }
+}
+.btn-group {
+  position: absolute;
+  right: 28rpx;
+  top: 50%;
+  transform: translateY(-50%);
+  .btn {
+    padding: 8rpx 16rpx;
+    border-radius: 8rpx;
+    font-size: 24rpx;
+    border: 2rpx solid #fe6d11;
+    &.shiming {
+      color: #fe6d11;
+    }
+    &.tixian {
+      color: #fff;
+      background-color: #fe6d11;
+    }
+  }
+}
+.tips {
+  padding: 16rpx 18rpx;
+  background: #ffe2e2;
+  padding: 16rpx 18rpx;
+  font-size: 28rpx;
+  line-height: 48rpx;
+  color: #ff1c1c;
+}
+.bind {
+  padding: 8rpx 32rpx;
+  border-radius: 8rpx;
+  font-size: 24rpx;
+  border: 2rpx solid #fe6d11;
+  color: #fff;
+  background-color: #fe6d11;
+}
+.top_bg {
+  width: 100%;
+}
+.bottom {
+  margin: 0 28rpx;
+  border-radius: 36rpx;
+  background-color: #fff;
+  transform: translateY(-20rpx);
+  padding: 32rpx 28rpx;
+  &.type1 {
+    transform: translateY(0);
+    margin: 0;
+    padding-bottom: 42rpx;
+  }
+}
+.title {
+  font-size: 32rpx;
+  font-weight: 700;
+  color: #333;
+}
+.small-title {
+  font-size: 28rpx;
+  font-weight: 700;
+  color: #333;
+}
+.parse-html {
+  margin: 32rpx 28rpx;
+  font-size: 28rpx;
+}
+.recoder-item {
+  padding: 16rpx 0;
+  border-bottom: 2rpx solid #ededed;
+}
+.share {
+  border-radius: 16rpx;
+  background: #e8ad7b;
+  padding: 14rpx 76rpx;
+  font-size: 32rpx;
+  line-height: 48rpx;
+  color: #fff;
+}
+.copy {
+  padding: 4rpx 30rpx;
+  border-radius: 18rpx;
+  border: 2rpx solid #e8ad7b;
+  background: #fff;
+  font-size: 28rpx;
+  color: #e8ad7b;
+  line-height: 48rpx;
+  text-align: center;
+}
+.bottom-btn {
+  position: fixed;
+  left: 84rpx;
+  right: 84rpx;
+  bottom: 100rpx;
+  white-space: nowrap;
+  gap: 54rpx;
+}
+.buy {
+  padding: 32rpx 224rpx;
+  border-radius: 40rpx;
+  background: linear-gradient(98deg, #fe6d1100 40.64%, #ffd1b4 105.2%),
+    linear-gradient(259deg, #fe6d11 50.14%, #ffd1b4 114.93%);
+  box-shadow: 0 14rpx 30.4rpx 0 #fe8b435e;
+  font-size: 32rpx;
+  color: #fff;
+  font-weight: 700;
+  position: fixed;
+  left: 28rpx;
+  right: 28rpx;
+  bottom: 62rpx;
+  white-space: nowrap;
+}
+.tabs {
+  display: flex;
+  margin: 20rpx 0;
+  gap: 30rpx;
+  .tabs-item {
+    flex: 1;
+    padding: 4rpx 30rpx;
+    border-radius: 18rpx;
+    border: 2rpx solid #e8ad7b;
+    background: #fff;
+    font-size: 28rpx;
+    color: #e8ad7b;
+    line-height: 48rpx;
+    text-align: center;
+    transition: all 0.3s ease-in-out;
+    &.active {
+      background-color: #e8ad7b;
+      color: #fff;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/distribution/shop-list/index.vue b/distribution/shop-list/index.vue
new file mode 100644
index 0000000..afc3e2a
--- /dev/null
+++ b/distribution/shop-list/index.vue
@@ -0,0 +1,201 @@
+<template>
+  <view class="box">
+    <!-- <up-search v-model="query.shopName" @search="getData" @custom="getData"></up-search> -->
+    <view class="list">
+      <view class="u-flex  shop-item " v-for="(item, index) in list" :key="index" @click="toShopDetail(item)">
+        <up-image
+          width="104rpx"
+          height="104rpx"
+          radius="8rpx"
+          :src="item.coverImg"
+        ></up-image>
+        <view class="u-flex-1 u-m-l-14">
+          <view class="u-flex justify-between align-center">
+            <view>
+              <view class="shop-name">{{ item.shopName }}</view>
+              <view class="u-flex">
+                <view class="tag" v-if="item.labelContent">{{
+                  item.labelContent
+                }}</view>
+              </view>
+              <view class="address u-line-1">{{ item.shopAddress }}</view>
+            </view>
+            <view v-if="options.type == 'activates'">
+                <view class="shouyi">收益</view>
+                <view class="price">¥{{ item.income||'0.00' }}</view>
+              </view>
+            <view class="u-flex u-flex-col justify-center" v-else>
+              <view class="fufei" v-if="item.openType == 'pay'">付费开通</view>
+              <view class="fufei" v-else-if="item.openType == 'manual'"
+                  >手动开通</view
+                >
+              <template  v-else-if="item.openType == 'auto'">
+                <view class="font-12 color-333 font-700">自动开通</view>
+                <view class="u-m-t-8 color-666 font-12"
+                  >还差{{
+                    item.shopInviteCount - item.userInviteCount
+                  }}人开通</view
+                >
+              </template>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <up-loadmore :status="query.isEnd?'noMore':'loadmore'"></up-loadmore>
+  </view>
+</template>
+
+<script setup>
+import * as distributionApi from "@/common/api/market/distribution.js";
+
+import { onLoad, onReachBottom } from "@dcloudio/uni-app";
+import { onMounted, reactive, ref } from "vue";
+
+const list = ref([]);
+const query = reactive({
+  shopName: "",
+  page: 1,
+  size: 10,
+  isEnd: false,
+});
+async function getData() {
+  const res =
+    options.type == "activates"
+      ? await distributionApi.activates(query)
+      : await distributionApi.unActivates(query);
+  if (res) {
+    if (query.page == 1) {
+      list.value = res.records || [];
+    } else {
+      list.value.push(...(res.records || []));
+    }
+    query.isEnd = query.page >= res.totalPage * 1;
+  }
+}
+
+
+
+
+function toShopDetail(item,type) {
+  uni.navigateTo({
+    url: "/distribution/shop-detail/index?shopId=" + item.shopId
+  });
+}
+const options = reactive({});
+onLoad((opt) => {
+  console.log(opt);
+  Object.assign(options, opt);
+  getData();
+});
+onReachBottom(() => {
+  query.page++;
+  if (query.isEnd) {
+    return;
+  }
+  getData();
+});
+</script>
+
+<style lang="scss" scoped>
+.box {
+  padding: 32rpx 28rpx;
+  font-size: 28rpx;
+}
+
+.color-1 {
+  color: #ff6300;
+}
+
+
+
+.list {
+  .shop-item {
+    padding: 16rpx 0;
+    border-bottom: 2rpx solid #ededed;
+    font-size: 24rpx;
+    color: #666;
+    display: flex;
+    align-items: center;
+ 
+    .fufei {
+      color: #e8ad7b;
+    }
+    .tag {
+      font-size: 24rpx;
+      color: #ff1c1c;
+      background-color: #ffe4e4;
+      padding: 8rpx 20rpx;
+      border-radius: 8rpx;
+    }
+    .shop-name {
+    }
+    .address {
+      max-width: 390rpx;
+    }
+    .shouyi {
+      font-size: 24rpx;
+      color: #666;
+      text-align: center;
+    }
+    .price {
+      font-size: 20rpx;
+      color: #333;
+      font-weight: 500;
+    }
+  }
+}
+
+.price {
+  font-weight: 700;
+  color: #333;
+  font-size: 40rpx;
+  margin-top: 16rpx;
+}
+.top {
+  position: relative;
+  .top_content {
+    background-color: #faf7f4;
+    position: absolute;
+    left: 28rpx;
+    right: 28rpx;
+    bottom: 0;
+    padding: 32rpx 106rpx 32rpx 56rpx;
+    border-radius: 24rpx 24rpx 0 0;
+  }
+}
+.top_bg {
+  width: 100%;
+  height: 530rpx;
+}
+.bottom {
+  padding: 34rpx 28rpx;
+}
+.title {
+  font-size: 32rpx;
+  font-weight: 700;
+  color: #333;
+  position: relative;
+  overflow: hidden;
+  &::after {
+    display: block;
+    content: "";
+    position: absolute;
+    right: 0;
+    bottom: 4rpx;
+    background-color: #9ee708;
+    border-radius: 10rpx;
+    z-index: -1;
+    width: 94.2rpx;
+    height: 13.98rpx;
+    flex-shrink: 0;
+    stroke-width: 4rpx;
+    stroke: #9ee708d6;
+  }
+}
+.small-title {
+  font-size: 28rpx;
+  font-weight: 700;
+  color: #333;
+}
+</style>
\ No newline at end of file
diff --git a/distribution/static/scan.svg b/distribution/static/scan.svg
new file mode 100644
index 0000000..c4aa892
--- /dev/null
+++ b/distribution/static/scan.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1761787146008" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4672" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M146.432 336.896h-81.92V106.496l40.96-40.96h231.424v81.92H146.432zM336.896 958.464H105.472l-40.96-40.96V687.104h81.92v189.44h190.464zM956.416 336.896h-81.92V147.456H684.032v-81.92h231.424l40.96 40.96zM915.456 958.464H613.376v-81.92h261.12V659.456h81.92v258.048z" fill="#437DFF" p-id="4673"></path><path d="M326.656 334.848h61.44v98.304h-61.44zM415.744 575.488h61.44v133.12h-61.44zM265.216 575.488h61.44v114.688h-61.44zM566.272 575.488h61.44v98.304h-61.44zM706.56 575.488h61.44v154.624h-61.44zM477.184 297.984h61.44v135.168h-61.44zM627.712 329.728h61.44v103.424h-61.44z" fill="#63F7DE" p-id="4674"></path><path d="M10.24 473.088h1003.52v61.44H10.24z" fill="#437DFF" p-id="4675"></path></svg>
\ No newline at end of file
diff --git a/distribution/static/top_bg.png b/distribution/static/top_bg.png
new file mode 100644
index 0000000..bbccede
Binary files /dev/null and b/distribution/static/top_bg.png differ
diff --git a/distribution/withdraw/index.vue b/distribution/withdraw/index.vue
new file mode 100644
index 0000000..cbce567
--- /dev/null
+++ b/distribution/withdraw/index.vue
@@ -0,0 +1,374 @@
+<template>
+  <view class="min-h-100vh bg-gray">
+    <up-navbar
+      bg-color="transparent"
+      title="提现"
+      @leftClick="back"
+      :fixed="true"
+    ></up-navbar>
+    <view class="top">
+      <image class="top_bg" src="/distribution/static/top_bg.png"></image>
+      <view class="top_content">
+        <view class="color-333 font-16"> 提现金额 </view>
+        <view class="u-m-t-32 u-flex input-number-box">
+          <text class="fuhao">¥</text>
+          <input
+            v-model="money"
+            type="digit"
+            class="input-number"
+            placeholder="最小提现金额为30"
+          />
+          <text class="all-in" @click="allin">全部提现</text>
+        </view>
+        <view class="color-666 font-12 u-m-t-16">
+          <text>可提现金额：￥{{ state.cashOutAmount || 0 }}</text>
+          <text class="u-m-l-20">手续费为8%</text>
+        </view>
+
+        <view class="btn-group">
+          <view class="btn shiming" @click="toShiming">实名认证</view>
+          <view class="btn tixian u-m-t-32" @click="tixian">立即提现</view>
+        </view>
+      </view>
+    </view>
+    <view class="bottom">
+      <view class="u-flex">
+        <view class="title">提现记录</view>
+      </view>
+      <view class="list">
+        <view v-for="(item, index) in list" :key="index" class="shop-item">
+          <view class="u-flex-1">
+            <view class="u-flex justify-between">
+              <view>
+                <view class="name">提现</view>
+                <view class="shouxufei u-m-t-16"
+                  >手续费{{ item.serviceFee }}元</view
+                >
+                <view class="font-12 color-999 u-m-t-10">
+                  时间：{{ item.createTime }}
+                </view>
+              </view>
+              <view class="u-flex u-flex-col justify-center">
+                <template v-if="item.status == 'pending'">
+                  <view class="lingqu" @click="lingqu(item)">点击领取</view>
+                  <view class="price reduce"
+                    >-{{
+                      BigNumber(item.serviceFee).plus(item.amount).toFixed(2)
+                    }}</view
+                  >
+                </template>
+                <template v-if="item.status == 'finish'">
+                  <view class="status">提现成功</view>
+                  <view class="price reduce"
+                    >-{{
+                      BigNumber(item.serviceFee).plus(item.amount).toFixed(2)
+                    }}</view
+                  >
+                </template>
+                <template v-if="item.status == 'fail'">
+                  <view class="status fail">提现失败</view>
+                  <view class="price"
+                    >+{{
+                      BigNumber(item.serviceFee).plus(item.amount).toFixed(2)
+                    }}</view
+                  >
+                </template>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="" style="padding-bottom: 60rpx;">
+      <up-loadmore
+      :status="isEnd?'no-more':'loadmore'"
+    ></up-loadmore>
+    </view>
+ 
+  </view>
+</template>
+  
+<script setup>
+import * as distributionApi from "@/common/api/market/distribution.js";
+import { productStore } from "@/stores/user.js";
+const storeuser = productStore();
+import { ref, onMounted, reactive } from "vue";
+import { onLoad, onReachBottom, onShow } from "@dcloudio/uni-app";
+import BigNumber from "bignumber.js";
+function back() {
+  uni.navigateBack({
+    delta: 1,
+  });
+}
+async function lingqu(item) {
+  const res = await distributionApi.withdrawDetail({ id: item.id });
+  if (res) {
+    uni.requestMerchantTransfer({
+      ...res,
+      success: (res) => {
+        uni.showToast({
+          title: "领取成功",
+          icon: "none",
+        });
+        refesh();
+      },
+      fail: (res) => {
+        uni.showToast({
+          title: "领取失败",
+          icon: "none",
+        });
+        refesh();
+      },
+    });
+  }
+}
+function toShiming() {
+  uni.navigateTo({
+    url: "/distribution/shiming/index",
+  });
+}
+const userinfo = ref(uni.cache.get("userinfo") || {});
+const query = reactive({
+  page: 1,
+  size: 10,
+});
+const list = ref([]);
+const isEnd = ref(false);
+async function withdrawFlow() {
+  const res = await distributionApi.withdrawFlow(query);
+  if (res) {
+    if (query.page == 1) {
+      list.value = res.records;
+    } else {
+      list.value.push(...res.records);
+    }
+    isEnd.value = query.page >= res.totalPage * 1;
+  }
+}
+
+const state = reactive({
+  cashOutAmount: 0,
+  pendingIncome: 0,
+  totalIncome: 0,
+});
+async function centerUser() {
+  const res = await distributionApi.centerUser();
+  if (res) {
+    Object.assign(state, res);
+  }
+}
+
+const money = ref(0);
+
+function allin() {
+  money.value = state.cashOutAmount;
+}
+async function tixian() {
+  if (!userinfo.value.idCard) {
+    uni.showToast({
+      title: "请先实名认证",
+      icon: "none",
+    });
+    setTimeout(() => {
+      toShiming();
+    }, 1500);
+    return;
+  }
+  if (money.value <= 0) {
+    uni.showToast({
+      title: "请输入提现金额",
+      icon: "none",
+    });
+    return;
+  }
+  if (money.value > state.cashOutAmount) {
+    uni.showToast({
+      title: "提现金额不能大于可提现金额",
+      icon: "none",
+    });
+    return;
+  }
+  const res = await distributionApi.withdraw({
+    amount: money.value,
+  });
+  if (res) {
+    uni.showToast({
+      title: "提现成功",
+      icon: "none",
+    });
+  }
+
+  refesh();
+}
+function refesh() {
+  setTimeout(() => {
+    query.page = 1;
+    init();
+  }, 3000);
+}
+async function init() {
+  await centerUser();
+  await withdrawFlow();
+}
+onReachBottom(async () => {
+  console.log('onReachBottom', isEnd.value);
+  if (!isEnd.value) {
+    query.page++;
+    await withdrawFlow();
+  }
+});
+onLoad(() => {
+  init();
+});
+
+onShow(() => {
+  storeuser.actionsAPIuser().then((res) => {
+    userinfo.value = res;
+  });
+});
+</script>
+  
+  <style scoped lang="scss">
+.input-number-box {
+  width: 428rpx;
+  padding-bottom: 10rpx;
+  border-bottom: 1px solid #999;
+  font-size: 28rpx;
+  align-items: baseline;
+  .fuhao {
+    font-size: 64rpx;
+    color: #333;
+  }
+  .input-number {
+    flex: 1;
+    height: 100%;
+    font-size: 28rpx;
+    color: #333;
+    padding-left: 24rpx;
+    padding-right: 10rpx;
+  }
+  .all-in {
+    font-size: 28rpx;
+    color: #fe7e00;
+  }
+}
+.list {
+  .shop-item {
+    padding: 32rpx 28rpx;
+    border-bottom: 2rpx solid #ededed;
+    font-size: 28rpx;
+    color: #666;
+    display: flex;
+    align-items: center;
+    &:last-child {
+      border-bottom: none;
+    }
+    .fufei {
+      color: #e8ad7b;
+    }
+    .tag {
+      font-size: 24rpx;
+      color: #ff1c1c;
+      background-color: #ffe4e4;
+      padding: 8rpx 20rpx;
+      border-radius: 8rpx;
+    }
+    .name {
+      color: #333;
+      font-weight: 700;
+    }
+    .shouxufei {
+    }
+    .shouyi {
+      font-size: 24rpx;
+      color: #666;
+      text-align: center;
+    }
+  }
+}
+.status {
+  font-size: 28rpx;
+  font-weight: 700;
+  text-align: right;
+  color: #333333;
+  &.fail {
+    color: #ff1c1c;
+  }
+}
+.lingqu {
+  font-size: 28rpx;
+  border-radius: 8rpx;
+  background: #fe6d11;
+  padding: 8rpx 16rpx;
+  color: #ffffff;
+}
+.price {
+  font-weight: 700;
+  font-size: 48rpx;
+  margin-top: 16rpx;
+  color: #fe7e00;
+  text-align: right;
+  &.reduce {
+    color: #666;
+  }
+}
+.top {
+  position: relative;
+  .top_content {
+    border: 1px solid rgba(255, 255, 255, 0.8);
+    position: absolute;
+    left: 28rpx;
+    right: 28rpx;
+    bottom: 52rpx;
+    padding: 28rpx 28rpx 52rpx 28rpx;
+    border-radius: 16rpx;
+
+    flex-shrink: 0;
+    fill: #ffffff3b;
+    stroke-width: 2rpx;
+    stroke: #fff;
+    filter: drop-shadow(2rpx -4rpx 13.4rpx #ff6f0124);
+    backdrop-filter: blur(5.1rpx);
+    .btn-group {
+      position: absolute;
+      right: 28rpx;
+      top: 50%;
+      transform: translateY(-50%);
+      .btn {
+        padding: 8rpx 16rpx;
+        border-radius: 8rpx;
+        font-size: 24rpx;
+        border: 2rpx solid #fe6d11;
+        &.shiming {
+          color: #fe6d11;
+        }
+        &.tixian {
+          color: #fff;
+          background-color: #fe6d11;
+        }
+      }
+    }
+  }
+}
+.top_bg {
+  width: 100%;
+  height: 580rpx;
+}
+.bottom {
+  margin: 0 28rpx;
+  border-radius: 16rpx 16rpx 0 0;
+  background-color: #fff;
+  transform: translateY(-20rpx);
+}
+.title {
+  font-size: 32rpx;
+  font-weight: 700;
+  color: #333;
+  padding: 28rpx;
+}
+.small-title {
+  font-size: 28rpx;
+  font-weight: 700;
+  color: #333;
+}
+</style>
\ No newline at end of file
diff --git a/framework/0-conf.js b/framework/0-conf.js
index 6367448..cf0810e 100644
--- a/framework/0-conf.js
+++ b/framework/0-conf.js
@@ -7,9 +7,6 @@ const proxyApi = "/api"
 // #ifdef MP-WEIXIN || APP || MP-ALIPAY
 const proxyApi = 'http://192.168.1.42' // 调试地址
 const proxyApiwws = 'ws://192.168.1.42:2348' // 调试地址 
-// 测试
-// const proxyApi = "https://fv901fw8033.vicp.fun"
-// const proxyApiwws = 'wss://sockets.sxczgkj.com/wss'
 // #endif
 
 // #ifdef H5
@@ -23,10 +20,6 @@ const baseUrlwws = debug ? proxyApiwws : 'wss://czgeatws.sxczgkj.com/wss' // 线
 // #endif
 
 
-// import VConsole from "./vConsole.js"
-// if (debug) {
-// 	new VConsole()
-// }
 const version = '100'
 const autoRemoveCache = {
 	count: 100000,
diff --git a/package.json b/package.json
index 036e425..add3875 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,6 @@
     "lodash": "^4.17.21",
     "pinia": "^2.3.1",
     "pinia-plugin-unistorage": "^0.1.2",
-    "ysk-utils": "^1.0.40"
+    "ysk-utils": "^1.0.78"
   }
 }
diff --git a/pages.json b/pages.json
index 2bea098..b5248ea 100644
--- a/pages.json
+++ b/pages.json
@@ -203,38 +203,94 @@
 			}
 		},
 		{
-			"path" : "pages/user/member/czzx-shop-list",
-			"style" : 
-			{
-				"navigationBarTitleText" : "适用门店"
+			"path": "pages/user/member/czzx-shop-list",
+			"style": {
+				"navigationBarTitleText": "适用门店"
 			}
 		}
 	],
 	"subPackages": [{
-		"root": "user",
-		"pages": [{
-				"path": "vip/vip",
-				"style": {
-					"navigationBarTitleText": "",
-					"navigationStyle": "custom"
+			"root": "user",
+			"pages": [{
+					"path": "vip/vip",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "vip/buy-vip",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "score/list",
+					"style": {
+						"navigationBarTitleText": "积分门店"
+					}
+				},
+				{
+					"path": "exchange/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom"
+					}
 				}
-			},
-			{
-				"path": "vip/buy-vip",
-				"style": {
-					"navigationBarTitleText": "",
-					"navigationStyle": "custom"
-				}
-			},
-			{
-				"path": "score/list",
-				"style": {
-					"navigationBarTitleText": "积分门店"
-				}
-			}
 
-		]
-	}],
+			]
+		},
+		{
+			"root": "distribution",
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "分销中心",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "withdraw/index",
+					"style": {
+						"navigationBarTitleText": "提现",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "shiming/index",
+					"style": {
+						"navigationBarTitleText": "实名认证"
+					}
+				},
+				{
+					"path": "shop-detail/index",
+					"style": {
+						"navigationBarTitleText": "分销中心",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "shop-list/index",
+					"style": {
+						"navigationBarTitleText": "店铺列表"
+					}
+				},
+				{
+					"path": "income-details/index",
+					"style": {
+						"navigationBarTitleText": "收益明细"
+					}
+				},
+				{
+					"path": "poster",
+					"style": {
+						"navigationBarTitleText": "poster"
+					}
+				}
+			]
+		}
+	],
 	"uniIdRouter": {},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5f3165f..5cb6eec 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -194,7 +194,9 @@ const hometop = async () => {
 			const query = uni.createSelectorQuery().select('#fourcontent');
 			query
 				.boundingClientRect((rect) => {
-					elementTop.value = rect.top - store.height;
+					if(rect){
+						elementTop.value = rect.top - store.height;
+					}
 				})
 				.exec();
 		}, 500);
@@ -324,33 +326,8 @@ const indexsRef = ref(null);
 
 onShow(async () => {
 	try {
-		uni.getLocation({
-			type: 'wgs84',
-			success: async (res) => {
-				console.log('getLocation',res);
-				let successres = await APIgeocodelocation({
-					lng: res.longitude,
-					lat: res.latitude
-				});
-				if (successres) {
-					let datastorage = {
-						country: successres.addressComponent.country, // "中国"
-						province: successres.addressComponent.province, //province: "陕西省"
-						address: successres.addressComponent.city, //district: "西安市"
-						district: successres.addressComponent.district, //district: "未央区"
-						lng: res.longitude,
-						lat: res.latitude
-					};
-					uni.cache.set('getLocationstorage', datastorage);
-					// 登录
-					proxy.$isResolve();
-				}
-			},
-			fail(error) {
-				console.error('获取经纬度失败',error);
-			}
-		});
-		
+		await storeuser.getLocation()
+		proxy.$isResolve();
 		const shopId=uni.cache.get('shopId')
 		if(shopId){
 			indexsRef.value.getVipConfig();
diff --git a/pages/order/components/charge.vue b/pages/order/components/charge.vue
index 5ae661f..536d68d 100644
--- a/pages/order/components/charge.vue
+++ b/pages/order/components/charge.vue
@@ -1,189 +1,213 @@
 <template>
-	<view>
-		<view class="box" v-if="isShow">
-			<view class="u-flex u-col-center" style="align-items: center;">
-				<image src="/static/icon/charge.png" class="charge" mode=""></image>
-				<view class="u-m-l-28 color-333 font-700"> 充值享优惠</view>
-			</view>
-			<scroll-view scroll-x="true" class="u-m-t-20">
-				<view class="list">
-					<view class="item color1" @click="itemClick(index)" v-for="(item,index) in list" :key="index"
-						:class="{active:sel==index}">
-						<view class="">
-							<text>￥</text>
-							<text class="font-700" style="font-size: 48rpx;"
-								:class="{color2:sel==index}">{{item.amount}}</text>
-						</view>
-						<view class="font-12" v-if="item.rewardAmount" :class="{color2:sel==index}">
-							<text>赠</text>
-							<text>￥</text>
-							<text class="font-14">{{item.rewardAmount}}</text>
-						</view>
-						<view class="font-12" v-if="item.rewardPoints">
-							<text>送</text>
-							<text class="font-14">{{item.rewardPoints}}</text>
-							<text>积分</text>
-						</view>
-						<view class="font-12 color-666" v-if="item.couponInfoList.length">
-							<text>送</text>
-							<text>{{couponNum(item.couponInfoList)}}</text>
-							<text>张券</text>
-							<text class="color2 u-m-l-8" v-if="sel==index" @click="lookCoupon(item)">查看</text>
-						</view>
-
-						<view class="sel u-flex" v-if="sel==index">
-							<image class="image" src="/static/vip/sel.png" mode=""></image>
-						</view>
-					</view>
-				</view>
-
-			</scroll-view>
-		</view>
-		<view class="" v-else></view>
-		<CouponList v-model="couponModel.show" :list="couponModel.couponInfoList"></CouponList>
-	</view>
+  <view>
+    <view class="box" v-if="isShow">
+      <view class="u-flex u-col-center" style="align-items: center">
+        <image src="/static/icon/charge.png" class="charge" mode=""></image>
+        <view class="u-m-l-28 color-333 font-700"> 充值享优惠</view>
+      </view>
+      <scroll-view scroll-x="true" class="u-m-t-20">
+        <view class="list">
+          <view
+            class="item color1"
+            @click="itemClick(index)"
+            v-for="(item, index) in list"
+            :key="index"
+            :class="{ active: sel == index }"
+          >
+            <view class="">
+              <text>￥</text>
+              <text
+                class="font-700"
+                style="font-size: 48rpx"
+                :class="{ color2: sel == index }"
+                >{{ item.amount }}</text
+              >
+            </view>
+            <view
+              class="font-12"
+              v-if="item.rewardAmount"
+              :class="{ color2: sel == index }"
+            >
+              <text>赠</text>
+              <text>￥</text>
+              <text class="font-14">{{ item.rewardAmount }}</text>
+            </view>
+            <view class="font-12" v-if="item.rewardPoints">
+              <text>送</text>
+              <text class="font-14">{{ item.rewardPoints }}</text>
+              <text>积分</text>
+            </view>
+            <view class="font-12 color-666" v-if="item.couponInfoList.length">
+              <text>送</text>
+              <text>{{ couponNum(item.couponInfoList) }}</text>
+              <text>张券</text>
+              <text
+                class="color2 u-m-l-8"
+                v-if="sel == index"
+                @click="lookCoupon(item)"
+                >查看</text
+              >
+            </view>
 
+            <view class="sel u-flex" v-if="sel == index">
+              <image class="image" src="/static/vip/sel.png" mode=""></image>
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+    <view class="" v-else></view>
+    <CouponList
+      v-model="couponModel.show"
+      :list="couponModel.couponInfoList"
+    ></CouponList>
+  </view>
 </template>
 
 <script setup>
-	import CouponList from '@/components/coupon/list.vue'
-	import * as rechargeApi from '@/common/api/market/recharge.js'
-	import {
-		useCartsStore
-	} from '@/stores/carts.js';
-	import {
-		onMounted,reactive,
-		ref,
-		watch
-	} from 'vue';
-	const couponModel = reactive({
-		show: false,
-		couponInfoList: []
-	})
-	
-	function lookCoupon(item) {
-		couponModel.couponInfoList = item.couponInfoList
-		couponModel.show = true
-	}
-	
-	function couponNum(list) {
-		return list.reduce((prve, cur) => {
-			return prve + cur.num
-		}, 0)
-	}
-	const cartStore = useCartsStore()
+import CouponList from "@/components/coupon/list.vue";
+import * as rechargeApi from "@/common/api/market/recharge.js";
+import { useCartsStore } from "@/stores/carts.js";
+import { onMounted, reactive, ref, watch } from "vue";
+const couponModel = reactive({
+  show: false,
+  couponInfoList: [],
+});
 
-	const list = ref([])
-	const sel = ref(-1)
-	const isShow = ref(false)
-	let data={}
-	let $riginList=[]
-	async function init() {
-		console.log('recharge', )
-		const shopId = uni.cache.get('shopId')
-		const res = await rechargeApi.config({
-			shopId
-		})
-		if (res) {
-			data=res;
-			$riginList=res.rechargeDetailList
-			isShow.value = res.isOrder
-			list.value = res.rechargeDetailList.filter(v=>v.amount>cartStore.orderCostSummary.finalPayAmount)
-			if(list.value.length){
-				updateSel()
-			}
-		}
-	}
-	watch(()=>cartStore.orderCostSummary.finalPayAmount,(newval)=>{
-		list.value=$riginList.filter(v=>v.amount>newval)
-		if(list.value.length){
-			updateSel()
-		}
-	})
-	const emits=defineEmits(['updateChargeSel','updateRechargeId'])
-	function updateSel(){
-		const selItem=list.value[sel.value]
-		emits('updateChargeSel',selItem?selItem:{})
-		emits('updateRechargeId',data.id)
-	}
-	function itemClick(index){
-		
-		console.log('itemClick',sel.value,index);
-		if(sel.value==-1){
-			sel.value=index
-			return 
-		}
-		if(sel.value==index){
-			sel.value=-1
-			return
-		}
-		sel.value=index
-	}
-	watch(()=>sel.value,(newval)=>{
-		updateSel()
-	})
-	onMounted(() => {
-		init()
-	})
+function lookCoupon(item) {
+  couponModel.couponInfoList = item.couponInfoList;
+  couponModel.show = true;
+}
+
+function couponNum(list) {
+  return list.reduce((prve, cur) => {
+    return prve + cur.num;
+  }, 0);
+}
+const cartStore = useCartsStore();
+
+const list = ref([]);
+const sel = ref(-1);
+const isShow = ref(false);
+let data = {};
+let $riginList = [];
+const emits = defineEmits(["updateChargeSel", "updateRechargeId","updateIsShow"]);
+
+async function init() {
+  console.log("recharge");
+  const shopId = uni.cache.get("shopId");
+  const res = await rechargeApi.config({
+    shopId,
+  });
+  if (res) {
+    data = res;
+    $riginList = res.rechargeDetailList;
+    isShow.value = res.isOrder&&res.isEnable?true:false;
+    list.value = res.rechargeDetailList.filter(
+      (v) => v.amount > cartStore.orderCostSummary.finalPayAmount
+    );
+    if (list.value.length) {
+      updateSel();
+    }
+  }
+}
+watch(
+  () => cartStore.orderCostSummary.finalPayAmount,
+  (newval) => {
+    list.value = $riginList.filter((v) => v.amount > newval);
+    if (list.value.length) {
+      updateSel();
+    }
+  }
+);
+function updateSel() {
+  const selItem = list.value[sel.value];
+  emits("updateChargeSel", selItem ? selItem : {});
+  emits("updateRechargeId", data.id);
+}
+function itemClick(index) {
+  console.log("itemClick", sel.value, index);
+  if (sel.value == -1) {
+    sel.value = index;
+    return;
+  }
+  if (sel.value == index) {
+    sel.value = -1;
+    return;
+  }
+  sel.value = index;
+}
+watch(
+  () => sel.value,
+  (newval) => {
+    updateSel();
+  }
+);
+watch(()=>isShow.value,(newval)=>{
+  emits("updateIsShow", newval);
+})
+onMounted(() => {
+  init();
+});
 </script>
 
 <style lang="scss" scoped>
-	.color1{
-		color: #5F2E0F;
-	}
-	.color2{
-		color: #FF6300;
-	}
-	.box {
-		background-color: #fdf9f6;
-		padding: 30rpx;
-		margin-top: 32rpx;
-		border-radius: 22rpx;
-		overflow: hidden;
-	}
+.color1 {
+  color: #5f2e0f;
+}
+.color2 {
+  color: #ff6300;
+}
+.box {
+  background-color: #fdf9f6;
+  padding: 30rpx;
+  margin-top: 32rpx;
+  border-radius: 22rpx;
+  overflow: hidden;
+}
 
-	.charge {
-		width: 70rpx;
-		height: 70rpx;
-	}
+.charge {
+  width: 70rpx;
+  height: 70rpx;
+}
 
-	.list {
-		display: flex;
-		gap: 20rpx;
-		padding: 20rpx 0;
+.list {
+  display: flex;
+  gap: 20rpx;
+  padding: 20rpx 0;
 
-		.item {
-			padding: 36rpx 22rpx;
-			border-radius: 42rpx;
-			background: linear-gradient(180deg, #F5F5F5 58.54%, #FFF 104.47%);
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			position: relative;
-			box-sizing: border-box;
-			border: 6rpx solid transparent;
-			transition: all .3s ease-in-out;
-			min-width: 202rpx;
+  .item {
+    padding: 36rpx 22rpx;
+    border-radius: 42rpx;
+    background: linear-gradient(180deg, #f5f5f5 58.54%, #fff 104.47%);
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    position: relative;
+    box-sizing: border-box;
+    border: 6rpx solid transparent;
+    transition: all 0.3s ease-in-out;
+    min-width: 202rpx;
 
-			&.active {
-				background: linear-gradient(180deg, #FFC29A -26.17%, #FFF 64.06%);
-				border: 6rpx solid #FE6C0E;
-				box-shadow: 0 0 31rpx 2rpx #fe8b435e;
-			}
+    &.active {
+      background: linear-gradient(180deg, #ffc29a -26.17%, #fff 64.06%);
+      border: 6rpx solid #fe6c0e;
+      box-shadow: 0 0 31rpx 2rpx #fe8b435e;
+    }
 
-			.sel {
-				position: absolute;
-				bottom: 0;
-				left: 50%;
+    .sel {
+      position: absolute;
+      bottom: 0;
+      left: 50%;
 
-				transform: translateX(-50%) translateY(21rpx);
+      transform: translateX(-50%) translateY(21rpx);
 
-				.image {
-					width: 42rpx;
-					height: 42rpx;
-				}
-			}
-		}
-	}
+      .image {
+        width: 42rpx;
+        height: 42rpx;
+      }
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/pages/order/components/order-item.vue b/pages/order/components/order-item.vue
index 7537e83..027b806 100644
--- a/pages/order/components/order-item.vue
+++ b/pages/order/components/order-item.vue
@@ -1,474 +1,545 @@
 <template>
-	<view class="card_item">
-		<!-- <view class="head">
-			<view class="head_left">
-				<text class="placeNum">当前购物车</text>
-			</view>
-		</view> -->
-		<!-- 订单详情 -->
-		<view class="shop-info">
-			<view class="item" v-for="item in nowCarts" :key="item.id">
-				<view class="cover">
-					<up-image width="76" height="76" radius="16" :src="item.productImg"
-						v-if="item.productId!=-999"></up-image>
-					<up-image width="76" height="76" radius="16"
-						:src="'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/table.png'"
-						mode="heightFix" v-else></up-image>
-				</view>
-				<view class="info">
-					<text class="productName">{{item.productName}}</text>
-					<text class="productSkuName" v-if="item.skuName">{{item.skuName}}</text>
-				</view>
+  <view class="card_item">
+    <!-- 订单详情 -->
+    <view class="shop-info">
+      <view class="item" v-for="item in nowCarts" :key="item.id">
+        <view class="cover">
+          <view class="limitDiscount" v-if="showLimitDiscount(item)"
+            >限时折扣</view
+          >
 
-				<view class="price">
-					<view class="priceAmount">
-						<text v-if="changeFreeenable">{{item.price}}</text>
-						<text v-else>
-							￥{{useVipPrice?(item.memberPrice|| item.price):item.price}}
-						</text>
-					</view>
-					<view class="num">x{{item.num}}</view>
-				</view>
-			</view>
-		</view>
+          <up-image
+            width="76"
+            height="76"
+            radius="6"
+            :src="item.productImg"
+            v-if="item.productId != -999"
+          ></up-image>
+          <up-image
+            width="76"
+            height="76"
+            radius="6"
+            :src="'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/table.png'"
+            mode="heightFix"
+            v-else
+          ></up-image>
+        </view>
+        <view class="info">
+          <text class="productName">{{ item.productName }}</text>
+          <text class="productSkuName" v-if="item.skuName">{{
+            item.skuName
+          }}</text>
+          <template v-if="showLimitDiscount(item)">
+            <text
+              class="limitDiscount-time"
+              v-if="limitDiscount.useTimeType == 'all'"
+            >
+              限时折扣：00：00-24：00
+            </text>
+            <text
+              class="limitDiscount-time"
+              v-if="
+                limitDiscount.useTimeType == 'custom' &&
+                limitDiscount.useStartTime &&
+                limitDiscount.useEndTime
+              "
+            >
+              限时折扣：{{ limitDiscount.useStartTime }}-{{
+                limitDiscount.useEndTime
+              }}
+            </text>
+          </template>
+        </view>
 
-		<!--<view class="status" v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'">未付款</view>
-		 <view class="totalAmount">
-			<view class="label">小计￥</view>
-			<view class="price"> {{item.totalAmount}} </view>
-		</view> -->
-
-		<!-- <view class="semicircle_icon" v-if="index > 0">
-			<view class="semicircle_left_icon"></view>
-			<view class="semicircle_right_icon"></view>
-		</view> -->
-	</view>
+        <view class="price">
+          <view class="priceAmount">
+            ¥
+            <goodsPrice
+              :cart="item"
+              :limitDiscount="limitDiscount"
+              :shopUserInfo="shopUserInfo"
+              :shopInfo="shopInfo"
+              idKey="product_id"
+            ></goodsPrice>
+            <view class="old-price" v-if="showLimitDiscount(item)">¥{{ item.salePrice }}</view>
+          </view>
+          <view class="num">x{{ item.num }}</view>
+        </view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script setup>
-	import {
-		ref,
-		reactive,
-		defineProps,
-		computed,
-		defineEmits,
-		watch,
-		watchEffect,
-		defineExpose,
-		onMounted
-	} from 'vue'
-	const props = defineProps({
-		changeFreeenable: {
-			type: Boolean,
-			default: false
-		},
-		useVipPrice: {
-			type: Boolean,
-			default: false
-		},
-		nowCarts: {
-			type: Array,
-			default: () => {
-				return []
-			}
-		}
-	})
-	onMounted(() => {
-		console.log('props.nowCarts');
-		console.log(props.nowCarts);
-	})
+import {
+  ref,
+  reactive,
+  defineProps,
+  computed,
+  defineEmits,
+  watch,
+  watchEffect,
+  defineExpose,
+  inject,
+  onMounted,
+} from "vue";
+import goodsPrice from "@/components/goods-price.vue";
+import * as orderUtils from "@/utils/order-utils.js";
+
+const props = defineProps({
+  changeFreeenable: {
+    type: Boolean,
+    default: false,
+  },
+  useVipPrice: {
+    type: Boolean,
+    default: false,
+  },
+  nowCarts: {
+    type: Array,
+    default: () => {
+      return [];
+    },
+  },
+  limitDiscount: {
+    type: Object,
+    default: () => {},
+  },
+});
+const shopUserInfo = inject("shopUserInfo");
+const shopInfo = inject("shopInfo");
+
+function showLimitDiscount(item) {
+  if (!props.limitDiscount || !props.limitDiscount.id) {
+    return false;
+  }
+  return orderUtils.canUseLimitTimeDiscount(
+    item,
+    props.limitDiscount,
+    shopInfo.value,
+    shopUserInfo.value,
+    "productId"
+  );
+}
+onMounted(() => {
+  console.log("props.nowCarts");
+  console.log(props.nowCarts);
+});
+
+const showOldPrice = computed(() => {});
 </script>
 
 <style lang="scss" scoped>
-	.card_item {
-		display: flex;
-		flex-direction: column;
-		position: relative;
-		padding: 0 34rpx;
-
-		.head {
-			display: flex;
-			justify-content: space-between;
-			// padding: 32rpx 0;
-
-			.head_left {
-				display: flex;
-				align-items: center;
-
-				.placeNum {
-					font-weight: bold;
-					font-size: 32rpx;
-					color: #333333;
-					margin-right: 32rpx;
-					flex-shrink: 0;
-				}
-
-				.placeTime {
-					font-weight: 400;
-					font-size: 32rpx;
-					color: #666666;
-					flex-shrink: 0;
-				}
-			}
-
-		}
-
-		.shop-info {
-			padding-top: 28rpx;
-		
-			.item:nth-child(1) {
-				margin-top: 0;
-			}
-
-			.item {
-				margin-bottom: 32rpx;
-				display: flex;
-				&:last-child{
-						margin-bottom: 0;
-				}
-				.cover {}
-
-				.info {
-					flex: 1;
-					display: flex;
-					flex-direction: column;
-					padding-left: 16upx;
-
-					.productName {
-						font-weight: bold;
-						font-size: 28rpx;
-						color: #333333;
-						margin-top: 20rpx;
-					}
-
-					.productSkuName {
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #999999;
-						display: -webkit-box;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 3;
-						overflow: hidden;
-						text-overflow: ellipsis;
-					}
-
-					.n {
-						font-size: 24upx;
-						color: #999;
-					}
-				}
-
-				.price {
-					display: flex;
-					flex-direction: column;
-					align-items: flex-end;
-					padding-left: 68rpx;
-
-					.priceAmount {
-						font-weight: 500;
-						font-size: 28rpx;
-						color: #333333;
-						margin-top: 26rpx;
-					}
-
-					.num {
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #999999;
-						margin-top: 22rpx;
-					}
-				}
-			}
-		}
-
-		.status {
-			align-self: flex-end;
-			width: 92rpx;
-			height: 40rpx;
-			line-height: 40rpx;
-			text-align: center;
-			background: #999999;
-			border-radius: 10rpx 10rpx 10rpx 10rpx;
-			font-weight: 400;
-			font-size: 22rpx;
-			color: #FFFFFF;
-			margin-top: 32rpx;
-		}
-
-		.totalAmount {
-			width: 100%;
-			display: flex;
-			justify-content: flex-end;
-			align-items: flex-end;
-			padding: 32rpx 0;
-			border-bottom: 2rpx dashed #e5e5e5;
-
-			.label {
-				font-weight: bold;
-				font-size: 28rpx;
-				color: #333333;
-			}
-
-			.price {
-				font-weight: bold;
-				font-size: 36rpx;
-				color: #333333;
-			}
-		}
-
-		.semicircle_icon {
-			width: 100%;
-			position: absolute;
-			top: -22.5rpx;
-			left: 0;
-			display: flex;
-			justify-content: space-between;
-
-			.semicircle_left_icon {
-				width: 45rpx;
-				height: 45rpx;
-				margin-left: -22.5rpx;
-				background-color: #f9f9f9;
-				border-radius: 50%;
-				// box-shadow: inset -20rpx 0rpx 22rpx -20rpx rgba(87, 86, 86, 0.35);
-
-			}
-
-			.semicircle_right_icon {
-				width: 45rpx;
-				height: 45rpx;
-				margin-right: -22.5rpx;
-				background-color: #f9f9f9;
-				border-radius: 50%;
-				// box-shadow: inset 13rpx 0rpx 16rpx -9rpx rgba(87, 86, 86, 0.35);
-
-			}
-		}
-	}
-
-	.cell-item {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 32rpx 34rpx 0 34rpx;
-
-		.label {
-			font-weight: bold;
-			font-size: 32rpx;
-			color: #333333;
-			padding-bottom: 32rpx;
-		}
-
-		.val {
-			display: flex;
-			align-items: flex-end;
-			padding-bottom: 32rpx;
-			border-bottom: 2rpx dashed #e5e5e5;
-
-			view:nth-child(1) {
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #999999;
-				margin-right: 42rpx;
-			}
-
-			view:nth-child(2) {
-				display: flex;
-				align-items: flex-end;
-				font-weight: bold;
-				font-size: 36rpx;
-				color: #333333;
-			}
-		}
-
-		.val.column {
-			display: flex;
-			flex-direction: column;
-
-			.productCoupon {
-				display: flex;
-				align-items: flex-end;
-				margin: 0 0 10rpx 0;
-
-				.name {
-					font-weight: 400;
-					font-size: 26rpx;
-					color: #999;
-					margin: 0;
-				}
-
-				.num {
-					font-weight: 400;
-					font-size: 26rpx;
-					color: #999;
-					margin: 0 30rpx;
-					line-height: 20rpx;
-				}
-
-				.amount {
-					font-weight: bold;
-					font-size: 26rpx;
-					color: #333;
-				}
-			}
-		}
-	}
-
-	.favorable {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 0 30rpx;
-		box-sizing: border-box;
-		padding-bottom: 26rpx;
-		padding-top: 26rpx;
-		border-bottom: 2rpx solid #E5E5E5;
-
-		.favorable_left {
-			display: flex;
-			align-items: center;
-
-			.icon {
-				width: 40rpx;
-				height: 40rpx;
-				margin-right: 16rpx;
-			}
-
-			.name {
-				font-size: 28rpx;
-				font-weight: 400rpx;
-				color: #333;
-			}
-		}
-
-		.favorable_right {
-			display: flex;
-			align-items: center;
-
-			.favorable_right_text {
-				font-size: 24rpx;
-				color: #999;
-				font-weight: 400rpx;
-			}
-
-		}
-
-		.favorable_right {
-			.column {
-				display: flex;
-				flex-direction: column;
-				align-items: flex-end;
-
-				.favorable_right_text {
-					margin-bottom: 10rpx;
-
-					text:nth-child(1) {
-						font-size: 26rpx;
-						color: #999;
-					}
-
-					text:nth-child(2) {
-						font-size: 26rpx;
-						color: #999;
-						margin: 0 30rpx;
-					}
-
-					text:nth-child(3) {
-						font-size: 26rpx;
-						color: #333;
-
-					}
-				}
-			}
-		}
-
-		.favorable_right.column {
-			align-items: flex-start;
-		}
-	}
-
-	.favorable.column {
-		align-items: flex-start;
-	}
-
-	.cell-item.column {
-		align-items: flex-start;
-	}
-
-	.total-wrap {
-		width: 100%;
-		display: flex;
-		justify-content: flex-end;
-		align-items: flex-end;
-		padding: 0 34rpx;
-		font-weight: bold;
-		font-size: 28rpx;
-		color: #333333;
-		margin-top: 64rpx;
-
-		.price {
-			font-weight: bold;
-			font-size: 36rpx;
-		}
-	}
-
-
-
-	.order_footer {
-		display: flex;
-		flex-direction: column;
-		padding: 34rpx;
-		position: relative;
-
-
-
-	}
-
-
-
-	.fixedview {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		width: 100%;
-
-		.flex-between {
-			width: 100%;
-			padding: 36rpx 54rpx 102rpx 54rpx;
-			background: #FFFFFF;
-
-			.fixedview_one {
-				display: flex;
-				align-items: flex-end;
-
-				.fixedview_oneone {
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #666666;
-				}
-
-				.fixedview_onetow {
-					font-weight: bold;
-					font-size: 32rpx;
-					color: #333333;
-
-					text {
-						font-size: 24rpx;
-					}
-				}
-			}
-
-			.fixedview_tow {
-				width: 140rpx;
-				height: 56rpx;
-				line-height: 56rpx;
-				text-align: center;
-				background: #E3AD7F;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #FFFFFF;
-			}
-		}
-	}
+.card_item {
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  padding: 0 34rpx;
+
+  .head {
+    display: flex;
+    justify-content: space-between;
+    // padding: 32rpx 0;
+
+    .head_left {
+      display: flex;
+      align-items: center;
+
+      .placeNum {
+        font-weight: bold;
+        font-size: 32rpx;
+        color: #333333;
+        margin-right: 32rpx;
+        flex-shrink: 0;
+      }
+
+      .placeTime {
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #666666;
+        flex-shrink: 0;
+      }
+    }
+  }
+
+  .shop-info {
+    padding-top: 28rpx;
+
+    .item:nth-child(1) {
+      margin-top: 0;
+    }
+
+    .item {
+      margin-bottom: 32rpx;
+      display: flex;
+      &:last-child {
+        margin-bottom: 0;
+      }
+      .cover {
+      }
+
+      .info {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        padding-left: 16upx;
+
+        .productName {
+          font-weight: bold;
+          font-size: 28rpx;
+          color: #333333;
+          margin-top: 20rpx;
+        }
+
+        .productSkuName {
+          font-weight: 400;
+          font-size: 24rpx;
+          color: #999999;
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 3;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+
+        .n {
+          font-size: 24upx;
+          color: #999;
+        }
+      }
+
+      .price {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-end;
+        padding-left: 68rpx;
+
+        .priceAmount {
+          font-weight: 700;
+          font-size: 28rpx;
+          color: #333333;
+          margin-top: 26rpx;
+        }
+
+        .num {
+          font-weight: 400;
+          font-size: 24rpx;
+          color: #999999;
+          margin-top: 22rpx;
+        }
+      }
+    }
+  }
+
+  .status {
+    align-self: flex-end;
+    width: 92rpx;
+    height: 40rpx;
+    line-height: 40rpx;
+    text-align: center;
+    background: #999999;
+    border-radius: 10rpx 10rpx 10rpx 10rpx;
+    font-weight: 400;
+    font-size: 22rpx;
+    color: #ffffff;
+    margin-top: 32rpx;
+  }
+
+  .totalAmount {
+    width: 100%;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+    padding: 32rpx 0;
+    border-bottom: 2rpx dashed #e5e5e5;
+
+    .label {
+      font-weight: bold;
+      font-size: 28rpx;
+      color: #333333;
+    }
+
+    .price {
+      font-weight: bold;
+      font-size: 36rpx;
+      color: #333333;
+    }
+  }
+
+  .semicircle_icon {
+    width: 100%;
+    position: absolute;
+    top: -22.5rpx;
+    left: 0;
+    display: flex;
+    justify-content: space-between;
+
+    .semicircle_left_icon {
+      width: 45rpx;
+      height: 45rpx;
+      margin-left: -22.5rpx;
+      background-color: #f9f9f9;
+      border-radius: 50%;
+      // box-shadow: inset -20rpx 0rpx 22rpx -20rpx rgba(87, 86, 86, 0.35);
+    }
+
+    .semicircle_right_icon {
+      width: 45rpx;
+      height: 45rpx;
+      margin-right: -22.5rpx;
+      background-color: #f9f9f9;
+      border-radius: 50%;
+      // box-shadow: inset 13rpx 0rpx 16rpx -9rpx rgba(87, 86, 86, 0.35);
+    }
+  }
+}
+
+.cell-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 32rpx 34rpx 0 34rpx;
+
+  .label {
+    font-weight: bold;
+    font-size: 32rpx;
+    color: #333333;
+    padding-bottom: 32rpx;
+  }
+
+  .val {
+    display: flex;
+    align-items: flex-end;
+    padding-bottom: 32rpx;
+    border-bottom: 2rpx dashed #e5e5e5;
+
+    view:nth-child(1) {
+      font-weight: 400;
+      font-size: 24rpx;
+      color: #999999;
+      margin-right: 42rpx;
+    }
+
+    view:nth-child(2) {
+      display: flex;
+      align-items: flex-end;
+      font-weight: bold;
+      font-size: 36rpx;
+      color: #333333;
+    }
+  }
+
+  .val.column {
+    display: flex;
+    flex-direction: column;
+
+    .productCoupon {
+      display: flex;
+      align-items: flex-end;
+      margin: 0 0 10rpx 0;
+
+      .name {
+        font-weight: 400;
+        font-size: 26rpx;
+        color: #999;
+        margin: 0;
+      }
+
+      .num {
+        font-weight: 400;
+        font-size: 26rpx;
+        color: #999;
+        margin: 0 30rpx;
+        line-height: 20rpx;
+      }
+
+      .amount {
+        font-weight: bold;
+        font-size: 26rpx;
+        color: #333;
+      }
+    }
+  }
+}
+
+.favorable {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 30rpx;
+  box-sizing: border-box;
+  padding-bottom: 26rpx;
+  padding-top: 26rpx;
+  border-bottom: 2rpx solid #e5e5e5;
+
+  .favorable_left {
+    display: flex;
+    align-items: center;
+
+    .icon {
+      width: 40rpx;
+      height: 40rpx;
+      margin-right: 16rpx;
+    }
+
+    .name {
+      font-size: 28rpx;
+      font-weight: 400rpx;
+      color: #333;
+    }
+  }
+
+  .favorable_right {
+    display: flex;
+    align-items: center;
+
+    .favorable_right_text {
+      font-size: 24rpx;
+      color: #999;
+      font-weight: 400rpx;
+    }
+  }
+
+  .favorable_right {
+    .column {
+      display: flex;
+      flex-direction: column;
+      align-items: flex-end;
+
+      .favorable_right_text {
+        margin-bottom: 10rpx;
+
+        text:nth-child(1) {
+          font-size: 26rpx;
+          color: #999;
+        }
+
+        text:nth-child(2) {
+          font-size: 26rpx;
+          color: #999;
+          margin: 0 30rpx;
+        }
+
+        text:nth-child(3) {
+          font-size: 26rpx;
+          color: #333;
+        }
+      }
+    }
+  }
+
+  .favorable_right.column {
+    align-items: flex-start;
+  }
+}
+
+.favorable.column {
+  align-items: flex-start;
+}
+
+.cell-item.column {
+  align-items: flex-start;
+}
+
+.total-wrap {
+  width: 100%;
+  display: flex;
+  justify-content: flex-end;
+  align-items: flex-end;
+  padding: 0 34rpx;
+  font-weight: bold;
+  font-size: 28rpx;
+  color: #333333;
+  margin-top: 64rpx;
+
+  .price {
+    font-weight: bold;
+    font-size: 36rpx;
+  }
+}
+
+.order_footer {
+  display: flex;
+  flex-direction: column;
+  padding: 34rpx;
+  position: relative;
+}
+
+.fixedview {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+
+  .flex-between {
+    width: 100%;
+    padding: 36rpx 54rpx 102rpx 54rpx;
+    background: #ffffff;
+
+    .fixedview_one {
+      display: flex;
+      align-items: flex-end;
+
+      .fixedview_oneone {
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #666666;
+      }
+
+      .fixedview_onetow {
+        font-weight: bold;
+        font-size: 32rpx;
+        color: #333333;
+
+        text {
+          font-size: 24rpx;
+        }
+      }
+    }
+
+    .fixedview_tow {
+      width: 140rpx;
+      height: 56rpx;
+      line-height: 56rpx;
+      text-align: center;
+      background: #e3ad7f;
+      border-radius: 12rpx 12rpx 12rpx 12rpx;
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #ffffff;
+    }
+  }
+}
+
+.cover {
+  position: relative;
+}
+
+.limitDiscount {
+  background-color: #cc5617;
+  padding: 2rpx 10rpx;
+  white-space: nowrap;
+  text-align: center;
+  position: absolute;
+  top: 0;
+  left: 0;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #ffffff;
+  border-radius: 20rpx 0rpx 20rpx 0rpx;
+  z-index: 9;
+  color: #fff;
+}
+.limitDiscount-time {
+  color: #ff534b;
+  font-size: 20rpx;
+  line-height: 25rpx;
+}
+.old-price {
+  font-size: 24rpx;
+  color: #999;
+  font-weight: 400;
+  text-decoration: line-through;
+  text-align: right;
+}
 </style>
\ No newline at end of file
diff --git a/pages/order/components/orderInfo.vue b/pages/order/components/orderInfo.vue
index 59684f6..b5a3c14 100644
--- a/pages/order/components/orderInfo.vue
+++ b/pages/order/components/orderInfo.vue
@@ -1,103 +1,146 @@
 <template>
-	<view>
-		<view class="card_box">
-			<!-- <view class="card_head_box">
+  <view>
+    <view class="card_box">
+      <!-- <view class="card_head_box">
 				<view class="card_head_item" v-for="(item,index) in 8" :key="index"></view>
 			</view> -->
 
-			<!-- 先付款 -->
-			<view class="tabBox" v-if="listinfo.status == 'unpaid'||!listinfo.id">
-				<view class="tab">
-					<view v-for="(item,index) in tebtypeList" :key="index"
-						:class="is_type==index?'tab_item'+(is_type+1)+' tab_item  active ':'tab_item'"
-						@click="tabClick(item,index)">
-						<view></view>
-						<image class="icon" :src="is_type==index?item.url_active:item.url" mode="aspectFill" />
-						<text class="title" :class="{active:is_type==index}">{{item.title}}</text>
-					</view>
-				</view>
-				<view class="table" v-if=" is_type == 0 ">
-					<view class="table_left">
-						<image class="icon"
-							src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/table.png"
-							mode="aspectFill" />
-						<text class="title">桌台</text>
-					</view>
-					<view class="value" v-if="listinfo.tableName"> {{ listinfo.tableName || '' }} </view>
-				</view>
+      <!-- 先付款 -->
+      <view class="tabBox" v-if="listinfo.status == 'unpaid' || !listinfo.id">
+        <view class="tab">
+          <view
+            v-for="(item, index) in tebtypeList"
+            :key="index"
+            :class="
+              is_type == index
+                ? 'tab_item' + (is_type + 1) + ' tab_item  active '
+                : 'tab_item'
+            "
+            @click="tabClick(item, index)"
+          >
+            <view></view>
+            <image
+              class="icon"
+              :src="is_type == index ? item.url_active : item.url"
+              mode="aspectFill"
+            />
+            <text class="title" :class="{ active: is_type == index }">{{
+              item.title
+            }}</text>
+          </view>
+        </view>
+        <view class="table" v-if="is_type == 0">
+          <view class="table_left">
+            <image
+              class="icon"
+              src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/table.png"
+              mode="aspectFill"
+            />
+            <text class="title">桌台</text>
+          </view>
+          <view class="value" v-if="listinfo.tableName">
+            {{ listinfo.tableName || "" }}
+          </view>
+        </view>
+      </view>
 
-			</view>
+      <view class="card">
+        <!-- <orderItemVue
+          :useVipPrice="useVipPrice"
+          v-if="nowCarts.length"
+          :nowCarts="nowCarts"
+          :limitDiscount="cartStore.limitTimeDiscount"
+        ></orderItemVue> -->
+        <orderItemVue
+          :useVipPrice="useVipPrice"
+          v-if="cartStore.allGoods.length"
+          :nowCarts="cartStore.allGoods"
+          :limitDiscount="cartStore.limitTimeDiscount"
+        ></orderItemVue>
+        <template v-if="false">
+          <view
+            class="card_item"
+            v-for="(value, key) in listinfo.detailMap"
+            :key="key"
+          >
+            <view class="shop-info">
+              <view class="item" v-for="item in value" :key="item.id">
+                <view class="cover">
+                  <up-image
+                    width="76"
+                    height="76"
+                    radius="6"
+                    :src="item.productImg"
+                    v-if="item.productId != -999"
+                  ></up-image>
+                  <up-image
+                    width="76"
+                    height="76"
+                    radius="6"
+                    :src="'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/table.png'"
+                    mode="heightFix"
+                    v-else
+                  ></up-image>
+                </view>
+                <view class="info">
+                  <text class="productName">{{ item.productName }}</text>
+                  <text class="productSkuName" v-if="item.skuName">{{
+                    item.skuName
+                  }}</text>
+                </view>
+                <view class="price">
+                  <view class="priceAmount">
+                    <text v-if="isBwc">{{ item.price }}</text>
+                    <text v-else>
+                      ￥{{
+                        useVipPrice
+                          ? item.memberPrice || item.price
+                          : item.price
+                      }}
+                    </text>
+                  </view>
+                  <view class="num">x{{ item.num }}</view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </template>
 
-			<view class="card">
-				<orderItemVue :useVipPrice="useVipPrice" v-if="nowCarts.length" :nowCarts="nowCarts"></orderItemVue>
-				<!-- 订单头部 -->
-				<view class="card_item" v-for="(value, key) in listinfo.detailMap" :key="key">
-					<!-- <view class="head">
-						<view class="head_left">
-							<text class="placeNum" v-if="key!=0">第{{key}}次下单</text>
-						</view>
-					</view> -->
-					<!-- 订单详情 -->
-					<view class="shop-info">
-						<view class="item" v-for="item in value" :key="item.id">
-							<view class="cover">
-								<up-image width="76" height="76" radius="16" :src="item.productImg"
-									v-if="item.productId!=-999"></up-image>
-								<up-image width="76" height="76" radius="16"
-									:src="'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/table.png'"
-									mode="heightFix" v-else></up-image>
-							</view>
-							<view class="info">
-								<text class="productName">{{item.productName}}</text>
-								<text class="productSkuName" v-if="item.skuName">{{item.skuName}}</text>
-							</view>
-							<view class="price">
-								<view class="priceAmount">
-									<text v-if="isBwc">{{item.price}}</text>
-									<text v-else>
-										￥{{useVipPrice?(item.memberPrice|| item.price):item.price}}
-									</text>
-								</view>
-								<view class="num">x{{item.num}}</view>
-							</view>
-						</view>
+        <view
+          class="total-wrap u-m-t-30"
+          v-if="listinfo.status == 'unpaid' || !listinfo.id"
+        >
+          <view>总计￥</view>
+          <view class="price">
+            {{ cartStore.orderCostSummary.goodsRealAmount }}
+          </view>
+        </view>
 
-					</view>
-
-
-				</view>
-
-				<view class="total-wrap u-m-t-30" v-if="listinfo.status == 'unpaid'||!listinfo.id">
-					<view>总计￥</view>
-					<view class="price"> {{cartStore.orderCostSummary.goodsRealAmount}} </view>
-				</view>
-
-				<!-- <view class="total-wrap" v-else>
+        <!-- <view class="total-wrap" v-else>
 					<view>实付￥</view>
 					<view class="price"> {{listinfo.payAmount||''}} </view>
 				</view> -->
 
-				<view class="cell-item" v-if="is_type != 0">
-					<view class="label">打包费</view>
-					<view class="val">
-						<view></view>
-						<view style="font-size: 28rpx;">￥</view>
-						<view>{{cartStore.orderCostSummary.packFee }}</view>
-					</view>
-				</view>
+        <view class="cell-item" v-if="is_type != 0">
+          <view class="label">打包费</view>
+          <view class="val">
+            <view></view>
+            <view style="font-size: 28rpx">￥</view>
+            <view>{{ cartStore.orderCostSummary.packFee }}</view>
+          </view>
+        </view>
 
+        <!-- isTableFee == 0是不免除 -->
+        <view class="cell-item" v-if="cartStore.orderCostSummary.seatFee">
+          <view class="label">餐位费</view>
+          <view class="val">
+            <view>X{{ cartStore.seatFeeConfig.personCount }}</view>
+            <view style="font-size: 28rpx">￥</view>
+            <view>{{ cartStore.orderCostSummary.seatFee }}</view>
+          </view>
+        </view>
 
-				<!-- isTableFee == 0是不免除 -->
-				<view class="cell-item" v-if="cartStore.orderCostSummary.seatFee">
-					<view class="label">餐位费</view>
-					<view class="val">
-						<view>X{{cartStore.seatFeeConfig.personCount}}</view>
-						<view style="font-size: 28rpx;">￥</view>
-						<view>{{cartStore.orderCostSummary.seatFee}}</view>
-					</view>
-				</view>
-
-				<!-- <view class="cell-item" v-else>
+        <!-- <view class="cell-item" v-else>
 					<view class="label">免餐位费</view>
 					<view class="val">
 						<view></view>
@@ -106,1178 +149,1448 @@
 					</view>
 				</view> -->
 
-				<!-- 支付之前 -->
-				<block v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'||!listinfo.id">
-					<view class="u-m-t-40 u-p-l-20 u-p-r-20">
-						<view class="favorable" v-for="(item,indexe) in favorablelist" :key="indexe"
-							:class="{column:item.type=='product'}" @click="goUrl(item)">
-							<view class="favorable_left">
-								<view class="u-flex" style="width: 44rpx;">
-									<u-image bgColor="#fff" :width="item.width||'44rpx'" :height="item.height||'44rpx'"
-										v-if="item.icon" :src="item.icon" mode=""></u-image>
-								</view>
-								<text class="name u-m-l-16 no-wrap"> {{ item.name }} </text>
-								<text class=" u-p-l-6" style="color: #666;max-width: 400rpx;font-size: 10px;"
-									v-if="item.type=='points'">
-									「可用积分{{pointsRes.accountPoints}}，最大可抵扣{{maxPointDiscount}}元」
+        <!-- 支付之前 -->
+        <block
+          v-if="
+            listinfo.status == 'unpaid' ||
+            listinfo.status == 'paying' ||
+            !listinfo.id
+          "
+        >
+          <view class="u-m-t-40 u-p-l-20 u-p-r-20">
+            <view class="youhui-item" v-if="cartStore.orderCostSummary.fullReduction.actualAmount">
+              <view class="u-flex align-center">
+                <image
+                  src="/static/icon/coup.png"
+                  bgColor="#fff"
+                  style="width: 50rpx; height: 50rpx"
+                ></image>
+                <text class="color-333 font-14 u-m-l-16 no-wrap">满减活动</text>
+              </view>
 
-								</text>
-							</view>
+              <view class="red font-12 u-flex align-center"
+                >-￥{{ cartStore.orderCostSummary.fullReduction.actualAmount }}</view
+              >
+            </view>
+            <view class="youhui-item" v-if="cartStore.orderCostSummary.vipDiscountAmount">
+              <view class="u-flex align-center">
+                <image
+                  src="/static/icon/newUserDiscount.png"
+                  bgColor="#fff"
+                  style="width: 50rpx; height: 50rpx"
+                ></image>
+                <text class="color-333 font-14 u-m-l-16 no-wrap">会员折扣</text>
+              </view>
 
+              <view class="red font-12 u-flex align-center"
+                >-￥{{ cartStore.orderCostSummary.vipDiscountAmount }}</view
+              >
+            </view>
+            <view class="youhui-item" v-if="newUserDiscount">
+              <view class="u-flex align-center">
+                <image
+                  src="/static/icon/newUserDiscount.png"
+                  bgColor="#fff"
+                  style="width: 50rpx; height: 50rpx"
+                ></image>
+                <text class="color-333 font-14 u-m-l-16 no-wrap">新客立减</text>
+              </view>
 
-							<!-- 优惠卷 -->
-							<view class="favorable_right" v-if="item.type=='coupon'">
-								<template v-if="cartStore.orderCostSummary.couponDeductionAmount>0">
-									<text
-										class="favorable_right_text red">-￥{{cartStore.orderCostSummary.couponDeductionAmount}}</text>
-								</template>
-								<template v-else>
-									<text class="favorable_right_text red" v-if="hasCouponCanUse">有可用优惠券</text>
-									<text class=" favorable_right_text " v-else>暂无可用优惠券</text>
-								</template>
+              <view class="red font-12 u-flex align-center"
+                >-￥{{ newUserDiscount }}</view
+              >
+            </view>
+            <view
+              class="favorable"
+              v-for="(item, indexe) in favorablelist"
+              :key="indexe"
+              :class="{ column: item.type == 'product' }"
+              @click="goUrl(item)"
+            >
+              <view class="favorable_left">
+                <view class="u-flex" style="width: 44rpx">
+                  <u-image
+                    bgColor="#fff"
+                    :width="item.width || '50rpx'"
+                    :height="item.height || '50rpx'"
+                    v-if="item.icon"
+                    :src="item.icon"
+                    mode=""
+                  ></u-image>
+                </view>
+                <text class="name u-m-l-16 no-wrap"> {{ item.name }} </text>
+                <template v-if="item.type == 'points' && !pointObj.disabled">
+                  <text
+                    class="u-p-l-6"
+                    style="color: #666; max-width: 400rpx; font-size: 10px"
+                  >
+                    「可用积分{{ pointsRes.accountPoints }}，最大可抵扣{{
+                      maxPointDiscount
+                    }}元」
+                  </text>
+                </template>
+              </view>
 
+              <!-- 优惠卷 -->
+              <view class="favorable_right" v-if="item.type == 'coupon'">
+                <template
+                  v-if="cartStore.orderCostSummary.couponDeductionAmount > 0"
+                >
+                  <text class="favorable_right_text red"
+                    >-￥{{
+                      cartStore.orderCostSummary.couponDeductionAmount
+                    }}</text
+                  >
+                </template>
+                <template v-else>
+                  <text
+                    class="favorable_right_text red"
+                    v-if="couponObj.disabled"
+                    >{{ couponObj.disabledReason }}</text
+                  >
+                  <text
+                    class="favorable_right_text red"
+                    v-else-if="hasCouponCanUse"
+                    >有可用优惠券</text
+                  >
+                  <text class="favorable_right_text" v-else
+                    >暂无可用优惠券</text
+                  >
+                </template>
+                <template v-if="!couponObj.disabled">
+                  <up-icon
+                    name="arrow-right"
+                    color="#575B66"
+                    size="16"
+                    v-if="
+                      listinfo.status == 'unpaid' ||
+                      listinfo.status == 'paying' ||
+                      !listinfo.id
+                    "
+                  ></up-icon>
+                </template>
+              </view>
 
+              <!-- 新客立减 -->
+              <view class="favorable_right" v-if="item.type == 'newUser'">
+                <text
+                  class="favorable_right_text red"
+                  v-if="newUserDiscount > 0"
+                  >-￥{{ newUserDiscount }}</text
+                >
+              </view>
 
-								<up-icon name="arrow-right" color="#575B66" size="16"
-									v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'||!listinfo.id"></up-icon>
-
-							</view>
-
-							<!-- 新客立减 -->
-							<view class="favorable_right" v-if="item.type=='newUser'">
-								<text class="favorable_right_text red"
-									v-if="newUserDiscount>0">-￥{{newUserDiscount}}</text>
-
-							</view>
-
-							<!-- 积分 -->
-							<view class="favorable_right u-flex u-col-center" v-if="item.type=='points'">
-								<template v-if="usePoints&&cartStore.orderCostSummary.pointDeductionAmount">
-									<up-icon name="checkmark-circle-fill" size="24rpx" color="#FE7E00"></up-icon>
-									<text class="red">
-										-¥{{cartStore.orderCostSummary.pointDeductionAmount}}
-									</text>
-								</template>
-
-								<template v-else>
-									<view v-if="maxPointDiscount>0" class="u-flex u-col-center">
-										<view class="round"></view>
-										<text class="color-333 font-12 no-wrap u-m-l-4">使用抵扣</text>
-									</view>
-
-								</template>
-
-							</view>
-							<!-- <view class="favorable_right" v-if="item.type=='points'">
-								<text class="favorable_right_text" style="color: #666;margin-right: 16rpx;"
-									v-if="calcUsablePointsData.integral">
-									使用 {{ calcUsablePointsData.integral}}
-									积分抵扣￥{{props.listinfo.pointsDiscountAmount}}
-								</text>
-								<up-icon v-else name="arrow-right" color="#575B66" size="16"></up-icon>
-							</view> -->
-
-						</view>
-					</view>
-				</block>
-				<block v-else>
-					<view class="cell-item column" v-if="listinfo.discountInfo">
-						<view class="label">优惠折扣</view>
-						<view class="val column">
-							<view class="productCoupon" v-for="(item,index) in listinfo.discountInfo" :key="index">
-								<view class="name">{{item.name}}</view>
-								<!-- <view class="num">{{item.amount}}</view> -->
-								<view class="amount" style="margin-left: 10rpx;">{{item.amount}}元</view>
-							</view>
-						</view>
-					</view>
-				</block>
-
-
-			</view>
-		</view>
-		<view class="orderInfo">
-			<view class="row" @click="copyHandle(listinfo.orderNo)">
-				<text class="t">订单编号：</text>
-				<text class="info"
-					style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">{{listinfo.orderNo}}(点击复制)</text>
-			</view>
-			<view class="row">
-				<text class="t">下单时间：</text>
-				<text class="info">{{$u.timeFormat(listinfo.updateTime, 'yyyy-mm-dd hh:MM:ss')}}</text>
-			</view>
-			<view class="row" v-if="listinfo.tableName">
-				<text class="t">下单台桌：</text>
-				<text class="info">{{listinfo.tableName}}</text>
-			</view>
-			<view class="row" v-if="orderVIP.shopName">
-				<text class="t">下单门店：</text>
-				<text class="info">{{orderVIP.shopName}}</text>
-			</view>
-			<view class="row" v-if="listinfo.dineMod">
-				<text class="t">用餐模式：</text>
-				<text class="info" v-if="listinfo.dineMod == 'dine-in'">堂食</text>
-				<text class="info" v-if="listinfo.dineMod == 'take-out'">外带</text>
-				<text class="info" v-if="listinfo.dineMod == 'take-away'">外卖</text>
-			</view>
-			<view class="row" v-if="listinfo.id&& listinfo.satus!='unpaid'">
-				<text class="t">备注：</text>
-				<text class="info u-line-5">{{ listinfo.remark || ""}}</text>
-			</view>
-			<view class="row" v-if="listinfo.seatNum">
-				<text class="t">就餐人数：</text>
-				<text class="info">{{ listinfo.seatNum || ""}}</text>
-			</view>
-			<view class="row" v-if="listinfo.refundType">
-				<text class="t">退款方式：</text>
-				<text class="info">{{ listinfo.refundType == 'cash'?'手动退款':'原路退回'}}</text>
-			</view>
-		</view>
-
-
-	</view>
+              <!-- 积分 -->
+              <view
+                class="favorable_right u-flex u-col-center"
+                v-if="item.type == 'points'"
+              >
+                <text
+                  v-if="pointObj.disabled"
+                  class="u-p-l-6 red"
+                  style="max-width: 440rpx; font-size: 24rpx"
+                  >{{ pointObj.disabledReason }}</text
+                >
+                <template
+                  v-else-if="
+                    usePoints && cartStore.orderCostSummary.pointDeductionAmount
+                  "
+                >
+                  <up-icon
+                    name="checkmark-circle-fill"
+                    size="24rpx"
+                    color="#FE7E00"
+                  ></up-icon>
+                  <text class="red">
+                    -¥{{ cartStore.orderCostSummary.pointDeductionAmount }}
+                  </text>
+                </template>
 
+                <template v-else>
+                  <view
+                    v-if="maxPointDiscount > 0 && !pointObj.disabled"
+                    class="u-flex u-col-center"
+                  >
+                    <view class="round"></view>
+                    <text class="color-333 font-12 no-wrap u-m-l-4"
+                      >使用抵扣</text
+                    >
+                  </view>
+                </template>
+              </view>
+            </view>
+          </view>
+        </block>
+        <block v-else>
+          <view
+            class="cell-item column"
+            v-if="listinfo.discountInfo && listinfo.discountInfo != '{}'"
+          >
+            <view class="label">优惠折扣</view>
+            <view class="val column">
+              <view
+                class="productCoupon"
+                v-for="(item, index) in listinfo.discountInfo"
+                :key="index"
+              >
+                <view class="name">{{ item.name }}</view>
+                <!-- <view class="num">{{item.amount}}</view> -->
+                <view class="amount" style="margin-left: 10rpx"
+                  >{{ item.amount }}元</view
+                >
+              </view>
+            </view>
+          </view>
+        </block>
+      </view>
+    </view>
+    <view class="orderInfo">
+      <view class="row" @click="copyHandle(listinfo.orderNo)">
+        <text class="t">订单编号：</text>
+        <text
+          class="info"
+          style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
+          >{{ listinfo.orderNo }}(点击复制)</text
+        >
+      </view>
+      <view class="row">
+        <text class="t">下单时间：</text>
+        <text class="info">{{
+          $u.timeFormat(listinfo.updateTime, "yyyy-mm-dd hh:MM:ss")
+        }}</text>
+      </view>
+      <view class="row" v-if="listinfo.tableName">
+        <text class="t">下单台桌：</text>
+        <text class="info">{{ listinfo.tableName }}</text>
+      </view>
+      <view class="row" v-if="orderVIP.shopName">
+        <text class="t">下单门店：</text>
+        <text class="info">{{ orderVIP.shopName }}</text>
+      </view>
+      <view class="row" v-if="listinfo.dineMod">
+        <text class="t">用餐模式：</text>
+        <text class="info" v-if="listinfo.dineMod == 'dine-in'">堂食</text>
+        <text class="info" v-if="listinfo.dineMod == 'take-out'">外带</text>
+        <text class="info" v-if="listinfo.dineMod == 'take-away'">外卖</text>
+      </view>
+      <view class="row" v-if="listinfo.id && listinfo.satus != 'unpaid'">
+        <text class="t">备注：</text>
+        <text class="info u-line-5">{{ listinfo.remark || "" }}</text>
+      </view>
+      <view class="row" v-if="listinfo.seatNum">
+        <text class="t">就餐人数：</text>
+        <text class="info">{{ listinfo.seatNum || "" }}</text>
+      </view>
+      <view class="row" v-if="listinfo.refundType">
+        <text class="t">退款方式：</text>
+        <text class="info">{{
+          listinfo.refundType == "cash" ? "手动退款" : "原路退回"
+        }}</text>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script setup>
-	import {
-		useCartsStore
-	} from '@/stores/carts.js';
-	const cartStore = useCartsStore()
-	import {
-		consumeDiscount
-	} from '@/common/api/market/index.js'
-	import orderItemVue from './order-item.vue';
-	import {
-		ref,
-		reactive,
-		defineProps,
-		computed,
-		defineEmits,
-		watch,
-		watchEffect,
-		defineExpose,
-		toRaw,
-		onMounted,
-		nextTick
+import { useCartsStore } from "@/stores/carts.js";
+import * as discountActivityApi from "@/common/api/market/discountActivity";
+const cartStore = useCartsStore();
+import { consumeDiscount } from "@/common/api/market/index.js";
+import orderItemVue from "./order-item.vue";
+import {
+  ref,
+  reactive,
+  defineProps,
+  computed,
+  defineEmits,
+  watch,
+  watchEffect,
+  defineExpose,
+  toRaw,
+  onMounted,
+  provide,
+  nextTick,
+} from "vue";
+import { returnHasCouponCanUse } from "@/utils/coupon.js";
+let hasCouponCanUse = ref(false);
 
-	} from 'vue'
-	import {
-		returnHasCouponCanUse
-	} from '@/utils/coupon.js'
-	let hasCouponCanUse = ref(false)
+const usePoints = ref(false);
 
+function chnageIsUsePoints() {
+  usePoints.value = !usePoints.value;
+}
 
-	const usePoints = ref(false)
+import IntegralInput from "./IntegralInput.vue";
+import {
+  APImemberPointsmyPoints,
+  APImemberPointscalcUsablePoints,
+  APImemberPointscalcDeductionAmount,
+} from "@/common/api/shop/index.js";
+import goodsIcon from "@/static/icon/goods.png";
+import coupIcon from "@/static/icon/coup.png";
+// import pointsIcon from "@/static/icon/points.png";
+import pointsIcon from "@/static/icon/jifen.png";
+// 定义自定义事件
+const emits = defineEmits(["customevent", "istype", "learcoupons"]);
 
-	function chnageIsUsePoints() {
-		usePoints.value = !usePoints.value
-	}
+// teb  切换送餐和打包
+const tebtypeList = reactive([
+  {
+    title: "送餐到桌",
+    show: false,
+    type: "table",
+    val: "dine-in",
+    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab1.png",
+    url_active:
+      "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab1_active.png",
+  },
+  {
+    title: "打包外带",
+    show: false,
+    type: "takeself",
+    val: "take-out",
+    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab2.png",
+    url_active:
+      "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab2_active.png",
+  },
+]);
 
-	import IntegralInput from './IntegralInput.vue';
-	import {
-		APImemberPointsmyPoints,
-		APImemberPointscalcUsablePoints,
-		APImemberPointscalcDeductionAmount
-	} from '@/common/api/shop/index.js'
-	import goodsIcon from '@/static/icon/goods.png'
-	import coupIcon from '@/static/icon/coup.png'
-	import pointsIcon from '@/static/icon/points.png'
-	// 定义自定义事件
-	const emits = defineEmits(['customevent', 'istype', 'learcoupons']);
+const favorablelist = ref([
+  //   {
+  //     name: "新客立减",
+  //     type: "newUser",
+  //     width: "40rpx",
+  //     height: "34rpx",
+  //     value: "",
+  //     icon: coupIcon,
+  //     url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/coupon.png",
+  //   },
+  {
+    name: "优惠券",
+    type: "coupon",
+    value: "",
+    icon: coupIcon,
+    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/coupon.png",
+  },
+  {
+    icon: pointsIcon,
+    name: "积分抵扣",
+    type: "points",
+    value: "",
+    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/points.png",
+  },
+]);
 
-	// teb  切换送餐和打包
-	const tebtypeList = reactive([{
-			title: "送餐到桌",
-			show: false,
-			type: "table",
-			val: "dine-in",
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab1.png",
-			url_active: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab1_active.png"
-		},
-		{
-			title: "打包外带",
-			show: false,
-			type: "takeself",
-			val: "take-out",
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab2.png",
-			url_active: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab2_active.png"
-		},
-	])
+const props = defineProps({
+  useVipPrice: {
+    type: Boolean,
+    default: false,
+  },
+  freeCheck: {
+    type: Boolean,
+  },
+  shifu: {
+    type: [String, Number],
+    defalut: 0,
+  },
+  listinfo: {
+    type: Object,
+    default: {
+      combinedArray: {},
+      Productroll: 0,
+      coupondiscountAmount: 0,
+      couponInfoList: "",
+      pointsDiscountAmount: 0,
+      packFeess: 0,
+      totalPrices: 0,
+      Seatcharge: 0,
+      payAmount: 0,
+      remark: "",
+    },
+  },
+  orderVIP: {
+    type: Object,
+  },
+  ordershopUserInfo: {
+    type: Object,
+    default: {
+      isTableFee: 0,
+    },
+  },
+  isBwc: {
+    type: Boolean,
+    default: false,
+  },
+  nowCarts: {
+    type: Array,
+    default: () => {
+      return [];
+    },
+  },
+});
 
-	const favorablelist = ref([{
-			name: "新客立减",
-			type: "newUser",
-			width: '40rpx',
-			height: '34rpx',
-			value: "",
-			icon: coupIcon,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/coupon.png"
-		},
-		{
-			name: "优惠券",
-			type: "coupon",
-			width: '40rpx',
-			height: '34rpx',
-			value: "",
-			icon: coupIcon,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/coupon.png"
-		},
-		{
-			icon: pointsIcon,
-			name: "积分抵扣",
-			type: "points",
-			value: "",
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/points.png"
-		}
-	])
+const is_type = ref(0);
 
+//满减活动
+const discountActivityRes = ref(null);
 
-	const props = defineProps({
-		useVipPrice: {
-			type: Boolean,
-			default: false
-		},
-		freeCheck: {
-			type: Boolean
-		},
-		shifu: {
-			type: [String, Number],
-			defalut: 0
-		},
-		listinfo: {
-			type: Object,
-			default: {
-				combinedArray: {},
-				Productroll: 0,
-				coupondiscountAmount: 0,
-				couponInfoList: '',
-				pointsDiscountAmount: 0,
-				packFeess: 0,
-				totalPrices: 0,
-				Seatcharge: 0,
-				payAmount: 0,
-				remark: ''
-			}
+//当前使用的满减活动的门槛满减
+const discountActivity = ref(null);
+//备份当前使用的满减活动的门槛满减
+let back_discountActivity = null;
 
-		},
-		orderVIP: {
-			type: Object
-		},
-		ordershopUserInfo: {
-			type: Object,
-			default: {
-				isTableFee: 0
-			}
-		},
-		isBwc: {
-			type: Boolean,
-			default: false
-		},
-		nowCarts: {
-			type: Array,
-			default: () => {
-				return []
-			}
-		},
+const couponObj = computed(() => {
+  const obj = {
+    disabled: false,
+    disabledReason: "",
+  };
+  const freeDineConfig = props.orderVIP.freeDineConfig;
+  if (props.isBwc && freeDineConfig.enable) {
+    //使用了霸王餐
+    if (!freeDineConfig.withCoupon) {
+      obj.disabled = true;
+      obj.disabledReason = "霸王餐与优惠券不可同时使用";
+    }
+  }
+  //使用了满减活动
+  const res = discountActivityRes.value;
 
-	})
+  if (discountActivity.value && res) {
+    if (!res.couponShare) {
+      obj.disabled = true;
+      obj.disabledReason = "当前满减活动不可与其他优惠共享";
+    }
+  }
+  if (obj.disabled) {
+    cartStore.backendCoupons = [];
+  }
+  return obj;
+});
 
-	const is_type = ref(0)
-	// 监听送餐/打包切换
-	const tabClick = (item, index) => {
-		is_type.value = index
-		emits("istype", is_type.value)
-		cartStore.setDinnerType(item.val)
-		// this.getchoseEatModel('tabClick', index, item);
-	}
-	cartStore.setDinnerType(tebtypeList[is_type.value].val)
+const pointObj = computed(() => {
+  const obj = {
+    disabled: false,
+    disabledReason: "",
+  };
+  const freeDineConfig = props.orderVIP.freeDineConfig;
+  if (props.isBwc && freeDineConfig.enable) {
+    //使用了霸王餐
+    if (!freeDineConfig.withPoints) {
+      obj.disabled = true;
+      obj.disabledReason = "霸王餐与积分不可同时使用";
+    }
+  }
+  //使用了满减活动
+  const res = discountActivityRes.value;
+  if (discountActivity.value && res) {
+    if (!res.pointsShare) {
+      obj.disabled = true;
+      obj.disabledReason = "当前满减活动不可与积分同享";
+    }
+  }
 
-	// 操作优惠卷
-	const dataprocessing = (data) => {
-		favorablelist.value[1].value = data
+  //积分抵扣不足
+  if (pointsRes && !pointsRes.usable) {
+    obj.disabledReason = pointsRes.unusableReason || "积分抵扣不足或不可用";
+  }
+  if (obj.disabled) {
+    cartStore.setUserPoints(0);
+  }
 
-	}
+  return obj;
+});
 
-	const returnCouponDiscount = computed(() => {
-		if (!favorablelist.value[1].value) {
-			return 0
-		}
-		return favorablelist.value[1].value.reduce((prve, cur) => {
-			return prve + (cur.discountAmount || 0)
-		}, 0)
-	})
+// 监听送餐/打包切换
+const tabClick = (item, index) => {
+  is_type.value = index;
+  emits("istype", is_type.value);
+  cartStore.setDinnerType(item.val);
+  // this.getchoseEatModel('tabClick', index, item);
+};
+cartStore.setDinnerType(tebtypeList[is_type.value].val);
 
-	// 清空
-	const bwcclear = () => {
-		IntegralInputclose()
-		// 清空优惠卷
-		favorablelist.value[1].value = ''
-		favorablelist.value[1].value = ''
-	}
-	const dinnerType = computed(() => {
-		return is_type.value ? 'take-out' : 'dine-ine'
-	})
-	// 跳转
-	const goUrl = (item) => {
-		const canDikouGoodsArr = props.nowCarts
-		// const goodsOrderPrice = props.listinfo.totalPrices
-		// const user=uni.cache.get('shopUserInfo')
-		uni.setStorageSync('goodsOrderPrice', cartStore.orderCostSummary.goodsRealAmount)
+// 清空
+const bwcclear = () => {
+  IntegralInputclose();
+};
 
-		if (props.isBwc) {
-			uni.showToast({
-				title: '不可与其他优惠共享!',
-				icon: 'none'
-			})
-			return false;
-		}
-		switch (item.type) {
-			case 'coupon':
-				emits('learcoupons', 'coupon')
-				uni.pro.navigateTo('/pages/order/coupon', {})
-				break;
+// 跳转
+const goUrl = (item) => {
+  const canDikouGoodsArr = props.nowCarts;
+  // const goodsOrderPrice = props.listinfo.totalPrices
+  // const user=uni.cache.get('shopUserInfo')
+  uni.setStorageSync(
+    "goodsOrderPrice",
+    cartStore.orderCostSummary.goodsRealAmount
+  );
 
-			case 'points':
-				if (maxPointDiscount.value <= 0) {
-					return
-				}
-				chnageIsUsePoints()
-				return
-		}
-	}
+  switch (item.type) {
+    case "coupon":
+      if (couponObj.value.disabled) {
+        return uni.showToast({
+          title: couponObj.value.disabledReason,
+          icon: "none",
+        });
+      }
+      uni.pro.navigateTo("/pages/order/coupon", {});
+      break;
 
-	// 积分
-	const calcUsablePointsData = reactive({
-		minIntegral: 1, //最小
-		maxIntegral: '', //最多积分
-		instructionText: '',
-		unusableReason: '',
-		showModal: false,
-		integral: ''
-	})
+    case "points":
+      if (pointObj.value.disabled) {
+        return uni.showToast({
+          title: pointObj.value.disabledReason,
+          icon: "none",
+        });
+      }
+      if (maxPointDiscount.value <= 0) {
+        return;
+      }
+      chnageIsUsePoints();
+      break;
+  }
+};
 
+// 积分
+const calcUsablePointsData = reactive({
+  minIntegral: 1, //最小
+  maxIntegral: "", //最多积分
+  instructionText: "",
+  unusableReason: "",
+  showModal: false,
+  integral: "",
+});
 
-	const pointsRes = reactive({
-		accountPoints: 0
-	})
-	const maxPointDiscount = ref(0)
-	//积分可抵扣最大金额
-	const maxMoney = computed(() => {
-		return cartStore.orderCostSummary.finalPayAmount + cartStore.orderCostSummary
-			.pointDeductionAmount
-	})
+const pointsRes = reactive({
+  accountPoints: 0,
+});
+const maxPointDiscount = ref(0);
+//积分可抵扣最大金额
+const maxMoney = computed(() => {
+  return (
+    cartStore.orderCostSummary.orderOriginFinalPayAmount +
+    cartStore.orderCostSummary.pointDeductionAmount
+  );
+});
 
-	async function getMaxPointsDiscount() {
-		let res = await APImemberPointscalcUsablePoints({
-			shopUserId: props.orderVIP.id,
-			orderAmount: maxMoney.value
-		})
-		Object.assign(pointsRes, res)
-		maxPointDiscount.value = res.maxDeductionAmount
-		if (usePoints.value) {
-			cartStore.setUserPoints(res.maxUsablePoints || 0)
-		}
-		console.log('getMaxPointsDiscount:cartStore.orderCostSummary.pointUsed', cartStore.orderCostSummary.pointUsed);
-	}
-	watch(() => maxMoney.value, (newval) => {
-		console.log('maxMoney.value', newval);
-		getMaxPointsDiscount()
-	})
-	watch(() => usePoints.value, (newval) => {
-		if (newval) {
-			getMaxPointsDiscount()
-		} else {
-			cartStore.setUserPoints(0)
-		}
+async function getMaxPointsDiscount() {
+  if (!props.orderVIP.id) {
+    return;
+  }
+  let res = await APImemberPointscalcUsablePoints({
+    shopUserId: props.orderVIP.id,
+    orderAmount: maxMoney.value,
+  });
+  if (res) {
+    cartStore.setPointDeductionRule(
+      res.equivalentPoints || 0,
+      res.maxDeductionAmount || 0
+    );
+  }
+  Object.assign(pointsRes, res);
+  maxPointDiscount.value = res.maxDeductionAmount || 0;
+  console.log("积分可抵扣最大金额", maxPointDiscount.value);
 
-	})
+  if (usePoints.value && res.usable) {
+    console.log("积分抵扣金额", res.maxDeductionAmount);
+    cartStore.setUserPoints(res.maxUsablePoints || 0);
+  }
+  if (!res.usable) {
+    cartStore.setUserPoints(0);
+  }
+}
+watch(
+  () => maxMoney.value,
+  (newval) => {
+    getMaxPointsDiscount();
+  }
+);
+watch(
+  () => usePoints.value,
+  (newval) => {
+    if (newval) {
+      getMaxPointsDiscount();
+    } else {
+      cartStore.setUserPoints(0);
+    }
+  }
+);
 
+// * 获取积分相关信息
+const getCalcUsablePoints = async (data) => {
+  Object.assign(calcUsablePointsData, data);
+  try {
+    cartStore.setPointDeductionRule(
+      data.equivalentPoints,
+      data.maxDeductionAmount
+    );
+    calcUsablePointsData.minIntegral = data.minDeductionPoints;
+    calcUsablePointsData.maxIntegral = data.maxUsablePoints;
+    calcUsablePointsData.instructionText = `请输入 ${data.minDeductionPoints} - ${data.maxUsablePoints} 之间的积分`;
+  } catch (error) {
+    //TODO handle the exception
+  }
+};
 
-	// * 获取积分相关信息
-	const getCalcUsablePoints = async (data) => {
-		Object.assign(calcUsablePointsData, data);
-		try {
-			cartStore.setPointDeductionRule(data.equivalentPoints, data.maxDeductionAmount)
-			calcUsablePointsData.minIntegral = data.minDeductionPoints
-			calcUsablePointsData.maxIntegral = data.maxUsablePoints
-			calcUsablePointsData.instructionText =
-				`请输入 ${ data.minDeductionPoints} - ${data.maxUsablePoints} 之间的积分`
-		} catch (error) {
-			//TODO handle the exception
-		}
+// 积分取消清空
+const IntegralInputclose = async () => {
+  calcUsablePointsData.integral = null;
+  props.listinfo.pointsDiscountAmount = 0;
+  calcUsablePointsData.showModal = false;
+  // cartStore.setUserPoints(0);
+};
 
-	}
+// * 复制订单号
+const copyHandle = (e) => {
+  uni.setClipboardData({
+    data: e,
+    success() {
+      uni.showToast({
+        title: "复制成功",
+        icon: "none",
+      });
+    },
+  });
+};
 
-	// 积分取消清空
-	const IntegralInputclose = async () => {
-		calcUsablePointsData.integral = null
-		props.listinfo.pointsDiscountAmount = 0
-		calcUsablePointsData.showModal = false
-		// cartStore.setUserPoints(0);
-	}
+// 将方法暴露给父组件
+defineExpose({
+  getCalcUsablePoints,
+  bwcclear,
+  IntegralInputclose,
+});
 
-	// * 复制订单号
-	const copyHandle = (e) => {
-		uni.setClipboardData({
-			data: e,
-			success() {
-				uni.showToast({
-					title: '复制成功',
-					icon: 'none'
-				});
-			}
-		});
-	}
+watch(
+  () => props.listinfo.seatNum,
+  (newval) => {
+    cartStore.setSeatFeeConfig("personCount", newval || 0);
+  }
+);
 
+const newUserDiscount = ref(0);
+const back_favorablelist = toRaw(favorablelist.value);
+async function getConsumeDiscount() {
+  const consumeDiscountRes = await consumeDiscount({
+    shopId: uni.cache.get("shopId"),
+  });
+  if (!consumeDiscountRes) {
+    favorablelist.value = back_favorablelist.filter(
+      (v) => v.name != "新客立减"
+    );
+    return;
+  }
 
-	// 将方法暴露给父组件
-	defineExpose({
-		dataprocessing,
-		getCalcUsablePoints,
-		bwcclear,
-		IntegralInputclose
-	});
+  if (consumeDiscountRes) {
+    newUserDiscount.value = consumeDiscountRes.amount;
+    cartStore.newUserDiscount = consumeDiscountRes.amount || 0;
+    cartStore.consumeDiscount = consumeDiscountRes;
+  }
+}
 
-	watch(() => props.listinfo.seatNum, (newval) => {
-		cartStore.setSeatFeeConfig('personCount', newval || 0)
-	})
+// 初始化订单计算可能为计算完毕，所以判断监听价格变化后再获取优惠券
+let loadFinish = false;
+watch(
+  () => cartStore.orderCostSummary.goodsRealAmount,
+  async (newval) => {
+    if (newval && !loadFinish) {
+      const goodsOrderPrice = cartStore.orderCostSummary.goodsRealAmount;
+      const dinnerType = cartStore.dinnerType;
+      const shopInfo = cartStore.shopInfo;
+      const shopId = cartStore.shopInfo.shopId;
+      const user = uni.cache.get("shopUserInfo");
+      const shopUserId = user.id;
+      const allGoods = cartStore.allGoods;
 
-	const newUserDiscount = ref(0)
-	const back_favorablelist = toRaw(favorablelist.value)
-	async function getConsumeDiscount() {
-		const consumeDiscountRes = await consumeDiscount({
-			shopId: uni.cache.get('shopId'),
-		})
-		if (!consumeDiscountRes) {
-			favorablelist.value = back_favorablelist.filter(v => v.name != '新客立减')
-			return
-		}
-	
-		if (consumeDiscountRes) {
-			newUserDiscount.value = consumeDiscountRes.amount
-			cartStore.newUserDiscount = consumeDiscountRes.amount || 0
-			cartStore.consumeDiscount = consumeDiscountRes
-		}
-	}
-	
-	// 初始化订单计算可能为计算完毕，所以判断监听价格变化后再获取优惠券
-	let loadFinish = false
-	watch(() => cartStore.orderCostSummary.goodsRealAmount,async (newval) => {
-		if (newval && !loadFinish) {
-			const goodsOrderPrice = cartStore.orderCostSummary.goodsRealAmount
-			const dinnerType = cartStore.dinnerType
-			const shopInfo = cartStore.shopInfo
-			const shopId = cartStore.shopInfo.shopId
-			const user = uni.cache.get('shopUserInfo')
-			const shopUserId = user.id
-			const allGoods = cartStore.allGoods
+      hasCouponCanUse.value = await returnHasCouponCanUse({
+        goodsOrderPrice,
+        dinnerType,
+        shopId,
+        shopInfo,
+        shopUserId,
+        allGoods,
+        user,
+      });
+    }
+  }
+);
 
-			hasCouponCanUse.value = await returnHasCouponCanUse({
-				goodsOrderPrice,
-				dinnerType,
-				shopId,
-				shopInfo,
-				shopUserId,
-				allGoods,
-				user
-			})
-			console.log('hasCouponCanUse', hasCouponCanUse.value);
-		}
-	})
-	onMounted(() => {
-		getConsumeDiscount()
+const originalPrice = computed(() => {
+  const originalPrice =
+    cartStore.orderCostSummary.goodsRealAmount +
+    -cartStore.orderCostSummary.newUserDiscount +
+    cartStore.orderCostSummary.packFee +
+    cartStore.orderCostSummary.seatFee;
+  return originalPrice <= 0 ? 0 : originalPrice;
+});
 
-	})
+watch(
+  () => originalPrice.value,
+  () => {
+    if (discountActivityRes.value) {
+      calcDiscountActivity();
+    }
+  }
+);
+
+watch(
+  () => props.isBwc,
+  (newval) => {
+    const freeDineConfig = props.orderVIP.freeDineConfig;
+    if (newval) {
+      discountActivity.value = null;
+      cartStore.fullReductionActivities = [];
+      usePoints.value = false;
+      cartStore.setUserPoints(0);
+    } else {
+      if (back_discountActivity) {
+        calcDiscountActivity();
+      }
+    }
+  }
+);
+
+function calcDiscountActivity() {
+  const res = discountActivityRes.value;
+  const user = uni.cache.get("shopUserInfo");
+
+  const usedFullReductionActivityFullAmount=cartStore.orderCostSummary.fullReduction.usedFullReductionActivityFullAmount;
+  console.log("usedFullReductionActivityFullAmount", usedFullReductionActivityFullAmount);
+
+  if (res && res.thresholds && res.thresholds.length > 0) {
+    const canUseThresholds = res.thresholds
+      .filter((v) => {
+        return usedFullReductionActivityFullAmount >= v.fullAmount;
+      })
+      .sort((a, b) => {
+        return b.discountAmount - a.discountAmount;
+      });
+    console.log("canUseThresholds", canUseThresholds);
+
+    if (canUseThresholds.length) {
+      discountActivity.value = canUseThresholds[0];
+      back_discountActivity = canUseThresholds[0];
+    }
+  }
+  if (!discountActivity.value) {
+    return;
+  }
+  console.log("当前满减门槛", discountActivity.value);
+
+  
+}
+async function getDiscountActivity() {
+  const res = await discountActivityApi.config({
+    shopId: uni.cache.get("shopId"),
+  });
+  if (!res) {
+    return;
+  }
+  discountActivityRes.value = res;
+  cartStore.fullReductionActivities = [res];
+
+  calcDiscountActivity();
+}
+onMounted(async () => {
+  await getConsumeDiscount();
+  getDiscountActivity();
+});
 </script>
 
 <style lang="scss" scoped>
-	::v-deep .orderInfo .u-textarea {
-		background: #FAFAFA;
-		border-radius: 10rpx 10rpx 10rpx 10rpx;
-	}
-
-	.round {
-		width: 24rpx;
-		height: 24rpx;
-		border-radius: 50%;
-		background-color: #fff;
-		border: 1px solid #D9D9D9;
-	}
-
-	::v-deep .u-textarea__field {
-		background: #FAFAFA;
-		border-radius: 10rpx 10rpx 10rpx 10rpx;
-	}
-
-	.t {
-		font-weight: bold;
-		font-size: 28rpx;
-		color: #333333;
-		flex-shrink: 0;
-	}
-
-	.card_box {
-		background-color: #fff;
-		// box-shadow: 0rpx 8rpx 12rpx 2rpx rgba(87,86,86,0.35);
-		position: relative;
-		width: 100%;
-		height: 100%;
-		// box-shadow: 0rpx 4rpx 12rpx 2rpx rgba(87,86,86,0.35);
-		border-radius: 18rpx;
-		padding-bottom: 32rpx;
-
-		.tabBox {
-			width: 100%;
-			margin-top: 52rpx;
-			position: relative;
-			z-index: 1;
-
-			.tab {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				border-radius: 22rpx 22rpx 0 0;
-				// background-color: $uni-bg-color;
-
-				.tab_item {
-					width: 50%;
-					height: 90rpx;
-					line-height: 90rpx;
-					display: flex;
-					align-items: center;
-					padding-left: 30rpx;
-					box-sizing: border-box;
-					background-color: #FEFBF8;
-					border-radius: 0 22rpx 0 0;
-					position: relative;
-
-					.title {
-						font-weight: 500;
-						font-size: 28rpx;
-						color: #999999;
-						position: relative;
-						z-index: 1;
-					}
-
-					.title.active {
-						color: #E8AD7B;
-					}
-
-					.icon {
-						width: 48rpx;
-						height: 48rpx;
-						margin-right: 16rpx;
-						position: relative;
-						z-index: 1;
-					}
-				}
-
-				.tab_item.active {
-					background-color: #fff;
-				}
-
-				// .tab_item.active:after {
-				//  content: "";
-				//          position: absolute;
-				//          top: 0;
-				//          left: -4px;
-				//          width: 40px;
-				//          height: 26px;
-				//          background: orange;
-				// }
-				.tab_item.active:before {
-					content: "";
-					position: absolute;
-					top: -20rpx;
-					left: 0;
-					right: 0;
-					bottom: 0;
-					border-radius: 2px;
-					background: #fff;
-					transform: skewX(0deg);
-				}
-
-				.tab_item1.active:before {
-					border-radius: 22rpx 40rpx 0 0;
-				}
-
-				.tab_item2.active:before {
-					border-radius: 40rpx 22rpx 0 0;
-				}
-			}
-
-			.table {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				margin: 0 30rpx;
-				box-sizing: border-box;
-				height: 90rpx;
-				background-color: $uni-bg-color;
-				border-bottom: 1rpx solid #E5E5E5;
-
-				.table_left {
-					display: flex;
-					align-items: center;
-
-					.icon {
-						width: 32.86rpx;
-						height: 39.07rpx;
-						margin-right: 24rpx;
-					}
-
-					.title {
-						display: flex;
-						align-items: center;
-						color: #E8AD7B;
-					}
-				}
-
-				.value {
-					font-weight: 500;
-					font-size: 32rpx;
-					color: #333333;
-				}
-			}
-
-			.pack {
-				display: flex;
-				flex-direction: column;
-				padding: 30rpx;
-				box-sizing: border-box;
-				background-color: $uni-bg-color;
-				border-radius: 0 0 22rpx 22rpx;
-
-				.top {
-					display: flex;
-					flex-direction: column;
-					margin-top: 8rpx;
-
-					.title {
-						font-size: 28rpx;
-						color: #333;
-						font-weight: bold;
-						margin-bottom: 16rpx;
-					}
-
-					.address {
-						font-size: 24rpx;
-						font-weight: 400;
-						color: #999;
-					}
-				}
-
-				.list {
-					display: flex;
-					flex-direction: column;
-
-					.item {
-						height: 70rpx;
-						display: flex;
-						align-items: center;
-						justify-content: space-between;
-						font-size: 28rpx;
-
-						.lable {
-							color: #666;
-							font-weight: 500;
-						}
-
-						.getPhone {
-							display: flex;
-							align-items: center;
-
-							.u-input {
-								width: 340rpx;
-								border: none;
-
-								input {
-									font-size: 24rpx;
-									color: #333;
-
-								}
-
-								.input-placeholder {
-									font-size: 24rpx;
-								}
-							}
-						}
-
-						.text,
-						.getBtn {
-							color: #E8AD7B;
-						}
-
-						.getBtn {
-							border-radius: 12rpx;
-							border: 2rpx solid #E8AD7B;
-							padding: 8rpx 20rpx;
-							box-sizing: border-box;
-						}
-					}
-				}
-
-			}
-		}
-
-
-		.card_head_box {
-			width: 100%;
-			display: flex;
-			justify-content: space-between;
-			position: absolute;
-			top: -22.5rpx;
-			padding: 0 44rpx;
-
-			.card_head_item {
-				width: 45rpx;
-				height: 45rpx;
-				background-color: #f9f9f9;
-				border-radius: 50%;
-				// box-shadow: inset 0rpx -13rpx 18rpx -16rpx rgba(87, 86, 86, 0.35);
-			}
-
-		}
-
-		.card {
-			// background-color: #fff;
-			border-radius: 20upx;
-			margin-bottom: 28upx;
-			position: relative;
-
-			.card_item {
-				display: flex;
-				flex-direction: column;
-				position: relative;
-				padding: 0 34rpx;
-
-				.head {
-					display: flex;
-					justify-content: space-between;
-					// padding: 32rpx 0;
-
-					.head_left {
-						display: flex;
-						align-items: center;
-
-						.placeNum {
-							font-weight: bold;
-							font-size: 32rpx;
-							color: #333333;
-							margin-right: 32rpx;
-							flex-shrink: 0;
-						}
-
-						.placeTime {
-							font-weight: 400;
-							font-size: 32rpx;
-							color: #666666;
-							flex-shrink: 0;
-						}
-					}
-
-				}
-
-				.shop-info {
-					padding-top: 28rpx;
-
-					.item:nth-child(1) {
-						margin-top: 0;
-					}
-
-					.item {
-						margin-bottom: 32rpx;
-						display: flex;
-
-						.cover {}
-
-						.info {
-							flex: 1;
-							display: flex;
-							flex-direction: column;
-							padding-left: 16upx;
-
-							.productName {
-								font-weight: bold;
-								font-size: 28rpx;
-								color: #333333;
-								margin-top: 20rpx;
-							}
-
-							.productSkuName {
-								font-weight: 400;
-								font-size: 24rpx;
-								color: #999999;
-								display: -webkit-box;
-								-webkit-box-orient: vertical;
-								-webkit-line-clamp: 3;
-								overflow: hidden;
-								text-overflow: ellipsis;
-							}
-
-							.n {
-								font-size: 24upx;
-								color: #999;
-							}
-						}
-
-						.price {
-							display: flex;
-							flex-direction: column;
-							align-items: flex-end;
-							padding-left: 68rpx;
-
-							.priceAmount {
-								font-weight: 500;
-								font-size: 28rpx;
-								color: #333333;
-								margin-top: 26rpx;
-							}
-
-							.num {
-								font-weight: 400;
-								font-size: 24rpx;
-								color: #999999;
-								margin-top: 22rpx;
-							}
-						}
-					}
-				}
-
-				.status {
-					align-self: flex-end;
-					width: 92rpx;
-					height: 40rpx;
-					line-height: 40rpx;
-					text-align: center;
-					background: #999999;
-					border-radius: 10rpx 10rpx 10rpx 10rpx;
-					font-weight: 400;
-					font-size: 22rpx;
-					color: #FFFFFF;
-					margin-top: 32rpx;
-				}
-
-				.totalAmount {
-					width: 100%;
-					display: flex;
-					justify-content: flex-end;
-					align-items: flex-end;
-					padding: 32rpx 0;
-					border-bottom: 2rpx dashed #e5e5e5;
-
-					.label {
-						font-weight: bold;
-						font-size: 28rpx;
-						color: #333333;
-					}
-
-					.price {
-						font-weight: bold;
-						font-size: 36rpx;
-						color: #333333;
-					}
-				}
-
-				.semicircle_icon {
-					width: 100%;
-					position: absolute;
-					top: -22.5rpx;
-					left: 0;
-					display: flex;
-					justify-content: space-between;
-
-					.semicircle_left_icon {
-						width: 45rpx;
-						height: 45rpx;
-						margin-left: -22.5rpx;
-						background-color: #f9f9f9;
-						border-radius: 50%;
-						// box-shadow: inset -20rpx 0rpx 22rpx -20rpx rgba(87, 86, 86, 0.35);
-
-					}
-
-					.semicircle_right_icon {
-						width: 45rpx;
-						height: 45rpx;
-						margin-right: -22.5rpx;
-						background-color: #f9f9f9;
-						border-radius: 50%;
-						// box-shadow: inset 13rpx 0rpx 16rpx -9rpx rgba(87, 86, 86, 0.35);
-
-					}
-				}
-			}
-
-			.cell-item {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				padding: 32rpx 34rpx 0 34rpx;
-
-				.label {
-					font-weight: bold;
-					font-size: 32rpx;
-					color: #333333;
-					padding-bottom: 32rpx;
-				}
-
-				.val {
-					display: flex;
-					align-items: flex-end;
-					padding-bottom: 32rpx;
-					border-bottom: 2rpx dashed #e5e5e5;
-
-					view:nth-child(1) {
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #999999;
-						margin-right: 42rpx;
-					}
-
-					view:nth-child(2) {
-						display: flex;
-						align-items: flex-end;
-						font-weight: bold;
-						font-size: 36rpx;
-						color: #333333;
-					}
-				}
-
-				.val.column {
-					display: flex;
-					flex-direction: column;
-
-					.productCoupon {
-						display: flex;
-						align-items: flex-end;
-						margin: 0 0 10rpx 0;
-
-						.name {
-							font-weight: 400;
-							font-size: 26rpx;
-							color: #999;
-							margin: 0;
-						}
-
-						.num {
-							font-weight: 400;
-							font-size: 26rpx;
-							color: #999;
-							margin: 0 30rpx;
-							line-height: 20rpx;
-						}
-
-						.amount {
-							font-weight: bold;
-							font-size: 26rpx;
-							color: #333;
-						}
-					}
-				}
-			}
-
-			.favorable {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				height: 60rpx;
-				box-sizing: border-box;
-				// border-bottom: 2rpx solid #E5E5E5;
-
-				.favorable_left {
-					display: flex;
-					align-items: center;
-
-					.icon {
-						width: 40rpx;
-						height: 40rpx;
-						margin-right: 16rpx;
-					}
-
-					.name {
-						font-size: 28rpx;
-						font-weight: 400rpx;
-						color: #333;
-					}
-				}
-
-				.favorable_right {
-					display: flex;
-					align-items: center;
-
-					.favorable_right_text {
-						font-size: 24rpx;
-						color: #999;
-						font-weight: 400rpx;
-
-						&.red {
-							color: #FF3232;
-						}
-					}
-
-				}
-
-				.favorable_right {
-					.column {
-						display: flex;
-						flex-direction: column;
-						align-items: flex-end;
-
-						.favorable_right_text {
-							margin-bottom: 10rpx;
-
-							&.red {
-								color: #FF3232;
-							}
-
-							text:nth-child(1) {
-								font-size: 26rpx;
-								color: #999;
-							}
-
-							text:nth-child(2) {
-								font-size: 26rpx;
-								color: #999;
-								margin: 0 30rpx;
-							}
-
-							text:nth-child(3) {
-								font-size: 26rpx;
-								color: #333;
-
-							}
-						}
-					}
-				}
-
-				.favorable_right.column {
-					align-items: flex-start;
-				}
-			}
-
-			.favorable.column {
-				align-items: flex-start;
-			}
-
-			.cell-item.column {
-				align-items: flex-start;
-			}
-
-			.total-wrap {
-				display: flex;
-				margin: 0 30rpx;
-				justify-content: flex-end;
-				align-items: flex-end;
-				padding: 0 0 30rpx 34rpx;
-				font-weight: bold;
-				font-size: 28rpx;
-				color: #333333;
-				border-bottom: 2rpx dashed #e5e5e5;
-
-				.price {
-					font-weight: bold;
-					font-size: 36rpx;
-				}
-			}
-
-
-
-			.order_footer {
-				display: flex;
-				flex-direction: column;
-				padding: 34rpx;
-				position: relative;
-
-
-
-			}
-
-
-		}
-	}
-
-	.orderInfo {
-		background: #FFFFFF;
-		border-radius: 18rpx 18rpx 18rpx 18rpx;
-		margin-top: 32rpx;
-		padding: 32rpx 34rpx;
-
-		// box-shadow: 0rpx 4rpx 12rpx 2rpx rgba(87,86,86,0.35);
-		.row {
-			display: flex;
-			justify-content: space-between;
-			margin-bottom: 32rpx;
-
-			.t {
-				font-weight: bold;
-				font-size: 28rpx;
-				color: #333333;
-				flex-shrink: 0;
-			}
-
-			.info {
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #666666;
-			}
-		}
-
-		.row:last-child {
-			margin-bottom: none;
-		}
-
-	}
-
-
-	.fixedview {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		width: 100%;
-
-		.flex-between {
-			width: 100%;
-			padding: 36rpx 54rpx 102rpx 54rpx;
-			background: #FFFFFF;
-
-			.fixedview_one {
-				display: flex;
-				align-items: flex-end;
-
-				.fixedview_oneone {
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #666666;
-				}
-
-				.fixedview_onetow {
-					font-weight: bold;
-					font-size: 32rpx;
-					color: #333333;
-
-					text {
-						font-size: 24rpx;
-					}
-				}
-			}
-
-			.fixedview_tow {
-				width: 140rpx;
-				height: 56rpx;
-				line-height: 56rpx;
-				text-align: center;
-				background: #E3AD7F;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #FFFFFF;
-			}
-		}
-	}
-
-	.red {
-		color: #FF3232;
-	}
+::v-deep .orderInfo .u-textarea {
+  background: #fafafa;
+  border-radius: 10rpx 10rpx 10rpx 10rpx;
+}
+
+.round {
+  width: 24rpx;
+  height: 24rpx;
+  border-radius: 50%;
+  background-color: #fff;
+  border: 1px solid #d9d9d9;
+}
+
+::v-deep .u-textarea__field {
+  background: #fafafa;
+  border-radius: 10rpx 10rpx 10rpx 10rpx;
+}
+
+.t {
+  font-weight: bold;
+  font-size: 28rpx;
+  color: #333333;
+  flex-shrink: 0;
+}
+
+.card_box {
+  background-color: #fff;
+  // box-shadow: 0rpx 8rpx 12rpx 2rpx rgba(87,86,86,0.35);
+  position: relative;
+  width: 100%;
+  height: 100%;
+  // box-shadow: 0rpx 4rpx 12rpx 2rpx rgba(87,86,86,0.35);
+  border-radius: 18rpx;
+  padding-bottom: 32rpx;
+
+  .tabBox {
+    width: 100%;
+    margin-top: 52rpx;
+    position: relative;
+    z-index: 1;
+
+    .tab {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      border-radius: 22rpx 22rpx 0 0;
+      // background-color: $uni-bg-color;
+
+      .tab_item {
+        width: 50%;
+        height: 90rpx;
+        line-height: 90rpx;
+        display: flex;
+        align-items: center;
+        padding-left: 30rpx;
+        box-sizing: border-box;
+        background-color: #fefbf8;
+        border-radius: 0 22rpx 0 0;
+        position: relative;
+
+        .title {
+          font-weight: 500;
+          font-size: 28rpx;
+          color: #999999;
+          position: relative;
+          z-index: 1;
+        }
+
+        .title.active {
+          color: #e8ad7b;
+        }
+
+        .icon {
+          width: 48rpx;
+          height: 48rpx;
+          margin-right: 16rpx;
+          position: relative;
+          z-index: 1;
+        }
+      }
+
+      .tab_item.active {
+        background-color: #fff;
+      }
+
+      // .tab_item.active:after {
+      //  content: "";
+      //          position: absolute;
+      //          top: 0;
+      //          left: -4px;
+      //          width: 40px;
+      //          height: 26px;
+      //          background: orange;
+      // }
+      .tab_item.active:before {
+        content: "";
+        position: absolute;
+        top: -20rpx;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        border-radius: 2px;
+        background: #fff;
+        transform: skewX(0deg);
+      }
+
+      .tab_item1.active:before {
+        border-radius: 22rpx 40rpx 0 0;
+      }
+
+      .tab_item2.active:before {
+        border-radius: 40rpx 22rpx 0 0;
+      }
+    }
+
+    .table {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin: 0 30rpx;
+      box-sizing: border-box;
+      height: 90rpx;
+      background-color: $uni-bg-color;
+      border-bottom: 1rpx solid #e5e5e5;
+
+      .table_left {
+        display: flex;
+        align-items: center;
+
+        .icon {
+          width: 32.86rpx;
+          height: 39.07rpx;
+          margin-right: 24rpx;
+        }
+
+        .title {
+          display: flex;
+          align-items: center;
+          color: #e8ad7b;
+        }
+      }
+
+      .value {
+        font-weight: 500;
+        font-size: 32rpx;
+        color: #333333;
+      }
+    }
+
+    .pack {
+      display: flex;
+      flex-direction: column;
+      padding: 30rpx;
+      box-sizing: border-box;
+      background-color: $uni-bg-color;
+      border-radius: 0 0 22rpx 22rpx;
+
+      .top {
+        display: flex;
+        flex-direction: column;
+        margin-top: 8rpx;
+
+        .title {
+          font-size: 28rpx;
+          color: #333;
+          font-weight: bold;
+          margin-bottom: 16rpx;
+        }
+
+        .address {
+          font-size: 24rpx;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .list {
+        display: flex;
+        flex-direction: column;
+
+        .item {
+          height: 70rpx;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          font-size: 28rpx;
+
+          .lable {
+            color: #666;
+            font-weight: 500;
+          }
+
+          .getPhone {
+            display: flex;
+            align-items: center;
+
+            .u-input {
+              width: 340rpx;
+              border: none;
+
+              input {
+                font-size: 24rpx;
+                color: #333;
+              }
+
+              .input-placeholder {
+                font-size: 24rpx;
+              }
+            }
+          }
+
+          .text,
+          .getBtn {
+            color: #e8ad7b;
+          }
+
+          .getBtn {
+            border-radius: 12rpx;
+            border: 2rpx solid #e8ad7b;
+            padding: 8rpx 20rpx;
+            box-sizing: border-box;
+          }
+        }
+      }
+    }
+  }
+
+  .card_head_box {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    position: absolute;
+    top: -22.5rpx;
+    padding: 0 44rpx;
+
+    .card_head_item {
+      width: 45rpx;
+      height: 45rpx;
+      background-color: #f9f9f9;
+      border-radius: 50%;
+      // box-shadow: inset 0rpx -13rpx 18rpx -16rpx rgba(87, 86, 86, 0.35);
+    }
+  }
+
+  .card {
+    // background-color: #fff;
+    border-radius: 20upx;
+    margin-bottom: 28upx;
+    position: relative;
+
+    .card_item {
+      display: flex;
+      flex-direction: column;
+      position: relative;
+      padding: 0 34rpx;
+
+      .head {
+        display: flex;
+        justify-content: space-between;
+        // padding: 32rpx 0;
+
+        .head_left {
+          display: flex;
+          align-items: center;
+
+          .placeNum {
+            font-weight: bold;
+            font-size: 32rpx;
+            color: #333333;
+            margin-right: 32rpx;
+            flex-shrink: 0;
+          }
+
+          .placeTime {
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #666666;
+            flex-shrink: 0;
+          }
+        }
+      }
+
+      .shop-info {
+        padding-top: 28rpx;
+
+        .item:nth-child(1) {
+          margin-top: 0;
+        }
+
+        .item {
+          margin-bottom: 32rpx;
+          display: flex;
+
+          .cover {
+            position: relative;
+          }
+
+          .info {
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            padding-left: 16upx;
+
+            .productName {
+              font-weight: bold;
+              font-size: 28rpx;
+              color: #333333;
+              margin-top: 20rpx;
+            }
+
+            .productSkuName {
+              font-weight: 400;
+              font-size: 24rpx;
+              color: #999999;
+              display: -webkit-box;
+              -webkit-box-orient: vertical;
+              -webkit-line-clamp: 3;
+              overflow: hidden;
+              text-overflow: ellipsis;
+            }
+
+            .n {
+              font-size: 24upx;
+              color: #999;
+            }
+          }
+
+          .price {
+            display: flex;
+            flex-direction: column;
+            align-items: flex-end;
+            padding-left: 68rpx;
+
+            .priceAmount {
+              font-weight: 500;
+              font-size: 28rpx;
+              color: #333333;
+              margin-top: 26rpx;
+            }
+
+            .num {
+              font-weight: 400;
+              font-size: 24rpx;
+              color: #999999;
+              margin-top: 22rpx;
+            }
+          }
+        }
+      }
+
+      .status {
+        align-self: flex-end;
+        width: 92rpx;
+        height: 40rpx;
+        line-height: 40rpx;
+        text-align: center;
+        background: #999999;
+        border-radius: 10rpx 10rpx 10rpx 10rpx;
+        font-weight: 400;
+        font-size: 22rpx;
+        color: #ffffff;
+        margin-top: 32rpx;
+      }
+
+      .totalAmount {
+        width: 100%;
+        display: flex;
+        justify-content: flex-end;
+        align-items: flex-end;
+        padding: 32rpx 0;
+        border-bottom: 2rpx dashed #e5e5e5;
+
+        .label {
+          font-weight: bold;
+          font-size: 28rpx;
+          color: #333333;
+        }
+
+        .price {
+          font-weight: bold;
+          font-size: 36rpx;
+          color: #333333;
+        }
+      }
+
+      .semicircle_icon {
+        width: 100%;
+        position: absolute;
+        top: -22.5rpx;
+        left: 0;
+        display: flex;
+        justify-content: space-between;
+
+        .semicircle_left_icon {
+          width: 45rpx;
+          height: 45rpx;
+          margin-left: -22.5rpx;
+          background-color: #f9f9f9;
+          border-radius: 50%;
+          // box-shadow: inset -20rpx 0rpx 22rpx -20rpx rgba(87, 86, 86, 0.35);
+        }
+
+        .semicircle_right_icon {
+          width: 45rpx;
+          height: 45rpx;
+          margin-right: -22.5rpx;
+          background-color: #f9f9f9;
+          border-radius: 50%;
+          // box-shadow: inset 13rpx 0rpx 16rpx -9rpx rgba(87, 86, 86, 0.35);
+        }
+      }
+    }
+
+    .cell-item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 32rpx 34rpx 0 34rpx;
+
+      .label {
+        font-weight: bold;
+        font-size: 32rpx;
+        color: #333333;
+        padding-bottom: 32rpx;
+      }
+
+      .val {
+        display: flex;
+        align-items: flex-end;
+        padding-bottom: 32rpx;
+        border-bottom: 2rpx dashed #e5e5e5;
+
+        view:nth-child(1) {
+          font-weight: 400;
+          font-size: 24rpx;
+          color: #999999;
+          margin-right: 42rpx;
+        }
+
+        view:nth-child(2) {
+          display: flex;
+          align-items: flex-end;
+          font-weight: bold;
+          font-size: 36rpx;
+          color: #333333;
+        }
+      }
+
+      .val.column {
+        display: flex;
+        flex-direction: column;
+
+        .productCoupon {
+          display: flex;
+          align-items: flex-end;
+          margin: 0 0 10rpx 0;
+
+          .name {
+            font-weight: 400;
+            font-size: 26rpx;
+            color: #999;
+            margin: 0;
+          }
+
+          .num {
+            font-weight: 400;
+            font-size: 26rpx;
+            color: #999;
+            margin: 0 30rpx;
+            line-height: 20rpx;
+          }
+
+          .amount {
+            font-weight: bold;
+            font-size: 26rpx;
+            color: #333;
+          }
+        }
+      }
+    }
+
+    .favorable {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 60rpx;
+      box-sizing: border-box;
+      // border-bottom: 2rpx solid #E5E5E5;
+
+      .favorable_left {
+        display: flex;
+        align-items: center;
+
+        .icon {
+          width: 40rpx;
+          height: 40rpx;
+          margin-right: 16rpx;
+        }
+
+        .name {
+          font-size: 28rpx;
+          font-weight: 400rpx;
+          color: #333;
+        }
+      }
+
+      .favorable_right {
+        display: flex;
+        align-items: center;
+
+        .favorable_right_text {
+          font-size: 24rpx;
+          color: #999;
+          font-weight: 400rpx;
+
+          &.red {
+            color: #ff3232;
+          }
+        }
+      }
+
+      .favorable_right {
+        .column {
+          display: flex;
+          flex-direction: column;
+          align-items: flex-end;
+
+          .favorable_right_text {
+            margin-bottom: 10rpx;
+
+            &.red {
+              color: #ff3232;
+            }
+
+            text:nth-child(1) {
+              font-size: 26rpx;
+              color: #999;
+            }
+
+            text:nth-child(2) {
+              font-size: 26rpx;
+              color: #999;
+              margin: 0 30rpx;
+            }
+
+            text:nth-child(3) {
+              font-size: 26rpx;
+              color: #333;
+            }
+          }
+        }
+      }
+
+      .favorable_right.column {
+        align-items: flex-start;
+      }
+    }
+
+    .favorable.column {
+      align-items: flex-start;
+    }
+
+    .cell-item.column {
+      align-items: flex-start;
+    }
+
+    .total-wrap {
+      display: flex;
+      margin: 0 30rpx;
+      justify-content: flex-end;
+      align-items: flex-end;
+      padding: 0 0 30rpx 34rpx;
+      font-weight: bold;
+      font-size: 28rpx;
+      color: #333333;
+      border-bottom: 2rpx dashed #e5e5e5;
+
+      .price {
+        font-weight: bold;
+        font-size: 36rpx;
+      }
+    }
+
+    .order_footer {
+      display: flex;
+      flex-direction: column;
+      padding: 34rpx;
+      position: relative;
+    }
+  }
+}
+
+.orderInfo {
+  background: #ffffff;
+  border-radius: 18rpx 18rpx 18rpx 18rpx;
+  margin-top: 32rpx;
+  padding: 32rpx 34rpx;
+
+  // box-shadow: 0rpx 4rpx 12rpx 2rpx rgba(87,86,86,0.35);
+  .row {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 32rpx;
+
+    .t {
+      font-weight: bold;
+      font-size: 28rpx;
+      color: #333333;
+      flex-shrink: 0;
+    }
+
+    .info {
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #666666;
+    }
+  }
+
+  .row:last-child {
+    margin-bottom: none;
+  }
+}
+
+.fixedview {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+
+  .flex-between {
+    width: 100%;
+    padding: 36rpx 54rpx 102rpx 54rpx;
+    background: #ffffff;
+
+    .fixedview_one {
+      display: flex;
+      align-items: flex-end;
+
+      .fixedview_oneone {
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #666666;
+      }
+
+      .fixedview_onetow {
+        font-weight: bold;
+        font-size: 32rpx;
+        color: #333333;
+
+        text {
+          font-size: 24rpx;
+        }
+      }
+    }
+
+    .fixedview_tow {
+      width: 140rpx;
+      height: 56rpx;
+      line-height: 56rpx;
+      text-align: center;
+      background: #e3ad7f;
+      border-radius: 12rpx 12rpx 12rpx 12rpx;
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #ffffff;
+    }
+  }
+}
+
+.red {
+  color: #ff3232;
+}
+.youhui-item {
+  height: 60rpx;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-content: center;
+}
+.align-center {
+  align-items: center;
+}
+.limitDiscount {
+  background-color: #cc5617;
+  padding: 2rpx 10rpx;
+  white-space: nowrap;
+  text-align: center;
+  position: absolute;
+  top: 0;
+  left: 0;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #ffffff;
+  border-radius: 20rpx 0rpx 20rpx 0rpx;
+  z-index: 9;
+  color: #fff;
+}
 </style>
\ No newline at end of file
diff --git a/pages/order/components/rechargeFree.vue b/pages/order/components/rechargeFree.vue
index 9c18794..aea2dbe 100644
--- a/pages/order/components/rechargeFree.vue
+++ b/pages/order/components/rechargeFree.vue
@@ -1,92 +1,107 @@
 <template>
-	<!-- 充值免单 -->
-	<view class="rechargeFree">
-		<view class="rechargeFree_bg" @click="changeFree">
-			<view class="left">
-				<view class="icon">优惠</view>
-				<view class="text">
-					充值消费{{freeDineConfig.rechargeTimes}}倍（订单满￥{{freeDineConfig.rechargeThreshold}}元可用），本单立享免单！</view>
-			</view>
-			<up-checkbox :disabled="!freeDineConfig.enable"  @change="change" shape="circle" usedAlone v-model:checked="changeFreeenable" icon-size="20" size="20">
-			</up-checkbox>
-			<!-- <up-checkbox-group iconPlacement="right">
+  <!-- 充值免单 -->
+  <view class="rechargeFree">
+    <view class="rechargeFree_bg" @click="itemClick">
+      <view class="left">
+        <view class="icon">优惠</view>
+        <view class="text">
+          充值消费{{ freeDineConfig.rechargeTimes }}倍（订单满￥{{
+            freeDineConfig.rechargeThreshold
+          }}元可用），本单立享免单！</view
+        >
+      </view>
+	  <view @click.stop="()=>{}">
+		<up-checkbox
+        :disabled="!freeDineConfig.enable"
+        @change="changeFree"
+        shape="circle"
+		activeColor="#E8AD7B" 
+        usedAlone
+        v-model:checked="changeFreeenable"
+        icon-size="20"
+        size="20"
+      >
+      </up-checkbox>
+	  </view>
+
+      <!-- <up-checkbox-group iconPlacement="right">
 				<up-checkbox : v-model="changeFreeenable"
 					:checked="freeDineConfig.enable" @change="change" activeColor="#E8AD7B" shape="circle"
 					icon-size="16" size="16">
 				</up-checkbox>
 			</up-checkbox-group> -->
-		</view>
-	</view>
+    </view>
+  </view>
 </template>
 
 <script setup>
-	import {
-		ref,
-		defineProps,
-		defineEmits
-	} from 'vue';
+import { ref, defineProps, defineEmits } from "vue";
 
-	// 定义接收的属性
-	const props = defineProps({
-		freeDineConfig: {
-			type: Object,
-			default: {}
-		},
-		payAmount: {
-			type: Number,
-			default: 0
-		},
-	});
+// 定义接收的属性
+const props = defineProps({
+  freeDineConfig: {
+    type: Object,
+    default: {},
+  },
+  payAmount: {
+    type: Number,
+    default: 0,
+  },
+});
+function itemClick(){
+	changeFreeenable.value = !changeFreeenable.value;
+	emits("changeFree", changeFreeenable.value);
 
-	const emits = defineEmits(['changeFree']);
+}
+const emits = defineEmits(["changeFree"]);
 
-	const changeFreeenable = ref(false)
+const changeFreeenable = ref(false);
 
-	/**
-	 * 监听是否免单
-	 */
-	const change = (e) => {
-		emits('changeFree', e);
-	}
+/**
+ * 监听是否免单
+ */
+const changeFree = (e) => {
+  emits("changeFree", e);
+};
 </script>
 
 <style lang="scss" scoped>
-	.rechargeFree {
-		// padding: 0 20rpx;
-		margin-top: 32rpx;
+.rechargeFree {
+  // padding: 0 20rpx;
+  margin-top: 32rpx;
 
-		.rechargeFree_bg {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 32rpx 24rpx;
-			border-radius: 24rpx;
-			background-color: #fff;
+  .rechargeFree_bg {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 32rpx 24rpx;
+    border-radius: 24rpx;
+    background-color: #fff;
 
-			.left {
-				display: flex;
-				align-items: center;
+    .left {
+      display: flex;
+      align-items: center;
 
-				.icon {
-					width: 68rpx;
-					height: 36rpx;
-					text-align: center;
-					line-height: 36rpx;
-					background: linear-gradient(180deg, #FEDE81 0%, #FEB263 100%);
-					border-radius: 12rpx 0rpx 12rpx 0rpx;
-					font-weight: 500;
-					font-size: 20rpx;
-					color: #FFFFFF;
-					margin-right: 12rpx;
-				}
+      .icon {
+        width: 68rpx;
+        height: 36rpx;
+        text-align: center;
+        line-height: 36rpx;
+        background: linear-gradient(180deg, #fede81 0%, #feb263 100%);
+        border-radius: 12rpx 0rpx 12rpx 0rpx;
+        font-weight: 500;
+        font-size: 20rpx;
+        color: #ffffff;
+        margin-right: 12rpx;
+      }
 
-				.text {
-					width: 80%;
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #333333;
-				}
-			}
-		}
-	}
+      .text {
+        width: 80%;
+        font-weight: 500;
+        font-size: 28rpx;
+        color: #333333;
+      }
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/pages/order/confirm-order - 副本.vue b/pages/order/confirm-order-back.vue
similarity index 100%
rename from pages/order/confirm-order - 副本.vue
rename to pages/order/confirm-order-back.vue
diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index e893384..679ade6 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -1,1614 +1,1739 @@
 <template>
-	<view class="container">
-		<up-navbar :title="navTitle" @leftClick="onback" placeholder></up-navbar>
-		<view class="headStatus">
-			<view class="status">
+  <view class="container">
+    <up-navbar :title="navTitle" @leftClick="onback" placeholder></up-navbar>
+    <view class="headStatus">
+      <view class="status">
+        <up-icon
+          v-if="
+            listinfo.status == 'done' ||
+            listinfo.status == 'unpaid' ||
+            !listinfo.id
+          "
+          name="checkmark-circle-fill"
+          color="#03C061"
+          size="23"
+        ></up-icon>
+        <view
+          class="statusName"
+          v-if="listinfo.status == 'unpaid' || !listinfo.id"
+          >待支付</view
+        >
+        <view class="statusName" v-if="listinfo.status == 'done'">已完成</view>
+        <view class="statusName" v-if="listinfo.status == 'refund'">退单</view>
+        <view class="statusName" v-if="listinfo.status == 'part-refund'"
+          >部分退单</view
+        >
+        <view class="statusName" v-if="listinfo.status == 'cancelled'"
+          >取消订单</view
+        >
+      </view>
+      <view class="time" v-if="listinfo.createTime"
+        >下单时间：{{ listinfo.createTime }}</view
+      >
+      <view
+        class="time"
+        v-if="
+          listinfo.paidTime &&
+          (listinfo.status != 'cancelled' || listinfo.status != 'unpaid')
+        "
+      >
+        付款时间：{{ listinfo.paidTime }}
+      </view>
+    </view>
 
-				<up-icon v-if="listinfo.status =='done'||listinfo.status =='unpaid'||!listinfo.id"
-					name="checkmark-circle-fill" color="#03C061" size="23"></up-icon>
-				<view class="statusName" v-if="listinfo.status == 'unpaid'||!listinfo.id">待支付</view>
-				<view class="statusName" v-if="listinfo.status=='done'">已完成</view>
-				<view class="statusName" v-if="listinfo.status=='refund'">退单</view>
-				<view class="statusName" v-if="listinfo.status=='part-refund'">部分退单</view>
-				<view class="statusName" v-if="listinfo.status=='cancelled'">取消订单</view>
-			</view>
-			<view class="time" v-if="listinfo.createTime">下单时间：{{ listinfo.createTime }}</view>
-			<view class="time" v-if="listinfo.paidTime && (listinfo.status!='cancelled' ||listinfo.status!='unpaid')">
-				付款时间：{{listinfo.paidTime}}
-			</view>
-		</view>
+    <view class="wxQrcode" v-if="shopQrcode">
+      <view class="left">
+        <text class="title">扫码加好友，优惠多多</text>
+        <text>优惠活动多</text>
+        <text>充值有好礼</text>
+        <text>会员享低价</text>
+        <text>长按保存，微信内扫一扫加好友</text>
+      </view>
+      <!-- #ifdef MP-WEIXIN -->
+      <u-image width="152" height="152" radius="16" :src="shopQrcode"></u-image>
+      <!-- #endif -->
+      <!-- #ifdef MP-ALIPAY -->
+      <image
+        style="height: 150rpx; width: 150rpx"
+        :src="shopQrcode"
+        @longpress="saveImage(shopQrcode)"
+        mode="aspectFill"
+      ></image>
+      <!-- #endif -->
+    </view>
 
-		<view class="wxQrcode" v-if="shopQrcode">
-			<view class="left">
-				<text class="title">扫码加好友，优惠多多</text>
-				<text>优惠活动多</text>
-				<text>充值有好礼</text>
-				<text>会员享低价</text>
-				<text>长按保存，微信内扫一扫加好友</text>
-			</view>
-			<!-- #ifdef MP-WEIXIN -->
-			<u-image width="152" height="152" radius="16" :src="shopQrcode"></u-image>
-			<!-- #endif -->
-			<!-- #ifdef MP-ALIPAY -->
-			<image style="height: 150rpx;width: 150rpx;" :src="shopQrcode" @longpress="saveImage(shopQrcode)"
-				mode="aspectFill"></image>
-			<!-- #endif -->
-		</view>
+    <!--  {{cartStore.orderCostSummary}} -->
 
+    <!-- 详情 -->
+    <orderInfo
+      :useVipPrice="cartStore.useVipPrice"
+      :packfee="packfee"
+      :shifu="shifu"
+      :nowCarts="cartStore.carts"
+      ref="orderInfoAfterRef"
+      :freeCheck="freeCheck"
+      :listinfo="listinfo"
+      :orderVIP="orderVIP"
+      :ordershopUserInfo="ordershopUserInfo"
+      @istype="istype"
+      @clickPointsamount="clickPointsamount"
+      :isBwc="isBwc"
+    >
+    </orderInfo>
+    <!-- 订单备注 -->
+    <view class="orderInfo">
+      <view class="">
+        <view class="t"> 订单备注： </view>
+        <view class="u-m-t-18">
+          <up-textarea
+            border="none"
+            placeholder="请填写口味、偏好等要求"
+            type="textarea"
+            v-model="orderRemarker"
+            :clearable="true"
+          />
+        </view>
+      </view>
+    </view>
+    <!-- 霸王餐 -->
+    <rechargeFree
+      :freeDineConfig="orderVIP.freeDineConfig"
+      :payAmount="listinfo.totalPrices"
+      v-if="showFreeDine && (listinfo.status == 'unpaid' || !listinfo.id)"
+      @changeFree="changeFree"
+    >
+    </rechargeFree>
 
-		<!--  {{cartStore.orderCostSummary}} -->
-
-		<!-- 详情 -->
-		<orderInfo :useVipPrice="cartStore.useVipPrice" :packfee="packfee" :shifu="shifu" :nowCarts="cartStore.carts"
-			ref="orderInfoAfterRef" :freeCheck="freeCheck" :listinfo="listinfo" :orderVIP="orderVIP"
-			:ordershopUserInfo='ordershopUserInfo' @istype="istype" @clickPointsamount='clickPointsamount'
-			@learcoupons="learcoupons" :isBwc='isBwc'>
-		</orderInfo>
-		<!-- 订单备注 -->
-		<view class="orderInfo">
-			<view class="">
-				<view class="t">
-					订单备注：
-				</view>
-				<view class="u-m-t-18 ">
-					<up-textarea border="none" placeholder="请填写口味、偏好等要求" type="textarea" v-model="orderRemarker"
-						:clearable="true" />
-				</view>
-			</view>
-		</view>
-		<!-- 霸王餐 -->
-		<rechargeFree :freeDineConfig="orderVIP.freeDineConfig" :payAmount="listinfo.totalPrices"
-			v-if="(listinfo.status == 'unpaid'||!listinfo.id) && orderVIP.freeDineConfig.enable"
-			@changeFree="changeFree">
-		</rechargeFree>
-		<!-- 充值享优惠 -->
-		<view v-else>
-			<ChargeVue @updateChargeSel="updateChargeSel" @updateRechargeId="updateRechargeId"
-				v-if="(listinfo.status == 'unpaid'||!listinfo.id)"></ChargeVue>
-		</view>
-		<!-- 支付方式 -->
-		<paymentMethodes ref="paymentMethodref" :orderVIP="orderVIP" @groupChange="groupChange"
-			:disablePayType="disablePayType" :changeFreeenable="isBwc" v-if="listinfo.status == 'unpaid'||!listinfo.id">
-		</paymentMethodes>
-		<view class="fixedview">
-			<view class="flex-between" v-if="listinfo.status == 'unpaid'||!listinfo.id">
-				<view class="fixedview_one flex-start">
-					<view class="fixedview_oneone"> 实付金额： </view>
-					<view class="fixedview_onetow" v-if="rechargeItem.id">
-						<text>¥</text>{{rechargeItem.amount}}
-					</view>
-					<view class="fixedview_onetow" v-else>
-						<text>¥</text>{{cartStore.orderCostSummary.finalPayAmount}}
-					</view>
-				</view>
-				<view class="flex-colum-end u-flex u-flex-y-center">
-
-					<view class="u-m-r-30 u-flex u-flex-y-center">
-						<template v-if="ordershopUserInfo.registerType=='before'">
-							<up-button shape="circle" v-if="!listinfo.id" @click="toJiacai" plain
-								:custom-style="customStyle">
-								<view class="u-flex u-flex-y-center">
-									<image style="width: 40rpx;height: 40rpx;" src="@/static/icon/add-goods.png"
-										mode=""></image>
-									<text class="u-font-32 color-main u-m-l-16">加菜</text>
-								</view>
-							</up-button>
-							<up-button shape="circle" v-if="listinfo.id&&listinfo.status=='unpaid'" plain
-								@tap="cancelOrder" :custom-style="customStyle">
-								<view class="u-flex u-flex-y-center">
-									<text class="u-font-32 color-main u-m-l-16">取消订单</text>
-								</view>
-							</up-button>
-						</template>
-						<template v-else>
-							<up-button v-if="!cartStore.isEmpty" shape="circle" @click="onlyCreateOrder" plain
-								:custom-style="customStyle">
-								<view class="u-flex u-flex-y-center">
-									<!-- <image style="width: 40rpx;height: 40rpx;" src="@/static/icon/add-goods.png" mode=""></image> -->
-									<text class="u-font-32 color-main ">仅下单</text>
-								</view>
-							</up-button>
-							<up-button v-else shape="circle" @click="toJiacai" plain :custom-style="customStyle">
-								<view class="u-flex u-flex-y-center">
-									<image style="width: 40rpx;height: 40rpx;" src="@/static/icon/add-goods.png"
-										mode=""></image>
-									<text class="u-font-32 color-main u-m-l-16">加菜</text>
-								</view>
-							</up-button>
-						</template>
-					</view>
-					<view class="fixedview_tow" @tap="$u.debounce(istoricalorders,1000)">
-						{{paymentmethod.paymentBtnText}}
-					</view>
-					<!-- <view class="fixedview_tows" @tap="$u.debounce(APIputuserorderclick,1000)">
+    <!-- 充值享优惠 -->
+    <view
+      v-if="
+        !showFreeDine &&
+        (listinfo.status == 'unpaid' || !listinfo.id) &&
+        cartStore.orderCostSummary.finalPayAmount > 0
+      "
+    >
+      <ChargeVue
+        @updateChargeSel="(e) => updateChargeSel(e)"
+        @updateRechargeId="updateRechargeId"
+        @updateIsShow="updateIsShow"
+        v-if="listinfo.status == 'unpaid' || !listinfo.id"
+      ></ChargeVue>
+    </view>
+    <!-- 支付方式 -->
+    <paymentMethodes
+      ref="paymentMethodref"
+      :orderVIP="orderVIP"
+      @groupChange="groupChange"
+      :disablePayType="disablePayType"
+      :changeFreeenable="isBwc"
+      v-model="paymentmethod"
+      v-if="listinfo.status == 'unpaid' || !listinfo.id"
+    >
+    </paymentMethodes>
+    <view class="fixedview">
+      <view
+        class="flex-between"
+        v-if="listinfo.status == 'unpaid' || !listinfo.id"
+      >
+        <view class="fixedview_one flex-start">
+          <view class="fixedview_oneone"> 实付金额： </view>
+          <view class="fixedview_onetow" v-if="rechargeItem.id">
+            <text>¥</text>{{ rechargeItem.amount }}
+          </view>
+          <view class="fixedview_onetow" v-else>
+            <text>¥</text>{{ cartStore.orderCostSummary.finalPayAmount }}
+          </view>
+        </view>
+        <view class="flex-colum-end u-flex u-flex-y-center">
+          <view class="u-m-r-30 u-flex u-flex-y-center">
+            <template v-if="ordershopUserInfo.registerType == 'before'">
+              <up-button
+                shape="circle"
+                v-if="!listinfo.id"
+                @click="toJiacai"
+                plain
+                :custom-style="customStyle"
+              >
+                <view class="u-flex u-flex-y-center">
+                  <image
+                    style="width: 40rpx; height: 40rpx"
+                    src="@/static/icon/add-goods.png"
+                    mode=""
+                  ></image>
+                  <text class="u-font-32 color-main u-m-l-16">加菜</text>
+                </view>
+              </up-button>
+              <up-button
+                shape="circle"
+                v-if="listinfo.id && listinfo.status == 'unpaid'"
+                plain
+                @tap="cancelOrder()"
+                :custom-style="customStyle"
+              >
+                <view class="u-flex u-flex-y-center">
+                  <text class="u-font-32 color-main u-m-l-16">取消订单</text>
+                </view>
+              </up-button>
+            </template>
+            <template v-else>
+              <up-button
+                v-if="!cartStore.isEmpty"
+                shape="circle"
+                @click="onlyCreateOrder"
+                plain
+                :custom-style="customStyle"
+              >
+                <view class="u-flex u-flex-y-center">
+                  <!-- <image style="width: 40rpx;height: 40rpx;" src="@/static/icon/add-goods.png" mode=""></image> -->
+                  <text class="u-font-32 color-main">仅下单</text>
+                </view>
+              </up-button>
+              <up-button
+                v-else
+                shape="circle"
+                @click="toJiacai"
+                plain
+                :custom-style="customStyle"
+              >
+                <view class="u-flex u-flex-y-center">
+                  <image
+                    style="width: 40rpx; height: 40rpx"
+                    src="@/static/icon/add-goods.png"
+                    mode=""
+                  ></image>
+                  <text class="u-font-32 color-main u-m-l-16">加菜</text>
+                </view>
+              </up-button>
+            </template>
+          </view>
+          <view class="fixedview_tow" @tap="$u.debounce(istoricalorders, 1000)">
+            {{ paymentmethod.name }}
+          </view>
+          <!-- <view class="fixedview_tows" @tap="$u.debounce(APIputuserorderclick,1000)">
 						取消订单
 					</view> -->
-				</view>
-			</view>
-		</view>
-		<view style="width: 100%;height: 200rpx;color: #fff; color: #fff;">
-		</view>
-		<payPassword ref="payPasswordref" :isShow="ispws" @inputComplete="accountPayevent" @close="ispws = false" />
-	</view>
+        </view>
+      </view>
+    </view>
+    <view style="width: 100%; height: 200rpx; color: #fff; color: #fff"> </view>
+    <payPassword
+      ref="payPasswordref"
+      :isShow="ispws"
+      @inputComplete="(e) => accountPayevent(e)"
+      @close="pwdClose"
+    />
+    <!-- 私域引流配置 -->
+    <OrderFinshModal v-model="showDrainage"></OrderFinshModal>
+  </view>
 </template>
 <script setup>
-	import {
-		back
-	} from '@/utils/uniapp.js'
-	import {
-		onLoad
-	} from '@dcloudio/uni-app'
-	import {
-		BigNumber
-	} from 'bignumber.js';
-	import ChargeVue from './components/charge.vue';
-	import {
-		pay
-	} from '@/utils/pay.js'
-	import * as UTILS from '@/utils/goods-utils.js'
-	import {
-		findCoupon
-	} from '@/common/api/market/coupon.js';
-
-	function onback() {
-		closeSocket()
-		back()
-	}
-	const customStyle = {
-		'width': '180rpx',
-		'height': '70rpx',
-		'background': 'FFFFFF',
-		'border-radius': '106rpx',
-		'border': '2rpx solid #E8AD7B'
-	}
-	import _ from "lodash";
-	import {
-		ref,
-		reactive,
-		computed,
-		onMounted,
-		onUnmounted,
-		watchEffect,
-		nextTick,
-		watch,
-		onBeforeMount,
-		onBeforeUnmount
-	} from 'vue';
-	import {
-		getTableInfo
-	} from '@/common/api/shop/index.js'
-	import {
-		APIgetOrderById,
-		APIputuserorder,
-		APIhistoryOrder,
-		rechargePayOrder,
-		APIcancelOrder
-	} from '@/common/api/order/index.js'
-	import {
-		APIusershopInfodetail,
-		APIshopUserInfo
-	} from '@/common/api/member.js'
-	import {
-		APImemberPointsmyPoints,
-		APImemberPointscalcUsablePoints
-	} from '@/common/api/shop/index.js'
-	import {
-		useCartsStore
-	} from '@/stores/carts.js';
-	import {
-		useWebSocket
-	} from '@/stores/carts-websocket.js';
-
-	const cartStore = useCartsStore()
-
-
-
-	const disablePayType = ref([])
-	//充值相关
-	const rechargeItem = ref({
-		id: ''
-	})
-	const rechargeId = ref(null)
-
-	function updateRechargeId(e) {
-		rechargeId.value = e
-	}
-
-	function updateChargeSel(newval) {
-		rechargeItem.value = newval
-		console.log('updateChargeSel',newval);
-		//充值并付款时只能微信支付
-		if (newval && newval.id) {
-			disablePayType.value = ['余额支付']
-			paymentMethodref.value.groupChanges(2)
-			return
-		} 
-		console.log('orderVIP.value.amount',orderVIP.value.amount);
-		if (!orderVIP.value.amount) {
-			disablePayType.value = ['余额支付']
-			if (paymentMethodref.value) {
-				paymentMethodref.value.groupChanges(2)
-			}
-			return
-		}
-		if (orderVIP.value.amount < newval) {
-			disablePayType.value = ['余额支付']
-			if (paymentMethodref.value) {
-				paymentMethodref.value.groupChanges(2)
-			}
-			return
-		}
-		disablePayType.value = []
-	}
-
-	async function onMessage(Message) {
-		cartStore.onMessage(Message, cartsSocket)
-		listinfo.totalPrices = historyTotalPrices * 1 + cartStore.totalPrice * 1
-		if (Message.operate_type == "init") {
-			youhuiReset()
-		}
-		if (Message.operate_type == "cleanup") {
-			listinfo.totalCost = 0;
-			youhuiReset()
-			if (listinfo.id) {
-				let res = await APIgetOrderById({
-					orderId: listinfo.id
-				})
-				console.log('onMessage:APIgetOrderById', res);
-				if (res) {
-					orderRemarker.value=res.remark;
-					// cartStore.carts=[];
-					// cartStore.setOldOrder(res)
-				}
-				if (noPayStatus[res.status]) {
-					uni.showToast({
-						title: noPayStatus[res.status],
-						icon: 'none'
-					})
-					setTimeout(() => {
-						uni.navigateBack()
-					}, 1000);
-					return;
-				}
-			}
-		}
-		if (Message.operate_type == "del") {
-			youhuiReset()
-		}
-		if (Message.operate_type == "edit") {
-			youhuiReset()
-		}
-		if (Message.operate_type == 'clearOrder') {
-			youhuiReset()
-		}
-		if (Message.type == 'product' && Message.data_type == 'product_update' && Message
-			.operate_type == 'product_update') {
-			youhuiReset()
-		}
-		return Message
-	}
-	let cartsSocket = null
-	cartStore.goodsInit()
-	const socketInitPar = {
-		type: 'shopping',
-		operate_type: 'init',
-		table_code: uni.cache.get('tableCode'),
-		shop_id: uni.cache.get('shopId'),
-	}
-
-	function socketInit() {
-		cartsSocket = useWebSocket();
-		cartsSocket.connect(socketInitPar, onMessage);
-	}
-	const noPayStatus = {
-		cancelled: "订单已取消",
-		done: "订单已关闭",
-	};
-
-
-
-	function youhuiReset() {
-		listinfo.pointsDiscountAmount = 0;
-		listinfo.pointsNum = 0;
-		listinfo.pointsDiscountAmount = 0
-		listinfo.Productroll = 0
-		uniqueIds.value = []
-		try {
-			orderInfoAfterRef.value?.IntegralInputclose();
-		} catch {
-
-		}
-	}
-
-
-	// 结账管理
-	import {
-		Memberpay
-	} from '@/stores/pay.js';
-
-	const storeMemberpay = Memberpay();
-
-	import {
-		productStore
-	} from '@/stores/user.js';
-	const storeuser = productStore();
-
-	import payPassword from '@/components/payPassword.vue'
-	import orderInfo from './components/orderInfo.vue'
-	// import orderInfoBefore from '../components/orderInfoBefore.vue'
-	import rechargeFree from './components/rechargeFree.vue'
-	import paymentMethodes from '@/components/paymentMethod.vue'; //支付方式
-	import {
-		onShow,
-		onBackPress
-	} from '@dcloudio/uni-app';
-	import {
-		onHide
-	} from '@dcloudio/uni-app';
-	// 输入支付密码
-	const ispws = ref(false)
-	const userInfo= uni.cache.get('userInfo')
-
-	// 会员信息
-	const orderVIP = ref(uni.cache.get('orderVIP'))
-	// 商品订单关联的店铺信息
-	const ordershopUserInfo = ref(uni.cache.get('shopInfo'))
-
-
-	cartStore.updateData('orderVIP', orderVIP.value)
-	cartStore.updateData('shopInfo', ordershopUserInfo.value)
-	// 是否显示商家二维码信息
-	const shopQrcode = ref(ordershopUserInfo.shopInfo || false)
-
-	// 霸王餐
-	const isBwc = ref(false)
-	//订单备注
-	const orderRemarker = ref('')
-	// 订单详情
-	const listinfo = reactive({
-		combinedArray: [],
-		Productroll: 0,
-		coupondiscountAmount: 0,
-		pointsDiscountAmount: 0,
-		packFeess: 0,
-		totalPrices: 0,
-		Seatcharge: 0,
-		pointsNum: 0,
-		id: null
-	})
-
-
-
-	//判断是否是打包商品
-	const is_type = ref(0)
-	//打包商品切换
-	const istype = (newValue) => {
-		is_type.value = newValue;
-	};
-	//积分
-
-	const freeCheck = ref(false)
-	let backtimer = null
-	let historyTotalPrices = 0;
-	// * 获取订单详情接口
-	const orderorderInfo = async () => {
-		console.log('listinfo.id', listinfo.id);
-		let res = listinfo.id ? await APIgetOrderById({
-			orderId: listinfo.id
-		}) : await APIhistoryOrder({
-			tableCode: options.tableCode
-		})
-		orderRemarker.value=res.remark;
-		if (res && res.tableCode) {
-			socketInitPar.table_code = res.tableCode
-			let tableRes = await getTableInfo({
-				tableCode: options.tableCode
-			})
-			console.log(tableRes);
-			listinfo.tableName = tableRes.name;
-		} else {
-			if (options.tableCode) {
-				socketInitPar.table_code = options.tableCode
-				let tableRes = await getTableInfo({
-					tableCode: options.tableCode
-				})
-				console.log(tableRes);
-				listinfo.tableName = tableRes.name;
-			}
-		}
-		cartStore.setOldOrder(res);
-		socketInit()
-		console.log(res);
-
-		getOrderInfoAfterCalcInit(res)
-	}
-
-	//拿到订单数据后续初始化处理
-	function getOrderInfoAfterCalcInit(res) {
-		console.log('getOrderInfoAfterCalcInit',res);
-		if (res && res.id) {
-			Object.assign(listinfo, res);
-			// 历史订单
-			if (listinfo.detailMap) {
-				let combinedArray = [];
-				for (const key in listinfo.detailMap) {
-					if (listinfo.detailMap.hasOwnProperty(key)) {
-						let subArray = listinfo.detailMap[key];
-						combinedArray = [...combinedArray, ...subArray]
-					}
-				}
-				listinfo.combinedArray = combinedArray
-				listinfo.packFeess = cartStore.getTotalPackFee(listinfo.combinedArray)
-				// 计算购物车商品费用
-				historyTotalPrices = cartStore.getTotalTotalPrices(listinfo
-					.combinedArray, isBwc.value) * 1
-
-				listinfo.totalPrices = historyTotalPrices + cartStore.totalPrice * 1
-				// 餐位费listinfo.seatNum
-				listinfo.Seatcharge = cartStore.getTotalSeatcharge(listinfo.seatNum)
-			}
-			if (listinfo.discountInfo) {
-				const discountObj = JSON.parse(listinfo.discountInfo);
-				const tempArray = [];
-				for (const [key, value] of Object.entries(discountObj)) {
-					tempArray.push({
-						name: key,
-						amount: value
-					});
-				}
-				listinfo.discountInfo = tempArray;
-			}
-			// 回填先质控
-			listinfo.pointsDiscountAmount = 0
-			// console.log(listinfo)
-
-		} else {
-			listinfo.totalPrices = cartStore.totalPrice * 1
-		}
-
-		// uni.showToast({
-		// 	title:'订单已取消或已付款',
-		// 	icon:'none'
-		// })
-		// backtimer=setTimeout(()=>{
-		// 	const arr=getCurrentPages()
-		// 	if(arr.length<=1){
-		// 		toJiacai()
-		// 	}else{
-		// 		uni.navigateBack({delta:1})
-		// 	}
-		// },1000)
-	}
-
-
-	// 监听价格算法
-	watchEffect(async () => {
-		if (listinfo.combinedArray.length > 0 || cartStore.carts.length > 0) {
-			// 打包费packFeess  计算购物车商品费用totalPrices  餐位费Seatcharge
-			// try {
-			let historyOrderPackFee = is_type.value != 0 ? listinfo.packFeess : 0;
-			let nowCartPackFee = is_type.value != 0 ? cartStore.totalPackFee * 1 : 0;
-			let seatFee = is_type.value == 0 ? listinfo.Seatcharge : 0;
-			let sum = cartStore.totalPackFee * 1 + historyOrderPackFee + listinfo.totalPrices + seatFee;
-			listinfo.originAmount = Math.round(sum * 100) / 100;
-
-			// 打包费packFeess  计算购物车商品费用totalPrices  餐位费Seatcharge  商品卷Productroll 优惠卷coupondiscountAmount 积分listinfo.pointsDiscountAmount
-			let sums = nowCartPackFee + historyOrderPackFee + listinfo.totalPrices + seatFee - (listinfo
-				.Productroll || 0) - (listinfo.coupondiscountAmount || 0) - (listinfo
-				.pointsDiscountAmount || 0);
-			listinfo.totalCost = Math.round(sums * 100) / 100;
-
-			// 总价格
-			// console.log(listinfo.combinedArray, listinfo.packFeess, listinfo.totalPrices, listinfo
-			// 	.Seatcharge, listinfo.Productroll, listinfo.coupondiscountAmount, sums) // 霸王餐
-			// console.log(orderVIP.value.freeDineConfig.enable, changeFreeenable.value)
-			if (orderVIP.value.freeDineConfig.enable && isBwc.value) {
-				listinfo.totalCost = (parseFloat(listinfo.totalCost) * parseFloat(orderVIP.value
-					.freeDineConfig.rechargeTimes)).toFixed(2)
-			}
-			// 积分
-			if (listinfo.totalCost && (listinfo.status == 'unpaid' || !listinfo.id) && orderVIP.value.id) {
-				uni.$u.debounce(memberPointscalcUsablePoints, 500)
-			}
-			// } catch (error) {
-			// 	//TODO handle the exception
-			// }
-		}
-	});
-
-
-
-	const changeFree = (e) => {
-		isBwc.value = e
-
-		orderInfoAfterRef.value.bwcclear()
-		uniqueIds.value = [] // 筛选出商品卷的id
-		listinfo.coupondiscountAmount = 0 // 优惠卷减去的金额
-		listinfo.pointsNum = 0 // 商品卷总价价格
-		// 商品价格
-		listinfo.totalPrices = cartStore.getTotalTotalPrices(listinfo.combinedArray, isBwc.value)
-		// 支付方式切换
-		// #ifdef MP-WEIXIN
-		paymentMethodref.value.groupChanges(2)
-		// #endif
-		// #ifdef MP-ALIPAY
-		paymentMethodref.value.groupChanges(3)
-		// #endif
-
-
-	}
-
-	const saveImage = (url) => {
-		uni.saveImage({
-			url: url,
-			success: () => {
-				uni.showToast({
-					title: "保存成功",
-					icon: 'none'
-				})
-			},
-		});
-	}
-
-	//
-	const paymentMethodref = ref(null)
-
-	// 支付方式切换
-	const paymentmethod = reactive({
-		radiovalue: 2,
-		paymentBtnText: "微信支付",
-		payType: 'wechatPay'
-	})
-
-	const groupChange = async (e) => {
-		paymentmethod.radiovalue = e.type;
-		paymentmethod.paymentBtnText = e.name;
-		paymentmethod.payType = e.payType;
-	}
-
-	// * 去充值
-	const goRecharge = () => {
-		uni.pro.navigateTo('/pages/member/index', {
-			shopId: listinfo.shopId
-		})
-	}
-
-	// 操作下单时候
-	const orderInfoAfterRef = ref(null)
-
-	// 商品卷的id储存
-	const uniqueIds = ref([])
-
-	// 这是优惠卷传的值
-	const handleReturnData = async (data) => {
-		// 这是优惠卷
-		if (data.typeOrder == 1) {
-			if (data.item) {
-				// 优惠卷减去的金额
-				listinfo.coupondiscountAmount = data.item.discountAmount
-				uniqueIds.value.push(data.item.id)
-				orderInfoAfterRef.value.dataprocessing(data)
-			}
-		} else {
-			// 筛选出商品卷的id
-			// 商品卷总价价格
-			// uniqueIds.value = [...uniqueIds.value, ...new Set(data.map(item => item.id))]
-			uniqueIds.value = [...uniqueIds.value, ...data.map(item => item.id)]
-			console.log(uniqueIds.value);
-			listinfo.Productroll = cartStore.getTotalProductroll(data).value
-			// TODO handle the exception
-			let res = {
-				Productroll: listinfo.Productroll,
-				uniqueIds: uniqueIds.value.length
-			}
-			orderInfoAfterRef.value.dataprocessing(res)
-
-		}
-
-	};
-
-	const learcoupons = (data) => {
-		if (data == 'product') {
-			uniqueIds.value = [] // 筛选出商品卷的id
-			listinfo.coupondiscountAmount = 0 // 优惠卷减去的金额
-			listinfo.Productroll = 0 // 商品卷总价价格
-			listinfo.pointsNum = 0 // 积分总价格
-		} else {
-			// 每次点击优惠卷删除优惠卷里的id 
-			if (listinfo.coupondiscountAmount != 0) {
-				uniqueIds.value.pop()
-			}
-			listinfo.coupondiscountAmount = 0 // 优惠卷减去的金额
-		}
-	}
-
-	//取消订单
-	const cancelOrder = async () => {
-		uni.showModal({
-			title: '取消订单',
-			content: '是否取消订单？',
-			showCancel: true,
-			success: async (res) => {
-				if (res.confirm) {
-					await APIcancelOrder({
-						shopId: listinfo.shopId,
-						orderId: listinfo.id
-					})
-					uni.showToast({
-						title: '取消订单成功',
-						icon: 'none'
-					})
-					setTimeout(() => {
-						uni.pro.switchTab('order/index')
-					}, 1000)
-				}
-			}
-		})
-
-	}
-
-	// 删除订单
-	const APIputuserorderclick = async () => {
-		await APIputuserorder(listinfo.id)
-		uni.showToast({
-			title: '删除成功',
-			icon: 'none'
-		})
-		uni.pro.switchTab('order/index')
-	}
-	async function onlyCreateOrder() {
-		await createOrder()
-		orderorderInfo()
-	}
-	// 生成订单
-	const createOrder = async () => {
-		// cartStore.carts = [];
-		const res = await storeMemberpay.actionscreateOrder({
-			dineMode: is_type.value == 0 ? 'dine-in' : 'take-out', //堂食 dine-in 外带 take-out 外卖 take-away
-			seatNum: uni.cache.get('dinersNum') ? uni.cache.get('dinersNum') : '', //用餐人数
-			// packFee: packFee.value, //打包费
-			packFee: packfee.value, //打包费
-			originAmount: shifu.value, //订单原金额（包含打包费） 不含折扣价格 不含餐位费
-			remark: orderRemarker.value, //备注
-			placeNum: listinfo.id ? (listinfo.placeNum * 1 + 1) : 1, //当前订单下单次数
-			waitCall: '', //是否等叫 0 否 1 等叫
-			orderId: listinfo.id || '',
-			tableCode: options.tableCode,
-			userId: uni.cache.get('userInfo').id || '' //
-		})
-		// 清空购物车
-		if (res) {
-			Object.assign(listinfo, res)
-			// cartStore.setOldOrder(res)
-			getOrderInfoAfterCalcInit(res)
-
-			cartsSocket.sendMessage({
-				type: 'shopping',
-				table_code: uni.cache.get('tableCode'),
-				shop_id: uni.cache.get('shopId'),
-				operate_type: 'cleanup',
-			})
-			return res
-		} else {
-			uni.showToast({
-				title: '生成订单失败'
-			})
-		}
-
-	}
-
-	function isPayBefor() {
-		return ordershopUserInfo.value.registerType == 'before' ? true : false
-	}
-
-
-	function pay_lock() {
-		cartsSocket.sendMessage({
-			...socketInitPar,
-			operate_type: 'pay_lock'
-		})
-	}
-
-	function pay_unlock() {
-		clearInterval(payStatusTimer)
-		cartsSocket.sendMessage({
-			...socketInitPar,
-			operate_type: 'pay_unlock'
-		})
-	}
-	async function search_pay_lock() {
-		cartsSocket.sendMessage({
-			...socketInitPar,
-			operate_type: 'search_pay_lock'
-		})
-		return new Promise((relove, reject) => {
-			cartsSocket.socketTask.onMessage(res => {
-				relove(JSON.parse(res.data))
-			})
-		})
-	}
-	let payStatusTimer = null
-	let orderIsLock = true;
-	let usePoints=ref(0)
-	
-	
-	let checkOrderPay = {}
-	
-	const istoricalorders = async () => {
-		
-		checkOrderPay = {
-			orderId:'',
-			vipPrice: cartStore.useVipPrice ? 1 : 0, //是否使用会员价0否1是
-			userAllPack: is_type.value == 0 ? 0 : 1, //是否整单打包
-			seatNum: is_type.value == 0 ? cartStore.seatFeeConfig.personCount : 0, //用餐人数
-			originAmount: cartStore.orderCostSummary.goodsRealAmount, //订单原金额（包含打包费+餐位费） 不含折扣价格
-			discountRatio: 1, //折扣比例(计算时 向上取整保留 两位小数)   写死1
-			discountAmount: 0, //手动优惠金额  写死0
-			productCouponDiscountAmount: cartStore.orderCostSummary.productCouponDeduction, //商品优惠券抵扣金额
-			otherCouponDiscountAmount: cartStore.orderCostSummary.fullCouponDeduction, //其他优惠券抵扣金额
-			couponList: cartStore.backendCoupons.map(v => v.id), //用户使用的卡券
-			orderAmount: cartStore.orderCostSummary.finalPayAmount, // 最终订单金额
-			roundAmount: 0, //抹零金额 减免多少钱
-			pointsDiscountAmount: cartStore.orderCostSummary
-				.pointDeductionAmount, //积分抵扣金额(tb_points_basic_setting表)
-			pointsNum: cartStore.orderCostSummary.pointUsed, //(扣除各类折扣 enable_deduction后使用)
-			newCustomerDiscountAmount: cartStore.orderCostSummary.newUserDiscount, //新客立减
-			newCustomerDiscountId: cartStore.orderCostSummary.newUserDiscount > 0 ? cartStore
-				.consumeDiscount.id : '',
-			remark: orderRemarker.value, //用户备注
-		}
-		
-		//先付
-		if (isPayBefor()) {
-			console.log('isPayBefor');
-			console.log('cartStore.isEmpty', cartStore.isEmpty);
-			console.log('cartStore.carts', cartStore.carts);
-			// 购物车有数据
-			if (!cartStore.isEmpty) {
-				usePoints=cartStore.orderCostSummary.pointUsed
-				const res = await createOrder()
-				//历史订单数据
-				const res1 = await APIgetOrderById({
-					orderId: res.id
-				})
-				console.log('历史订单数据',res1);
-				orderRemarker.value=res1.remark;
-				cartStore.setOldOrder(res1)
-			}
-			console.log('istoricalorders：cartStore.orderCostSummary.pointUsed',cartStore.orderCostSummary.pointUsed);
-			console.log('istoricalorders：cartStore.userPoints',cartStore.userPoints);
-			goToPay()
-			// goToPay()
-
-		} else {
-			//后付
-			
-			// 购物车有数据
-			if (!cartStore.isEmpty) {
-				usePoints=cartStore.orderCostSummary.pointUsed
-				const res = await createOrder()
-				//历史订单数据
-				const res1 = await APIgetOrderById({
-					orderId: res.id
-				})
-				console.log('历史订单数据',res1);
-				orderRemarker.value=res1.remark;
-				cartStore.setOldOrder(res1)
-				goToPay()
-				return 
-			}
-			// 先调用历史订单
-			let APIhistoryOrderres = await APIhistoryOrder({
-				tableCode: listinfo.tableCode
-			})
-			// 判断是否有历史订单
-			if (APIhistoryOrderres.detailMap) {
-				let combinedArray = [];
-				for (const key in APIhistoryOrderres.detailMap) {
-					if (APIhistoryOrderres.detailMap.hasOwnProperty(key)) {
-						let subArray = APIhistoryOrderres.detailMap[key];
-						combinedArray = [...combinedArray, ...subArray]
-					}
-				}
-				// 判断支付之前是是否还有新加订单
-				if (listinfo.combinedArray.length === combinedArray.length) {
-					goToPay()
-				} else {
-					uni.showToast({
-						title: '你的订单已更新！',
-						icon: 'none'
-					})
-					orderorderInfo()
-				}
-			} else {
-				uni.showToast({
-					title: '你的小伙伴已提交订单~',
-					icon: 'none'
-				})
-				setTimeout(() => {
-					orderorderInfo()
-				}, 1000)
-			}
-		}
-
-
-
-	}
-
-	// * 去支付
-	const goToPay = async (isCreateOrder = false) => {
-		// 余额支付
-		if (paymentmethod.payType == 'accountPay') {
-			if (orderVIP.value.payPwd == '') {
-				uni.showModal({
-					title: '提示',
-					content: '您还未设置支付密码，是否去设置？',
-					success: (res) => {
-						if (res.confirm) {
-							uni.pro.navigateTo('user/member/setPassword', {
-								shopId: orderVIP.value.shopId,
-								type: 'detail'
-							})
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				})
-				return
-			} 
-			if(userInfo.usePayPwd){
-				ispws.value = true
-				return 
-			}
-			accountPayevent()
-			return 
-		}
-
-		const canPayRes = await search_pay_lock()
-		const canPay = canPayRes.status == 1 ? true : false;
-		if (!canPay) {
-			uni.showToast({
-				title: '有人正在付款中！',
-				icon: 'none'
-			})
-			return
-		}
-		pay_lock()
-		payStatusTimer = setInterval(() => {
-			pay_lock()
-		}, 1000)
-
-		if (orderVIP.value.freeDineConfig.enable && isBwc.value) {
-			await storeMemberpay.actionspayltPayVip({
-				shopId: orderVIP.value.shopId,
-				shopUserId: orderVIP.value.id,
-				orderId: listinfo.id,
-				userAllPack: is_type.value == 0 ? 0 : 1, //是否整单打包
-				amount: cartStore.orderCostSummary.finalPayAmount, // 最终订单金额
-				returnUrl: '', //跳转地址
-				buyerRemark: '',
-				seatNum: is_type.value == 0 ? listinfo.seatNum : 0, //用餐人数
-			})
-
-			orderorderInfo()
-			return false;
-		} else {
-			checkOrderPay.orderId=listinfo.id;
-			console.log('cartStore.orderCostSummary',cartStore.orderCostSummary);
-			console.log('topay checkOrderPay', checkOrderPay);
-			try {
-				if (rechargeItem.value.id && rechargeId.value) {
-					//充值并且支付
-					const payRes = await rechargePayOrder({
-						checkOrderPay: {
-							...checkOrderPay,
-							userId: uni.cache.get('shopUserInfo').userId || ''
-						},
-
-						payType: paymentmethod.payType,
-						buyerRemark: '',
-						returnUrl: '',
-						rechargeId: rechargeId.value,
-						rechargeDetailId: rechargeItem.value.id,
-						shopUserId: orderVIP.value.id,
-						shopId: orderVIP.value.shopId,
-					})
-					await pay(payRes)
-					pay_unlock()
-				} else {
-					console.log('微信支付');
-					await storeMemberpay.actionsltPayOrder({
-						checkOrderPay,
-						payType: paymentmethod.payType,
-						buyerRemark: '',
-						returnUrl: ''
-					})
-				}
-
-			} catch (error) {
-				console.log('error', error);
-				pay_unlock()
-				//TODO handle the exception
-			}
-		}
-		pay_unlock()
-		console.log('orderorderInfo');
-		orderorderInfo()
-	}
-
-	//002-获取订单可用积分及抵扣金额（支付页面使用）
-	const memberPointscalcUsablePoints = async () => {
-		let res = await APImemberPointscalcUsablePoints({
-			shopUserId: orderVIP.value.id,
-			orderAmount: listinfo.totalCost,
-		})
-		orderInfoAfterRef.value?.getCalcUsablePoints(res)
-	}
-	// 
-	const clickPointsamount = (Pointsamount) => {
-		listinfo.pointsDiscountAmount = Pointsamount.pointsDiscountAmount
-		listinfo.pointsNum = Pointsamount.pointsNum
-	}
-
-	const payPasswordref = ref(null)
-	// 余额支付
-	const accountPayevent = async (pwd) => {
-		ispws.value = false;
-		checkOrderPay.userId=uni.cache.get('userInfo').id
-		checkOrderPay.orderId=listinfo.id
-		console.log('余额支付本地计算',cartStore.orderCostSummary);
-		console.log('余额支付提交参数',{
-				checkOrderPay,
-				payType: paymentmethod.payType,
-				pwd: pwd,
-				shopUserId: orderVIP.value.id,
-				buyerRemark: '',
-				returnUrl: ''
-			});
-			console.log('积分',checkOrderPay.pointsNum);
-		try {
-			await storeMemberpay.balancePayOrder({
-				checkOrderPay,
-				payType: paymentmethod.payType,
-				pwd: pwd,
-				shopUserId: orderVIP.value.id,
-				buyerRemark: '',
-				returnUrl: ''
-			})
-			uni.showToast({
-				title: '支付成功',
-				icon: 'none'
-			})
-		} catch (error) {
-			//TODO handle the exception
-		}
-		orderorderInfo()
-	}
-
-	onBeforeUnmount(() => {
-		uni.$off('returnData', handleReturnData);
-		clearTimeout(backtimer)
-		clearInterval(payStatusTimer)
-		closeSocket()
-	});
-	onHide(() => {
-		closeSocket()
-		clearInterval(payStatusTimer)
-	})
-
-	function closeSocket() {
-
-		// cartsSocket.closeExistingConnection()
-	}
-
-	onShow(() => {
-		if (cartsSocket) {
-			cartsSocket.connect()
-		}
-		try {
-			// 更新数据
-			if (orderVIP.value) {
-				orderVIP.value = uni.cache.get('orderVIP')
-				paymentMethodref.value.orderVIPfun(uni.cache.get('orderVIP'))
-				if (listinfo.id && ordershopUserInfo.value.registerType != 'before') {
-					orderorderInfo()
-				}
-			}
-		} catch (error) {
-			//TODO handle the exception
-		}
-
-
-		orderorderInfo()
-		uni.$off('selCoupon')
-		uni.$on('selCoupon', function(data) {
-			console.log('selCoupon', data)
-			orderInfoAfterRef.value.dataprocessing(_.cloneDeep(data))
-			cartStore.setCoupons(_.cloneDeep(data))
-		})
-
-	});
-	let options = {}
-
-	// 跳转到加菜页面
-	function toJiacai() {
-		back()
-		return
-		uni.navigateTo({
-			url: '/pages/product/index'
-		})
-	}
-	const packfee = computed(() => {
-		return cartStore.orderCostSummary.packFee
-	})
-	//不计算各种折扣前的实付金额
-	const shifu = computed(() => {
-		const payAmount = listinfo.payAmount ? listinfo.payAmount * 1 : 0
-		return payAmount + cartStore.totalPrice * 1 + packfee.value * 1
-	})
-	//减去各种折扣后的金额
-	const lastPayMoney = computed(() => {
-		return shifu.value * 1
-	})
-
-
-	const payStatus = {
-		'unpaid': '待支付',
-		'done': '已完成',
-		'refund': '已退款',
-		'part-refund': '部分退款',
-		'cancelled': '已取消'
-	}
-	const navTitle = computed(() => {
-		if (!listinfo.id && !cartStore.isEmpty) {
-			return '待确认'
-		}
-		if (cartStore.isEmpty && listinfo.id) {
-			return payStatus[listinfo.status] || '待确认'
-		} else {
-			return '待确认'
-		}
-	})
-
-	async function init(opt) {
-		console.log('init');
-		cartStore.clearOrderConfig()
-		Object.assign(options, opt)
-		listinfo.id = options.orderId;
-		console.log('options', options);
-		if (options.shopId) {
-			// 每次进来全局更新shopId
-			uni.cache.set('shopId', options.shopId, 30)
-			uni.$on('returnData', handleReturnData);
-		}
-		//如果已经生成订单，根据历史订信息设置相关配置
-		if (options.orderId) {
-			let res = await APIgetOrderById({
-				orderId: listinfo.id
-			})
-			if (res) {
-				uni.cache.set('tableCode', res.tableCode)
-				uni.cache.set('tableCode', res.seatNum)
-				options.tableCode = res.tableCode
-				cartStore.setSeatFeeConfig('personCount', res.seatNum)
-				cartStore.setDinnerType(res.dineMode || 'dine-in')
-				orderRemarker.value=res.remark;
-			}
-		}
-		//获取店铺信息
-		const shopInfoRes = await APIusershopInfodetail({
-			shopId: options.shopId
-		})
-		if (shopInfoRes) {
-			cartStore.shopInfo = shopInfoRes.shopInfo;
-		}
-		await cartStore.goodsInit()
-		// * 获取会员信息
-		await storeuser.actionsproductqueryProduct()
-		await nextTick()
-
-		orderVIP.value = uni.cache.get('orderVIP')
-		if (options.tableCode) {
-			socketInitPar.table_code = options.tableCode
-			socketInit()
-		} else {
-			orderorderInfo()
-		}
-
-	}
-	onLoad((opt) => {
-		init(opt)
-	})
+import { back } from "@/utils/uniapp.js";
+import { onLoad ,onUnload} from "@dcloudio/uni-app";
+import ChargeVue from "./components/charge.vue";
+import { pay } from "@/utils/pay.js";
+import OrderFinshModal from "@/components/order-finish-modal.vue";
+import _ from "lodash";
+import {
+  ref,
+  reactive,
+  computed,
+  onMounted,
+  onUnmounted,
+  nextTick,
+  watch,
+  onBeforeMount,
+  onBeforeUnmount,
+  provide,
+} from "vue";
+provide("shopUserInfo", ref(uni.cache.get("shopUserInfo")));
+provide("shopInfo", ref(uni.cache.get("shopInfo")));
+import { getTableInfo } from "@/common/api/shop/index.js";
+import {
+  APIgetOrderById,
+  APIputuserorder,
+  APIhistoryOrder,
+  rechargePayOrder,
+  APIcancelOrder,
+} from "@/common/api/order/index.js";
+import { APIusershopInfodetail, APIshopUserInfo } from "@/common/api/member.js";
+import {
+  APImemberPointsmyPoints,
+  APImemberPointscalcUsablePoints,
+} from "@/common/api/shop/index.js";
+import { useCartsStore } from "@/stores/carts.js";
+import { useWebSocket } from "@/stores/carts-websocket.js";
+
+function pwdClose() {
+  ispws.value = false;
+  pay_unlock();
+}
+
+onUnload(()=> {
+  console.log("onUnload");
+  closeSocket();
+}) 
+onBackPress(()=> {
+  console.log("返回拦截");
+  closeSocket();
+}) 
+function onback() {
+  closeSocket();
+  console.log("返回");
+  back();
+}
+const customStyle = {
+  width: "180rpx",
+  height: "70rpx",
+  background: "FFFFFF",
+  "border-radius": "106rpx",
+  border: "2rpx solid #E8AD7B",
+};
+
+const cartStore = useCartsStore();
+
+//充值相关start
+//充值和余额支付是否可用
+const isCanUseCharge = ref(true);
+function updateIsShow(e) {
+  isCanUseCharge.value = e;
+}
+const rechargeItem = ref({
+  id: "",
+});
+const rechargeId = ref(null);
+
+function updateRechargeId(e) {
+  rechargeId.value = e;
+}
+
+function updateChargeSel(newval) {
+  rechargeItem.value = newval;
+  console.log("updateChargeSel", newval);
+}
+//充值相关end
+
+async function onMessage(Message) {
+  cartStore.onMessage(Message, cartsSocket);
+  listinfo.totalPrices = historyTotalPrices * 1 + cartStore.totalPrice * 1;
+  if (Message.operate_type == "init") {
+    youhuiReset();
+  }
+  if (Message.operate_type == "cleanup") {
+    console.log("onMessage:cleanup", Message);
+    console.log("onMessage:options", options);
+    console.log("onMessage:listinfo", listinfo);
+    youhuiReset();
+    if (listinfo.id || options.tableCode) {
+      let res = listinfo.id
+        ? await APIgetOrderById({
+            orderId: listinfo.id,
+          })
+        : await APIhistoryOrder({
+            tableCode: options.tableCode || "",
+          });
+
+      console.log("onMessage:APIgetOrderById", res);
+      Object.assign(listinfo, res);
+      if (res) {
+        orderRemarker.value = res.remark;
+        cartStore.setOldOrder(res);
+      }
+      if (noPayStatus[res.status]) {
+        uni.showToast({
+          title: noPayStatus[res.status],
+          icon: "none",
+        });
+        setTimeout(() => {
+          uni.navigateBack();
+        }, 1000);
+        return;
+      }
+    }
+  }
+  if (Message.operate_type == "del") {
+    youhuiReset();
+  }
+  if (Message.operate_type == "edit") {
+    youhuiReset();
+  }
+  if (Message.operate_type == "clearOrder") {
+    youhuiReset();
+  }
+  if (
+    Message.type == "product" &&
+    Message.data_type == "product_update" &&
+    Message.operate_type == "product_update"
+  ) {
+    youhuiReset();
+  }
+  return Message;
+}
+let cartsSocket = null;
+cartStore.goodsInit();
+const socketInitPar = {
+  type: "shopping",
+  operate_type: "init",
+  table_code: uni.cache.get("tableCode"),
+  shop_id: uni.cache.get("shopId"),
+};
+
+function socketInit() {
+  cartsSocket = useWebSocket();
+  cartsSocket.connect(socketInitPar, onMessage);
+}
+const noPayStatus = {
+  cancelled: "订单已取消",
+  done: "订单已关闭",
+};
+
+function youhuiReset() {
+  listinfo.pointsDiscountAmount = 0;
+  listinfo.pointsNum = 0;
+  listinfo.pointsDiscountAmount = 0;
+  listinfo.Productroll = 0;
+  try {
+    orderInfoAfterRef.value?.IntegralInputclose();
+  } catch {}
+}
+
+// 结账管理
+import { Memberpay } from "@/stores/pay.js";
+
+const storeMemberpay = Memberpay();
+
+import { productStore } from "@/stores/user.js";
+const storeuser = productStore();
+
+import payPassword from "@/components/payPassword.vue";
+import orderInfo from "./components/orderInfo.vue";
+// import orderInfoBefore from '../components/orderInfoBefore.vue'
+import rechargeFree from "./components/rechargeFree.vue";
+import paymentMethodes from "@/components/paymentMethod.vue"; //支付方式
+import { onShow, onBackPress } from "@dcloudio/uni-app";
+import { onHide } from "@dcloudio/uni-app";
+// 输入支付密码
+const ispws = ref(false);
+let userInfo = uni.cache.get("userInfo");
+
+// 会员信息
+const orderVIP = ref(uni.cache.get("orderVIP"));
+// 商品订单关联的店铺信息
+const ordershopUserInfo = ref(uni.cache.get("shopInfo"));
+
+cartStore.updateData("orderVIP", orderVIP.value);
+cartStore.updateData("shopInfo", ordershopUserInfo.value);
+// 是否显示商家二维码信息
+const shopQrcode = ref(ordershopUserInfo.shopInfo || false);
+
+// 霸王餐
+const isBwc = ref(false);
+//是否显示霸王餐
+const showFreeDine = ref(false);
+
+//订单备注
+const orderRemarker = ref("");
+// 订单详情
+const listinfo = reactive({
+  combinedArray: [],
+  Productroll: 0,
+  coupondiscountAmount: 0,
+  pointsDiscountAmount: 0,
+  packFeess: 0,
+  totalPrices: 0,
+  Seatcharge: 0,
+  id: null,
+});
+
+//判断是否是打包商品
+const is_type = ref(0);
+//打包商品切换
+const istype = (newValue) => {
+  is_type.value = newValue;
+};
+//积分
+
+const freeCheck = ref(false);
+let backtimer = null;
+let historyTotalPrices = 0;
+// * 获取订单详情接口
+const orderorderInfo = async (isNpwGetOrderDetail = false) => {
+  console.log("listinfo.id", listinfo.id);
+
+  if (!listinfo.id && !options.tableCode) {
+    return;
+  }
+  if (!isNpwGetOrderDetail) {
+    if (isPayBefor() && !listinfo.id) {
+      return;
+    }
+  }
+
+  let res = listinfo.id
+    ? await APIgetOrderById({
+        orderId: listinfo.id,
+      })
+    : await APIhistoryOrder({
+        tableCode: options.tableCode || "",
+      });
+  orderRemarker.value = res.remark;
+  Object.assign(listinfo, res);
+  if (res && res.tableCode) {
+    socketInitPar.table_code = res.tableCode;
+    let tableRes = await getTableInfo({
+      tableCode: options.tableCode || "",
+    });
+    console.log(tableRes);
+    listinfo.tableName = tableRes.name;
+  } else {
+    if (options.tableCode) {
+      socketInitPar.table_code = options.tableCode;
+      let tableRes = await getTableInfo({
+        tableCode: options.tableCode || "",
+      });
+      console.log(tableRes);
+      listinfo.tableName = tableRes.name;
+    }
+  }
+  cartStore.setOldOrder(res);
+  socketInit();
+  console.log(res);
+
+  getOrderInfoAfterCalcInit(res);
+};
+
+//拿到订单数据后续初始化处理
+function getOrderInfoAfterCalcInit(res) {
+  console.log("getOrderInfoAfterCalcInit", res);
+  if (res && res.id) {
+    Object.assign(listinfo, res);
+    // 历史订单
+    if (listinfo.detailMap) {
+      let combinedArray = [];
+      for (const key in listinfo.detailMap) {
+        if (listinfo.detailMap.hasOwnProperty(key)) {
+          let subArray = listinfo.detailMap[key];
+          combinedArray = [...combinedArray, ...subArray];
+        }
+      }
+      listinfo.combinedArray = combinedArray;
+      listinfo.packFeess = cartStore.getTotalPackFee(listinfo.combinedArray);
+      // 计算购物车商品费用
+      historyTotalPrices =
+        cartStore.getTotalTotalPrices(listinfo.combinedArray, isBwc.value) * 1;
+
+      listinfo.totalPrices = historyTotalPrices + cartStore.totalPrice * 1;
+      // 餐位费listinfo.seatNum
+      listinfo.Seatcharge = cartStore.getTotalSeatcharge(listinfo.seatNum);
+    }
+    if (listinfo.discountInfo) {
+      const discountObj = JSON.parse(listinfo.discountInfo);
+      const tempArray = [];
+      for (const [key, value] of Object.entries(discountObj)) {
+        tempArray.push({
+          name: key,
+          amount: value,
+        });
+      }
+      listinfo.discountInfo = tempArray;
+    }
+    // 回填先质控
+    listinfo.pointsDiscountAmount = 0;
+    // console.log(listinfo)
+  } else {
+    listinfo.totalPrices = cartStore.totalPrice * 1;
+  }
+
+  // uni.showToast({
+  // 	title:'订单已取消或已付款',
+  // 	icon:'none'
+  // })
+  // backtimer=setTimeout(()=>{
+  // 	const arr=getCurrentPages()
+  // 	if(arr.length<=1){
+  // 		toJiacai()
+  // 	}else{
+  // 		uni.navigateBack({delta:1})
+  // 	}
+  // },1000)
+}
+
+const changeFree = (e) => {
+  if (JSON.stringify(e) == "{}") {
+    return;
+  }
+  isBwc.value = e;
+  console.log("changeFree", e);
+
+  // 支付方式切换
+  // #ifdef MP-WEIXIN
+  // #endif
+  // #ifdef MP-ALIPAY
+  // #endif
+};
+
+const saveImage = (url) => {
+  uni.saveImage({
+    url: url,
+    success: () => {
+      uni.showToast({
+        title: "保存成功",
+        icon: "none",
+      });
+    },
+  });
+};
+
+//
+const paymentMethodref = ref(null);
+const paymentmethod = ref({});
+// 支付方式
+// #ifdef MP-WEIXIN
+paymentmethod.value = {
+  name: "微信支付",
+  type: 2,
+  url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png",
+  payType: "wechatPay",
+};
+// #endif
+// #ifdef MP-ALIPAY
+paymentmethod.value = {
+  name: "支付宝支付",
+  type: 3,
+  url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/alipay.png",
+  payType: "aliPay",
+};
+// #endif
+
+const groupChange = async (e) => {
+  if (e == 5) {
+    return;
+  }
+  paymentmethod.value = e;
+};
+
+// 操作下单时候
+const orderInfoAfterRef = ref(null);
+
+//取消订单
+const cancelOrder = async () => {
+  uni.showModal({
+    title: "取消订单",
+    content: "是否取消订单？",
+    showCancel: true,
+    success: async (res) => {
+      if (res.confirm) {
+        await APIcancelOrder({
+          shopId: listinfo.shopId,
+          orderId: listinfo.id,
+        });
+        uni.showToast({
+          title: "取消订单成功",
+          icon: "none",
+        });
+        setTimeout(() => {
+          uni.pro.switchTab("order/index");
+        }, 1000);
+      }
+    },
+  });
+};
+
+// 删除订单
+const APIputuserorderclick = async () => {
+  await APIputuserorder(listinfo.id);
+  uni.showToast({
+    title: "删除成功",
+    icon: "none",
+  });
+  uni.pro.switchTab("order/index");
+};
+async function onlyCreateOrder() {
+  await createOrder();
+  orderorderInfo();
+}
+// 生成订单
+const createOrder = async () => {
+  // cartStore.carts = [];
+  const res = await storeMemberpay.actionscreateOrder({
+    dineMode: is_type.value == 0 ? "dine-in" : "take-out", //堂食 dine-in 外带 take-out 外卖 take-away
+    seatNum: uni.cache.get("dinersNum") ? uni.cache.get("dinersNum") : "", //用餐人数
+    // packFee: packFee.value, //打包费
+    packFee: packfee.value, //打包费
+    originAmount: shifu.value, //订单原金额（包含打包费） 不含折扣价格 不含餐位费
+    remark: orderRemarker.value, //备注
+    placeNum: listinfo.id ? listinfo.placeNum * 1 + 1 : 1, //当前订单下单次数
+    waitCall: "", //是否等叫 0 否 1 等叫
+    orderId: listinfo.id || "",
+    tableCode: options.tableCode || "",
+    userId: uni.cache.get("userInfo").id || "", //
+    limitRate:
+      cartStore.limitTimeDiscount && cartStore.limitTimeDiscount.id
+        ? {
+            id: cartStore.limitTimeDiscount.id,
+            discountRate: cartStore.limitTimeDiscount.discountRate,
+            discountPriority: cartStore.limitTimeDiscount.discountPriority,
+            foodType: cartStore.limitTimeDiscount.foodType,
+            foods: cartStore.limitTimeDiscount.foods,
+          }
+        : null,
+  });
+  // 清空购物车
+  if (res) {
+    Object.assign(listinfo, res);
+    // cartStore.setOldOrder(res)
+    getOrderInfoAfterCalcInit(res);
+
+    cartsSocket.sendMessage({
+      type: "shopping",
+      table_code: uni.cache.get("tableCode"),
+      shop_id: uni.cache.get("shopId"),
+      operate_type: "cleanup",
+    });
+    return res;
+  } else {
+    uni.showToast({
+      title: "生成订单失败",
+    });
+  }
+};
+
+function isPayBefor() {
+  return ordershopUserInfo.value.registerType == "before" ? true : false;
+}
+
+function pay_lock() {
+  cartsSocket.sendMessage({
+    ...socketInitPar,
+    operate_type: "pay_lock",
+  });
+}
+
+function pay_unlock() {
+  console.log("pay_unlock");
+  clearInterval(payStatusTimer);
+  cartsSocket.sendMessage({
+    ...socketInitPar,
+    operate_type: "pay_unlock",
+  });
+}
+async function search_pay_lock() {
+  cartsSocket.sendMessage({
+    ...socketInitPar,
+    operate_type: "search_pay_lock",
+  });
+  return new Promise((relove, reject) => {
+    cartsSocket.socketTask.onMessage((res) => {
+      relove(JSON.parse(res.data));
+    });
+  });
+}
+let payStatusTimer = null;
+let orderIsLock = true;
+
+function returnPayParams() {
+  const checkOrderPay = {
+    orderId: "",
+    vipPrice: cartStore.useVipPrice ? 1 : 0, //是否使用会员价0否1是
+    userAllPack: is_type.value == 0 ? 0 : 1, //是否整单打包
+    seatNum: is_type.value == 0 ? cartStore.seatFeeConfig.personCount : 0, //用餐人数
+    originAmount: cartStore.orderCostSummary.goodsRealAmount, //订单原金额（不包含打包费+餐位费）
+    discountRatio: 1, //折扣比例(计算时 向上取整保留 两位小数)   写死1
+    discountAmount: 0, //手动优惠金额  写死0
+    productCouponDiscountAmount:
+      cartStore.orderCostSummary.productCouponDeduction, //商品优惠券抵扣金额
+    otherCouponDiscountAmount: cartStore.orderCostSummary.fullCouponDeduction, //其他优惠券抵扣金额
+    couponList: cartStore.backendCoupons.map((v) => v.id), //用户使用的卡券
+    orderAmount: isBwc.value
+      ? cartStore.orderCostSummary.orderOriginFinalPayAmount
+      : cartStore.orderCostSummary.finalPayAmount, // 最终订单金额
+    roundAmount: 0, //抹零金额 减免多少钱
+    pointsDiscountAmount: cartStore.orderCostSummary.pointDeductionAmount, //积分抵扣金额(tb_points_basic_setting表)
+    pointsNum: cartStore.orderCostSummary.pointUsed, //(扣除各类折扣 enable_deduction后使用)
+    newCustomerDiscountAmount: cartStore.orderCostSummary.newUserDiscount, //新客立减
+    newCustomerDiscountId:
+      cartStore.orderCostSummary.newUserDiscount > 0
+        ? cartStore.consumeDiscount.id
+        : "",
+    remark: orderRemarker.value, //用户备注
+    discountActAmount: cartStore.orderCostSummary.fullReduction.actualAmount, //满减抵扣金额
+    discountActId: cartStore.orderCostSummary.fullReduction.usedActivity
+      ? cartStore.orderCostSummary.fullReduction.usedActivity.id
+      : null,
+    userId: uni.cache.get("userInfo").id || "", //
+    limitRate:
+      cartStore.limitTimeDiscount && cartStore.limitTimeDiscount.id
+        ? {
+            id: cartStore.limitTimeDiscount.id,
+            discountRate: cartStore.limitTimeDiscount.discountRate,
+            discountPriority: cartStore.limitTimeDiscount.discountPriority,
+            foodType: cartStore.limitTimeDiscount.foodType,
+            foods: cartStore.limitTimeDiscount.foods,
+          }
+        : null,
+    vipDiscountAmount: cartStore.orderCostSummary.vipDiscountAmount, //会员折扣减免金额
+  };
+  return {
+    isBwc: isBwc.value,
+    checkOrderPay,
+    payType: paymentmethod.value.payType,
+    buyerRemark: "",
+    returnUrl: "",
+    rechargeId: rechargeId.value,
+    rechargeDetailId: rechargeItem.value.id,
+    shopUserId: orderVIP.value.id,
+    shopId: orderVIP.value.shopId,
+    pwd: "",
+    userId: uni.cache.get("userInfo").id || "", //
+    discountActld: cartStore.orderCostSummary.fullReduction.usedActivity
+      ? cartStore.orderCostSummary.fullReduction.usedActivity.id
+      : "", //满减活动id
+  };
+}
+
+const istoricalorders = async () => {
+  const payParams = returnPayParams();
+
+  console.log("istoricalorders:payParams", payParams);
+  //先付
+  if (isPayBefor()) {
+    // 购物车有数据
+    if (!cartStore.isEmpty) {
+      const res = await createOrder();
+      //历史订单数据
+      const res1 = await APIgetOrderById({
+        orderId: res.id,
+      });
+      Object.assign(listinfo, res1);
+      orderRemarker.value = res1.remark;
+      cartStore.setOldOrder(res1);
+    }
+    goToPay(payParams);
+    // goToPay()
+  } else {
+    //后付
+
+    // 购物车有数据
+    if (!cartStore.isEmpty) {
+      const res = await createOrder();
+      //历史订单数据
+      const res1 = await APIgetOrderById({
+        orderId: res.id,
+      });
+      Object.assign(listinfo, res1);
+
+      orderRemarker.value = res1.remark;
+      cartStore.setOldOrder(res1);
+      goToPay(payParams);
+      return;
+    }
+    // 先调用历史订单
+    let APIhistoryOrderres = await APIhistoryOrder({
+      tableCode: listinfo.tableCode,
+    });
+    // 判断是否有历史订单
+    if (APIhistoryOrderres.detailMap) {
+      let combinedArray = [];
+      for (const key in APIhistoryOrderres.detailMap) {
+        if (APIhistoryOrderres.detailMap.hasOwnProperty(key)) {
+          let subArray = APIhistoryOrderres.detailMap[key];
+          combinedArray = [...combinedArray, ...subArray];
+        }
+      }
+      // 判断支付之前是是否还有新加订单
+      if (listinfo.combinedArray.length === combinedArray.length) {
+        goToPay(payParams);
+      } else {
+        uni.showToast({
+          title: "你的订单已更新！",
+          icon: "none",
+        });
+        orderorderInfo();
+      }
+    } else {
+      uni.showToast({
+        title: "你的小伙伴已提交订单~",
+        icon: "none",
+      });
+      setTimeout(() => {
+        orderorderInfo();
+      }, 1000);
+    }
+  }
+};
+
+//开始锁单
+function start_lock_order() {
+  clearInterval(payStatusTimer);
+  pay_lock();
+  payStatusTimer = setInterval(() => {
+    pay_lock();
+  }, 1000);
+}
+
+// * 去支付
+const goToPay = async (payParams) => {
+  console.log("goToPay:payParams", payParams);
+
+  const canPayRes = await search_pay_lock();
+  const canPay = canPayRes.status == 1 ? true : false;
+  if (!canPay) {
+    uni.showToast({
+      title: "有人正在付款中！",
+      icon: "none",
+    });
+    const shopUserInfo = uni.cache.get("shopUserInfo");
+    console.log("shopUserInfo", shopUserInfo);
+    console.log("listinfo", listinfo);
+    if (shopUserInfo) {
+      if (shopUserInfo.userId == listinfo.userId) {
+        pay_unlock();
+      }
+    }
+    return;
+  }
+  
+  // 余额支付
+  if (payParams.payType == "accountPay") {
+    console.log("orderVIP.value", orderVIP.value);
+    if (orderVIP.value.payPwd == "" &&userInfo.usePayPwd) {
+      uni.showModal({
+        title: "提示",
+        content: "您还未设置支付密码，是否去设置？",
+        success: (res) => {
+          if (res.confirm) {
+            uni.pro.navigateTo("user/member/setPassword", {
+              shopId: orderVIP.value.shopId,
+              type: "detail",
+            });
+          } else if (res.cancel) {
+            console.log("用户点击取消");
+          }
+        },
+      });
+      return;
+    }
+    start_lock_order();
+    if (userInfo.usePayPwd) {
+      ispws.value = true;
+      return;
+    }
+    accountPayevent();
+    return;
+  }
+  console.log("canPay:goToPay:payParams", payParams);
+
+  start_lock_order();
+
+  console.log("霸王餐前payParams", payParams);
+  if (payParams.isBwc) {
+    payParams.checkOrderPay.orderId = listinfo.id;
+    console.log("霸王餐支付参数：", payParams);
+    try {
+      const isPaySuccess = await storeMemberpay.actionspayltPayVip({
+        ...payParams,
+        shopId: orderVIP.value.shopId,
+        shopUserId: orderVIP.value.id,
+        orderId: listinfo.id,
+        userAllPack: is_type.value == 0 ? 0 : 1, //是否整单打包
+        amount: cartStore.orderCostSummary.finalPayAmount, // 最终订单金额
+        orderAmount: cartStore.orderCostSummary.orderOriginFinalPayAmount, // 最终订单原金额
+        originAmount: cartStore.orderCostSummary.goodsRealAmount, //订单原金额（不包含打包费+餐位费）
+
+        returnUrl: "", //跳转地址
+        buyerRemark: "",
+        seatNum: is_type.value == 0 ? cartStore.seatFeeConfig.personCount : 0, //用餐人数
+      });
+      if (isPaySuccess) {
+        paySucessCallback();
+        orderorderInfo();
+        pay_unlock();
+      }
+    } catch (error) {
+      console.log("error", error);
+      pay_unlock();
+    }
+
+    return false;
+  } else {
+    payParams.checkOrderPay.orderId = listinfo.id;
+    try {
+      if (rechargeItem.value.id && rechargeId.value) {
+        //充值并且支付
+        const payRes = await rechargePayOrder(payParams);
+        const isPaySuccess = await pay(payRes);
+        if (isPaySuccess) {
+          paySucessCallback();
+        }
+        pay_unlock();
+      } else {
+        console.log("微信支付");
+        const isPaySuccess = await storeMemberpay.actionsltPayOrder(payParams);
+        if (isPaySuccess) {
+          paySucessCallback();
+        }
+      }
+    } catch (error) {
+      console.log("error", error);
+      pay_unlock();
+      //TODO handle the exception
+    }
+  }
+  pay_unlock();
+  console.log("orderorderInfo");
+  orderorderInfo();
+};
+
+//
+const clickPointsamount = (Pointsamount) => {
+  listinfo.pointsDiscountAmount = Pointsamount.pointsDiscountAmount;
+  listinfo.pointsNum = Pointsamount.pointsNum;
+};
+
+const payPasswordref = ref(null);
+// 余额支付
+const accountPayevent = async (pwd) => {
+  console.log("账户支付", pwd);
+  if (JSON.stringify(pwd) === "{}") {
+    return;
+  }
+  const payParams = returnPayParams();
+  ispws.value = false;
+  payParams.checkOrderPay.userId = uni.cache.get("userInfo").id;
+  payParams.checkOrderPay.orderId = listinfo.id;
+  payParams.pwd = pwd;
+  try {
+    const isPaySuccess = await storeMemberpay.balancePayOrder(payParams);
+    if (isPaySuccess) {
+      uni.showToast({
+        title: "支付成功",
+        icon: "none",
+      });
+      pay_unlock();
+
+      paySucessCallback();
+    }
+  } catch (error) {
+    //TODO handle the exception
+    pay_unlock();
+  }
+  orderorderInfo();
+};
+
+onBeforeUnmount(() => {
+  clearTimeout(backtimer);
+  clearInterval(payStatusTimer);
+  closeSocket();
+});
+onHide(() => {
+  closeSocket();
+  clearInterval(payStatusTimer);
+});
+
+function closeSocket() {
+  // cartsSocket.closeExistingConnection()
+}
+
+onShow(() => {
+  userInfo = uni.cache.get("userInfo");
+  if (cartsSocket) {
+    cartsSocket.connect();
+  }
+  try {
+    // 更新数据
+    if (orderVIP.value) {
+      orderVIP.value = uni.cache.get("orderVIP");
+      paymentMethodref.value.orderVIPfun(uni.cache.get("orderVIP"));
+      if (listinfo.id && ordershopUserInfo.value.registerType != "before") {
+        orderorderInfo();
+      }
+    }
+  } catch (error) {
+    //TODO handle the exception
+  }
+
+  orderorderInfo();
+  uni.$off("selCoupon");
+  uni.$on("selCoupon", function (data) {
+    console.log("selCoupon", data);
+    cartStore.setCoupons(_.cloneDeep(data));
+  });
+});
+let options = {};
+
+// 跳转到加菜页面
+function toJiacai() {
+  console.log("跳转到加菜页面");
+  back();
+}
+const packfee = computed(() => {
+  return cartStore.orderCostSummary.packFee;
+});
+//不计算各种折扣前的实付金额
+const shifu = computed(() => {
+  const payAmount = listinfo.payAmount ? listinfo.payAmount * 1 : 0;
+  return payAmount + cartStore.totalPrice * 1 + packfee.value * 1;
+});
+//减去各种折扣后的金额
+const lastPayMoney = computed(() => {
+  return shifu.value * 1;
+});
+
+const payStatus = {
+  unpaid: "待支付",
+  done: "已完成",
+  refund: "已退款",
+  "part-refund": "部分退款",
+  cancelled: "已取消",
+};
+const navTitle = computed(() => {
+  if (!listinfo.id && !cartStore.isEmpty) {
+    return "待确认";
+  }
+  if (cartStore.isEmpty && listinfo.id) {
+    return payStatus[listinfo.status] || "待确认";
+  } else {
+    return "待确认";
+  }
+});
+
+//支付成功后的处理
+function paySucessCallback() {
+  console.log("paySucessCallback");
+  cartsSocket.closeSocket();
+  showDrainage.value = true;
+}
+
+//私域引流配置
+const drainageConfig = ref({});
+//私域引流弹窗
+const showDrainage = ref(false);
+async function init(opt) {
+  await storeuser.actionsproductqueryProduct();
+
+  console.log("init");
+  cartStore.clearOrderConfig();
+  Object.assign(options, opt);
+  listinfo.id = options.orderId;
+  console.log("options", options);
+  if (options.shopId) {
+    // 每次进来全局更新shopId
+    uni.cache.set("shopId", options.shopId, 30);
+  }
+  //如果已经生成订单，根据历史订信息设置相关配置
+  if (options.orderId) {
+    let res = await APIgetOrderById({
+      orderId: listinfo.id,
+    });
+    if (res) {
+      uni.cache.set("tableCode", res.tableCode);
+      uni.cache.set("tableCode", res.seatNum);
+      options.tableCode = res.tableCode || "";
+      cartStore.setSeatFeeConfig("personCount", res.seatNum);
+      cartStore.setDinnerType(res.dineMode || "dine-in");
+      cartStore.setOldOrder(res);
+      if (res.limitRate) {
+        cartStore.limitTimeDiscount = res.limitRate;
+      }
+      orderRemarker.value = res.remark;
+      Object.assign(listinfo, res);
+    }
+  }
+  //获取店铺信息
+  const shopInfoRes = await APIusershopInfodetail({
+    shopId: options.shopId,
+  });
+  if (shopInfoRes) {
+    cartStore.shopInfo = shopInfoRes.shopInfo;
+  }
+  await cartStore.goodsInit();
+  // * 获取会员信息
+  await nextTick();
+
+  orderVIP.value = uni.cache.get("orderVIP");
+  cartStore.freeDineConfig = orderVIP.value.freeDineConfig;
+  const shopUserInfo = uni.cache.get("shopUserInfo");
+  cartStore.shopUserInfo = shopUserInfo;
+  if (options.tableCode) {
+    socketInitPar.table_code = options.tableCode;
+    socketInit();
+  } else {
+    orderorderInfo();
+  }
+}
+onLoad((opt) => {
+  init(opt);
+});
+
+watch(
+  () => cartStore.orderCostSummary.orderOriginFinalPayAmount,
+  (newval) => {
+    console.log(
+      "cartStore.orderCostSummary.orderOriginFinalPayAmount",
+      orderVIP.value
+    );
+    if (JSON.stringify(orderVIP.value) == "{}") {
+      return;
+    }
+    if (!orderVIP.value) {
+      return;
+    }
+    if (
+      !orderVIP.value.freeDineConfig ||
+      !orderVIP.value.freeDineConfig.enable
+    ) {
+      //未开始霸王餐后面代码不执行
+      isBwc.value = false;
+      showFreeDine.value = false;
+      return;
+    }
+
+    const bwc_fullaniunt_money =
+      newval + cartStore.orderCostSummary.fullReduction.actualAmount;
+    if (
+      bwc_fullaniunt_money <= 0 ||
+      bwc_fullaniunt_money < orderVIP.value.freeDineConfig.rechargeThreshold
+    ) {
+      isBwc.value = false;
+      showFreeDine.value = false;
+      return;
+    }
+
+    if (
+      (listinfo.status == "unpaid" || !listinfo.id) &&
+      orderVIP.value.freeDineConfig.enable &&
+      bwc_fullaniunt_money >= orderVIP.value.freeDineConfig.rechargeThreshold
+    ) {
+      showFreeDine.value = true;
+    }
+  },
+  {
+    immediate: true,
+  }
+);
+
+watch(
+  () => isBwc.value,
+  (newval) => {
+    cartStore.isFreeDine = newval;
+  }
+);
+
+const disablePayType = computed(() => {
+  const arr = new Set([]);
+  if (isBwc.value) {
+    if (cartStore.orderCostSummary.orderOriginFinalPayAmount <= 0) {
+      arr.add("微信支付");
+    } else {
+      arr.add("余额支付");
+    }
+  }
+  if (cartStore.orderCostSummary.orderOriginFinalPayAmount <= 0) {
+    arr.add("微信支付");
+  }
+
+  //充值并付款时只能微信支付
+  if (rechargeItem.value.id) {
+    arr.add("余额支付");
+  }
+  if (!orderVIP.value || !orderVIP.value.amount) {
+    arr.add("余额支付");
+  }
+  if (orderVIP.value) {
+    if (
+      orderVIP.value.amount <
+      cartStore.orderCostSummary.orderOriginFinalPayAmount
+    ) {
+      arr.add("余额支付");
+    }
+  }
+
+  // if (cartStore.orderCostSummary.orderOriginFinalPayAmount <= 0) {
+  //   arr.add("微信支付");
+  // }
+  if (!isCanUseCharge.value) {
+    arr.add("余额支付");
+  }
+
+  return Array.from(arr);
+});
 </script>
 
 <style lang="scss">
-	page {
-		background-color: #F7F7F7;
-	}
-
-	.container {
-		padding: 32rpx 28rpx 32rpx 28rpx;
-	}
-
-	.headStatus {
-		display: flex;
-		flex-direction: column;
-		margin-bottom: 32rpx;
-		align-items: center;
-
-		.status {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			font-weight: bold;
-			font-size: 36rpx;
-			color: #333333;
-
-			.statusName {
-				margin-left: 16rpx;
-			}
-		}
-
-		.time {
-			font-weight: 400;
-			font-size: 24rpx;
-			color: #999999;
-			margin-top: 18rpx;
-		}
-	}
-
-	.wxQrcode {
-		background: #FFFFFF;
-		border-radius: 18rpx 18rpx 18rpx 18rpx;
-		padding: 32rpx 24rpx;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #999999;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin-bottom: 32rpx;
-
-		.left {
-			display: flex;
-			flex-direction: column;
-		}
-
-		.title {
-			font-weight: bold;
-			font-size: 28rpx;
-			color: #333333;
-			margin-bottom: 16rpx;
-		}
-	}
-
-	.card_box {
-		background-color: #fff;
-		// box-shadow: 0rpx 8rpx 12rpx 2rpx rgba(87,86,86,0.35);
-		position: relative;
-		width: 100%;
-		height: 100%;
-		// box-shadow: 0rpx 4rpx 12rpx 2rpx rgba(87, 86, 86, 0.35);
-		border-radius: 18rpx;
-
-		.card_head_box {
-			width: 100%;
-			display: flex;
-			justify-content: space-between;
-			position: absolute;
-			top: -22.5rpx;
-			padding: 0 44rpx;
-
-			.card_head_item {
-				width: 45rpx;
-				height: 45rpx;
-				background-color: #f9f9f9;
-				border-radius: 50%;
-				box-shadow: inset 0rpx -13rpx 18rpx -16rpx rgba(87, 86, 86, 0.35);
-			}
-
-		}
-	}
-
-	.card {
-		// background-color: #fff;
-		border-radius: 20upx;
-		margin-bottom: 28upx;
-		position: relative;
-
-		.head {
-			display: flex;
-			justify-content: space-between;
-			padding: 50rpx 0 32rpx 0;
-			border-bottom: 2rpx dashed #E3E3E3;
-
-			.head_left {
-				.shopName {
-					font-weight: bold;
-					font-size: 32rpx;
-					color: #333333;
-				}
-
-				.tableName {
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #333333;
-				}
-			}
-
-			.status {
-				text {
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #333333;
-				}
-			}
-		}
-
-		.number-wrap {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			margin-top: 32rpx;
-
-			.t {
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #333333;
-			}
-
-			.number {
-				font-weight: bold;
-				font-size: 56rpx;
-				color: #333333;
-			}
-		}
-
-
-		.price {
-			.i {
-				font-size: 20upx;
-			}
-
-			.num {
-				font-size: 38upx;
-			}
-		}
-
-		.shop-box {
-			padding: 36rpx 34rpx 30rpx 34rpx;
-			border-bottom: 2rpx dashed #E3E3E3;
-
-			.shop-head {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-
-				.shop-head-left {
-					display: flex;
-					align-items: center;
-
-					.tag-wrap {
-						width: 80rpx;
-						height: 48rpx;
-						background: #FFFFFF;
-						border-radius: 10rpx 10rpx 10rpx 10rpx;
-						border: 2rpx solid #E3AD7F;
-						margin-right: 18rpx;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-
-						.tag {
-							font-weight: 400;
-							font-size: 24rpx;
-							color: #E3AD7F;
-						}
-					}
-
-					.title {
-						font-weight: bold;
-						font-size: 28rpx;
-						color: #333333;
-					}
-
-				}
-			}
-
-			.shop-info {
-				margin-top: 32rpx;
-
-				.item:nth-child(1) {
-					margin-top: 0;
-				}
-
-				.item {
-					padding: 32rpx 0 !important;
-					display: flex;
-
-					.cover {}
-
-					.info {
-						flex: 1;
-						display: flex;
-						flex-direction: column;
-						padding-left: 16upx;
-
-						.productName {
-							font-weight: bold;
-							font-size: 28rpx;
-							color: #333333;
-							margin-top: 20rpx;
-						}
-
-						.productSkuName {
-							font-weight: 400;
-							font-size: 24rpx;
-							color: #999999;
-							display: -webkit-box;
-							-webkit-box-orient: vertical;
-							-webkit-line-clamp: 3;
-							overflow: hidden;
-							text-overflow: ellipsis;
-						}
-
-						.n {
-							font-size: 24upx;
-							color: #999;
-						}
-					}
-
-					.price {
-						display: flex;
-						flex-direction: column;
-						align-items: flex-end;
-						padding-left: 68rpx;
-
-						.priceAmount {
-							font-weight: 500;
-							font-size: 28rpx;
-							color: #333333;
-							margin-top: 26rpx;
-						}
-
-						.num {
-							font-weight: 400;
-							font-size: 24rpx;
-							color: #999999;
-							margin-top: 22rpx;
-						}
-					}
-				}
-			}
-
-			.total-wrap {
-				width: 100%;
-				display: flex;
-				justify-content: space-between;
-				font-weight: 500;
-				font-size: 28rpx;
-
-				.price {
-					font-weight: bold;
-					font-size: 32rpx;
-				}
-			}
-		}
-
-
-
-		.order_footer {
-			display: flex;
-			flex-direction: column;
-			padding: 34rpx;
-			position: relative;
-
-			.order_footer_icon {
-				width: 100%;
-				position: absolute;
-				top: -22.5rpx;
-				left: 0;
-				display: flex;
-				justify-content: space-between;
-
-				.order_footer_left_icon {
-					width: 45rpx;
-					height: 45rpx;
-					margin-left: -22.5rpx;
-					background-color: #f9f9f9;
-					border-radius: 50%;
-					box-shadow: inset -20rpx 0rpx 22rpx -20rpx rgba(87, 86, 86, 0.35);
-
-				}
-
-				.order_footer_right_icon {
-					width: 45rpx;
-					height: 45rpx;
-					margin-right: -22.5rpx;
-					background-color: #f9f9f9;
-					border-radius: 50%;
-					box-shadow: inset 13rpx 0rpx 16rpx -9rpx rgba(87, 86, 86, 0.35);
-
-				}
-			}
-
-			.title {
-				font-weight: bold;
-				font-size: 28rpx;
-				color: #333333;
-			}
-
-			.order-info {
-				.row {
-					display: flex;
-					justify-content: space-between;
-					padding-top: 32upx;
-
-					.t {
-						font-weight: normal;
-						font-size: 28rpx;
-						color: #333333;
-					}
-
-					.info {
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #666666;
-					}
-				}
-			}
-		}
-
-
-	}
-
-	.pay-info-wrap {
-		padding: 0;
-		box-sizing: border-box;
-
-		.info-wrap {
-			padding: 64rpx 30rpx 30rpx 30rpx;
-			box-sizing: border-box;
-
-			.title {
-				align-self: center;
-				font-size: 32rpx;
-				color: #333;
-				font-weight: bold;
-			}
-		}
-
-		.info-content {
-			.pay-title {
-				display: flex;
-				align-items: flex-end;
-				justify-content: center;
-				font-weight: bold;
-				width: 100%;
-				font-size: 48rpx;
-				color: #333;
-				margin-top: 48rpx;
-
-				text {
-					font-size: 60rpx;
-					color: #333;
-				}
-			}
-
-			.pay-password {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				margin-top: 64rpx;
-
-				.list {
-					width: 88rpx;
-					height: 88rpx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					border: 2rpx solid #999;
-					border-radius: 8rpx;
-
-					text {
-						font-size: 32rpx;
-					}
-				}
-
-			}
-
-			.hint {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				width: 100%;
-				height: 100rpx;
-
-				text {
-					font-size: 28rpx;
-					color: #ccc;
-				}
-			}
-		}
-
-	}
-
-	.fixedview {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		width: 100%;
-		z-index: 999;
-
-		// height: 80rpx;
-		.flex-between {
-			width: 100%;
-			padding: 36rpx 36rpx 70rpx 36rpx;
-			background: #FFFFFF;
-
-			.fixedview_one {
-				display: flex;
-				align-items: flex-end;
-
-				.fixedview_oneone {
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #666666;
-				}
-
-				.fixedview_onetow {
-					font-weight: bold;
-					font-size: 32rpx;
-					color: #333333;
-
-					text {
-						font-size: 24rpx;
-					}
-				}
-			}
-
-			.flex-colum-end {
-				.fixedview_tow {
-					background: #E3AD7F;
-					border-radius: 36rpx;
-					font-weight: 400;
-					font-size: 32rpx;
-					color: #FFFFFF;
-					padding: 14rpx 44rpx;
-				}
-
-				.fixedview_tows {
-					margin-top: 10rpx;
-					background: #c3c3c3;
-					border-radius: 36rpx;
-					font-weight: 400;
-					font-size: 32rpx;
-					color: #FFFFFF;
-					padding: 14rpx 44rpx;
-				}
-			}
-
-		}
-	}
-
-	.orderInfo {
-		background: #FFFFFF;
-		border-radius: 18rpx 18rpx 18rpx 18rpx;
-		margin-top: 32rpx;
-		padding: 32rpx 34rpx;
-
-		.t {
-			font-weight: bold;
-			font-size: 28rpx;
-			color: #333333;
-			flex-shrink: 0;
-		}
-
-		.info {
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #666666;
-		}
-
-	}
+page {
+  background-color: #f7f7f7;
+}
+
+.container {
+  padding: 32rpx 28rpx 32rpx 28rpx;
+}
+
+.headStatus {
+  display: flex;
+  flex-direction: column;
+  margin-bottom: 32rpx;
+  align-items: center;
+
+  .status {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-weight: bold;
+    font-size: 36rpx;
+    color: #333333;
+
+    .statusName {
+      margin-left: 16rpx;
+    }
+  }
+
+  .time {
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #999999;
+    margin-top: 18rpx;
+  }
+}
+
+.wxQrcode {
+  background: #ffffff;
+  border-radius: 18rpx 18rpx 18rpx 18rpx;
+  padding: 32rpx 24rpx;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #999999;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 32rpx;
+
+  .left {
+    display: flex;
+    flex-direction: column;
+  }
+
+  .title {
+    font-weight: bold;
+    font-size: 28rpx;
+    color: #333333;
+    margin-bottom: 16rpx;
+  }
+}
+
+.card_box {
+  background-color: #fff;
+  // box-shadow: 0rpx 8rpx 12rpx 2rpx rgba(87,86,86,0.35);
+  position: relative;
+  width: 100%;
+  height: 100%;
+  // box-shadow: 0rpx 4rpx 12rpx 2rpx rgba(87, 86, 86, 0.35);
+  border-radius: 18rpx;
+
+  .card_head_box {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    position: absolute;
+    top: -22.5rpx;
+    padding: 0 44rpx;
+
+    .card_head_item {
+      width: 45rpx;
+      height: 45rpx;
+      background-color: #f9f9f9;
+      border-radius: 50%;
+      box-shadow: inset 0rpx -13rpx 18rpx -16rpx rgba(87, 86, 86, 0.35);
+    }
+  }
+}
+
+.card {
+  // background-color: #fff;
+  border-radius: 20upx;
+  margin-bottom: 28upx;
+  position: relative;
+
+  .head {
+    display: flex;
+    justify-content: space-between;
+    padding: 50rpx 0 32rpx 0;
+    border-bottom: 2rpx dashed #e3e3e3;
+
+    .head_left {
+      .shopName {
+        font-weight: bold;
+        font-size: 32rpx;
+        color: #333333;
+      }
+
+      .tableName {
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #333333;
+      }
+    }
+
+    .status {
+      text {
+        font-weight: 500;
+        font-size: 28rpx;
+        color: #333333;
+      }
+    }
+  }
+
+  .number-wrap {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin-top: 32rpx;
+
+    .t {
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #333333;
+    }
+
+    .number {
+      font-weight: bold;
+      font-size: 56rpx;
+      color: #333333;
+    }
+  }
+
+  .price {
+    .i {
+      font-size: 20upx;
+    }
+
+    .num {
+      font-size: 38upx;
+    }
+  }
+
+  .shop-box {
+    padding: 36rpx 34rpx 30rpx 34rpx;
+    border-bottom: 2rpx dashed #e3e3e3;
+
+    .shop-head {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .shop-head-left {
+        display: flex;
+        align-items: center;
+
+        .tag-wrap {
+          width: 80rpx;
+          height: 48rpx;
+          background: #ffffff;
+          border-radius: 10rpx 10rpx 10rpx 10rpx;
+          border: 2rpx solid #e3ad7f;
+          margin-right: 18rpx;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+
+          .tag {
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #e3ad7f;
+          }
+        }
+
+        .title {
+          font-weight: bold;
+          font-size: 28rpx;
+          color: #333333;
+        }
+      }
+    }
+
+    .shop-info {
+      margin-top: 32rpx;
+
+      .item:nth-child(1) {
+        margin-top: 0;
+      }
+
+      .item {
+        padding: 32rpx 0 !important;
+        display: flex;
+
+        .cover {
+        }
+
+        .info {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          padding-left: 16upx;
+
+          .productName {
+            font-weight: bold;
+            font-size: 28rpx;
+            color: #333333;
+            margin-top: 20rpx;
+          }
+
+          .productSkuName {
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #999999;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 3;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+
+          .n {
+            font-size: 24upx;
+            color: #999;
+          }
+        }
+
+        .price {
+          display: flex;
+          flex-direction: column;
+          align-items: flex-end;
+          padding-left: 68rpx;
+
+          .priceAmount {
+            font-weight: 500;
+            font-size: 28rpx;
+            color: #333333;
+            margin-top: 26rpx;
+          }
+
+          .num {
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #999999;
+            margin-top: 22rpx;
+          }
+        }
+      }
+    }
+
+    .total-wrap {
+      width: 100%;
+      display: flex;
+      justify-content: space-between;
+      font-weight: 500;
+      font-size: 28rpx;
+
+      .price {
+        font-weight: bold;
+        font-size: 32rpx;
+      }
+    }
+  }
+
+  .order_footer {
+    display: flex;
+    flex-direction: column;
+    padding: 34rpx;
+    position: relative;
+
+    .order_footer_icon {
+      width: 100%;
+      position: absolute;
+      top: -22.5rpx;
+      left: 0;
+      display: flex;
+      justify-content: space-between;
+
+      .order_footer_left_icon {
+        width: 45rpx;
+        height: 45rpx;
+        margin-left: -22.5rpx;
+        background-color: #f9f9f9;
+        border-radius: 50%;
+        box-shadow: inset -20rpx 0rpx 22rpx -20rpx rgba(87, 86, 86, 0.35);
+      }
+
+      .order_footer_right_icon {
+        width: 45rpx;
+        height: 45rpx;
+        margin-right: -22.5rpx;
+        background-color: #f9f9f9;
+        border-radius: 50%;
+        box-shadow: inset 13rpx 0rpx 16rpx -9rpx rgba(87, 86, 86, 0.35);
+      }
+    }
+
+    .title {
+      font-weight: bold;
+      font-size: 28rpx;
+      color: #333333;
+    }
+
+    .order-info {
+      .row {
+        display: flex;
+        justify-content: space-between;
+        padding-top: 32upx;
+
+        .t {
+          font-weight: normal;
+          font-size: 28rpx;
+          color: #333333;
+        }
+
+        .info {
+          font-weight: 400;
+          font-size: 24rpx;
+          color: #666666;
+        }
+      }
+    }
+  }
+}
+
+.pay-info-wrap {
+  padding: 0;
+  box-sizing: border-box;
+
+  .info-wrap {
+    padding: 64rpx 30rpx 30rpx 30rpx;
+    box-sizing: border-box;
+
+    .title {
+      align-self: center;
+      font-size: 32rpx;
+      color: #333;
+      font-weight: bold;
+    }
+  }
+
+  .info-content {
+    .pay-title {
+      display: flex;
+      align-items: flex-end;
+      justify-content: center;
+      font-weight: bold;
+      width: 100%;
+      font-size: 48rpx;
+      color: #333;
+      margin-top: 48rpx;
+
+      text {
+        font-size: 60rpx;
+        color: #333;
+      }
+    }
+
+    .pay-password {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-top: 64rpx;
+
+      .list {
+        width: 88rpx;
+        height: 88rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border: 2rpx solid #999;
+        border-radius: 8rpx;
+
+        text {
+          font-size: 32rpx;
+        }
+      }
+    }
+
+    .hint {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 100%;
+      height: 100rpx;
+
+      text {
+        font-size: 28rpx;
+        color: #ccc;
+      }
+    }
+  }
+}
+
+.fixedview {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  z-index: 999;
+
+  // height: 80rpx;
+  .flex-between {
+    width: 100%;
+    padding: 36rpx 36rpx 70rpx 36rpx;
+    background: #ffffff;
+
+    .fixedview_one {
+      display: flex;
+      align-items: flex-end;
+
+      .fixedview_oneone {
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #666666;
+      }
+
+      .fixedview_onetow {
+        font-weight: bold;
+        font-size: 32rpx;
+        color: #333333;
+
+        text {
+          font-size: 24rpx;
+        }
+      }
+    }
+
+    .flex-colum-end {
+      .fixedview_tow {
+        background: #e3ad7f;
+        border-radius: 36rpx;
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #ffffff;
+        padding: 14rpx 44rpx;
+      }
+
+      .fixedview_tows {
+        margin-top: 10rpx;
+        background: #c3c3c3;
+        border-radius: 36rpx;
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #ffffff;
+        padding: 14rpx 44rpx;
+      }
+    }
+  }
+}
+
+.orderInfo {
+  background: #ffffff;
+  border-radius: 18rpx 18rpx 18rpx 18rpx;
+  margin-top: 32rpx;
+  padding: 32rpx 34rpx;
+
+  .t {
+    font-weight: bold;
+    font-size: 28rpx;
+    color: #333333;
+    flex-shrink: 0;
+  }
+
+  .info {
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #666666;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/pages/order/coupon.vue b/pages/order/coupon.vue
index 60c5b3b..2dbba3c 100644
--- a/pages/order/coupon.vue
+++ b/pages/order/coupon.vue
@@ -1,7 +1,7 @@
 <template>
-	<view class="container">
-		<view class="header-wrap">
-			<!-- <view class="search-wrap">
+  <view class="container">
+    <view class="header-wrap">
+      <!-- <view class="search-wrap">
 				<view class="input-wrap">
 					<view class="icon left">
 						<u-icon name="search" size="26"></u-icon>
@@ -15,397 +15,514 @@
 					<input v-model="querForm.shopName" class="ipt right" type="text" placeholder="请选择" disabled />
 				</view>
 			</view> -->
-			<view class="status-wrap">
-				<view class="item" :class="{ active: querForm.statusActiveIndex == 0 }" @click="tabChange(0)">
-					<text class="t">商品兑换券 {{ returnSelNumber(0) }}</text>
-				</view>
-				<view class="item" :class="{ active: querForm.statusActiveIndex == 1 }" @click="tabChange(1)">
-					<text class="t">折扣优惠券{{ returnSelNumber(1) }}</text>
-				</view>
+      <view class="status-wrap">
+        <view
+          class="item"
+          :class="{ active: querForm.statusActiveIndex == 0 }"
+          @click="tabChange(0)"
+        >
+          <text class="t">商品兑换券 {{ returnSelNumber(0) }}</text>
+        </view>
+        <view
+          class="item"
+          :class="{ active: querForm.statusActiveIndex == 1 }"
+          @click="tabChange(1)"
+        >
+          <text class="t">折扣优惠券{{ returnSelNumber(1) }}</text>
+        </view>
 
-				<view class="icon-wrap" :style="{ width: `${100 / statusList.length}%`, left: `${(100 / statusList.length) * querForm.statusActiveIndex}%` }">
-					<image
-						class="active-icon"
-						src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAMCAYAAAB4MH11AAACKUlEQVR4AaRTS2sTURT+MpkxUzNtRpuYpBsrqbgQH6BYRHGllloQN+5cuNeV6MKfoj9BwYUgIsXHRqE+SluliFLbBqmENJNMMpMm87qecw1NglJse+HMPeee833nce8oIgpFq7wsGt/fCb9eFrtdfmNd1L+9Jc4Vog6E4jcqqM0/R+3zNOwv09jtshdfSx7mDJwKqAMfIvAAEaFVWkLgWjvOEbVdtNa+Epf4wxmFUNTkfqiDGUkqogDu8icKiKS9nQ9jnR8fqM5AwuJJE/G9JhRF05E8dAqIKeDlrsyiWVxg9f+Fum+uzsFZmtnEGIVxKHsGIFn1bAF6ZlQ6I28D9uIrmYSrkodbfETgw6GubZo9Yzk0kR4Fc7IuE8QUFebJKSTSB/kM4UYd1scnKL18QInm4Vk/6W6qiNoOwpZDuoX2elFWXHrzELW5Z+RzJVbPHca+09doIKq0ZQLW+C44iWbm2ZQSNMqozj5F5f1jWCSVGd4fwerstYUXCOplGcsfxponJqHS7Nlm2UyAWAza0AFkzt1A6uhFqEYaoHsR9BLCpg2vukZVr5IU4dV+yU7oRikkTrHDMI9PIHPhJrhQ9Kxugs6hkkhi8Mh5DI9flyCep6ImOt7uxnF6dgypYxMy1hg7S0/yH3FdSL+mpbIw6CVwVSNX7yM/eQfZS7eQu3wb+St3MTJ1D2nq1iicgZbK9YN7rL866PH1qfGBIWj0v/Do4rrR59vK+A0AAP//GfTndQAAAAZJREFUAwCu+SjIaSGpLwAAAABJRU5ErkJggg=="
-					></image>
-				</view>
-			</view>
-		</view>
-		<view class="list-wrap">
-			<view class="tips">
-				<text class="t">使用商品兑换券的商品，不再计入同享优惠券门槛和折扣计算。</text>
-			</view>
-			<view class="title-wrap">
-				<text class="t">可用红包</text>
-				<text class="n">{{ list.canUseCoupons.length }}张</text>
-			</view>
-			<view class="item" v-for="item in list.canUseCoupons" :key="item.id" @click="changeSelCoupon(item)">
-				<view class="top">
-					<view class="icon">
-						<couponIcon :item="item" />
-					</view>
-					<view class="info">
-						<view class="view name">
-							<text class="t">{{ item.name }}</text>
-						</view>
-						<view class="view time">
-							<text class="t">{{ dayjs(item.effectStartTime).format('YYYY.M.D') }} - {{ dayjs(item.effectEndTime).format('YYYY.M.D') }}</text>
-						</view>
-					</view>
-					<view class="btn">
-						<view class="active" v-if="isActive(item)">
-							<up-icon name="checkmark-circle-fill" size="24" color="#FF3232"></up-icon>
-						</view>
-						<view class="round" v-else></view>
-					</view>
-				</view>
-				<view class="btm">
-					<view class="left">1、可适用门店：{{ item.useShops }} 2、可适用商品：{{ item.foods }}3、可使用类型：{{ convertValuesToLabels(item.useType) }}</view>
-					<view class="right" @click.stop="showDetailHandle(item)">
-						<text class="t">查看详情</text>
-					</view>
-				</view>
-			</view>
-			<view class="title-wrap">
-				<text class="t">不可用红包</text>
-				<text class="n">{{ list.noCanUseCoupons.length }}张</text>
-			</view>
-			<view class="item disabled" v-for="item in list.noCanUseCoupons" :key="item.id">
-				<view class="top">
-					<view class="icon">
-						<couponIcon :item="item" />
-					</view>
-					<view class="info">
-						<view class="view name">
-							<text class="t">{{ item.name }}</text>
-						</view>
-						<view class="view time">
-							<text class="t">{{ dayjs(item.effectStartTime).format('YYYY.M.D') }} - {{ dayjs(item.effectEndTime).format('YYYY.M.D') }}</text>
-						</view>
-					</view>
-					<view class="btn">
-						<view class="round"></view>
-					</view>
-				</view>
-				<view class="btm">
-					<!-- <view class="left">1、可适用门店：{{ item.useShops }} 2、可适用商品：{{ item.foods }}3、可使用类型：{{ convertValuesToLabels(item.useType) }}</view>
+        <view
+          class="icon-wrap"
+          :style="{
+            width: `${100 / statusList.length}%`,
+            left: `${(100 / statusList.length) * querForm.statusActiveIndex}%`,
+          }"
+        >
+          <image
+            class="active-icon"
+            src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAMCAYAAAB4MH11AAACKUlEQVR4AaRTS2sTURT+MpkxUzNtRpuYpBsrqbgQH6BYRHGllloQN+5cuNeV6MKfoj9BwYUgIsXHRqE+SluliFLbBqmENJNMMpMm87qecw1NglJse+HMPeee833nce8oIgpFq7wsGt/fCb9eFrtdfmNd1L+9Jc4Vog6E4jcqqM0/R+3zNOwv09jtshdfSx7mDJwKqAMfIvAAEaFVWkLgWjvOEbVdtNa+Epf4wxmFUNTkfqiDGUkqogDu8icKiKS9nQ9jnR8fqM5AwuJJE/G9JhRF05E8dAqIKeDlrsyiWVxg9f+Fum+uzsFZmtnEGIVxKHsGIFn1bAF6ZlQ6I28D9uIrmYSrkodbfETgw6GubZo9Yzk0kR4Fc7IuE8QUFebJKSTSB/kM4UYd1scnKL18QInm4Vk/6W6qiNoOwpZDuoX2elFWXHrzELW5Z+RzJVbPHca+09doIKq0ZQLW+C44iWbm2ZQSNMqozj5F5f1jWCSVGd4fwerstYUXCOplGcsfxponJqHS7Nlm2UyAWAza0AFkzt1A6uhFqEYaoHsR9BLCpg2vukZVr5IU4dV+yU7oRikkTrHDMI9PIHPhJrhQ9Kxugs6hkkhi8Mh5DI9flyCep6ImOt7uxnF6dgypYxMy1hg7S0/yH3FdSL+mpbIw6CVwVSNX7yM/eQfZS7eQu3wb+St3MTJ1D2nq1iicgZbK9YN7rL866PH1qfGBIWj0v/Do4rrR59vK+A0AAP//GfTndQAAAAZJREFUAwCu+SjIaSGpLwAAAABJRU5ErkJggg=="
+          ></image>
+        </view>
+      </view>
+    </view>
+    <view class="list-wrap">
+      <view class="tips">
+        <text class="t"
+          >使用商品兑换券的商品，不再计入同享优惠券门槛和折扣计算。</text
+        >
+      </view>
+      <view class="title-wrap">
+        <text class="t">可用红包</text>
+        <text class="n">{{ list.canUseCoupons.length }}张</text>
+      </view>
+      <view
+        class="item"
+        v-for="item in list.canUseCoupons"
+        :key="item.id"
+        @click="changeSelCoupon(item)"
+      >
+        <view class="top">
+          <view class="icon">
+            <couponIcon :item="item" />
+          </view>
+          <view class="info">
+            <view class="view name">
+              <text class="t">{{ item.name }}</text>
+            </view>
+            <view class="view time">
+              <text class="t"
+                >{{ dayjs(item.effectStartTime).format("YYYY.M.D") }} -
+                {{ dayjs(item.effectEndTime).format("YYYY.M.D") }}</text
+              >
+            </view>
+          </view>
+          <view class="btn">
+            <view class="active" v-if="isActive(item)">
+              <up-icon
+                name="checkmark-circle-fill"
+                size="24"
+                color="#FF3232"
+              ></up-icon>
+            </view>
+            <view class="round" v-else></view>
+          </view>
+        </view>
+        <view class="btm">
+          <view class="left"
+            >1、可适用门店：{{ item.useShops }} 2、可适用商品：{{
+              item.foods
+            }}3、可使用类型：{{ convertValuesToLabels(item.useType) }}</view
+          >
+          <view class="right" @click.stop="showDetailHandle(item)">
+            <text class="t">查看详情</text>
+          </view>
+        </view>
+      </view>
+      <view class="title-wrap">
+        <text class="t">不可用红包</text>
+        <text class="n">{{ list.noCanUseCoupons.length }}张</text>
+      </view>
+      <view
+        class="item disabled"
+        v-for="item in list.noCanUseCoupons"
+        :key="item.id"
+      >
+        <view class="top">
+          <view class="icon">
+            <couponIcon :item="item" />
+          </view>
+          <view class="info">
+            <view class="view name">
+              <text class="t">{{ item.name }}</text>
+            </view>
+            <view class="view time">
+              <text class="t"
+                >{{ dayjs(item.effectStartTime).format("YYYY.M.D") }} -
+                {{ dayjs(item.effectEndTime).format("YYYY.M.D") }}</text
+              >
+            </view>
+          </view>
+          <view class="btn">
+            <view class="round"></view>
+          </view>
+        </view>
+        <view class="btm">
+          <!-- <view class="left">1、可适用门店：{{ item.useShops }} 2、可适用商品：{{ item.foods }}3、可使用类型：{{ convertValuesToLabels(item.useType) }}</view>
 					<view class="right" @click.stop="showDetailHandle(item)">
 						<text class="t">查看详情</text>
 					</view> -->
-					<view class="error">
-						<text class="t t1">不可用原因：</text>
-						<text class="t t2">{{ returnNoUseRestrictions(item) }}</text>
-					</view>
-				</view>
-			</view>
-		</view>
-		<u-loadmore :status="list.status"></u-loadmore>
-		<u-popup :show="show" round="20" closeable @close="show = false">
-			<view class="shoplist-popup">
-				<view class="title">
-					<text class="t">店铺列表</text>
-				</view>
-				<scroll-view class="popup-list" direction="vertical" @scrollend="scrollBottom">
-					<view class="item" v-for="item in shopList" :key="item.shopId" @click="selectShopHandle(item)">
-						<text class="t">{{ item.shopName }}</text>
-						<text class="intro">地址：{{ item.shopAddress }}</text>
-					</view>
-					<u-loadmore status="nomore"></u-loadmore>
-				</scroll-view>
-			</view>
-		</u-popup>
-		<u-popup :show="showDetail" round="20" closeable @close="showDetail = false">
-			<view class="shoplist-popup">
-				<view class="title">
-					<text class="t">详情说明</text>
-				</view>
-				<scroll-view class="popup-list" direction="vertical">
-					<view class="ul">
-						<view class="li" v-for="(item, index) in selectListItemDetails" :key="index">{{ index + 1 }}、{{ item }}</view>
-					</view>
-				</scroll-view>
-			</view>
-		</u-popup>
-	</view>
+          <view class="error">
+            <text class="t t1">不可用原因：</text>
+            <text class="t t2">{{ returnNoUseRestrictions(item) }}</text>
+          </view>
+        </view>
+      </view>
+    </view>
+    <u-loadmore :status="list.status"></u-loadmore>
+    <u-popup :show="show" round="20" closeable @close="show = false">
+      <view class="shoplist-popup">
+        <view class="title">
+          <text class="t">店铺列表</text>
+        </view>
+        <scroll-view
+          class="popup-list"
+          direction="vertical"
+          @scrollend="scrollBottom"
+        >
+          <view
+            class="item"
+            v-for="item in shopList"
+            :key="item.shopId"
+            @click="selectShopHandle(item)"
+          >
+            <text class="t">{{ item.shopName }}</text>
+            <text class="intro">地址：{{ item.shopAddress }}</text>
+          </view>
+          <u-loadmore status="nomore"></u-loadmore>
+        </scroll-view>
+      </view>
+    </u-popup>
+    <u-popup
+      :show="showDetail"
+      round="20"
+      closeable
+      @close="showDetail = false"
+    >
+      <view class="shoplist-popup">
+        <view class="title">
+          <text class="t">详情说明</text>
+        </view>
+        <scroll-view class="popup-list" direction="vertical">
+          <view class="ul">
+            <view
+              class="li"
+              v-for="(item, index) in selectListItemDetails"
+              :key="index"
+              >{{ index + 1 }}、{{ item }}</view
+            >
+          </view>
+        </scroll-view>
+      </view>
+    </u-popup>
+  </view>
 </template>
 
 <script setup>
-import dayjs from 'dayjs';
-import { ref, reactive, onMounted, computed, watch } from 'vue';
-import { onLoad, onReady, onShow, onPageScroll, onReachBottom, onBackPress } from '@dcloudio/uni-app';
-import { APIcouponfindByUserId, APIfindCoupon, getCouponShops } from '@/common/api/member.js';
-import { findCoupon } from '@/common/api/market/coupon.js';
-import couponIcon from '@/pages/user/components/coupon-icon.vue';
-import * as UTILS from '@/utils/goods-utils.js';
-import { useCartsStore } from '@/stores/carts.js';
+import dayjs from "dayjs";
+import { ref, reactive, onMounted, computed, watch } from "vue";
+import {
+  onLoad,
+  onReady,
+  onShow,
+  onPageScroll,
+  onReachBottom,
+  onBackPress,
+} from "@dcloudio/uni-app";
+import {
+  APIcouponfindByUserId,
+  APIfindCoupon,
+  getCouponShops,
+} from "@/common/api/member.js";
+import { findCoupon } from "@/common/api/market/coupon.js";
+import couponIcon from "@/pages/user/components/coupon-icon.vue";
+// import * as UTILS from '@/utils/goods-utils.js';
+import yskUtils from "ysk-utils";
+const UTILS = yskUtils.couponUtils;
+import { useCartsStore } from "@/stores/carts.js";
 const cartStore = useCartsStore();
 
 //返回不可用原因
 function returnNoUseRestrictions(item) {
-	if (item.noUseRestrictions) {
-		return item.noUseRestrictions;
-	}
-	if (item.canuseResult) {
-		return item.canuseResult.reason;
-	}
-	return '';
+  if (item.noUseRestrictions) {
+    return item.noUseRestrictions;
+  }
+  if (item.canuseResult) {
+    return item.canuseResult.reason;
+  }
+  return "";
 }
 
 const show = ref(false);
 
 const querForm = ref({
-	searchValue: '',
-	shopId: '',
-	shopName: '',
-	statusActiveIndex: 0
+  searchValue: "",
+  shopId: "",
+  shopName: "",
+  statusActiveIndex: 0,
 });
 
 const statusList = ref([
-	{
-		value: 0,
-		label: '商品兑换券',
-		bg: '#333333',
-		color: '#ffffff'
-	},
-	{
-		value: 1,
-		label: '折扣优惠券',
-		bg: '#F8F8F8',
-		color: '#999999'
-	}
+  {
+    value: 0,
+    label: "商品兑换券",
+    bg: "#333333",
+    color: "#ffffff",
+  },
+  {
+    value: 1,
+    label: "折扣优惠券",
+    bg: "#F8F8F8",
+    color: "#999999",
+  },
 ]);
 const list = reactive({
-	page: 1,
-	size: 10,
-	status: 'nomore',
-	data: [],
-	noCanUseCoupons: [],
-	canUseCoupons: []
+  page: 1,
+  size: 10,
+  status: "nomore",
+  data: [],
+  noCanUseCoupons: [],
+  canUseCoupons: [],
 });
 
 const showDetail = ref(false);
-const selectListItem = ref('');
+const selectListItem = ref("");
 const selectListItemDetails = ref([]);
 
 function showDetailHandle(item) {
-	showDetail.value = true;
+  showDetail.value = true;
 
-	// 1. 定义每个规则的独立描述（仅“其他优惠券”需判断item.type）
-	const ruleList = [];
+  // 1. 定义每个规则的独立描述（仅“其他优惠券”需判断item.type）
+  const ruleList = [];
 
-	// 规则1：限时折扣同享（始终显示）
-	const discountRule = item.discountShare ? '与限时折扣同享' : '不与限时折扣同享';
-	ruleList.push(discountRule);
+  // 规则1：限时折扣同享（始终显示）
+  const discountRule = item.discountShare
+    ? "与限时折扣同享"
+    : "不与限时折扣同享";
+  ruleList.push(discountRule);
 
-	// 规则2：会员价/会员折扣同享（始终显示）
-	const vipRule = item.vipPriceShare ? '与会员价/会员折扣同享' : '不与会员价/会员折扣同享';
-	ruleList.push(vipRule);
+  // 规则2：会员价/会员折扣同享（始终显示）
+  const vipRule = item.vipPriceShare
+    ? "与会员价/会员折扣同享"
+    : "不与会员价/会员折扣同享";
+  ruleList.push(vipRule);
 
-	// 规则3：其他优惠券同享（仅item.type=2时显示）
-	if (item.type === 2) {
-		const otherCouponRule = item.otherCouponShare ? '与其他优惠券同享' : '不与其他优惠券同享';
-		ruleList.push(otherCouponRule);
-	}
-	const shareRuleText = `${ruleList.join('、')}`;
-	let foods=item.foods;
-	selectListItemDetails.value = [
-		`可适用门店：${item.useShops}`,
-		`可适用商品：${foods}`,
-		`可使用类型：${convertValuesToLabels(item.useType)}`,
-		`可用时间段：${item.useTimeType == 'all' ? '全段时间可用' : `${item.useStartTime} - ${item.useEndTime}`}`,
-		`限量规则：每人限领${item.getLimit == -10086 ? `无限张` : `${item.getLimit}张`}，每日最多可使用${item.useLimit == -10086 ? `无限张` : `${item.useLimit}张`}`,
-		`同享规则：${shareRuleText}`,
-		`其它说明：${item.ruleDetails || '无'}`
-	];
+  // 规则3：其他优惠券同享（仅item.type=2时显示）
+  if (item.type === 2) {
+    const otherCouponRule = item.otherCouponShare
+      ? "与其他优惠券同享"
+      : "不与其他优惠券同享";
+    ruleList.push(otherCouponRule);
+  }
+  const shareRuleText = `${ruleList.join("、")}`;
+  let foods = item.foods;
+  selectListItemDetails.value = [
+    `可适用门店：${item.useShops}`,
+    `可适用商品：${foods}`,
+    `可使用类型：${convertValuesToLabels(item.useType)}`,
+    `可用时间段：${
+      item.useTimeType == "all"
+        ? "全段时间可用"
+        : `${item.useStartTime} - ${item.useEndTime}`
+    }`,
+    `限量规则：每人限领${
+      item.getLimit == -10086 ? `无限张` : `${item.getLimit}张`
+    }，每日最多可使用${
+      item.useLimit == -10086 ? `无限张` : `${item.useLimit}张`
+    }`,
+    `同享规则：${shareRuleText}`,
+    `其它说明：${item.ruleDetails || "无"}`,
+  ];
 
-	if (item.type == 2 || item.type == 4 || item.type == 6) {
-		selectListItemDetails.value.splice(2, 0, `使用规则：${item.useRule == 'price_asc' ? '从最低价开始抵扣' : '从最高价开始抵扣'}`);
-	}
+  if (item.type == 2 || item.type == 4 || item.type == 6) {
+    selectListItemDetails.value.splice(
+      2,
+      0,
+      `使用规则：${
+        item.useRule == "price_asc" ? "从最低价开始抵扣" : "从最高价开始抵扣"
+      }`
+    );
+  }
 
-	if (item.type == 3) {
-		selectListItemDetails.value.unshift(`最高抵扣${item.maxDiscountAmount}元`);
-	}
+  if (item.type == 3) {
+    selectListItemDetails.value.unshift(`最高抵扣${item.maxDiscountAmount}元`);
+  }
 }
 
 function returnSelNumber(index) {
-	if (index) {
-		if (couponSel.value.id) {
-			return '(1)';
-		} else {
-			return '(0)';
-		}
-	} else {
-		if (goodsCouponSel.value.id) {
-			return '(1)';
-		} else {
-			return '(0)';
-		}
-	}
+  if (index) {
+    if (couponSel.value.id) {
+      return "(1)";
+    } else {
+      return "(0)";
+    }
+  } else {
+    if (goodsCouponSel.value.id) {
+      return "(1)";
+    } else {
+      return "(0)";
+    }
+  }
 }
 // 搜索
 function searchHandle() {
-	list.page = 1;
-	list.status = 'nomore';
-	getCouponList();
+  list.page = 1;
+  list.status = "nomore";
+  getCouponList();
 }
 
 // 切换类型
 function tabChange(index) {
-	querForm.value.statusActiveIndex = index;
-	list.page = 1;
-	list.status = 'nomore';
-	formatCoupon();
+  querForm.value.statusActiveIndex = index;
+  list.page = 1;
+  list.status = "nomore";
+  formatCoupon();
 }
 
 function changeSelCoupon(item) {
-	if (querForm.value.statusActiveIndex) {
-		if (couponSel.value.id == item.id) {
-			couponSel.value = {
-				id: ''
-			};
-		} else {
-			couponSel.value = item;
-		}
-	} else {
-		if (goodsCouponSel.value.id == item.id) {
-			goodsCouponSel.value = {
-				id: ''
-			};
-		} else {
-			goodsCouponSel.value = item;
-		}
-	}
+  if (querForm.value.statusActiveIndex) {
+    if (couponSel.value.id == item.id) {
+      couponSel.value = {
+        id: "",
+      };
+    } else {
+      couponSel.value = item;
+    }
+  } else {
+    if (goodsCouponSel.value.id == item.id) {
+      goodsCouponSel.value = {
+        id: "",
+      };
+    } else {
+      goodsCouponSel.value = item;
+    }
+  }
 }
 
-
 const couponSel = ref({
-	id: ''
+  id: "",
 });
 const goodsCouponSel = ref({
-	id: ''
+  id: "",
 });
 const quansSelArr = computed(() => {
-	return [couponSel.value, goodsCouponSel.value].filter((v) => v.id);
+  return [couponSel.value, goodsCouponSel.value].filter((v) => v.id);
 });
-watch(()=>couponSel.value.id,(newval)=>{
-	formatCoupon()
-})
-watch(()=>goodsCouponSel.value.id,(newval)=>{
-	formatCoupon()
-})
+watch(
+  () => couponSel.value.id,
+  (newval) => {
+    formatCoupon();
+  }
+);
+watch(
+  () => goodsCouponSel.value.id,
+  (newval) => {
+    formatCoupon();
+  }
+);
 function isActive(item) {
-	if (querForm.value.statusActiveIndex) {
-		return couponSel.value.id == item.id;
-	} else {
-		return goodsCouponSel.value.id == item.id;
-	}
+  if (querForm.value.statusActiveIndex) {
+    return couponSel.value.id == item.id;
+  } else {
+    return goodsCouponSel.value.id == item.id;
+  }
 }
 
+const couponList = ref([]);
+function formatCoupon() {
+  let canUseGoodsCoupon = [];
+  let canUseDiscountCoupon = [];
 
-const couponList=ref([])
-function formatCoupon(){
-	
-	let canUseGoodsCoupon = [];
-	let canUseDiscountCoupon = [];
-	
-	let noUseGoodsCoupon = [];
-	let noUseDiscountCoupon = [];
-	const user = uni.cache.get('shopUserInfo');
-	let shopInfo = uni.cache.get('shopInfo') || {};
-	if (!shopInfo.isMemberPrice) {
-		shopInfo = {};
-	}
-	const goodsOrderPrice = uni.getStorageSync('goodsOrderPrice') || 0;
-	const dinnerType = cartStore.dinnerType;
-	const canDikouGoodsArr = UTILS.returnCanDikouGoods(cartStore.allGoods, [], user);
-	const shopId = uni.cache.get('shopId');
-	for (let i = 0; i < couponList.value.length; i++) {
-		const coupon = couponList.value[i];
-		const selCoupon=querForm.value.statusActiveIndex!=1?quansSelArr.value.filter(v=>v.type!=2):quansSelArr.value.filter(v=>v.type==2)
-		const canuseResult = UTILS.returnCouponCanUse({
-			canDikouGoodsArr,
-			coupon,
-			goodsOrderPrice,
-			user,
-			selCoupon:selCoupon,
-			shopInfo
-		});
-		const { canUse, reason } = canuseResult;
-		if (coupon.type == 2) {
-			if (canUse || goodsCouponSel.value.id == coupon.id) {
-				canUseGoodsCoupon.push(coupon);
-			} else {
-				noUseGoodsCoupon.push({
-					...coupon,
-					canuseResult
-				});
-			}
-		} else {
-			if (canUse || couponSel.value.id == coupon.id) {
-				canUseDiscountCoupon.push(coupon);
-			} else {
-				noUseDiscountCoupon.push({
-					...coupon,
-					canuseResult
-				});
-			}
-		}
-	}
-	//商品券
-	canUseGoodsCoupon = canUseGoodsCoupon.map((v) => {
-		const discount = UTILS.returnCouponDiscount(canDikouGoodsArr, v, user, goodsOrderPrice, quansSelArr.value, shopInfo);
-		return {
-			...v,
-			discount,
-			discountAmount: discount ? discount.discountPrice : v.discountAmount
-		};
-	});
-	//非商品券
-	canUseDiscountCoupon = canUseDiscountCoupon.map((v) => {
-		const discount = UTILS.returnCouponDiscount(canDikouGoodsArr, v, user, goodsOrderPrice, quansSelArr.value, shopInfo);
-		return {
-			...v,
-			discount,
-			discountAmount: discount ? discount.discountPrice : v.discountAmount
-		};
-	});
-	
-	if (querForm.value.statusActiveIndex == 0) {
-		list.noCanUseCoupons = noUseGoodsCoupon;
-		list.canUseCoupons = canUseGoodsCoupon;
-	} else {
-		list.noCanUseCoupons = noUseDiscountCoupon;
-		list.canUseCoupons = canUseDiscountCoupon;
-	}
-	
-	console.log('canUseGoodsCoupon', canUseGoodsCoupon);
-	console.log('noUseGoodsCoupon', noUseGoodsCoupon);
-	console.log('canUseDiscountCoupon', canUseDiscountCoupon);
-	console.log('noUseDiscountCoupon', noUseDiscountCoupon);
+  let noUseGoodsCoupon = [];
+  let noUseDiscountCoupon = [];
+  const user = uni.cache.get("shopUserInfo");
+  let shopInfo = uni.cache.get("shopInfo") || {};
+  if (!shopInfo.isMemberPrice) {
+    shopInfo = {};
+  }
+  const goodsOrderPrice = uni.getStorageSync("goodsOrderPrice") || 0;
+  const dinnerType = cartStore.dinnerType;
+  const canDikouGoodsArr = UTILS.returnCanDikouGoods(
+    cartStore.allGoods,
+    [],
+    user
+  );
+  const shopId = uni.cache.get("shopId");
+  for (let i = 0; i < couponList.value.length; i++) {
+    const coupon = couponList.value[i];
+    const selCoupon =
+      querForm.value.statusActiveIndex != 1
+        ? quansSelArr.value.filter((v) => v.type != 2)
+        : quansSelArr.value.filter((v) => v.type == 2);
+    const canuseResult = UTILS.returnCouponCanUse({
+      canDikouGoodsArr,
+      coupon,
+      goodsOrderPrice,
+      user,
+      selCoupon: selCoupon,
+      shopInfo,
+      limitTimeDiscount: cartStore.limitTimeDiscount,
+    });
+    const { canUse, reason } = canuseResult;
+    if (coupon.type == 2) {
+      if (canUse || goodsCouponSel.value.id == coupon.id) {
+        canUseGoodsCoupon.push(coupon);
+      } else {
+        noUseGoodsCoupon.push({
+          ...coupon,
+          canuseResult,
+        });
+      }
+    } else {
+      if (canUse || couponSel.value.id == coupon.id) {
+        canUseDiscountCoupon.push(coupon);
+      } else {
+        noUseDiscountCoupon.push({
+          ...coupon,
+          canuseResult,
+        });
+      }
+    }
+  }
+  //商品券
+  canUseGoodsCoupon = canUseGoodsCoupon.map((v) => {
+    const discount = UTILS.returnCouponDiscount(
+      canDikouGoodsArr,
+      v,
+      user,
+      goodsOrderPrice,
+      quansSelArr.value,
+      shopInfo,
+      cartStore.limitTimeDiscount
+    );
+    return {
+      ...v,
+      discount,
+      discountAmount: discount ? discount.discountPrice : v.discountAmount,
+    };
+  });
+  //非商品券
+  canUseDiscountCoupon = canUseDiscountCoupon.map((v) => {
+    const discount = UTILS.returnCouponDiscount(
+      canDikouGoodsArr,
+      v,
+      user,
+      goodsOrderPrice,
+      quansSelArr.value,
+      shopInfo,
+      cartStore.limitTimeDiscount
+    );
+    return {
+      ...v,
+      discount,
+      discountAmount: discount ? discount.discountPrice : v.discountAmount,
+    };
+  });
+
+  if (querForm.value.statusActiveIndex == 0) {
+    list.noCanUseCoupons = noUseGoodsCoupon;
+    list.canUseCoupons = canUseGoodsCoupon;
+  } else {
+    list.noCanUseCoupons = noUseDiscountCoupon;
+    list.canUseCoupons = canUseDiscountCoupon;
+  }
+
+  console.log("canUseGoodsCoupon", canUseGoodsCoupon);
+  console.log("noUseGoodsCoupon", noUseGoodsCoupon);
+  console.log("canUseDiscountCoupon", canUseDiscountCoupon);
+  console.log("noUseDiscountCoupon", noUseDiscountCoupon);
 }
 
 // 获取优惠券列表
 async function getCouponList() {
-	try {
-		uni.showLoading({
-			title: '加载中...',
-			mask: true
-		});
-		const res = await findCoupon({
-			shopUserId: uni.cache.get('shopUserInfo').id
-		});
-		couponList.value=res
-		formatCoupon()
-		
-	} catch (error) {
-		console.log(error);
-	}
-	uni.hideLoading();
+  try {
+    uni.showLoading({
+      title: "加载中...",
+      mask: true,
+    });
+    const res = await findCoupon({
+      shopUserId: uni.cache.get("shopUserInfo").id,
+    });
+    couponList.value = res;
+    formatCoupon();
+  } catch (error) {
+    console.log(error);
+  }
+  uni.hideLoading();
 }
 
 // 店铺列表滚动到底部了
 function scrollBottom() {
-	console.log('店铺列表滚动到底部了');
+  console.log("店铺列表滚动到底部了");
 }
 
 /**
@@ -415,505 +532,531 @@ function scrollBottom() {
  * @param {string} separator - 标签拼接分隔符，默认值为'、'
  * @returns {string} 拼接后的label字符串，如"堂食、自取"
  */
-function convertValuesToLabels(valueStr, options, separator = '、') {
-	try {
-		options = [
-			{
-				value: 'dine',
-				label: '堂食'
-			},
-			{
-				value: 'pickup',
-				label: '自取'
-			},
-			{
-				value: 'deliv',
-				label: '配送'
-			},
-			{
-				value: 'express',
-				label: '快递'
-			}
-		];
-		// 验证输入参数
-		if (!Array.isArray(options)) {
-			throw new Error('options必须是数组');
-		}
-		if (typeof valueStr !== 'string') {
-			throw new Error('valueStr必须是字符串');
-		}
+function convertValuesToLabels(valueStr, options, separator = "、") {
+  try {
+    options = [
+      {
+        value: "dine",
+        label: "堂食",
+      },
+      {
+        value: "pickup",
+        label: "自取",
+      },
+      {
+        value: "deliv",
+        label: "配送",
+      },
+      {
+        value: "express",
+        label: "快递",
+      },
+    ];
+    // 验证输入参数
+    if (!Array.isArray(options)) {
+      throw new Error("options必须是数组");
+    }
+    if (typeof valueStr !== "string") {
+      throw new Error("valueStr必须是字符串");
+    }
 
-		// 解析value数组字符串
-		const values = JSON.parse(valueStr);
-		if (!Array.isArray(values)) {
-			throw new Error('解析后的valueStr必须是数组');
-		}
+    // 解析value数组字符串
+    const values = JSON.parse(valueStr);
+    if (!Array.isArray(values)) {
+      throw new Error("解析后的valueStr必须是数组");
+    }
 
-		// 构建value到label的映射表
-		const valueLabelMap = new Map();
-		options.forEach((item) => {
-			if (item && typeof item.value !== 'undefined' && typeof item.label !== 'undefined') {
-				valueLabelMap.set(item.value, item.label);
-			}
-		});
+    // 构建value到label的映射表
+    const valueLabelMap = new Map();
+    options.forEach((item) => {
+      if (
+        item &&
+        typeof item.value !== "undefined" &&
+        typeof item.label !== "undefined"
+      ) {
+        valueLabelMap.set(item.value, item.label);
+      }
+    });
 
-		// 匹配并收集label
-		const labels = values.map((value) => valueLabelMap.get(value)).filter(Boolean); // 过滤未匹配到的项
+    // 匹配并收集label
+    const labels = values
+      .map((value) => valueLabelMap.get(value))
+      .filter(Boolean); // 过滤未匹配到的项
 
-		// 拼接结果
-		return labels.join(separator);
-	} catch (error) {
-		console.error('转换失败:', error.message);
-		return ''; // 出错时返回空字符串
-	}
+    // 拼接结果
+    return labels.join(separator);
+  } catch (error) {
+    console.error("转换失败:", error.message);
+    return ""; // 出错时返回空字符串
+  }
 }
 
 // 选择店铺
 function selectShopHandle(item) {
-	querForm.value.shopId = item.shopId;
-	querForm.value.shopName = item.shopName;
-	list.page = 1;
-	show.value = false;
-	getCouponList();
+  querForm.value.shopId = item.shopId;
+  querForm.value.shopName = item.shopName;
+  list.page = 1;
+  show.value = false;
+  getCouponList();
 }
 // 获取当前店铺会员信息
 const shopList = ref([]);
 async function getCouponShopsAjax() {
-	try {
-		const res = await getCouponShops();
-		shopList.value = res;
-	} catch (error) {
-		console.log(error);
-	}
+  try {
+    const res = await getCouponShops();
+    shopList.value = res;
+  } catch (error) {
+    console.log(error);
+  }
 }
 
 onShow(() => {
-	const couponArr = cartStore.backendCoupons.filter((v) => v.type != 2);
-	const goodsCouponArr = cartStore.backendCoupons.filter((v) => v.type == 2);
-	if (couponArr.length) {
-		couponSel.value = couponArr[0];
-	}
-	if (goodsCouponArr.length) {
-		goodsCouponSel.value = goodsCouponArr[0];
-	}
-	getCouponList();
+  const couponArr = cartStore.backendCoupons.filter((v) => v.type != 2);
+  const goodsCouponArr = cartStore.backendCoupons.filter((v) => v.type == 2);
+  if (couponArr.length) {
+    couponSel.value = couponArr[0];
+  }
+  if (goodsCouponArr.length) {
+    goodsCouponSel.value = goodsCouponArr[0];
+  }
+  getCouponList();
 });
 
 onLoad(() => {
-	getCouponShopsAjax();
+  getCouponShopsAjax();
 });
 watch(
-	() => quansSelArr.value,
-	(newval) => {
-		// getCouponList()
-		const user = uni.cache.get('shopUserInfo');
-		let shopInfo = uni.cache.get('shopInfo') || {};
-		if (!shopInfo.isMemberPrice) {
-			shopInfo = {};
-		}
-		const goodsOrderPrice = uni.getStorageSync('goodsOrderPrice') || 0;
-		const dinnerType = cartStore.dinnerType;
-		const canDikouGoodsArr = UTILS.returnCanDikouGoods(cartStore.allGoods, [], user);
-		const shopId = uni.cache.get('shopId');
-		let goodsCoupon = newval.filter((v) => v.type == 2);
-		let otherCoupon = newval.filter((v) => v.type != 2);
-		goodsCoupon = goodsCoupon.map((v) => {
-			const discount = UTILS.returnCouponDiscount(canDikouGoodsArr, v, user, goodsOrderPrice, [], shopInfo);
-			return {
-				...v,
-				discount,
-				discountAmount: discount ? discount.discountPrice : v.discountAmount
-			};
-		});
-		otherCoupon = otherCoupon.map((v) => {
-			const discount = UTILS.returnCouponDiscount(canDikouGoodsArr, v, user, goodsOrderPrice, goodsCoupon, shopInfo);
-			return {
-				...v,
-				discount,
-				discountAmount: discount ? discount.discountPrice : v.discountAmount
-			};
-		});
-		uni.$emit('selCoupon', [...goodsCoupon, ...otherCoupon]);
-	},
-	{
-		deep: true
-	}
+  () => quansSelArr.value,
+  (newval) => {
+    // getCouponList()
+    const user = uni.cache.get("shopUserInfo");
+    let shopInfo = uni.cache.get("shopInfo") || {};
+    if (!shopInfo.isMemberPrice) {
+      shopInfo = {};
+    }
+    const goodsOrderPrice = uni.getStorageSync("goodsOrderPrice") || 0;
+    const dinnerType = cartStore.dinnerType;
+    const canDikouGoodsArr = UTILS.returnCanDikouGoods(
+      cartStore.allGoods,
+      [],
+      user
+    );
+    const shopId = uni.cache.get("shopId");
+    let goodsCoupon = newval.filter((v) => v.type == 2);
+    let otherCoupon = newval.filter((v) => v.type != 2);
+    goodsCoupon = goodsCoupon.map((v) => {
+      const discount = UTILS.returnCouponDiscount(
+        canDikouGoodsArr,
+        v,
+        user,
+        goodsOrderPrice,
+        [],
+        shopInfo,
+        cartStore.limitTimeDiscount
+      );
+      return {
+        ...v,
+        discount,
+        discountAmount: discount ? discount.discountPrice : v.discountAmount,
+      };
+    });
+    otherCoupon = otherCoupon.map((v) => {
+      const discount = UTILS.returnCouponDiscount(
+        canDikouGoodsArr,
+        v,
+        user,
+        goodsOrderPrice,
+        goodsCoupon,
+        shopInfo,
+        cartStore.limitTimeDiscount
+      );
+      return {
+        ...v,
+        discount,
+        discountAmount: discount ? discount.discountPrice : v.discountAmount,
+      };
+    });
+    uni.$emit("selCoupon", [...goodsCoupon, ...otherCoupon]);
+  },
+  {
+    deep: true,
+  }
 );
 </script>
 
 <style>
 page {
-	background-color: #f7f7f7;
+  background-color: #f7f7f7;
 }
 </style>
 <style scoped lang="scss">
 .container {
-	padding: 136upx 28upx 28upx;
+  padding: 136upx 28upx 28upx;
 }
 
 .header-wrap {
-	width: 100%;
-	background-color: #fff;
-	position: fixed;
-	top: 0;
-	left: 0;
-	z-index: 99;
-	padding: 28upx;
+  width: 100%;
+  background-color: #fff;
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 99;
+  padding: 28upx;
 
-	.search-wrap {
-		display: flex;
-		gap: 28upx;
+  .search-wrap {
+    display: flex;
+    gap: 28upx;
 
-		.input-wrap {
-			flex: 1;
-			height: 70upx;
-			border: 1px solid #ececec;
-			border-radius: 8upx;
-			position: relative;
+    .input-wrap {
+      flex: 1;
+      height: 70upx;
+      border: 1px solid #ececec;
+      border-radius: 8upx;
+      position: relative;
 
-			&:first-child {
-				flex: 1.5;
-			}
+      &:first-child {
+        flex: 1.5;
+      }
 
-			.icon {
-				position: absolute;
-				top: 50%;
-				transform: translateY(-50%);
+      .icon {
+        position: absolute;
+        top: 50%;
+        transform: translateY(-50%);
 
-				&.left {
-					left: 14upx;
-				}
+        &.left {
+          left: 14upx;
+        }
 
-				&.right {
-					right: 14upx;
-				}
-			}
+        &.right {
+          right: 14upx;
+        }
+      }
 
-			.ipt {
-				width: 100%;
-				height: 100%;
+      .ipt {
+        width: 100%;
+        height: 100%;
 
-				&.left {
-					padding-left: 68upx;
-				}
+        &.left {
+          padding-left: 68upx;
+        }
 
-				&.right {
-					padding: 0 56upx 0 28upx;
-				}
-			}
-		}
-	}
+        &.right {
+          padding: 0 56upx 0 28upx;
+        }
+      }
+    }
+  }
 
-	.status-wrap {
-		display: flex;
-		// padding-top: 28upx;
-		position: relative;
+  .status-wrap {
+    display: flex;
+    // padding-top: 28upx;
+    position: relative;
 
-		.icon-wrap {
-			height: 12upx;
-			position: absolute;
-			bottom: 0;
-			left: 0;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			transition: all 0.3s ease-in-out;
-			padding-right: 28upx;
+    .icon-wrap {
+      height: 12upx;
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      transition: all 0.3s ease-in-out;
+      padding-right: 28upx;
 
-			.active-icon {
-				width: 24upx;
-				height: 12upx;
-				z-index: 9;
-			}
-		}
+      .active-icon {
+        width: 24upx;
+        height: 12upx;
+        z-index: 9;
+      }
+    }
 
-		.item {
-			flex: 1;
-			height: 80upx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
+    .item {
+      flex: 1;
+      height: 80upx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
 
-			.t {
-				font-size: 32upx;
-				color: #666666;
-				transition: all 0.3s ease-in-out 0.1s;
-			}
+      .t {
+        font-size: 32upx;
+        color: #666666;
+        transition: all 0.3s ease-in-out 0.1s;
+      }
 
-			&.active {
-				.t {
-					color: #e3ad7f;
-				}
-			}
-		}
-	}
+      &.active {
+        .t {
+          color: #e3ad7f;
+        }
+      }
+    }
+  }
 }
 
 .list-wrap {
-	padding-top: 28upx;
+  padding-top: 28upx;
 
-	.tips {
-		.t {
-			color: #666;
-			font-size: 24upx;
-		}
-	}
+  .tips {
+    .t {
+      color: #666;
+      font-size: 24upx;
+    }
+  }
 
-	.title-wrap {
-		display: flex;
-		align-items: center;
-		gap: 10upx;
-		padding-top: 28upx;
+  .title-wrap {
+    display: flex;
+    align-items: center;
+    gap: 10upx;
+    padding-top: 28upx;
 
-		.t {
-			font-size: 32upx;
-			color: #333;
-		}
+    .t {
+      font-size: 32upx;
+      color: #333;
+    }
 
-		.n {
-			color: #666;
-			font-size: 24upx;
-		}
-	}
+    .n {
+      color: #666;
+      font-size: 24upx;
+    }
+  }
 
-	.item {
-		border-radius: 18upx;
-		background-color: #fff;
-		padding: 28upx;
+  .item {
+    border-radius: 18upx;
+    background-color: #fff;
+    padding: 28upx;
 
-		&:not(:first-child) {
-			margin-top: 28upx;
-		}
+    &:not(:first-child) {
+      margin-top: 28upx;
+    }
 
-		&.disabled {
-			.top {
-				position: relative;
+    &.disabled {
+      .top {
+        position: relative;
 
-				&::after {
-					content: '';
-					width: 100%;
-					height: 100%;
-					position: absolute;
-					top: 0;
-					left: 0;
-					z-index: 10;
-					background-color: rgba(255, 255, 255, 0.6);
-				}
+        &::after {
+          content: "";
+          width: 100%;
+          height: 100%;
+          position: absolute;
+          top: 0;
+          left: 0;
+          z-index: 10;
+          background-color: rgba(255, 255, 255, 0.6);
+        }
 
-				.btn {
-					.round {
-						background-color: #f0f0f0;
-					}
-				}
-			}
-		}
+        .btn {
+          .round {
+            background-color: #f0f0f0;
+          }
+        }
+      }
+    }
 
-		.top {
-			display: flex;
-			align-items: center;
-			padding-bottom: 28upx;
+    .top {
+      display: flex;
+      align-items: center;
+      padding-bottom: 28upx;
 
-			.icon {
-				$size: 140upx;
-				width: $size;
-				height: $size;
-				margin-right: 28upx;
-			}
+      .icon {
+        $size: 140upx;
+        width: $size;
+        height: $size;
+        margin-right: 28upx;
+      }
 
-			.info {
-				flex: 1;
-				display: flex;
-				justify-content: center;
-				flex-direction: column;
-				gap: 8upx;
-				padding: 0 28upx;
-				position: relative;
+      .info {
+        flex: 1;
+        display: flex;
+        justify-content: center;
+        flex-direction: column;
+        gap: 8upx;
+        padding: 0 28upx;
+        position: relative;
 
-				&::after {
-					$height: 100upx;
-					content: '';
-					height: $height;
-					border-left: 1upx solid #f7f7f7;
-					position: absolute;
-					top: 50%;
-					margin-top: $height * 0.5 * -1;
-					left: 0;
-				}
+        &::after {
+          $height: 100upx;
+          content: "";
+          height: $height;
+          border-left: 1upx solid #f7f7f7;
+          position: absolute;
+          top: 50%;
+          margin-top: $height * 0.5 * -1;
+          left: 0;
+        }
 
-				.view {
-					flex: 1;
+        .view {
+          flex: 1;
 
-					&.name {
-						font-size: 32upx;
-						color: #333;
-					}
+          &.name {
+            font-size: 32upx;
+            color: #333;
+          }
 
-					&.time {
-						.t {
-							font-size: 24upx;
-							color: #999;
-						}
-					}
-				}
-			}
+          &.time {
+            .t {
+              font-size: 24upx;
+              color: #999;
+            }
+          }
+        }
+      }
 
-			.btn {
-				width: 40upx;
-				height: 40upx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
+      .btn {
+        width: 40upx;
+        height: 40upx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
 
-				.round {
-					width: 100%;
-					height: 100%;
-					border-radius: 50%;
-					background-color: #fff;
-					border: 1px solid #d9d9d9;
-				}
-			}
-		}
+        .round {
+          width: 100%;
+          height: 100%;
+          border-radius: 50%;
+          background-color: #fff;
+          border: 1px solid #d9d9d9;
+        }
+      }
+    }
 
-		.btm {
-			display: flex;
-			align-items: center;
-			padding: 28upx 0 14upx;
-			border-top: 1upx solid #f7f7f7;
+    .btm {
+      display: flex;
+      align-items: center;
+      padding: 28upx 0 14upx;
+      border-top: 1upx solid #f7f7f7;
 
-			.left {
-				flex: 1;
-				height: 40upx;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				white-space: nowrap;
-				font-size: 24upx;
-				color: #999;
-			}
+      .left {
+        flex: 1;
+        height: 40upx;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        font-size: 24upx;
+        color: #999;
+      }
 
-			.right {
-				flex: 1;
-				display: flex;
-				align-items: center;
-				padding-left: 28upx;
-				justify-content: flex-end;
+      .right {
+        flex: 1;
+        display: flex;
+        align-items: center;
+        padding-left: 28upx;
+        justify-content: flex-end;
 
-				.t {
-					font-size: 24upx;
-					color: #333;
-				}
-			}
+        .t {
+          font-size: 24upx;
+          color: #333;
+        }
+      }
 
-			.error {
-				flex: 1;
+      .error {
+        flex: 1;
 
-				.t {
-					font-size: 24upx;
+        .t {
+          font-size: 24upx;
 
-					&.t1 {
-						color: #ff1c1c;
-					}
+          &.t1 {
+            color: #ff1c1c;
+          }
 
-					&.t2 {
-						color: #333;
-					}
-				}
-			}
-		}
-	}
+          &.t2 {
+            color: #333;
+          }
+        }
+      }
+    }
+  }
 }
 
 .shoplist-popup {
-	padding: 0 28upx 28upx;
+  padding: 0 28upx 28upx;
 
-	.title {
-		padding: 28upx 0;
-		display: flex;
-		align-items: center;
-		justify-content: center;
+  .title {
+    padding: 28upx 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
 
-		.t {
-			font-size: 32upx;
-			font-weight: bold;
-			color: #333;
-		}
-	}
+    .t {
+      font-size: 32upx;
+      font-weight: bold;
+      color: #333;
+    }
+  }
 
-	.popup-list {
-		max-height: 50vh;
+  .popup-list {
+    max-height: 50vh;
 
-		.item {
-			padding: 28upx;
-			border-radius: 12upx;
-			background-color: #f7f7f7;
-			margin-bottom: 28upx;
-			display: flex;
-			flex-direction: column;
-			padding: 28upx;
+    .item {
+      padding: 28upx;
+      border-radius: 12upx;
+      background-color: #f7f7f7;
+      margin-bottom: 28upx;
+      display: flex;
+      flex-direction: column;
+      padding: 28upx;
 
-			.t {
-				font-size: 28upx;
-				font-weight: bold;
-				color: #333;
-				/* 必须设置宽度 */
-				width: 600upx;
-				/* 或具体像素值 */
+      .t {
+        font-size: 28upx;
+        font-weight: bold;
+        color: #333;
+        /* 必须设置宽度 */
+        width: 600upx;
+        /* 或具体像素值 */
 
-				/* 关键属性 */
-				display: -webkit-box;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 1;
-				/* 显示2行 */
-				overflow: hidden;
+        /* 关键属性 */
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 1;
+        /* 显示2行 */
+        overflow: hidden;
 
-				/* 文本溢出省略号 */
-				text-overflow: ellipsis;
+        /* 文本溢出省略号 */
+        text-overflow: ellipsis;
 
-				/* 可选：防止行高度，确保计算准确 */
-				line-height: 1.5;
-				word-break: break-all;
-				/* 允许在单词内换行 */
-				word-wrap: break-word;
-				/* 允许长单词或URL换行 */
-			}
+        /* 可选：防止行高度，确保计算准确 */
+        line-height: 1.5;
+        word-break: break-all;
+        /* 允许在单词内换行 */
+        word-wrap: break-word;
+        /* 允许长单词或URL换行 */
+      }
 
-			.intro {
-				font-size: 28upx;
-				color: #999;
-				/* 必须设置宽度 */
-				width: 600upx;
-				/* 或具体像素值 */
+      .intro {
+        font-size: 28upx;
+        color: #999;
+        /* 必须设置宽度 */
+        width: 600upx;
+        /* 或具体像素值 */
 
-				/* 关键属性 */
-				display: -webkit-box;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 2;
-				/* 显示2行 */
-				overflow: hidden;
+        /* 关键属性 */
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        /* 显示2行 */
+        overflow: hidden;
 
-				/* 文本溢出省略号 */
-				text-overflow: ellipsis;
+        /* 文本溢出省略号 */
+        text-overflow: ellipsis;
 
-				/* 可选：防止行高度，确保计算准确 */
-				line-height: 1.5;
-				word-break: break-all;
-				/* 允许在单词内换行 */
-				word-wrap: break-word;
-				/* 允许长单词或URL换行 */
-			}
-		}
+        /* 可选：防止行高度，确保计算准确 */
+        line-height: 1.5;
+        word-break: break-all;
+        /* 允许在单词内换行 */
+        word-wrap: break-word;
+        /* 允许长单词或URL换行 */
+      }
+    }
 
-		.ul {
-			.li {
-				color: #999;
-				font-size: 28upx;
-				padding: 8upx 0;
+    .ul {
+      .li {
+        color: #999;
+        font-size: 28upx;
+        padding: 8upx 0;
 
-				.t {
-					color: #999;
-					font-size: 28upx;
-				}
-			}
-		}
-	}
+        .t {
+          color: #999;
+          font-size: 28upx;
+        }
+      }
+    }
+  }
 }
 </style>
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 0e9e58e..f2f7dc4 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -219,6 +219,7 @@
 
 	const orderinfo = (e) => {
 		if(e.status=='unpaid'){
+			uni.cache.set('shopId',e.shopId)
 			uni.pro.navigateTo('order/confirm-order', {
 				orderId: e.id,
 				shopId: e.shopId,
diff --git a/pages/product/components/goods-modal.vue b/pages/product/components/goods-modal.vue
new file mode 100644
index 0000000..fd3b53c
--- /dev/null
+++ b/pages/product/components/goods-modal.vue
@@ -0,0 +1,251 @@
+<template>
+  <up-popup :show="visible" :round="20" mode="bottom" @close="close">
+    <view class="shop_sku">
+      <scroll-view scroll-y style="max-height: 60vh; width: 100%">
+        <view class="positionabsolute">
+          <up-icon
+            name="close-circle"
+            @click="close"
+            color="#000"
+            size="25"
+          ></up-icon>
+        </view>
+        <up-swiper :list="specifications.item.images" height="250"></up-swiper>
+        <view class="shop_sku_name">{{ specifications.item.name }}</view>
+        <view class="shop_sku_description">
+          {{
+            specifications.item.shortTitle ? specifications.item.shortTitle : ""
+          }}
+        </view>
+        <view v-if="specifications.item.type != 'package'">
+          <view
+            class="shop_sku_box"
+            v-for="(specOptions, specType) in specifications.item
+              .selectSpecInfo"
+            :key="specType"
+          >
+            <view class="shop_sku_box_name">
+              {{ specType }}
+            </view>
+            <view class="flex-start">
+              <view
+                class="shop_sku_box_item"
+                v-for="option in specOptions"
+                :key="option"
+                @click="selectSpec(specType, option)"
+                :class="{
+                  shop_sku_box_item_selected: isSelected(option),
+                }"
+              >
+                {{ option }}
+                <view
+                  class="shop_sku_box_item_tip"
+                  v-if="
+                    specifications.item.result &&
+                    specifications.item.result.isSoldStock == 1 &&
+                    selectedSpecs[specType] === option
+                  "
+                >
+                  <view>售罄</view>
+                </view>
+                <view
+                  class="shop_sku_box_item_tip"
+                  v-if="
+                    specifications.item.result == 'kong' &&
+                    canSubmit == false &&
+                    selectedSpecs[specType] === option
+                  "
+                >
+                  <view>已下架</view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <!-- 套餐 -->
+        <view v-else>
+          <view class="shop_sku_box">
+            <view
+              v-for="(setmenu, setmenuindex) in specifications.item.groupSnap"
+              :key="setmenuindex"
+            >
+              <view class="shop_sku_box_name"
+                >{{ setmenu.title }} {{ setmenu.count }} 选{{
+                  setmenu.number
+                }}</view
+              >
+              <view class="flex-start">
+                <view
+                  class="shop_sku_box_item"
+                  v-for="(option, goodsid) in setmenu.goods"
+                  :key="goodsid"
+                  @click="goodsidClick(setmenuindex, option, goodsid)"
+                  :class="{
+                    shop_sku_box_item_selected: isOptionSelected(
+                      setmenuindex,
+                      option
+                    ),
+                  }"
+                  :disabled="
+                    isMaxSelected(setmenuindex) &&
+                    !isOptionSelected(setmenuindex, option)
+                  "
+                >
+                  {{ option.proName }}
+                  <text v-if="option.unitName">/{{ option.unitName }}</text>
+                  <view
+                    class="shop_sku_box_item_tip"
+                    v-if="specifications.item.isSoldStock == 1"
+                  >
+                    <view>售罄</view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+      <view class="shop_bottom">
+        <view class="flex-between">
+          <view
+            class="price"
+            v-if="
+              specifications.item.type != 'package' &&
+              specifications.item.result
+            "
+          >
+            <text class="i">￥</text>
+            <view class="num">
+              <GoodsPrice
+                :limitDiscount="limitTimeDiscountRes"
+                :cart="specifications.item.result"
+                :shopUserInfo="shopUserInfo"
+                :shopInfo="shopInfo"
+              ></GoodsPrice>
+            </view>
+
+            <text class="num" v-if="false">
+              {{
+                shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1
+                  ? specifications.item.result.memberPrice ||
+                    specifications.item.result.salePrice
+                  : specifications.item.result.salePrice
+              }}
+            </text>
+            <text class="i" v-if="specifications.item.unitName"
+              >/{{ specifications.item.unitName }}</text
+            >
+            <text v-if="specifications.item.result.suitNum > 1"
+              >「{{ specifications.item.result.suitNum
+              }}{{ specifications.item.result.unitName }}起点」</text
+            >
+          </view>
+          <view class="price" v-else>
+            <text class="i">￥</text>
+            <view class="num">
+              <GoodsPrice
+                :limitDiscount="limitTimeDiscountRes"
+                :cart="specifications.item"
+                :shopUserInfo="shopUserInfo"
+                :shopInfo="shopInfo"
+              ></GoodsPrice>
+            </view>
+            <text class="num" v-if="false">
+              {{
+                shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1
+                  ? specifications.item.memberPrice ||
+                    specifications.item.salePrice
+                  : specifications.item.salePrice
+              }}
+            </text>
+            <text class="i" v-if="specifications.item.unitName"
+              >/{{ specifications.item.unitName }}</text
+            >
+            <text v-if="specifications.item.suitNum > 1"
+              >「{{ specifications.item.suitNum
+              }}{{ specifications.item.unitName }}起点」</text
+            >
+          </view>
+
+          <view
+            class="operation-wrap"
+            v-if="specifications.item.type != 'package'"
+          >
+            <view class="btn">
+              <up-icon
+                name="minus-circle-fill"
+                color="#E9AB7A"
+                size="25"
+                v-if="shopCartNumber > 0"
+              ></up-icon>
+              <view class="btnClick" @click="shopCart('-')"></view>
+            </view>
+            <text class="num">{{ shopCartNumber }}</text>
+            <view class="btn">
+              <up-icon
+                name="plus-circle-fill"
+                color="#E9AB7A"
+                size="25"
+              ></up-icon>
+              <view class="btnClick" @click="shopCart('+')"></view>
+            </view>
+          </view>
+        </view>
+        <view class="shop_skuselect flex-start" v-if="selectedSpecsStr">
+          <view class="shop_skuselectname">{{ selectedSpecsStr }}</view>
+        </view>
+        <view
+          v-if="specifications.item.type == 'package'"
+          class="addShopping"
+          :class="shopCartNumber > 0 && allConditionsSatisfied ? 'active' : ''"
+          @click="submitSelection()"
+        >
+          {{ skuBtnText }}
+        </view>
+        <view
+          v-else
+          class="addShopping"
+          :class="shopCartNumber > 0 && canSubmit ? 'active' : ''"
+          @click="submitSelection()"
+        >
+          {{ skuBtnText }}
+        </view>
+      </view>
+    </view>
+  </up-popup>
+</template>
+
+<script setup>
+import { ref } from "vue";
+const props = defineProps({
+  data: {
+    type: Object,
+    default: () => {},
+  },
+  specifications: {
+    type: Object,
+    default: () => {
+        return {
+            item: {},
+        }
+    },
+  },
+});
+const visible = defineModel({
+  default: false,
+});
+function close() {
+  visible.value = false;
+}
+const selectedSpecs = ref({});
+function isSelected(option) {
+  return selectedSpecs.value[specType] === option;
+}
+</script>
+<style scoped lang="scss">
+.box {
+  width: 100%;
+  height: 200px;
+  background-color: #f5f5f5;
+}
+</style>
\ No newline at end of file
diff --git a/pages/product/components/recommend-goods-modal.vue b/pages/product/components/recommend-goods-modal.vue
new file mode 100644
index 0000000..1c47c5a
--- /dev/null
+++ b/pages/product/components/recommend-goods-modal.vue
@@ -0,0 +1,196 @@
+<template>
+  <up-overlay :show="show">
+    <view class="box" v-if="SelData">
+      <view class="bg-fff u-p-30 item">
+        <view class="u-flex coverImg">
+          <up-image
+          width="204rpx"
+          height="228rpx"
+          radius="6"
+          :src="SelData.goods.coverImg"
+        ></up-image>
+        <view class="limitDiscount" v-if="showLimitDiscount(SelData.goods)"
+                  >限时折扣</view
+                >
+        </view>
+    
+        <view class="u-flex-1 u-p-l-36">
+          <view class="u-flex u-col-center justify-between u-m-t-10">
+            <view class="u-line-1 font-16 color-333 font-bold u-p-r-16">{{
+              SelData.title
+            }}</view>
+            <up-icon
+              size="20"
+              name="close-circle"
+              color="#666"
+              @click="close"
+            ></up-icon>
+          </view>
+          <view class="color-333 font-14 u-m-t-32 u-line-1">{{
+            SelData.guideDetail
+          }}</view>
+          <view class="u-flex justify-between u-m-t-30">
+            <view class="price"
+              >¥
+              <GoodsPrice
+                :limitDiscount="cartStore.limitTimeDiscount"
+                :cart="SelData.goods"
+                :shopUserInfo="shopUserInfo"
+                :shopInfo="shopInfo"
+              ></GoodsPrice
+            ></view>
+            <view class="buy" @click="buy">立即下单</view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </up-overlay>
+</template>
+<script setup>
+import * as orderUtils from "@/utils/order-utils.js";
+import GoodsPrice from "@/components/goods-price.vue";
+import * as suggestApi from "@/common/api/market/suggest.js";
+import { ref, onMounted, inject, watch } from "vue";
+const cartStore = inject("cartStore");
+const shopUserInfo = inject("shopUserInfo");
+const shopInfo = inject("shopInfo");
+
+function showLimitDiscount(item) {
+  if (!cartStore.limitTimeDiscount) {
+    return false;
+  }
+  return orderUtils.canUseLimitTimeDiscount(
+    item,
+    cartStore.limitTimeDiscount,
+    shopInfo,
+    shopUserInfo.value,
+    "id"
+  );
+}
+
+
+const show = ref(false);
+
+let timer = null;
+
+function taskEnd() {
+  clearInterval(timer);
+  show.value = false;
+}
+function statTime() {
+  clearInterval(timer);
+  timer = setTimeout(() => {
+    const item = list.value[nowIndex.value];
+    if (item) {
+      SelData.value = item;
+      show.value = true;
+    } else {
+      taskEnd();
+    }
+  }, suggestTime.value * 1000);
+}
+
+const list = ref([]);
+const SelData = ref(null);
+const nowIndex = ref(0);
+function close() {
+  suggestTime.value = 30;
+  taskEnd();
+  nowIndex.value += 1;
+  if (nowIndex.value == list.value.length) {
+    return;
+  }
+  statTime();
+}
+const suggestTime = ref(100);
+
+const emits = defineEmits(["onBuyClick"]);
+function buy() {
+  emits("onBuyClick", SelData.value.goods);
+}
+onMounted(() => {
+  suggestApi
+    .getGoods({
+      shopId: uni.cache.get("shopId"),
+    })
+    .then((res) => {
+      if (res) {
+        suggestTime.value = res.suggestTime;
+        list.value = (res.list || [])
+          .map((v) => {
+            return {
+              ...v,
+              goods: cartStore.returnGoods(v.foods),
+            };
+          })
+          .filter((v) => v.goods);
+          console.log('list.value ', list.value )
+        startWatch();
+      }
+    });
+});
+
+function startWatch() {
+  watch(
+    () => cartStore.isEmpty,
+    (newval) => {
+      if (newval && list.value.length) {
+        statTime();
+      } else {
+        clearInterval(timer);
+        nowIndex.value = 0;
+        show.value = false;
+      }
+    },
+    {
+      immediate: true,
+    }
+  );
+}
+</script>
+<style scoped lang="scss">
+.box {
+  position: fixed;
+  z-index: 100;
+  left: 30rpx;
+  right: 30rpx;
+  bottom: calc(var(--safe-area-inset-bottom) + 0px);
+  .item {
+    padding: 32rpx 28rpx;
+    border-radius: 16rpx;
+    background: #fff;
+    box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.05);
+    display: flex;
+  }
+  .price {
+    font-size: 40rpx;
+    color: #333;
+  }
+  .buy {
+    padding: 4rpx 28rpx;
+    border-radius: 36rpx;
+    background: #e8ad7b;
+    color: #ffffff;
+    font-size: 28rpx;
+    line-height: 48rpx;
+  }
+}
+.coverImg{
+  position: relative;
+}
+.limitDiscount {
+  background-color: #cc5617;
+  padding: 2rpx 10rpx;
+  white-space: nowrap;
+  text-align: center;
+  position: absolute;
+  top: 0;
+  left: 0;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #ffffff;
+  border-radius: 20rpx 0rpx 20rpx 0rpx;
+  z-index: 9;
+  color: #fff;
+}
+</style>
\ No newline at end of file
diff --git a/pages/product/components/shoppingCartes.vue b/pages/product/components/shoppingCartes.vue
index 04c9986..ddc39ed 100644
--- a/pages/product/components/shoppingCartes.vue
+++ b/pages/product/components/shoppingCartes.vue
@@ -1,836 +1,917 @@
 <template>
-	<view>
-		<up-popup :show="showCart" :round="20" :safeAreaInsetBottom="false" :zIndex="98" :overlayStyle="{ zIndex: 98 }"
-			@close="close">
-			<view class="cart-list-wrap">
-				<!-- 	<view class="cart-header flex-between">
+  <view>
+    <up-popup
+      :show="showCart"
+      :round="20"
+      :safeAreaInsetBottom="false"
+      :zIndex="98"
+      :overlayStyle="{ zIndex: 98 }"
+      @close="close"
+    >
+      <view class="cart-list-wrap">
+        <!-- 	<view class="cart-header flex-between">
 					<view class="num">已点 {{ cartLists_count }} 份</view>
 					<view class="clear" @click="cartclear">
 						<up-icon name="trash" color="#999"></up-icon>
 						<text class="t">清空</text>
 					</view>
 				</view> -->
-				<scroll-view scroll-y class="scroll-view">
-					<view class="list-wrap">
-						<view v-if="cartList.length>0">
-							<view class="ShoppingCart flex-between">
-								<view>
-									购物车
-								</view>
-								<view class="flex-between" @click="cartclear">
-									<up-icon name="trash" color="#999" size="20"></up-icon>
-									<text class="clear-btn">清空购物车</text>
-								</view>
+        <scroll-view scroll-y class="scroll-view">
+          <view class="list-wrap">
+            <view v-if="cartList.length > 0">
+              <view class="ShoppingCart flex-between">
+                <view> 购物车 </view>
+                <view class="flex-between" @click="cartclear">
+                  <up-icon name="trash" color="#999" size="20"></up-icon>
+                  <text class="clear-btn">清空购物车</text>
+                </view>
+              </view>
+              <view
+                class="shop-item"
+                v-for="(item, index) in cartList"
+                :key="item.id"
+              >
+                <view class="shop-item-content">
+                  <view class="cover" v-if="item.productId != -999">
+                    <view class="limit-discount" v-if="showLimitDiscount(item)">
+                      限时折扣
+                    </view>
+                    <up-image
+                      :src="item.coverImg"
+                      width="124rpx"
+                      height="124rpx"
+                      mode="aspectFill"
+                      radius="10"
+                    ></up-image>
+                  </view>
+                  <view class="info">
+                    <view class="name">
+                      {{
+                        item.cartListinfo.is_temporary == 1
+                          ? "临时菜"
+                          : item.name
+                      }}
+                    </view>
+                    <view class="select-sku-wrap" v-if="item.type == 'sku'">
+                      <text v-for="i in item.skuList" :key="i.id">
+                        {{ item.cartListinfo.sku_id == i.id ? i.name : "" }}
+                      </text>
+                    </view>
+                    <view class="select-sku-wrap" v-if="item.type == 'package'">
+                      <view
+                        v-for="(a, b) in dataprocessing(item.cartListinfo)"
+                        :key="b"
+                      >
+                        <!-- <view>{{a.title}}</view> -->
+                        <text
+                          v-for="i in a.goods"
+                          :key="i.proId"
+                          style="margin-left: 4rpx"
+                        >
+                          {{ i.proName }}
+                        </text>
+                      </view>
+                    </view>
+                    <view class="price-wrap" style="padding-top: 0">
+                      <view class="price">
+                        <text class="i">¥</text>
+                        <goodsPrice
+                          :limitDiscount="limitDiscount"
+                          :cart="item"
+                          :shopUserInfo="shopUserInfo"
+                          :shopInfo="shopInfo"
+                        ></goodsPrice>
 
-							</view>
-							<view class="shop-item" v-for="(item,index) in cartList" :key="item.id">
-								<view class="shop-item-content">
-									<view class="cover" v-if="item.productId!=-999">
-										<up-image :src="item.coverImg" width="80" radius="10" height="80"></up-image>
-									</view>
-									<view class="info">
-										<view class="name"> {{item.cartListinfo.is_temporary == 1?'临时菜' :item.name }}
-										</view>
-										<view class="select-sku-wrap" v-if="item.type == 'sku'">
-											<text v-for="i in item.skuList" :key="i.id">
-												{{item.cartListinfo.sku_id == i.id? i.name:"" }}
-											</text>
-										</view>
-										<view class="select-sku-wrap" v-if="item.type == 'package'">
-											<view v-for="(a,b) in dataprocessing(item.cartListinfo)" :key="b">
-												<!-- <view>{{a.title}}</view> -->
-												<text v-for="i in a.goods" :key="i.proId" style="margin-left: 4rpx;">
-													{{i.proName }}
-												</text>
-											</view>
-										</view>
-										<view class="price-wrap" style="padding-top: 0;">
-											<view class="price">
-												<text class="i">￥</text>
-												<!-- 会员价与价格 -->
-												<text class="price" v-if="item.type == 'sku'">
-													<text v-for="i in item.skuList" :key="i.id">
-														<!--  -->
-														{{item.cartListinfo.sku_id == i.id?(shopInfo.isVip ==1 && shopInfo.isMemberPrice==1?(i.memberPrice || i.salePrice):i.salePrice):''}}
-													</text>
-												</text>
-												<text class="price" v-else>
-													{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1?(item.memberPrice || item.salePrice):item.salePrice}}
-												</text>
-												<!-- <text class="originalprice"
+                        <text
+                          class="originalprice" v-if="showLimitDiscount(item)"
+                          >{{ item.salePrice }}</text
+                        >
+
+                        <!-- <text class="originalprice"
 													v-if="item.originPrice">¥{{item.originPrice}}</text>
 												<text class="unit" v-if="item.unitName">/{{item.unitName}}</text> -->
-											</view>
+                      </view>
 
-
-											<view class="operation-wrap">
-												<view class="btn">
-													<up-icon color="#E8AD7B" name="minus-circle" size="25"></up-icon>
-													<view class="btnClick" @click="cartListadd(item,'-')"></view>
-												</view>
-												<text class="num">{{ ifcartNumber(item) }}</text>
-												<view class="btn" v-if="item.type !='package'">
-													<!-- <up-icon name="plus-circle-fill"
+                      <view class="operation-wrap">
+                        <view class="btn">
+                          <up-icon
+                            color="#E8AD7B"
+                            name="minus-circle"
+                            size="18"
+                          ></up-icon>
+                          <view
+                            class="btnClick"
+                            @click="cartListadd(item, '-')"
+                          ></view>
+                        </view>
+                        <text class="num">{{ ifcartNumber(item) }}</text>
+                        <view class="btn" v-if="item.type != 'package'">
+                          <!-- <up-icon name="plus-circle-fill"
 														:color="{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1? '#CECECE' : '#E9AB7A'"
 														size="25"></up-icon> -->
-													<up-icon name="plus-circle-fill" color="#E8AD7B"
-														size="25"></up-icon>
-													<view class="btnClick" @click="cartListadd(item,'+')"></view>
-												</view>
-											</view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-						
-					</view>
-				</scroll-view>
-			</view>
-		</up-popup>
-	</view>
-
+                          <up-icon
+                            name="plus-circle-fill"
+                            color="#E8AD7B"
+                            size="18"
+                          ></up-icon>
+                          <view
+                            class="btnClick"
+                            @click="cartListadd(item, '+')"
+                          ></view>
+                        </view>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </up-popup>
+  </view>
 </template>
 
 <script setup>
-	import {
-		ref,
-		defineProps,
-		computed,
-		defineEmits
-	} from 'vue';
-	import {
-		productStore
-	} from '@/stores/user.js';
+import { ref, defineProps, computed, defineEmits, watch } from "vue";
+import { productStore } from "@/stores/user.js";
+import goodsPrice from "@/components/goods-price.vue";
+import * as orderUtils from "@/utils/order-utils.js";
 
-	// 定义自定义事件
-	const emits = defineEmits(['customevent', 'close', 'clickcancelOrder']);
+// 定义自定义事件
+const emits = defineEmits(["customevent", "close", "clickcancelOrder"]);
 
-	const props = defineProps({
-		cartList: {
-			type: Array
-		},
-		cartLists_count: {
-			type: Number,
-			default: 0
-		},
-		showCart: {
-			type: Boolean
-		},
-		orderinfo: {
-			type: Object,
-			default: {
-				detailMap: {}
-			}
-		},
+const props = defineProps({
+  cartList: {
+    type: Array,
+  },
+  cartLists_count: {
+    type: Number,
+    default: 0,
+  },
+  showCart: {
+    type: Boolean,
+  },
+  orderinfo: {
+    type: Object,
+    default: {
+      detailMap: {},
+    },
+  },
+  //限时折扣
+  limitDiscount: {
+    type: Object,
+    default: {},
+  },
+});
 
-	});
-	const shopInfo = uni.cache.get('shopInfo')
 
-	// 定义 ifcartNumber 计算属性方法
-	const ifcartNumber = computed(() => {
-		return (item) => {
-			// 如果 item 为空或者 cartNumber 不是字符串类型，返回 0
-			if (!item || typeof item.cartNumber !== 'string') {
-				return 0;
-			}
-			let numValue = parseFloat(item.cartNumber);
-			if (isNaN(numValue)) {
-				// 如果转换结果是 NaN，说明 cartNumber 不是有效的数字字符串，返回 0
-				return 0;
-			}
-			// type string  商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
-			if (item.type === 'weight') {
-				// 如果类型是称重重量，将值保留两位小数
-				return parseFloat(numValue.toFixed(2));
-			} else {
-				// 如果类型是整数，将值转换为整数
-				return Math.round(numValue);
-			}
-			// 如果类型不匹配，返回原始值
-			return item.cartNumber;
-		};
-	})
+function showLimitDiscount(item){
+  if (!props.limitDiscount||!props.limitDiscount.id) {
+    return false;
+  }
+  return orderUtils.canUseLimitTimeDiscount(
+    item,
+    props.limitDiscount,
+    shopInfo.value,
+    shopUserInfo.value,
+    "id"
+  );
+}
 
-	const close = () => {
-		emits("close", false)
-	}
-	// 购物车加减
-	const cartListadd = async (item, i) => {
-		// 是否起售 如果小于或者大于都是1
-		const cartNumberFloat = parseFloat(item.cartNumber);
-		const suitNum = item.suitNum >= cartNumberFloat && i == '-' ? item.cartNumber : 1;
+watch(
+  () => props.cartList,
+  (newCartList) => {
+    console.log("购物车数据变化", newCartList);
+  },
+  {
+    deep: true,
+  }
+);
+const shopInfo = ref(uni.cache.get("shopInfo"));
+const shopUserInfo = ref(uni.cache.get("shopUserInfo"));
 
-		emits('customevent', {
-			id: item.cartListId ? item.cartListId : '',
-			type: 'shopping',
-			table_code: uni.cache.get('tableCode'),
-			shop_id: uni.cache.get('shopId'),
-			operate_type: calculateValue(item.cartNumber, i, suitNum) == 'del' ? 'del' : item.cartListId &&
-				item.cartNumber > 0 ? 'edit' : 'add',
-			product_id: item.id,
-			sku_id: item.skuId,
-			number: await calculateValue(item.cartNumber, i, suitNum),
-			is_print: 1,
-			suitNum: item.suitNum,
-		})
-	}
+function returnRealPrice(cart) {
+  const price = orderUtils.returnPrice({
+    goods: cart,
+    shopInfo: shopInfo,
+    limitDiscount: props.limitDiscount.id ? props.limitDiscount : null,
+    shopUserInfo: shopUserInfo,
+  });
+  if (goods.name == "纯生纯生纯生") {
+    console.log("returnRealPrice", price);
+  }
+  return price;
+}
 
-	const dataprocessing = computed(() => {
-		return (item) => {
-			let res = null
-			try {
-				res = JSON.parse(item.pro_group_info)
-			} catch (error) {
-				//TODO handle the exception
-			}
-			return res
-		};
-	})
+// 定义 ifcartNumber 计算属性方法
+const ifcartNumber = computed(() => {
+  return (item) => {
+    // 如果 item 为空或者 cartNumber 不是字符串类型，返回 0
+    if (!item || typeof item.cartNumber !== "string") {
+      return 0;
+    }
+    let numValue = parseFloat(item.cartNumber);
+    if (isNaN(numValue)) {
+      // 如果转换结果是 NaN，说明 cartNumber 不是有效的数字字符串，返回 0
+      return 0;
+    }
+    // type string  商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
+    if (item.type === "weight") {
+      // 如果类型是称重重量，将值保留两位小数
+      return parseFloat(numValue.toFixed(2));
+    } else {
+      // 如果类型是整数，将值转换为整数
+      return Math.round(numValue);
+    }
+    // 如果类型不匹配，返回原始值
+    return item.cartNumber;
+  };
+});
 
-	const clickcancelOrder = (i, key) => {
-		emits('clickcancelOrder', {
-			i,
-			key
-		})
-		emits('customevent', {
-			type: 'shopping',
-			table_code: uni.cache.get('tableCode'),
-			shop_id: uni.cache.get('shopId'),
-			operate_type: 'clearOrder',
-		})
-	}
+const close = () => {
+  emits("close", false);
+};
+// 购物车加减
+const cartListadd = async (item, i) => {
+  // 是否起售 如果小于或者大于都是1
+  const cartNumberFloat = parseFloat(item.cartNumber);
+  const suitNum =
+    item.suitNum >= cartNumberFloat && i == "-" ? item.cartNumber : 1;
 
-	const calculateValue = (cartNumber, i, step = 1) => {
-		if (i == '+') {
-			const result = parseFloat(cartNumber) + parseFloat(step);
-			return result.toFixed(2);
-		} else {
-			// 当减到0返回del
-			const result = parseFloat(cartNumber) - parseFloat(step);
-			return result == 0 ? 'del' : result.toFixed(2);
-		}
-	}
+  emits("customevent", {
+    id: item.cartListId ? item.cartListId : "",
+    type: "shopping",
+    table_code: uni.cache.get("tableCode"),
+    shop_id: uni.cache.get("shopId"),
+    operate_type:
+      calculateValue(item.cartNumber, i, suitNum) == "del"
+        ? "del"
+        : item.cartListId && item.cartNumber > 0
+        ? "edit"
+        : "add",
+    product_id: item.id,
+    sku_id: item.skuId,
+    number: await calculateValue(item.cartNumber, i, suitNum),
+    is_print: 1,
+    suitNum: item.suitNum,
+  });
+};
 
-	// 菜品备注修改
-	const productBlur = (item) => {
-		let params = {
-			"skuId": item.skuId,
-			"num": item.number, //数量
-			"type": item.type,
-			"isVip": item.isVip,
-			"productId": item.productId, //商品id
-			"note": item.note,
-			"shopId": this.shopId,
-			"userId": uni.cache.get('userInfo').id,
-			"tableId": this.tableCode,
-		}
-		this.$emit("addCart", params)
-	}
+const dataprocessing = computed(() => {
+  return (item) => {
+    let res = null;
+    try {
+      res = JSON.parse(item.pro_group_info);
+    } catch (error) {
+      //TODO handle the exception
+    }
+    return res;
+  };
+});
 
-	// 清空购物车
-	const cartclear = () => {
-		emits('customevent', {
-			type: 'shopping',
-			table_code: uni.cache.get('tableCode'),
-			shop_id: uni.cache.get('shopId'),
-			operate_type: 'cleanup',
-		})
-	}
+const clickcancelOrder = (i, key) => {
+  emits("clickcancelOrder", {
+    i,
+    key,
+  });
+  emits("customevent", {
+    type: "shopping",
+    table_code: uni.cache.get("tableCode"),
+    shop_id: uni.cache.get("shopId"),
+    operate_type: "clearOrder",
+  });
+};
+
+const calculateValue = (cartNumber, i, step = 1) => {
+  if (i == "+") {
+    const result = parseFloat(cartNumber) + parseFloat(step);
+    return result.toFixed(2);
+  } else {
+    // 当减到0返回del
+    const result = parseFloat(cartNumber) - parseFloat(step);
+    return result == 0 ? "del" : result.toFixed(2);
+  }
+};
+
+// 菜品备注修改
+const productBlur = (item) => {
+  let params = {
+    skuId: item.skuId,
+    num: item.number, //数量
+    type: item.type,
+    isVip: item.isVip,
+    productId: item.productId, //商品id
+    note: item.note,
+    shopId: this.shopId,
+    userId: uni.cache.get("userInfo").id,
+    tableId: this.tableCode,
+  };
+  this.$emit("addCart", params);
+};
+
+// 清空购物车
+const cartclear = () => {
+  emits("customevent", {
+    type: "shopping",
+    table_code: uni.cache.get("tableCode"),
+    shop_id: uni.cache.get("shopId"),
+    operate_type: "cleanup",
+  });
+};
 </script>
 
 <style lang="scss">
-	.clear-btn{
-		color: #333;
-		font-size: 24rpx;
-		font-weight: 500;
-	}
-	.cart-list-wrap {
-		.cart-header {
-			display: flex;
-			height: 72rpx;
-			background-color: #F2F2F2;
-			align-items: center;
-			justify-content: space-between;
-			padding: 20upx 28rpx;
-			border-radius: 20upx 20upx 0 0;
-
-			.num {
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #333333;
-			}
-
-			.clear {
-				display: flex;
-				align-items: center;
-
-				.t {
-					font-size: 24upx;
-					color: #999;
-					margin-left: 4upx;
-				}
-			}
-		}
-
-		.scroll-view {
-			max-height: 60vh;
-			margin-bottom: 190rpx;
-
-			.list-wrap {
-				padding: 0 28rpx;
-
-				.ShoppingCart {
-					font-size: 30rpx;
-					text-align: left;
-					padding: 20rpx 0;
-					font-weight: 700;
-					border-bottom: 1rpx solid #cecece;
-					color: #000;
-
-				}
-
-				.shop-item:last-child {
-					border-bottom: 1rpx solid #cecece;
-					padding-bottom: 20rpx;
-				}
-
-				.shop-item {
-					margin-top: 15rpx;
-					display: flex;
-					flex-direction: column;
-
-					.shop-item-content {
-						display: flex;
-						justify-content: center;
-						align-items: center;
-					}
-
-					.shop-item-remark {
-						display: flex;
-						align-items: center;
-						padding-right: 180rpx;
-						margin-top: 10rpx;
-
-						.label {
-							font-size: 28rpx;
-							color: #666;
-							margin-right: 20rpx;
-						}
-
-					}
-
-					.langcover {
-						position: relative;
-					}
-
-					.langcover::after {
-						content: '加载中..';
-						position: absolute;
-						top: 0;
-						left: 0;
-						height: 100%;
-						width: 100%;
-						background-color: #e8e8e8;
-						color: #6b6b6b;
-						border-radius: 10rpx;
-						text-align: center;
-						line-height: 180rpx;
-						z-index: 1;
-					}
-
-					.info {
-						flex: 1;
-						padding-left: 20rpx;
-
-						.name {
-							font-size: 28upx;
-							font-weight: bold;
-							color: #333;
-							margin-bottom: 5rpx;
-						}
-
-						.select-sku-wrap {
-							font-weight: 400;
-							font-size: 24rpx;
-							color: #999999;
-						}
-
-						.price-wrap {
-							margin-top: 16rpx;
-							display: flex;
-							align-items: center;
-							justify-content: space-between;
-
-							.price {
-								display: flex;
-								align-items: flex-end;
-
-								.i,
-								.num {
-									font-weight: bold;
-									font-size: 32rpx;
-									color: #333333;
-								}
-
-								.i {
-									position: relative;
-									bottom: 4upx;
-								}
-
-								.price {
-									font-family: Source Han Sans CN, Source Han Sans CN;
-									font-weight: bold;
-									font-size: 36rpx;
-									color: #333333;
-								}
-
-								.originalprice {
-									margin-left: 10rpx;
-									font-family: Source Han Sans CN, Source Han Sans CN;
-									font-weight: 400;
-									font-size: 20rpx;
-									text-decoration: line-through;
-								}
-
-								.unit {
-									font-family: Source Han Sans CN, Source Han Sans CN;
-									font-weight: 400;
-									font-size: 36rpx;
-									color: #333333;
-								}
-
-								.lineThrough {
-									font-weight: normal;
-									text-decoration: line-through;
-									color: #999 !important;
-									font-size: 24rpx !important;
-								}
-							}
-
-							.sku-wrap {
-								padding: 6upx 16upx;
-								background-color: #ffd100;
-								border-radius: 12upx;
-								display: flex;
-								align-items: center;
-								justify-content: center;
-								position: relative;
-
-								.t {
-									font-size: 24upx;
-									font-weight: bold;
-								}
-
-								.dot {
-									display: flex;
-									align-items: center;
-									justify-content: center;
-									font-size: 20upx;
-									position: absolute;
-									padding: 2upx 12upx;
-									border-radius: 8upx;
-									background-color: #eb5232;
-									color: #fff;
-									position: absolute;
-									top: -14upx;
-									right: -8upx;
-								}
-
-							}
-
-							.operation-wrap {
-								display: flex;
-								align-items: center;
-
-								.num {
-									font-size: 32upx;
-									padding: 0 16upx;
-								}
-
-								.btn {
-									position: relative;
-									display: flex;
-									align-items: center;
-									justify-content: center;
-									position: relative;
-
-									.btnClick {
-										width: 100rpx;
-										height: 100rpx;
-										position: absolute;
-										// bottom: 0;
-									}
-
-									.btnClick.l {
-										right: 0;
-									}
-
-									.btnClick.r {
-										left: 0;
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-		.card {
-			position: relative;
-
-			.cardcalorders {
-				position: relative;
-				padding: 20rpx 0;
-				font-size: 35rpx;
-				font-weight: bold;
-				border-bottom: 1rpx solid #cecece;
-				color: #000;
-
-				.absolute {
-					position: absolute;
-					right: 0;
-					top: 2rpx;
-					font-size: 24rpx;
-				}
-			}
-
-			.card_item {
-				display: flex;
-				flex-direction: column;
-				position: relative;
-
-				.head {
-					display: flex;
-					justify-content: space-between;
-
-					.head_left {
-						width: 100%;
-						display: flex;
-						justify-content: space-between;
-						padding: 20rpx 0;
-						border-bottom: 1rpx solid #cecece;
-
-						.placeNum {
-							font-weight: 700;
-							font-size: 27rpx;
-							color: #3e3d3d;
-						}
-
-						.placeTime {
-							font-weight: 400;
-							font-size: 32rpx;
-							color: #999;
-
-							.t {
-								margin-left: 4rpx;
-								font-size: 24rpx;
-							}
-						}
-					}
-
-				}
-
-				.shop-info {
-					border-bottom: 2rpx dashed #e5e5e5;
-
-
-					.item {
-						margin: 30rpx 0;
-						display: flex;
-
-						.info {
-							flex: 1;
-							display: flex;
-							flex-direction: column;
-							padding-left: 16upx;
-
-							.productName {
-								font-weight: bold;
-								font-size: 28rpx;
-								color: #333333;
-								margin-top: 20rpx;
-							}
-
-							.productSkuName {
-								font-weight: 400;
-								font-size: 24rpx;
-								color: #999999;
-								display: -webkit-box;
-								-webkit-box-orient: vertical;
-								-webkit-line-clamp: 3;
-								overflow: hidden;
-								text-overflow: ellipsis;
-							}
-
-							.n {
-								font-size: 24upx;
-								color: #999;
-							}
-						}
-
-						.price {
-							display: flex;
-							flex-direction: column;
-							align-items: flex-end;
-
-							.priceAmount {
-								font-weight: 500;
-								font-size: 28rpx;
-								color: #333333;
-								margin-top: 26rpx;
-							}
-
-							.num {
-								font-weight: 400;
-								font-size: 24rpx;
-								color: #999999;
-								margin-top: 22rpx;
-							}
-						}
-					}
-				}
-
-				.status {
-					align-self: flex-end;
-					width: 92rpx;
-					height: 40rpx;
-					line-height: 40rpx;
-					text-align: center;
-					background: #999999;
-					border-radius: 10rpx 10rpx 10rpx 10rpx;
-					font-weight: 400;
-					font-size: 22rpx;
-					color: #FFFFFF;
-					margin-top: 32rpx;
-				}
-
-				.totalAmount {
-					width: 100%;
-					display: flex;
-					justify-content: flex-end;
-					align-items: flex-end;
-					padding: 32rpx 0;
-					border-bottom: 2rpx dashed #e5e5e5;
-
-					.label {
-						font-weight: bold;
-						font-size: 28rpx;
-						color: #333333;
-					}
-
-					.price {
-						font-weight: bold;
-						font-size: 36rpx;
-						color: #333333;
-					}
-				}
-
-				.semicircle_icon {
-					width: 100%;
-					position: absolute;
-					top: -22.5rpx;
-					left: 0;
-					display: flex;
-					justify-content: space-between;
-
-					.semicircle_left_icon {
-						width: 45rpx;
-						height: 45rpx;
-						margin-left: -22.5rpx;
-						background-color: #f9f9f9;
-						border-radius: 50%;
-						// box-shadow: inset -20rpx 0rpx 22rpx -20rpx rgba(87, 86, 86, 0.35);
-
-					}
-
-					.semicircle_right_icon {
-						width: 45rpx;
-						height: 45rpx;
-						margin-right: -22.5rpx;
-						background-color: #f9f9f9;
-						border-radius: 50%;
-						// box-shadow: inset 13rpx 0rpx 16rpx -9rpx rgba(87, 86, 86, 0.35);
-
-					}
-				}
-			}
-
-			.cell-item {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				padding: 32rpx 34rpx 0 34rpx;
-
-				.label {
-					font-weight: bold;
-					font-size: 32rpx;
-					color: #333333;
-					padding-bottom: 32rpx;
-				}
-
-				.val {
-					display: flex;
-					align-items: flex-end;
-					padding-bottom: 32rpx;
-					border-bottom: 2rpx dashed #e5e5e5;
-
-					view:nth-child(1) {
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #999999;
-						margin-right: 42rpx;
-					}
-
-					view:nth-child(2) {
-						display: flex;
-						align-items: flex-end;
-						font-weight: bold;
-						font-size: 36rpx;
-						color: #333333;
-					}
-				}
-
-				.val.column {
-					display: flex;
-					flex-direction: column;
-
-					.productCoupon {
-						display: flex;
-						align-items: flex-end;
-						margin: 0 0 10rpx 0;
-
-						.name {
-							font-weight: 400;
-							font-size: 26rpx;
-							color: #999;
-							margin: 0;
-						}
-
-						.num {
-							font-weight: 400;
-							font-size: 26rpx;
-							color: #999;
-							margin: 0 30rpx;
-							line-height: 20rpx;
-						}
-
-						.amount {
-							font-weight: bold;
-							font-size: 26rpx;
-							color: #333;
-						}
-					}
-				}
-			}
-
-			.favorable {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				padding: 0 30rpx;
-				box-sizing: border-box;
-				padding-bottom: 26rpx;
-				padding-top: 26rpx;
-				border-bottom: 2rpx solid #E5E5E5;
-
-				.favorable_left {
-					display: flex;
-					align-items: center;
-
-					.icon {
-						width: 40rpx;
-						height: 40rpx;
-						margin-right: 16rpx;
-					}
-
-					.name {
-						font-size: 28rpx;
-						font-weight: 400rpx;
-						color: #333;
-					}
-				}
-
-				.favorable_right {
-					display: flex;
-					align-items: center;
-
-					.favorable_right_text {
-						font-size: 24rpx;
-						color: #999;
-						font-weight: 400rpx;
-					}
-
-				}
-
-				.favorable_right {
-					.column {
-						display: flex;
-						flex-direction: column;
-						align-items: flex-end;
-
-						.favorable_right_text {
-							margin-bottom: 10rpx;
-
-							text:nth-child(1) {
-								font-size: 26rpx;
-								color: #999;
-							}
-
-							text:nth-child(2) {
-								font-size: 26rpx;
-								color: #999;
-								margin: 0 30rpx;
-							}
-
-							text:nth-child(3) {
-								font-size: 26rpx;
-								color: #333;
-
-							}
-						}
-					}
-				}
-
-				.favorable_right.column {
-					align-items: flex-start;
-				}
-			}
-
-			.favorable.column {
-				align-items: flex-start;
-			}
-
-			.cell-item.column {
-				align-items: flex-start;
-			}
-
-			.total-wrap {
-				width: 100%;
-				display: flex;
-				justify-content: flex-end;
-				align-items: flex-end;
-				padding: 0 34rpx;
-				font-weight: bold;
-				font-size: 28rpx;
-				color: #333333;
-				margin-top: 64rpx;
-
-				.price {
-					font-weight: bold;
-					font-size: 36rpx;
-				}
-			}
-
-			.order_footer {
-				display: flex;
-				flex-direction: column;
-				padding: 34rpx;
-				position: relative;
-			}
-
-		}
-
-	}
+.clear-btn {
+  color: #333;
+  font-size: 24rpx;
+  font-weight: 500;
+}
+.cart-list-wrap {
+  .cart-header {
+    display: flex;
+    height: 72rpx;
+    background-color: #f2f2f2;
+    align-items: center;
+    justify-content: space-between;
+    padding: 20upx 28rpx;
+    border-radius: 20upx 20upx 0 0;
+
+    .num {
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #333333;
+    }
+
+    .clear {
+      display: flex;
+      align-items: center;
+
+      .t {
+        font-size: 24upx;
+        color: #999;
+        margin-left: 4upx;
+      }
+    }
+  }
+
+  .scroll-view {
+    max-height: 60vh;
+    margin-bottom: 190rpx;
+
+    .list-wrap {
+      padding: 0 28rpx;
+
+      .ShoppingCart {
+        font-size: 30rpx;
+        text-align: left;
+        padding: 20rpx 0;
+        font-weight: 700;
+        border-bottom: 1rpx solid #cecece;
+        color: #000;
+      }
+
+      .shop-item:last-child {
+        border-bottom: 1rpx solid #cecece;
+        padding-bottom: 20rpx;
+      }
+
+      .shop-item {
+        margin-top: 15rpx;
+        display: flex;
+        flex-direction: column;
+
+        .shop-item-content {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          .cover {
+            position: relative;
+            .limit-discount {
+              position: absolute;
+              background: #cc5617;
+              font-size: 24rpx;
+              color: #fff;
+              border-radius: 20rpx 0 20rpx 0;
+              padding: 2rpx 10rpx;
+              z-index: 1;
+            }
+          }
+        }
+
+        .shop-item-remark {
+          display: flex;
+          align-items: center;
+          padding-right: 180rpx;
+          margin-top: 10rpx;
+
+          .label {
+            font-size: 28rpx;
+            color: #666;
+            margin-right: 20rpx;
+          }
+        }
+
+        .langcover {
+          position: relative;
+        }
+
+        .langcover::after {
+          content: "加载中..";
+          position: absolute;
+          top: 0;
+          left: 0;
+          height: 100%;
+          width: 100%;
+          background-color: #e8e8e8;
+          color: #6b6b6b;
+          border-radius: 10rpx;
+          text-align: center;
+          line-height: 180rpx;
+          z-index: 1;
+        }
+
+        .info {
+          flex: 1;
+          padding-left: 20rpx;
+
+          .name {
+            font-size: 28upx;
+            font-weight: bold;
+            color: #333;
+            margin-bottom: 5rpx;
+          }
+
+          .select-sku-wrap {
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #999999;
+          }
+
+          .price-wrap {
+            margin-top: 16rpx;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+
+            .price {
+              display: flex;
+              align-items: baseline;
+
+              .i,
+              .num {
+                font-weight: bold;
+                font-size: 32rpx;
+                color: #333333;
+              }
+
+              .i {
+              }
+
+              .price {
+                font-family: Source Han Sans CN, Source Han Sans CN;
+                font-weight: bold;
+                font-size: 32rpx;
+                color: #333333;
+              }
+
+              .originalprice {
+                color: #999;
+                margin-left: 10rpx;
+                font-weight: 400;
+                font-size: 24rpx;
+                text-decoration: line-through;
+              }
+
+              .unit {
+                font-family: Source Han Sans CN, Source Han Sans CN;
+                font-weight: 400;
+                font-size: 36rpx;
+                color: #333333;
+              }
+
+              .lineThrough {
+                font-weight: normal;
+                text-decoration: line-through;
+                color: #999 !important;
+                font-size: 24rpx !important;
+              }
+            }
+
+            .sku-wrap {
+              padding: 6upx 16upx;
+              background-color: #ffd100;
+              border-radius: 12upx;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              position: relative;
+
+              .t {
+                font-size: 24upx;
+                font-weight: bold;
+              }
+
+              .dot {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                font-size: 20upx;
+                position: absolute;
+                padding: 2upx 12upx;
+                border-radius: 8upx;
+                background-color: #eb5232;
+                color: #fff;
+                position: absolute;
+                top: -14upx;
+                right: -8upx;
+              }
+            }
+
+            .operation-wrap {
+              display: flex;
+              align-items: center;
+
+              .num {
+                font-size: 32upx;
+                padding: 0 16upx;
+              }
+
+              .btn {
+                position: relative;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                position: relative;
+
+                .btnClick {
+                  width: 100rpx;
+                  height: 100rpx;
+                  position: absolute;
+                  // bottom: 0;
+                }
+
+                .btnClick.l {
+                  right: 0;
+                }
+
+                .btnClick.r {
+                  left: 0;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .card {
+    position: relative;
+
+    .cardcalorders {
+      position: relative;
+      padding: 20rpx 0;
+      font-size: 35rpx;
+      font-weight: bold;
+      border-bottom: 1rpx solid #cecece;
+      color: #000;
+
+      .absolute {
+        position: absolute;
+        right: 0;
+        top: 2rpx;
+        font-size: 24rpx;
+      }
+    }
+
+    .card_item {
+      display: flex;
+      flex-direction: column;
+      position: relative;
+
+      .head {
+        display: flex;
+        justify-content: space-between;
+
+        .head_left {
+          width: 100%;
+          display: flex;
+          justify-content: space-between;
+          padding: 20rpx 0;
+          border-bottom: 1rpx solid #cecece;
+
+          .placeNum {
+            font-weight: 700;
+            font-size: 27rpx;
+            color: #3e3d3d;
+          }
+
+          .placeTime {
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #999;
+
+            .t {
+              margin-left: 4rpx;
+              font-size: 24rpx;
+            }
+          }
+        }
+      }
+
+      .shop-info {
+        border-bottom: 2rpx dashed #e5e5e5;
+
+        .item {
+          margin: 30rpx 0;
+          display: flex;
+
+          .info {
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            padding-left: 16upx;
+
+            .productName {
+              font-weight: bold;
+              font-size: 28rpx;
+              color: #333333;
+              margin-top: 20rpx;
+            }
+
+            .productSkuName {
+              font-weight: 400;
+              font-size: 24rpx;
+              color: #999999;
+              display: -webkit-box;
+              -webkit-box-orient: vertical;
+              -webkit-line-clamp: 3;
+              overflow: hidden;
+              text-overflow: ellipsis;
+            }
+
+            .n {
+              font-size: 24upx;
+              color: #999;
+            }
+          }
+
+          .price {
+            display: flex;
+            flex-direction: column;
+            align-items: flex-end;
+
+            .priceAmount {
+              font-weight: 500;
+              font-size: 28rpx;
+              color: #333333;
+              margin-top: 26rpx;
+            }
+
+            .num {
+              font-weight: 400;
+              font-size: 24rpx;
+              color: #999999;
+              margin-top: 22rpx;
+            }
+          }
+        }
+      }
+
+      .status {
+        align-self: flex-end;
+        width: 92rpx;
+        height: 40rpx;
+        line-height: 40rpx;
+        text-align: center;
+        background: #999999;
+        border-radius: 10rpx 10rpx 10rpx 10rpx;
+        font-weight: 400;
+        font-size: 22rpx;
+        color: #ffffff;
+        margin-top: 32rpx;
+      }
+
+      .totalAmount {
+        width: 100%;
+        display: flex;
+        justify-content: flex-end;
+        align-items: flex-end;
+        padding: 32rpx 0;
+        border-bottom: 2rpx dashed #e5e5e5;
+
+        .label {
+          font-weight: bold;
+          font-size: 28rpx;
+          color: #333333;
+        }
+
+        .price {
+          font-weight: bold;
+          font-size: 36rpx;
+          color: #333333;
+        }
+      }
+
+      .semicircle_icon {
+        width: 100%;
+        position: absolute;
+        top: -22.5rpx;
+        left: 0;
+        display: flex;
+        justify-content: space-between;
+
+        .semicircle_left_icon {
+          width: 45rpx;
+          height: 45rpx;
+          margin-left: -22.5rpx;
+          background-color: #f9f9f9;
+          border-radius: 50%;
+          // box-shadow: inset -20rpx 0rpx 22rpx -20rpx rgba(87, 86, 86, 0.35);
+        }
+
+        .semicircle_right_icon {
+          width: 45rpx;
+          height: 45rpx;
+          margin-right: -22.5rpx;
+          background-color: #f9f9f9;
+          border-radius: 50%;
+          // box-shadow: inset 13rpx 0rpx 16rpx -9rpx rgba(87, 86, 86, 0.35);
+        }
+      }
+    }
+
+    .cell-item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 32rpx 34rpx 0 34rpx;
+
+      .label {
+        font-weight: bold;
+        font-size: 32rpx;
+        color: #333333;
+        padding-bottom: 32rpx;
+      }
+
+      .val {
+        display: flex;
+        align-items: flex-end;
+        padding-bottom: 32rpx;
+        border-bottom: 2rpx dashed #e5e5e5;
+
+        view:nth-child(1) {
+          font-weight: 400;
+          font-size: 24rpx;
+          color: #999999;
+          margin-right: 42rpx;
+        }
+
+        view:nth-child(2) {
+          display: flex;
+          align-items: flex-end;
+          font-weight: bold;
+          font-size: 36rpx;
+          color: #333333;
+        }
+      }
+
+      .val.column {
+        display: flex;
+        flex-direction: column;
+
+        .productCoupon {
+          display: flex;
+          align-items: flex-end;
+          margin: 0 0 10rpx 0;
+
+          .name {
+            font-weight: 400;
+            font-size: 26rpx;
+            color: #999;
+            margin: 0;
+          }
+
+          .num {
+            font-weight: 400;
+            font-size: 26rpx;
+            color: #999;
+            margin: 0 30rpx;
+            line-height: 20rpx;
+          }
+
+          .amount {
+            font-weight: bold;
+            font-size: 26rpx;
+            color: #333;
+          }
+        }
+      }
+    }
+
+    .favorable {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 0 30rpx;
+      box-sizing: border-box;
+      padding-bottom: 26rpx;
+      padding-top: 26rpx;
+      border-bottom: 2rpx solid #e5e5e5;
+
+      .favorable_left {
+        display: flex;
+        align-items: center;
+
+        .icon {
+          width: 40rpx;
+          height: 40rpx;
+          margin-right: 16rpx;
+        }
+
+        .name {
+          font-size: 28rpx;
+          font-weight: 400rpx;
+          color: #333;
+        }
+      }
+
+      .favorable_right {
+        display: flex;
+        align-items: center;
+
+        .favorable_right_text {
+          font-size: 24rpx;
+          color: #999;
+          font-weight: 400rpx;
+        }
+      }
+
+      .favorable_right {
+        .column {
+          display: flex;
+          flex-direction: column;
+          align-items: flex-end;
+
+          .favorable_right_text {
+            margin-bottom: 10rpx;
+
+            text:nth-child(1) {
+              font-size: 26rpx;
+              color: #999;
+            }
+
+            text:nth-child(2) {
+              font-size: 26rpx;
+              color: #999;
+              margin: 0 30rpx;
+            }
+
+            text:nth-child(3) {
+              font-size: 26rpx;
+              color: #333;
+            }
+          }
+        }
+      }
+
+      .favorable_right.column {
+        align-items: flex-start;
+      }
+    }
+
+    .favorable.column {
+      align-items: flex-start;
+    }
+
+    .cell-item.column {
+      align-items: flex-start;
+    }
+
+    .total-wrap {
+      width: 100%;
+      display: flex;
+      justify-content: flex-end;
+      align-items: flex-end;
+      padding: 0 34rpx;
+      font-weight: bold;
+      font-size: 28rpx;
+      color: #333333;
+      margin-top: 64rpx;
+
+      .price {
+        font-weight: bold;
+        font-size: 36rpx;
+      }
+    }
+
+    .order_footer {
+      display: flex;
+      flex-direction: column;
+      padding: 34rpx;
+      position: relative;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/pages/product/index.vue b/pages/product/index.vue
index 5a78e68..2770980 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -1,519 +1,1000 @@
 <template>
-	<view>
-		<Nav />
-		<!-- 顶部面板 -->
-		<view class="top--panel" :class="{ grayscale: !isBusinessTime }">
-			<image
-				class="panelimgbackground"
-				:src="shopExtend ? shopExtend.value : 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/topBanner.png'"
-				mode="aspectFill"
-			></image>
-			<view class="panelone flex-start">
-				<view class="u-flex u-flex-y-center">
-					<text>
-						{{ shopInfo.shopName }}
-					</text>
-					<view class="u-flex u-flex-y-center u-m-t-4">
-						<up-icon name="arrow-right" color="#999999" size="14"></up-icon>
-					</view>
-				</view>
-				<!-- <up-icon name="arrow-right" color="#999999" size="14"></up-icon> -->
-			</view>
-			<view class="paneltow" v-if="distance">距离您{{ distance }}</view>
-			<view class="panelthere flex-between">
-				<view class="paneltheretext">
-					营业时间：{{ (shopInfo.businessStartDay || '--') + ' 至 ' + (shopInfo.businessEndDay || '--') }} {{ endTimeref.startTime }} -
-					{{ endTimeref.endTime < '05' ? ` 凌晨${endTimeref.endTime}` : endTimeref.endTime }}
-				</view>
-				<view class="flex-start" @click="callChildMethod">
-					<view style="margin-right: 14rpx">查看</view>
-					<up-icon name="arrow-down" color="#999999" size="14"></up-icon>
-				</view>
-			</view>
-			<!-- 本店招牌菜 -->
-			<view class="panelfour" v-if="shopProductList.hots && shopProductList.hots.length > 0">本店招牌菜</view>
-			<view class="panelfive">
-				<scroll-view :scroll-x="true" :scroll-with-animation="false">
-					<view class="panelfive_list">
-						<view class="panelfiveitem" @click="clickspecifications(item, index, index, '热销')" v-for="(item, index) in shopProductList.hots" :key="index">
-							<image class="panelfiveitemimage" :src="item.coverImg" mode="aspectFill"></image>
-							<view
-								class="vifgoodsImg flex-center"
-								v-if="item.isSale == 0 || (item.isSaleTime == 0 && !item.isSaleTimeshow) || item.isSoldStock == 1 || (item.isStock == 1 && item.stockNumber <= 0)"
-							>
-								<image v-if="item.isSale == 0" src="@/static/ztt/icon_goods_yxj.svg" style="width: 200rpx; height: 100%" mode=""></image>
-								<image
-									v-else-if="item.isSaleTime == 0 && !item.isSaleTimeshow"
-									src="@/static/ztt/icon_goods_wks.svg"
-									style="width: 200rpx; height: 100%"
-									mode=""
-								></image>
-								<image v-else-if="item.isSoldStock == 1" src="@/static/ztt/icon_goods_sq.svg" style="width: 200rpx; height: 100%" mode=""></image>
-								<image
-									v-else-if="item.isStock == 1 && item.stockNumber <= 0"
-									src="@/static/ztt/icon_goods_kcbz.svg"
-									style="width: 200rpx; height: 100%"
-									mode=""
-								></image>
-							</view>
-							<view class="panelfiveitemone">
-								{{ item.name }}
-							</view>
-							<view class="panelfiveitemtow">本店回头客第{{ index + 1 }}名</view>
-							<view class="panelfiveitemthere flex-between">
-								<text>招牌</text>
-								<view class="describe" v-if="item.suitNum > 1 && item.type != 'sku'" style="font-size: 20rpx; margin-top: 10rpx">
-									「{{ item.suitNum }}{{ item.unitName }}起点」
-								</view>
-							</view>
+  <view>
+    <Nav />
+    <!-- 顶部面板 -->
+    <view class="top--panel" :class="{ grayscale: !isBusinessTime }">
+      <image
+        class="panelimgbackground"
+        :src="
+          shopExtend
+            ? shopExtend.value
+            : 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/topBanner.png'
+        "
+        mode="aspectFill"
+      ></image>
+      <view class="panelone flex-start">
+        <view class="u-flex u-flex-y-center">
+          <text>
+            {{ shopInfo.shopName }}
+          </text>
+          <view class="u-flex u-flex-y-center u-m-t-4">
+            <up-icon name="arrow-right" color="#999999" size="14"></up-icon>
+          </view>
+        </view>
+        <!-- <up-icon name="arrow-right" color="#999999" size="14"></up-icon> -->
+      </view>
+      <view class="paneltow" v-if="distance">距离您{{ distance }}</view>
+      <view class="panelthere flex-between">
+        <view class="paneltheretext">
+          营业时间：{{
+            (shopInfo.businessStartDay || "--") +
+            " 至 " +
+            (shopInfo.businessEndDay || "--")
+          }}
+          {{ endTimeref.startTime }} -
+          {{
+            endTimeref.endTime < "05"
+              ? ` 凌晨${endTimeref.endTime}`
+              : endTimeref.endTime
+          }}
+        </view>
+        <view class="flex-start" @click="callChildMethod">
+          <view style="margin-right: 14rpx">查看</view>
+          <up-icon name="arrow-down" color="#999999" size="14"></up-icon>
+        </view>
+      </view>
+      <!-- 本店招牌菜 -->
+      <view
+        class="panelfour"
+        v-if="shopProductList.hots && shopProductList.hots.length > 0"
+        >本店招牌菜</view
+      >
+      <view class="panelfive">
+        <scroll-view :scroll-x="true" :scroll-with-animation="false">
+          <view class="panelfive_list">
+            <view
+              class="panelfiveitem"
+              @click="clickspecifications(item, index, index, '热销')"
+              v-for="(item, index) in shopProductList.hots"
+              :key="index"
+            >
+              <!-- <view class="limitDiscount" v-if="showLimitDiscount(item)"
+                >限时折扣</view
+              > -->
+              <view class="limitDiscount" v-if="item.is_time_discount"
+                >限时折扣</view
+              >
+              <image
+                @click.stop="getImgs(item)"
+                class="panelfiveitemimage"
+                :src="item.coverImg"
+                mode="aspectFill"
+              ></image>
+              <view
+                class="vifgoodsImg flex-center"
+                v-if="
+                  item.isSale == 0 ||
+                  (item.isSaleTime == 0 && !item.isSaleTimeshow) ||
+                  item.isSoldStock == 1 ||
+                  (item.isStock == 1 && item.stockNumber <= 0)
+                "
+              >
+                <image
+                  v-if="item.isSale == 0"
+                  src="@/static/ztt/icon_goods_yxj.svg"
+                  style="width: 200rpx; height: 100%"
+                  mode=""
+                ></image>
+                <image
+                  v-else-if="item.isSaleTime == 0 && !item.isSaleTimeshow"
+                  src="@/static/ztt/icon_goods_wks.svg"
+                  style="width: 200rpx; height: 100%"
+                  mode=""
+                ></image>
+                <image
+                  v-else-if="item.isSoldStock == 1"
+                  src="@/static/ztt/icon_goods_sq.svg"
+                  style="width: 200rpx; height: 100%"
+                  mode=""
+                ></image>
+                <image
+                  v-else-if="item.isStock == 1 && item.stockNumber <= 0"
+                  src="@/static/ztt/icon_goods_kcbz.svg"
+                  style="width: 200rpx; height: 100%"
+                  mode=""
+                ></image>
+              </view>
+              <view class="panelfiveitemone">
+                {{ item.name }}
+              </view>
+              <view class="panelfiveitemtow"
+                >本店回头客第{{ index + 1 }}名</view
+              >
+              <view class="panelfiveitemthere flex-between">
+                <text>招牌</text>
+                <view
+                  class="describe"
+                  v-if="item.suitNum > 1 && item.type != 'sku'"
+                  style="font-size: 20rpx; margin-top: 10rpx"
+                >
+                  「{{ item.suitNum }}{{ item.unitName }}起点」
+                </view>
+              </view>
 
-							<!-- <view class="panelfiveitemfour">
+              <!-- <view class="panelfiveitemfour">
 								{{item.shortTitle?item.shortTitle:''}}
 							</view>
 							<view class="panelfiveitemfive">
 								月售{{item.stockNumber}}
 							</view> -->
-							<view
-								v-if="item.isSoldStock == 1 || (item.isSaleTime == 0 && !item.isSaleTimeshow)"
-								class="flex-between"
-								style="margin-top: 32rpx; margin-bottom: 48rpx"
-							>
-								<view class="panelfiveitemsex flex-between">
-									<view class="panelfiveitemsex_oen">
-										<text class="tips" :class="shopInfo.isVip == 0 || shopInfo.isMemberPrice == 0 ? 'lineThrough' : ''">¥</text>
-										<!-- 会员价与价格 -->
-										<text class="price">
-											{{ shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1 ? item.memberPrice || item.salePrice : item.salePrice }}
-										</text>
-										<!-- 单位 -->
-										<text class="unit" v-if="item.unitName">/{{ item.unitName }}</text>
-									</view>
-								</view>
-								<view class="panelfiveitemNum">
-									<view class="sku-wrap flex-center" style="background-color: #cecece">
-										<text class="t" v-if="item.isSaleTime == 0 && !item.isSaleTimeshow">未开售</text>
-										<text class="t" v-if="item.isSoldStock == 1">已售罄</text>
-									</view>
-								</view>
-							</view>
+              <view
+                v-if="
+                  item.isSoldStock == 1 ||
+                  (item.isSaleTime == 0 && !item.isSaleTimeshow)
+                "
+                class="flex-between"
+                style="margin-top: 32rpx; margin-bottom: 48rpx"
+              >
+                <view class="panelfiveitemsex flex-between">
+                  <view class="panelfiveitemsex_oen">
+                    <text
+                      class="tips"
+                      :class="
+                        shopInfo.isVip == 0 || shopInfo.isMemberPrice == 0
+                          ? 'lineThrough'
+                          : ''
+                      "
+                      >¥</text
+                    >
+                    <!-- 会员价与价格 -->
+                    <text class="price">
+                      {{
+                        shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1
+                          ? item.memberPrice || item.salePrice
+                          : item.salePrice
+                      }}
+                    </text>
+                    <!-- 单位 -->
+                    <text class="unit" v-if="item.unitName"
+                      >/{{ item.unitName }}</text
+                    >
 
-							<view v-else class="flex-between" style="margin-top: 32rpx; margin-bottom: 48rpx; flex-wrap: inherit">
-								<view class="panelfiveitemsex flex-between">
-									<view class="panelfiveitemsex_oen">
-										<text class="tips" :class="shopInfo.isVip == 0 || shopInfo.isMemberPrice == 0 ? 'lineThrough' : ''">¥</text>
-										<!-- 会员价与价格 -->
-										<text class="price">
-											{{ shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1 ? item.memberPrice || item.salePrice : item.salePrice }}
-										</text>
-										<text class="unit" v-if="item.unitName">/{{ item.unitName }}</text>
-										<!-- <text v-if="item.suitNum>1 && item.type!= 'sku'"
+                    <text class="old-price">¥{{ item.salePrice }}</text>
+                  </view>
+                </view>
+                <view class="panelfiveitemNum">
+                  <view
+                    class="sku-wrap flex-center"
+                    style="background-color: #cecece"
+                  >
+                    <text
+                      class="t"
+                      v-if="item.isSaleTime == 0 && !item.isSaleTimeshow"
+                      >未开售</text
+                    >
+                    <text class="t" v-if="item.isSoldStock == 1">已售罄</text>
+                  </view>
+                </view>
+              </view>
+
+              <view
+                v-else
+                class="flex-between"
+                style="
+                  margin-top: 32rpx;
+                  margin-bottom: 48rpx;
+                  flex-wrap: inherit;
+                "
+              >
+                <view class="panelfiveitemsex flex-between">
+                  <view class="panelfiveitemsex_oen">
+                    <text
+                      class="tips"
+                      :class="
+                        shopInfo.isVip == 0 || shopInfo.isMemberPrice == 0
+                          ? 'lineThrough'
+                          : ''
+                      "
+                      >¥</text
+                    >
+                    <!-- 会员价与价格 -->
+                    <view class="price">
+                      <GoodsPrice
+                        :limitDiscount="limitTimeDiscountRes"
+                        :cart="item"
+                        :shopUserInfo="shopUserInfo"
+                        :key="item.id"
+                        :shopInfo="shopInfo"
+                      ></GoodsPrice>
+                    </view>
+
+                    <text class="unit" v-if="item.unitName"
+                      >/{{ item.unitName }}</text
+                    >
+                    <text class="old-price">¥{{ item.salePrice }}</text>
+                    <!-- <text v-if="item.suitNum>1 && item.type!= 'sku'"
 											style="font-size: 16rpx;">「{{item.suitNum}}{{item.unitName}}起点」</text> -->
-									</view>
-								</view>
-								<!-- single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券 -->
-								<view class="panelfiveitemNum">
-									<!-- v-if="item.type == 'single'|| item.type == 'weight' || item.type == 'coupon' || (item.type == 'package' && item.groupType=='0')" -->
-									<view
-										class="sku-wrap flex-center"
-										v-if="item.type == 'sku' || (item.type == 'package' && item.groupType == '1')"
-										@click.stop="clickspecifications(item, index, index1)"
-									>
-										<text class="t no-wrap" v-if="item.groupType == '1'">选择套餐</text>
-										<text class="t" v-else>选规格</text>
-										<text class="dot num" v-if="item.cartNumber > 0">{{ ifcartNumber(item) < 99 ? ifcartNumber(item) : '99+' }}</text>
-									</view>
-									<view class="Controls" v-else>
-										<view class="btn" v-if="item.cartNumber != '0'">
-											<up-icon name="minus-circle-fill" color="#E9AB7A" size="25"></up-icon>
-											<view class="btnClick" @tap.stop="$u.throttle(() => singleclick(item, '-'), 500)"></view>
-										</view>
-										<text class="num">{{ ifcartNumber(item) }}</text>
-										<view class="btn">
-											<up-icon name="plus-circle-fill" color="#E9AB7A" size="25"></up-icon>
-											<view class="btnClick" @tap.stop="$u.throttle(() => singleclick(item, '+'), 500)"></view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-		</view>
+                  </view>
+                </view>
+                <!-- single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券 -->
+                <view class="panelfiveitemNum">
+                  <!-- v-if="item.type == 'single'|| item.type == 'weight' || item.type == 'coupon' || (item.type == 'package' && item.groupType=='0')" -->
+                  <view
+                    class="sku-wrap flex-center"
+                    v-if="
+                      item.type == 'sku' ||
+                      (item.type == 'package' && item.groupType == '1')
+                    "
+                    @click.stop="clickspecifications(item, index, index1)"
+                  >
+                    <text class="t no-wrap" v-if="item.groupType == '1'"
+                      >选择套餐</text
+                    >
+                    <text class="t" v-else>选规格</text>
+                    <text class="dot num" v-if="item.cartNumber > 0">{{
+                      ifcartNumber(item) < 99 ? ifcartNumber(item) : "99+"
+                    }}</text>
+                  </view>
+                  <view class="Controls" v-else>
+                    <view class="btn" v-if="item.cartNumber != '0'">
+                      <up-icon
+                        name="minus-circle-fill"
+                        color="#E9AB7A"
+                        size="25"
+                      ></up-icon>
+                      <view
+                        class="btnClick"
+                        @tap.stop="
+                          $u.throttle(() => singleclick(item, '-'), 500)
+                        "
+                      ></view>
+                    </view>
+                    <text class="num">{{ ifcartNumber(item) }}</text>
+                    <view class="btn" >
+                      <up-icon
+                        name="plus-circle-fill"
+                        color="#E9AB7A"
+                        size="25"
+                      ></up-icon>
+                      <view
+                        class="btnClick"
+                        @tap.stop="
+                          $u.throttle(() => singleclick(item, '+'), 500)
+                        "
+                      ></view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
 
-		<!-- 滚动区域 -->
-		<view class="scroll-panel" id="scroll-panel" :class="{ grayscale: !isBusinessTime }">
-			<view class="list-box">
-				<view class="left" :style="{ top: `${store.height}px` }">
-					<scroll-view
-						:scroll-into-view="leftIntoView"
-						:scroll-with-animation="false"
-						:scroll-y="true"
-						:style="{ height: `${store.screenHeight - store.height}px` }"
-						style="padding-bottom: 200rpx"
-					>
-						<view
-							class="item"
-							v-for="(item, index) in shopProductList.productInfo"
-							:key="index"
-							:class="{ active: index == leftIndex }"
-							:id="'left-' + index"
-							:data-index="index"
-							@click="leftTap(index)"
-						>
-							<text>{{ item.name }}</text>
-						</view>
-					</scroll-view>
-				</view>
-				<view class="main">
-					<view>
-						<view class="item main-item" v-for="(item, index) in shopProductList.productInfo" :key="index" :id="'item-' + index">
-							<view class="title">
-								<view>{{ item.name }}</view>
-							</view>
-							<view class="goods" @click="clickspecifications(item1, index, index1)" v-for="(item1, index1) in item.productList" :key="index1">
-								<image
-									class="goodsImg"
-									v-if="item1.coverImg != null"
-									:lazy-load="true"
-									@load="imageLoaded(item1, index, index1)"
-									:src="`${item1.coverImg}${!item1.imgLoad ? '?x-oss-process=image/resize,m_lfit,w_150,h_150' : ''}`"
-									mode="aspectFill"
-								></image>
-								<image class="goodsImg" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/1.gif" mode="" v-else :lazy-load="true"></image>
-								<view
-									class="vifgoodsImg"
-									v-if="
-										item1.isSale == 0 ||
-										(item1.isSaleTime == 0 && !item1.isSaleTimeshow) ||
-										item1.isSoldStock == 1 ||
-										(item1.isStock == 1 && item1.stockNumber <= 0)
-									"
-								>
-									<image v-if="item1.isSale == 0" src="@/static/ztt/icon_goods_yxj.svg" style="width: 200rpx; height: 100%" mode=""></image>
-									<image
-										v-else-if="item1.isSaleTime == 0 && !item1.isSaleTimeshow"
-										src="@/static/ztt/icon_goods_wks.svg"
-										style="width: 200rpx; height: 100%"
-										mode=""
-									></image>
-									<image v-else-if="item1.isSoldStock == 1" src="@/static/ztt/icon_goods_sq.svg" style="width: 200rpx; height: 100%" mode=""></image>
-									<image
-										v-else-if="item1.isStock == 1 && item1.stockNumber <= 0"
-										src="@/static/ztt/icon_goods_kcbz.svg"
-										style="width: 200rpx; height: 100%"
-										mode=""
-									></image>
-								</view>
-								<view v-if="index == '0'" class="topSort" :class="'c' + (index1 + 1)">TOP{{ index1 + 1 }}</view>
-								<view class="goods_right" style="overflow: hidden">
-									<view class="name">{{ item1.name }}</view>
-									<!-- <view class="lookBack" v-if="index=='0'">本店销量第{{index1+1}}名</view>-->
-									<view class="lookBack" v-if="specifications.item.isHot == 1">热销</view>
-									<view class="describe">{{ item1.shortTitle ? item1.shortTitle : '' }}</view>
+    <!-- 滚动区域 -->
+    <view
+      class="scroll-panel"
+      id="scroll-panel"
+      :class="{ grayscale: !isBusinessTime }"
+    >
+      <view class="list-box">
+        <view class="left" :style="{ top: `${store.height}px` }">
+          <scroll-view
+            :scroll-into-view="leftIntoView"
+            :scroll-with-animation="false"
+            :scroll-y="true"
+            :style="{ height: `${store.screenHeight - store.height}px` }"
+            style="padding-bottom: 200rpx"
+          >
+            <view
+              class="item"
+              v-for="(item, index) in shopProductList.productInfo"
+              :key="index"
+              :class="{ active: index == leftIndex }"
+              :id="'left-' + index"
+              :data-index="index"
+              @click="leftTap(index)"
+            >
+              <text>{{ item.name }}</text>
+            </view>
+          </scroll-view>
+        </view>
+        <view class="main">
+          <view>
+            <view
+              class="item main-item"
+              v-for="(item, index) in shopProductList.productInfo"
+              :key="index"
+              :id="'item-' + index"
+            >
+              <view class="title">
+                <view>{{ item.name }}</view>
+              </view>
+              <view
+                class="goods"
+                @click="clickspecifications(item1, index, index1)"
+                v-for="(item1, index1) in item.productList"
+                :key="index1"
+              >
+                <image
+                  class="goodsImg"
+                  @click.stop="getImgs(item1)"
+                  v-if="item1.coverImg != null"
+                  :lazy-load="true"
+                  @load="imageLoaded(item1, index, index1)"
+                  :src="`${item1.coverImg}${
+                    !item1.imgLoad
+                      ? '?x-oss-process=image/resize,m_lfit,w_150,h_150'
+                      : ''
+                  }`"
+                  mode="aspectFill"
+                ></image>
+                <image
+                  class="goodsImg"
+                  src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/1.gif"
+                  mode=""
+                  v-else
+                  :lazy-load="true"
+                ></image>
 
-									<view class="describe" v-if="item1.suitNum > 1 && item1.type != 'sku'" style="font-size: 20rpx">
-										「{{ item1.suitNum }}{{ item1.unitName }}起点」
-									</view>
-									<view v-if="item1.isSoldStock == 1 || (item1.isSaleTime == 0 && !item1.isSaleTimeshow)" class="flex-between">
-										<view class="money">
-											<view>￥</view>
-											<text class="money_num" style="margin-right: 10rpx">
-												{{ shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1 ? item1.memberPrice || item1.salePrice : item1.salePrice }}
-											</text>
-											<text v-if="item1.unitName">/{{ item1.unitName }}</text>
-										</view>
-										<view class="flex-end">
-											<view class="sku-wrap flex-center" style="background-color: #cecece">
-												<text class="t" v-if="item1.isSaleTime == 0 && !item1.isSaleTimeshow">未开售</text>
-												<text class="t" v-else-if="item1.isSoldStock == 1">已售罄</text>
-											</view>
-										</view>
-									</view>
-									<view v-else class="flex-between" style="flex-wrap: inherit">
-										<view class="money">
-											<view>￥</view>
-											<text class="money_num">
-												{{ shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1 ? item1.memberPrice || item1.salePrice : item1.salePrice }}
-											</text>
-											<text class="money_num" v-if="item1.unitName">/{{ item1.unitName }}</text>
-											<!-- <text v-if="item1.suitNum>1 && item1.type!= 'sku'"
+                <view
+                  class="vifgoodsImg"
+                  v-if="
+                    item1.isSale == 0 ||
+                    (item1.isSaleTime == 0 && !item1.isSaleTimeshow) ||
+                    item1.isSoldStock == 1 ||
+                    (item1.isStock == 1 && item1.stockNumber <= 0)
+                  "
+                >
+                  <image
+                    v-if="item1.isSale == 0"
+                    src="@/static/ztt/icon_goods_yxj.svg"
+                    style="width: 200rpx; height: 100%"
+                    mode=""
+                  ></image>
+                  <image
+                    v-else-if="item1.isSaleTime == 0 && !item1.isSaleTimeshow"
+                    src="@/static/ztt/icon_goods_wks.svg"
+                    style="width: 200rpx; height: 100%"
+                    mode=""
+                  ></image>
+                  <image
+                    v-else-if="item1.isSoldStock == 1"
+                    src="@/static/ztt/icon_goods_sq.svg"
+                    style="width: 200rpx; height: 100%"
+                    mode=""
+                  ></image>
+                  <image
+                    v-else-if="item1.isStock == 1 && item1.stockNumber <= 0"
+                    src="@/static/ztt/icon_goods_kcbz.svg"
+                    style="width: 200rpx; height: 100%"
+                    mode=""
+                  ></image>
+                </view>
+
+                <view
+                  v-if="index == '0'"
+                  class="topSort"
+                  :class="'c' + (index1 + 1)"
+                  >TOP{{ index1 + 1 }}</view
+                >
+                <view class="limitDiscount" v-else-if="item1.is_time_discount"
+                  >限时折扣</view
+                >
+                <view class="goods_right" style="overflow: hidden">
+                  <view class="name">{{ item1.name }}</view>
+                  <!-- <view class="lookBack" v-if="index=='0'">本店销量第{{index1+1}}名</view>-->
+                  <view class="lookBack" v-if="specifications.item.isHot == 1"
+                    >热销</view
+                  >
+                  <view class="describe">{{
+                    item1.shortTitle ? item1.shortTitle : ""
+                  }}</view>
+
+                  <view
+                    class="describe"
+                    v-if="item1.suitNum > 1 && item1.type != 'sku'"
+                    style="font-size: 20rpx"
+                  >
+                    「{{ item1.suitNum }}{{ item1.unitName }}起点」
+                  </view>
+                  <view
+                    v-if="
+                      item1.isSoldStock == 1 ||
+                      (item1.isSaleTime == 0 && !item1.isSaleTimeshow)
+                    "
+                    class="flex-between"
+                  >
+                    <view class="money">
+                      <view>￥</view>
+                      <text class="money_num" style="margin-right: 10rpx">
+                        {{
+                          shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1
+                            ? item1.memberPrice || item1.salePrice
+                            : item1.salePrice
+                        }}
+                      </text>
+                      <text v-if="item1.unitName">/{{ item1.unitName }}</text>
+                    </view>
+                    <view class="flex-end">
+                      <view
+                        class="sku-wrap flex-center"
+                        style="background-color: #cecece"
+                      >
+                        <text
+                          class="t"
+                          v-if="item1.isSaleTime == 0 && !item1.isSaleTimeshow"
+                          >未开售</text
+                        >
+                        <text class="t" v-else-if="item1.isSoldStock == 1"
+                          >已售罄</text
+                        >
+                      </view>
+                    </view>
+                  </view>
+                  <view v-else class="flex-between" style="flex-wrap: inherit">
+                    <view class="money">
+                      <view>￥</view>
+                      <view class="money_num">
+                        <GoodsPrice
+                          :limitDiscount="limitTimeDiscountRes"
+                          :cart="item1"
+                          :shopUserInfo="shopUserInfo"
+                          :shopInfo="shopInfo"
+                        ></GoodsPrice>
+                      </view>
+                      <text class="money_num" v-if="item1.unitName"
+                        >/{{ item1.unitName }}</text
+                      >
+                      <!-- <text class="old-price" v-if=" showLimitDiscount(item1)"
+                        >￥{{ item1.salePrice }}</text
+                      > -->
+                      <text class="old-price" v-if="item1.is_time_discount"
+                        >￥{{ item1.salePrice }}</text
+                      >
+
+                      <!-- <text v-if="item1.suitNum>1 && item1.type!= 'sku'"
 												style="font-size: 14rpx;">
 												「{{item1.suitNum}}{{item1.unitName}}起点」
 											</text> -->
-										</view>
-										<view class="flex-end" v-if="item1.type == 'sku' || (item1.type == 'package' && item1.groupType == '1')">
-											<view class="sku-wrap flex-center" @click.stop="clickspecifications(item1, index, index1)">
-												<text class="t no-wrap" v-if="item1.groupType == '1'">选择套餐</text>
-												<text class="t" v-else>选规格</text>
-												<text class="dot num" v-if="item1.cartNumber > 0">{{ ifcartNumber(item1) < 99 ? ifcartNumber(item1) : '99+' }}</text>
-											</view>
-										</view>
-										<view class="Controls" v-else>
-											<view class="btn" v-if="item1.cartNumber * 1 != '0'">
-												<up-icon name="minus-circle-fill" color="#E9AB7A" size="25"></up-icon>
-												<view class="btnClick" @tap.stop="$u.throttle(() => singleclick(item1, '-'), 500)"></view>
-											</view>
+                    </view>
+                    <view
+                      class="flex-end"
+                      v-if="
+                        item1.type == 'sku' ||
+                        (item1.type == 'package' && item1.groupType == '1')
+                      "
+                    >
+                      <view
+                        class="sku-wrap flex-center"
+                        @click.stop="clickspecifications(item1, index, index1)"
+                      >
+                        <text class="t no-wrap" v-if="item1.groupType == '1'"
+                          >选择套餐</text
+                        >
+                        <text class="t" v-else>选规格</text>
+                        <text class="dot num" v-if="item1.cartNumber > 0">{{
+                          ifcartNumber(item1) < 99 ? ifcartNumber(item1) : "99+"
+                        }}</text>
+                      </view>
+                    </view>
+                    <view class="Controls" v-else>
+                      <view class="btn" v-if="item1.cartNumber * 1 != '0'">
+                        <up-icon
+                          name="minus-circle-fill"
+                          color="#E9AB7A"
+                          size="25"
+                        ></up-icon>
+                        <view
+                          class="btnClick"
+                          @tap.stop="
+                            $u.throttle(() => singleclick(item1, '-'), 500)
+                          "
+                        ></view>
+                      </view>
 
-											<text class="num">{{ ifcartNumber(item1) }}</text>
-											<view class="btn">
-												<up-icon name="plus-circle-fill" color="#E9AB7A" size="25"></up-icon>
-												<view class="btnClick" @tap.stop="$u.throttle(() => singleclick(item1, '+'), 500)"></view>
-											</view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="fill-last" :style="{ height: fillHeight + 'px' }"></view>
-					</view>
-				</view>
-			</view>
-		</view>
+                      <text class="num">{{ ifcartNumber(item1) }}</text>
+                      <view class="btn" >
+                        <up-icon
+                          name="plus-circle-fill"
+                          color="#E9AB7A"
+                          size="25"
+                        ></up-icon>
+                        <view
+                          class="btnClick"
+                          @tap.stop="
+                            $u.throttle(() => singleclick(item1, '+'), 500)
+                          "
+                        ></view>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </view>
+            <view
+              class="fill-last"
+              :style="{ height: fillHeight + 'px' }"
+            ></view>
+          </view>
+        </view>
+      </view>
+    </view>
 
-		<confirmorder
-			ref="confirmorderref"
-			:cartLists_count="cartLists_count"
-			:cartList="matchedProducts"
-			:totalPrices="totalPrices"
-			:confirmordershow="confirmordershow"
-			@close="confirmordershow = !confirmordershow"
-			@customevent="websocketsendMessage"
-			:orderinfo="orderinfo"
-		></confirmorder>
+    <confirmorder
+      ref="confirmorderref"
+      :cartLists_count="cartLists_count"
+      :cartList="matchedProducts"
+      :totalPrices="totalPrices"
+      :confirmordershow="confirmordershow"
+      @close="confirmordershow = !confirmordershow"
+      @customevent="websocketsendMessage"
+      :orderinfo="orderinfo"
+    ></confirmorder>
 
-		<!-- 店铺详情 -->
-		<shopindex ref="showShopInfoRef"></shopindex>
-		<!-- 购物车 -->
-		<shoppingCartes
-			:cartLists_count="cartLists_count"
-			:cartList="matchedProducts"
-			:showCart="showCart"
-			@customevent="websocketsendMessage"
-			@close="showCart = !showCart"
-			:orderinfo="orderinfo"
-			@clickcancelOrder="clickcancelOrder"
-			v-if="cartLists_count > 0"
-		></shoppingCartes>
+    <!-- 店铺详情 -->
+    <shopindex ref="showShopInfoRef"></shopindex>
+    <!-- 购物车 -->
+    <shoppingCartes
+      :cartLists_count="cartLists_count"
+      :cartList="matchedProducts"
+      :showCart="showCart"
+      :limitDiscount="limitTimeDiscountRes"
+      @customevent="websocketsendMessage"
+      @close="showCart = !showCart"
+      :orderinfo="orderinfo"
+      @clickcancelOrder="clickcancelOrder"
+      v-if="cartLists_count > 0"
+    ></shoppingCartes>
 
-		<!-- 显示购物车栏 -->
-		<view class="cart-wrap" v-if="cartLists_count > 0 && !confirmordershow && isBusinessTime">
-			<view class="cart-content">
-				<view class="left">
-					<view class="iconBox">
-						<image
-							class="icon"
-							src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/shopIcon.png"
-							mode="aspectFill"
-							@click="Historicalorders(true)"
-						></image>
-						<text class="u-badge">{{ cartLists_count < 99 ? cartLists_count : '99+' }}</text>
-					</view>
+    <!-- 显示购物车栏 -->
+    <view
+      class="cart-wrap"
+      v-if="cartLists_count > 0 && !confirmordershow && isBusinessTime"
+    >
+      <view class="cart-content">
+        <view class="left">
+          <view class="iconBox">
+            <image
+              class="icon"
+              src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/shopIcon.png"
+              mode="aspectFill"
+              @click="Historicalorders(true)"
+            ></image>
+            <text class="u-badge">{{
+              cartLists_count < 99 ? cartLists_count : "99+"
+            }}</text>
+          </view>
 
-					<text class="i">￥</text>
-					<text class="num">{{ totalPrices }}</text>
-				</view>
-				<view class="btn" @tap="$u.debounce(orderdetail, 500)">
-					<text class="t">结算</text>
-				</view>
-			</view>
-		</view>
+          <text class="i">￥</text>
+          <text class="num">{{ totalPrices }}</text>
+        </view>
+        <view class="btn" @tap="$u.debounce(orderdetail, 500)">
+          <text class="t">结算</text>
+        </view>
+      </view>
+    </view>
 
-		<!-- 规格 -->
-		<up-popup :show="showShopsku" :round="20" mode="bottom" @close="(showShopsku = false), (pagemetashow = false)">
-			<view class="shop_sku">
-				<scroll-view scroll-y style="max-height: 60vh; width: 100%">
-					<view class="positionabsolute">
-						<up-icon
-							name="close-circle"
-							@click="
-								showShopsku = false;
-								pagemetashow = false;
-							"
-							color="#000"
-							size="25"
-						></up-icon>
-					</view>
-					<up-swiper :list="specifications.item.images" height="250"></up-swiper>
-					<view class="shop_sku_name">{{ specifications.item.name }}</view>
-					<view class="shop_sku_description">
-						{{ specifications.item.shortTitle ? specifications.item.shortTitle : '' }}
-					</view>
-					<view v-if="specifications.item.type != 'package'">
-						<view class="shop_sku_box" v-for="(specOptions, specType) in specifications.item.selectSpecInfo" :key="specType">
-							<view class="shop_sku_box_name">
-								{{ specType }}
-							</view>
-							<view class="flex-start">
-								<view
-									class="shop_sku_box_item"
-									v-for="option in specOptions"
-									:key="option"
-									@click="selectSpec(specType, option)"
-									:class="{ shop_sku_box_item_selected: selectedSpecs[specType] === option }"
-								>
-									{{ option }}
-									<view
-										class="shop_sku_box_item_tip"
-										v-if="specifications.item.result && specifications.item.result.isSoldStock == 1 && selectedSpecs[specType] === option"
-									>
-										<view>售罄</view>
-									</view>
-									<view class="shop_sku_box_item_tip" v-if="specifications.item.result == 'kong' && canSubmit == false && selectedSpecs[specType] === option">
-										<view>已下架</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-					<!-- 套餐 -->
-					<view v-else>
-						<view class="shop_sku_box">
-							<view v-for="(setmenu, setmenuindex) in specifications.item.groupSnap" :key="setmenuindex">
-								<view class="shop_sku_box_name">{{ setmenu.title }} {{ setmenu.count }} 选{{ setmenu.number }}</view>
-								<view class="flex-start">
-									<view
-										class="shop_sku_box_item"
-										v-for="(option, goodsid) in setmenu.goods"
-										:key="goodsid"
-										@click="goodsidClick(setmenuindex, option, goodsid)"
-										:class="{ shop_sku_box_item_selected: isOptionSelected(setmenuindex, option) }"
-										:disabled="isMaxSelected(setmenuindex) && !isOptionSelected(setmenuindex, option)"
-									>
-										{{ option.proName }}
-										<text v-if="option.unitName">/{{ option.unitName }}</text>
-										<view class="shop_sku_box_item_tip" v-if="specifications.item.isSoldStock == 1">
-											<view>售罄</view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-				<view class="shop_bottom">
-					<view class="flex-between">
-						<view class="price" v-if="specifications.item.type != 'package' && specifications.item.result">
-							<text class="i">￥</text>
-							<text class="num">
-								{{
-									shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1
-										? specifications.item.result.memberPrice || specifications.item.result.salePrice
-										: specifications.item.result.salePrice
-								}}
-							</text>
-							<text class="i" v-if="specifications.item.unitName">/{{ specifications.item.unitName }}</text>
-							<text v-if="specifications.item.result.suitNum > 1">「{{ specifications.item.result.suitNum }}{{ specifications.item.result.unitName }}起点」</text>
-						</view>
-						<view class="price" v-else>
-							<text class="i">￥</text>
-							<text class="num">
-								{{
-									shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1
-										? specifications.item.memberPrice || specifications.item.salePrice
-										: specifications.item.salePrice
-								}}
-							</text>
-							<text class="i" v-if="specifications.item.unitName">/{{ specifications.item.unitName }}</text>
-							<text v-if="specifications.item.suitNum > 1">「{{ specifications.item.suitNum }}{{ specifications.item.unitName }}起点」</text>
-						</view>
+    <!-- 规格 -->
+    <up-popup
+      :show="showShopsku"
+      :round="20"
+      mode="bottom"
+      @close="(showShopsku = false), (pagemetashow = false)"
+    >
+      <view class="shop_sku">
+        <scroll-view scroll-y style="max-height: 60vh; width: 100%">
+          <view class="positionabsolute">
+            <up-icon
+              name="close-circle"
+              @click="
+                showShopsku = false;
+                pagemetashow = false;
+              "
+              color="#000"
+              size="25"
+            ></up-icon>
+          </view>
+          <up-swiper
+            :list="specifications.item.images"
+            @change="swiperChange"
+            :current="swiperCurrent"
+            radius="6px"
+            height="250"
+            @click="
+              prveImgs(
+                specifications.item.images,
+                specifications.item.images[swiperCurrent]
+              )
+            "
+          >
+            <!-- <template v-slot:default="{item}">
+            <image :src=item></image>
+          </templte> -->
+          </up-swiper>
 
-						<view class="operation-wrap" v-if="specifications.item.type != 'package'">
-							<view class="btn">
-								<up-icon name="minus-circle-fill" color="#E9AB7A" size="25" v-if="shopCartNumber > 0"></up-icon>
-								<view class="btnClick" @click="shopCart('-')"></view>
-							</view>
-							<text class="num">{{ shopCartNumber }}</text>
-							<view class="btn">
-								<up-icon name="plus-circle-fill" color="#E9AB7A" size="25"></up-icon>
-								<view class="btnClick" @click="shopCart('+')"></view>
-							</view>
-						</view>
-					</view>
-					<view class="shop_skuselect flex-start" v-if="selectedSpecsStr">
-						<view class="shop_skuselectname">{{ selectedSpecsStr }}</view>
-					</view>
-					<view
-						v-if="specifications.item.type == 'package'"
-						class="addShopping"
-						:class="shopCartNumber > 0 && allConditionsSatisfied ? 'active' : ''"
-						@click="submitSelection()"
-					>
-						{{ skuBtnText }}
-					</view>
-					<view v-else class="addShopping" :class="shopCartNumber > 0 && canSubmit ? 'active' : ''" @click="submitSelection()">
-						{{ skuBtnText }}
-					</view>
-				</view>
-			</view>
-		</up-popup>
-		<view class="history_order" @click="toHistory" v-if="shopInfo && shopInfo.registerType == 'after' && orderinfo.id">
-			<image class="img" src="@/static/history.png" mode=""></image>
-			<text>已下单菜品</text>
-		</view>
-		<Loading :isLoading="!useSocket.isConnected" />
-		<couponModal getMode="eat" />
-	</view>
+          <view class="shop_sku_name">{{ specifications.item.name }}</view>
+          <view class="shop_sku_description" v-if="isSkuGoods">
+            {{
+              specifications.item.shortTitle
+                ? specifications.item.shortTitle
+                : ""
+            }}
+          </view>
+          <view v-if="specifications.item.type != 'package'">
+            <view
+              class="shop_sku_box"
+              v-for="(specOptions, specType) in specifications.item
+                .selectSpecInfo"
+              :key="specType"
+            >
+              <view class="shop_sku_box_name">
+                {{ specType }}
+              </view>
+              <view class="flex-start">
+                <view
+                  class="shop_sku_box_item"
+                  v-for="option in specOptions"
+                  :key="option"
+                  @click="selectSpec(specType, option)"
+                  :class="{
+                    shop_sku_box_item_selected: isSkuSelected(specType, option),
+                  }"
+                >
+                  {{ option }}
+                  <view
+                    class="shop_sku_box_item_tip"
+                    v-if="
+                      specifications.item.result &&
+                      specifications.item.result.isSoldStock == 1 &&
+                      selectedSpecs[specType] === option
+                    "
+                  >
+                    <view>售罄</view>
+                  </view>
+                  <view
+                    class="shop_sku_box_item_tip"
+                    v-if="
+                      specifications.item.result == 'kong' &&
+                      canSubmit == false &&
+                      selectedSpecs[specType] === option
+                    "
+                  >
+                    <view>已下架</view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+          <!-- 套餐 -->
+          <view v-else>
+            <view class="shop_sku_box">
+              <view
+                v-for="(setmenu, setmenuindex) in specifications.item.groupSnap"
+                :key="setmenuindex"
+              >
+                <view class="shop_sku_box_name"
+                  >{{ setmenu.title }} {{ setmenu.count }} 选{{
+                    setmenu.number
+                  }}</view
+                >
+                <view class="flex-start">
+                  <view
+                    class="shop_sku_box_item"
+                    v-for="(option, goodsid) in setmenu.goods"
+                    :key="goodsid"
+                    @click="goodsidClick(setmenuindex, option, goodsid)"
+                    :class="{
+                      shop_sku_box_item_selected: isOptionSelected(
+                        setmenuindex,
+                        option
+                      ),
+                    }"
+                    :disabled="
+                      isMaxSelected(setmenuindex) &&
+                      !isOptionSelected(setmenuindex, option)
+                    "
+                  >
+                    {{ option.proName }}
+                    <text v-if="option.unitName">/{{ option.unitName }}</text>
+                    <view
+                      class="shop_sku_box_item_tip"
+                      v-if="specifications.item.isSoldStock == 1"
+                    >
+                      <view>售罄</view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+        <view class="shop_bottom">
+          <view class="flex-between">
+            <view
+              class="price"
+              v-if="
+                specifications.item.type != 'package' &&
+                specifications.item.result
+              "
+            >
+              <text class="i">￥</text>
+              <view class="num">
+                <GoodsPrice
+                  :limitDiscount="limitTimeDiscountRes"
+                  :cart="specifications.item.result"
+                  :shopUserInfo="shopUserInfo"
+                  :shopInfo="shopInfo"
+                ></GoodsPrice>
+              </view>
+
+              <text class="num" v-if="false">
+                {{
+                  shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1
+                    ? specifications.item.result.memberPrice ||
+                      specifications.item.result.salePrice
+                    : specifications.item.result.salePrice
+                }}
+              </text>
+              <text class="i" v-if="specifications.item.unitName"
+                >/{{ specifications.item.unitName }}</text
+              >
+              <text v-if="specifications.item.result.suitNum > 1"
+                >「{{ specifications.item.result.suitNum
+                }}{{ specifications.item.result.unitName }}起点」</text
+              >
+            </view>
+            <view class="price" v-else>
+              <text class="i">￥</text>
+              <view class="num">
+                <GoodsPrice
+                  :limitDiscount="limitTimeDiscountRes"
+                  :cart="specifications.item"
+                  :shopUserInfo="shopUserInfo"
+                  :shopInfo="shopInfo"
+                ></GoodsPrice>
+              </view>
+              <text class="num" v-if="false">
+                {{
+                  shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1
+                    ? specifications.item.memberPrice ||
+                      specifications.item.salePrice
+                    : specifications.item.salePrice
+                }}
+              </text>
+              <text class="i" v-if="specifications.item.unitName"
+                >/{{ specifications.item.unitName }}</text
+              >
+              <text v-if="specifications.item.suitNum > 1"
+                >「{{ specifications.item.suitNum
+                }}{{ specifications.item.unitName }}起点」</text
+              >
+            </view>
+
+            <view
+              class="operation-wrap"
+              v-if="specifications.item.type != 'package'"
+            >
+              <view class="btn">
+                <up-icon
+                  name="minus-circle-fill"
+                  color="#E9AB7A"
+                  size="25"
+                  v-if="shopCartNumber > 0"
+                ></up-icon>
+                <view class="btnClick" @click="shopCart('-')"></view>
+              </view>
+              <text class="num">{{ shopCartNumber }}</text>
+              <view class="btn">
+                <up-icon
+                  name="plus-circle-fill"
+                  color="#E9AB7A"
+                  size="25"
+                ></up-icon>
+                <view class="btnClick" @click="shopCart('+')"></view>
+              </view>
+            </view>
+          </view>
+          <view class="shop_skuselect flex-start" v-if="selectedSpecsStr">
+            <view class="shop_skuselectname">{{ selectedSpecsStr }}</view>
+          </view>
+          <template v-if="isSkuGoods">
+            <view
+              v-if="specifications.item.type == 'package'"
+              class="addShopping"
+              :class="
+                shopCartNumber > 0 && allConditionsSatisfied ? 'active' : ''
+              "
+              @click="submitSelection()"
+            >
+              {{ skuBtnText }}
+            </view>
+            <view
+              v-else
+              class="addShopping"
+              :class="shopCartNumber > 0 && canSubmit ? 'active' : ''"
+              @click="submitSelection()"
+            >
+              {{ skuBtnText }}
+            </view>
+          </template>
+          <template v-else>
+            <view
+              class="addShopping"
+              :class="shopCartNumber > 0 ? 'active' : ''"
+              @click="submitSelection()"
+            >
+              {{ skuBtnText }}
+            </view>
+          </template>
+        </view>
+      </view>
+    </up-popup>
+    <view
+      class="history_order"
+      @click="toHistory"
+      v-if="shopInfo && shopInfo.registerType == 'after' && orderinfo.id"
+    >
+      <image class="img" src="@/static/history.png" mode=""></image>
+      <text>已下单菜品</text>
+    </view>
+    <Loading :isLoading="!useSocket.isConnected" />
+    <ModalList></ModalList>
+    <recommendGoodsModal
+      v-if="isDataLoaded"
+      @onBuyClick="onBuyClick"
+    ></recommendGoodsModal>
+    <goodsModal></goodsModal>
+    <xbSwiperPreview
+      :visable="showPrveImg"
+      :imgs="prveImgsList"
+      @update:visable="showPrveImg = $event"
+    ></xbSwiperPreview>
+  </view>
 </template>
 
 <script setup>
-import couponModal from '@/components/coupon-modal.vue';
-import { ref, reactive, onMounted, watchEffect, getCurrentInstance, computed, watch } from 'vue';
+import xbSwiperPreview from "@/components/xb-swiper-preview/index.vue";
+//价格计算辅助函数
+import * as orderUtils from "@/utils/order-utils.js";
+import BigNumber from "bignumber.js";
 
-import { onLoad, onReady, onShow, onHide, onPageScroll } from '@dcloudio/uni-app';
+import GoodsPrice from "@/components/goods-price.vue";
+
+import * as limitTimeDiscountapi from "@/common/api/market/limitTimeDiscount.js";
+import ModalList from "@/components/modal-list.vue";
+import recommendGoodsModal from "./components/recommend-goods-modal.vue";
+import {
+  ref,
+  reactive,
+  onMounted,
+  watchEffect,
+  getCurrentInstance,
+  computed,
+  provide,
+  watch,
+} from "vue";
+
+import {
+  onLoad,
+  onReady,
+  onShow,
+  onHide,
+  onUnload,
+  onPageScroll,
+} from "@dcloudio/uni-app";
 
 //导航栏
-import Nav from '@/components/CustomNavbar.vue';
-import shopindex from './components/shopindex.vue';
-import shoppingCartes from './components/shoppingCartes.vue';
-import confirmorder from './components/confirmorder.vue';
-import Loading from '@/components/Loading.vue';
-import dayjs from 'dayjs';
-import isBetween from 'dayjs/plugin/isBetween';
+import Nav from "@/components/CustomNavbar.vue";
+import shopindex from "./components/shopindex.vue";
+import goodsModal from "./components/goods-modal.vue";
+import shoppingCartes from "./components/shoppingCartes.vue";
+import confirmorder from "./components/confirmorder.vue";
+import Loading from "@/components/Loading.vue";
+import dayjs from "dayjs";
+import isBetween from "dayjs/plugin/isBetween";
 dayjs.extend(isBetween);
 
+//点单智能推荐
+function onBuyClick(item) {
+  console.log("onBuyClick", item);
+  console.log("shopProductList", shopProductList);
+  let index = -1;
+  let index1 = -1;
+  if (!item.isHot) {
+    if (
+      item.type == "sku" ||
+      (item.type == "package" && item.groupType == "1")
+    ) {
+      for (let i in shopProductList.productInfo) {
+        const cate = shopProductList.productInfo[i];
+        const goodsList = cate.productList;
+        const index1 = goodsList.findIndex((goods) => goods.id == item.id);
+        if (index1 > -1) {
+          index = i;
+          clickspecifications(item, index, index1);
+          break;
+        }
+      }
+    } else {
+      uni.$u.throttle(() => singleclick(item, "+"), 500);
+    }
+  } else {
+    if (
+      item.type == "sku" ||
+      (item.type == "package" && item.groupType == "1")
+    ) {
+      for (let i in shopProductList.hots) {
+        const goods = shopProductList.hots[i];
+        if (goods.id == item.id) {
+          index = i;
+          clickspecifications(item, index, index);
+          break;
+        }
+      }
+    } else {
+      uni.$u.throttle(() => singleclick(item, "+"), 500);
+    }
+  }
+}
+
 // 获取全局属性
 const { proxy } = getCurrentInstance();
 
 //接口引入
-import { productminiApphotsquery, APIgroupquery, APIminiAppinfo, APIminiAppskuinfo } from '@/common/api/product/product.js';
+import {
+  productminiApphotsquery,
+  APIgroupquery,
+  APIminiAppinfo,
+  APIminiAppskuinfo,
+} from "@/common/api/product/product.js";
 
-import { APIhistoryOrder, APIcancelOrder, APIrmPlaceOrder } from '@/common/api/order/index.js';
+import {
+  APIhistoryOrder,
+  APIcancelOrder,
+  APIrmPlaceOrder,
+} from "@/common/api/order/index.js";
 
 // websocket
 // import useWebSocket from '@/common/js/websocket.js';
-import { useWebSocket } from '@/stores/carts-websocket.js';
+import { useWebSocket } from "@/stores/carts-websocket.js";
 
 // pinia管理
-import { useNavbarStore } from '@/stores/navbarStore';
+import { useNavbarStore } from "@/stores/navbarStore";
 
 // 结账管理
-import { Memberpay } from '@/stores/pay.js';
+import { Memberpay } from "@/stores/pay.js";
 
 const storeMemberpay = Memberpay();
 const store = useNavbarStore();
 
-import { productStore } from '@/stores/user.js';
+import { productStore } from "@/stores/user.js";
 
 const userStore = productStore();
 
 // 金额管理
-import { useCartStore } from '@/stores/order.js';
+import { useCartStore } from "@/stores/order.js";
 const cartStore = useCartStore();
 
 // 动态更新导航栏配置
 store.updateNavbarConfig({
-	showBack: true, //左边返回键
-	rightText: '', //右边文字
-	showSearch: false, //true是标题其他事文字
-	title: '',
-	isTransparent: false,
-	hasPlaceholder: false //是否要占位符
+  showBack: true, //左边返回键
+  rightText: "", //右边文字
+  showSearch: false, //true是标题其他事文字
+  title: "",
+  isTransparent: false,
+  hasPlaceholder: false, //是否要占位符
 });
+const shopInfo = reactive({});
+Object.assign(shopInfo, uni.cache.get("shopInfo"));
+const shopTable = uni.cache.get("shopTable");
+const distance = uni.cache.get("distance"); //距离
 
-const shopInfo = uni.cache.get('shopInfo');
-const shopTable = uni.cache.get('shopTable');
-const distance = uni.cache.get('distance'); //距离
+const swiperCurrent = ref(0);
+function swiperChange(e) {
+  swiperCurrent.value = e.current;
+}
 
 //店铺详情
 const showShopInfoRef = ref(null);
@@ -523,13 +1004,13 @@ const isLoading = ref(true);
 
 //调用shop组件
 const callChildMethod = () => {
-	if (showShopInfoRef.value) {
-		showShopInfoRef.value.childMethod();
-	}
+  if (showShopInfoRef.value) {
+    showShopInfoRef.value.childMethod();
+  }
 };
 
 try {
-	const shopExtend = uni.cache.get('shopTable').shopExtendMap.shopinfo_bg;
+  const shopExtend = uni.cache.get("shopTable").shopExtendMap.shopinfo_bg;
 } catch (error) {}
 
 // 计算高度
@@ -537,23 +1018,20 @@ const navScroll = ref(null);
 
 // 获取商品数据
 const shopProductList = reactive({
-	hots: [],
-	productInfo: []
+  hots: [],
+  productInfo: [],
 });
 
 // * 图片加载
 const imageLoaded = (item, index, index1) => {
-	// shopProductList.productInfo[index].products[index1]['imgLoad'] = true;
+  // shopProductList.productInfo[index].products[index1]['imgLoad'] = true;
 };
 
 // 计算左侧位置
 const leftIndex = ref(0);
 
-//距离顶部的高度
-const scrollTopSiz = ref(0);
-
 //元素最低端的距离
-const lastbottom = ref('');
+const lastbottom = ref("");
 
 //储存元素的下标
 const topArr = ref([]);
@@ -566,51 +1044,56 @@ const scrollTopSize = ref(0);
 
 //左侧导航点击
 const leftTap = (index) => {
-	uni.pageScrollTo({
-		scrollTop: topArr.value[index] - store.height,
-		duration: 0
-	});
-	leftIndex.value = index;
+  uni.pageScrollTo({
+    scrollTop: topArr.value[index] - store.height,
+    duration: 0,
+  });
+  leftIndex.value = index;
 };
 
 /* 计算左侧滚动位置定位 */
 const leftIntoView = computed(() => {
-	return `left-${leftIndex.value ? leftIndex.value : 0}`;
+  return `left-${leftIndex.value ? leftIndex.value : 0}`;
 });
 
 /* 获取元素顶部信息 */
 const getElementTop = () => {
-	new Promise((resolve, reject) => {
-		let view = uni.createSelectorQuery().selectAll('.main-item');
-		view.boundingClientRect(async (data) => {
-			resolve(data);
-		}).exec();
-		proxy.$uGetRect('.scroll-panel').then((res) => {
-			scrollTopSize.value = res.top; //元素距离顶部的距离
-		});
-	}).then((res) => {
-		try {
-			topArr.value = res.map((item) => {
-				return item.top; /* 减去滚动容器距离顶部的距离 加导航栏高度*/
-			});
+  new Promise((resolve, reject) => {
+    let view = uni.createSelectorQuery().selectAll(".main-item");
+    view
+      .boundingClientRect(async (data) => {
+        resolve(data);
+      })
+      .exec();
+    proxy.$uGetRect(".scroll-panel").then((res) => {
+      scrollTopSize.value = res.top; //元素距离顶部的距离
+    });
+  }).then((res) => {
+    try {
+      topArr.value = res.map((item) => {
+        return item.top; /* 减去滚动容器距离顶部的距离 加导航栏高度*/
+      });
 
-			// 获取最后一个元素最低端的盒子到顶点的距离
-			for (let i = 0; i <= topArr.value.length - 1; i++) {
-				if (store.screenHeight - 200 >= topArr.value[topArr.value.length - 1] - topArr.value[i]) {
-					// 获取距离最后一个index
-					lastbottom.value = i;
-					break;
-				}
-			}
-			/* 获取最后一项的高度，设置填充高度。判断和填充时做了 +-20 的操作，是为了滚动时更好的定位 */
-			let last = res[res.length - 1].height;
-			if (last - 20 < store.screenHeight) {
-				fillHeight.value = 200;
-			}
-		} catch (error) {
-			//TODO handle the exception
-		}
-	});
+      // 获取最后一个元素最低端的盒子到顶点的距离
+      for (let i = 0; i <= topArr.value.length - 1; i++) {
+        if (
+          store.screenHeight - 200 >=
+          topArr.value[topArr.value.length - 1] - topArr.value[i]
+        ) {
+          // 获取距离最后一个index
+          lastbottom.value = i;
+          break;
+        }
+      }
+      /* 获取最后一项的高度，设置填充高度。判断和填充时做了 +-20 的操作，是为了滚动时更好的定位 */
+      let last = res[res.length - 1].height;
+      if (last - 20 < store.screenHeight) {
+        fillHeight.value = 200;
+      }
+    } catch (error) {
+      //TODO handle the exception
+    }
+  });
 };
 
 // 定时器
@@ -618,39 +1101,39 @@ const mainThrottle = ref(null);
 
 /* 主区域滚动监听 */
 const mainScroll = (e) => {
-	// 节流方法
-	clearTimeout(mainThrottle.value);
-	mainThrottle.value = setTimeout(() => {
-		scrollFn();
-	}, 10);
-	let scrollFn = () => {
-		let top = e.scrollTop;
-		let index = 0;
-		// 判断左边是否可以滑动
+  // 节流方法
+  clearTimeout(mainThrottle.value);
+  mainThrottle.value = setTimeout(() => {
+    scrollFn();
+  }, 10);
+  let scrollFn = () => {
+    let top = e.scrollTop;
+    let index = 0;
+    // 判断左边是否可以滑动
 
-		for (let i = topArr.value.length - 1; i >= 0; i--) {
-			/* 在部分安卓设备上，因手机逻辑分辨率与rpx单位计算不是整数，滚动距离与有误差，增加2px来完善该问题 */
-			if (top + 2 >= topArr.value[i] - store.height) {
-				index = i;
-				break;
-			}
-		}
-		/* 查找当前滚动距离 */
-		if (index >= lastbottom.value) {
-			//
-			leftIndex.value = index > leftIndex.value ? index : leftIndex.value;
-			// this.leftIndex = this.leftIndex
-		} else {
-			leftIndex.value = index < 0 ? 0 : index;
-		}
-	};
+    for (let i = topArr.value.length - 1; i >= 0; i--) {
+      /* 在部分安卓设备上，因手机逻辑分辨率与rpx单位计算不是整数，滚动距离与有误差，增加2px来完善该问题 */
+      if (top + 2 >= topArr.value[i] - store.height) {
+        index = i;
+        break;
+      }
+    }
+    /* 查找当前滚动距离 */
+    if (index >= lastbottom.value) {
+      //
+      leftIndex.value = index > leftIndex.value ? index : leftIndex.value;
+      // this.leftIndex = this.leftIndex
+    } else {
+      leftIndex.value = index < 0 ? 0 : index;
+    }
+  };
 };
 
 //动态导航栏滑动距离
 onPageScroll((res) => {
-	uni.$u.debounce((store.scrollTop = res.scrollTop), 500);
-	uni.$u.debounce((navScroll.value = res.scrollTop), 500);
-	uni.$u.debounce(mainScroll(res), 500);
+  uni.$u.debounce((store.scrollTop = res.scrollTop), 500);
+  uni.$u.debounce((navScroll.value = res.scrollTop), 500);
+  uni.$u.debounce(mainScroll(res), 500);
 });
 
 // 点击详情
@@ -658,19 +1141,19 @@ const showShopsku = ref(false);
 
 // 规格信息
 const specifications = reactive({
-	item: {},
-	index: '',
-	inedxs: '',
-	type: '',
-	product_id: '',
-	sku_id: '',
-	groupSnap: {},
-	item: {
-		groupSnap: [],
-		result: {
-			isSoldStock: 0
-		}
-	}
+  item: {},
+  index: "",
+  inedxs: "",
+  type: "",
+  product_id: "",
+  sku_id: "",
+  groupSnap: {},
+  item: {
+    groupSnap: [],
+    result: {
+      isSoldStock: 0,
+    },
+  },
 });
 // 用于判断接口数据是否加载完成
 const isDataLoaded = ref(false);
@@ -682,67 +1165,73 @@ const selectedSpecs = ref({});
 const canSubmit = ref(false);
 
 //字形判断
-const skuBtnText = ref('添加到购物车');
+const skuBtnText = ref("添加到购物车");
 
 // 计算属性，判断是否所有规格类型都有选中项
 const allSpecsSelected = computed(() => {
-	// 获取所有规格类型的键
-	const specKeys = Object.keys(specifications.item.selectSpecInfo);
-	// skuBtnText.value = selectedSpecsStr.value ? `您还没选择${specKeys[1]}哦` : ``
-	// 检查每个规格类型是否都在 selectedSpecs 中有对应的选中值
-	return specKeys.every((key) => selectedSpecs.value[key]);
+  // 获取所有规格类型的键
+  const specKeys = Object.keys(specifications.item.selectSpecInfo);
+  // skuBtnText.value = selectedSpecsStr.value ? `您还没选择${specKeys[1]}哦` : ``
+  // 检查每个规格类型是否都在 selectedSpecs 中有对应的选中值
+  return specKeys.every((key) => selectedSpecs.value[key]);
 });
 
+function isSkuSelected(specType, option) {
+  return selectedSpecs.value[specType] === option;
+}
+
 // 处理规格选择的方法
 const selectSpec = async (specType, option) => {
-	// 规格清零
-	shopCartNumber.value = 0;
+  // 规格清零
+  shopCartNumber.value = 0;
 
-	// 更新 selectedSpecs 对象，将当前规格类型的选中值设置为用户点击的选项
-	const newSelectedSpecs = {};
-	const specKeys = Object.keys(specifications.item.selectSpecInfo);
-	for (const key of specKeys) {
-		if (key === specType) {
-			newSelectedSpecs[key] = option;
-		} else {
-			newSelectedSpecs[key] = selectedSpecs.value[key];
-		}
-	}
-	selectedSpecs.value = newSelectedSpecs;
-	if (allSpecsSelected.value) {
-		// try {
-		let result = await APIminiAppskuinfo({
-			specInfo: selectedSpecsStr.value,
-			id: specifications.item.id
-		});
-		// skuList
-		if (result != true) {
-			specifications.sku_id = result.id;
-			specifications.product_id = result.productId;
-			// 添加多规格分组
-			specifications.item.result = result;
-			if (result.isSoldStock == 0) {
-				canSubmit.value = true;
-			} else {
-				canSubmit.value = false;
-			}
-		} else {
-			specifications.item.result = 'kong';
-			canSubmit.value = false;
-		}
-	} else {
-		canSubmit.value = false;
-	}
+  // 更新 selectedSpecs 对象，将当前规格类型的选中值设置为用户点击的选项
+  const newSelectedSpecs = {};
+  const specKeys = Object.keys(specifications.item.selectSpecInfo);
+  for (const key of specKeys) {
+    if (key === specType) {
+      newSelectedSpecs[key] = option;
+    } else {
+      newSelectedSpecs[key] = selectedSpecs.value[key];
+    }
+  }
+  selectedSpecs.value = newSelectedSpecs;
+  if (allSpecsSelected.value) {
+    // try {
+    let result = await APIminiAppskuinfo({
+      specInfo: selectedSpecsStr.value,
+      id: specifications.item.id,
+    });
+    // skuList
+    if (result != true) {
+      specifications.sku_id = result.id;
+      specifications.product_id = result.productId;
+      // 添加多规格分组
+      specifications.item.result = result;
+      if (result.isSoldStock == 0) {
+        canSubmit.value = true;
+      } else {
+        canSubmit.value = false;
+      }
+    } else {
+      specifications.item.result = "kong";
+      canSubmit.value = false;
+    }
+  } else {
+    canSubmit.value = false;
+  }
 };
 
+const shopUserInfo = ref(uni.cache.get("shopUserInfo"));
+
 // 监听 specifications 的变化
 watch(
-	() => specifications.item.groupSnap,
-	(newGroupSnap) => {
-		if (Array.isArray(newGroupSnap)) {
-			selectedOptions.value = newGroupSnap.map(() => []);
-		}
-	}
+  () => specifications.item.groupSnap,
+  (newGroupSnap) => {
+    if (Array.isArray(newGroupSnap)) {
+      selectedOptions.value = newGroupSnap.map(() => []);
+    }
+  }
 );
 
 // 存储选中的选项，二维数组
@@ -750,50 +1239,57 @@ const selectedOptions = ref(specifications.item.groupSnap.map(() => []));
 
 // / 选择规格的方法
 const goodsidClick = (setmenuindex, option, goodsid) => {
-	if (!selectedOptions.value[setmenuindex]) {
-		// 如果 selectedOptions.value[setmenuindex] 不存在，初始化一个空数组
-		selectedOptions.value[setmenuindex] = [];
-	}
-	if (isOptionSelected(setmenuindex, option)) {
-		// 如果已经选中，取消选中
-		selectedOptions.value[setmenuindex] = selectedOptions.value[setmenuindex].filter((item) => item.proId !== option.proId);
-	} else if (!isMaxSelected(setmenuindex)) {
-		// 如果未达到最大选择数量，添加到选中列表
-		selectedOptions.value[setmenuindex].push(option);
-	}
+  if (!selectedOptions.value[setmenuindex]) {
+    // 如果 selectedOptions.value[setmenuindex] 不存在，初始化一个空数组
+    selectedOptions.value[setmenuindex] = [];
+  }
+  if (isOptionSelected(setmenuindex, option)) {
+    // 如果已经选中，取消选中
+    selectedOptions.value[setmenuindex] = selectedOptions.value[
+      setmenuindex
+    ].filter((item) => item.proId !== option.proId);
+  } else if (!isMaxSelected(setmenuindex)) {
+    // 如果未达到最大选择数量，添加到选中列表
+    selectedOptions.value[setmenuindex].push(option);
+  }
 };
 
 // 判断选项是否已选中
 const isOptionSelected = (setmenuindex, option) => {
-	// 确保 selectedOptions.value[setmenuindex] 存在
-	if (selectedOptions.value[setmenuindex]) {
-		return selectedOptions.value[setmenuindex].some((item) => item.proId === option.proId);
-	}
-	return false;
+  // 确保 selectedOptions.value[setmenuindex] 存在
+  if (selectedOptions.value[setmenuindex]) {
+    return selectedOptions.value[setmenuindex].some(
+      (item) => item.proId === option.proId
+    );
+  }
+  return false;
 };
 
 // 判断是否达到最大选择数量
 const isMaxSelected = (setmenuindex) => {
-	// 确保 selectedOptions.value[setmenuindex] 存在
-	if (selectedOptions.value[setmenuindex]) {
-		return selectedOptions.value[setmenuindex].length >= specifications.item.groupSnap[setmenuindex].number;
-	}
-	return false;
+  // 确保 selectedOptions.value[setmenuindex] 存在
+  if (selectedOptions.value[setmenuindex]) {
+    return (
+      selectedOptions.value[setmenuindex].length >=
+      specifications.item.groupSnap[setmenuindex].number
+    );
+  }
+  return false;
 };
 
 // 计算所有选中条件是否都符合
 const allConditionsSatisfied = computed(() => {
-	// 检查 specifications.item.groupSnap 是否存在
-	if (!specifications.item?.groupSnap) {
-		return false;
-	}
-	return specifications.item.groupSnap.every((optionGroup, index) => {
-		// 获取当前索引对应的已选选项，如果不存在则默认为空数组
-		const selected = selectedOptions.value[index] || [];
-		// 检查是否达到最大选择数量
-		const hasEnoughSelection = selected.length === optionGroup.number;
-		return hasEnoughSelection;
-	});
+  // 检查 specifications.item.groupSnap 是否存在
+  if (!specifications.item?.groupSnap) {
+    return false;
+  }
+  return specifications.item.groupSnap.every((optionGroup, index) => {
+    // 获取当前索引对应的已选选项，如果不存在则默认为空数组
+    const selected = selectedOptions.value[index] || [];
+    // 检查是否达到最大选择数量
+    const hasEnoughSelection = selected.length === optionGroup.number;
+    return hasEnoughSelection;
+  });
 });
 
 // 提交选择，套餐选中最后处理的数据
@@ -801,327 +1297,472 @@ const selectedGroupSnap = ref([]);
 
 // 计算属性，将 selectedSpecs 转换为字符串形式
 const selectedSpecsStr = computed(() => {
-	const values = Object.values(selectedSpecs.value);
-	return values.join('，');
+  const values = Object.values(selectedSpecs.value);
+  return values.join("，");
 });
 
 //添加购物车数量
 const shopCartNumber = ref(0);
 
-// 多规格 套餐添加数量
+// 多规格 套餐 单规格添加数量
 const shopCart = async (i) => {
-	if (i == '-' && shopCartNumber.value >= 0) {
-		shopCartNumber.value = 0;
-		return false;
-	}
-	let res = await shoppingcart();
-	if (i == '-') {
-		if (!res && shopCartNumber.value == specifications.item.suitNum) {
-			uni.showToast({
-				title: `起点${specifications.item.suitNum}个`,
-				icon: 'none'
-			});
-			return false;
-		} else {
-			shopCartNumber.value--;
-		}
-	} else {
-		if (!res && shopCartNumber.value < 1) {
-			console.log(res, specifications);
-			if (specifications.type == 'sku') {
-				shopCartNumber.value = parseFloat(specifications.item.result.suitNum);
-			} else {
-				shopCartNumber.value = parseFloat(specifications.item.suitNum);
-			}
-		} else {
-			shopCartNumber.value++;
-		}
-	}
+  if (i == "-" && shopCartNumber.value >= 0) {
+    shopCartNumber.value = 0;
+    return false;
+  }
+  let res = await shoppingcart();
+  // if (!isSkuGoods.value) {
+  //   console.log("specifications.item", specifications.item);
+  //   if (i == "-") {
+  //     shopCartNumber.value--;
+  //   } else {
+  //     shopCartNumber.value++;
+  //   }
+  //   specifications.item.cartNumber = shopCartNumber.value;
+  //   singleclick(specifications.item, i);
+  //   return;
+  // }
+  if (i == "-") {
+    if (!res && shopCartNumber.value == specifications.item.suitNum) {
+      uni.showToast({
+        title: `起点${specifications.item.suitNum}个`,
+        icon: "none",
+      });
+      return false;
+    } else {
+      shopCartNumber.value--;
+    }
+  } else {
+    if (!res && shopCartNumber.value < 1) {
+      console.log(res, specifications);
+      if (specifications.type == "sku") {
+        shopCartNumber.value = parseFloat(specifications.item.result.suitNum);
+      } else {
+        shopCartNumber.value = parseFloat(specifications.item.suitNum);
+      }
+    } else {
+      shopCartNumber.value++;
+    }
+  }
 };
 
 // 套餐比较两个对象是否相等
 function isObjectEqual(obj1, obj2) {
-	if (typeof obj1 !== 'object' || obj1 === null || typeof obj2 !== 'object' || obj2 === null) {
-		return obj1 === obj2;
-	}
-	const keys1 = Object.keys(obj1);
-	const keys2 = Object.keys(obj2);
-	if (keys1.length !== keys2.length) {
-		return false;
-	}
-	for (const key of keys1) {
-		if (Array.isArray(obj1[key]) && Array.isArray(obj2[key])) {
-			if (!isArrayEqual(obj1[key], obj2[key])) {
-				return false;
-			}
-		} else if (!isObjectEqual(obj1[key], obj2[key])) {
-			return false;
-		}
-	}
-	return true;
+  if (
+    typeof obj1 !== "object" ||
+    obj1 === null ||
+    typeof obj2 !== "object" ||
+    obj2 === null
+  ) {
+    return obj1 === obj2;
+  }
+  const keys1 = Object.keys(obj1);
+  const keys2 = Object.keys(obj2);
+  if (keys1.length !== keys2.length) {
+    return false;
+  }
+  for (const key of keys1) {
+    if (Array.isArray(obj1[key]) && Array.isArray(obj2[key])) {
+      if (!isArrayEqual(obj1[key], obj2[key])) {
+        return false;
+      }
+    } else if (!isObjectEqual(obj1[key], obj2[key])) {
+      return false;
+    }
+  }
+  return true;
 }
 
 // 比较两个数组是否相等（忽略顺序）
 function isArrayEqual(arr1, arr2) {
-	if (arr1.length !== arr2.length) {
-		return false;
-	}
-	const usedIndices = new Array(arr2.length).fill(false);
-	for (const item1 of arr1) {
-		let found = false;
-		for (let i = 0; i < arr2.length; i++) {
-			if (!usedIndices[i] && isObjectEqual(item1, arr2[i])) {
-				usedIndices[i] = true;
-				found = true;
-				break;
-			}
-		}
-		if (!found) {
-			return false;
-		}
-	}
-	return true;
+  if (arr1.length !== arr2.length) {
+    return false;
+  }
+  const usedIndices = new Array(arr2.length).fill(false);
+  for (const item1 of arr1) {
+    let found = false;
+    for (let i = 0; i < arr2.length; i++) {
+      if (!usedIndices[i] && isObjectEqual(item1, arr2[i])) {
+        usedIndices[i] = true;
+        found = true;
+        break;
+      }
+    }
+    if (!found) {
+      return false;
+    }
+  }
+  return true;
 }
 
 // 根据购物车的数据匹配选中的商品查找是否有匹配的数组
 const matchingProduct = async (data) => {
-	return matchedProducts.value.find((product, index) => {
-		if (specifications.type == 'package') {
-			// 套餐
-			let result = false;
-			try {
-				if (product.type == 'package') {
-					let res = JSON.parse(product.cartListinfo.pro_group_info);
-					result = isArrayEqual(res, selectedGroupSnap.value);
-				}
-			} catch (error) {
-				//TODO handle the exception
-			}
-			// 直接返回布尔值
-			return result;
-		} else if (specifications.item.type == 'sku') {
-			// 多规格
-			return product.cartListinfo.sku_id == data.id && product.cartListinfo.product_id == data.productId;
-		} else {
-			// 其他
-			return product.skuId == data.skuId && product.id == data.id;
-		}
-	});
+  return matchedProducts.value.find((product, index) => {
+    if (specifications.type == "package") {
+      // 套餐
+      let result = false;
+      try {
+        if (product.type == "package") {
+          let res = JSON.parse(product.cartListinfo.pro_group_info);
+          result = isArrayEqual(res, selectedGroupSnap.value);
+        }
+      } catch (error) {
+        //TODO handle the exception
+      }
+      // 直接返回布尔值
+      return result;
+    } else if (specifications.item.type == "sku") {
+      // 多规格
+      return (
+        product.cartListinfo.sku_id == data.id &&
+        product.cartListinfo.product_id == data.productId
+      );
+    } else {
+      // 其他
+      return product.skuId == data.skuId && product.id == data.id;
+    }
+  });
 };
 
 // 判断多规格和套餐  商品是否在购物车有数据
 const shoppingcart = async () => {
-	let res = null;
-	if (specifications.item.type == 'package') {
-		if (!allConditionsSatisfied.value) {
-			return false;
-		}
-		// 是否是套餐package
-		selectedGroupSnap.value = specifications.item.groupSnap.map((setmenu, index) => {
-			return {
-				...setmenu,
-				goods: selectedOptions.value[index]
-			};
-		});
-		res = await matchingProduct(selectedGroupSnap.value);
-	} else {
-		if (!canSubmit.value) {
-			return false;
-		}
-		res = await matchingProduct(specifications.item.result);
-	}
-	return res;
+  let res = null;
+  if (specifications.item.type == "package") {
+    if (!allConditionsSatisfied.value) {
+      return false;
+    }
+    // 是否是套餐package
+    selectedGroupSnap.value = specifications.item.groupSnap.map(
+      (setmenu, index) => {
+        return {
+          ...setmenu,
+          goods: selectedOptions.value[index],
+        };
+      }
+    );
+    res = await matchingProduct(selectedGroupSnap.value);
+  } else if (specifications.item.type == "sku") {
+    if (!canSubmit.value) {
+      return false;
+    }
+    res = await matchingProduct(specifications.item.result);
+  } else {
+    // 单规格
+    res = await matchingProduct(specifications.item);
+  }
+  return res;
 };
 
 // 提交选择并执行下一步操作的方法
 const submitSelection = async () => {
-	if (!isProductAvailable(specifications.productListitem.days, specifications.productListitem.startTime, specifications.productListitem.endTime)) {
-		uni.showToast({
-			title: '不在可售时间内'
-		});
-		return false;
-	}
-	// 判断购物车是否有该选中商品
-	// 数量不能少于0
-	if (shopCartNumber.value <= 0) {
-		return;
-	}
-	if ((specifications.item.type == 'package' && allConditionsSatisfied.value) || (specifications.item.type == 'sku' && canSubmit.value)) {
-		let res = await shoppingcart();
+  if (
+    !isProductAvailable(
+      specifications.productListitem.days,
+      specifications.productListitem.startTime,
+      specifications.productListitem.endTime
+    )
+  ) {
+    uni.showToast({
+      title: "不在可售时间内",
+    });
+    return false;
+  }
+  // 判断购物车是否有该选中商品
+  // 数量不能少于0
+  if (shopCartNumber.value <= 0) {
+    return;
+  }
+  let res = await shoppingcart();
 
-		// 是否是套餐 有就传
-		if (specifications.item.type == 'package') {
-			// 需求更改:所所有商品套餐都是add,没有修改
-			res = null;
-		} else {
-			selectedGroupSnap.value = [];
-		}
+  if (
+    (specifications.item.type == "package" && allConditionsSatisfied.value) ||
+    (specifications.item.type == "sku" && canSubmit.value)
+  ) {
+    // 是否是套餐 有就传
+    if (specifications.item.type == "package") {
+      // 需求更改:所所有商品套餐都是add,没有修改
+      res = null;
+    } else {
+      selectedGroupSnap.value = [];
+    }
+    console.log("specifications.item", specifications.item);
+    websocketsendMessage({
+      id: res ? res.cartListId : "",
+      type: "shopping",
+      suitNum: specifications.productListitem.suitNum,
+      table_code: uni.cache.get("tableCode"),
+      shop_id: uni.cache.get("shopId"),
+      operate_type: res ? "edit" : "add",
+      product_id: specifications.product_id,
+      sku_id: specifications.sku_id,
+      number: res
+        ? await calculateValue(res.cartNumber, "+", shopCartNumber.value)
+        : shopCartNumber.value,
+      pro_group_info: selectedGroupSnap.value,
+      goods_type: specifications.item.type == "package" ? "package" : "",
+      memberPrice: specifications.item.memberPrice,
+      is_print: 1,
+      product_type: specifications.item.type,
+      is_time_discount: specifications.item.is_time_discount,
+    });
+    // 清空套餐选中
+    selectedGroupSnap.value = [];
+    showShopsku.value = false;
+  } else {
+    websocketsendMessage({
+      id: res ? res.cartListId : "",
+      type: "shopping",
+      suitNum: specifications.productListitem.suitNum,
+      table_code: uni.cache.get("tableCode"),
+      shop_id: uni.cache.get("shopId"),
+      operate_type: res ? "edit" : "add",
+      product_id: specifications.product_id,
+      sku_id: specifications.sku_id,
+      number: res
+        ? await calculateValue(res.cartNumber, "+", shopCartNumber.value)
+        : shopCartNumber.value,
+      memberPrice: specifications.item.memberPrice,
+      is_print: 1,
+      product_type: specifications.item.type,
+      is_time_discount: specifications.item.is_time_discount,
+    });
+    showShopsku.value = false;
 
-		websocketsendMessage({
-			id: res ? res.cartListId : '',
-			type: 'shopping',
-			suitNum: specifications.productListitem.suitNum,
-			table_code: uni.cache.get('tableCode'),
-			shop_id: uni.cache.get('shopId'),
-			operate_type: res ? 'edit' : 'add',
-			product_id: specifications.product_id,
-			sku_id: specifications.sku_id,
-			number: res ? await calculateValue(res.cartNumber, '+', shopCartNumber.value) : shopCartNumber.value,
-			pro_group_info: selectedGroupSnap.value,
-			goods_type: specifications.item.type == 'package' ? 'package' : '',
-			is_print: 1,
-			product_type: specifications.item.type
-		});
-		// 清空套餐选中
-		selectedGroupSnap.value = [];
-		showShopsku.value = false;
-	} else {
-		return;
-	}
+    return;
+  }
 };
 
+//返回是否是多规格商品
+function returnIsSkuGoods(item) {
+  if (
+    item.type == "single" ||
+    item.type == "weight" ||
+    (item.type == "package" && item.groupType == "0")
+  ) {
+    return false;
+  }
+  return true;
+}
+
+const isSkuGoods = computed(() => {
+  return returnIsSkuGoods(specifications.item);
+});
+
+//预览图
+const showPrveImg = ref(false);
+const prveImgsList = ref([]);
+function prveImgs(images) {
+  prveImgsList.value = images;
+  showPrveImg.value = true;
+  return;
+  uni.previewImage({
+    urls: images,
+    current: swiperCurrent.value,
+  });
+}
+
+async function getImgs(item) {
+  let res = await APIminiAppinfo(item.id);
+  prveImgs(res.images);
+}
+
 //获取多规格数据
 const clickspecifications = async (item, index, indexs, type) => {
-	console.log(item);
-	// 商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
-	if (
-		item.isSoldStock == 1 ||
-		(item.isSaleTime == 0 && !item.isSaleTimeshow) ||
-		item.type == 'single' ||
-		item.type == 'weight' ||
-		(item.type == 'package' && item.groupType == '0')
-	) {
-		return false;
-	}
-	// 数量清零
-	shopCartNumber.value = 0;
-	// 初始化
-	let data = {
-		item: item,
-		productListitem: item,
-		type: '',
-		product_id: '',
-		sku_id: ''
-	};
-	Object.assign(specifications, data);
-	// 初始化 多规格选中
-	selectedSpecs.value = {};
-	canSubmit.value = false;
-	// skuBtnText.value = '请选择规格'
-	// single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
-	let res = await APIminiAppinfo(item.id);
-	specifications.item = res;
-	if (specifications.item.type == 'package') {
-		selectedOptions.value = [];
-		specifications.product_id = res.id;
-		specifications.sku_id = item.skuId;
-		shopCartNumber.value = 1;
-	}
-	// 购物车是否有商品
-	specifications.type = res.type;
-	specifications.item.selectSpecInfo = Object.fromEntries(Object.entries(specifications.item.selectSpecInfo).filter(([_, value]) => value.length > 0));
-	// 给默认数量
-	specifications.item.amountcartNumber = 0;
-	showShopsku.value = true;
+  console.log(item);
+  // 商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
+  // if (
+  //   item.isSoldStock == 1 ||
+  //   (item.isSaleTime == 0 && !item.isSaleTimeshow) ||
+  //   item.type == "single" ||
+  //   item.type == "weight" ||
+  //   (item.type == "package" && item.groupType == "0")
+  // ) {
+  //   return false;
+  // }
+
+  if (item.isSoldStock == 1 || (item.isSaleTime == 0 && !item.isSaleTimeshow)) {
+    return false;
+  }
+
+  shopCartNumber.value = 0;
+
+  // 数量清零
+  // 初始化
+  let data = {
+    item: item,
+    productListitem: item,
+    type: "",
+    product_id: "",
+    sku_id: "",
+  };
+  Object.assign(specifications, data);
+  // 初始化 多规格选中
+  selectedSpecs.value = {};
+  canSubmit.value = false;
+  // skuBtnText.value = '请选择规格'
+  // single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
+  let res = await APIminiAppinfo(item.id);
+
+  console.log("res", res);
+  console.log("item", item);
+  specifications.item = {
+    ...res,
+    ...item,
+    product_id: res.id,
+    sku_id: item.skuId,
+  };
+  if (specifications.item.type == "package") {
+    selectedOptions.value = [];
+    specifications.product_id = res.id;
+    specifications.sku_id = item.skuId;
+    shopCartNumber.value = 1;
+  } else {
+    specifications.product_id = res.id || specifications.item.product_id;
+    specifications.sku_id = item.skuId || specifications.item.sku_id;
+  }
+  // 购物车是否有商品
+  specifications.type = res.type;
+  specifications.item.selectSpecInfo = Object.fromEntries(
+    Object.entries(specifications.item.selectSpecInfo).filter(
+      ([_, value]) => value.length > 0
+    )
+  );
+  // 给默认数量
+  specifications.item.amountcartNumber = 0;
+  showShopsku.value = true;
 };
 // 判断商品是否在可售时间内
 const isProductAvailable = async (sellDaysStr, startTimeStr, endTimeStr) => {
-	// 将后端返回的字符串转换为数组
-	const sellDays = sellDaysStr.split(',');
-	const now = dayjs();
-	const days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
-	const currentDay = days[now.day()];
+  // 将后端返回的字符串转换为数组
+  const sellDays = sellDaysStr.split(",");
+  const now = dayjs();
+  const days = [
+    "Sunday",
+    "Monday",
+    "Tuesday",
+    "Wednesday",
+    "Thursday",
+    "Friday",
+    "Saturday",
+  ];
+  const currentDay = days[now.day()];
 
-	// console.log('当前日期:', currentDay);
-	// console.log('可售日期列表:', sellDays);
+  // console.log('当前日期:', currentDay);
+  // console.log('可售日期列表:', sellDays);
 
-	// 检查当前周几是否在可售周几列表中
-	if (!sellDays.includes(currentDay)) {
-		// console.log('当前日期不在可售日期列表中');
-		return false;
-	}
+  // 检查当前周几是否在可售周几列表中
+  if (!sellDays.includes(currentDay)) {
+    // console.log('当前日期不在可售日期列表中');
+    return false;
+  }
 
-	const startTime = dayjs(`${now.format('YYYY-MM-DD')} ${startTimeStr}`);
-	let endTime = dayjs(`${now.format('YYYY-MM-DD')} ${endTimeStr}`);
+  const startTime = dayjs(`${now.format("YYYY-MM-DD")} ${startTimeStr}`);
+  let endTime = dayjs(`${now.format("YYYY-MM-DD")} ${endTimeStr}`);
 
-	// 处理跨天情况
-	if (endTime.isBefore(startTime)) {
-		endTime = endTime.add(1, 'day');
-	}
+  // 处理跨天情况
+  if (endTime.isBefore(startTime)) {
+    endTime = endTime.add(1, "day");
+  }
 
-	// console.log('当前时间:', now.format('YYYY-MM-DD HH:mm:ss'));
-	// console.log('开始时间:', startTime.format('YYYY-MM-DD HH:mm:ss'));
-	// console.log('结束时间:', endTime.format('YYYY-MM-DD HH:mm:ss'));
+  // console.log('当前时间:', now.format('YYYY-MM-DD HH:mm:ss'));
+  // console.log('开始时间:', startTime.format('YYYY-MM-DD HH:mm:ss'));
+  // console.log('结束时间:', endTime.format('YYYY-MM-DD HH:mm:ss'));
 
-	const isInRange = now.isBetween(startTime, endTime, null, '[)');
-	// console.log('当前时间是否在可售时间范围内:', isInRange);
+  const isInRange = now.isBetween(startTime, endTime, null, "[)");
+  // console.log('当前时间是否在可售时间范围内:', isInRange);
 
-	return isInRange;
+  return isInRange;
 };
 
+/**
+ * 判断商品是否可售
+ * @param {Object} item
+ */
+function juageProductAvailable(item) {
+  if (!isProductAvailable(item.days, item.startTime, item.endTime)) {
+    uni.showToast({
+      title: "不在可售时间内",
+    });
+    return false;
+  }
+  if(item.isStock&&item.stockNumber<item.suitNum){
+    uni.showToast({
+      title: "库存不足",
+      icon: "none",
+    });
+    return false;
+  }
+  return true
+}
+
 // 单规格
 const singleclick = async (item, i) => {
-	if (!isProductAvailable(item.days, item.startTime, item.endTime)) {
-		uni.showToast({
-			title: '不在可售时间内'
-		});
-		return false;
-	}
-	// 判断购物车是否有该选中商品
-	let res = null;
-	try {
-		res = matchedProducts.value.find((product, index) => {
-			return product.skuId == item.skuId && product.id == item.id;
-		});
-	} catch (error) {
-		//TODO handle the exception
-	}
+  console.log("单规格商品点击事件:", item, i);
+  if(!juageProductAvailable(item)){
+    return false;
+  }
+  // 判断购物车是否有该选中商品
+  let res = null;
+  try {
+    res = matchedProducts.value.find((product, index) => {
+      return product.skuId == item.skuId && product.id == item.id;
+    });
+  } catch (error) {
+    //TODO handle the exception
+  }
 
-	// 保存这次点击的
-	specifications.productListitem = item;
+  // 保存这次点击的
+  specifications.productListitem = item;
 
-	// 是否起售 如果小于或者大于都是1
-	let suitNum = 1;
-	const cartNumberFloat = parseFloat(item.cartNumber);
-	if (!res && item.suitNum > cartNumberFloat) {
-		suitNum = item.suitNum;
-	} else if (item.suitNum >= cartNumberFloat && i === '-') {
-		suitNum = item.cartNumber;
-	}
-	websocketsendMessage({
-		id: res ? item.cartListId : '',
-		type: 'shopping',
-		suitNum: item.suitNum,
-		table_code: uni.cache.get('tableCode'),
-		shop_id: uni.cache.get('shopId'),
-		operate_type: (await calculateValue(item.cartNumber, i, suitNum)) == 'del' ? 'del' : res ? 'edit' : 'add',
-		product_id: item.id,
-		sku_id: item.skuId,
-		number: await calculateValue(item.cartNumber, i, suitNum),
-		is_print: 1,
-		product_type: item.type
-	});
+  // 是否起售 如果小于或者大于都是1
+  let suitNum = 1;
+  const cartNumberFloat = parseFloat(item.cartNumber);
+  if (!res && item.suitNum > cartNumberFloat) {
+    suitNum = item.suitNum;
+  } else if (item.suitNum >= cartNumberFloat && i === "-") {
+    suitNum = item.cartNumber;
+  }
+  websocketsendMessage({
+    id: res ? item.cartListId : "",
+    type: "shopping",
+    suitNum: item.suitNum,
+    table_code: uni.cache.get("tableCode"),
+    shop_id: uni.cache.get("shopId"),
+    operate_type:
+      (await calculateValue(item.cartNumber, i, suitNum)) == "del"
+        ? "del"
+        : res
+        ? "edit"
+        : "add",
+    product_id: item.id,
+    sku_id: item.skuId,
+    memberPrice: item.memberPrice,
+    number: await calculateValue(item.cartNumber, i, suitNum),
+    is_print: 1,
+    product_type: item.type,
+    is_time_discount: item.is_time_discount,
+  });
 };
 
 const calculateValue = (cartNumber, i, step = 1) => {
-	if (i == '+') {
-		const result = parseFloat(cartNumber) + parseFloat(step);
-		return result.toFixed(2);
-	} else {
-		// 当减到0返回del
-		const result = parseFloat(cartNumber) - parseFloat(step);
-		return result == 0 ? 'del' : result.toFixed(2);
-	}
+  if (i == "+") {
+    const result = parseFloat(cartNumber) + parseFloat(step);
+    return result.toFixed(2);
+  } else {
+    // 当减到0返回del
+    const result = parseFloat(cartNumber) - parseFloat(step);
+    return result == 0 ? "del" : result.toFixed(2);
+  }
 };
 
 // WebSocket处理  	// 初始化配置
 const options = {
-	initMessage: {
-		type: 'shopping',
-		operate_type: 'init',
-		table_code: uni.cache.get('tableCode'),
-		shop_id: uni.cache.get('shopId')
-	}
+  initMessage: {
+    type: "shopping",
+    operate_type: "init",
+    table_code: uni.cache.get("tableCode"),
+    shop_id: uni.cache.get("shopId"),
+  },
 };
 const useSocket = useWebSocket();
 useSocket.connect(options.initMessage, onMessage);
@@ -1133,47 +1774,53 @@ const confirmordershow = ref(false);
 
 // 更新商品数量的方法
 const updateProductQuantities = () => {
-	console.log('updateProductQuantities');
-	// 先将所有商品的 cartNumber 初始化为 0
-	shopProductList.hots.forEach((i) => {
-		i.cartNumber = 0;
-	});
-	// 遍历商品列表二维数组
-	shopProductList.productInfo.forEach((group) => {
-		group.productList.forEach((product) => {
-			product.cartNumber = 0;
-		});
-	});
+  console.log("updateProductQuantities");
+  // 先将所有商品的 cartNumber 初始化为 0
+  shopProductList.hots.forEach((i) => {
+    i.cartNumber = 0;
+  });
+  // 遍历商品列表二维数组
+  shopProductList.productInfo.forEach((group) => {
+    group.productList.forEach((product) => {
+      product.cartNumber = 0;
+    });
+  });
 
-	// 再去更新数组的值
-	cartListFilter.value.forEach((cartItem) => {
-		shopProductList.productInfo.forEach((group) => {
-			group.productList.forEach((product) => {
-				if (product.id == cartItem.product_id && product.skuId == cartItem.sku_id) {
-					product.cartNumber = cartItem.number || 0;
-					product.cartListId = cartItem.id;
-				}
-			});
-		});
-	});
-	// 遍历购物车数组
-	cartListFilter.value.forEach((cartItem) => {
-		// 遍历商品列表二维数组
-		shopProductList.hots.forEach((group) => {
-			// 商品 id 匹配
-			if (group.id == cartItem.product_id) {
-				// 更新商品的数量
-				group.cartListId = cartItem.id;
-				group.cartNumber = cartItem.number || 0;
-			}
-		});
-	});
+  // 再去更新数组的值
+  cartListFilter.value.forEach((cartItem) => {
+    shopProductList.productInfo.forEach((group) => {
+      group.productList.forEach((product) => {
+        if (
+          product.id == cartItem.product_id &&
+          product.skuId == cartItem.sku_id
+        ) {
+          product.cartNumber = cartItem.number || 0;
+          product.cartListId = cartItem.id;
+        }
+      });
+    });
+  });
+  // 遍历购物车数组
+  cartListFilter.value.forEach((cartItem) => {
+    // 遍历商品列表二维数组
+    shopProductList.hots.forEach((group) => {
+      // 商品 id 匹配
+      if (group.id == cartItem.product_id) {
+        // 更新商品的数量
+        group.cartListId = cartItem.id;
+        group.cartNumber = cartItem.number || 0;
+      }
+    });
+  });
 };
 
 //websocket产值
 const websocketsendMessage = (data) => {
-	console.log(data);
-	uni.$u.debounce(useSocket.sendMessage(data), 500);
+  console.log("websocketsendMessage", data);
+  delete data.memberPrice;
+  uni.$u.debounce(() => {
+    useSocket.sendMessage(data);
+  }, 500);
 };
 
 // 用于记录已经处理过的消息的 msg_id
@@ -1181,201 +1828,220 @@ const processedMessageIds = new Set();
 
 //设置商品初始选中
 function setGoodsInitSel(cartsArr) {
-	console.log('setGoodsInitSel');
-	const arr = cartsArr && cartsArr.length ? cartsArr : cartStore.carts;
-	if (arr.length <= 0) {
-		return;
-	}
-	shopProductList.hots.map((v) => {
-		const item = arr.find((cart) => cart.product_id == v.id);
-		if (item) {
-			v.cartNumber = `${item.number}`;
-		}
-	});
-	shopProductList.productInfo.map((info) => {
-		info.productList.map((v) => {
-			const item = arr.find((cart) => cart.product_id == v.id);
-			if (item) {
-				v.cartNumber = `${item.number}`;
-				console.log(v.cartNumber);
-			}
-		});
-	});
+  console.log("setGoodsInitSel");
+  const arr = cartsArr && cartsArr.length ? cartsArr : cartStore.carts;
+  if (arr.length <= 0) {
+    return;
+  }
+  shopProductList.hots.map((v) => {
+    const item = arr.find((cart) => cart.product_id == v.id);
+    if (item) {
+      v.cartNumber = `${item.number}`;
+    }
+  });
+  shopProductList.productInfo.map((info) => {
+    info.productList.map((v) => {
+      const item = arr.find((cart) => cart.product_id == v.id);
+      if (item) {
+        v.cartNumber = `${item.number}`;
+        console.log(v.cartNumber);
+      }
+    });
+  });
+}
+
+async function delGoods() {
+  await websocketsendMessage({
+    id: Message.id,
+    type: "shopping",
+    table_code: uni.cache.get("tableCode"),
+    shop_id: uni.cache.get("shopId"),
+    operate_type: "del",
+    is_print: 1,
+  });
 }
 
 // 收到的消息变化
 async function onMessage(Message) {
-	if (Message) {
-		console.log('product index 收到消息', Message);
-		// 心跳返回  过滤
-		if (Message.type == 'ping_interval' || Message.msg_id == 'ping_interval') {
-			isLoading.value = false;
-			return false;
-		}
-		// 检查消息是否已经处理过
-		if (processedMessageIds.has(Message.msg_id)) {
-			return;
-		}
-		processedMessageIds.add(Message.msg_id);
+  if (Message) {
+    console.log("product index 收到消息", Message);
+    // 心跳返回  过滤
+    if (Message.type == "ping_interval" || Message.msg_id == "ping_interval") {
+      isLoading.value = false;
+      return false;
+    }
+    // 检查消息是否已经处理过
+    if (processedMessageIds.has(Message.msg_id)) {
+      return;
+    }
+    processedMessageIds.add(Message.msg_id);
 
-		// 初始化
-		if (Message.operate_type == 'init') {
-			cartStore.carts = Message.data;
-			uni.hideLoading();
-			isLoading.value = false;
-			// 初始化商品数量
-			// setGoodsInitSel(Message.data)
-		}
+    // 初始化
+    if (Message.operate_type == "init") {
+      cartStore.carts = Message.data;
+      cartStore.limitTimeDiscount = Message.time_dis_info;
+      uni.hideLoading();
+      isLoading.value = false;
+      // 初始化商品数量
+      // setGoodsInitSel(Message.data)
+    }
 
-		// 清空购物车
-		if (Message.operate_type == 'cleanup') {
-			cartStore.carts = [];
-			setTimeout(() => {
-				Historicalorders();
-			}, 400);
-			showCart.value = false;
-		}
+    // 清空购物车
+    if (Message.operate_type == "cleanup") {
+      cartStore.carts = [];
+      setTimeout(() => {
+        Historicalorders();
+      }, 400);
+      showCart.value = false;
+    }
 
-		// 删除除购物车
-		if (Message.operate_type == 'del' && Message.status == 1) {
-			// 优化：使用可选链操作符避免报错
-			cartStore.carts = cartStore.carts.filter((item) => item.id !== Message.data?.id);
-			// cartStore.carts = cartStore.carts.filter(item => item.id != Message.data.id);
-		}
+    // 删除除购物车
+    if (Message.operate_type == "del" && Message.status == 1) {
+      // 优化：使用可选链操作符避免报错
+      cartStore.carts = cartStore.carts.filter(
+        (item) => item.id !== Message.data?.id
+      );
+      // cartStore.carts = cartStore.carts.filter(item => item.id != Message.data.id);
+    }
 
-		// 添加或者减少购物后返回
-		if (Message.operate_type == 'add' || Message.operate_type == 'edit') {
-			[Message.data].forEach((objA) => {
-				const index = cartStore.carts.findIndex((objB) => objB.id == objA.id);
-				if (index !== -1) {
-					cartStore.carts[index] = objA;
-				} else {
-					cartStore.carts.push(objA);
-				}
-			});
-		}
+    // 添加或者减少购物后返回
+    if (Message.operate_type == "add" || Message.operate_type == "edit") {
+      [Message.data].forEach((objA) => {
+        const index = cartStore.carts.findIndex((objB) => objB.id == objA.id);
+        if (index !== -1) {
+          cartStore.carts[index] = objA;
+        } else {
+          cartStore.carts.push(objA);
+        }
+      });
+    }
 
-		// 历史订单
-		if (Message.operate_type == 'clearOrder') {
-			Historicalorders();
-		}
+    // 历史订单
+    if (Message.operate_type == "clearOrder") {
+      Historicalorders();
+    }
 
-		// 购物车数据更新从新请求
-		if (Message.type == 'product' && Message.data_type == 'product_update' && Message.operate_type == 'product_update') {
-			isDataLoaded.value = false;
-			productqueryProduct();
-		}
+    // 购物车数据更新从新请求
+    if (
+      Message.type == "product" &&
+      Message.data_type == "product_update" &&
+      Message.operate_type == "product_update"
+    ) {
+      isDataLoaded.value = false;
+      productqueryProduct();
+    }
 
-		// 提示
-		if (Message.status == 0 && Message.type != 'no_suit_num') {
-			uni.showToast({
-				title: Message.msg,
-				icon: 'none'
-			});
-		}
+    // 提示
+    if (
+      Message.status == 0 &&
+      Message.type != "no_suit_num" &&
+      Message.type != "time_discount"
+    ) {
+      uni.showToast({
+        title: Message.msg,
+        icon: "none",
+      });
+    }
 
-		if (Message.type == 'no_suit_num') {
-			// console.log(specifications)
-			uni.showModal({
-				title: '提示',
-				showCancel: false,
-				content: '此商品库存不足起售数量！',
-				success: async (data) => {
-					await websocketsendMessage({
-						id: Message.id,
-						type: 'shopping',
-						table_code: uni.cache.get('tableCode'),
-						shop_id: uni.cache.get('shopId'),
-						operate_type: 'del',
-						is_print: 1
-					});
-				}
-			});
-		}
+    if (Message.type == "no_suit_num") {
+      // console.log(specifications)
+      uni.showModal({
+        title: "提示",
+        showCancel: false,
+        content: "此商品库存不足起售数量！",
+        success: (data) => {
+          delGoods();
+        },
+      });
+    }
+    if (Message.operate_type == "time_discount_save") {
+      cartStore.limitTimeDiscount = Message.data;
+      console.log("time_discount_save", cartStore.limitTimeDiscount);
+    }
 
-		//除去p 每次返回都回执消息
-		await websocketsendMessage({
-			type: 'receipt',
-			msg_id: Message.msg_id
-		});
+    //除去p 每次返回都回执消息
+    await websocketsendMessage({
+      type: "receipt",
+      msg_id: Message.msg_id,
+    });
 
-		// 初始化商品数量
-		await updateProductQuantities();
-	}
+    // 初始化商品数量
+    await updateProductQuantities();
+  }
 }
 
 // 更新购物车数据shopProductList.hots
 const matchedProducts = computed(() => {
-	if (cartStore.carts.length > 0) {
-		let Specialstop = null;
+  if (cartStore.carts.length > 0) {
+    let Specialstop = null;
 
-		try {
-			Specialstop = [
-				...[
-					{
-						id: '',
-						name: '',
-						productList: shopProductList.hots
-					}
-				],
-				...shopProductList.productInfo
-			];
-		} catch (error) {
-			Specialstop = shopProductList.productInfo;
-			//TODO handle the exception
-		}
-		return cartStore.carts
-			.flatMap((cartItem) => {
-				for (const group of Specialstop) {
-					for (const product of group.productList) {
-						if (product.id == cartItem.product_id) {
-							console.log(cartItem);
-							return {
-								...product,
-								cartListinfo: cartItem,
-								cartListId: cartItem.id, //购物车id
-								cartNumber: cartItem.number //增加一个数量算法
-								// cartNumberToAdd: cartItem.number //增加一个数量算法
-							};
-						}
-					}
-				}
-				if (cartItem.is_temporary === 1) {
-					return [
-						{
-							...cartItem,
-							memberPrice: cartItem.discount_sale_amount,
-							salePrice: cartItem.discount_sale_amount,
-							cartListinfo: cartItem,
-							cartListId: cartItem.id, // 购物车id
-							cartNumber: cartItem.number // 增加一个数量算法
-						}
-					];
-				}
-				// 如果没找到匹配的商品，返回 null 或者其他默认值，这里返回 null
-				return null;
-			})
-			.filter((item) => item !== null);
-	} else {
-		return [];
-	}
+    try {
+      Specialstop = [
+        ...[
+          {
+            id: "",
+            name: "",
+            productList: shopProductList.hots,
+          },
+        ],
+        ...shopProductList.productInfo,
+      ];
+    } catch (error) {
+      Specialstop = shopProductList.productInfo;
+      //TODO handle the exception
+    }
+    return cartStore.carts
+      .flatMap((cartItem) => {
+        for (const group of Specialstop) {
+          for (const product of group.productList) {
+            if (product.id == cartItem.product_id) {
+              console.log(cartItem);
+              return {
+                ...product,
+                cartListinfo: cartItem,
+                cartListId: cartItem.id, //购物车id
+                cartNumber: cartItem.number, //增加一个数量算法
+                // cartNumberToAdd: cartItem.number //增加一个数量算法
+              };
+            }
+          }
+        }
+        if (cartItem.is_temporary === 1) {
+          return [
+            {
+              ...cartItem,
+              memberPrice: cartItem.discount_sale_amount,
+              salePrice: cartItem.discount_sale_amount,
+              cartListinfo: cartItem,
+              cartListId: cartItem.id, // 购物车id
+              cartNumber: cartItem.number, // 增加一个数量算法
+            },
+          ];
+        }
+        // 如果没找到匹配的商品，返回 null 或者其他默认值，这里返回 null
+        return null;
+      })
+      .filter((item) => item !== null);
+  } else {
+    return [];
+  }
 });
 
 //删除某一个待支付订单
 const clickcancelOrder = async (data) => {
-	if (data.i == 'all') {
-		await APIcancelOrder({
-			shopId: uni.cache.get('shopId'),
-			orderId: orderinfo.value.id
-		});
-	} else {
-		await APIrmPlaceOrder({
-			shopId: uni.cache.get('shopId'),
-			orderId: orderinfo.value.id,
-			placeNum: data.key
-		});
-	}
-	Historicalorders();
+  if (data.i == "all") {
+    await APIcancelOrder({
+      shopId: uni.cache.get("shopId"),
+      orderId: orderinfo.value.id,
+    });
+  } else {
+    await APIrmPlaceOrder({
+      shopId: uni.cache.get("shopId"),
+      orderId: orderinfo.value.id,
+      placeNum: data.key,
+    });
+  }
+  Historicalorders();
 };
 
 // 储存是否存在多次下单
@@ -1384,1252 +2050,1356 @@ const confirmorderref = ref(null);
 
 // 结账
 const orderdetail = async () => {
-	uni.navigateTo({
-		url: '/pages/order/confirm-order?tableCode=' + uni.cache.get('tableCode') + '&shopId=' + uni.cache.get('shopId')
-	});
-	return;
-	try {
-		await Historicalorders();
-	} catch (error) {}
-	confirmordershow.value = true;
-	showCart.value = false;
+  uni.navigateTo({
+    url:
+      "/pages/order/confirm-order?tableCode=" +
+      uni.cache.get("tableCode") +
+      "&shopId=" +
+      uni.cache.get("shopId"),
+  });
+  return;
+  try {
+    await Historicalorders();
+  } catch (error) {}
+  confirmordershow.value = true;
+  showCart.value = false;
 };
 
 // 历史订单
 const Historicalorders = async (W) => {
-	if (W) {
-		showCart.value = !showCart.value;
-	} else {
-		let res = await APIhistoryOrder({
-			tableCode: uni.cache.get('tableCode')
-		});
-		orderinfo.value = {
-			id: res.id,
-			detailMap: res.detailMap,
-			placeNum: res.placeNum
-		};
-	}
+  if (W) {
+    showCart.value = !showCart.value;
+  } else {
+    let res = await APIhistoryOrder({
+      tableCode: uni.cache.get("tableCode"),
+    });
+    orderinfo.value = {
+      id: res.id,
+      detailMap: res.detailMap,
+      placeNum: res.placeNum,
+    };
+  }
 };
 
 // 提取合并 orderinfo.detailMap 数组的逻辑
 function combineOrderInfoDetailMap(orderinfo) {
-	if (!orderinfo) return [];
-	let combinedArray = [];
-	for (const key in orderinfo.detailMap) {
-		if (orderinfo.detailMap.hasOwnProperty(key)) {
-			let subArray = orderinfo.detailMap[key];
-			combinedArray = [...combinedArray, ...subArray];
-		}
-	}
-	return combinedArray;
+  if (!orderinfo) return [];
+  let combinedArray = [];
+  for (const key in orderinfo.detailMap) {
+    if (orderinfo.detailMap.hasOwnProperty(key)) {
+      let subArray = orderinfo.detailMap[key];
+      combinedArray = [...combinedArray, ...subArray];
+    }
+  }
+  return combinedArray;
 }
 
 // 计算购物车商品费用
 const totalPrices = computed(() => {
-	// 待支付订单
-	let cartone = 0;
-	if (orderinfo.value) {
-		let combinedArray = [];
-		for (const key in orderinfo.value.detailMap) {
-			if (orderinfo.value.detailMap.hasOwnProperty(key)) {
-				let subArray = orderinfo.value.detailMap[key];
-				combinedArray = [...combinedArray, ...subArray];
-			}
-		}
-		// 购物车总数价格
-		cartone = combinedArray.reduce((total, item) => {
-			// 是否启用会员价 0否1是
-			if (shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1) {
-				// memberPrice会员价
-				return total + parseFloat(item.memberPrice || item.price) * parseFloat(item.num - item.returnNum);
-			} else {
-				// salePrice销售价
-				return total + parseFloat(item.price || 0) * parseFloat(item.num - item.returnNum);
-			}
-		}, 0);
-	}
-	// 购物车总数价格
-	let cart = 0;
-	if (matchedProducts.value.length > 0) {
-		// 购物车总数价格
-		cart = matchedProducts.value.reduce((total, item) => {
-			if (item.type == 'sku') {
-				item.skuList.forEach((i, t) => {
-					if (item.cartListinfo.sku_id == i.id) {
-						item.memberPrice = i.memberPrice;
-						item.salePrice = i.salePrice;
-					}
-				});
-			}
-			// 是否启用会员价 0否1是
-			if (shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1) {
-				// memberPrice会员价
-				return total + parseFloat(item.memberPrice || item.salePrice) * parseFloat(item.cartNumber);
-			} else {
-				// salePrice销售价
-				return total + parseFloat(item.salePrice || 0) * parseFloat(item.cartNumber);
-			}
-		}, 0);
-	}
-	cart = parseFloat(cart);
-	// 向上取整并保留两位小数
-	return parseFloat(cart.toFixed(2));
+  // 购物车总数价格
+  let cart = 0;
+  if (matchedProducts.value.length > 0) {
+    // 购物车总数价格
+    cart = matchedProducts.value.reduce((total, item) => {
+      if (item.type == "sku") {
+        item.skuList.forEach((i, t) => {
+          if (item.cartListinfo.sku_id == i.id) {
+            item.memberPrice = i.memberPrice;
+            item.salePrice = i.salePrice;
+          }
+        });
+      }
+      if (
+        limitTimeDiscountRes.value &&
+        limitTimeDiscountRes.value.id &&
+        item.is_time_discount == 1
+      ) {
+        //限时折扣
+        const price = orderUtils.returnPrice({
+          goods: item,
+          shopInfo,
+          limitTimeDiscountRes: limitTimeDiscountRes.value,
+          shopUserInfo: shopUserInfo.value,
+          idKey: "id",
+        });
+        return total + parseFloat(price) * parseFloat(item.cartNumber);
+      }
+      // 是否启用会员价 0否1是
+      if (
+        shopUserInfo.value.isVip == 1 &&
+        shopUserInfo.value.isMemberPrice == 1
+      ) {
+        // memberPrice会员价
+        return (
+          total +
+          parseFloat(item.memberPrice || item.salePrice) *
+            parseFloat(item.cartNumber)
+        );
+      } else {
+        // salePrice销售价
+        return (
+          total + parseFloat(item.salePrice || 0) * parseFloat(item.cartNumber)
+        );
+      }
+    }, 0);
+  }
+  cart = parseFloat(cart);
+  // 向上取整并保留两位小数
+  return parseFloat(cart.toFixed(2));
 });
 
 // 计算购物车商品总数量
 const cartLists_count = computed(() => {
-	const combinedOrderInfo = combineOrderInfoDetailMap(orderinfo.value);
-	const orderInfoCount = combinedOrderInfo.reduce((sum, item) => {
-		return sum + parseFloat(item.num);
-	}, 0);
+  const combinedOrderInfo = combineOrderInfoDetailMap(orderinfo.value);
+  const orderInfoCount = combinedOrderInfo.reduce((sum, item) => {
+    return sum + parseFloat(item.num);
+  }, 0);
 
-	const matchedProductsCount = matchedProducts.value.reduce((sum, item) => {
-		const num = typeof item.cartNumber === 'string' ? parseFloat(item.cartNumber) : item.cartNumber;
-		return sum + num;
-	}, 0);
+  const matchedProductsCount = matchedProducts.value.reduce((sum, item) => {
+    const num =
+      typeof item.cartNumber === "string"
+        ? parseFloat(item.cartNumber)
+        : item.cartNumber;
+    return sum + num;
+  }, 0);
 
-	const totalCount = matchedProductsCount;
-	return parseFloat(totalCount.toFixed(2));
+  const totalCount = matchedProductsCount;
+  return parseFloat(totalCount.toFixed(2));
 });
 
 // 定义 ifcartNumber 计算属性方法 展示数量
 function ifcartNumber(item) {
-	// 如果 item 为空或者 cartNumber 不是字符串类型，返回 0
-	if (!item || item.cartNumber * 1 == 0) {
-		return '';
-	}
-	let numValue = parseFloat(item.cartNumber);
-	if (isNaN(numValue)) {
-		// 如果转换结果是 NaN，说明 cartNumber 不是有效的数字字符串，返回 0
-		return '';
-	}
-	// type string  商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
-	if (item.type === 'weight') {
-		// 如果类型是称重重量，将值保留两位小数
-		return parseFloat(numValue.toFixed(2));
-	} else {
-		// 如果类型是整数，将值转换为整数
-		return Math.round(numValue);
-	}
-	// 如果类型不匹配，返回原始值
-	return item.cartNumber;
+  // 如果 item 为空或者 cartNumber 不是字符串类型，返回 0
+  if (!item || item.cartNumber * 1 == 0) {
+    return "";
+  }
+  let numValue = parseFloat(item.cartNumber);
+  if (isNaN(numValue)) {
+    // 如果转换结果是 NaN，说明 cartNumber 不是有效的数字字符串，返回 0
+    return "";
+  }
+  // type string  商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
+  if (item.type === "weight") {
+    // 如果类型是称重重量，将值保留两位小数
+    return parseFloat(numValue.toFixed(2));
+  } else {
+    // 如果类型是整数，将值转换为整数
+    return Math.round(numValue);
+  }
+  // 如果类型不匹配，返回原始值
+  return item.cartNumber;
 }
-// const ifcartNumber = computed(() => {
-// 	return (item) => {
-// 		// 如果 item 为空或者 cartNumber 不是字符串类型，返回 0
-// 		if (!item || typeof item.cartNumber !== 'string') {
-// 			return 0;
-// 		}
-// 		let numValue = parseFloat(item.cartNumber);
-// 		if (isNaN(numValue)) {
-// 			// 如果转换结果是 NaN，说明 cartNumber 不是有效的数字字符串，返回 0
-// 			return 0;
-// 		}
-// 		// type string  商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
-// 		if (item.type === 'weight') {
-// 			// 如果类型是称重重量，将值保留两位小数
-// 			return parseFloat(numValue.toFixed(2));
-// 		} else {
-// 			// 如果类型是整数，将值转换为整数
-// 			return Math.round(numValue);
-// 		}
-// 		// 如果类型不匹配，返回原始值
-// 		return item.cartNumber;
-// 	};
-// })
 
 // 计算处理后的购物车列表 	// 用于筛选后的购物车数组
 const cartListFilter = computed(() => {
-	// 使用 reduce 方法对 cartList 进行处理
-	const grouped = cartStore.carts.reduce((acc, item) => {
-		const productId = item.product_id;
-		const num = parseFloat(item.number);
+  // 使用 reduce 方法对 cartList 进行处理
+  const grouped = cartStore.carts.reduce((acc, item) => {
+    const productId = item.product_id;
+    const num = parseFloat(item.number);
 
-		if (!acc[productId]) {
-			// 如果 acc 中还没有该 product_id 的记录，创建一个新对象
-			acc[productId] = {
-				...item,
-				number: num
-			};
-		} else {
-			// 如果已经有该 product_id 的记录，将当前对象的 number 值累加到已有记录的 number 属性上
-			acc[productId].number += num;
-		}
-		return acc;
-	}, {});
-	// 将累加结果保留两位小数，并将对象转换为数组
-	return Object.values(grouped).map((item) => ({
-		...item,
-		number: item.number.toFixed(2)
-	}));
+    if (!acc[productId]) {
+      // 如果 acc 中还没有该 product_id 的记录，创建一个新对象
+      acc[productId] = {
+        ...item,
+        number: num,
+      };
+    } else {
+      // 如果已经有该 product_id 的记录，将当前对象的 number 值累加到已有记录的 number 属性上
+      acc[productId].number += num;
+    }
+    return acc;
+  }, {});
+  // 将累加结果保留两位小数，并将对象转换为数组
+  return Object.values(grouped).map((item) => ({
+    ...item,
+    number: item.number.toFixed(2),
+  }));
 });
 
 const endTimeref = reactive({
-	startTime: '',
-	endTime: ''
+  startTime: "",
+  endTime: "",
 });
 
 // 获取当前时间
 const getCurrentTime = () => {
-	const now = new Date();
-	const hours = now.getHours().toString().padStart(2, '0');
-	const minutes = now.getMinutes().toString().padStart(2, '0');
-	return `${hours}:${minutes}`;
+  const now = new Date();
+  const hours = now.getHours().toString().padStart(2, "0");
+  const minutes = now.getMinutes().toString().padStart(2, "0");
+  return `${hours}:${minutes}`;
 };
 
 // 计算是否在营业时间内
 const isBusinessTime = computed(() => {
-	if (!shopInfo.businessTime) {
-		return true;
-	}
-	const currentTime = getCurrentTime();
-	const [startTime, endTime] = shopInfo.businessTime.split('-');
-	endTimeref.startTime = startTime;
-	endTimeref.endTime = endTime;
-	// 如果开始时间大于结束时间，说明是跨天的营业时间
-	if (startTime > endTime) {
-		return currentTime >= startTime || currentTime <= endTime;
-	}
-	return currentTime >= startTime && currentTime <= endTime;
+  if (!shopInfo.businessTime) {
+    return true;
+  }
+  const currentTime = getCurrentTime();
+  const [startTime, endTime] = shopInfo.businessTime.split("-");
+  endTimeref.startTime = startTime;
+  endTimeref.endTime = endTime;
+  // 如果开始时间大于结束时间，说明是跨天的营业时间
+  if (startTime > endTime) {
+    return currentTime >= startTime || currentTime <= endTime;
+  }
+  return currentTime >= startTime && currentTime <= endTime;
 });
 
 // 列表请求
 const productqueryProduct = async () => {
-	cartStore.goodsIsloading = false;
-	try {
-		shopProductList.hots = await productminiApphotsquery();
-		shopProductList.productInfo = await APIgroupquery();
-	} catch (error) {
-		uni.showToast({
-			title: '网络不稳定，请重新扫码进入',
-			icon: 'none'
-		});
-		setTimeout(() => {
-			uni.pro.switchTab('index/index');
-		}, 1000);
-	}
-	if (shopProductList.productInfo.length > 0 || shopProductList.hots.length > 0) {
-		//TODO handle the exception
-		//第一步：将所有商品的 cartNumber 初始化为 0
-		shopProductList.productInfo.forEach((group) => {
-			group.productList.forEach(async (product) => {
-				product.cartNumber = 0;
-				product.isSaleTimeshow = await isProductAvailable(product.days, product.startTime, product.endTime);
-				cartStore.setGoodsMap(product.id, product);
-			});
-		});
-		shopProductList.hots.forEach(async (i) => {
-			i.cartNumber = 0;
-			i.isSaleTimeshow = await isProductAvailable(i.days, i.startTime, i.endTime);
-			cartStore.setGoodsMap(i.id, i);
-		});
-		cartStore.goodsIsloading = true;
-		scrollTopSize.value = 0;
-		topArr.value = [];
-		// userStore.actionsAPIuser()
-		// 数据可以更新
-		isDataLoaded.value = true;
-		// 历史订单
-		Historicalorders();
-		updateProductQuantities();
-	} else {
-		uni.showToast({
-			title: '暂无列表数据,请重新扫码',
-			icon: 'none'
-		});
-		isDataLoaded.value = false;
-		setTimeout(() => {
-			uni.pro.switchTab('index/index');
-		}, 1000);
-		return false;
-	}
+  cartStore.goodsIsloading = false;
+  try {
+    shopProductList.hots = await productminiApphotsquery();
+    shopProductList.productInfo = await APIgroupquery();
+  } catch (error) {
+    uni.showToast({
+      title: "网络不稳定，请重新扫码进入",
+      icon: "none",
+    });
+    setTimeout(() => {
+      uni.pro.switchTab("index/index");
+    }, 1000);
+  }
+  if (
+    shopProductList.productInfo.length > 0 ||
+    shopProductList.hots.length > 0
+  ) {
+    //TODO handle the exception
+    //第一步：将所有商品的 cartNumber 初始化为 0
+    shopProductList.productInfo.forEach((group) => {
+      group.productList.forEach(async (product) => {
+        product.cartNumber = 0;
+        product.isSaleTimeshow = await isProductAvailable(
+          product.days,
+          product.startTime,
+          product.endTime
+        );
+        product.is_time_discount = showLimitDiscount(product) ? 1 : 0;
+        product.limitSalePrice = returnLimitPrice(product);
+
+        cartStore.setGoodsMap(product.id, product);
+      });
+    });
+    shopProductList.hots.forEach(async (i) => {
+      i.cartNumber = 0;
+      i.isSaleTimeshow = await isProductAvailable(
+        i.days,
+        i.startTime,
+        i.endTime
+      );
+      i.is_time_discount = showLimitDiscount(i) ? 1 : 0;
+      i.limitSalePrice = returnLimitPrice(i);
+      cartStore.setGoodsMap(i.id, i);
+    });
+    console.log("shopProductList", shopProductList);
+    cartStore.goodsIsloading = true;
+    scrollTopSize.value = 0;
+    topArr.value = [];
+    // userStore.actionsAPIuser()
+    // 数据可以更新
+    isDataLoaded.value = true;
+    // 历史订单
+    Historicalorders();
+    updateProductQuantities();
+  } else {
+    uni.showToast({
+      title: "暂无列表数据,请重新扫码",
+      icon: "none",
+    });
+    isDataLoaded.value = false;
+    setTimeout(() => {
+      uni.pro.switchTab("index/index");
+    }, 1000);
+    return false;
+  }
 };
 
+provide("cartStore", cartStore);
+provide("shopUserInfo", shopUserInfo);
+provide("shopInfo", shopInfo);
+
 onLoad(async (e) => {
-	await proxy.$onLaunched;
+  console.log("onLoad:e", e);
+  cartStore.setOldOrder({
+    detailMap: {},
+    originAmount: 0,
+  });
+  await proxy.$onLaunched;
 });
 
+const limitTimeDiscountRes = ref(null);
+
+function showLimitDiscount(item) {
+  if (!cartStore.limitTimeDiscount || !cartStore.limitTimeDiscount.id) {
+    return false;
+  }
+  return orderUtils.canUseLimitTimeDiscount(
+    item,
+    cartStore.limitTimeDiscount,
+    shopInfo,
+    shopUserInfo.value,
+    "id"
+  );
+}
+
+function returnLimitPrice(item) {
+  return orderUtils.returnPrice({
+    goods: item,
+    limitTimeDiscountRes: cartStore.limitTimeDiscount,
+    shopInfo: shopInfo,
+    shopUserInfo: shopUserInfo.value,
+    idKey: "id",
+  });
+}
+
 onShow(async () => {
-	// 监听页面显示和隐藏
-	useSocket.setOnMessage(onMessage);
-	useSocket.onShowconnect();
-	let res = await APIhistoryOrder({
-		tableCode: uni.cache.get('tableCode')
-	});
-	if (res) {
-		orderinfo.value = {
-			id: res.id,
-			detailMap: res.detailMap,
-			placeNum: res.placeNum
-		};
-	} else {
-		orderinfo.value = {
-			id: ''
-		};
-	}
+  // 监听页面显示和隐藏
+  useSocket.setOnMessage(onMessage);
+  useSocket.onShowconnect();
+  let res = await APIhistoryOrder({
+    tableCode: uni.cache.get("tableCode"),
+  });
+  if (res) {
+    orderinfo.value = {
+      id: res.id,
+      detailMap: res.detailMap,
+      placeNum: res.placeNum,
+    };
+  } else {
+    orderinfo.value = {
+      id: "",
+    };
+  }
 });
 
-onHide(() => {});
+onHide(() => {
+  console.log("product index onHide");
+  useSocket.closeSocket();
+  useSocket.setOnMessage(() => {});
+});
+onUnload(() => {
+  console.log("product index onUnload");
+  useSocket.closeSocket();
+  useSocket.setOnMessage(() => {});
+});
 
 onMounted(async () => {
-	await proxy.$onLaunched;
-	// 获取当前页面栈
-	const pages = getCurrentPages();
-	// 获取当前页面实例
-	const currentPage = pages[pages.length - 1];
-	// 获取页面参数
-	const options = currentPage.options;
-	let res = await APIhistoryOrder({
-		tableCode: uni.cache.get('tableCode')
-	});
+  await proxy.$onLaunched;
+  // 获取当前页面栈
+  const pages = getCurrentPages();
+  // 获取当前页面实例
+  const currentPage = pages[pages.length - 1];
+  // 获取页面参数
+  const options = currentPage.options;
+  console.log("onMounted", options);
+  let res = await APIhistoryOrder({
+    tableCode: uni.cache.get("tableCode"),
+  });
+  const limitRes = await limitTimeDiscountapi.getConfig({
+    shopId: uni.cache.get("shopId"),
+  });
+  if (limitRes && typeof limitRes == "object") {
+    limitTimeDiscountRes.value = limitRes;
+    cartStore.limitTimeDiscount = limitRes;
+    websocketsendMessage({
+      type: "shopping",
+      operate_type: "time_discount_save",
+      table_code: uni.cache.get("tableCode"),
+      shop_id: uni.cache.get("shopId"),
+      operate_type: "time_discount_save",
+      data: limitRes,
+    });
+  } else {
+    cartStore.limitTimeDiscount = null;
+    websocketsendMessage({
+      type: "shopping",
+      operate_type: "time_discount_save",
+      table_code: uni.cache.get("tableCode"),
+      shop_id: uni.cache.get("shopId"),
+      operate_type: "time_discount_save",
+      data: null,
+    });
+  }
 
-	await productqueryProduct();
-	if (res && res.id && shopInfo.registerType == 'after') {
-		toHistory();
-		return;
-	}
-	setTimeout(() => {
-		// 启动网络监听
-		useSocket.initNetworkListener();
-		getElementTop();
-	}, 500);
+  await productqueryProduct();
+  if (res && res.id && shopInfo.registerType == "after") {
+    toHistory();
+    return;
+  }
+  setTimeout(() => {
+    // 启动网络监听
+    useSocket.initNetworkListener();
+    getElementTop();
+  }, 500);
 });
 
 //跳转历史订单
 function toHistory() {
-	uni.navigateTo({
-		url: '/pages/order/confirm-order?tableCode=' + uni.cache.get('tableCode') + '&shopId=' + uni.cache.get('shopId')
-	});
-	// uni.navigateTo({
-	// 	url: '/pages/order/confirm-order?orderId=' + orderinfo.id + '&shopId=' + uni.cache.get('shopId')+'&tableCode='+uni.cache.get('tableCode')
-	// })
+  const tableCode = uni.cache.get("tableCode");
+  const shopId = uni.cache.get("shopId");
+  uni.navigateTo({
+    url: `/pages/order/confirm-order?tableCode=${tableCode}&shopId=${shopId}`,
+  });
 }
 </script>
 
 <style lang="scss" scoped>
 .grayscale {
-	filter: grayscale(100%);
-	pointer-events: none;
+  filter: grayscale(100%);
+  pointer-events: none;
 }
 
 .top--panel {
-	// padding: 0 20rpx;
-	background-color: #fff;
+  // padding: 0 20rpx;
+  background-color: #fff;
 
-	.panelimgbackground {
-		width: 100%;
-		height: 272rpx;
-	}
+  .panelimgbackground {
+    width: 100%;
+    height: 272rpx;
+  }
 
-	.panelone {
-		padding: 20rpx 20rpx 0 20rpx;
-		font-family: Source Han Sans CN, Source Han Sans CN;
-		font-weight: 500;
-		font-size: 32rpx;
-		color: #333333;
-	}
+  .panelone {
+    padding: 20rpx 20rpx 0 20rpx;
+    font-family: Source Han Sans CN, Source Han Sans CN;
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #333333;
+  }
 
-	.paneltow {
-		padding: 0 20rpx;
-		margin-top: 16rpx;
-		font-family: Source Han Sans CN, Source Han Sans CN;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #999999;
-	}
+  .paneltow {
+    padding: 0 20rpx;
+    margin-top: 16rpx;
+    font-family: Source Han Sans CN, Source Han Sans CN;
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #999999;
+  }
 
-	.panelthere {
-		margin-top: 32rpx;
-		margin-bottom: 50rpx;
-		font-family: Source Han Sans CN, Source Han Sans CN;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #999999;
-		padding: 0 20rpx;
+  .panelthere {
+    margin-top: 32rpx;
+    margin-bottom: 50rpx;
+    font-family: Source Han Sans CN, Source Han Sans CN;
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #999999;
+    padding: 0 20rpx;
 
-		.paneltheretext {
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: 400;
-			font-size: 24rpx;
-			color: #999999;
-		}
+    .paneltheretext {
+      font-family: Source Han Sans CN, Source Han Sans CN;
+      font-weight: 400;
+      font-size: 24rpx;
+      color: #999999;
+    }
 
-		.flex-start {
-			view {
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #999999;
-			}
-		}
-	}
+    .flex-start {
+      view {
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #999999;
+      }
+    }
+  }
 
-	.panelfour {
-		font-family: Source Han Sans CN, Source Han Sans CN;
-		font-weight: bold;
-		font-size: 32rpx;
-		color: #333333;
-		padding: 0 20rpx;
-	}
+  .panelfour {
+    font-family: Source Han Sans CN, Source Han Sans CN;
+    font-weight: bold;
+    font-size: 32rpx;
+    color: #333333;
+    padding: 0 20rpx;
+  }
 
-	.panelfive {
-		width: 100%;
-		padding: 0 20rpx;
+  .panelfive {
+    width: 100%;
+    padding: 0 20rpx;
 
-		.panelfive_list {
-			display: flex;
-		}
+    .panelfive_list {
+      display: flex;
+    }
 
-		.panelfiveitem {
-			margin-top: 16rpx;
-			width: 340rpx;
-			margin-right: 30rpx;
-			position: relative;
-			flex-shrink: 0;
+    .panelfiveitem {
+      margin-top: 16rpx;
+      width: 340rpx;
+      margin-right: 30rpx;
+      position: relative;
+      flex-shrink: 0;
 
-			.panelfiveitemimage {
-				border-radius: 20rpx 20rpx 0rpx 0rpx;
-				width: 100%;
-				height: 204rpx;
-			}
+      .panelfiveitemimage {
+        border-radius: 20rpx 20rpx 0rpx 0rpx;
+        width: 100%;
+        height: 204rpx;
+      }
 
-			.vifgoodsImg {
-				width: 100%;
-				height: 204rpx;
-				position: absolute;
-				top: 0;
-				left: 0;
-				z-index: 9;
-				background-color: rgb(0, 0, 0, 0.5);
+      .vifgoodsImg {
+        width: 100%;
+        height: 204rpx;
+        position: absolute;
+        top: 0;
+        left: 0;
+        z-index: 9;
+        background-color: rgb(0, 0, 0, 0.5);
 
-				image {
-					padding: 30rpx;
-					width: 100%;
-					height: 100%;
-				}
-			}
+        image {
+          padding: 30rpx;
+          width: 100%;
+          height: 100%;
+        }
+      }
 
-			.panelfiveitemone {
-				margin-top: 32rpx;
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 500;
-				font-size: 28rpx;
-				color: #333333;
-				overflow: hidden; //超出的文本隐藏
-				text-overflow: ellipsis; //溢出用省略号显示
-				white-space: nowrap; //溢出不换行
-			}
+      .panelfiveitemone {
+        margin-top: 32rpx;
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: 500;
+        font-size: 28rpx;
+        color: #333333;
+        overflow: hidden; //超出的文本隐藏
+        text-overflow: ellipsis; //溢出用省略号显示
+        white-space: nowrap; //溢出不换行
+      }
 
-			.panelfiveitemtow {
-				margin-top: 16rpx;
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #ff534b;
-			}
+      .panelfiveitemtow {
+        margin-top: 16rpx;
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #ff534b;
+      }
 
-			.panelfiveitemthere {
-				margin-top: 12rpx;
-				// text:nth-child(1) {
-				// 	margin-left: 0;
-				// }
+      .panelfiveitemthere {
+        margin-top: 12rpx;
+        // text:nth-child(1) {
+        // 	margin-left: 0;
+        // }
 
-				text {
-					padding: 4rpx 24rpx;
-					background: #f6f6f6;
-					border-radius: 8rpx 8rpx 8rpx 8rpx;
-					font-family: Source Han Sans CN, Source Han Sans CN;
-					font-weight: 400;
-					font-size: 20rpx;
-					color: #999999;
-				}
-			}
+        text {
+          padding: 4rpx 24rpx;
+          background: #f6f6f6;
+          border-radius: 8rpx 8rpx 8rpx 8rpx;
+          font-family: Source Han Sans CN, Source Han Sans CN;
+          font-weight: 400;
+          font-size: 20rpx;
+          color: #999999;
+        }
+      }
 
-			.panelfiveitemfour {
-				margin-top: 12rpx;
-				width: 100%;
-				height: 36rpx;
-				line-height: 36rpx;
-				overflow: hidden; //超出的文本隐藏
-				text-overflow: ellipsis; //溢出用省略号显示
-				white-space: nowrap; //溢出不换行
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #999999;
-			}
+      .panelfiveitemfour {
+        margin-top: 12rpx;
+        width: 100%;
+        height: 36rpx;
+        line-height: 36rpx;
+        overflow: hidden; //超出的文本隐藏
+        text-overflow: ellipsis; //溢出用省略号显示
+        white-space: nowrap; //溢出不换行
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #999999;
+      }
 
-			.panelfiveitemfive {
-				margin-top: 8rpx;
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #999999;
-			}
+      .panelfiveitemfive {
+        margin-top: 8rpx;
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #999999;
+      }
 
-			.panelfiveitemsex {
-				.panelfiveitemsex_oen {
-					.tips {
-						font-family: Source Han Sans CN, Source Han Sans CN;
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #333333;
-					}
+      .panelfiveitemsex {
+        .panelfiveitemsex_oen {
+          display: flex;
+          align-items: baseline;
+          .tips {
+            font-family: Source Han Sans CN, Source Han Sans CN;
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #333333;
+          }
 
-					.price {
-						font-family: Source Han Sans CN, Source Han Sans CN;
-						font-weight: bold;
-						font-size: 36rpx;
-						color: #333333;
-					}
+          .price {
+            font-family: Source Han Sans CN, Source Han Sans CN;
+            font-weight: bold;
+            font-size: 36rpx;
+            color: #333333;
+          }
 
-					.originalprice {
-						margin-left: 10rpx;
-						font-family: Source Han Sans CN, Source Han Sans CN;
-						font-weight: 400;
-						font-size: 20rpx;
-						text-decoration: line-through;
-					}
+          .originalprice {
+            margin-left: 10rpx;
+            font-family: Source Han Sans CN, Source Han Sans CN;
+            font-weight: 400;
+            font-size: 20rpx;
+            text-decoration: line-through;
+          }
 
-					.unit {
-						font-family: Source Han Sans CN, Source Han Sans CN;
-						font-weight: 400;
-						font-size: 36rpx;
-						color: #333333;
-					}
-				}
-			}
+          .unit {
+            font-family: Source Han Sans CN, Source Han Sans CN;
+            font-weight: 400;
+            font-size: 36rpx;
+            color: #333333;
+          }
+        }
+      }
 
-			.panelfiveitemNum {
-				// position: absolute;
-				// bottom: 82rpx;
-				// right: 0;
-				display: flex;
-				align-items: center;
-				justify-content: flex-end;
+      .panelfiveitemNum {
+        // position: absolute;
+        // bottom: 82rpx;
+        // right: 0;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
 
-				.sku-wrap {
-					padding: 10rpx 20rpx;
-					background: #e3ad7f;
-					border-radius: 32rpx;
-					position: relative;
-					align-items: center;
-					white-space: nowrap;
-					.t {
-						font-size: 28rpx;
-						color: #fff;
-					}
+        .sku-wrap {
+          padding: 10rpx 20rpx;
+          background: #e3ad7f;
+          border-radius: 32rpx;
+          position: relative;
+          align-items: center;
+          white-space: nowrap;
+          .t {
+            font-size: 28rpx;
+            color: #fff;
+          }
 
-					.dot {
-						position: absolute;
-						top: -15rpx;
-						right: -10rpx;
-						background-color: #ff4b33;
-						color: #fff;
-						border-radius: 58rpx;
-						padding: 5rpx 14rpx;
-						box-sizing: border-box;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						font-size: 20rpx;
-					}
-				}
+          .dot {
+            position: absolute;
+            top: -15rpx;
+            right: -10rpx;
+            background-color: #ff4b33;
+            color: #fff;
+            border-radius: 58rpx;
+            padding: 5rpx 14rpx;
+            box-sizing: border-box;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size: 20rpx;
+          }
+        }
 
-				.Controls {
-					display: flex;
-					align-items: center;
+        .Controls {
+          display: flex;
+          align-items: center;
 
-					.num {
-						margin: 8rpx 8rpx 0 8rpx;
-					}
+          .num {
+            margin: 8rpx 8rpx 0 8rpx;
+          }
 
-					.btn {
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						position: relative;
+          .btn {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            position: relative;
 
-						.btnClick {
-							width: 100rpx;
-							height: 100rpx;
-							position: absolute;
-							// bottom: 0;
-						}
-					}
-				}
-			}
-		}
-	}
+            .btnClick {
+              width: 100rpx;
+              height: 100rpx;
+              position: absolute;
+              // bottom: 0;
+            }
+          }
+        }
+      }
+    }
+  }
 }
 
 .scroll-panel {
-	position: relative;
+  position: relative;
 
-	.list-box {
-		display: flex;
-		flex-direction: row;
-		flex-wrap: nowrap;
-		justify-content: flex-start;
-		align-items: flex-start;
-		align-content: flex-start;
-		font-size: 28rpx;
-		position: relative;
+  .list-box {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    align-items: flex-start;
+    align-content: flex-start;
+    font-size: 28rpx;
+    position: relative;
 
-		.left {
-			width: 200rpx;
-			background-color: #f6f6f6;
-			line-height: normal;
-			box-sizing: border-box;
-			font-size: 32rpx;
-			position: sticky;
-			top: 0;
+    .left {
+      // width: 200rpx;
+      width: 156rpx;
+      background-color: #f6f6f6;
+      line-height: normal;
+      box-sizing: border-box;
+      font-size: 32rpx;
+      position: sticky;
+      top: 0;
 
-			// padding-bottom: 200rpx;
-			.item {
-				padding: 30rpx 30rpx;
-				// height: 92rpx;
-				// line-height: 92rpx;
-				position: relative;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #333333;
-				display: flex;
-				align-items: center;
-				// overflow: hidden;
-				// text-overflow: ellipsis;
-				// white-space: nowrap;
+      // padding-bottom: 200rpx;
+      .item {
+        padding: 30rpx 30rpx;
+        // height: 92rpx;
+        // line-height: 92rpx;
+        position: relative;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #333333;
+        display: flex;
+        align-items: center;
+        // overflow: hidden;
+        // text-overflow: ellipsis;
+        // white-space: nowrap;
 
-				& + .item {
-					margin-top: 1px;
+        & + .item {
+          margin-top: 1px;
 
-					&::after {
-						// content: '';
-						// display: block;
-						// height: 0;
-						// border-top: #d6d6d6 solid 1px;
-						// width: 620upx;
-						// position: absolute;
-						// top: -1px;
-						// right: 0;
-						// transform: scaleY(0.5);
-						/* 1px像素 */
-					}
-				}
+          &::after {
+            // content: '';
+            // display: block;
+            // height: 0;
+            // border-top: #d6d6d6 solid 1px;
+            // width: 620upx;
+            // position: absolute;
+            // top: -1px;
+            // right: 0;
+            // transform: scaleY(0.5);
+            /* 1px像素 */
+          }
+        }
 
-				&.active {
-					color: #333;
-					background-color: #fff;
-					position: relative;
+        &.active {
+          color: #333;
+          background-color: #fff;
+          position: relative;
 
-					&::before {
-						content: '';
-						display: block;
-						position: absolute;
-						top: 0;
-						left: 0;
-						border-left: #7e5c23 solid 4px;
-						height: 100%;
-						width: 0;
-					}
+          &::before {
+            content: "";
+            display: block;
+            position: absolute;
+            top: 0;
+            left: 0;
+            border-left: #7e5c23 solid 4px;
+            height: 100%;
+            width: 0;
+          }
 
-					&::after {
-						content: '';
-						display: block;
-						position: absolute;
-						top: 0;
-						left: -15rpx;
-						bottom: 0;
-						margin: auto;
-						height: 30rpx;
-						width: 30rpx;
-						border-radius: 50%;
-						background-color: #7e5c23;
-					}
-				}
-			}
+          &::after {
+            content: "";
+            display: block;
+            position: absolute;
+            top: 0;
+            left: -15rpx;
+            bottom: 0;
+            margin: auto;
+            height: 30rpx;
+            width: 30rpx;
+            border-radius: 50%;
+            background-color: #7e5c23;
+          }
+        }
+      }
 
-			.items {
-				height: 90px;
-				position: relative;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #333333;
-			}
+      .items {
+        height: 90px;
+        position: relative;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #333333;
+      }
 
-			.fill-last {
-				height: 0;
-				width: 100%;
-				background: none;
-			}
-		}
+      .fill-last {
+        height: 0;
+        width: 100%;
+        background: none;
+      }
+    }
 
-		.main {
-			background-color: #fff;
-			padding-left: 20rpx;
-			width: 0;
-			flex-grow: 1;
-			box-sizing: border-box;
-			position: relative;
+    .main {
+      background-color: #fff;
+      padding-left: 20rpx;
+      width: 0;
+      flex-grow: 1;
+      box-sizing: border-box;
+      position: relative;
 
-			.title {
-				line-height: normal;
-				padding: 30rpx 0;
-				font-size: 24rpx;
-				font-weight: bold;
-				color: #666;
-				background-color: #fff;
-				position: sticky;
-				top: 0;
-				z-index: 19;
-			}
+      .title {
+        line-height: normal;
+        padding: 30rpx 0;
+        font-size: 24rpx;
+        font-weight: bold;
+        color: #666;
+        background-color: #fff;
+        position: sticky;
+        top: 0;
+        z-index: 19;
+      }
 
-			.item {
-				padding-bottom: 16rpx;
-				border-bottom: #eee solid 1px;
-			}
+      .item {
+        padding-bottom: 16rpx;
+        border-bottom: #eee solid 1px;
+      }
 
-			.goods {
-				display: flex;
-				flex-direction: row;
-				flex-wrap: nowrap;
-				justify-content: flex-start;
-				align-content: center;
-				position: relative;
+      .goods {
+        display: flex;
+        flex-direction: row;
+        flex-wrap: nowrap;
+        justify-content: flex-start;
+        align-content: center;
+        position: relative;
 
-				& + .goods {
-					margin-top: 16rpx;
-				}
+        & + .goods {
+          margin-top: 16rpx;
+        }
 
-				& > image {
-					width: 120rpx;
-					height: 120rpx;
-					margin-right: 18rpx;
-				}
+        & > image {
+          width: 120rpx;
+          height: 120rpx;
+          margin-right: 18rpx;
+        }
 
-				.goodsImg {
-					position: relative;
-					width: 200rpx;
-					height: 200rpx;
-					border-radius: 18rpx;
-					flex-shrink: 0;
-				}
+        .goodsImg {
+          position: relative;
+          width: 200rpx;
+          height: 200rpx;
+          border-radius: 18rpx;
+          flex-shrink: 0;
+        }
 
-				.vifgoodsImg {
-					width: 200rpx;
-					height: 100%;
-					position: absolute;
-					top: 0;
-					left: 0;
-					z-index: 9;
-					background-color: rgb(0, 0, 0, 0.5);
+        .vifgoodsImg {
+          width: 200rpx;
+          height: 100%;
+          position: absolute;
+          border-radius: 18rpx;
+          top: 0;
+          left: 0;
+          z-index: 9;
+          background-color: rgb(0, 0, 0, 0.5);
 
-					image {
-						padding: 30rpx;
-						width: 100%;
-						height: 100%;
-					}
-				}
+          image {
+            padding: 30rpx;
+            width: 100%;
+            height: 100%;
+          }
+        }
 
-				.topSort {
-					width: 92rpx;
-					height: 38rpx;
-					text-align: center;
-					line-height: 38rpx;
-					position: absolute;
-					top: 0;
-					left: 0;
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #ffffff;
-					border-radius: 20rpx 0rpx 20rpx 0rpx;
-				}
+        .topSort {
+          width: 92rpx;
+          height: 38rpx;
+          text-align: center;
+          line-height: 38rpx;
+          position: absolute;
+          top: 0;
+          left: 0;
+          font-weight: 400;
+          font-size: 24rpx;
+          color: #ffffff;
+          border-radius: 20rpx 0rpx 20rpx 0rpx;
+          z-index: 10;
+        }
 
-				.topSort.c1 {
-					background: #fc5c2e;
-				}
+        .topSort.c1 {
+          background: #fc5c2e;
+        }
 
-				.topSort.c2 {
-					background: #ef994e;
-				}
+        .topSort.c2 {
+          background: #ef994e;
+        }
 
-				.topSort.c3 {
-					background: #f4b951;
-				}
+        .topSort.c3 {
+          background: #f4b951;
+        }
 
-				.goods_right {
-					width: 100%;
-					display: flex;
-					flex-direction: column;
-					justify-content: space-around;
-					position: relative;
-					padding-top: 5rpx;
-					padding-right: 20rpx;
-					box-sizing: border-box;
+        .goods_right {
+          width: 100%;
+          display: flex;
+          flex-direction: column;
+          justify-content: space-around;
+          position: relative;
+          padding-top: 5rpx;
+          padding-right: 20rpx;
+          box-sizing: border-box;
 
-					.name {
-						font-size: 28rpx;
-						color: #333;
-						font-weight: bold;
-						margin-bottom: 8rpx;
-					}
+          .name {
+            font-size: 28rpx;
+            color: #333;
+            font-weight: bold;
+            margin-bottom: 8rpx;
+          }
 
-					.describe,
-					.monthlySale,
-					.lookBack {
-						font-weight: 400;
-						font-size: 20rpx;
-						color: #999999;
-						margin-bottom: 8rpx;
-					}
+          .describe,
+          .monthlySale,
+          .lookBack {
+            font-weight: 400;
+            font-size: 20rpx;
+            color: #999999;
+            margin-bottom: 8rpx;
+          }
 
-					.describe,
-					.name {
-						width: 270rpx;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						white-space: nowrap;
-					}
+          .describe,
+          .name {
+            width: 270rpx;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
 
-					.lookBack {
-						color: #ff534b;
-					}
+          .lookBack {
+            color: #ff534b;
+          }
 
-					.money {
-						font-weight: bold;
-						font-size: 24rpx;
-						color: #333;
-						display: flex;
-						align-items: flex-end;
+          .money {
+            font-weight: bold;
+            font-size: 20rpx;
+            color: #333;
+            display: flex;
+            align-items: baseline;
+            white-space: nowrap;
 
-						.money_num {
-							font-size: 28rpx;
-							color: #333;
-							font-weight: bold;
-						}
-					}
+            .money_num {
+              font-size: 28rpx;
+              color: #333;
+              font-weight: bold;
+            }
+          }
 
-					.suit {
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #666666;
-					}
+          .suit {
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #666666;
+          }
 
-					.sku-wrap {
-						padding: 10rpx 20rpx;
-						background: #e3ad7f;
-						border-radius: 32rpx;
-						// position: absolute;
-						// bottom: 10rpx;
-						// right: 20rpx;
-						align-items: center;
-						position: relative;
+          .sku-wrap {
+            padding: 10rpx 20rpx;
+            background: #e3ad7f;
+            border-radius: 32rpx;
+            // position: absolute;
+            // bottom: 10rpx;
+            // right: 20rpx;
+            align-items: center;
+            position: relative;
 
-						.t {
-							font-size: 24rpx;
-							color: #fff;
-						}
+            .t {
+              font-size: 24rpx;
+              color: #fff;
+            }
 
-						.dot {
-							position: absolute;
-							top: -15rpx;
-							right: -10rpx;
-							background-color: #ff4b33;
-							color: #fff;
-							border-radius: 58rpx;
-							padding: 5rpx 14rpx;
-							box-sizing: border-box;
-							display: flex;
-							align-items: center;
-							justify-content: center;
-							font-size: 20rpx;
-						}
-					}
+            .dot {
+              position: absolute;
+              top: -15rpx;
+              right: -10rpx;
+              background-color: #ff4b33;
+              color: #fff;
+              border-radius: 58rpx;
+              padding: 5rpx 14rpx;
+              box-sizing: border-box;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              font-size: 20rpx;
+            }
+          }
 
-					.Controls {
-						display: flex;
-						align-items: center;
-						justify-content: flex-end;
+          .Controls {
+            display: flex;
+            align-items: center;
+            justify-content: flex-end;
 
-						// position: absolute;
-						// bottom: 10rpx;
-						// right: 20rpx;
-						.num {
-							margin: auto 16rpx;
-						}
+            // position: absolute;
+            // bottom: 10rpx;
+            // right: 20rpx;
+            .num {
+              margin: auto 16rpx;
+            }
 
-						.btn {
-							display: flex;
-							align-items: center;
-							justify-content: center;
-							position: relative;
+            .btn {
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              position: relative;
 
-							.btnClick {
-								width: 100rpx;
-								height: 100rpx;
-								position: absolute;
-								// bottom: 0;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
+              .btnClick {
+                width: 100rpx;
+                height: 100rpx;
+                position: absolute;
+                // bottom: 0;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
 
-	.lineThrough {
-		font-weight: normal;
-		text-decoration: line-through;
-		color: #999 !important;
-		font-size: 24rpx !important;
-	}
+  .lineThrough {
+    font-weight: normal;
+    text-decoration: line-through;
+    color: #999 !important;
+    font-size: 24rpx !important;
+  }
 
-	.money_num.lineThrough {
-	}
+  .money_num.lineThrough {
+  }
 }
 
 .shop_sku {
-	width: 100%;
-	position: relative;
-	border-radius: 20rpx;
-	background: #fff;
-	box-sizing: border-box;
-	padding-bottom: 250rpx;
+  width: 100%;
+  position: relative;
+  border-radius: 20rpx;
+  background: #fff;
+  box-sizing: border-box;
+  padding-bottom: 200rpx;
 
-	.positionabsolute {
-		position: absolute;
-		top: 30rpx;
-		z-index: 999;
-		right: 30rpx;
-	}
+  .positionabsolute {
+    position: absolute;
+    top: 30rpx;
+    z-index: 999;
+    right: 30rpx;
+  }
 
-	.shop_sku_name {
-		padding: 0 28rpx;
-		margin-top: 20rpx;
-		font-weight: bold;
-		font-size: 32upx;
-		margin-bottom: 16rpx;
-	}
+  .shop_sku_name {
+    padding: 0 28rpx;
+    margin-top: 20rpx;
+    font-weight: bold;
+    font-size: 32upx;
+    margin-bottom: 16rpx;
+  }
 
-	.shop_sku_returned {
-		padding: 0 28rpx;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #ff534b;
-	}
+  .shop_sku_returned {
+    padding: 0 28rpx;
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #ff534b;
+  }
 
-	.shop_sku_description {
-		padding: 0 28rpx;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #999999;
-		margin-top: 16rpx;
-		padding-bottom: 32rpx;
-		box-sizing: border-box;
-		border-bottom: 2rpx solid #f0f0f0;
-	}
+  .shop_sku_description {
+    padding: 0 28rpx;
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #999999;
+    margin-top: 16rpx;
+    padding-bottom: 32rpx;
+    box-sizing: border-box;
+    border-bottom: 2rpx solid #f0f0f0;
+  }
 
-	.shop_sku_box:last-child {
-		padding-bottom: 60rpx;
-	}
+  .shop_sku_box:last-child {
+    padding-bottom: 140rpx;
+  }
 
-	.shop_sku_box {
-		padding: 20rpx;
+  .shop_sku_box {
+    padding: 20rpx;
 
-		.shop_sku_box_name {
-			margin-top: 20rpx;
-			font-weight: 500;
-			font-size: 28upx;
-			color: #333;
-		}
+    .shop_sku_box_name {
+      margin-top: 20rpx;
+      font-weight: 500;
+      font-size: 28upx;
+      color: #333;
+    }
 
-		.flex-start {
-			.shop_sku_box_item {
-				margin-top: 16rpx;
-				padding: 12rpx 28rpx;
-				border-radius: 8rpx;
-				font-size: 24upx;
-				margin-right: 56rpx;
-				background: #efefef;
-				border: 2rpx solid #efefef;
-				position: relative;
-				color: #666666;
+    .flex-start {
+      .shop_sku_box_item {
+        margin-top: 16rpx;
+        padding: 12rpx 28rpx;
+        border-radius: 8rpx;
+        font-size: 24upx;
+        margin-right: 56rpx;
+        background: #efefef;
+        border: 2rpx solid #efefef;
+        position: relative;
+        color: #666666;
 
-				.shop_sku_box_item_tip {
-					width: 62rpx;
-					height: 47rpx;
-					text-align: right;
-					position: absolute;
-					top: 0;
-					right: 0;
-					background: linear-gradient(45deg, transparent, transparent 50%, #cecece 50%, #cecece 100%);
+        .shop_sku_box_item_tip {
+          width: 62rpx;
+          height: 47rpx;
+          text-align: right;
+          position: absolute;
+          top: 0;
+          right: 0;
+          background: linear-gradient(
+            45deg,
+            transparent,
+            transparent 50%,
+            #cecece 50%,
+            #cecece 100%
+          );
 
-					view {
-						font-size: 18rpx;
-						color: #666666;
-						transform: rotate(45deg);
-						position: absolute;
-						top: 5rpx;
-						right: 3rpx;
-					}
-				}
-			}
+          view {
+            font-size: 18rpx;
+            color: #666666;
+            transform: rotate(45deg);
+            position: absolute;
+            top: 5rpx;
+            right: 3rpx;
+          }
+        }
+      }
 
-			.shop_sku_box_item:nth-child(1) {
-				margin-left: 0;
-			}
+      .shop_sku_box_item:nth-child(1) {
+        margin-left: 0;
+      }
 
-			.disabled {
-				color: #999;
-				background-color: #f5f5f5;
-				border: 2rpx solid #f5f5f5;
-			}
+      .disabled {
+        color: #999;
+        background-color: #f5f5f5;
+        border: 2rpx solid #f5f5f5;
+      }
 
-			.shop_sku_box_item_noselected {
-				color: #666;
-			}
+      .shop_sku_box_item_noselected {
+        color: #666;
+      }
 
-			.shop_sku_box_item_selected {
-				background: #fefaf7;
-				border-radius: 8rpx;
-				border: 2rpx solid #e8ad7b;
-				color: #e8ad7b;
-			}
-		}
-	}
+      .shop_sku_box_item_selected {
+        background: #fefaf7;
+        border-radius: 8rpx;
+        border: 2rpx solid #e8ad7b;
+        color: #e8ad7b;
+      }
+    }
+  }
 
-	.shop_skuselect {
-		margin-top: 16rpx;
-		width: 100%;
-		// background: #f7f7f7;
-		color: #999;
-		font-size: 24upx;
+  .shop_skuselect {
+    margin-top: 16rpx;
+    width: 100%;
+    // background: #f7f7f7;
+    color: #999;
+    font-size: 24upx;
 
-		.shop_skuselectname {
-			color: #000;
-			font-size: 26upx;
-		}
-	}
+    .shop_skuselectname {
+      color: #000;
+      font-size: 26upx;
+    }
+  }
 
-	.shop_bottom {
-		width: 100%;
-		box-sizing: border-box;
-		padding: 30rpx 28rpx;
-		background-color: #fff;
-		box-shadow: 0rpx -6rpx 14rpx 2rpx rgba(0, 0, 0, 0.1);
-		position: fixed;
-		left: 0;
-		bottom: 0;
+  .shop_bottom {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 30rpx 28rpx;
+    background-color: #fff;
+    box-shadow: 0rpx -6rpx 14rpx 2rpx rgba(0, 0, 0, 0.1);
+    position: fixed;
+    left: 0;
+    bottom: 0;
 
-		.price {
-			display: flex;
-			align-items: flex-end;
+    .price {
+      display: flex;
+      align-items: flex-end;
 
-			.i {
-				font-size: 28rpx;
-				color: #e8ad7b;
-				position: relative;
-				bottom: 4upx;
-				font-weight: bold;
-			}
+      .i {
+        font-size: 28rpx;
+        color: #e8ad7b;
+        position: relative;
+        bottom: 4upx;
+        font-weight: bold;
+      }
 
-			.num {
-				font-size: 42rpx;
-				color: #e8ad7b;
-				position: relative;
-				top: 6upx;
-				padding: 0 4upx;
-			}
-		}
+      .num {
+        font-size: 42rpx;
+        color: #e8ad7b;
+        position: relative;
+        top: 6upx;
+        padding: 0 4upx;
+      }
+    }
 
-		.operation-wrap {
-			display: flex;
-			align-items: center;
+    .operation-wrap {
+      display: flex;
+      align-items: center;
 
-			.num {
-				font-size: 32upx;
-				padding: 0 16upx;
-			}
+      .num {
+        font-size: 32upx;
+        padding: 0 16upx;
+      }
 
-			.btn {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				position: relative;
+      .btn {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        position: relative;
 
-				.btnClick {
-					width: 100rpx;
-					height: 100rpx;
-					position: absolute;
-					// bottom: 0;
-				}
-			}
-		}
+        .btnClick {
+          width: 100rpx;
+          height: 100rpx;
+          position: absolute;
+          // bottom: 0;
+        }
+      }
+    }
 
-		.addShopping {
-			width: 100%;
-			height: 96rpx;
-			line-height: 96rpx;
-			text-align: center;
-			background: #ccc;
-			border-radius: 48rpx;
-			font-weight: 400;
-			font-size: 32rpx;
-			color: #ffffff;
-			margin-top: 36rpx;
-		}
+    .addShopping {
+      width: 100%;
+      height: 96rpx;
+      line-height: 96rpx;
+      text-align: center;
+      background: #ccc;
+      border-radius: 48rpx;
+      font-weight: 400;
+      font-size: 32rpx;
+      color: #ffffff;
+      margin-top: 36rpx;
+    }
 
-		.addShopping.active {
-			background: #e8ad7b;
-		}
-	}
+    .addShopping.active {
+      background: #e8ad7b;
+    }
+  }
 }
 
 .shop-info-wrap {
-	padding: 0 30rpx 50rpx;
-	box-sizing: border-box;
+  padding: 0 30rpx 50rpx;
+  box-sizing: border-box;
 
-	.info-wrap {
-		padding: 30rpx 0;
-		box-sizing: border-box;
+  .info-wrap {
+    padding: 30rpx 0;
+    box-sizing: border-box;
 
-		.shopName {
-			align-self: center;
-			font-size: 32rpx;
-			color: #333;
-			font-weight: bold;
-		}
-	}
+    .shopName {
+      align-self: center;
+      font-size: 32rpx;
+      color: #333;
+      font-weight: bold;
+    }
+  }
 
-	.info-wrap-title {
-		font-size: 32rpx;
-		font-weight: bold;
-		color: #333;
-	}
+  .info-wrap-title {
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #333;
+  }
 
-	.row {
-		.col {
-			margin-bottom: 10rpx;
-		}
+  .row {
+    .col {
+      margin-bottom: 10rpx;
+    }
 
-		.l,
-		.t {
-			font-size: 24rpx;
-			color: #999;
-		}
-	}
+    .l,
+    .t {
+      font-size: 24rpx;
+      color: #999;
+    }
+  }
 }
 
 .cart-wrap {
-	width: 100%;
-	padding: 0 20rpx;
-	box-sizing: border-box;
-	position: fixed;
-	bottom: 40rpx;
-	left: 0;
-	z-index: 99;
+  width: 100%;
+  padding: 0 20rpx;
+  box-sizing: border-box;
+  position: fixed;
+  bottom: 40rpx;
+  left: 0;
+  z-index: 99;
 
-	.cart-content {
-		display: flex;
-		align-items: center;
-		height: 128rpx;
-		background: #ffffff;
-		box-shadow: 0rpx 0rpx 20rpx 2rpx rgba(0, 0, 0, 0.15);
-		border-radius: 58rpx;
-		padding: 0 36rpx;
-		box-sizing: border-box;
+  .cart-content {
+    display: flex;
+    align-items: center;
+    height: 128rpx;
+    background: #ffffff;
+    box-shadow: 0rpx 0rpx 20rpx 2rpx rgba(0, 0, 0, 0.15);
+    border-radius: 58rpx;
+    padding: 0 36rpx;
+    box-sizing: border-box;
 
-		.left {
-			flex: 1;
-			display: flex;
-			align-items: center;
-			position: relative;
+    .left {
+      flex: 1;
+      display: flex;
+      align-items: center;
+      position: relative;
 
-			.iconBox {
-				position: relative;
-			}
+      .iconBox {
+        position: relative;
+      }
 
-			.icon {
-				width: 76rpx;
-				height: 88rpx;
-				margin-left: 22rpx;
-			}
+      .icon {
+        width: 76rpx;
+        height: 88rpx;
+        margin-left: 22rpx;
+      }
 
-			.u-badge {
-				position: absolute;
-				top: -30rpx;
-				right: -30rpx;
-				background-color: #ff4b33;
-				color: #fff;
-				border-radius: 58rpx;
-				padding: 5rpx 14rpx;
-				box-sizing: border-box;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				font-size: 20rpx;
-			}
+      .u-badge {
+        position: absolute;
+        top: -30rpx;
+        right: -30rpx;
+        background-color: #ff4b33;
+        color: #fff;
+        border-radius: 58rpx;
+        padding: 5rpx 14rpx;
+        box-sizing: border-box;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 20rpx;
+      }
 
-			.i,
-			.num {
-				color: #333;
-			}
+      .i,
+      .num {
+        color: #333;
+      }
 
-			.i {
-				font-size: 20upx;
-				position: relative;
-				top: 4upx;
-				margin-left: 64rpx;
-			}
+      .i {
+        font-size: 20upx;
+        position: relative;
+        top: 4upx;
+        margin-left: 64rpx;
+      }
 
-			.num {
-				font-size: 42upx;
-				font-weight: bold;
-			}
-		}
+      .num {
+        font-size: 42upx;
+        font-weight: bold;
+      }
+    }
 
-		.btn {
-			height: 100%;
-			width: 40%;
-			display: flex;
-			align-items: center;
-			justify-content: flex-end;
+    .btn {
+      height: 100%;
+      width: 40%;
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
 
-			.t {
-				width: 160rpx;
-				height: 64rpx;
-				line-height: 64rpx;
-				text-align: center;
-				background: #fefaf7;
-				border-radius: 36rpx 36rpx 36rpx 36rpx;
-				border: 2rpx solid $my-main-color;
-				font-weight: bold;
-				font-size: 28rpx;
-				color: $my-main-color;
-			}
-		}
-	}
+      .t {
+        width: 160rpx;
+        height: 64rpx;
+        line-height: 64rpx;
+        text-align: center;
+        background: #fefaf7;
+        border-radius: 36rpx 36rpx 36rpx 36rpx;
+        border: 2rpx solid $my-main-color;
+        font-weight: bold;
+        font-size: 28rpx;
+        color: $my-main-color;
+      }
+    }
+  }
 }
 
 .history_order {
-	background-color: #fff;
-	padding: 12rpx 16rpx;
-	font-size: 24rpx;
-	color: #333;
-	display: flex;
-	align-items: center;
-	box-shadow: 0rpx 6rpx 12rpx 2rpx rgba(0, 0, 0, 0.16);
-	position: fixed;
-	top: 50%;
-	right: 0;
-	transform: translateY(-50%);
-	border-radius: 100px 0 0 100px;
-	z-index: 20;
+  background-color: #fff;
+  padding: 12rpx 16rpx;
+  font-size: 24rpx;
+  color: #333;
+  display: flex;
+  align-items: center;
+  box-shadow: 0rpx 6rpx 12rpx 2rpx rgba(0, 0, 0, 0.16);
+  position: fixed;
+  top: 50%;
+  right: 0;
+  transform: translateY(-50%);
+  border-radius: 100px 0 0 100px;
+  z-index: 20;
 
-	.img {
-		width: 36rpx;
-		margin-right: 8rpx;
-		height: 36rpx;
-	}
+  .img {
+    width: 36rpx;
+    margin-right: 8rpx;
+    height: 36rpx;
+  }
+}
+.old-price {
+  color: #999;
+  font-size: 24rpx;
+  text-decoration: line-through;
+  margin-left: 8rpx;
+}
+.limitDiscount {
+  background-color: #cc5617;
+  padding: 2rpx 10rpx;
+  white-space: nowrap;
+  text-align: center;
+  position: absolute;
+  top: 0;
+  left: 0;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #ffffff;
+  border-radius: 20rpx 0rpx 20rpx 0rpx;
+  z-index: 9;
+  color: #fff;
 }
 </style>
diff --git a/pages/test/test.vue b/pages/test/test.vue
index 6e89ea4..066c711 100644
--- a/pages/test/test.vue
+++ b/pages/test/test.vue
@@ -1,65 +1,13 @@
 <template>
-	<view class="u-p-30">
-		<view>
-			<up-button type="warning" @click="popupShow">初始化</up-button>
-		</view>
-		<view class="u-m-t-30">
-			<up-button type="primary" @click="toCreate">去下单</up-button>
-		</view>
-		
-		<up-popup :show="show" mode="bottom" close-on-click-overlay @close="resetForm">
-			<view class="u-p-30">
-				<up-form label-width="80" ref="refForm">
-					<up-form-item label="台桌码">
-							<up-input v-model="form.tableCode" placeholder="请输入台桌码"></up-input>
-					</up-form-item>
-				</up-form>
-				<view class="u-flex gap-20 u-m-t-30">
-					<up-button @click="show=false">取消</up-button>
-					<up-button type="primary" @click="scanCodehandle">确定</up-button>
-				</view>
-			</view>
-			
-		</up-popup>
-	</view>
+  <view class="u-p-30">
+    <xb-swiper-preview></xb-swiper-preview>
+  </view>
 </template>
 
 <script setup>
-	import {onLoad} from '@dcloudio/uni-app'
-	import { reactive,ref} from 'vue'
-	import {
-		productStore
-	} from '@/stores/user.js';
-	const store = productStore();
-	const scanCodehandle = async (i) => {
-		await store.scanCodeactions(form)
-	}
-	const show=ref(false);
-	const options=ref({})
-	function popupShow(){
-		show.value=true;
-	}
-	const refForm=ref(null);
-	const form=reactive({
-		tableCode:"40963902920"
-	})
-	function resetForm(){
-		form.tableCode=""
-	}
-	onLoad((opt)=>{
-		console.log(opt);
-		options.value=opt
-	})
-	function toCreate(){
-		uni.navigateTo({
-			url:'/pages/index/index'
-		})
-	}
+import xbSwiperPreview from '@/components/xb-swiper-preview/index.vue'
 </script>
 
 <style lang="scss" scoped>
-	.gap-20{
-		gap: 20rpx;
-	}
 
 </style>
diff --git a/pages/user/coupon.vue b/pages/user/coupon.vue
index 40106bf..72758e0 100644
--- a/pages/user/coupon.vue
+++ b/pages/user/coupon.vue
@@ -1,6 +1,9 @@
 <template>
 	<view class="container">
 		<view class="header-wrap">
+			<view class="u-flex" style="justify-content: flex-end;">
+				<view @click="toExchangeCode" class="color-333 font-12 u-m-b-26 font-700">优惠券兑换码</view>
+			</view>
 			<view class="search-wrap">
 				<view class="input-wrap">
 					<view class="icon left">
@@ -137,7 +140,11 @@ onReachBottom(() => {
 		getCouponList();
 	}
 });
-
+function toExchangeCode(){
+	uni.navigateTo({
+		url: '/user/exchange/index'
+	})
+}
 const showDetail = ref(false);
 const selectListItem = ref('');
 const selectListItemDetails = ref([]);
diff --git a/pages/user/member/billDetails.vue b/pages/user/member/billDetails.vue
index c2ccedf..3abc4d2 100644
--- a/pages/user/member/billDetails.vue
+++ b/pages/user/member/billDetails.vue
@@ -57,6 +57,15 @@
 							<text v-if="item.bizCode == 'adminOut'">
 								管理员消费
 							</text>
+							<text v-if="item.bizCode == 'cashback'">
+								消费返现
+							</text>
+							<text v-if="item.bizCode == 'freeIn'">
+								霸王餐充值
+							</text>
+							<text v-if="item.bizCode == 'rechargeRedemption'">
+								兑换券充值
+							</text>
 						</view>
 						<view v-else>
 							{{item.content}}
diff --git a/pages/user/member/czzx.vue b/pages/user/member/czzx.vue
index 003ad30..cf2712b 100644
--- a/pages/user/member/czzx.vue
+++ b/pages/user/member/czzx.vue
@@ -1,411 +1,461 @@
 <!-- 充值中心 -->
 <template>
-	<view class="container">
-		<up-navbar bgColor="transparent" title="充值中心" @leftClick="back"></up-navbar>
-		<view class="header-wrap">
-			<image class="bg" src="/static/czzx_header_bg.png" mode="aspectFill"></image>
-			<view class="select-shop">
-				<view class="select-btn">
-					<up-icon name="map" color="#333"></up-icon>
-					<text class="t">{{shopInfo.shopName}}</text>
-					<up-icon name="arrow-right" color="#333"></up-icon>
-				</view>
-			</view>
-			<view class="balance-wrap">
-				<view class="left">
-					<text class="i t">余额</text>
-					<text class="n t">{{shopUserInfo.amount||0}}</text>
-				</view>
-				<view class="right">
-					<text class="t" @click="toDetail">明细</text>
-					<text class="t" @click="toPwd">密码设置</text>
-				</view>
-			</view>
-			<view class="btm-wrap">
-				<view class="">
+  <view class="container">
+    <up-navbar
+      bgColor="transparent"
+      title="充值中心"
+      @leftClick="back"
+    ></up-navbar>
+    <view class="header-wrap">
+      <image
+        class="bg"
+        src="/static/czzx_header_bg.png"
+        mode="aspectFill"
+      ></image>
+      <view class="select-shop">
+        <view class="select-btn">
+          <up-icon name="map" color="#333"></up-icon>
+          <text class="t">{{ shopInfo.shopName }}</text>
+          <up-icon name="arrow-right" color="#333"></up-icon>
+        </view>
+      </view>
+      <view class="balance-wrap">
+        <view class="left">
+          <text class="i t">余额</text>
+          <text class="n t">{{ shopUserInfo.amount || 0 }}</text>
+        </view>
+        <view class="right">
+          <text class="t" @click="toduihuan">兑换码</text>
+          <text class="t" @click="toDetail">明细</text>
+          <text class="t" @click="toPwd">密码设置</text>
+        </view>
+      </view>
+      <view class="btm-wrap">
+        <view class=""> </view>
+      </view>
+    </view>
+    <view class="bottom">
+      <view class="u-flex u-flex-between">
+        <view class="u-flex">
+          <image
+            src="/static/vip/money.png"
+            style="width: 44rpx; height: 44rpx"
+            mode=""
+          ></image>
+          <text class="u-m-l-24 color-333 font-16 font-700">立即充值</text>
+        </view>
+        <view class="font-12 color-999">
+          <text>充值代表接受</text>
+          <text style="color: #ecb592">《用户隐私协议》</text>
+        </view>
+      </view>
+      <view class="list u-m-t-40">
+        <view
+          class="item color1"
+          @click="sel = index"
+          v-for="(item, index) in list"
+          :key="index"
+          :class="{ active: sel == index }"
+        >
+          <view class="">
+            <text>￥</text>
+            <text
+              class="font-700"
+              style="font-size: 48 u-flex-1rpx"
+              :class="{ color2: sel == index }"
+              >{{ item.amount }}</text
+            >
+          </view>
+          <view
+            class="font-12"
+            v-if="item.rewardAmount"
+            :class="{ color2: sel == index }"
+          >
+            <text>赠</text>
+            <text>￥</text>
+            <text class="font-14">{{ item.rewardAmount }}</text>
+          </view>
+          <view class="font-12" v-if="item.rewardPoints" style="color: #5f2e0f">
+            <text>送</text>
+            <text class="font-14">{{ item.rewardPoints }}</text>
+            <text class="">积分</text>
+          </view>
+          <view class="font-12 color-666" v-if="item.couponInfoList.length">
+            <text>送</text>
+            <text>{{ couponNum(item.couponInfoList) }}</text>
+            <text>张券</text>
+            <text
+              class="color2 u-m-l-8"
+              v-if="sel == index"
+              @click="lookCoupon(item)"
+              >查看</text
+            >
+          </view>
 
-				</view>
-			</view>
-		</view>
-		<view class="bottom">
-			<view class="u-flex u-flex-between">
-				<view class="u-flex ">
-					<image src="/static/vip/money.png" style="width: 44rpx;height: 44rpx;" mode=""></image>
-					<text class="u-m-l-24 color-333 font-16 font-700">立即充值</text>
-				</view>
-				<view class="font-12 color-999">
-					<text>充值代表接受</text>
-					<text style="color: #ECB592;">《用户隐私协议》</text>
-				</view>
-			</view>
-			<view class="list u-m-t-40">
-				<view class="item color1" @click="sel=index" v-for="(item,index) in list" :key="index"
-					:class="{active:sel==index}">
-					<view class="">
-						<text>￥</text>
-						<text class="font-700" style="font-size: 48 u-flex-1rpx;"
-							:class="{color2:sel==index}">{{item.amount}}</text>
-					</view>
-					<view class="font-12" v-if="item.rewardAmount" :class="{color2:sel==index}">
-						<text>赠</text>
-						<text>￥</text>
-						<text class="font-14">{{item.rewardAmount}}</text>
-					</view>
-					<view class="font-12" v-if="item.rewardPoints" style="color: #5F2E0F;">
-						<text>送</text>
-						<text class="font-14">{{item.rewardPoints}}</text>
-						<text class="">积分</text>
-					</view>
-					<view class="font-12 color-666" v-if="item.couponInfoList.length">
-						<text>送</text>
-						<text>{{couponNum(item.couponInfoList) }}</text>
-						<text>张券</text>
-						<text class="color2 u-m-l-8" v-if="sel==index" @click="lookCoupon(item)">查看</text>
-					</view>
+          <view class="sel u-flex" v-if="sel == index">
+            <image class="image" src="/static/vip/sel.png" mode=""></image>
+          </view>
+        </view>
+      </view>
+      <template v-if="state.isCustom">
+        <view class="u-flex other flex-center">
+          <text class="font-14 color-333 font-700 u-m-r-28">其他金额</text>
+          <up-input
+            v-model="money"
+            type="number"
+            placeholder="请输入充值金额"
+            border="none"
+            placeholder-style="font-size:14px;"
+          ></up-input>
+        </view>
+        <view class="color-999 font-12 u-m-t-4"
+          >自定义金额充值时，不享受任何优惠赠送</view
+        >
+      </template>
 
-					<view class="sel u-flex" v-if="sel==index">
-						<image class="image" src="/static/vip/sel.png" mode=""></image>
-					</view>
-				</view>
-			</view>
-			<template v-if="state.isCustom">
-				<view class="u-flex other flex-center">
-					<text class="font-14 color-333 font-700 u-m-r-28">其他金额</text>
-					<up-input v-model="money" type="number" placeholder="请输入充值金额" border="none"
-						placeholder-style="font-size:14px;"></up-input>
-				</view>
-				<view class="color-999 font-12 u-m-t-4">自定义金额充值时，不享受任何优惠赠送</view>
-			</template>
-
-			<button class="buy-btn" @click="buy">
-				<text class="font-16 ">￥{{charge_money}}</text>
-				<text class="font-14 u-m-l-24">立即充值</text>
-			</button>
-			<view class="u-m-t-36 color-999 font-12">
-				<view>充值说明</view>
-				<view class="u-m-t-16">
-					<text>适用门店</text>
-					<text class="color2 u-m-l-28" @click="toShopList">全国门店通用 {{'>'}} </text>
-				</view>
-				<view class="u-m-t-16">
-					<text>有效期限</text>
-					<text class=" u-m-l-28">永久有效 </text>
-				</view>
-				<view class="u-m-t-16 u-flex u-flex-y-center">
-					<text class="no-wrap">注意事项</text>
-					<view class="u-m-l-28">
-						<view>1.储值完成后不支持自助退款，可联系商家处理</view>
-						<view> 2.余额不支持转赠，不可提现，长期有效</view>
-					</view>
-
-				</view>
-				<view class="u-m-t-16 u-flex u-flex-y-center">
-					<text class="no-wrap">充值说明</text>
-					<text class="u-m-l-28" style="word-break: break-all;">
-						{{state.remark||''}}
-					</text>
-
-				</view>
-			</view>
-		</view>
-		<CouponList v-model="couponModel.show" :list="couponModel.couponInfoList"></CouponList>
-	</view>
+      <button
+        class="buy-btn"
+        @click="buy"
+        :class="{ disabled: !state.isEnable }"
+      >
+        <text class="font-16">￥{{ charge_money }}</text>
+        <text class="font-14 u-m-l-24">立即充值</text>
+      </button>
+      <view class="u-m-t-36 color-999 font-12">
+        <view>充值说明</view>
+        <view class="u-m-t-16">
+          <text>适用门店</text>
+          <text class="color2 u-m-l-28" @click="toShopList"
+            >全国门店通用 {{ ">" }}
+          </text>
+        </view>
+        <view class="u-m-t-16">
+          <text>有效期限</text>
+          <text class="u-m-l-28">永久有效 </text>
+        </view>
+        <view class="u-m-t-16 u-flex u-flex-y-center">
+          <text class="no-wrap">注意事项</text>
+          <view class="u-m-l-28">
+            <view>1.储值完成后不支持自助退款，可联系商家处理</view>
+            <view> 2.余额不支持转赠，不可提现，长期有效</view>
+          </view>
+        </view>
+        <view class="u-m-t-16 u-flex u-flex-y-center">
+          <text class="no-wrap">充值说明</text>
+          <text class="u-m-l-28" style="word-break: break-all">
+            {{ state.remark || "" }}
+          </text>
+        </view>
+      </view>
+    </view>
+    <CouponList
+      v-model="couponModel.show"
+      :list="couponModel.couponInfoList"
+    ></CouponList>
+  </view>
 </template>
 
 <script setup>
-	import {
-		APIusershopInfodetail,
-		APIshopUserInfo
-	} from '@/common/api/member.js'
-	import CouponList from '@/components/coupon/list.vue'
-	import * as rechargeApi from '@/common/api/market/recharge.js'
-	import {
-		recharge
-	} from '@/common/api/order/index.js'
-	import {
-		joinMember
-	} from '@/common/api/order/index.js'
-	import {
-		ref,
-		onMounted,
-		computed,
-		reactive,
-		watch
-	} from 'vue'
-	import {
-		onLoad
-	} from '@dcloudio/uni-app'
-	import {
-		pay
-	} from '@/utils/pay.js'
-	
-	function toShopList(){
-		uni.navigateTo({
-			url:'/pages/user/member/czzx-shop-list?shopId='+option.shopId
-		})
-	}
+import { APIusershopInfodetail, APIshopUserInfo } from "@/common/api/member.js";
+import CouponList from "@/components/coupon/list.vue";
+import * as rechargeApi from "@/common/api/market/recharge.js";
+import { recharge } from "@/common/api/order/index.js";
+import { joinMember } from "@/common/api/order/index.js";
+import { ref, onMounted, computed, reactive, watch } from "vue";
+import { onLoad, onShow } from "@dcloudio/uni-app";
+import { pay } from "@/utils/pay.js";
 
-	function couponNum(list) {
-		return list.reduce((prve, cur) => {
-			return prve + cur.num
-		}, 0)
-	}
-	const couponModel = reactive({
-		show: false,
-		couponInfoList: []
-	})
+function toShopList() {
+  uni.navigateTo({
+    url: "/pages/user/member/czzx-shop-list?shopId=" + option.shopId,
+  });
+}
 
-	function lookCoupon(item) {
-		couponModel.show = true
-		couponModel.couponInfoList = item.couponInfoList
-	}
-	async function buy() {
-		if (!charge_money.value) {
-			return uni.showToast({
-				title: '请选择或者输入充值金额',
-				icon: 'none'
-			})
-		}
-		const json = {
-			shopId: option.shopId,
-			shopUserId: shopUserInfo.id,
-		}
-		if (sel.value < 0) {
-			json.amount = `${money.value}`.trim() * 1
-		} else {
-			json.rechargeDetailId = list.value[sel.value].id
-			json.amount = list.value[sel.value].amount
-		}
-		const res = await recharge(json)
-		if (!res) {
-			return uni.showToast({
-				title: '充值失败',
-				icon: 'error'
-			})
-		}
-		const payRes = await pay(res)
-		console.log(payRes);
-		if (payRes) {
-			uni.showToast({
-				title: '充值成功',
-				icon: 'none'
-			})
-			init()
-		}
+function toduihuan() {
+  uni.navigateTo({
+    url: "/user/exchange/index",
+  });
+}
 
-	}
+function couponNum(list) {
+  return list.reduce((prve, cur) => {
+    return prve + cur.num;
+  }, 0);
+}
+const couponModel = reactive({
+  show: false,
+  couponInfoList: [],
+});
 
-	function toDetail() {
-		uni.navigateTo({
-			url: '/pages/user/member/billDetails?type=1&shopId=' + option.shopId
-		})
-	}
+function lookCoupon(item) {
+  couponModel.show = true;
+  couponModel.couponInfoList = item.couponInfoList;
+}
+async function buy() {
+  if (!state.isEnable) {
+    return uni.showToast({
+      title: "充值未开启，暂不能充值",
+      icon: "none",
+    });
+  }
+  if (!charge_money.value) {
+    return uni.showToast({
+      title: "请选择或者输入充值金额",
+      icon: "none",
+    });
+  }
+  const json = {
+    shopId: option.shopId,
+    shopUserId: shopUserInfo.id,
+  };
+  if (sel.value < 0) {
+    json.amount = `${money.value}`.trim() * 1;
+  } else {
+    json.rechargeDetailId = list.value[sel.value].id;
+    json.amount = list.value[sel.value].amount;
+  }
+  const res = await recharge(json);
+  if (!res) {
+    return uni.showToast({
+      title: "充值失败",
+      icon: "error",
+    });
+  }
+  const payRes = await pay(res);
+  console.log(payRes);
+  if (payRes) {
+    uni.showToast({
+      title: "充值成功",
+      icon: "none",
+    });
+    init();
+  }
+}
 
-	function toPwd() {
-		uni.navigateTo({
-			url: '/pages/user/member/setPassword?type=1&shopId=' + option.shopId
-		})
-	}
+function toDetail() {
+  uni.navigateTo({
+    url: "/pages/user/member/billDetails?type=1&shopId=" + option.shopId,
+  });
+}
 
-	function back() {
-		uni.navigateBack();
-	}
-	const list = ref([])
-	const sel = ref(0)
-	const money = ref(null);
-	const option = reactive({
-		shopId: ''
-	})
-	const shopInfo = reactive({})
-	const shopUserInfo = reactive({})
-	const state = reactive({})
-	async function init() {
-		const shopInfoRes = await APIusershopInfodetail({
-			shopId: option.shopId
-		})
-		if (shopInfoRes) {
-			Object.assign(shopInfo, shopInfoRes.shopInfo)
-		}
-		const shopUserInfoRes = await APIshopUserInfo({
-			shopId: option.shopId
-		})
-		if (shopUserInfoRes) {
-			Object.assign(shopUserInfo, shopUserInfoRes)
-		}
-		const res = await rechargeApi.config({
-			shopId: option.shopId
-		})
-		if (res) {
-			Object.assign(state, res)
-			list.value = res.rechargeDetailList
-		}
-	}
-	const charge_money = computed(() => {
-		if (sel.value < 0) {
-			if (money.value > 0) {
-				return money.value
-			}
-			return ''
-		}
-		const item = list.value[sel.value]
-		if (item) {
-			return item.amount
-		}
-		return ''
-	})
-	onLoad((opt) => {
-		Object.assign(option, opt)
-		init()
-	})
+function toPwd() {
+  uni.navigateTo({
+    url: "/pages/user/member/setPassword?type=1&shopId=" + option.shopId,
+  });
+}
 
-	watch(() => money.value, (newval) => {
-		if (newval && newval > 0) {
-			sel.value = -1
-		}
-	})
+function back() {
+  uni.navigateBack();
+}
+const list = ref([]);
+const sel = ref(0);
+const money = ref(null);
+const option = reactive({
+  shopId: "",
+});
+const shopInfo = reactive({});
+const shopUserInfo = reactive({});
+const state = reactive({});
+async function init() {
+  const shopInfoRes = await APIusershopInfodetail({
+    shopId: option.shopId,
+  });
+  if (shopInfoRes) {
+    Object.assign(shopInfo, shopInfoRes.shopInfo);
+  }
+  const shopUserInfoRes = await APIshopUserInfo({
+    shopId: option.shopId,
+  });
+  if (shopUserInfoRes) {
+    Object.assign(shopUserInfo, shopUserInfoRes);
+  }
+  const res = await rechargeApi.config({
+    shopId: option.shopId,
+  });
+  if (res) {
+    Object.assign(state, res);
+    list.value = res.rechargeDetailList;
+  }
+}
+const charge_money = computed(() => {
+  if (sel.value < 0) {
+    if (money.value > 0) {
+      return money.value;
+    }
+    return "";
+  }
+  const item = list.value[sel.value];
+  if (item) {
+    return item.amount;
+  }
+  return "";
+});
+onLoad((opt) => {
+  Object.assign(option, opt);
+  // init();
+});
+
+watch(
+  () => money.value,
+  (newval) => {
+    if (newval && newval > 0) {
+      sel.value = -1;
+    }
+  }
+);
+onShow(() => {
+  init();
+});
 </script>
 
 <style scoped lang="scss">
-	.color1 {
-		color: #5F2E0F;
-	}
+.color1 {
+  color: #5f2e0f;
+}
 
-	.color2 {
-		color: #FF6300;
-	}
+.color2 {
+  color: #ff6300;
+}
 
-	.buy-btn {
-		margin-top: 28rpx;
-		padding: 32rpx 32rpx;
-		color: #fff;
-		font-size: 16px;
-		font-weight: 700;
-		border-radius: 80rpx;
-		line-height: 1;
-		background: linear-gradient(98deg, #fe6d1100 40.64%, #FFD1B4 105.2%), linear-gradient(259deg, #FE6D11 50.14%, #FFD1B4 114.93%);
-		box-shadow: 0 14rpx 30.4rpx 0 #fe8b435e;
-	}
+.buy-btn {
+  margin-top: 28rpx;
+  padding: 32rpx 32rpx;
+  color: #fff;
+  font-size: 16px;
+  font-weight: 700;
+  border-radius: 80rpx;
+  line-height: 1;
+  background: linear-gradient(98deg, #fe6d1100 40.64%, #ffd1b4 105.2%),
+    linear-gradient(259deg, #fe6d11 50.14%, #ffd1b4 114.93%);
+  box-shadow: 0 14rpx 30.4rpx 0 #fe8b435e;
+  &.disabled {
+    background: #eee;
+    box-shadow: none;
+    border: none;
+    color: #999;
+  }
+}
 
-	.other {
-		background: #F6F6F6;
-		padding: 24rpx 16rpx;
-		margin-top: 40rpx;
-	}
+.other {
+  background: #f6f6f6;
+  padding: 24rpx 16rpx;
+  margin-top: 40rpx;
+}
 
-	.header-wrap {
-		width: 100%;
-		height: 530rpx;
-		box-sizing: border-box;
-		padding: calc(var(--status-bar-height) + 140rpx) 28rpx 28rpx;
-		position: relative;
+.header-wrap {
+  width: 100%;
+  height: 530rpx;
+  box-sizing: border-box;
+  padding: calc(var(--status-bar-height) + 140rpx) 28rpx 28rpx;
+  position: relative;
 
-		.bg {
-			width: 100%;
-			height: 100%;
-			position: absolute;
-			top: 0;
-			left: 0;
-		}
+  .bg {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+  }
 
-		.select-shop {
-			display: flex;
-			align-items: center;
-			position: relative;
+  .select-shop {
+    display: flex;
+    align-items: center;
+    position: relative;
 
-			.select-btn {
-				display: flex;
-				align-items: center;
-				gap: 12upx;
+    .select-btn {
+      display: flex;
+      align-items: center;
+      gap: 12upx;
 
-				.t {
-					color: #333;
-				}
-			}
-		}
+      .t {
+        color: #333;
+      }
+    }
+  }
 
-		.balance-wrap {
-			display: flex;
-			justify-content: space-between;
-			position: relative;
-			padding-top: 40upx;
+  .balance-wrap {
+    display: flex;
+    justify-content: space-between;
+    position: relative;
+    padding-top: 20rpx;
 
-			.left {
-				display: flex;
-				align-items: center;
+    .left {
+      display: flex;
+      align-items: center;
 
-				.t {
-					color: #5e3110;
+      .t {
+        color: #5e3110;
 
-					&.i {
-						position: relative;
-						top: 10upx;
-						font-size: 28upx;
-					}
+        &.i {
+          position: relative;
+          top: 10upx;
+          font-size: 28upx;
+        }
 
-					&.n {
-						font-size: 64upx;
-						font-weight: bold;
-					}
-				}
-			}
+        &.n {
+          font-size: 64upx;
+          font-weight: bold;
+        }
+      }
+    }
 
-			.right {
-				display: flex;
-				flex-direction: column;
-				gap: 12upx;
+    .right {
+      display: flex;
+      flex-direction: column;
+      gap: 12upx;
 
-				.t {
-					color: #86491d;
-					font-size: 28upx;
-				}
-			}
-		}
-	}
+      .t {
+        color: #86491d;
+        font-size: 28upx;
+      }
+    }
+  }
+}
 
-	.bottom {
-		background-color: rgba(255, 255, 255, .3);
-		padding: 40rpx 28rpx 0 28rpx;
-		transform: translateY(-140rpx);
-		border-radius: 74rpx 74rpx 0 0;
-	}
+.bottom {
+  background-color: rgba(255, 255, 255, 0.3);
+  padding: 40rpx 28rpx 0 28rpx;
+  transform: translateY(-140rpx);
+  border-radius: 74rpx 74rpx 0 0;
+}
 
-	.list {
-		display: grid;
-		grid-template-columns: repeat(3, 1fr);
-		column-gap: 20rpx;
-		row-gap: 22rpx;
+.list {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  column-gap: 20rpx;
+  row-gap: 22rpx;
 
-		.item {
-			padding: 36rpx 22rpx;
-			border-radius: 42rpx;
-			background: linear-gradient(180deg, #F5F5F5 58.54%, #FFF 140.47%);
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			position: relative;
-			box-sizing: border-box;
-			border: 6rpx solid transparent;
-			transition: all .3s ease-in-out;
+  .item {
+    padding: 36rpx 22rpx;
+    border-radius: 42rpx;
+    background: linear-gradient(180deg, #f5f5f5 58.54%, #fff 140.47%);
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    position: relative;
+    box-sizing: border-box;
+    border: 6rpx solid transparent;
+    transition: all 0.3s ease-in-out;
 
-			&.active {
-				background: linear-gradient(180deg, #FFC29A -26.17%, #FFF 64.06%);
-				border: 6rpx solid #FE6C0E;
-				box-shadow: 0 0 31rpx 2rpx #fe8b435e;
-			}
+    &.active {
+      background: linear-gradient(180deg, #ffc29a -26.17%, #fff 64.06%);
+      border: 6rpx solid #fe6c0e;
+      box-shadow: 0 0 31rpx 2rpx #fe8b435e;
+    }
 
-			.sel {
-				position: absolute;
-				bottom: 0;
-				left: 50%;
+    .sel {
+      position: absolute;
+      bottom: 0;
+      left: 50%;
 
-				transform: translateX(-50%) translateY(21rpx);
+      transform: translateX(-50%) translateY(21rpx);
 
-				.image {
-					width: 42rpx;
-					height: 42rpx;
-				}
-			}
-		}
-	}
+      .image {
+        width: 42rpx;
+        height: 42rpx;
+      }
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/pages/user/member/setPassword.vue b/pages/user/member/setPassword.vue
index 8c2cbd3..73ab71d 100644
--- a/pages/user/member/setPassword.vue
+++ b/pages/user/member/setPassword.vue
@@ -1,338 +1,373 @@
 <template>
-	<view class="Box">
-		<view class="box_box">
-			<!-- <view class="box_item flex-between">
+  <view class="Box">
+    <view class="box_box">
+      <!-- <view class="box_item flex-between">
 				<text class="top_box_one_text">当前账号</text>
 				<input type="number" v-model="form.mobile" placeholder="请输入手机号" maxlength="11" disabled="disabled" />
 				<button v-if="!form.mobile" class="getPhone" open-type="getPhoneNumber" @getphonenumber="getPhone">
 					<view class="text">获取手机号</view>
 				</button>
 			</view> -->
-			<view class="u-flex">
-				<view class="u-p-r-40">
-					<view class="color-333 font-16 font-700">密码支付</view>
-					<view class="font-12 color-999 u-m-t-4">关闭时，使用余额支付将会直接扣除，不再进行确认</view>
-				</view>
-				<up-switch v-model="form.usePayPwd" active-color="#FFD158" :inactive-value="0" @change="usePayPwdChange"
-					:active-value="1"></up-switch>
-			</view>
-			<view class="color-333 font-16 font-700" style="margin-top: 60rpx;">密码支付</view>
-			<view class="box_item flex-between">
-				<text class="top_box_one_text">当前账号</text>
-				<input type="number" v-model="form.mobile"  placeholder="请输入手机号" maxlength="11" :disabled="true" />
-				<view class="top_box_one_texts">
-					<view v-if="datalist.showText == true" class="yzm" @click="CodeRegister">{{ datalist.Recapture }}
-					</view>
-					<view v-else style="color: #ccc; background-color: #f9f9f9; border-radius:16px; padding: 10rpx;">
-						{{ datalist.second }}s重新发送
-					</view>
-				</view>
-			</view>
-			<view class="box_item flex-between" style="position:relative;">
-				<text class="top_box_one_text"></text>
-				<input type="number" v-model="form.checkCode" placeholder="请输入验证码"
-					style="padding-right: 140rpx;color: #333" />
-				
-			</view>
-			<view class="box_item flex-between">
-				<text class="top_box_one_text">新密码</text>
-				<input type="number" v-model="form.password" placeholder="请输入6位数字交易密码" maxlength="6"
-					:password="!passwords" />
-			</view>
-			<view class="box_item flex-between">
-				<text class="top_box_one_text">确认密码</text>
-				<input type="number" v-model="form.payPassword" placeholder="请再次输入密码" maxlength="6"
-					:password="!payPasswords" />
-			</view>
-
-		</view>
-		<view class="flex-colum">
-			<view class="Box_bottom active" 
-				@click="userInfosavePayPassword">重置密码</view>
-		</view>
-	</view>
+      <view class="u-flex">
+        <view class="u-p-r-40">
+          <view class="color-333 font-16 font-700">密码支付</view>
+          <view class="font-12 color-999 u-m-t-4"
+            >关闭时，使用余额支付将会直接扣除，不再进行确认</view
+          >
+        </view>
+        <up-switch
+          v-model="form.usePayPwd"
+          active-color="#FFD158"
+          :inactive-value="0"
+          @change="usePayPwdChange"
+          :active-value="1"
+        ></up-switch>
+      </view>
+      <view class="color-333 font-16 font-700" style="margin-top: 60rpx"
+        >密码支付</view
+      >
+      <view class="box_item flex-between">
+        <text class="top_box_one_text">当前账号</text>
+        <input
+          type="number"
+          v-model="form.mobile"
+          placeholder="请输入手机号"
+          maxlength="11"
+          :disabled="false"
+        />
+        <view class="top_box_one_texts">
+          <view
+            v-if="datalist.showText == true"
+            class="yzm"
+            @click="CodeRegister"
+            >{{ datalist.Recapture }}
+          </view>
+          <view
+            v-else
+            style="
+              color: #ccc;
+              background-color: #f9f9f9;
+              border-radius: 16px;
+              padding: 10rpx;
+            "
+          >
+            {{ datalist.second }}s重新发送
+          </view>
+        </view>
+      </view>
+      <view class="box_item flex-between" style="position: relative">
+        <text class="top_box_one_text"></text>
+        <input
+          type="number"
+          v-model="form.checkCode"
+          placeholder="请输入验证码"
+          style="padding-right: 140rpx; color: #333"
+        />
+      </view>
+      <view class="box_item flex-between">
+        <text class="top_box_one_text">新密码</text>
+        <input
+          type="number"
+          v-model="form.password"
+          placeholder="请输入6位数字交易密码"
+          maxlength="6"
+          :password="!passwords"
+        />
+      </view>
+      <view class="box_item flex-between">
+        <text class="top_box_one_text">确认密码</text>
+        <input
+          type="number"
+          v-model="form.payPassword"
+          placeholder="请再次输入密码"
+          maxlength="6"
+          :password="!payPasswords"
+        />
+      </view>
+    </view>
+    <view class="flex-colum">
+      <view class="Box_bottom active" @click="userInfosavePayPassword"
+        >重置密码</view
+      >
+    </view>
+  </view>
 </template>
 <script setup>
-	import {
-		reactive,
-		onMounted
-	} from 'vue';
+import { reactive, onMounted } from "vue";
 
-	import {
-		APIuserpwd,
-		APIusercode
-	} from '@/common/api/api.js'
-	import {
-		APIshopUserInfo
-	} from '@/common/api/member.js'
+import { APIuserpwd, APIusercode } from "@/common/api/api.js";
+import { APIshopUserInfo } from "@/common/api/member.js";
 
-	import {
-		productStore
-	} from '@/stores/user.js';
-	import {APIuser} from '@/common/api/api.js'
-	const storeuser = productStore();
-	const shopUserInfo = reactive({
-		shopInfo: uni.cache.get('orderVIP'),
-		shopId: ''
-	})
-	
-	const userInfo=uni.cache.get('userInfo')
+import { productStore } from "@/stores/user.js";
+import { APIuser } from "@/common/api/api.js";
+const storeuser = productStore();
+const shopUserInfo = reactive({
+  shopInfo: uni.cache.get("orderVIP"),
+  shopId: "",
+});
 
-	const form = reactive({
-		mobile: uni.cache.get('orderVIP').phone,
-		password: '',
-		payPassword: '',
-		checkCode: '',
-		usePayPwd: userInfo.usePayPwd
-	})
+const userInfo = uni.cache.get("userInfo");
 
-	const datalist = reactive({
-		isPwd: "",
-		passwords: false,
-		payPasswords: false,
-		// 注册定时器   初始值
-		second: 60,
-		showText: true,
-		Recapture: '获取验证码',
-	})
+const form = reactive({
+  mobile: uni.cache.get("orderVIP").phone,
+  password: "",
+  payPassword: "",
+  checkCode: "",
+  usePayPwd: userInfo.usePayPwd,
+});
 
-	const CodeRegister = async () => {
-		console.log('CodeRegister');
-		const res = await APIusercode({
-			// post  手机验证码
-			phone: form.mobile
-		});
-		if (res) {
-			uni.showToast({
-				title: '验证码获取成功',
-				icon: 'none'
-			});
-			// 定时器
-			datalist.showText = false;
-			datalist.Recapture = '重新获取';
-			var interval = setInterval(() => {
-				let times = --datalist.second;
-				datalist.second = times < 10 ? '0' + times : times; //小于10秒补 0
-			}, 1000);
-			setTimeout(() => {
-				clearInterval(interval);
-				datalist.second = 60;
-				datalist.showText = true;
-			}, 60000);
-		}
-	}
+const datalist = reactive({
+  isPwd: "",
+  passwords: false,
+  payPasswords: false,
+  // 注册定时器   初始值
+  second: 60,
+  showText: true,
+  Recapture: "获取验证码",
+});
 
-	/**
-	 * 获取手机号
-	 * @param {Object} d
-	 */
-	const getPhone = async (d) => {
-		if (d.detail.iv) {
-			uni.login({
-				provider: 'weixin',
-				success: async (data) => {
-					console.log(data)
-					let res = await this.api.userwxlogins({
-						code: data.code,
-						encryptedData: d.detail.encryptedData,
-						iv: d.detail.iv,
-					})
-					// form.mobile = res ? (res.slice(0, 3) + '****' + res.slice(7)) : '';
-					form.mobile = res
-				}
-			})
-		}
-	}
-	const loginwxuserInfo = async () => {
-		let res = await this.api.loginwxuserInfo({
-			userId: uni.cache.get('userInfo').id
-		})
-		if (res.code == 0) {
-			uni.cache.set('userInfo', res.data);
-		}
-	}
+const CodeRegister = async () => {
+  console.log("CodeRegister");
+  const res = await APIusercode({
+    // post  手机验证码
+    phone: form.mobile,
+  });
+  if (res) {
+    uni.showToast({
+      title: "验证码获取成功",
+      icon: "none",
+    });
+    // 定时器
+    datalist.showText = false;
+    datalist.Recapture = "重新获取";
+    var interval = setInterval(() => {
+      let times = --datalist.second;
+      datalist.second = times < 10 ? "0" + times : times; //小于10秒补 0
+    }, 1000);
+    setTimeout(() => {
+      clearInterval(interval);
+      datalist.second = 60;
+      datalist.showText = true;
+    }, 60000);
+  }
+};
 
-	const userInfosavePayPassword = async () => {
-		if (form.mobile.length != 11) {
-			uni.showToast({
-				title: '手机号必须是11位',
-				icon: 'none'
-			});
-			return false;
-		}
-		if (form.password == null || form.password == '') {
-			uni.showToast({
-				title: '请输入密码',
-				icon: 'none'
-			});
-			return false;
-		}
-		if (form.payPassword == null || form.payPassword == '') {
-			uni.showToast({
-				title: '请输入确认密码',
-				icon: 'none'
-			});
-			return false;
-		}
-		if (form.password.length != 6 || form.payPassword.length != 6) {
-			uni.showToast({
-				title: '密码必须是6位',
-				icon: 'none'
-			});
-			return false;
-		}
-		if (form.payPassword != form.password) {
-			uni.showToast({
-				title: '密码和确认密码不一致',
-				icon: 'none'
-			});
-			return false;
-		}
-		if (form.checkCode == null || form.checkCode == '') {
-			uni.showToast({
-				title: '请输入验证码',
-				icon: 'none'
-			});
-			return false;
-		}
+/**
+ * 获取手机号
+ * @param {Object} d
+ */
+const getPhone = async (d) => {
+  if (d.detail.iv) {
+    uni.login({
+      provider: "weixin",
+      success: async (data) => {
+        console.log(data);
+        let res = await this.api.userwxlogins({
+          code: data.code,
+          encryptedData: d.detail.encryptedData,
+          iv: d.detail.iv,
+        });
+        // form.mobile = res ? (res.slice(0, 3) + '****' + res.slice(7)) : '';
+        form.mobile = res;
+      },
+    });
+  }
+};
+const loginwxuserInfo = async () => {
+  let res = await this.api.loginwxuserInfo({
+    userId: uni.cache.get("userInfo").id,
+  });
+  if (res.code == 0) {
+    uni.cache.set("userInfo", res.data);
+  }
+};
 
-		let res = await APIuserpwd({
-			checkPayPwd: form.payPassword,
-			payPwd: form.password,
-			code: form.checkCode,
-			usePayPwd:form.usePayPwd
-		})
-		// * 获取会员信息
-		await storeuser.actionsproductqueryProduct()
-		if (res) {
-			uni.navigateBack()
-		}
-	}
-	
-	async function usePayPwdChange(){
-		uni.showLoading()
-		await APIuserpwd({
-			usePayPwd:form.usePayPwd
-		})
-		uni.showToast({
-			title:'修改成功'
-		})
-	}
-	onMounted(()=>{
-		APIuser().then(res=>{
-			uni.cache.set('userInfo', res);
-			form.usePayPwd=res.usePayPwd
-		})
-	})
+const userInfosavePayPassword = async () => {
+  if (form.mobile.length != 11) {
+    uni.showToast({
+      title: "手机号必须是11位",
+      icon: "none",
+    });
+    return false;
+  }
+  if (form.password == null || form.password == "") {
+    uni.showToast({
+      title: "请输入密码",
+      icon: "none",
+    });
+    return false;
+  }
+  if (form.payPassword == null || form.payPassword == "") {
+    uni.showToast({
+      title: "请输入确认密码",
+      icon: "none",
+    });
+    return false;
+  }
+  if (form.password.length != 6 || form.payPassword.length != 6) {
+    uni.showToast({
+      title: "密码必须是6位",
+      icon: "none",
+    });
+    return false;
+  }
+  if (form.payPassword != form.password) {
+    uni.showToast({
+      title: "密码和确认密码不一致",
+      icon: "none",
+    });
+    return false;
+  }
+  if (form.checkCode == null || form.checkCode == "") {
+    uni.showToast({
+      title: "请输入验证码",
+      icon: "none",
+    });
+    return false;
+  }
+
+  let res = await APIuserpwd({
+    checkPayPwd: form.payPassword,
+    payPwd: form.password,
+    code: form.checkCode,
+    usePayPwd: form.usePayPwd,
+  });
+  // * 获取会员信息
+  await storeuser.actionsproductqueryProduct();
+  if (res) {
+    const userInfo = uni.cache.get("userInfo");
+    const orderVIP = uni.cache.get("orderVIP");
+    uni.cache.set("userInfo", { ...userInfo, usePayPwd: form.usePayPwd });
+    uni.cache.set("orderVIP", { ...orderVIP, payPwd: 'abcd' });
+    uni.navigateBack();
+  }
+};
+
+async function usePayPwdChange() {
+  uni.showLoading();
+  const res = await APIuserpwd({
+    usePayPwd: form.usePayPwd,
+  });
+  if (res) {
+    const userInfo = uni.cache.get("userInfo");
+    uni.cache.set("userInfo", { ...userInfo, usePayPwd: form.usePayPwd });
+
+    uni.showToast({
+      title: "修改成功",
+    });
+  }
+}
+onMounted(() => {
+  APIuser().then((res) => {
+    uni.cache.set("userInfo", res);
+    form.usePayPwd = res.usePayPwd;
+  });
+});
 </script>
 
 <style lang="scss" scoped>
-	
-	.Box {
-		padding: 80rpx 28rpx 28rpx;
+.Box {
+  padding: 80rpx 28rpx 28rpx;
 
-		.box_one {
-			margin-top: 26rpx;
-			font-size: 24rpx;
-			font-family: Source Han Sans CN-Regular, Source Han Sans CN;
-			font-weight: 400;
-			color: #999999;
-		}
+  .box_one {
+    margin-top: 26rpx;
+    font-size: 24rpx;
+    font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+    font-weight: 400;
+    color: #999999;
+  }
 
-		.box_box {
-			background: #fff;
+  .box_box {
+    background: #fff;
 
-			.box_item {
-				// border-bottom: 1rpx solid #E5E5E5;
-				position: relative;
+    .box_item {
+      // border-bottom: 1rpx solid #E5E5E5;
+      position: relative;
 
-				.top_box_one_text {
-					font-family: Source Han Sans CN, Source Han Sans CN;
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #333333;
-				}
+      .top_box_one_text {
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: 500;
+        font-size: 28rpx;
+        color: #333333;
+      }
 
-				input {
-					padding: 26rpx 0;
-					width: 75%;
-					font-size: 28rpx;
-					font-family: Source Han Sans CN-Regular, Source Han Sans CN;
-					font-weight: 400;
-					color: #333;
-				}
+      input {
+        padding: 26rpx 0;
+        width: 75%;
+        font-size: 28rpx;
+        font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+        font-weight: 400;
+        color: #333;
+      }
 
+      .top_box_one_texts {
+        position: absolute;
+        right: 0;
+        margin: auto;
+        font-size: 24rpx;
+        font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+        font-weight: 400;
+        color: #5082fd;
+        z-index: 100;
+        .yzm {
+          padding: 8rpx 20rpx;
+          background: #ffd158;
+          border-radius: 24rpx;
+          font-weight: 500;
+          font-size: 24rpx;
+          color: #5f2e0f;
+        }
+      }
+    }
 
-				.top_box_one_texts {
-					position: absolute;
-					right: 0;
-					margin: auto;
-					font-size: 24rpx;
-					font-family: Source Han Sans CN-Regular, Source Han Sans CN;
-					font-weight: 400;
-					color: #5082fd;
-					z-index: 100;
-					.yzm {
-						padding: 8rpx 20rpx;
-						background: #FFD158;
-						border-radius: 24rpx;
-						font-weight: 500;
-						font-size: 24rpx;
-						color: #5F2E0F;
-					}
-				}
-			}
+    .box_item:nth-child(1) {
+      border-bottom: none;
+      border-top: 1rpx solid #e5e5e5;
 
-			.box_item:nth-child(1) {
-				border-bottom: none;
-				border-top: 1rpx solid #E5E5E5;
+      input {
+        border-bottom: 1rpx solid #e5e5e5;
+        color: #333;
+      }
+    }
+  }
 
-				input {
-					border-bottom: 1rpx solid #E5E5E5;
-					color: #333;
-				}
-			}
-		}
+  .flex-colum {
+    width: 100%;
+    margin-top: 56rpx;
 
+    .Box_bottom {
+      width: 100%;
+      height: 96rpx;
+      line-height: 96rpx;
+      background-color: #ffd158;
+      border-radius: 48rpx;
+      font-size: 36rpx;
+      font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+      font-weight: 500;
+      color: #333;
+      text-align: center;
+    }
+  }
 
-		.flex-colum {
-			width: 100%;
-			margin-top: 56rpx;
-
-			.Box_bottom {
-				width: 100%;
-				height: 96rpx;
-				line-height: 96rpx;
-				background-color: #FFD158;
-				border-radius: 48rpx;
-				font-size: 36rpx;
-				font-family: Source Han Sans CN-Regular, Source Han Sans CN;
-				font-weight: 500;
-				color: #333;
-				text-align: center;
-			}
-
-		}
-
-		.getPhone {
-			line-height: initial;
-			background-color: none;
-			border: 2rpx solid #E3AD7F;
-			color: #E3AD7F;
-			font-size: 28rpx;
-			padding: 5rpx 10rpx;
-			position: absolute;
-			right: 10rpx;
-			z-index: 2;
-		}
-	}
-	.Box .box_box .box_item uni-input{
-		border-bottom: 1rpx solid #E5E5E5;
-	}
-	.Box .box_box .box_item input{
-		border-bottom: 1rpx solid #E5E5E5;
-	}
-	:deep(.Box .box_box .box_item uni-input){
-		border-bottom: 1rpx solid #E5E5E5;
-	}
+  .getPhone {
+    line-height: initial;
+    background-color: none;
+    border: 2rpx solid #e3ad7f;
+    color: #e3ad7f;
+    font-size: 28rpx;
+    padding: 5rpx 10rpx;
+    position: absolute;
+    right: 10rpx;
+    z-index: 2;
+  }
+}
+.Box .box_box .box_item uni-input {
+  border-bottom: 1rpx solid #e5e5e5;
+}
+.Box .box_box .box_item input {
+  border-bottom: 1rpx solid #e5e5e5;
+}
+:deep(.Box .box_box .box_item uni-input) {
+  border-bottom: 1rpx solid #e5e5e5;
+}
 </style>
\ No newline at end of file
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 176ca84..75c6bf8 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -1,307 +1,440 @@
 <template>
-	<view class="container">
-		<image
-			class="topBack"
-			:src="
-				userInfo.shopExtendList
-					? userInfo.shopExtendList[1].value
-						? userInfo.shopExtendList[1].value
-						: 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/myTopBack.png'
-					: 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/myTopBack.png'
-			"
-			mode="aspectFill"
-		></image>
-		<view class="myContent">
-			<view class="my_info flex-between">
-				<view class="my_info_left">
-					<image class="my_info_left_head" :src="userInfo.headImg" mode="aspectFill"></image>
-					<view class="name">{{ userInfo.nickName }}</view>
-				</view>
-				<image class="my_info_right_qr" src="/static/icon/code.png" mode="aspectFill"></image>
+  <view class="container">
+    <image
+      class="topBack"
+      :src="
+        userInfo.shopExtendList
+          ? userInfo.shopExtendList[1].value
+            ? userInfo.shopExtendList[1].value
+            : 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/myTopBack.png'
+          : 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/myTopBack.png'
+      "
+      mode="aspectFill"
+    ></image>
+    <view class="myContent">
+      <view class="my_info flex-between">
+        <view class="my_info_left">
+          <image
+            class="my_info_left_head"
+            :src="userInfo.headImg"
+            mode="aspectFill"
+          ></image>
+          <view class="name">{{ userInfo.nickName }}</view>
+        </view>
+        <image
+          class="my_info_right_qr"
+          src="/static/icon/code.png"
+          mode="aspectFill"
+        ></image>
 
-				<!-- 		<image class="my_info_right_qr" @click="clickEvent" v-if="userInfo.isVip == 1 && ShopId"
+        <!-- 		<image class="my_info_right_qr" @click="clickEvent" v-if="userInfo.isVip == 1 && ShopId"
 					:src="'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_qRcode.png'" mode="aspectFill">
 				</image>
 				<view class="my_info_right" @click="clickEvent" v-if="userInfo.isVip == 0 && ShopId">
 					<text>免费入会</text>
 				</view> -->
-			</view>
+      </view>
 
-			<up-gap height="26rpx" bg-color="#F9F9F9"></up-gap>
-			<!-- <view class="my_item my_assets" @click="Myassets"> -->
-			<view class="my_item my_assets">
-				<view class="my_item_title u-m-t-12">我的资产</view>
-				<view class="amount">
-					<view class="u-flex u-flex-between u-m-t-20">
-						<view class="u-flex">
-							<image style="width: 50rpx; height: 37rpx" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/storedValue.png" mode="aspectFill"></image>
-							<text class="color-333 font-14 u-m-l-20">储值</text>
-						</view>
-						<view class="u-flex color-666" @click="toChargeList">
-							<text class="font-12 u-m-r-4">{{ rechargeTotal }}家店</text>
-							<up-icon name="arrow-down" color="#666" size="12px"></up-icon>
-						</view>
-					</view>
+      <up-gap height="26rpx" bg-color="#F9F9F9"></up-gap>
+      <!-- <view class="my_item my_assets" @click="Myassets"> -->
+      <view class="my_item my_assets">
+        <view class="my_item_title u-m-t-12">我的资产</view>
+        <view class="amount">
+          <view class="u-flex u-flex-between u-m-t-20">
+            <view class="u-flex">
+              <image
+                style="width: 50rpx; height: 37rpx"
+                src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/storedValue.png"
+                mode="aspectFill"
+              ></image>
+              <text class="color-333 font-14 u-m-l-20">储值</text>
+            </view>
+            <view class="u-flex color-666" @click="toChargeList">
+              <text class="font-12 u-m-r-4">{{ rechargeTotal }}家店</text>
+              <up-icon name="arrow-down" color="#666" size="12px"></up-icon>
+            </view>
+          </view>
 
-					<view class="card-list">
-						<view class="card-list-item" v-for="(item, index) in rechargeList" :key="index" @click="toCharge(item)">
-							<up-image radius="20rpx" width="182rpx" height="182rpx" :src="item.logo"></up-image>
-							<view class="info text-center">
-								<view class="color-333 u-m-t-14">
-									<text class="font-10">¥</text>
-									<text class="font-16 font-700">{{ item.amount || '0.00' }}</text>
-								</view>
-								<view class="font-12 color-666 u-line-1">{{ item.shopName }}</view>
-							</view>
-						</view>
-						<view class="u-flex u-flex-column u-flex-center" style="width: 12px" v-if="rechargeList.length" @click="toChargeList">
-							<view class="text-center color-333 font-12">查看全部</view>
-						</view>
-					</view>
-				</view>
-				<view class="vip u-m-t-40">
-					<view class="u-flex u-flex-between u-m-t-20">
-						<view class="u-flex">
-							<image style="width: 50rpx; height: 40rpx" src="/static/icon/vip.png" mode="aspectFill"></image>
-							<text class="color-333 font-14 u-m-l-20">会员</text>
-						</view>
-						<view class="u-flex color-666" @click="tomemberList">
-							<text class="font-12 u-m-r-4">{{ memberTotal }}家店</text>
-							<up-icon name="arrow-down" color="#666" size="12px"></up-icon>
-						</view>
-					</view>
+          <view class="card-list">
+            <view
+              class="card-list-item"
+              v-for="(item, index) in rechargeList"
+              :key="index"
+              @click="toCharge(item)"
+            >
+              <up-image
+                radius="20rpx"
+                width="182rpx"
+                height="182rpx"
+                :src="item.logo"
+              ></up-image>
+              <view class="info text-center">
+                <view class="color-333 u-m-t-14">
+                  <text class="font-10">¥</text>
+                  <text class="font-16 font-700">{{
+                    item.amount || "0.00"
+                  }}</text>
+                </view>
+                <view class="font-12 color-666 u-line-1">{{
+                  item.shopName
+                }}</view>
+              </view>
+            </view>
+            <view
+              class="u-flex u-flex-column u-flex-center"
+              style="width: 12px"
+              v-if="rechargeList.length"
+              @click="toChargeList"
+            >
+              <view class="text-center color-333 font-12">查看全部</view>
+            </view>
+          </view>
+        </view>
+        <view class="vip u-m-t-40">
+          <view class="u-flex u-flex-between u-m-t-20">
+            <view class="u-flex">
+              <image
+                style="width: 50rpx; height: 40rpx"
+                src="/static/icon/vip.png"
+                mode="aspectFill"
+              ></image>
+              <text class="color-333 font-14 u-m-l-20">会员</text>
+            </view>
+            <view class="u-flex color-666" @click="tomemberList">
+              <text class="font-12 u-m-r-4">{{ memberTotal }}家店</text>
+              <up-icon name="arrow-down" color="#666" size="12px"></up-icon>
+            </view>
+          </view>
 
-					<view class="card-list">
-						<view class="card-list-item" v-for="(item, index) in memberList" :key="index" @click="tomember(item)">
-							<up-image radius="20rpx" width="182rpx" height="182rpx" :src="item.logo"></up-image>
-							<view class="info text-center">
-								<view class="font-12 color-666 u-m-t-14 u-line-1">{{ item.shopName }}</view>
-							</view>
-						</view>
-						<view class="u-flex u-flex-column u-flex-center" style="width: 12px" v-if="memberList.length">
-							<view class="text-center color-333 font-12" @click="tomemberList">查看全部</view>
-						</view>
-					</view>
-				</view>
-				<view class="amount">
-					<view class="u-flex u-flex-between u-m-t-20">
-						<view class="u-flex">
-							<image style="width: 50rpx; height: 44rpx" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/points.png" mode="aspectFill"></image>
-							<text class="color-333 font-14 u-m-l-20">积分</text>
-						</view>
-						<view class="u-flex color-666" @click="toCoin">
-							<text class="font-12 u-m-r-4">{{ coinTotal }}家店</text>
-							<up-icon name="arrow-down" color="#666" size="12px"></up-icon>
-						</view>
-					</view>
+          <view class="card-list">
+            <view
+              class="card-list-item"
+              v-for="(item, index) in memberList"
+              :key="index"
+              @click="tomember(item)"
+            >
+              <up-image
+                radius="20rpx"
+                width="182rpx"
+                height="182rpx"
+                :src="item.logo"
+              ></up-image>
+              <view class="info text-center">
+                <view class="font-12 color-666 u-m-t-14 u-line-1">{{
+                  item.shopName
+                }}</view>
+              </view>
+            </view>
+            <view
+              class="u-flex u-flex-column u-flex-center"
+              style="width: 12px"
+              v-if="memberList.length"
+            >
+              <view class="text-center color-333 font-12" @click="tomemberList"
+                >查看全部</view
+              >
+            </view>
+          </view>
+        </view>
+        <view class="amount">
+          <view class="u-flex u-flex-between u-m-t-20">
+            <view class="u-flex">
+              <image
+                style="width: 50rpx; height: 44rpx"
+                src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/points.png"
+                mode="aspectFill"
+              ></image>
+              <text class="color-333 font-14 u-m-l-20">积分</text>
+            </view>
+            <view class="u-flex color-666" @click="toCoin">
+              <text class="font-12 u-m-r-4">{{ coinTotal }}家店</text>
+              <up-icon name="arrow-down" color="#666" size="12px"></up-icon>
+            </view>
+          </view>
 
-					<view class="card-list">
-						<view class="card-list-item" v-for="(item, index) in coinList" :key="index" @click="toCoin(item)">
-							<up-image radius="20rpx" width="182rpx" height="182rpx" :src="item.logo"></up-image>
-							<view class="info text-center">
-								<view class="color-333 u-m-t-14">
-									<text class="font-10">¥</text>
-									<text class="font-16 font-700">{{ item.accountPoints || '0.00' }}</text>
-								</view>
-								<view class="font-12 color-666 u-line-1">{{ item.shopName }}</view>
-							</view>
-						</view>
-						<view class="u-flex u-flex-column u-flex-center" style="width: 12px" v-if="coinList.length" @click="toCoin">
-							<view class="text-center color-333 font-12">查看全部</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="my_item my_fun u-m-t-30">
-				<view class="my_fun_list">
-					<view class="my_list_item" v-for="(item, index) in myFunList" :key="index" @click="clickTo(item, index)">
-						<view class="my_list_item_left">
-							<image class="my_list_item_icon" :src="item.icon" mode="aspectFill"></image>
-							<view class="my_list_item_name">{{ item.name }}</view>
-						</view>
-						<view class="my_list_item_right u-flex">
-							<text v-if="item.type == 'score'" class="font-12">{{ userInfo.accountPoints || 0 }}</text>
-							<!-- <text v-else-if="item.type=='my_coupon'" class="font-12 ">{{userInfo.couponNum || 0}}</text> -->
-							<text class="font-12 color-999" v-else>查看</text>
-							<u-icon class="u-m-t-2" name="arrow-right" color="#999999" size="12"></u-icon>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
+          <view class="card-list">
+            <view
+              class="card-list-item"
+              v-for="(item, index) in coinList"
+              :key="index"
+              @click="toCoin(item)"
+            >
+              <up-image
+                radius="20rpx"
+                width="182rpx"
+                height="182rpx"
+                :src="item.logo"
+              ></up-image>
+              <view class="info text-center">
+                <view class="color-333 u-m-t-14">
+                  <text class="font-10">¥</text>
+                  <text class="font-16 font-700">{{
+                    item.accountPoints || "0.00"
+                  }}</text>
+                </view>
+                <view class="font-12 color-666 u-line-1">{{
+                  item.shopName
+                }}</view>
+              </view>
+            </view>
+            <view
+              class="u-flex u-flex-column u-flex-center"
+              style="width: 12px"
+              v-if="coinList.length"
+              @click="toCoin"
+            >
+              <view class="text-center color-333 font-12">查看全部</view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="my_item my_fun u-m-t-30">
+        <view class="my_fun_list">
+          <view
+            class="my_list_item"
+            v-for="(item, index) in myFunList"
+            :key="index"
+            @click="clickTo(item, index)"
+          >
+            <view class="my_list_item_left">
+              <image
+                class="my_list_item_icon"
+                :src="item.icon"
+                mode="aspectFill"
+              ></image>
+              <view class="my_list_item_name">{{ item.name }}</view>
+            </view>
+            <view class="my_list_item_right u-flex">
+              <text v-if="item.type == 'score'" class="font-12">{{
+                userInfo.accountPoints || 0
+              }}</text>
+              <!-- <text v-else-if="item.type=='my_coupon'" class="font-12 ">{{userInfo.couponNum || 0}}</text> -->
+              <text class="font-12 color-999" v-else>查看</text>
+              <u-icon
+                class="u-m-t-2"
+                name="arrow-right"
+                color="#999999"
+                size="12"
+              ></u-icon>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <!-- <l-qrcode  :value="wechatAcQrcode"  @complete="e=>qrcodeResult(e)"/> -->
+      <view
+        class="qrcode u-flex u-col-center justify-between"
+        v-if="showQrcode"
+      >
+        <view>
+          <view class="color-000 font-14 font-bold">扫码关注公众号</view>
+          <view class="u-m-t-16 color-999 font-12"
+            >长按识别关注，更多优惠不能错过</view
+          >
+        </view>
+        <up-image
+          width="178rpx"
+          height="178rpx"
+          :show-menu-by-longpress="true"
+          :src="qrcode"
+        ></up-image>
+      </view>
+    </view>
+
+    <!-- 生成公众号二维码 -->
+    <we-qrcode @generate="(e) => qrcodeResult(e)"></we-qrcode>
+
+    <devetools></devetools>
+  </view>
 </template>
 
 <script setup>
-import { ref, computed, onMounted, reactive } from 'vue';
-import { onLoad, onReady, onShow } from '@dcloudio/uni-app';
-import { productStore } from '@/stores/user.js';
-import * as vipApi from '@/common/api/market/vip.js';
-import * as rechargeApi from '@/common/api/market/recharge.js';
-import { pointsShopList } from '@/common/api/account/points.js';
+import weQrcode from "@/components/wechat-ac-qrcode.vue";
+import devetools from "@/components/devetools.vue";
+
+import { ref, computed, onMounted, reactive, watch } from "vue";
+import { onLoad, onReady, onShow } from "@dcloudio/uni-app";
+import { productStore } from "@/stores/user.js";
+import * as vipApi from "@/common/api/market/vip.js";
+import * as rechargeApi from "@/common/api/market/recharge.js";
+import { pointsShopList } from "@/common/api/account/points.js";
+
+function qrcodeResult(res) {
+  qrcode.value = res;
+}
 
 const store = productStore();
 const myFunList = ref([
-	// {
-	// 	name: "积分",
-	// 	type: "score",
-	// 	icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/points.png",
-	// 	url: '/user/score/list'
-	// },
-	{
-		name: '优惠券',
-		type: 'my_coupon',
-		icon: 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_coupon.png'
-	}
-	// {
-	// 	name: "我的订单",
-	// 	type: "my_order",
-	// 	icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_order.png"
-	// },
-	// { name: "收货地址", type: "", icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_address.png"},
-	// {
-	// 	name: "个人资料",
-	// 	type: "myself",
-	// 	icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/personal.png"
-	// },
-	// {
-	// 	name: "我的会员卡",
-	// 	type: "my_member",
-	// 	icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_member.png"
-	// },
-	// { name: "关于", type: "", icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/inRegard.png"},
+  // {
+  // 	name: "积分",
+  // 	type: "score",
+  // 	icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/points.png",
+  // 	url: '/user/score/list'
+  // },
+  {
+    name: "优惠券",
+    type: "my_coupon",
+    icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_coupon.png",
+  },
+  {
+    name: "分销",
+    type: "fenxiao",
+    icon: "/static/icon/fenxiao.svg",
+  },
+  // {
+  // 	name: "我的订单",
+  // 	type: "my_order",
+  // 	icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_order.png"
+  // },
+  // { name: "收货地址", type: "", icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_address.png"},
+  // {
+  // 	name: "个人资料",
+  // 	type: "myself",
+  // 	icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/personal.png"
+  // },
+  // {
+  // 	name: "我的会员卡",
+  // 	type: "my_member",
+  // 	icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_member.png"
+  // },
+  // { name: "关于", type: "", icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/inRegard.png"},
 ]);
 
 const userInfo = reactive({});
 
-const ShopId = ref(uni.cache.get('shopId'));
-console.log('ShopId', uni.cache.get('shopId'));
+const ShopId = ref(uni.cache.get("shopId"));
+console.log("ShopId", uni.cache.get("shopId"));
 
 function tomemberList() {
-	uni.navigateTo({
-		url: '/pages/user/member/list'
-	});
+  uni.navigateTo({
+    url: "/pages/user/member/list",
+  });
 }
 
 function tomember(item) {
-	uni.navigateTo({
-		url: '/user/vip/vip?shopId=' + item.shopId
-	});
+  uni.navigateTo({
+    url: "/user/vip/vip?shopId=" + item.shopId,
+  });
 }
 
 const clickEvent = () => {
-	if (ShopId.value) {
-		if (!userInfo.isVip) {
-			uni.navigateTo({
-				url: '/user/vip/buy-vip?shopId=' + ShopId.value
-			});
-		} else {
-			uni.navigateTo({
-				url: '/user/vip/vip?shopId=' + ShopId.value
-			});
-		}
+  if (ShopId.value) {
+    if (!userInfo.isVip) {
+      uni.navigateTo({
+        url: "/user/vip/buy-vip?shopId=" + ShopId.value,
+      });
+    } else {
+      uni.navigateTo({
+        url: "/user/vip/vip?shopId=" + ShopId.value,
+      });
+    }
 
-		// if (userInfo.isVip == 0) {
+    // if (userInfo.isVip == 0) {
 
-		// 	uni.pro.navigateTo('user/member/memberdetails', {
-		// 		shopId: uni.cache.get('shopId')
-		// 	})
-		// } else {
-		// 	uni.pro.navigateTo('user/member/paycode', {
-		// 		shopId: uni.cache.get('shopId'),
-		// 		shopInfo: JSON.stringify(uni.cache.get('orderVIP').shopInfo)
-		// 	})
-		// }
-	} else {
-		uni.pro.navigateTo('member/list', {
-			type: 'user_payCode'
-		});
-	}
+    // 	uni.pro.navigateTo('user/member/memberdetails', {
+    // 		shopId: uni.cache.get('shopId')
+    // 	})
+    // } else {
+    // 	uni.pro.navigateTo('user/member/paycode', {
+    // 		shopId: uni.cache.get('shopId'),
+    // 		shopInfo: JSON.stringify(uni.cache.get('orderVIP').shopInfo)
+    // 	})
+    // }
+  } else {
+    uni.pro.navigateTo("member/list", {
+      type: "user_payCode",
+    });
+  }
 };
 
 // 我的资产
 const Myassets = () => {
-	if (uni.cache.get('shopId')) {
-		uni.pro.navigateTo('user/member/memberdetails', {
-			shopId: uni.cache.get('shopId'),
-			type: 'index'
-		});
-	} else {
-		uni.pro.navigateTo('user/member/list', {
-			shopId: uni.cache.get('shopId'),
-			type: 'index'
-		});
-	}
+  if (uni.cache.get("shopId")) {
+    uni.pro.navigateTo("user/member/memberdetails", {
+      shopId: uni.cache.get("shopId"),
+      type: "index",
+    });
+  } else {
+    uni.pro.navigateTo("user/member/list", {
+      shopId: uni.cache.get("shopId"),
+      type: "index",
+    });
+  }
 };
 
 function toCharge(item) {
-	uni.navigateTo({
-		url: '/pages/user/member/czzx?shopId=' + item.shopId
-	});
+  uni.navigateTo({
+    url: "/pages/user/member/czzx?shopId=" + item.shopId,
+  });
 }
 
 function toChargeList() {
-	uni.navigateTo({
-		url: '/pages/user/member/amount-list'
-	});
+  uni.navigateTo({
+    url: "/pages/user/member/amount-list",
+  });
 }
 
 const clickTo = (item, index) => {
-	if (item.url) {
-		uni.navigateTo({
-			url: item.url
-		});
-		return;
-	}
-	let shopId = null;
-	switch (item.type) {
-		case 'my_order':
-			uni.pro.switchTab('order/index');
-			break;
-		case 'my_member':
-			uni.pro.navigateTo('user/member/list');
-			break;
-		case 'recharge':
-			if (uni.cache.get('shopId') && uni.cache.get('token')) {
-				uni.pro.navigateTo('member/index', {
-					shopId: uni.cache.get('shopId'),
-					type: 'index'
-				});
-			} else {
-				uni.pro.navigateTo('member/list', {
-					type: 'user_recharge'
-				});
-			}
-			break;
-		case 'points': //积分
-			if (uni.cache.get('shopId') && uni.cache.get('token')) {
-				uni.pro.navigateTo('/pagesPoints/index/index', {
-					shopId: uni.cache.get('shopId'),
-					type: 'user'
-				});
-			} else {
-				uni.pro.navigateTo('member/list', {
-					type: 'user_points'
-				});
-			}
-			break;
-		case 'my_coupon': //优惠券
-			uni.pro.navigateTo('user/coupon', {
-				shopId: uni.cache.get('shopId') || ''
-			});
-			break;
-		case 'myself': //内部页面
-			uni.pro.navigateTo('user/myself');
-			break;
-		case 'scan_applet':
-			uni.navigateToMiniProgram(JSON.parse(item.value));
-			break;
-		case 'absolute': //外链url
-			uni.navigateTo({
-				url: `/pages/webview/webview?url=${item.menuUrl}`
-			});
-			break;
-	}
+  if (item.url) {
+    uni.navigateTo({
+      url: item.url,
+    });
+    return;
+  }
+  let shopId = null;
+  switch (item.type) {
+    case "my_order":
+      uni.pro.switchTab("order/index");
+      break;
+    case "my_member":
+      uni.pro.navigateTo("user/member/list");
+      break;
+    case "recharge":
+      if (uni.cache.get("shopId") && uni.cache.get("token")) {
+        uni.pro.navigateTo("member/index", {
+          shopId: uni.cache.get("shopId"),
+          type: "index",
+        });
+      } else {
+        uni.pro.navigateTo("member/list", {
+          type: "user_recharge",
+        });
+      }
+      break;
+    case "points": //积分
+      if (uni.cache.get("shopId") && uni.cache.get("token")) {
+        uni.pro.navigateTo("/pagesPoints/index/index", {
+          shopId: uni.cache.get("shopId"),
+          type: "user",
+        });
+      } else {
+        uni.pro.navigateTo("member/list", {
+          type: "user_points",
+        });
+      }
+      break;
+    case "my_coupon": //优惠券
+      uni.pro.navigateTo("user/coupon", {
+        shopId: uni.cache.get("shopId") || "",
+      });
+      break;
+    case "fenxiao": //优惠券
+      uni.navigateTo({
+        url: "/distribution/index",
+      });
+      break;
+    case "myself": //内部页面
+      uni.pro.navigateTo("user/myself");
+      break;
+    case "scan_applet":
+      uni.navigateToMiniProgram(JSON.parse(item.value));
+      break;
+    case "absolute": //外链url
+      uni.navigateTo({
+        url: `/pages/webview/webview?url=${item.menuUrl}`,
+      });
+      break;
+  }
 };
 
 const memberList = ref([]);
@@ -312,203 +445,222 @@ const rechargeTotal = ref(0);
 const coinTotal = ref(0);
 const coinList = ref([]);
 async function getData() {
-	const res = await vipApi.list();
-	memberTotal.value = res.length;
-	memberList.value = res.slice(0, 3);
-	const res1 = await rechargeApi.list();
-	rechargeTotal.value = res1.length;
-	rechargeList.value = res1.slice(0, 3);
+  const res = await vipApi.list();
+  memberTotal.value = res.length;
+  memberList.value = res.slice(0, 3);
+  const res1 = await rechargeApi.list();
+  rechargeTotal.value = res1.length;
+  rechargeList.value = res1.slice(0, 3);
 
-	const res3 = await pointsShopList();
-	coinTotal.value = res3.length;
-	coinList.value = res3;
+  const res3 = await pointsShopList();
+  coinTotal.value = res3.length;
+  coinList.value = res3;
 }
 
 function toCoin() {
-	uni.navigateTo({
-		url: '/user/score/list'
-	});
+  uni.navigateTo({
+    url: "/user/score/list",
+  });
 }
 
 onShow(() => {
-	store.actionsAPIuser();
-	if (uni.cache.get('shopId')) {
-		Object.assign(userInfo, uni.cache.get('orderVIP'));
-	} else {
-		Object.assign(userInfo, {
-			...uni.cache.get('userInfo'),
-			...uni.cache.get('userInfo').assetsSummary
-		});
-	}
-	getData();
+  store.actionsAPIuser();
+  if (uni.cache.get("shopId")) {
+    Object.assign(userInfo, uni.cache.get("orderVIP"));
+  } else {
+    Object.assign(userInfo, {
+      ...uni.cache.get("userInfo"),
+      ...uni.cache.get("userInfo").assetsSummary,
+    });
+  }
+  console.log("userInfo", userInfo);
+  getData();
+});
+
+const qrcode = ref("");
+const showQrcode = computed(() => {
+  const followIndex = uni.cache.get("followIndex");
+  if (followIndex == "mine" && qrcode.value) {
+    return true;
+  }
 });
 </script>
 
 <style scoped lang="scss">
 .topBack {
-	width: 100%;
-	height: 400rpx;
-	position: absolute;
+  width: 100%;
+  height: 400rpx;
+  position: absolute;
 }
 
 .myContent {
-	position: relative;
-	z-index: 1;
-	padding: 298rpx 0 0 0;
+  position: relative;
+  z-index: 1;
+  padding: 298rpx 0 60rpx 0;
 
-	.my_info {
-		align-items: center;
-		background-color: #fff;
-		padding: 32rpx 32rpx;
-		border-radius: 18rpx;
+  .my_info {
+    align-items: center;
+    background-color: #fff;
+    padding: 32rpx 32rpx;
+    border-radius: 18rpx;
 
-		.my_info_left {
-			display: flex;
-			align-items: center;
+    .my_info_left {
+      display: flex;
+      align-items: center;
 
-			.my_info_left_head {
-				width: 84rpx;
-				height: 84rpx;
-				margin-right: 18rpx;
-				border-radius: 50%;
-			}
+      .my_info_left_head {
+        width: 84rpx;
+        height: 84rpx;
+        margin-right: 18rpx;
+        border-radius: 50%;
+      }
 
-			.name {
-				font-weight: 400;
-				font-size: 36rpx;
-				color: #333333;
-			}
-		}
+      .name {
+        font-weight: 400;
+        font-size: 36rpx;
+        color: #333333;
+      }
+    }
 
-		.my_info_right {
-			width: 136rpx;
-			height: 48rpx;
-			background-color: #e3ad7f;
-			border-radius: 24rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
+    .my_info_right {
+      width: 136rpx;
+      height: 48rpx;
+      background-color: #e3ad7f;
+      border-radius: 24rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
 
-			text {
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #ffffff;
-			}
-		}
+      text {
+        font-weight: 500;
+        font-size: 24rpx;
+        color: #ffffff;
+      }
+    }
 
-		.my_info_right_qr {
-			width: 40rpx;
-			height: 40rpx;
-		}
-	}
+    .my_info_right_qr {
+      width: 40rpx;
+      height: 40rpx;
+    }
+  }
 
-	.my_item {
-		background-color: #fff;
-		padding: 0 32rpx;
-		border-radius: 18rpx;
+  .my_item {
+    background-color: #fff;
+    padding: 0 32rpx;
+    border-radius: 18rpx;
 
-		.my_item_title {
-			font-weight: bold;
-			font-size: 32rpx;
-			color: #333333;
-			font-family: Source Han Sans CN, Source Han Sans CN;
-		}
-	}
+    .my_item_title {
+      font-weight: bold;
+      font-size: 32rpx;
+      color: #333333;
+      font-family: Source Han Sans CN, Source Han Sans CN;
+    }
+  }
 
-	.my_assets {
-		.my_item_title {
-			margin-bottom: 26rpx;
-		}
+  .my_assets {
+    .my_item_title {
+      margin-bottom: 26rpx;
+    }
 
-		.my_assets_list {
-			display: flex;
-			justify-content: space-around;
-			padding: 0 38rpx;
+    .my_assets_list {
+      display: flex;
+      justify-content: space-around;
+      padding: 0 38rpx;
 
-			.my_list_item {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
+      .my_list_item {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
 
-				.my_list_item_icon {
-					width: 52rpx;
-					height: 44rpx;
-				}
+        .my_list_item_icon {
+          width: 52rpx;
+          height: 44rpx;
+        }
 
-				.my_list_item_name {
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #333333;
-					margin-top: 16rpx;
-					margin-bottom: 16rpx;
-				}
+        .my_list_item_name {
+          font-weight: 500;
+          font-size: 24rpx;
+          color: #333333;
+          margin-top: 16rpx;
+          margin-bottom: 16rpx;
+        }
 
-				.my_list_item_num {
-					font-weight: 400;
-					font-size: 20rpx;
-					color: #e3ad7f;
-				}
-			}
-		}
-	}
+        .my_list_item_num {
+          font-weight: 400;
+          font-size: 20rpx;
+          color: #e3ad7f;
+        }
+      }
+    }
+  }
 
-	.my_fun {
-		.my_item_title {
-			margin-bottom: 18rpx;
-		}
+  .my_fun {
+    .my_item_title {
+      margin-bottom: 18rpx;
+    }
 
-		.my_fun_list {
-			display: flex;
-			flex-direction: column;
+    .my_fun_list {
+      display: flex;
+      flex-direction: column;
 
-			.my_list_item {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				padding: 24rpx 0 26rpx 0;
-				border-bottom: 1rpx solid #e5e5e5;
+      .my_list_item {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 24rpx 0 26rpx 0;
+        border-bottom: 1rpx solid #e5e5e5;
 
-				.my_list_item_left {
-					display: flex;
-					align-items: center;
+        .my_list_item_left {
+          display: flex;
+          align-items: center;
 
-					.my_list_item_icon {
-						width: 44rpx;
-						height: 44rpx;
-						margin-right: 18rpx;
-					}
+          .my_list_item_icon {
+            width: 44rpx;
+            height: 44rpx;
+            margin-right: 18rpx;
+          }
 
-					.my_list_item_name {
-						font-weight: 400;
-						font-size: 28rpx;
-						color: #333333;
-					}
-				}
-			}
+          .my_list_item_name {
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #333333;
+          }
+        }
+      }
 
-			.my_list_item:last-child {
-				border-bottom: none;
-			}
-		}
-	}
+      .my_list_item:last-child {
+        border-bottom: none;
+      }
+    }
+  }
 }
 
 .card-list {
-	display: grid;
-	grid-template-columns: repeat(4, 1fr);
-	column-gap: 40rpx;
-	margin-top: 20rpx;
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  column-gap: 40rpx;
+  margin-top: 20rpx;
 
-	.card-list-item {
-		max-width: 182rpx;
-		box-shadow: 8rpx 8rpx 32rpx 0 #0b18390f;
-		border-radius: 0 0 20rpx 20rpx;
+  .card-list-item {
+    max-width: 182rpx;
+    box-shadow: 8rpx 8rpx 32rpx 0 #0b18390f;
+    border-radius: 0 0 20rpx 20rpx;
 
-		.info {
-			padding-bottom: 16rpx;
-			border-radius: 0 0 20rpx 20rpx;
-			overflow: hidden;
-		}
-	}
+    .info {
+      padding-bottom: 16rpx;
+      border-radius: 0 0 20rpx 20rpx;
+      overflow: hidden;
+    }
+  }
+}
+.qrcode {
+  padding: 24rpx;
+  margin: 60rpx 32rpx 60rpx 32rpx;
+  border-radius: 18rpx;
+  border: 2rpx solid #d9d9d9;
+}
+.qrcode-box {
+  position: fixed;
+  transform: translateX(200vw, 200vh);
 }
 </style>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 17c1f22..2e112e1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -30,8 +30,8 @@ importers:
         specifier: ^0.1.2
         version: 0.1.2
       ysk-utils:
-        specifier: ^1.0.40
-        version: 1.0.40
+        specifier: ^1.0.78
+        version: 1.0.78
 
 packages:
 
@@ -39,17 +39,17 @@ packages:
     resolution: {integrity: sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-validator-identifier@7.27.1':
-    resolution: {integrity: sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==}
+  '@babel/helper-validator-identifier@7.28.5':
+    resolution: {integrity: sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/parser@7.28.4':
-    resolution: {integrity: sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==}
+  '@babel/parser@7.28.5':
+    resolution: {integrity: sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
-  '@babel/types@7.28.4':
-    resolution: {integrity: sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==}
+  '@babel/types@7.28.5':
+    resolution: {integrity: sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==}
     engines: {node: '>=6.9.0'}
 
   '@dcloudio/types@3.4.21':
@@ -104,8 +104,8 @@ packages:
   bignumber.js@9.3.1:
     resolution: {integrity: sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ==}
 
-  csstype@3.1.3:
-    resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
+  csstype@3.2.3:
+    resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}
 
   dayjs@1.11.18:
     resolution: {integrity: sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA==}
@@ -120,11 +120,15 @@ packages:
   jsbarcode@3.12.1:
     resolution: {integrity: sha512-QZQSqIknC2Rr/YOUyOkCBqsoiBAOTYK+7yNN3JsqfoUtJtkazxNw1dmPpxuv7VVvqW13kA3/mKiLq+s/e3o9hQ==}
 
+  loadsh@0.0.4:
+    resolution: {integrity: sha512-U+wLL8InpfRalWrr+0SuhWgGt10M4OyAk6G8xCYo2rwpiHtxZkWiFpjei0vO463ghW8LPCdhqQxXlMy2qicAEw==}
+    deprecated: This is a typosquat on the popular Lodash package. This is not maintained nor is the original Lodash package.
+
   lodash@4.17.21:
     resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
 
-  magic-string@0.30.19:
-    resolution: {integrity: sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==}
+  magic-string@0.30.21:
+    resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
 
   nanoid@3.3.11:
     resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==}
@@ -173,23 +177,23 @@ packages:
       typescript:
         optional: true
 
-  ysk-utils@1.0.40:
-    resolution: {integrity: sha512-Hi+XI7sykGJizExMY5kVWIBhPvO3wudp2q92Vqv6zI6eDtquLz4CwxIfOLEXFfn5crYXVu/yfJQVjK3WAyNYDQ==}
+  ysk-utils@1.0.78:
+    resolution: {integrity: sha512-Bgr5B3WWiy0nbgL91QVKoVPYm4wt13Rlav757zEjMVRHbmTjwFEhi3wJlYus0JGd52mbknSxXHMazAPHXwA7uQ==}
 
 snapshots:
 
   '@babel/helper-string-parser@7.27.1': {}
 
-  '@babel/helper-validator-identifier@7.27.1': {}
+  '@babel/helper-validator-identifier@7.28.5': {}
 
-  '@babel/parser@7.28.4':
+  '@babel/parser@7.28.5':
     dependencies:
-      '@babel/types': 7.28.4
+      '@babel/types': 7.28.5
 
-  '@babel/types@7.28.4':
+  '@babel/types@7.28.5':
     dependencies:
       '@babel/helper-string-parser': 7.27.1
-      '@babel/helper-validator-identifier': 7.27.1
+      '@babel/helper-validator-identifier': 7.28.5
 
   '@dcloudio/types@3.4.21': {}
 
@@ -202,7 +206,7 @@ snapshots:
 
   '@vue/compiler-core@3.5.22':
     dependencies:
-      '@babel/parser': 7.28.4
+      '@babel/parser': 7.28.5
       '@vue/shared': 3.5.22
       entities: 4.5.0
       estree-walker: 2.0.2
@@ -215,13 +219,13 @@ snapshots:
 
   '@vue/compiler-sfc@3.5.22':
     dependencies:
-      '@babel/parser': 7.28.4
+      '@babel/parser': 7.28.5
       '@vue/compiler-core': 3.5.22
       '@vue/compiler-dom': 3.5.22
       '@vue/compiler-ssr': 3.5.22
       '@vue/shared': 3.5.22
       estree-walker: 2.0.2
-      magic-string: 0.30.19
+      magic-string: 0.30.21
       postcss: 8.5.6
       source-map-js: 1.2.1
 
@@ -250,7 +254,7 @@ snapshots:
       '@vue/reactivity': 3.5.22
       '@vue/runtime-core': 3.5.22
       '@vue/shared': 3.5.22
-      csstype: 3.1.3
+      csstype: 3.2.3
 
   '@vue/server-renderer@3.5.22(vue@3.5.22)':
     dependencies:
@@ -262,7 +266,7 @@ snapshots:
 
   bignumber.js@9.3.1: {}
 
-  csstype@3.1.3: {}
+  csstype@3.2.3: {}
 
   dayjs@1.11.18: {}
 
@@ -272,9 +276,11 @@ snapshots:
 
   jsbarcode@3.12.1: {}
 
+  loadsh@0.0.4: {}
+
   lodash@4.17.21: {}
 
-  magic-string@0.30.19:
+  magic-string@0.30.21:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.5
 
@@ -314,7 +320,8 @@ snapshots:
       '@vue/server-renderer': 3.5.22(vue@3.5.22)
       '@vue/shared': 3.5.22
 
-  ysk-utils@1.0.40:
+  ysk-utils@1.0.78:
     dependencies:
       bignumber.js: 9.3.1
+      loadsh: 0.0.4
       lodash: 4.17.21
diff --git a/static/icon/coup.png b/static/icon/coup.png
index 558815a..c6dccb4 100644
Binary files a/static/icon/coup.png and b/static/icon/coup.png differ
diff --git a/static/icon/fenxiao.svg b/static/icon/fenxiao.svg
new file mode 100644
index 0000000..a09e46d
--- /dev/null
+++ b/static/icon/fenxiao.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1761788431710" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5024" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M381.952 539.136h-31.744v-16.384h31.744c14.848 0 26.112-8.704 26.112-19.968s-11.776-19.968-26.112-19.968h-17.408l38.4-66.048c4.096-6.656 5.12-14.848 3.584-21.504-1.024-5.12-4.608-9.728-9.216-12.288-10.24-5.632-25.088 0-31.744 12.288L338.432 445.44c-9.728 17.92-10.24 19.456-10.24 19.456l-0.512 1.024c-12.8-25.088-36.352-68.608-37.376-71.168-6.656-12.288-22.016-17.92-32.256-11.776-4.608 3.072-8.192 7.68-9.728 12.8-2.048 6.656-0.512 14.336 3.072 20.992l35.84 61.952 2.048 3.584h-18.944c-14.848 0-26.112 8.704-26.112 19.968s11.776 19.968 26.112 19.968h33.792v16.384h-33.792c-14.848 0-26.112 8.704-26.112 20.48 0 10.752 10.24 18.944 24.576 19.968h35.84v21.504c0 14.336 10.24 26.112 23.04 26.112s23.04-11.264 23.04-25.6V578.56h36.864c12.8-2.048 20.992-9.728 20.992-19.456-0.512-11.264-11.776-19.968-26.624-19.968z" fill="#333333" p-id="5025"></path><path d="M817.152 354.304c82.944 0 150.528-67.584 150.528-150.528s-67.584-150.528-150.528-150.528-150.528 67.584-150.528 150.528c0 13.312 1.536 25.6 4.608 37.888l-138.752 92.16c-5.632-6.656-11.264-13.312-17.92-19.456-50.688-50.688-117.76-78.336-189.44-78.336s-138.752 27.648-189.44 78.336c-50.688 50.688-78.336 117.76-78.336 189.44s27.648 138.752 78.336 189.44c50.688 50.688 117.76 78.336 189.44 78.336 71.168 0 138.24-27.648 188.928-77.824l146.944 102.4c-6.144 14.336-9.216 30.72-9.216 47.104 0 23.04 6.144 44.544 17.408 62.976h-139.776c-16.384 0-30.208 13.312-30.208 30.208 0 16.384 13.312 30.208 30.208 30.208h247.296c67.584-1.024 121.856-55.808 121.856-123.392 0-68.096-55.296-123.392-123.392-123.392-29.696 0-56.832 10.24-77.824 27.648l-145.408-101.376c26.624-42.496 40.96-91.648 40.96-142.848 0-41.984-9.728-82.944-27.648-119.296l133.12-88.576c28.16 35.84 70.656 58.88 118.784 58.88z m0-248.832c54.272 0 98.304 44.032 98.304 98.304S871.424 302.08 817.152 302.08s-98.304-44.032-98.304-98.304 44.032-98.304 98.304-98.304z m-41.472 674.816c34.816 0 62.976 28.16 62.976 62.976s-28.16 62.976-62.976 62.976-62.976-28.16-62.976-62.976 28.16-62.976 62.976-62.976zM326.144 711.68c-114.688 0-207.872-93.184-207.872-207.872 0-114.688 93.184-207.872 207.872-207.872s207.872 93.184 207.872 207.872C533.504 618.496 440.32 711.68 326.144 711.68z" fill="#333333" p-id="5026"></path></svg>
\ No newline at end of file
diff --git a/static/icon/jifen.png b/static/icon/jifen.png
new file mode 100644
index 0000000..879b655
Binary files /dev/null and b/static/icon/jifen.png differ
diff --git a/static/icon/newUserDiscount.png b/static/icon/newUserDiscount.png
new file mode 100644
index 0000000..a43be67
Binary files /dev/null and b/static/icon/newUserDiscount.png differ
diff --git a/stores/carts.js b/stores/carts.js
index ce77dd9..f93df0b 100644
--- a/stores/carts.js
+++ b/stores/carts.js
@@ -1,616 +1,680 @@
-import {
-	defineStore
-} from 'pinia';
-import yskUtils from 'ysk-utils'
-const {
-	OrderPriceCalculator,
-	BaseCartItem,
-	BackendCoupon,
-	ActivityConfig,
-	OrderExtraConfig,
-	MerchantReductionConfig,
-	MerchantReductionType,
-	GoodsType
-} = yskUtils
+import { defineStore } from "pinia";
+// import yskUtils from 'ysk-utils'
+// const {
+// 	OrderPriceCalculator,
+// 	BaseCartItem,
+// 	BackendCoupon,
+// 	ActivityConfig,
+// 	OrderExtraConfig,
+// 	MerchantReductionConfig,
+// 	MerchantReductionType,
+// 	GoodsType
+// } = yskUtils
 
+import { OrderPriceCalculator } from "@/utils/goods";
+
+import { ref, computed, reactive, watchEffect, watch } from "vue";
 import {
-	ref,
-	computed,
-	reactive,
-	watchEffect,
-	watch
-} from 'vue';
-import {
-	productminiApphotsquery,
-	APIgroupquery,
+  productminiApphotsquery,
+  APIgroupquery,
 } from "@/common/api/product/product.js";
 
-export const useCartsStore = defineStore('cart',
-	() => {
+export const useCartsStore = defineStore("cart", () => {
+  // 店铺信息
+  const shopInfo = ref(
+    uni.cache.get("shopInfo") || {
+      isMemberPrice: 0,
+      isTableFee: 1,
+    }
+  );
+  //用户信息
+  const shopUserInfo = ref(uni.cache.get("shopUserInfo") || {});
 
-		// 店铺信息
-		const shopInfo = ref(uni.cache.get('shopInfo') || {
-			isMemberPrice: 0,
-			isTableFee: 1
-		})
-		
-		const consumeDiscount=ref({})
+  const consumeDiscount = ref({});
 
-		// 适配工具库 BaseCartItem 接口的商品数据转换函数
-		const convertToBaseCartItem = (item) => {
-			const skuData = item.skuData ? {
-					id: item.skuData.id || item.sku_id,
-					salePrice: item.skuData.salePrice || 0,
-					memberPrice: item.skuData.memberPrice || 0
-				} :
-				undefined;
+  // 适配工具库 BaseCartItem 接口的商品数据转换函数
+  const convertToBaseCartItem = (item) => {
+    const skuData = item.skuData
+      ? {
+          id: item.skuData.id || item.sku_id,
+          salePrice: item.skuData.salePrice || 0,
+          memberPrice: item.skuData.memberPrice || 0,
+        }
+      : undefined;
 
-			const goods = getProductDetails({
-				...item,
-				product_id: item.product_id || item.productId,
-				sku_id:item.skuId||item.sku_id
-			})
-			return {
-				...item,
-				id: item.id,
-				sku_id:item.skuId||item.sku_id,
-				product_id: item.product_id || item.productId,
-				salePrice: item.salePrice || item.price,
-				number: item.number || item.num || 0,
-				product_type: item.productType,
-				is_temporary: !!(item.is_temporary || item.isTemporary),
-				is_gift: !!(item.is_gift || item.isGift),
-				returnNum: item.returnNum || 0,
-				memberPrice: item.memberPrice || 0,
-				discountSaleAmount: item.discount_sale_amount || item.discountSaleAmount || 0,
-				packFee: item.packFee || (goods?goods.packFee:0) || 0,
-				packNumber: item.pack_number || item.packNumber || 0,
-				activityInfo: item.activityInfo ? {
-					type: item.activityInfo.type,
-					discountRate: OrderPriceCalculator.formatDiscountRate(item.activityInfo.discountRate),
-					vipPriceShare: !!item.activityInfo.vipPriceShare
-				} : undefined,
-				skuData
-			};
-		};
+    const goods = getProductDetails({
+      ...item,
+      product_id: item.product_id || item.productId,
+      sku_id: item.skuId || item.sku_id,
+    });
+    console.log('convertToBaseCartItem',item)
+    const discountSaleAmount=item.discount_sale_amount?(item.discount_sale_amount*1) : (item.discountSaleAmount?item.discountSaleAmount*1:0)
+    return {
+      ...item,
+      id: item.id,
+      sku_id: item.skuId || item.sku_id,
+      product_id: item.product_id || item.productId,
+      salePrice: item.salePrice || item.price,
+      number: item.number || item.num || 0,
+      product_type: item.productType,
+      is_temporary: !!(item.is_temporary || item.isTemporary),
+      is_gift: !!(item.is_gift || item.isGift),
+      is_time_discount: item.is_time_discount || item.isTimeDiscount ,
+      returnNum: item.returnNum || 0,
+      memberPrice: item.memberPrice || 0,
+      discountSaleAmount:discountSaleAmount,
+      packFee: item.packFee || (goods ? goods.packFee : 0) || 0,
+      packNumber: item.pack_number || item.packNumber || 0,
+      activityInfo: item.activityInfo
+        ? {
+            type: item.activityInfo.type,
+            discountRate: OrderPriceCalculator.formatDiscountRate(
+              item.activityInfo.discountRate
+            ),
+            vipPriceShare: !!item.activityInfo.vipPriceShare,
+          }
+        : undefined,
+      skuData,
+    };
+  };
 
-		// 合并所有商品列表
-		const allGoods = ref([])
+  // 合并所有商品列表
+  const allGoods = ref([]);
 
-		function getAllGoodsList() {
-			const currentGoods = (carts.value).map(convertToBaseCartItem);
-			const giftGoods = [].map(convertToBaseCartItem);
-			// 扁平化历史订单商品
-			const oldOrderGoods = Object.values(oldOrder.value.detailMap || {})
-				.flat()
-				.map(convertToBaseCartItem);
-			return [...currentGoods, ...giftGoods, ...oldOrderGoods];
-		}
+  function getAllGoodsList() {
+    const currentGoods = carts.value.map(convertToBaseCartItem);
+    const giftGoods = [].map(convertToBaseCartItem);
+    // 扁平化历史订单商品
+    const oldOrderGoods = Object.values(oldOrder.value.detailMap || {})
+      .flat()
+      .map(convertToBaseCartItem);
 
+      console.log('oldOrder.value',oldOrder.value)
+      if(!oldOrder.value.id){
 
-		// 就餐类型 'dine-in' | 'take-out'
+      }
+    return [...currentGoods, ...giftGoods, ...oldOrderGoods];
+  }
 
-		let dinnerType = ref('dine-in');
+  // 就餐类型 'dine-in' | 'take-out'
 
-		function setDinnerType(str) {
-			dinnerType.value = str
-		}
-		//餐位费配置
+  let dinnerType = ref("dine-in");
 
-		const dinersNum = uni.cache.get('dinersNum') || 0
-		const seatFeeConfig = ref({
-			pricePerPerson: shopInfo.value.tableFee || 0,
-			personCount: dinersNum||0,
-			isEnabled: !shopInfo.value.isTableFee
-		})
-		watch(() => shopInfo.value.isTableFee, (newval) => {
-			seatFeeConfig.value.isEnabled = !shopInfo.value.isTableFee
-			seatFeeConfig.value.pricePerPerson = shopInfo.value.tableFee||0
-		},{
-			deep:true
-		})
+  function setDinnerType(str) {
+    dinnerType.value = str;
+  }
+  //餐位费配置
 
-		function setSeatFeeConfig(key, val) {
-			seatFeeConfig.value[key] = val;
-		}
-		watch(() => seatFeeConfig.value, (newval) => {
-			console.log('seatFeeConfig', seatFeeConfig.value);
-		}, {
-			deep: true
-		})
+  const dinersNum = uni.cache.get("dinersNum") || 0;
+  const seatFeeConfig = ref({
+    pricePerPerson: shopInfo.value.tableFee || 0,
+    personCount: dinersNum || 0,
+    isEnabled: !shopInfo.value.isTableFee,
+  });
+  watch(
+    () => shopInfo.value.isTableFee,
+    (newval) => {
+      seatFeeConfig.value.isEnabled = !shopInfo.value.isTableFee;
+      seatFeeConfig.value.pricePerPerson = shopInfo.value.tableFee || 0;
+    },
+    {
+      deep: true,
+    }
+  );
 
-		//积分规则
-		const pointDeductionRule = ref({
-			pointsPerYuan: 100,
-			maxDeductionAmount: Infinity
-		})
+  function setSeatFeeConfig(key, val) {
+    seatFeeConfig.value[key] = val;
+  }
+  watch(
+    () => seatFeeConfig.value,
+    (newval) => {
+      console.log("seatFeeConfig", seatFeeConfig.value);
+    },
+    {
+      deep: true,
+    }
+  );
 
-		function setPointDeductionRule(pointsPerYuan, maxDeductionAmount) {
-			pointDeductionRule.value.pointsPerYuan = pointsPerYuan
-			pointDeductionRule.value.maxDeductionAmount = maxDeductionAmount
-		}
+  //积分规则
+  const pointDeductionRule = ref({
+    pointsPerYuan: 0,
+    maxDeductionAmount: Infinity,
+  });
 
-		// 初始配置：默认无减免（固定金额 0 元）
-		const merchantReductionConfig = ref({
-			type: 'fixed_amount',
-			fixedAmount: 0
-		});
-		//使用积分数量
-		const userPoints = ref(0);
+  function setPointDeductionRule(pointsPerYuan, maxDeductionAmount) {
+    pointDeductionRule.value.pointsPerYuan = pointsPerYuan;
+    pointDeductionRule.value.maxDeductionAmount = maxDeductionAmount;
+  }
 
-		function setUserPoints(newval) {
-			userPoints.value = newval
-		}
+  // 初始配置：默认无减免（固定金额 0 元）
+  const merchantReductionConfig = ref({
+    type: "fixed_amount",
+    fixedAmount: 0,
+  });
+  //使用积分数量
+  const userPoints = ref(0);
 
+  function setUserPoints(newval) {
+    userPoints.value = newval;
+  }
 
-		//新客立减
-		const newUserDiscount = ref(0);
-		// 订单额外配置
-		const orderExtraConfig = computed(() => ({
-			// 引用扩展后的商家减免配置
-			merchantReduction: merchantReductionConfig.value,
-			additionalFee: 0,
-			pointDeductionRule: pointDeductionRule.value,
-			seatFeeConfig: seatFeeConfig.value,
-			currentStoreId: '',
-			userPoints: userPoints.value,
-			isMember: useVipPrice.value,
-			memberDiscountRate: 1,
-			newUserDiscount: newUserDiscount.value
-		}));
+  //新客立减
+  const newUserDiscount = ref(0);
+  //满减活动
+  const fullReductionActivities = ref([]);
+  //是否使用霸王餐
+  const isFreeDine = ref(false);
+  // 商家霸王餐配置
+  const freeDineConfig = ref(null);
+  //限时折扣
+  const limitTimeDiscount = ref(null);
+  // 订单额外配置
+  const orderExtraConfig = computed(() => ({
+    // 引用扩展后的商家减免配置
+    merchantReduction: merchantReductionConfig.value,
+    additionalFee: 0,
+    pointDeductionRule: pointDeductionRule.value,
+    seatFeeConfig: seatFeeConfig.value,
+    currentStoreId: "",
+    userPoints: userPoints.value,
+    isMember: useVipPrice.value,
+    memberDiscountRate: 1,
+    newUserDiscount: newUserDiscount.value,
+    fullReductionActivities: fullReductionActivities.value,
+    currentDinnerType: dinnerType.value,
+    isFreeDine: isFreeDine.value,
+    freeDineConfig: freeDineConfig.value,
+    limitTimeDiscount: limitTimeDiscount.value,
+    shopUserInfo: shopUserInfo.value,
+  }));
 
-		// 营销活动列表
-		const activityList = computed(() => {
-			return [];
-		});
-		// 优惠券列表
-		const backendCoupons = ref([])
+  // 营销活动列表
+  const activityList = computed(() => {
+    return [];
+  });
+  // 优惠券列表
+  const backendCoupons = ref([]);
 
-		function setCoupons(cps) {
-			console.log('setCoupons', cps);
-			backendCoupons.value = cps;
-		}
-		// 商品加入购物车顺序
-		const cartOrder = ref({});
-		// 订单费用汇总
-		const orderCostSummary = computed(() => {
-			allGoods.value = getAllGoodsList()
-			console.log('allGoods.value',allGoods.value);
-			const costSummary = OrderPriceCalculator.calculateOrderCostSummary(
-				allGoods.value,
-				dinnerType.value,
-				backendCoupons.value,
-				activityList.value,
-				orderExtraConfig.value,
-				cartOrder.value,
-				new Date()
-			);
-			return costSummary;
-		});
+  function setCoupons(cps) {
+    console.log("setCoupons", cps);
+    backendCoupons.value = cps;
+  }
+  // 商品加入购物车顺序
+  const cartOrder = ref({});
+  // 订单费用汇总
+  const orderCostSummary = computed(() => {
+    allGoods.value = getAllGoodsList();
+    console.log("allGoods.value", allGoods.value);
+    console.log("orderExtraConfig.value", orderExtraConfig.value);
+    const costSummary = OrderPriceCalculator.calculateOrderCostSummary(
+      allGoods.value,
+      dinnerType.value,
+      backendCoupons.value,
+      activityList.value,
+      orderExtraConfig.value,
+      cartOrder.value,
+      new Date()
+    );
+    console.log(" 订单费用汇总", costSummary);
+    return costSummary;
+  });
 
-		const goodsIsloading = ref(true);
+  const goodsIsloading = ref(true);
 
-		//商品数据Map
-		const goodsMap = reactive({})
-		//获取商品数据
-		async function goodsInit() {
-			goodsIsloading.value = true;
-			//获取招牌菜商品
-			const hotres = await productminiApphotsquery();
-			for (let product of hotres) {
-				setGoodsMap(product.id, product)
-			}
-			//获取分组商品
-			const groupres = await APIgroupquery()
-			for (let group of groupres) {
-				for (let product of group.productList) {
-					setGoodsMap(product.id, product)
-				}
-			}
-			allGoods.value = getAllGoodsList()
-			console.log('allGoods.value ',allGoods.value );
-			goodsIsloading.value = false
-		}
+  //商品数据Map
+  const goodsMap = reactive({});
 
-		function setGoodsMap(product_id, data) {
-			goodsMap[product_id] = data;
-		}
+  function returnGoods(product_id) {
+    return goodsMap[product_id * 1];
+  }
 
-		//websocket回执
-		const websocketsendMessage = (data) => {
-			uni.$u.debounce(sendMessage(data), 500)
-		}
+  //获取商品数据
+  async function goodsInit() {
+    goodsIsloading.value = true;
+    //获取招牌菜商品
+    const hotres = await productminiApphotsquery();
+    for (let product of hotres) {
+      setGoodsMap(product.id, product);
+    }
+    //获取分组商品
+    const groupres = await APIgroupquery();
+    for (let group of groupres) {
+      for (let product of group.productList) {
+        setGoodsMap(product.id, product);
+      }
+    }
+    allGoods.value = getAllGoodsList();
+    goodsIsloading.value = false;
+  }
 
-		const isLoading = ref(true);
+  function setGoodsMap(product_id, data) {
+    goodsMap[product_id] = data;
+  }
 
-		function getProductDetails(v) {
-			const goods = goodsMap[v.product_id]
-			if (!goods) {
-				return undefined
-			}
-			let skuData = undefined;
-			skuData = goods?.skuList.find((sku) => sku.id == v.sku_id);
-		
-			if (skuData) {
-				return {
-					...v,
-					productId: v.product_id,
-					salePrice: skuData ? skuData.salePrice : 0,
-					price: skuData ? skuData.salePrice : 0,
-					memberPrice: skuData ? skuData.memberPrice : 0,
-					coverImg: goods.coverImg,
-					productImg: goods.coverImg,
-					name: goods.name,
-					productName: goods.name,
-					specInfo: skuData.specInfo,
-					packFee: goods.packFee || 0,
-					type: goods.type,
-					skuData,
-					skuName: skuData.name,
-					num: v.number * 1
-				}
-			} else {
-				return undefined
-			}
-		}
-		// 用于记录已经处理过的消息的 msg_id
-		const processedMessageIds = new Set();
+  const isLoading = ref(true);
 
-		//购物车商品信息补全初始化
-		function cartsGoodsInfoInit(arr) {
-			carts.value = arr.map(v => {
-				return getProductDetails(v)
-			}).filter(v => v)
-		}
+  function getProductDetails(v) {
+    const goods = goodsMap[v.product_id];
+    if (!goods) {
+      return undefined;
+    }
+    let skuData = undefined;
+    skuData = goods?.skuList.find((sku) => sku.id == v.sku_id);
 
+    if (skuData) {
+      return {
+        ...v,
+        productId: v.product_id,
+        salePrice: skuData ? skuData.salePrice : 0,
+        price: skuData ? skuData.salePrice : 0,
+        memberPrice: skuData ? skuData.memberPrice : 0,
+        coverImg: goods.coverImg,
+        productImg: goods.coverImg,
+        name: goods.name,
+        productName: goods.name,
+        specInfo: skuData.specInfo,
+        packFee: goods.packFee || 0,
+        type: goods.type,
+        skuData,
+        skuName: skuData.name,
+        num: v.number * 1,
+      };
+    } else {
+      return undefined;
+    }
+  }
+  // 用于记录已经处理过的消息的 msg_id
+  const processedMessageIds = new Set();
 
-		//收到socket消息时对购物车进行处理
-		async function onMessage(Message) {
-			if (Message) {
-				// 心跳返回  过滤
-				if (Message.type == "ping_interval" || Message.msg_id == "ping_interval") {
-					isLoading.value = false;
-					return false
-				}
-				// 检查消息是否已经处理过
-				if (processedMessageIds.has(Message.msg_id)) {
-					return;
-				}
-				processedMessageIds.add(Message.msg_id);
-				const msgData = Message.data
-				// 初始化
-				if (Message.operate_type == "init") {
-					console.log('carts init', msgData);
-					cartsGoodsInfoInit(msgData)
-					uni.hideLoading();
-					isLoading.value = false;
-				}
+  //购物车商品信息补全初始化
+  function cartsGoodsInfoInit(arr) {
+    console.log('cartsGoodsInfoInit',arr)
+    if(arr&&Array.isArray(arr)){
+      carts.value = arr
+      .map((v) => {
+        return getProductDetails(v);
+      })
+      .filter((v) => v);
+    }
+   
+  }
 
-				// 清空购物车
-				if (Message.operate_type == 'cleanup') {
-					carts.value = []
-				}
+  //收到socket消息时对购物车进行处理
+  async function onMessage(Message) {
+    if (Message) {
+      // 心跳返回  过滤
+      if (
+        Message.type == "ping_interval" ||
+        Message.msg_id == "ping_interval"
+      ) {
+        isLoading.value = false;
+        return false;
+      }
+      // 检查消息是否已经处理过
+      if (processedMessageIds.has(Message.msg_id)) {
+        return;
+      }
+      processedMessageIds.add(Message.msg_id);
+      const msgData = Message.data;
+      // 初始化
+      if (Message.operate_type == "init") {
+        console.log("carts init Message", Message);
+        console.log("carts init", msgData);
+        if(!oldOrder.value.id){
+          limitTimeDiscount.value = Message.time_dis_info;
+        }
+        cartsGoodsInfoInit(msgData);
+        uni.hideLoading();
+        isLoading.value = false;
+      }
 
-				// 删除除购物车
-				if (Message.operate_type == 'del' && Message.status == 1) {
-					// 优化：使用可选链操作符避免报错
-					carts.value = carts.value.filter(item => item.id !== msgData?.id);
-				}
+      // 清空购物车
+      if (Message.operate_type == "cleanup") {
+        carts.value = [];
+      }
 
-				// 添加或者减少购物后返回
-				if (Message.operate_type == 'add' || Message.operate_type == 'edit') {
-					const index = carts.value.findIndex((v => v.id == msgData.id))
-					if (index !== -1) {
-						carts.value[index] = getProductDetails(msgData);
-					} else {
-						carts.value.push(getProductDetails(msgData));
-					}
-				}
+      // 删除除购物车
+      if (Message.operate_type == "del" && Message.status == 1) {
+        // 优化：使用可选链操作符避免报错
+        carts.value = carts.value.filter((item) => item.id !== msgData?.id);
+      }
 
-				// 历史订单
-				if (Message.operate_type == 'clearOrder') {}
+      // 添加或者减少购物后返回
+      if (Message.operate_type == "add" || Message.operate_type == "edit") {
+        const index = carts.value.findIndex((v) => v.id == msgData.id);
+        if (index !== -1) {
+          carts.value[index] = getProductDetails(msgData);
+        } else {
+          carts.value.push(getProductDetails(msgData));
+        }
+      }
 
-				// 购物车数据更新从新请求
-				if (Message.type == 'product' && Message.data_type == 'product_update' && Message
-					.operate_type == 'product_update') {
-					await goodsInit()
-					await cartsGoodsInfoInit()
-				}
+      // 历史订单
+      if (Message.operate_type == "clearOrder") {
+      }
 
-				// 提示
-				if (Message.status == 0 && Message.type != 'no_suit_num') {
-					uni.showToast({
-						title: Message.msg,
-						icon: "none"
-					})
-				}
+      // 购物车数据更新从新请求
+      if (
+        Message.type == "product" &&
+        Message.data_type == "product_update" &&
+        Message.operate_type == "product_update"
+      ) {
+        await goodsInit();
+        await cartsGoodsInfoInit();
+      }
 
-				if (Message.type == 'no_suit_num') {
-					uni.showModal({
-						title: '提示',
-						showCancel: false,
-						content: '此商品库存不足起售数量！',
-						success: async (data) => {
+      // 提示
+      if (Message.status == 0 && Message.type != "no_suit_num") {
+        uni.showToast({
+          title: Message.msg,
+          icon: "none",
+        });
+      }
+      //获取限时折扣
+      if(Message.operate_type == "time_discount_get"){
+        console.log("time_discount_get", Message.data);
+        limitTimeDiscount.value = Message.data;
+      }
+      if(Message.operate_type == "time_discount_save"){
+        console.log("time_discount_save", Message.data);
+        limitTimeDiscount.value = Message.data;
+      }
 
-						}
-					});
-				}
-			}
-		}
+      if (Message.type == "no_suit_num") {
+        uni.showModal({
+          title: "提示",
+          showCancel: false,
+          content: "此商品库存不足起售数量！",
+          success: async (data) => {},
+        });
+      }
+    }
+  }
 
+  //购物车数据
+  const carts = ref([]);
 
-		//购物车数据
-		const carts = ref([])
+  //历史订单数据
+  const oldOrder = ref({
+    detailMap: {},
+    originAmount: 0,
+  });
 
-		//历史订单数据
-		const oldOrder = ref({
-			detailMap: {},
-			originAmount: 0
-		})
+  function setOldOrder(data) {
+    console.log("setOldOrder", data);
+    oldOrder.value = data;
+    allGoods.value = getAllGoodsList();
+  }
 
-		function setOldOrder(data) {
-			oldOrder.value = data
-			allGoods.value=getAllGoodsList()
-		}
+  // 会员信息
+  const orderVIP = ref(
+    uni.cache.get("orderVIP") || {
+      isVip: false,
+    }
+  );
 
+  function updateData(key, newval) {
+    if (key === "orderVIP") {
+      uni.cache.set("orderVIP", newval);
+      return (orderVIP.value = newval);
+    }
+    if (key === "shopInfo") {
+      uni.cache.set("shopInfo", newval);
+      return (shopInfo.value = newval);
+    }
+  }
 
-		// 会员信息
-		const orderVIP = ref(uni.cache.get('orderVIP') || {
-			isVip: false
-		})
+  //是否使用会员价
+  const useVipPrice = computed(() => {
+    if (!shopUserInfo.value) {
+      return false;
+    }
+    const isUse =
+      shopUserInfo.value.isVip && shopUserInfo.value.isMemberPrice && shopInfo.value.isMemberPrice==1
+        ? true
+        : false;
+    return isUse;
+  });
 
-		function updateData(key, newval) {
-			if (key === 'orderVIP') {
-				uni.cache.set('orderVIP', newval)
-				return orderVIP.value = newval
-			}
-			if (key === 'shopInfo') {
-				uni.cache.set('shopInfo', newval)
-				return shopInfo.value = newval
-			}
-		}
+  function currentCalcMpneyNumber(item) {
+    const n = item.number - (item.returnNum || 0);
+    return n <= 0 ? 0 : n;
+  }
+ 
 
+  //当前购物车总价格
+  const totalPrice = computed(() => {
+    const money = carts.value.reduce((prve, cur) => {
+      const memberPrice = cur.memberPrice || cur.salePrice;
+      const price = useVipPrice.value ? memberPrice : cur.salePrice;
+      const curMoney = price * currentCalcMpneyNumber(cur);
+      return prve + curMoney;
+    }, 0);
+    return money;
+  });
+  // 霸王餐购物车原价，不享受任何优惠
+  const totalOriginPrice = computed(() => {
+    const money = carts.value.reduce((prve, cur) => {
+      const curMoney = cur.salePrice * currentCalcMpneyNumber(cur);
+      return prve + curMoney;
+    }, 0);
+    return money;
+  });
 
+  //返回打包数量（称重商品打包数量最大为1）
+  function returnCartPackNumber(cur) {
+    const maxReturnNum = cur.number - (cur.returnNum || 0);
+    let pack_number = cur.number;
+    pack_number =
+      cur.product_type == "weight" && pack_number > 1 ? 1 : pack_number;
+    pack_number = Math.min(maxReturnNum, pack_number);
+    pack_number = pack_number <= 0 ? 0 : pack_number;
+    return pack_number * 1;
+  }
 
-		//是否使用会员价
-		const useVipPrice = computed(() => {
-			const isUse = (orderVIP.value.isVip && shopInfo.value.isMemberPrice) ? true : false
-			return isUse
-		})
+  //当前购物车打包费
+  const totalPackFee = computed(() => {
+    const money = carts.value.reduce((prve, cur) => {
+      const curMoney = (cur.packFee || 0) * currentCalcMpneyNumber(cur);
+      return prve + curMoney;
+    }, 0);
+    return money;
+  });
 
-		function currentCalcMpneyNumber(item) {
-			const n = item.number - (item.returnNum || 0)
-			return n <= 0 ? 0 : n
-		}
-		//历史订单商品价格总和
-		const oldOrderMoney = computed(() => {
-			let total = 0
-			for (let i in oldOrder.value.detailMap) {
-				total += oldOrder.value.detailMap[i].reduce((prve, cur) => {
-					if (cur.isGift) {
-						return prve + 0
-					}
-					const discount_sale_amount = cur.discount_sale_amount * 1 || 0
-					const memberPrice = cur.skuData ? (cur.skuData.memberPrice || cur.skuData
-						.salePrice) : 0
-					const price = (discount_sale_amount || cur.salePrice || 0)
-					const number = currentCalcMpneyNumber(cur)
-					return prve + (number <= 0 ? 0 : number) * (discount_sale_amount || (useVipPrice
-						.value ? memberPrice : price))
-				}, 0)
-			}
-			return total
-		})
+  //打包费
+  const packFee = computed(() => {
+    const nowPackFee = carts.value.reduce((acc, cur) => {
+      return acc + (cur.packFee || 0) * returnCartPackNumber(cur);
+    }, 0);
+    let oldPackfee = 0;
+    for (let i in oldOrder.value.detailMap) {
+      oldPackfee += oldOrder.value.detailMap[i].reduce((prve, cur) => {
+        return prve + (cur.packFee || 0) * returnCartPackNumber(cur);
+      }, 0);
+    }
+    return nowPackFee + oldPackfee;
+  });
 
-		//当前购物车总价格
-		const totalPrice = computed(() => {
-			const money = carts.value.reduce((prve, cur) => {
-				const memberPrice = cur.memberPrice || cur.salePrice
-				const price = useVipPrice.value ? memberPrice : cur.salePrice;
-				const curMoney = price * currentCalcMpneyNumber(cur)
-				return prve + curMoney
-			}, 0)
-			return money
-		})
-		// 霸王餐购物车原价，不享受任何优惠
-		const totalOriginPrice = computed(() => {
-			const money = carts.value.reduce((prve, cur) => {
-				const curMoney = cur.salePrice * currentCalcMpneyNumber(cur)
-				return prve + curMoney
-			}, 0)
-			return money
-		})
+  //购物车是否为空
+  const isEmpty = computed(() => {
+    return !carts.value || carts.value.length <= 0;
+  });
+  // 计算向上取整
+  const roundUpToTwoDecimals = (num, i) => {
+    // 先将数字乘以 100 并转换为字符串保留足够的小数位
+    let temp = (num * 100).toFixed(10);
+    // 向上取整
+    let rounded = null;
+    if (i == "upward") {
+      rounded = Math.ceil(parseFloat(temp));
+    } else {
+      rounded = Math.floor(parseFloat(temp));
+    }
+    // 再除以 100 得到保留两位小数的结果
+    return rounded / 100;
+  };
 
-		//返回打包数量（称重商品打包数量最大为1）
-		function returnCartPackNumber(cur) {
-			const maxReturnNum = cur.number - (cur.returnNum || 0);
-			let pack_number = cur.number;
-			pack_number = (cur.product_type == 'weight' && pack_number > 1) ? 1 : pack_number;
-			pack_number = Math.min(maxReturnNum, pack_number);
-			pack_number = pack_number <= 0 ? 0 : pack_number
-			return pack_number * 1
-		}
+  // 精确计算函数
+  const preciseCalculation = (num1, num2) => {
+    // 将数字转换为整数，乘以 100 以保留两位小数
+    const int1 = BigInt(Math.round(num1 * 100));
+    const int2 = BigInt(Math.round(num2 * 100));
+    // 执行乘法运算
+    const result = int1 * int2;
+    // 再除以 10000 以还原为原来的小数
+    return Number(result) / 10000;
+  };
 
+  // 计算购物车商品总价格
+  const getTotalTotalPrices = (matchedProducts, isBwc = true) => {
+    if (!matchedProducts || !Array.isArray(matchedProducts)) {
+      return 0;
+    }
+    // 购物车总数价格
+    let cart = matchedProducts.reduce((total, item) => {
+      if (isBwc === true) {
+        return (
+          total + parseFloat(item.price) * parseFloat(item.num - item.returnNum)
+        );
+      }
+      // 是否启用会员价 0否1是
+      if (useVipPrice.value) {
+        // memberPrice会员价
+        return (
+          total +
+          parseFloat(item.memberPrice || item.price) *
+            parseFloat(item.num - item.returnNum)
+        );
+      } else {
+        // salePrice销售价
+        return (
+          total + parseFloat(item.price) * parseFloat(item.num - item.returnNum)
+        );
+      }
+    }, 0);
 
-		//当前购物车打包费
-		const totalPackFee = computed(() => {
-			const money = carts.value.reduce((prve, cur) => {
-				const curMoney = (cur.packFee || 0) * currentCalcMpneyNumber(cur)
-				return prve + curMoney
-			}, 0)
-			return money
-		})
+    cart = cart.toFixed(2);
+    return parseFloat(cart);
+  };
 
-		//打包费
-		const packFee = computed(() => {
-			const nowPackFee = carts.value.reduce((acc, cur) => {
-				return acc + (cur.packFee || 0) * returnCartPackNumber(cur)
-			}, 0)
-			let oldPackfee = 0;
-			for (let i in oldOrder.value.detailMap) {
-				oldPackfee += oldOrder.value.detailMap[i].reduce((prve, cur) => {
-					return prve + (cur.packFee || 0) * returnCartPackNumber(cur)
-				}, 0)
-			}
-			return nowPackFee + oldPackfee
-		})
+  // 计算商品卷所选择的总价格
+  const getTotalProductroll = (matchedProducts) =>
+    computed(() => {
+      if (!matchedProducts || !Array.isArray(matchedProducts)) {
+        return 0;
+      }
+      // 购物车总数价格
+      let cart = matchedProducts.reduce((total, item) => {
+        // 是否启用会员价 0否1是
+        if (useVipPrice.value) {
+          // memberPrice会员价
+          return total + parseFloat(item.memberPrice || item.price);
+        } else {
+          // salePrice销售价
+          return total + parseFloat(item.price);
+        }
+      }, 0);
+      // 向上取整并保留两位小数
+      let result = roundUpToTwoDecimals(cart, "upward");
+      return result;
+    });
 
-		//购物车是否为空
-		const isEmpty = computed(() => {
-			return !carts.value || carts.value.length <= 0
-		})
-		// 计算向上取整
-		const roundUpToTwoDecimals = (num, i) => {
-			// 先将数字乘以 100 并转换为字符串保留足够的小数位
-			let temp = (num * 100).toFixed(10);
-			// 向上取整
-			let rounded = null
-			if (i == 'upward') {
-				rounded = Math.ceil(parseFloat(temp));
-			} else {
-				rounded = Math.floor(parseFloat(temp));
-			}
-			// 再除以 100 得到保留两位小数的结果
-			return rounded / 100;
-		};
+  // 桌位置
+  const getTotalSeatcharge = (seatNum) =>
+    computed(() => {
+      // 是否免除桌位费 0 否 1 是
+      let cart = 0;
 
-		// 精确计算函数
-		const preciseCalculation = (num1, num2) => {
-			// 将数字转换为整数，乘以 100 以保留两位小数
-			const int1 = BigInt(Math.round(num1 * 100));
-			const int2 = BigInt(Math.round(num2 * 100));
-			// 执行乘法运算
-			const result = int1 * int2;
-			// 再除以 10000 以还原为原来的小数
-			return Number(result) / 10000;
-		};
+      if (uni.cache.get("ordershopUserInfo").isTableFee == 0 && seatNum) {
+        cart =
+          parseFloat(seatNum) *
+          parseFloat(uni.cache.get("ordershopUserInfo").tableFee);
+      }
+      // 向下取整并保留两位小数
+      let result = roundUpToTwoDecimals(cart, "downward");
+      return result;
+    });
 
-		// 计算购物车商品总价格
-		const getTotalTotalPrices = (matchedProducts, isBwc = true) => {
-			if (!matchedProducts || !Array.isArray(matchedProducts)) {
-				return 0;
-			}
-			// 购物车总数价格
-			console.log('isBwc');
-			console.log(isBwc);
-			let cart = matchedProducts.reduce((total, item) => {
-				if (isBwc === true) {
-					return total + (parseFloat(item.price) * parseFloat(item.num - item.returnNum));
-				}
-				// 是否启用会员价 0否1是
-				if (useVipPrice.value) {
-					// memberPrice会员价
-					return total + (parseFloat(item.memberPrice || item.price) * parseFloat(item
-						.num - item
-						.returnNum));
-				} else {
-					// salePrice销售价
-					return total + (parseFloat(item.price) * parseFloat(item.num - item.returnNum));
-				}
-			}, 0);
+  // 计算购物车总打包费用（向下取整并保留两位小数）
+  const getTotalPackFee = (cartList) =>
+    computed(() => {
+      const total = cartList.reduce((sum, item) => {
+        return (
+          sum +
+          parseFloat(item.packAmount) *
+            (parseFloat(item.packNumber) ||
+              parseFloat(item.num) - parseFloat(item.returnNum))
+        );
+      }, 0);
+      // 向下取整并保留两位小数
+      let result = roundUpToTwoDecimals(total, "downward");
+      return result;
+    });
 
-			cart = cart.toFixed(2)
-			console.log(parseFloat(cart))
-			return parseFloat(cart);
-		};
+  function clearOrderConfig() {
+    console.log("clearOrderConfig");
+    backendCoupons.value = [];
+    allGoods.value = [];
+    carts.value = [];
+    seatFeeConfig.value.personCount = uni.cache.get("dinersNum") || 0;
+    dinnerType.value = "dine-in";
+    userPoints.value = 0;
+    fullReductionActivities.value = [];
+    isFreeDine.value = false;
+    oldOrder.value = {
+      detailMap: {},
+      originAmount: 0,
+    };
+  }
 
-		// 计算商品卷所选择的总价格
-		const getTotalProductroll = (matchedProducts) => computed(() => {
-			if (!matchedProducts || !Array.isArray(matchedProducts)) {
-				return 0;
-			}
-			// 购物车总数价格
-			let cart = matchedProducts.reduce((total, item) => {
-				// 是否启用会员价 0否1是
-				if (useVipPrice.value) {
-					// memberPrice会员价
-					return total + parseFloat(item.memberPrice || item.price)
-				} else {
-					// salePrice销售价
-					return total + parseFloat(item.price)
-				}
-			}, 0);
-			// 向上取整并保留两位小数
-			let result = roundUpToTwoDecimals(cart, 'upward')
-			return result;
-		});
-
-		// 桌位置
-		const getTotalSeatcharge = (seatNum) => computed(() => {
-			// 是否免除桌位费 0 否 1 是
-			let cart = 0
-
-			if (uni.cache.get('ordershopUserInfo').isTableFee == 0 && seatNum) {
-				cart = parseFloat(seatNum) * parseFloat(uni.cache.get('ordershopUserInfo').tableFee)
-			}
-			// 向下取整并保留两位小数
-			let result = roundUpToTwoDecimals(cart, 'downward')
-			return result;
-		});
-
-		// 计算购物车总打包费用（向下取整并保留两位小数）
-		const getTotalPackFee = (cartList) => computed(() => {
-			const total = cartList.reduce((sum, item) => {
-				return sum + (parseFloat(item.packAmount) * (parseFloat(item.packNumber) || (
-					parseFloat(item.num) - parseFloat(item.returnNum))));
-			}, 0);
-			// 向下取整并保留两位小数
-			let result = roundUpToTwoDecimals(total, 'downward')
-			return result;
-		});
-
-		
-		function clearOrderConfig(){
-			console.log('clearOrderConfig');
-			backendCoupons.value=[];
-			allGoods.value=[];
-			carts.value=[]
-			seatFeeConfig.value.personCount=uni.cache.get('dinersNum') || 0;
-			dinnerType.value='dine-in';
-			userPoints.value=0
-		}
-		
-
-		return {
-			getTotalPackFee,
-			getTotalSeatcharge,
-			getTotalTotalPrices,
-			getTotalProductroll,
-			carts,
-			isEmpty,
-			setGoodsMap,
-			goodsMap,
-			goodsIsloading,
-			goodsInit,
-			onMessage,
-			totalPrice,
-			totalPackFee,
-			updateData,
-			useVipPrice,
-			totalOriginPrice,
-			orderCostSummary,
-			setCoupons,
-			userPoints,
-			setUserPoints,
-			setPointDeductionRule,
-			setOldOrder,
-			//优惠券列表
-			backendCoupons,
-			allGoods,
-			//就餐类型
-			dinnerType,
-			setDinnerType,
-			setSeatFeeConfig,
-			seatFeeConfig,
-			shopInfo,
-			//新客立减数据
-			consumeDiscount,
-			//新客立减金额
-			newUserDiscount,
-			getAllGoodsList,
-			//清空配置
-			clearOrderConfig
-			
-		};
-	}
-);
\ No newline at end of file
+  return {
+    getTotalPackFee,
+    getTotalSeatcharge,
+    getTotalTotalPrices,
+    getTotalProductroll,
+    carts,
+    isEmpty,
+    setGoodsMap,
+    goodsMap: goodsMap,
+    goodsIsloading,
+    goodsInit,
+    onMessage,
+    totalPrice,
+    totalPackFee,
+    updateData,
+    useVipPrice,
+    totalOriginPrice,
+    orderCostSummary,
+    setCoupons,
+    userPoints,
+    setUserPoints,
+    setPointDeductionRule,
+    setOldOrder,
+    //返回商品信息
+    returnGoods,
+    //优惠券列表
+    backendCoupons,
+    allGoods,
+    //就餐类型
+    dinnerType,
+    setDinnerType,
+    setSeatFeeConfig,
+    seatFeeConfig,
+    shopInfo,
+    //新客立减数据
+    consumeDiscount,
+    //新客立减金额
+    newUserDiscount,
+    getAllGoodsList,
+    //清空配置
+    clearOrderConfig,
+    //满减活动
+    fullReductionActivities,
+    isFreeDine, //是否使用霸王餐
+    // 商家霸王餐配置
+    freeDineConfig,
+    //限时折扣
+    limitTimeDiscount,
+    shopUserInfo,
+  };
+});
diff --git a/stores/pay.js b/stores/pay.js
index c346615..9314e96 100644
--- a/stores/pay.js
+++ b/stores/pay.js
@@ -23,10 +23,7 @@ export const Memberpay = defineStore('memberpay', {
 			return new Promise(async (resolve, reject) => {
 				try {
 					let res = await APIpayltPayVip({
-						shopId: data.shopId,
-						shopUserId: data.shopUserId,
-						amount: data.amount,
-						activateId: data.activateId,
+						...data,
 						// #ifdef MP-WEIXIN
 						payType: 'wechatPay',
 						openId: uni.cache.get('userInfo').wechatOpenId,
@@ -35,11 +32,6 @@ export const Memberpay = defineStore('memberpay', {
 						payType: 'aliPay',
 						openId: uni.cache.get('userInfo').wechatOpenId,
 						// #endif
-						returnUrl: data.returnUrl ? data.returnUrl : '',
-						buyerRemark: data.buyerRemark ? data.buyerRemark : '',
-						orderId: data.orderId,
-						userAllPack: data.userAllPack,
-						seatNum:data.seatNum
 					})
 					if (res) {
 						uni.showLoading({
@@ -67,20 +59,20 @@ export const Memberpay = defineStore('memberpay', {
 									title: "支付成功"
 								})
 								console.log('支付成功')
-								setTimeout(() => {
-									uni.navigateBack()
-								}, 1000)
-								resolve(res)
+								// setTimeout(() => {
+								// 	uni.navigateBack()
+								// }, 1000)
+								resolve(true)
 								// #endif
 								// #ifdef MP-ALIPAY
 								if (res.resultCode == '9000') {
 									uni.showToast({
 										title: "支付成功"
 									})
-									setTimeout(() => {
-										uni.navigateBack()
-									}, 1000)
-									resolve(res)
+									// setTimeout(() => {
+									// 	uni.navigateBack()
+									// }, 1000)
+									resolve(true)
 								} else {
 									uni.showToast({
 										title: "支付失败"
@@ -133,6 +125,10 @@ export const Memberpay = defineStore('memberpay', {
 						userId: uni.cache.get('userInfo').id || ''
 					})
 					console.log('actionsltPayOrder:res',res);
+					if(typeof res ==='string'){
+						resolve(res)
+						return 
+					}
 					if(!res){
 						console.log('支付失败');
 						reject(false)
@@ -163,14 +159,14 @@ export const Memberpay = defineStore('memberpay', {
 									title: "支付成功"
 								})
 								console.log('支付成功')
-								resolve(res)
+								resolve(true)
 								// #endif
 								// #ifdef MP-ALIPAY
 								if (res.resultCode == '9000') {
 									uni.showToast({
 										title: "支付成功"
 									})
-									resolve(res)
+									resolve(true)
 								} else {
 									uni.showToast({
 										title: "支付失败"
@@ -232,8 +228,10 @@ export const Memberpay = defineStore('memberpay', {
 
 		// 生成订单
 		actionscreateOrder(data) {
+			console.log('actionscreateOrder:生成订单',data);	
 			return new Promise(async (resolve, reject) => {
 				let res = await APIcreateOrder({
+					...data,
 					orderId: data.orderId, //多次下单时使用
 					shopId: uni.cache.get('shopId'), //店铺Id
 					userId: uni.cache.get('userInfo').id || '', //
@@ -246,7 +244,6 @@ export const Memberpay = defineStore('memberpay', {
 					placeNum: data.placeNum, //当前订单下单次数
 					waitCall: data.waitCall //是否等叫 0 否 1 等叫
 				})
-				console.log('actionscreateOrder res:');
 				console.log(res);
 				if (res) {
 					resolve(res)
diff --git a/stores/user.js b/stores/user.js
index d099c48..82e7c31 100644
--- a/stores/user.js
+++ b/stores/user.js
@@ -1,270 +1,432 @@
+import { defineStore } from "pinia";
+import { ref } from "vue";
+import { APIuserlogin, APIuser } from "@/common/api/api.js";
 import {
-	defineStore
-} from 'pinia';
-import {
-	ref
-} from 'vue';
-import {
-	APIuserlogin,
-	APIuser
-} from '@/common/api/api.js'
-import {
-	APIproductqueryShop,
-	APIusershopInfodetail,
-	APIshopUserInfo
-} from '@/common/api/member.js'
-export const Storelogin = defineStore('login', {
-	state: () => ({
-		token: '',
-		miniAppOpenId: '',
-		userInfo: '',
-		shopInfo: {}
-	}),
-	actions: {
-		async getShopInfo(shopId) {
-			const shopRes = await APIusershopInfodetail({
-				shopId
-			})
-			console.log(shopRes);
-		},
-		actionslogin() {
-			return new Promise(async (resolve, reject) => {
-				// #ifdef MP-WEIXIN
-				uni.login({
-					provider: 'weixin',
-					success: (data) => {
-						// 微信小程序环境
-						uni.getUserInfo({
-							provider: 'weixin',
-							success: async (infoRes) => {
-								let res = await APIuserlogin({
-									code: data.code, //临时登录凭证
-									rawData: infoRes.rawData,
-									source: 'wechat'
-								})
-								if (res) {
-									this.token = res.token
-									this.miniAppOpenId = res.userInfo
-										.miniAppOpenId
-									this.userInfo = res.userInfo
-									uni.cache.set('token', res.token);
-									uni.cache.set('userInfo', res.userInfo);
-								}
-								resolve(true);
-							},
-							fail: (err) => {
-								reject(false);
-							}
-						});
-					}
-				});
-				// #endif
-				// #ifdef MP-ALIPAY	
-				my.getAuthCode({
-					scopes: 'auth_base',
-					success: async (data) => {
-						// 支付宝小程序环境
-						// my.getAuthUserInfo({
-						// success: async (infoRes) => {
-						let res = await APIuserlogin({
-							code: data.authCode, //临时登录凭证
-							// rawData: JSON.stringify(infoRes),
-							source: 'alipay'
-						})
-						if (res) {
-							this.token = res.token
-							this.miniAppOpenId = res.userInfo.miniAppOpenId
-							this.userInfo = res.userInfo
-							uni.cache.set('token', res.token);
-							uni.cache.set('openId', res.userInfo
-								.alipayOpenId)
-							uni.cache.set('userInfo', res.userInfo);
-							resolve(true);
-						}
-					},
-					fail: () => {
-						reject(false);
-					}
-				})
-				// #endif
-			})
-		}
-	}
+  APIproductqueryShop,
+  APIusershopInfodetail,
+  APIshopUserInfo,
+} from "@/common/api/member.js";
+import { getDistance } from "@/utils/address.js";
+import { APIgeocodelocation } from "@/common/api/api.js";
+
+export const Storelogin = defineStore("login", {
+  state: () => ({
+    token: "",
+    miniAppOpenId: "",
+    userInfo: "",
+    shopInfo: {},
+  }),
+  actions: {
+    async getShopInfo(shopId) {
+      const shopRes = await APIusershopInfodetail({
+        shopId,
+      });
+      console.log(shopRes);
+    },
+    actionslogin() {
+      return new Promise(async (resolve, reject) => {
+        // #ifdef MP-WEIXIN
+        uni.login({
+          provider: "weixin",
+          success: (data) => {
+            // 微信小程序环境
+            uni.getUserInfo({
+              provider: "weixin",
+              success: async (infoRes) => {
+                let res = await APIuserlogin({
+                  code: data.code, //临时登录凭证
+                  rawData: infoRes.rawData,
+                  source: "wechat",
+                });
+                if (res) {
+                  this.token = res.token;
+                  this.miniAppOpenId = res.userInfo.miniAppOpenId;
+                  this.userInfo = res.userInfo;
+                  uni.cache.set("token", res.token);
+                  uni.cache.set("userInfo", res.userInfo);
+                  uni.cache.set("followIndex", res.followIndex || "");
+                }
+                resolve(true);
+              },
+              fail: (err) => {
+                reject(false);
+              },
+            });
+          },
+        });
+        // #endif
+        // #ifdef MP-ALIPAY
+        my.getAuthCode({
+          scopes: "auth_base",
+          success: async (data) => {
+            // 支付宝小程序环境
+            // my.getAuthUserInfo({
+            // success: async (infoRes) => {
+            let res = await APIuserlogin({
+              code: data.authCode, //临时登录凭证
+              // rawData: JSON.stringify(infoRes),
+              source: "alipay",
+            });
+            if (res) {
+              this.token = res.token;
+              this.miniAppOpenId = res.userInfo.miniAppOpenId;
+              this.userInfo = res.userInfo;
+              uni.cache.set("token", res.token);
+              uni.cache.set("openId", res.userInfo.alipayOpenId);
+              uni.cache.set("userInfo", res.userInfo);
+              resolve(true);
+            }
+          },
+          fail: () => {
+            reject(false);
+          },
+        });
+        // #endif
+      });
+    },
+  },
 });
 
-export const productStore = defineStore('product', {
-	actions: {
-		getQueryString(url, name) { //解码
-			var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i')
-			var r = url.substr(1).match(reg)
-			if (r != null) {
-				return r[2]
-			}
-			return null;
-		},
-		// 扫码请求
-		scanCodeactions(q) {
-			return new Promise(async (resolve, reject) => {
-				if (q) {
-					console.log(q)
-					let tableCode = ""
-					// #ifdef MP-WEIXIN
-					tableCode = this.getQueryString(decodeURIComponent(q), 'code')
-					// #endif
-					// #ifdef MP-ALIPAY
-					tableCode = q
-					// #endif
-					// #ifdef H5
-					tableCode = q.tableCode
-					// #endif
-					console.log(tableCode);
-					// 储存卓玛
-					uni.cache.set('tableCode', tableCode)
-					if (tableCode) {
-						console.log(uni.cache.get('tableCode'));
-						let data = await this.actionsproductqueryShop(tableCode)
-						
-						console.log('data', data)
-						// -4请求登录
-						if (data.code == '500') {
-							if (await this.actionslogin()) {
-								// 成功 接着在调用
-								await this.actionsproductqueryShop()
-							}
-						}
-						// 是否免除桌位费 0否1是
-						if (uni.cache.get('shopInfo').isTableFee == 0) {
-							uni.reLaunch({
-								url: '/pages/product/choosetable'
-							});
-						} else {
-							uni.reLaunch({
-								url: '/pages/product/index'
-							});
-						}
+export const productStore = defineStore("product", {
+  state: () => ({
+    location: {
+      latitude: "",
+      longitude: "",
+    },
+    shopInfo: {
+      shopId: "",
+      isOrderFence: 0,
+    },
+  }),
+  actions: {
+    getLocation() {
+      return new Promise((resolve, reject) => {
+        console.log("获取经纬度");
+        uni.getLocation({
+          type: "wgs84",
+          altitude: true,
+          isHighAccuracy: true,
+          success: (res) => {
+            console.log("获取经纬度成功", res);
 
-					}
-				} else {
-					// #ifdef APP || MP-WEIXIN || MP-ALIPAY
-					uni.scanCode({
-						success: async (res) => {
-							let tableCode = this.getQueryString(
-								decodeURIComponent(res.result), 'code')
-							// 储存卓玛
-							uni.cache.set('tableCode', tableCode)
-							if (tableCode) {
-								let data = await this.actionsproductqueryShop()
-								if (!data) {
-									uni.showToast({
-										title: '店铺已过期或其他问题，请联系商家',
-										icon:'none'
-									})
-									return
-								}
-								// -4请求登录
-								const store = Storelogin()
-								if (data.code == '-4') {
-									if (await store.actionslogin()) {
-										// 成功 接着在调用
-										await this.actionsproductqueryShop()
-									}
-								}
-								// 是否免除桌位费 0否1是
-								if (uni.cache.get('shopInfo').isTableFee == 0) {
-									uni.navigateTo({
-										url: '/pages/product/choosetable'
-									});
-								} else {
-									uni.reLaunch({
-										url: '/pages/product/index'
-									});
-								}
+            this.location = res;
+            this.APIgeocodelocation();
+            resolve(res);
+          },
+          fail: (err) => {
+            console.error("获取经纬度失败", err);
+            reject(err);
+          },
+        });
+      });
+    },
+    async APIgeocodelocation() {
+      let successres = await APIgeocodelocation({
+        lng: this.location.longitude,
+        lat: this.location.latitude,
+      });
+      if (successres) {
+        let datastorage = {
+          country: successres.addressComponent.country, // "中国"
+          province: successres.addressComponent.province, //province: "陕西省"
+          address: successres.addressComponent.city, //district: "西安市"
+          district: successres.addressComponent.district, //district: "未央区"
+          lng: this.location.longitude,
+          lat: this.location.latitude,
+        };
+        uni.cache.set("getLocationstorage", datastorage);
+      }
+    },
+    getQueryString(url, name) {
+      //解码
+      var reg = new RegExp("(^|&|/?)" + name + "=([^&|/?]*)(&|/?|$)", "i");
+      var r = url.substr(1).match(reg);
+      if (r != null) {
+        return r[2];
+      }
+      return null;
+    },
 
-							}
-						},
-						fail: (res) => {
-							console.log(res)
-						}
-					});
-					// #endif
-				}
+    /**
+     * 扫码请求
+     * @param {*} q
+     * @returns
+     */
+    async scanCodeactions(q) {
+      console.log("扫码内容", q);
+      return new Promise(async (resolve, reject) => {
+        if (q) {
+          console.log(q);
+          let tableCode = "";
+          // #ifdef MP-WEIXIN
+          tableCode = this.getQueryString(decodeURIComponent(q), "code");
+          // #endif
+          // #ifdef MP-ALIPAY
+          tableCode = q;
+          // #endif
+          // #ifdef H5
+          tableCode = q.tableCode;
+          // #endif
+          console.log(tableCode);
+          // 储存卓玛
+          uni.cache.set("tableCode", tableCode);
+          if (tableCode) {
+            console.log("台桌码", uni.cache.get("tableCode"));
+            let data = await this.actionsproductqueryShop(tableCode);
 
-			})
-		},
+            console.log("data", data);
+            // -4请求登录
+            if (data.code == "500") {
+              if (await this.actionslogin()) {
+                // 成功 接着在调用
+                await this.actionsproductqueryShop();
+              }
+            }
 
-		// /通过桌码获取当前店铺信息
-		actionsproductqueryShop(tableCode) {
-			return new Promise(async (resolve, reject) => {
-				// try {
-				try {
-					let res = await APIproductqueryShop({
-						tableCode: tableCode ? tableCode : uni.cache.get('tableCode'),
-					})
-					if (res) {
-						res.shopInfo.isVip = res.vip ? '1' : '0'
-						res.shopTable.shopExtendMap = res.shopExtendMap
-						// 店铺信息
-						uni.cache.set('shopTable', res.shopTable)
-						// 台桌信息
-						uni.cache.set('shopInfo', res.shopInfo)
-						uni.cache.set('shopId', res.shopTable.shopId, 30)
-						// 当前用户距离店铺的米数
-						uni.cache.set('distance', res.distance)
+            if (this.shopInfo.isOrderFence == 0) {
+              this.jumpToOrderPage();
+              return;
+            }
+            const canGetLocation = await this.openLocationAuth();
+            if (canGetLocation) {
+              const canOrder = await this.computedDistance();
+            }
+          }
+        } else {
+          // #ifdef APP || MP-WEIXIN || MP-ALIPAY
+          uni.scanCode({
+            success: async (res) => {
+              let tableCode = this.getQueryString(
+                decodeURIComponent(res.result),
+                "code"
+              );
+              // 储存卓玛
+              uni.cache.set("tableCode", tableCode);
+              if (tableCode) {
+                let data = await this.actionsproductqueryShop();
+                if (!data) {
+                  uni.showToast({
+                    title: "店铺已过期或其他问题，请联系商家",
+                    icon: "none",
+                  });
+                  return;
+                }
+                // -4请求登录
+                const store = Storelogin();
+                if (data.code == "-4") {
+                  if (await store.actionslogin()) {
+                    // 成功 接着在调用
+                    await this.actionsproductqueryShop();
+                  }
+                }
+                if (this.shopInfo.isOrderFence == 0) {
+                  this.jumpToOrderPage();
+                  return;
+                }
+                const canGetLocation = await this.openLocationAuth();
+                if (canGetLocation) {
+                  const canOrder = await this.computedDistance();
+                }
+              }
+            },
+            fail: (res) => {
+              console.log(res);
+            },
+          });
+          // #endif
+        }
+      });
+    },
+    async openLocationAuth() {
+      try {
+        // 1. 检查当前位置授权状态
+        return new Promise((resolve, reject) => {
+          uni.getSetting({
+            success: (settingRes) => {
+              if (settingRes.authSetting["scope.userLocation"]) {
+                // 2. 已授权：直接获取位置
+                resolve(true);
+              } else if (
+                settingRes.authSetting["scope.userLocation"] === undefined
+              ) {
+                // 3. 未请求过授权：发起授权请求
+                uni
+                  .authorize({ scope: "scope.userLocation" })
+                  .then((authRes) => {
+                    if (authRes.errMsg === "authorize:ok") {
+                      // 授权成功后获取位置
+                      resolve(true);
+                    } else {
+                      reject(false);
+                    }
+                  });
+              } else {
+                // 4. 已拒绝授权：提示用户去设置页开启
+                uni.showModal({
+                  title: "开启定位",
+                  content: "请允许“零点八零”使用您的位置，方便您进入店铺点餐",
+                  confirmText: "开启定位",
+                  cancelText: "取消",
+                  success: (modalRes) => {
+                    if (modalRes.confirm) {
+                      // 跳转微信小程序授权设置页
+                      uni.openSetting({
+                        success: async (openRes) => {
+                          // 用户在设置页开启授权后，再次获取位置
+                          if (openRes.authSetting["scope.userLocation"]) {
+                            resolve(true);
+                          } else {
+                            reject(false);
+                          }
+                        },
+                      });
+                    }
+                  },
+                });
+              }
+            },
+            fail: (err) => {
+              reject(err);
+            },
+          });
+        });
+      } catch (err) {
+        console.error("位置授权失败：", err);
+        uni.showToast({ title: "授权失败，请稍后重试", icon: "none" });
+      }
+    },
+    //计算距离判断是否可以点餐
+    async computedDistance() {
+      return new Promise((resolve, reject) => {
+        console.log("店铺经纬度", this.shopInfo.lat, this.shopInfo.lng);
+        console.log(
+          "用户经纬度",
+          this.location.latitude,
+          this.location.longitude
+        );
 
-						resolve(res)
-					} else {
-						console.log(res)
-						reject()
-					}
+        const juli = getDistance(
+          this.location.latitude,
+          this.location.longitude,
+          this.shopInfo.lat,
+          this.shopInfo.lng
+        );
+        const orderFenceDistance = (
+          (this.shopInfo.orderFenceDistance || 2000) / 2000
+        ).toFixed(2);
 
-				} catch (error) {
-					console.log(error);
-					reject()
-					//TODO handle the exception
-				}
+        console.log("距离", juli);
 
-				// } catch (e) {
-				// reject(false)
-				// }
+        if (this.shopInfo.isOrderFence && juli > orderFenceDistance) {
+          uni.showModal({
+            title: "提示",
+            confirmText: "重新定位",
+            content:
+              "抱歉，您当前距离店铺过远，为保障您的用餐体验，请您到店后或在门店附近再下单。若您已在店铺附近，可尝试重新定位",
+            success: async (res) => {
+              if (res.confirm) {
+                console.log("用户点击了确认");
+                await this.getLocation();
+                this.computedDistance();
+              } else if (res.cancel) {
+                console.log("用户点击了取消");
+              }
+            },
+          });
+          reject();
+          return;
+        }
+        this.jumpToOrderPage();
+        resolve(juli);
+      });
+    },
+    // 跳转点餐页面
+    jumpToOrderPage() {
+      // 是否免除桌位费 0否1是
+      if (this.shopInfo.isTableFee == 0) {
+        uni.reLaunch({
+          url: "/pages/product/choosetable",
+        });
+      } else {
+        uni.reLaunch({
+          url: "/pages/product/index",
+        });
+      }
+    },
 
-			})
-		},
+    // /通过桌码获取当前店铺信息
+    actionsproductqueryShop(tableCode) {
+      console.log("台桌码", tableCode);
+      return new Promise(async (resolve, reject) => {
+        // try {
+        try {
+          let res = await APIproductqueryShop({
+            tableCode: tableCode ? tableCode : uni.cache.get("tableCode"),
+          });
+          if (res) {
+            res.shopInfo.isVip = res.vip ? "1" : "0";
+            res.shopTable.shopExtendMap = res.shopExtendMap;
+            this.shopInfo = res.shopInfo;
+            // 店铺信息
+            uni.cache.set("shopTable", res.shopTable);
+            // 台桌信息
+            uni.cache.set("shopInfo", res.shopInfo);
+            uni.cache.set("shopId", res.shopTable.shopId, 30);
 
-		// 通过shopId  获取店铺会员信息
-		actionsproductqueryProduct() {
-			return new Promise(async (resolve, reject) => {
-				try {
-					let res = await APIshopUserInfo()
-					uni.cache.set('shopUserInfo', res);
-					uni.cache.set('orderVIP', res)
-					uni.cache.set('ordershopUserInfo', res.shopInfo)
-					resolve(res)
-				} catch (e) {
-					reject(false)
-				}
+            resolve(res);
+          } else {
+            uni.showToast({
+              title: "通过桌码获取当前店铺信息失败",
+              icon: "none",
+            });
+            console.error("通过桌码获取当前店铺信息失败", res);
+            reject();
+          }
+        } catch (error) {
+          console.log(error);
+          reject();
+          //TODO handle the exception
+        }
 
-			})
-		},
+        // } catch (e) {
+        // reject(false)
+        // }
+      });
+    },
 
-		// 用户信息获取
-		actionsAPIuser() {
-			return new Promise(async (resolve, reject) => {
-				try {
-					let res = null
-					// 获取店铺用户会员信息
-					if (uni.cache.get('shopId')) {
-						res = await this.actionsproductqueryProduct()
-					} else {
-						res = await APIuser()
-						uni.cache.set('userInfo', res);
-					}
-					console.log('actionsAPIuser res', res);
-					resolve(res)
-				} catch (e) {
-					reject(false)
-				}
+    // 通过shopId  获取店铺会员信息
+    actionsproductqueryProduct() {
+      return new Promise(async (resolve, reject) => {
+        try {
+          let res = await APIshopUserInfo();
+          uni.cache.set("shopUserInfo", res);
+          uni.cache.set("orderVIP", res);
+          uni.cache.set("ordershopUserInfo", res.shopInfo);
+          resolve(res);
+        } catch (e) {
+          reject(false);
+        }
+      });
+    },
 
-			})
-		}
-	}
-});
\ No newline at end of file
+    // 用户信息获取
+    actionsAPIuser() {
+      return new Promise(async (resolve, reject) => {
+        try {
+          let res = null;
+          // 获取店铺用户会员信息
+          if (uni.cache.get("shopId")) {
+            res = await this.actionsproductqueryProduct();
+          } else {
+            res = await APIuser();
+            uni.cache.set("userInfo", res);
+          }
+          console.log("actionsAPIuser res", res);
+          resolve(res);
+        } catch (e) {
+          reject(false);
+        }
+      });
+    },
+  },
+});
diff --git a/uni_modules/lime-painter/changelog.md b/uni_modules/lime-painter/changelog.md
new file mode 100644
index 0000000..588fa02
--- /dev/null
+++ b/uni_modules/lime-painter/changelog.md
@@ -0,0 +1,225 @@
+## 1.9.6.6（2024-09-25）
+- fix: 修复background-position无效的问题
+## 1.9.6.5（2024-04-14）
+- fix: 修复`nvue`无法生图的问题
+## 1.9.6.4（2024-03-10）
+- fix: 修复代理ctx导致H5不能使用ctx.save
+## 1.9.6.3（2024-03-08）
+- fix: 修复支付宝真机无法使用的问题
+## 1.9.6.2（2024-02-22）
+- fix: 修复使用render函数报错的问题
+## 1.9.6.1（2023-12-22）
+- fix: 修复字节小程序非2d字体偏移
+- fix: 修复`canvasToTempFilePathSync`会触发两次的问题
+- fix: 修复`parser`图片没有宽度的问题
+## 1.9.6（2023-12-06）
+- fix: 修复背景图受padding影响
+- fix: 修复因字节报错改了代理实现导致微信报错
+- 1.9.5.8（2023-11-16）
+- fix: 修复margin问题
+- fix: 修复borderWidth问题
+- fix: 修复textBox问题
+- fix: 修复字节开发工具报`could not be cloned.`问题
+## 1.9.5.7（2023-07-27）
+- fix: 去掉多余的方法
+- chore: 更新文档，增加自定义字体说明
+## 1.9.5.6（2023-07-21）
+- feat: 有限的支持富文本
+- feat: H5和APP 增加 `hidpi` prop，主要用于大尺寸无法生成图片时用
+- fix: 修复 钉钉小程序 缺少 `measureText` 方法
+- chore: 由于微信小程序 pc 端的 canvas 2d 时不时抽风，故不使用canvas 2d
+## 1.9.5.5（2023-06-27）
+- fix: 修复把`emoji`表情字符拆分成多个字符的情况
+## 1.9.5.4（2023-06-05）
+- fix: 修复因`canvasToTempFilePathSync`监听导致重复调用
+## 1.9.5.3（2023-05-23）
+- fix: 因isPc错写成了isPC导致小程序PC不能生成图片
+## 1.9.5.2（2023-05-22）
+- feat: 删除多余文件
+## 1.9.5.1（2023-05-22）
+- fix: 修复 文字行数与`line-clamp`相同但不满一行时也加了省略号的问题
+## 1.9.5（2023-05-14）
+- feat: 增加 `text-indent` 和 `calc` 方法
+- feat: 优化 布局时间
+## 1.9.4.4（2023-04-15）
+- fix: 修复无法匹配负值
+- fix: 修复 Nvue IOS getImageInfo `useCORS` 为 undefined
+## 1.9.4.3（2023-04-01）
+- feat: 增加支持文字描边 `text-stroke: '5rpx #fff'`
+## 1.9.4.2（2023-03-30）
+- fix: 修复 支付宝小程序 isPC 在手机也为true的问题
+- feat: 由 微信开发工具 3060 版 无法获取图片尺寸，现 微信开发工具 3220 版 修复该问题，故还原上一版的获取图片方式。
+## 1.9.4.1（2023-03-28）
+- fix: 修复固定高度不正确问题
+## 1.9.4（2023-03-17）
+- fix: nvue ios getImageInfo缺少this报错
+- fix: pathType 非2d无效问题
+- fix: 修复 小米9se 可能会存在多次init 导致画面多次放大
+- fix: 修复 border 分开写 width style无效问题
+- fix: 修复 支付宝小程序IOS 再次进入不渲染的问题
+- fix: 修复 支付宝小程序安卓Zindex排序错乱问题
+- fix: 修复 微信开发工具 3060 版 无法获取图片的问题
+- feat: 把 for in 改为 forEach
+- feat: 增加 hidden
+- feat: 根节点 box-sizing 默认 `border-box`
+- feat: 增加支持 `vw` `wh`
+- chore: pathType 取消 默认值，因为字节开发工具不能显示
+- chore: 支付宝小程序开发工具不支持 生成图片 请以真机调试为准
+- bug: 企业微信 2.20.3无法使用
+## 1.9.3.5（2022-06-29）
+- feat: justifyContent 增加 `space-around`、`space-between`
+- feat: canvas 2d 也使用`getImageInfo`
+- fix: 修复 `text`的 `text-decoration`错位
+## 1.9.3.4（2022-06-20）
+- fix: 修复 因创建节点速度问题导致顺序出错。 
+- fix: 修复 微信小程序 PC 无法显示本地图片 
+- fix: 修复 flex-box 对齐问题 
+- feat: 增加 `text-shadow`
+- feat: 重写 `text` 对齐方式
+- chore: 更新文档
+## 1.9.3.3（2022-06-17）
+- fix: 修复 支付宝小程序 canvas 2d 存在ctx.draw问题导致报错
+- fix: 修复 支付宝小程序 toDataURL 存在权限问题改用 `toTempFilePath`
+- fix: 修复 支付宝小程序 image size 问题导致 `objectFit` 无效
+## 1.9.3.2（2022-06-14）
+- fix: 修复 image 设置背景色不生效问题
+- fix: 修复 nvue 环境判断缺少参数问题
+## 1.9.3.1（2022-06-14）
+- fix: 修复 bottom 定位不对问题
+- fix: 修复 因小数导致计算出错换行问题
+- feat: 增加 `useCORS` h5端图片跨域 在设置请求头无效果后试一下设置这个值
+- chore: 更新文档
+## 1.9.3（2022-06-13）
+- feat: 增加 `zIndex`
+- feat: 增加 `flex-box` 该功能处于原始阶段，非常简陋。
+- tips: QQ小程序 vue3 不支持, 为 uni 官方BUG
+## 1.9.2.9（2022-06-10）
+- fix: 修复`text-align`及`margin`居中问题
+## 1.9.2.8（2022-06-10）
+- fix: 修复 Nvue `canvasToTempFilePathSync` 不生效问题
+## 1.9.2.7（2022-06-10）
+- fix: 修复 margin及padding的bug
+- fix: 修复 Nvue `isCanvasToTempFilePath` 不生效问题
+## 1.9.2.6（2022-06-09）
+- fix: 修复 Nvue 不显示
+- feat: 增加支持字体渐变
+```html
+<l-painter-text 
+	text="水调歌头\n明月几时有？把酒问青天。不知天上宫阙，今夕是何年。我欲乘风归去，又恐琼楼玉宇，高处不胜寒。起舞弄清影，何似在人间。"
+	css="background: linear-gradient(,#ff971b 0%, #1989fa 100%); background-clip: text" />
+```
+## 1.9.2.5（2022-06-09）
+- chore: 更变获取父级宽度的设定
+- chore: `pathType` 在canvas 2d 默认为 `url`
+## 1.9.2.4（2022-06-08）
+- fix: 修复 `pathType` 不生效问题
+## 1.9.2.3（2022-06-08）
+- fix: 修复 `canvasToTempFilePath` 漏写 `success` 参数
+## 1.9.2.2（2022-06-07）
+- chore: 更新文档
+## 1.9.2.1（2022-06-07）
+- fix: 修复 vue3 赋值给this再传入导致image无法绘制
+- fix: 修复 `canvasToTempFilePathSync` 时机问题
+- feat: canvas 2d 更改图片生成方式 `toDataURL` 
+## 1.9.2（2022-05-30）
+- fix: 修复 `canvasToTempFilePathSync` 在 vue3 下只生成一次
+## 1.9.1.7（2022-05-28）
+- fix: 修复 `qrcode`显示不全问题
+## 1.9.1.6（2022-05-28）
+- fix: 修复 `canvasToTempFilePathSync` 会重复多次问题
+- fix: 修复 `view` css `backgroundImage` 图片下载失败导致 子节点不渲染
+## 1.9.1.5（2022-05-27）
+- fix: 修正支付宝小程序 canvas 2d版本号 2.7.15
+## 1.9.1.4（2022-05-22）
+- fix: 修复字节小程序无法使用xml方式
+- fix: 修复字节小程序无法使用base64(非2D情况下工具上无法显示)
+- fix: 修复支付宝小程序 `canvasToTempFilePath` 报错
+## 1.9.1.3（2022-04-29）
+- fix: 修复vue3打包后uni对象为空后的报错
+## 1.9.1.2（2022-04-25）
+- fix: 删除多余文件
+## 1.9.1.1（2022-04-25）
+- fix: 修复图片不显示问题
+## 1.9.1（2022-04-12）
+- fix: 因四舍五入导致有些机型错位
+- fix: 修复无views报错 
+- chore: nvue下因ios无法读取插件内static文件，改由下载方式
+## 1.9.0（2022-03-20）
+- fix: 因无法固定尺寸导致生成图片不全
+- fix: 特定情况下text判断无效
+- chore: 本地化APP Nvue webview
+## 1.8.9（2022-02-20）
+- fix: 修复 小程序下载最多10次并发的问题
+- fix: 修复 APP端无法获取本地图片
+- fix: 修复 APP Nvue端不执行问题
+- chore: 增加图片缓存机制
+## 1.8.8.8（2022-01-27）
+- fix: 修复 主动调用尺寸问题
+## 1.8.8.6（2022-01-26）
+- fix: 修复 nvue 下无宽度时获取父级宽度 
+- fix: 修复 ios app 无法渲染问题
+## 1.8.8（2022-01-23）
+- fix: 修复 主动调用时无节点问题
+- fix: 修复 `box-shadow` 颜色问题
+- fix: 修复 `transform:rotate` 角度位置问题
+- feat: 增加 `overflow:hidden`
+## 1.8.7（2022-01-07）
+- fix: 修复 image 方向为 `right` 时原始宽高问题
+- feat: 支持 view 设置背景图 `background-image: url(xxx)`
+- chore: 去掉可选链
+## 1.8.6（2021-11-28）
+- feat: 支持`view`对`inline-block`的子集使用`text-align`
+## 1.8.5.5（2021-08-17）
+- chore: 更新文档，删除 replace
+- fix: 修复 text 值为 number时报错
+## 1.8.5.4（2021-08-16）
+- fix: 字节小程序兼容
+## 1.8.5.3（2021-08-15）
+- fix: 修复线性渐变与css现实效果不一致的问题
+- chore: 更新文档
+## 1.8.5.2（2021-08-13）
+- chore: 增加`background-image`、`background-repeat` 能力，主要用于背景纹理的绘制，并不是代替`image`。例如：大面积的重复平铺的水印
+- 注意：这个功能H5暂时无法使用，因为[官方的API有BUG](https://ask.dcloud.net.cn/question/128793)，待官方修复！！！
+## 1.8.5.1（2021-08-10）
+- fix: 修复因`margin`报错问题
+## 1.8.5（2021-08-09）
+- chore: 增加margin支持`auto`,以达到居中效果
+## 1.8.4（2021-08-06）
+- chore: 增加判断缓存文件条件
+- fix: 修复css 多余空格报错问题
+## 1.8.3（2021-08-04）
+- tips: 1.6.x 以下的版本升级到1.8.x后要为每个元素都加上定位：position: 'absolute'
+- fix: 修复只有一个view子元素时不计算高度的问题
+## 1.8.2（2021-08-03）
+- fix: 修复 path-type 为 `url` 无效问题
+- fix: 修复 qrcode `text` 为空时报错问题
+- fix: 修复 image `src` 动态设置时不生效问题
+- feat: 增加 css 属性 `min-width` `max-width`
+## 1.8.1（2021-08-02）
+- fix: 修复无法加载本地图片
+## 1.8.0（2021-08-02）
+- chore 文档更新
+- 使用旧版的同学不要升级！
+## 1.8.0-beta（2021-07-30）
+- ## 全新布局方式 不兼容旧版！
+- chore: 布局方式变更
+- tips: 微信canvas 2d 不支持真机调试
+## 1.6.6（2021-07-09）
+- chore: 统一命名规范，无须主动引入组件
+## 1.6.5（2021-06-08）
+- chore: 去掉console
+## 1.6.4（2021-06-07）
+- fix: 修复 数字 为纯字符串时不转换的BUG
+## 1.6.3（2021-06-06）
+- fix: 修复 PC 端放大的BUG
+## 1.6.2（2021-05-31）
+- fix: 修复 报`adaptor is not a function`错误
+- fix: 修复 text 多行高度
+- fix: 优化 默认文字的基准线
+- feat: `@progress`事件，监听绘制进度
+## 1.6.1（2021-02-28）
+- 删除多余节点
+## 1.6.0（2021-02-26）
+- 调整为uni_modules目录规范
+- 修复：transform的rotate不能为负数问题
+- 新增：`pathType` 指定生成图片返回的路径类型,可选值有 `base64`、`url`
diff --git a/uni_modules/lime-painter/components/common/relation.js b/uni_modules/lime-painter/components/common/relation.js
new file mode 100644
index 0000000..6ed37e8
--- /dev/null
+++ b/uni_modules/lime-painter/components/common/relation.js
@@ -0,0 +1,150 @@
+const styles = (v ='') =>  v.split(';').filter(v => v && !/^[\n\s]+$/.test(v)).map(v => {
+						const key = v.slice(0, v.indexOf(':'))
+						const value = v.slice(v.indexOf(':')+1)
+						return {
+							[key
+								.replace(/-([a-z])/g, function() { return arguments[1].toUpperCase()})
+								.replace(/\s+/g, '')
+							]: value.replace(/^\s+/, '').replace(/\s+$/, '') || ''
+						}
+					})
+export function parent(parent) {
+	return {
+		provide() {
+			return {
+				[parent]: this
+			}
+		},
+		data() {
+			return {
+				el: {
+					id: null,
+					css: {},
+					views: []
+				},
+			}
+		},
+		watch: {
+			css: { 
+				handler(v) {
+					if(this.canvasId) {
+						this.el.css = (typeof v == 'object' ? v : v && Object.assign(...styles(v))) || {}
+						this.canvasWidth = this.el.css && this.el.css.width || this.canvasWidth
+						this.canvasHeight = this.el.css && this.el.css.height || this.canvasHeight
+					}
+				},
+				immediate: true
+			}
+		}
+	}
+}
+export function children(parent, options = {}) {
+	const indexKey = options.indexKey || 'index'
+	return {
+		inject: {
+			[parent]: {
+				default: null
+			}
+		},
+		watch: {
+			el: {
+				handler(v, o) {
+					if(JSON.stringify(v) != JSON.stringify(o))
+						this.bindRelation()
+				},
+				deep: true,
+				immediate: true
+			},
+			src: {
+				handler(v, o) {
+					if(v != o)
+						this.bindRelation()
+				},
+				immediate: true
+			},
+			text: {
+				handler(v, o) {
+					if(v != o) this.bindRelation()
+				},
+				immediate: true
+			},
+			css: {
+				handler(v, o) {
+					if(v != o)
+						this.el.css = (typeof v == 'object' ? v : v && Object.assign(...styles(v))) || {}
+				},
+				immediate: true
+			},
+			replace: {
+				handler(v, o) {
+					if(JSON.stringify(v) != JSON.stringify(o))
+						this.bindRelation()
+				},
+				deep: true,
+				immediate: true
+			}
+		},
+		created() {
+			if(!this._uid) {
+				this._uid = this._.uid
+			}
+			Object.defineProperty(this, 'parent', {
+				get: () => this[parent] || [],
+			})
+			Object.defineProperty(this, 'index', {
+				get: () =>  {
+					this.bindRelation();
+					const {parent: {el: {views=[]}={}}={}} = this
+					return views.indexOf(this.el)
+				},
+			});
+			this.el.type = this.type
+			if(this.uid) {
+				this.el.uid = this.uid
+			}
+			this.bindRelation()
+		},
+		// #ifdef VUE3
+		beforeUnmount() {
+			this.removeEl()
+		},
+		// #endif
+		// #ifdef VUE2
+		beforeDestroy() {
+			this.removeEl()
+		},
+		// #endif
+		methods: {
+			removeEl() {
+				if (this.parent) {
+					this.parent.el.views = this.parent.el.views.filter(
+						(item) => item._uid !== this._uid
+					);
+				}
+			},
+			bindRelation() {
+				if(!this.el._uid) {
+					this.el._uid = this._uid 
+				}
+				if(['text','qrcode'].includes(this.type)) {
+					this.el.text = this.$slots && this.$slots.default && this.$slots.default[0].text || `${this.text || ''}`.replace(/\\n/g, '\n')
+				}
+				if(this.type == 'image') {
+					this.el.src = this.src
+				}
+				if (!this.parent) {
+					return;
+				}
+				let views = this.parent.el.views || [];
+				if(views.indexOf(this.el) !== -1) {
+					this.parent.el.views = views.map(v => v._uid == this._uid ? this.el : v)
+				} else {
+					this.parent.el.views = [...views, this.el];
+				}
+			}
+		},
+		mounted() {
+			// this.bindRelation()
+		},
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/lime-painter/components/l-painter-image/l-painter-image.vue b/uni_modules/lime-painter/components/l-painter-image/l-painter-image.vue
new file mode 100644
index 0000000..e24e3aa
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter-image/l-painter-image.vue
@@ -0,0 +1,28 @@
+<template>
+	
+</template>
+
+<script>
+	import {parent, children} from '../common/relation';
+	export default {
+		name: 'lime-painter-image',
+		mixins:[children('painter')],
+		props: {
+			id: String,
+			css: [String, Object],
+			src: String
+		},
+		data() {
+			return {
+				type: 'image',
+				el: {
+					css: {},
+					src: null
+				},
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue b/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue
new file mode 100644
index 0000000..a73e5ed
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue
@@ -0,0 +1,27 @@
+<template>
+</template>
+
+<script>
+	import {parent, children} from '../common/relation';
+	export default {
+		name: 'lime-painter-qrcode',
+		mixins:[children('painter')],
+		props: {
+			id: String,
+			css: [String, Object],
+			text: String
+		},
+		data() {
+			return {
+				type: 'qrcode',
+				el: {
+					css: {},
+					text: null
+				},
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/uni_modules/lime-painter/components/l-painter-text/l-painter-text.vue b/uni_modules/lime-painter/components/l-painter-text/l-painter-text.vue
new file mode 100644
index 0000000..b332b02
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter-text/l-painter-text.vue
@@ -0,0 +1,33 @@
+<template>
+	<text style="opacity: 0;height: 0;"><slot/></text>
+</template>
+
+<script>
+	import {parent, children} from '../common/relation';
+	export default {
+		name: 'lime-painter-text',
+		mixins:[children('painter')],
+		props: {
+			type: {
+				type: String,
+				default: 'text'
+			},
+			uid: String,
+			css: [String, Object],
+			text: [String, Number],
+			replace: Object,
+		},
+		data() {
+			return {
+				// type: 'text',
+				el: {
+					css: {},
+					text: null
+				},
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/uni_modules/lime-painter/components/l-painter-view/l-painter-view.vue b/uni_modules/lime-painter/components/l-painter-view/l-painter-view.vue
new file mode 100644
index 0000000..94596e5
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter-view/l-painter-view.vue
@@ -0,0 +1,34 @@
+<template>
+	<view><slot/></view>
+</template>
+
+<script>
+	import {parent, children} from '../common/relation';
+	export default {
+		name: 'lime-painter-view',
+		mixins:[children('painter'), parent('painter')],
+		props: {
+			id: String,
+			type: {
+				type: String,
+				default: 'view'
+			},
+			css: [String, Object],
+		},
+		data() {
+			return {
+				// type: 'view',
+				el: {
+					css: {},
+					views:[]
+				},
+			}
+		},
+		mounted() {
+			
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/uni_modules/lime-painter/components/l-painter/l-painter.vue b/uni_modules/lime-painter/components/l-painter/l-painter.vue
new file mode 100644
index 0000000..83926fd
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter/l-painter.vue
@@ -0,0 +1,461 @@
+<template>
+	<view class="lime-painter" ref="limepainter">
+		<view v-if="canvasId && size" :style="styles">
+			<!-- #ifndef APP-NVUE -->
+			<canvas class="lime-painter__canvas" v-if="use2dCanvas" :id="canvasId" type="2d" :style="size"></canvas>
+			<canvas class="lime-painter__canvas" v-else :id="canvasId" :canvas-id="canvasId" :style="size"
+				:width="boardWidth * dpr" :height="boardHeight * dpr" :hidpi="hidpi"></canvas>
+
+			<!-- #endif -->
+			<!-- #ifdef APP-NVUE -->
+			<web-view :style="size" ref="webview"
+				src="/uni_modules/lime-painter/hybrid/html/index.html"
+				class="lime-painter__canvas" @pagefinish="onPageFinish" @error="onError" @onPostMessage="onMessage">
+			</web-view>
+			<!-- #endif -->
+		</view>
+		<slot />
+	</view>
+</template>
+
+<script>
+	import { parent } from '../common/relation'
+	import props from './props'
+	import {toPx, base64ToPath, pathToBase64, isBase64, sleep, getImageInfo }from './utils';
+	//  #ifndef APP-NVUE
+	import { canIUseCanvas2d, isPC} from './utils';
+	import Painter from './painter';
+	// import Painter from '@painter'
+	const nvue = {}
+	//  #endif
+	//  #ifdef APP-NVUE
+	import nvue from './nvue'
+	//  #endif
+	export default {
+		name: 'lime-painter',
+		mixins: [props, parent('painter'), nvue],
+		data() {
+			return {
+				use2dCanvas: false,
+				canvasHeight: 150,
+				canvasWidth: null,
+				parentWidth: 0,
+				inited: false,
+				progress: 0,
+				firstRender: 0,
+				done: false,
+				tasks: []
+			};
+		},
+		computed: {
+			styles() {
+				return `${this.size}${this.customStyle||''};` + (this.hidden && 'position: fixed; left: 1500rpx;')
+			},
+			canvasId() {
+				return `l-painter${this._ && this._.uid || this._uid}`
+			},
+			size() {
+				if (this.boardWidth && this.boardHeight) {
+					return `width:${this.boardWidth}px; height: ${this.boardHeight}px;`;
+				}
+			},
+			dpr() {
+				return this.pixelRatio || uni.getSystemInfoSync().pixelRatio;
+			},
+			boardWidth() {
+				const {width = 0} = (this.elements && this.elements.css) || this.elements || this
+				const w = toPx(width||this.width)
+				return w || Math.max(w, toPx(this.canvasWidth));
+			},
+			boardHeight() {
+				const {height = 0} = (this.elements && this.elements.css) || this.elements || this
+				const h = toPx(height||this.height)
+				return h || Math.max(h, toPx(this.canvasHeight));
+			},
+			hasBoard() {
+				return this.board && Object.keys(this.board).length
+			},
+			elements() {
+				return this.hasBoard ? this.board : JSON.parse(JSON.stringify(this.el))
+			}
+		},
+		created() {
+			this.use2dCanvas = this.type === '2d' && canIUseCanvas2d() && !isPC
+		},
+		async mounted() {
+			await sleep(30)
+			await this.getParentWeith()
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.$watch('elements', this.watchRender, {
+						deep: true,
+						immediate: true
+					});
+				}, 30)
+			})
+		},
+		// #ifdef VUE3
+		unmounted() {
+			this.done = false
+			this.inited = false
+			this.firstRender = 0
+			this.progress = 0
+			this.painter = null
+			clearTimeout(this.rendertimer)
+		},
+		// #endif
+		// #ifdef VUE2
+		destroyed() {
+			this.done = false
+			this.inited = false
+			this.firstRender = 0
+			this.progress = 0
+			this.painter = null
+			clearTimeout(this.rendertimer)
+		},
+		// #endif
+		methods: {
+			async watchRender(val, old) {
+				if (!val || !val.views || (!this.firstRender ? !val.views.length : !this.firstRender) || !Object.keys(val).length || JSON.stringify(val) == JSON.stringify(old)) return;
+				this.firstRender = 1
+				this.progress = 0
+				this.done = false
+				clearTimeout(this.rendertimer)
+				this.rendertimer = setTimeout(() => {
+					this.render(val);
+				}, this.beforeDelay)
+			},
+			async setFilePath(path, param) {
+				let filePath = path
+				const {pathType = this.pathType} =  param || this
+				if (pathType == 'base64' && !isBase64(path)) {
+					filePath = await pathToBase64(path)
+				} else if (pathType == 'url' && isBase64(path)) {
+					filePath = await base64ToPath(path)
+				}
+				if (param && param.isEmit) {
+					this.$emit('success', filePath);
+				}
+				return filePath
+			},
+			async getSize(args) {
+				const {width} = args.css || args
+				const {height} = args.css || args
+				if (!this.size) {
+					if (width || height) {
+						this.canvasWidth = width || this.canvasWidth
+						this.canvasHeight = height || this.canvasHeight
+						await sleep(30);
+					} else {
+						await this.getParentWeith()
+					}
+				}
+			},
+			canvasToTempFilePathSync(args) {
+				// this.stopWatch && this.stopWatch()
+				// this.stopWatch = this.$watch('done', (v) => {
+				// 	if (v) {
+				// 		this.canvasToTempFilePath(args)
+				// 		this.stopWatch && this.stopWatch()
+				// 	}
+				// }, {
+				// 	immediate: true
+				// })
+				this.tasks.push(args)
+				if(this.done){
+					this.runTask()
+				}
+			},
+			runTask(){
+				while(this.tasks.length){
+					const task = this.tasks.shift()	
+					 this.canvasToTempFilePath(task)
+				}
+			},
+			// #ifndef APP-NVUE
+			getParentWeith() {
+				return new Promise(resolve => {
+					uni.createSelectorQuery()
+						.in(this)
+						.select(`.lime-painter`)
+						.boundingClientRect()
+						.exec(res => {
+							const {width, height} = res[0]||{}
+							this.parentWidth = Math.ceil(width||0)
+							this.canvasWidth = this.parentWidth || 300
+							this.canvasHeight = height || this.canvasHeight||150
+							resolve(res[0])
+						})
+				})
+			},
+			async render(args = {}) {
+				if(!Object.keys(args).length) {
+					return console.error('空对象')
+				}
+				this.progress = 0
+				this.done = false
+				// #ifdef APP-NVUE
+				this.tempFilePath.length = 0
+				// #endif
+				await this.getSize(args)
+				const ctx = await this.getContext();
+				
+				let {
+					use2dCanvas,
+					boardWidth,
+					boardHeight,
+					canvas,
+					afterDelay
+				} = this;
+				if (use2dCanvas && !canvas) {
+					return Promise.reject(new Error('canvas 没创建'));
+				}
+				this.boundary = {
+					top: 0,
+					left: 0,
+					width: boardWidth,
+					height: boardHeight
+				};
+				this.painter = null
+				if (!this.painter) {
+					const {width} = args.css || args
+					const {height} = args.css || args
+					if(!width && this.parentWidth) {
+						Object.assign(args, {width: this.parentWidth})
+					}
+					const param = {
+						context: ctx,
+						canvas,
+						width: boardWidth,
+						height: boardHeight,
+						pixelRatio: this.dpr,
+						useCORS: this.useCORS,
+						createImage: getImageInfo.bind(this),
+						performance: this.performance,
+						listen: {
+							onProgress: (v) => {
+								this.progress = v
+								this.$emit('progress', v)
+							},
+							onEffectFail: (err) => {
+								this.$emit('faill', err)
+							}
+						}
+					}
+					this.painter = new Painter(param)
+				} 
+				try{
+					// vue3 赋值给data会引起图片无法绘制
+					const { width, height } = await this.painter.source(JSON.parse(JSON.stringify(args)))
+					this.boundary.height = this.canvasHeight = height
+					this.boundary.width = this.canvasWidth = width
+					await sleep(this.sleep);
+					await this.painter.render()
+					await new Promise(resolve => this.$nextTick(resolve));
+					if (!use2dCanvas) {
+						await this.canvasDraw();
+					}
+					if (afterDelay && use2dCanvas) {
+						await sleep(afterDelay);
+					}
+					this.$emit('done');
+					this.done = true
+					if (this.isCanvasToTempFilePath) {
+						this.canvasToTempFilePath()
+							.then(res => {
+								this.$emit('success', res.tempFilePath)
+							})
+							.catch(err => {
+								this.$emit('fail', new Error(JSON.stringify(err)));
+							});
+					}
+					this.runTask()
+					return Promise.resolve({
+						ctx,
+						draw: this.painter,
+						node: this.node
+					});
+				}catch(e){
+					//TODO handle the exception
+				}
+				
+			},
+			canvasDraw(flag = false) {
+				return new Promise((resolve, reject) => this.ctx.draw(flag, () => setTimeout(() => resolve(), this
+					.afterDelay)));
+			},
+			async getContext() {
+				if (!this.canvasWidth) {
+					this.$emit('fail', 'painter no size')
+					console.error('[lime-painter]: 给画板或父级设置尺寸')
+					return Promise.reject();
+				}
+				if (this.ctx && this.inited) {
+					return Promise.resolve(this.ctx);
+				}
+				const { type, use2dCanvas, dpr, boardWidth, boardHeight } = this;
+				const _getContext = () => {
+					return new Promise(resolve => {
+						uni.createSelectorQuery()
+							.in(this)
+							.select(`#${this.canvasId}`)
+							.boundingClientRect()
+							.exec(res => {
+								if (res) {
+									const ctx = uni.createCanvasContext(this.canvasId, this);
+									if (!this.inited) {
+										this.inited = true;
+										this.use2dCanvas = false;
+										this.canvas = res;
+									}
+									
+									// 钉钉小程序框架不支持 measureText 方法，用此方法 mock
+									if (!ctx.measureText) {
+										function strLen(str) {
+											let len = 0;
+											for (let i = 0; i < str.length; i++) {
+												if (str.charCodeAt(i) > 0 && str.charCodeAt(i) < 128) {
+													len++;
+												} else {
+													len += 2;
+												}
+											}
+											return len;
+										}
+										ctx.measureText = text => {
+											let fontSize = ctx.state && ctx.state.fontSize || 12;
+											const font = ctx.__font
+											if (font && fontSize == 12) {
+												fontSize = parseInt(font.split(' ')[3], 10);
+											}
+											fontSize /= 2;
+											return {
+												width: strLen(text) * fontSize
+											};
+										}
+									}
+									
+									// #ifdef MP-ALIPAY
+									ctx.scale(dpr, dpr);
+									// #endif
+									this.ctx = ctx
+									resolve(this.ctx);
+								} else {
+									console.error('[lime-painter] no node')
+								}
+							});
+					});
+				};
+				if (!use2dCanvas) {
+					return _getContext();
+				}
+				return new Promise(resolve => {
+					uni.createSelectorQuery()
+						.in(this)
+						.select(`#${this.canvasId}`)
+						.node()
+						.exec(res => {
+							let {node: canvas} = res && res[0]||{};
+							if(canvas) {
+								const ctx = canvas.getContext(type);
+								if (!this.inited) {
+									this.inited = true;
+									this.use2dCanvas = true;
+									this.canvas = canvas;
+								}
+								this.ctx = ctx
+								resolve(this.ctx);
+							} else {
+								console.error('[lime-painter]: no size')
+							}
+						});
+				});
+			},
+			canvasToTempFilePath(args = {}) {
+				return new Promise(async (resolve, reject) => {
+					const { use2dCanvas, canvasId, dpr, fileType, quality } = this;
+					const success = async (res) => {
+						try {
+							const tempFilePath = await this.setFilePath(res.tempFilePath || res, args)
+							const result = Object.assign(res, {tempFilePath})
+							args.success && args.success(result)
+							resolve(result)
+						} catch (e) {
+							this.$emit('fail', e)
+						}
+					}
+					
+					let { top: y = 0, left: x = 0, width, height } = this.boundary || this;
+					// let destWidth = width * dpr;
+					// let destHeight = height * dpr;
+					// #ifdef MP-ALIPAY
+					// width = destWidth;
+					// height = destHeight;
+					// #endif
+					
+					const copyArgs = Object.assign({
+						// x,
+						// y,
+						// width,
+						// height,
+						// destWidth,
+						// destHeight,
+						canvasId,
+						id: canvasId,
+						fileType,
+						quality,
+					}, args, {success});
+					// if(this.isPC || use2dCanvas) {
+					// 	copyArgs.canvas = this.canvas
+					// }
+					if (use2dCanvas) {
+						copyArgs.canvas = this.canvas
+						try{
+							// #ifndef MP-ALIPAY
+							const oFilePath = this.canvas.toDataURL(`image/${args.fileType||fileType}`.replace(/pg/, 'peg'), args.quality||quality)
+							if(/data:,/.test(oFilePath)) {
+								uni.canvasToTempFilePath(copyArgs, this);
+							} else {
+								const tempFilePath = await this.setFilePath(oFilePath, args)
+								args.success && args.success({tempFilePath})
+								resolve({tempFilePath})
+							}
+							// #endif
+							// #ifdef MP-ALIPAY
+							this.canvas.toTempFilePath(copyArgs)
+							// #endif
+						}catch(e){
+							args.fail && args.fail(e)
+							reject(e)
+						}
+					} else {
+						// #ifdef MP-ALIPAY
+						if(this.ctx.toTempFilePath) {
+							// 钉钉
+							const ctx = uni.createCanvasContext(canvasId);
+							ctx.toTempFilePath(copyArgs);
+						} else {
+							my.canvasToTempFilePath(copyArgs);
+						}
+						// #endif
+						// #ifndef MP-ALIPAY
+						uni.canvasToTempFilePath(copyArgs, this);
+						// #endif
+					}
+				})
+			}
+			// #endif
+		}
+	};
+</script>
+<style>
+	.lime-painter,
+	.lime-painter__canvas {
+		// #ifndef APP-NVUE
+		width: 100%;
+		// #endif
+		// #ifdef APP-NVUE
+		flex: 1;
+		// #endif
+	}
+</style>
diff --git a/uni_modules/lime-painter/components/l-painter/nvue.js b/uni_modules/lime-painter/components/l-painter/nvue.js
new file mode 100644
index 0000000..25645fb
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter/nvue.js
@@ -0,0 +1,214 @@
+// #ifdef APP-NVUE
+import {
+	sleep,
+	getImageInfo,
+	isBase64,
+	networkReg
+} from './utils';
+const dom = weex.requireModule('dom')
+import {
+	version
+} from '../../package.json'
+
+export default {
+	data() {
+		return {
+			tempFilePath: [],
+			isInitFile: false,
+			osName: uni.getSystemInfoSync().osName
+		}
+	},
+	methods: {
+		getParentWeith() {
+			return new Promise(resolve => {
+				dom.getComponentRect(this.$refs.limepainter, (res) => {
+					this.parentWidth = Math.ceil(res.size.width)
+					this.canvasWidth = this.canvasWidth || this.parentWidth || 300
+					this.canvasHeight = res.size.height || this.canvasHeight || 150
+					resolve(res.size)
+				})
+			})
+		},
+		onPageFinish() {
+			this.webview = this.$refs.webview
+			this.webview.evalJS(`init(${this.dpr})`)
+		},
+		onMessage(e) {
+			const res = e.detail.data[0] || null;
+			if (res.event) {
+				if (res.event == 'inited') {
+					this.inited = true
+				}
+				if (res.event == 'fail') {
+					this.$emit('fail', res)
+				}
+				if (res.event == 'layoutChange') {
+					const data = typeof res.data == 'string' ? JSON.parse(res.data) : res.data
+					this.canvasWidth = Math.ceil(data.width);
+					this.canvasHeight = Math.ceil(data.height);
+				}
+				if (res.event == 'progressChange') {
+					this.progress = res.data * 1
+				}
+				if (res.event == 'file') {
+					this.tempFilePath.push(res.data)
+					if (this.tempFilePath.length > 7) {
+						this.tempFilePath.shift()
+					}
+					return
+				}
+				if (res.event == 'success') {
+					if (res.data) {
+						this.tempFilePath.push(res.data)
+						if (this.tempFilePath.length > 8) {
+							this.tempFilePath.shift()
+						}
+						if (this.isCanvasToTempFilePath) {
+							this.setFilePath(this.tempFilePath.join(''), {
+								isEmit: true
+							})
+						}
+					} else {
+						this.$emit('fail', 'canvas no data')
+					}
+					return
+				}
+				this.$emit(res.event, JSON.parse(res.data));
+			} else if (res.file) {
+				this.file = res.data;
+			} else {
+				console.info(res[0])
+			}
+		},
+		getWebViewInited() {
+			if (this.inited) return Promise.resolve(this.inited);
+			return new Promise((resolve) => {
+				this.$watch(
+					'inited',
+					async val => {
+						if (val) {
+							resolve(val)
+						}
+					}, {
+						immediate: true
+					}
+				);
+			})
+		},
+		getTempFilePath() {
+			if (this.tempFilePath.length == 8) return Promise.resolve(this.tempFilePath)
+			return new Promise((resolve) => {
+				this.$watch(
+					'tempFilePath',
+					async val => {
+						if (val.length == 8) {
+							resolve(val.join(''))
+						}
+					}, {
+						deep: true
+					}
+				);
+			})
+		},
+		getWebViewDone() {
+			if (this.progress == 1) return Promise.resolve(this.progress);
+			return new Promise((resolve) => {
+				this.$watch(
+					'progress',
+					async val => {
+						if (val == 1) {
+							this.$emit('done')
+							this.done = true
+							this.runTask()
+							resolve(val)
+						}
+					}, {
+						immediate: true
+					}
+				);
+			})
+		},
+		async render(args) {
+			try {
+				await this.getSize(args)
+				const {
+					width
+				} = args.css || args
+				if (!width && this.parentWidth) {
+					Object.assign(args, {
+						width: this.parentWidth
+					})
+				}
+				const newNode = await this.calcImage(args);
+				await this.getWebViewInited()
+				this.webview.evalJS(`source(${JSON.stringify(newNode)})`)
+				await this.getWebViewDone()
+				await sleep(this.afterDelay)
+				if (this.isCanvasToTempFilePath) {
+					const params = {
+						fileType: this.fileType,
+						quality: this.quality
+					}
+					this.webview.evalJS(`save(${JSON.stringify(params)})`)
+				}
+				return Promise.resolve()
+			} catch (e) {
+				this.$emit('fail', e)
+			}
+		},
+		async calcImage(args) {
+			let node = JSON.parse(JSON.stringify(args))
+			const urlReg = /url\((.+)\)/
+			const {
+				backgroundImage
+			} = node.css || {}
+			const isBG = backgroundImage && urlReg.exec(backgroundImage)[1]
+			const url = node.url || node.src || isBG
+			if (['text', 'qrcode'].includes(node.type)) {
+				return node
+			}
+			if ((node.type === "image" || isBG) && url && !isBase64(url) && (this.osName == 'ios' || !networkReg
+					.test(url))) {
+				let {
+					path
+				} = await getImageInfo(url, true)
+				if (isBG) {
+					node.css.backgroundImage = `url(${path})`
+				} else {
+					node.src = path
+				}
+			} else if (node.views && node.views.length) {
+				for (let i = 0; i < node.views.length; i++) {
+					node.views[i] = await this.calcImage(node.views[i])
+				}
+			}
+			return node
+		},
+		async canvasToTempFilePath(args = {}) {
+			if (!this.inited) {
+				return this.$emit('fail', 'no init')
+			}
+			this.tempFilePath = []
+			if (args.fileType == 'jpg') {
+				args.fileType = 'jpeg'
+			}
+
+			this.webview.evalJS(`save(${JSON.stringify(args)})`)
+			try {
+				let tempFilePath = await this.getTempFilePath()
+
+				tempFilePath = await this.setFilePath(tempFilePath, args)
+				args.success({
+					errMsg: "canvasToTempFilePath:ok",
+					tempFilePath
+				})
+			} catch (e) {
+				console.log('e', e)
+				args.fail({
+					error: e
+				})
+			}
+		}
+	}
+}
+// #endif
\ No newline at end of file
diff --git a/uni_modules/lime-painter/components/l-painter/painter.js b/uni_modules/lime-painter/components/l-painter/painter.js
new file mode 100644
index 0000000..a8e3483
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter/painter.js
@@ -0,0 +1 @@
+var t=function(){return t=Object.assign||function(t){for(var e,i=1,n=arguments.length;i<n;i++)for(var r in e=arguments[i])Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r]);return t},t.apply(this,arguments)};function e(t,e,i,n){return new(i||(i=Promise))((function(r,o){function s(t){try{h(n.next(t))}catch(t){o(t)}}function a(t){try{h(n.throw(t))}catch(t){o(t)}}function h(t){var e;t.done?r(t.value):(e=t.value,e instanceof i?e:new i((function(t){t(e)}))).then(s,a)}h((n=n.apply(t,e||[])).next())}))}function i(t,e){var i,n,r,o,s={label:0,sent:function(){if(1&r[0])throw r[1];return r[1]},trys:[],ops:[]};return o={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(i)throw new TypeError("Generator is already executing.");for(;s;)try{if(i=1,n&&(r=2&o[0]?n.return:o[0]?n.throw||((r=n.return)&&r.call(n),0):n.next)&&!(r=r.call(n,o[1])).done)return r;switch(n=0,r&&(o=[2&o[0],r.value]),o[0]){case 0:case 1:r=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,n=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(r=s.trys,(r=r.length>0&&r[r.length-1])||6!==o[0]&&2!==o[0])){s=0;continue}if(3===o[0]&&(!r||o[1]>r[0]&&o[1]<r[3])){s.label=o[1];break}if(6===o[0]&&s.label<r[1]){s.label=r[1],r=o;break}if(r&&s.label<r[2]){s.label=r[2],s.ops.push(o);break}r[2]&&s.ops.pop(),s.trys.pop();continue}o=e.call(t,s)}catch(t){o=[6,t],n=0}finally{i=r=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}}var n={MP_WEIXIN:"mp-weixin",MP_QQ:"mp-qq",MP_ALIPAY:"mp-alipay",MP_BAIDU:"mp-baidu",MP_TOUTIAO:"mp-toutiao",MP_DINGDING:"mp-dingding",H5:"h5",WEB:"web",PLUS:"plus"},r=["Top","Right","Bottom","Left"],o="right",s="bottom",a=["contentSize","clientSize","borderSize","offsetSize"],h="row",c="column",f={TOP:"top",MIDDLE:"middle",BOTTOM:s},l={LEFT:"left",CENTER:"center",RIGHT:o},d="view",u="text",p="image",g="qrcode",v="block",y="inline-block",x="none",b="flex",w="absolute",m="fixed",S={display:v,color:"#000000",lineHeight:"1.4em",fontSize:14,fontWeight:400,fontFamily:"sans-serif",lineCap:"butt",flexDirection:h,flexWrap:"nowrap",textAlign:"left",alignItems:"flex-start",justifyContent:"flex-start",position:"static",transformOrigin:"".concat("center"," ").concat("center")},z={upx2px:function(t){return window.innerWidth/750*t},getSystemInfoSync:function(){return{screenWidth:window.innerWidth,screenHeight:window.innerHeight}},getImageInfo:function(t){var e=t.src,i=t.success,n=t.fail,r=new Image;r.onload=function(){i({width:r.naturalWidth,height:r.naturalHeight,path:r.src,src:e})},r.onerror=n,r.src=e}},I="object"==typeof window?"undefined"==typeof uni||"undefined"!=typeof uni&&!uni.addInterceptor?n.WEB:n.H5:"object"==typeof swan?n.MP_BAIDU:"object"==typeof tt?n.MP_TOUTIAO:"object"==typeof plus?n.PLUS:"object"==typeof wx?n.MP_WEIXIN:void 0,M=I==n.MP_WEIXIN?wx:"undefined"!=typeof uni?uni.getImageInfo?{upx2px:function(t){return uni.upx2px(t)},getSystemInfoSync:function(){return uni.getSystemInfoSync()},getImageInfo:function(t){return uni.getImageInfo(t)},downloadFile:function(t){return uni.downloadFile(t)}}:Object.assign(uni,z):"undefined"!=typeof window?z:uni;if(!M.upx2px){var k=((M.getSystemInfoSync&&M.getSystemInfoSync()).screenWidth||375)/750;M.upx2px=function(t){return k*t}}function B(t){return/^-?\d+(\.\d+)?$/.test(t)}function W(t,e,i){if(B(t))return 1*t;if("string"==typeof t){var n=/^-?([0-9]+)?([.]{1}[0-9]+){0,1}(em|rpx|vw|vh|px|%)$/g.exec(t);if(!t||!n)return 0;var r=n[3];t=parseFloat(t);var o=0;if("rpx"===r)o=M.upx2px(t);else if("px"===r)o=1*t;else if("%"===r&&e)o=t*W(e)/100;else if("em"===r&&e)o=t*W(e||14);else if(["vw","vh"].includes(r)){var s=M.getSystemInfoSync(),a=s.screenWidth,h=s.screenHeight;o=t*("vw"==r?a:h)/100}return 1*o.toFixed(2)}return 0}function P(t){return/%$/.test(t)}function O(t){return/^-?([0-9]+)?([.]{1}[0-9]+){0,1}(rpx|px)$/.test(t)}var T=function(t){return!(!t||!t.startsWith("linear")&&!t.startsWith("radial"))},L=function(t,e,i,n,r,o){t.startsWith("linear")?function(t,e,i,n,r,o){for(var s=function(t,e,i,n,r){void 0===n&&(n=0);void 0===r&&(r=0);var o=t.match(/([-]?\d{1,3})deg/),s=o&&o[1]?parseFloat(o[1]):0;s>=360&&(s-=360);s<0&&(s+=360);if(0===(s=Math.round(s)))return{x0:Math.round(e/2)+n,y0:i+r,x1:Math.round(e/2)+n,y1:r};if(180===s)return{x0:Math.round(e/2)+n,y0:r,x1:Math.round(e/2)+n,y1:i+r};if(90===s)return{x0:n,y0:Math.round(i/2)+r,x1:e+n,y1:Math.round(i/2)+r};if(270===s)return{x0:e+n,y0:Math.round(i/2)+r,x1:n,y1:Math.round(i/2)+r};var a=Math.round(180*Math.asin(e/Math.sqrt(Math.pow(e,2)+Math.pow(i,2)))/Math.PI);if(s===a)return{x0:n,y0:i+r,x1:e+n,y1:r};if(s===180-a)return{x0:n,y0:r,x1:e+n,y1:i+r};if(s===180+a)return{x0:e+n,y0:r,x1:n,y1:i+r};if(s===360-a)return{x0:e+n,y0:i+r,x1:n,y1:r};var h=0,c=0,f=0,l=0;if(s<a||s>180-a&&s<180||s>180&&s<180+a||s>360-a){var d=s*Math.PI/180,u=s<a||s>360-a?i/2:-i/2,p=Math.tan(d)*u,g=s<a||s>180-a&&s<180?e/2-p:-e/2-p;h=-(f=p+(v=Math.pow(Math.sin(d),2)*g)),c=-(l=u+v/Math.tan(d))}if(s>a&&s<90||s>90&&s<90+a||s>180+a&&s<270||s>270&&s<360-a){var v;d=(90-s)*Math.PI/180,p=s>a&&s<90||s>90&&s<90+a?e/2:-e/2,u=Math.tan(d)*p,g=s>a&&s<90||s>270&&s<360-a?i/2-u:-i/2-u;h=-(f=p+(v=Math.pow(Math.sin(d),2)*g)/Math.tan(d)),c=-(l=u+v)}return h=Math.round(h+e/2)+n,c=Math.round(i/2-c)+r,f=Math.round(f+e/2)+n,l=Math.round(i/2-l)+r,{x0:h,y0:c,x1:f,y1:l}}(r,t,e,i,n),a=s.x0,h=s.y0,c=s.x1,f=s.y1,l=o.createLinearGradient(a,h,c,f),d=r.match(/linear-gradient\((.+)\)/)[1],u=R(d.substring(d.indexOf(",")+1)),p=0;p<u.colors.length;p++)l.addColorStop(u.percents[p],u.colors[p]);o.setFillStyle(l)}(e,i,n,r,t,o):t.startsWith("radial")&&function(t,e,i,n,r,o){for(var s=R(r.match(/radial-gradient\((.+)\)/)[1]),a=Math.round(t/2)+i,h=Math.round(e/2)+n,c=o.createRadialGradient(a,h,0,a,h,Math.max(t,e)/2),f=0;f<s.colors.length;f++)c.addColorStop(s.percents[f],s.colors[f]);o.setFillStyle(c)}(e,i,n,r,t,o)};function R(t){for(var e=[],i=[],n=0,r=t.substring(0,t.length-1).split("%,");n<r.length;n++){var o=r[n];e.push(o.substring(0,o.lastIndexOf(" ")).trim()),i.push(o.substring(o.lastIndexOf(" "),o.length)/100)}return{colors:e,percents:i}}function F(t,e,i){return e in t?Object.defineProperty(t,e,{value:i,enumerable:!0,configurable:!0,writable:!0}):t[e]=i,t}function A(){return A=Object.assign?Object.assign.bind():function(t){for(var e=1;e<arguments.length;e++){var i=arguments[e];for(var n in i)Object.prototype.hasOwnProperty.call(i,n)&&(t[n]=i[n])}return t},A.apply(this,arguments)}function j(t,e){return j=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},j(t,e)}function E(t,e){(null==e||e>t.length)&&(e=t.length);for(var i=0,n=new Array(e);i<e;i++)n[i]=t[i];return n}function C(t,e){var i="undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(i)return(i=i.call(t)).next.bind(i);if(Array.isArray(t)||(i=function(t,e){if(t){if("string"==typeof t)return E(t,e);var i=Object.prototype.toString.call(t).slice(8,-1);return"Object"===i&&t.constructor&&(i=t.constructor.name),"Map"===i||"Set"===i?Array.from(t):"Arguments"===i||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(i)?E(t,e):void 0}}(t))||e&&t&&"number"==typeof t.length){i&&(t=i);var n=0;return function(){return n>=t.length?{done:!0}:{done:!1,value:t[n++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function H(t){return"number"==typeof t}function D(t){return"auto"===t||null===t}function $(t){return/%$/.test(t)}var Y=p,U=u,N=d,X=g,_=y,q=w,G=m;function V(t){return t.replace(/-([a-z])/g,(function(t,e){return e.toUpperCase()}))}function J(t,e){var i,n,o=function(t){var e=t.match(/([a-z]+)/)[1];return[e,V(t.split(e)[1])]}(t),s=o[0],a=o[1],h=e.split(" ");if(a)return(i={})[s+a]=e,i;if(h.length&&!a){var c=h[0],f=h[1],l=h[2],d=h[3];return(n={})[s+r[0]]=c,n[s+r[1]]=f||c,n[s+r[2]]=l||c,n[s+r[3]]=d||f||c,n}}function Q(t){t=t.trim();for(var e=new Array,i="+",n="",r=t.length,o=0;o<r;++o){if("."===t[o]||!isNaN(Number(t[o]))&&" "!==t[o])n+=t[o];else if("("===t[o]){for(var s=1,a=o;s>0;)"("===t[a+=1]&&(s+=1),")"===t[a]&&(s-=1);n="".concat(Q(t.slice(o+1,a))),o=a}if(isNaN(Number(t[o]))&&"."!==t[o]||o===r-1){var h=parseFloat(n);switch(i){case"+":e.push(h);break;case"-":e.push(-h);break;case"*":e.push(e.pop()*h);break;case"/":e.push(e.pop()/h)}i=t[o],n=""}}for(var c=0;e.length;)c+=e.pop();return c}var Z,K=0,et=function(){function t(){F(this,"elements",[]),F(this,"afterElements",[]),F(this,"beforeElements",[]),F(this,"ids",[]),F(this,"width",0),F(this,"height",0),F(this,"top",0),F(this,"left",0),F(this,"pre",null),F(this,"offsetX",0),F(this,"offsetY",0),K++,this.id=K}var e=t.prototype;return e.fixedBind=function(t,e){void 0===e&&(e=0),this.container=e?t.parent:t.root,this.container.fixedLine=this,this.fixedAdd(t)},e.fixedAdd=function(t){if(!this.ids.includes(t.id)){this.ids.push(t.id),this.elements.push(t);var e=t.computedStyle.zIndex;(void 0===e?0:e)>=0?this.afterElements.push(t):this.beforeElements.push(t),this.refreshLayout()}},e.bind=function(t){this.container=t.parent,this.container.line=null,this.container.lines?(this.container.lines.push(this),this.pre=this.getPreLine(),this.top=this.pre.top+this.pre.height,this.left=this.container.contentSize.left):(this.top=this.container.contentSize.top,this.left=this.container.contentSize.left,this.container.lines=[this]),this.isInline=t.isInline(),this.container.line=this,this.outerWidth=t.parent&&t.parent.contentSize.width?t.parent.contentSize.width:1/0,this.add(t)},e.getPreLine=function(){return this.container.lines[this.container.lines.length-2]},e.canIEnter=function(t){return!((100*t.offsetSize.width+100*this.width)/100>this.outerWidth)||(this.closeLine(),!1)},e.closeLine=function(){delete this.container.line},e.add=function(t){this.ids.includes(t.id)||(this.ids.push(t.id),this.elements.push(t),this.refreshWidthHeight(t))},e.refreshWidthHeight=function(t){t.offsetSize.height>this.height&&(this.height=t.offsetSize.height),this.width+=t.offsetSize.width||0,(this.container.lineMaxWidth||0)<this.width&&(this.container.lineMaxWidth=this.width)},e.refreshXAlign=function(){if(this.isInline){var t=this.container.contentSize.width-this.width,e=this.container.style.textAlign;"center"===e?t/=2:"left"===e&&(t=0),this.offsetX=t}},e.getOffsetY=function(t){if(!t||!t.style)return 0;var e=(t.style||{}).verticalAlign;return e===s?this.height-t.contentSize.height:"middle"===e?(this.height-t.contentSize.height)/2:0},e.setIndent=function(t){var e=t.style.textIndent;if(e&&/^calc/.test(e)){var i=/^calc\((.+)\)$/.exec(e);if(i&&i[1]){var n=i[1].replace(/([^\s\(\+\-\*\/]+)\.(left|right|bottom|top|width|height)/g,(function(e){var i=e.split("."),n=i[0],r=i[1],o=t.parent.querySelector(n);if(o&&o.offsetSize){var s={right:o.offsetSize.left+o.offsetSize.width,bottom:o.offsetSize.top+o.offsetSize.height};return o.offsetSize[r]||s[r]||0}})),r=Q(n.replace(new RegExp(/-?[0-9]+(\.[0-9]+)?(rpx|px|%)/,"g"),W));t.style.textIndent=r}}},e.layout=function(t,e){var i=this;this.refreshXAlign(),this.pre?(this.top=this.pre.top+this.pre.height+this.offsetY,this.left=e+this.offsetX):(this.top=Math.max(this.top,this.container.contentSize.top,t)+this.offsetY,this.left=Math.max(this.left,this.container.contentSize.left,e)+this.offsetX),this.elements.forEach((function(t,e){i.setIndent(t);var n=i.elements[e-1],r=i.getOffsetY(t);t.style.top=i.top+r,t.style.left=n?n.offsetSize.left+n.offsetSize.width:i.left,t.getBoxPosition()}))},e.refreshLayout=function(){this.afterElements=this.afterElements.sort((function(t,e){return t.computedStyle.zIndex-e.computedStyle.zIndex})),this.beforeElements=this.beforeElements.sort((function(t,e){return t.computedStyle.zIndex-e.computedStyle.zIndex}))},t}(),it=((Z={})[h]={width:"width",contentWidth:"width",lineMaxWidth:"lineMaxWidth",left:"left",top:"top",height:"height",lineMaxHeight:"lineMaxHeight",marginLeft:"marginLeft"},Z[c]={width:"height",contentWidth:"height",lineMaxWidth:"lineMaxWidth",left:"top",top:"left",height:"width",lineMaxHeight:"lineMaxHeight",marginLeft:"marginTop"},Z),nt=function(t){var e,i;function n(){var e;return F(function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(e=t.call(this)||this),"outerWidth",0),e.exactValue=0,e.flexTotal=0,e.width=0,e.key=null,e.flexDirection="row",e}i=t,(e=n).prototype=Object.create(i.prototype),e.prototype.constructor=e,j(e,i);var r=n.prototype;return r.bind=function(t){this.container=t.parent,this.container.line=this,this.container.lines?(this.container.lines.push(this),this.pre=this.getPreLine(),this.top=this.pre.top+this.pre.height,this.left=this.container.contentSize.left):(this.top=this.container.contentSize.top,this.left=this.container.contentSize.left,this.container.lines=[this]),t.parent&&(this.flexDirection=t.parent.style.flexDirection,this.key=it[this.flexDirection]),this.initHeight(t),this.outerWidth=t.parent&&t.parent.contentSize[this.key.contentWidth]?t.parent.contentSize[this.key.contentWidth]:1/0,this.add(t)},r.add=function(t){this.ids.push(t.id);var e=t.style.flex;H(e)?this.flexTotal+=e:H(this.getWidth(t.style))&&(this.exactValue+=this.getWidth(t.offsetSize)),this.elements.push(t),this.refreshWidthHeight(t),t.next||this.closeLine()},r.closeLine=function(){this.calcFlex()},r.initHeight=function(t){this[this.key.height]=0},r.getWidth=function(t){return t[this.key.width]||0},r.getHeight=function(t){return t[this.key.height]||0},r.setWidth=function(t,e){t[this.key.width]=e},r.setHeight=function(t,e){t[this.key.height]=e},r.calcFlex=function(){var t=this,e=this.container.contentSize[this.key.contentWidth],i=0;this.elements.forEach((function(n){var r=n.style,o=n.contentSize,s=t.getWidth(r)||t.getWidth(o);H(r.flex)&&(s=r.flex/t.flexTotal*(e-t.exactValue)),t.setWidth(n.computedStyle,s),n.isFlexCalc=!0,delete n.line,delete n.lines,delete n.lineMaxWidth,n.getBoxWidthHeight(),i=Math.max(i,t.getHeight(n.offsetSize))})),this.setHeight(this,i)},r.refreshWidthHeight=function(t){var e=this.container.style.alignItems;e&&!t.style.alignSelf&&(t.style.alignSelf=e);var i=this.getHeight(t.offsetSize);i>this[this.key.height]&&(this.container[this.key.lineMaxHeight]=this[this.key.height]=i),this[this.key.width]+=this.getWidth(t.offsetSize);var n=Math.min(this.getWidth(this),!this.getWidth(this.container.contentSize)&&1/0);(this.container[this.key.lineMaxWidth]||0)<n&&(this.container[this.key.lineMaxWidth]=n)},r.refreshXAlign=function(){var t=this,e=this.elements.reduce((function(e,i){return e+t.getWidth(i.offsetSize)}),0),i=(this.outerWidth==1/0?0:this.outerWidth-e)||0,n=this.container.style.justifyContent;"center"===n?i/=2:"flex-start"===n?i=0:["space-between","space-around"].includes(n)&&(!function(e,i){void 0===i&&(i=0),i/=t.elements.length+(e?-1:1),t.elements.forEach((function(n,r){var o;e&&!r||(n.style.margin?n.style.margin[t.key.marginLeft]+=i:n.style.margin=((o={})[t.key.marginLeft]=i,o),n.getBoxPosition())})),i=0}("space-between"==n,i),i=0),this.offsetX=i||0,this.refreshYAlign()},r.refreshYAlign=function(){var t=this;if(1==this.container.lines.length)return 0;var e=this.container.lines.reduce((function(e,i){return e+t.getHeight(i)}),0),i=this.container.style.alignItems,n=this.getHeight(this.container.contentSize);if("center"===i){var r=(n-e)/(this.container.lines.length+1);this.container.lines.forEach((function(t){t.offsetY=r}))}if("flex-end"===i){var o=n-e;this.container.lines[0].offsetY=o}},r.getOffsetY=function(t){if(this.container.lines.length>1)return 0;var e=t.style.alignSelf,i=this.getHeight(this.container.contentSize),n=i-this.getHeight(t.offsetSize);return"flex-end"===e?n:"center"===e?n/2:"stretch"===e?(n&&t.name==d&&(t.style[this.key.width]=this.getWidth(t.offsetSize),t.style[this.key.height]=i,delete t.line,delete t.lines,t.getBoxWidthHeight()),0):0},r.layout=function(t,e){var i=this;this.refreshXAlign(),this.pre?(this.top=this.pre.top+this.pre.height+this.offsetY,this.left=e+this.offsetX):(this.top=Math.max(this.top,this.container.contentSize.top,t)+this.offsetY,this.left=Math.max(this.left,this.container.contentSize.left,e)+this.offsetX),this.elements.forEach((function(t,e){i.setIndent(t);var n=i.elements[e-1],r=i.getOffsetY(t);t.style[i.key.top]=i[i.key.top]+r,t.style[i.key.left]=n?n.offsetSize[i.key.left]+i.getWidth(n.offsetSize):i[i.key.left],t.getBoxPosition()}))},n}(et),rt=p,ot=u,st=d,at=v,ht=y,ct=b,ft=w,lt=m,dt=0,ut={left:null,top:null,width:null,height:null},pt=new Map,gt=function(){function t(t,e,i,n){var o=this;F(this,"id",dt++),F(this,"style",{left:null,top:null,width:null,height:null}),F(this,"computedStyle",{}),F(this,"originStyle",{}),F(this,"children",{}),F(this,"layoutBox",A({},ut)),F(this,"contentSize",A({},ut)),F(this,"clientSize",A({},ut)),F(this,"borderSize",A({},ut)),F(this,"offsetSize",A({},ut)),this.ctx=n,this.root=i,e&&(this.parent=e),this.name=t.type||t.name,this.attributes=this.getAttributes(t);var s=function(t,e){var i,n=["color","fontSize","lineHeight","verticalAlign","fontWeight","textAlign"],o=t.type,s=void 0===o?N:o,a=t.styles,h=void 0===a?{}:a,c=(e||{}).computedStyle,f=Object.assign({},S);if([U,Y,X].includes(s)&&!h.display&&(f.display=_),c)for(var l=0;l<n.length;l++){var d=n[l];(h[d]||c[d])&&(h[d]=h[(i=d,i.replace(/([A-Z])/g,"-$1").toLowerCase())]||h[d]||c[d])}for(var u=function(t){var e,i,n,o,a=h[t];if(/-/.test(t)&&(t=V(t),f[t]=a),/^(box|text)?shadow$/i.test(t)){var c=[];return a.replace(/((-?\d+(rpx|px|vw|vh)?\s+?){3})(.+)/,(function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];c=t[1].match(/-?\d+(rpx|px|vw|vh)?/g).map((function(t){return W(t)})).concat(t[4])})),/^text/.test(t)?f.textShadow=c:f.boxShadow=c,"continue"}if(/^border/i.test(t)&&!/radius$/i.test(t)){var l=t.match(/^border([BTRLa-z]+)?/)[0],d=t.match(/[W|S|C][a-z]+/),u=a.replace(/([\(,])\s+|\s+([\),])/g,"$1$2").split(" ").map((function(t){return/^\d/.test(t)?W(t,""):t}));return f[l]||(f[l]={}),1==u.length&&d?f[l][l+d[0]]=u[0]:f[l]=((e={})[l+"Width"]=B(u[0])?u[0]:0,e[l+"Style"]=u[1]||"solid",e[l+"Color"]=u[2]||"black",e),"continue"}if(/^background(color)?$/i.test(t))return f.backgroundColor=a,"continue";if(/^objectPosition$/i.test(t))return f[t]=a.split(" "),"continue";if(/^backgroundPosition$/i.test(t))return f[t]=a.split(" "),"continue";if(/padding|margin|radius/i.test(t)){var p=/radius$/i.test(t),g="borderRadius",v=p?g:t.match(/[a-z]+/)[0],y=function(t,e){return"border".concat(t).concat(e,"Radius")},x=[0,0,0,0].map((function(t,e){return p?[y(r[0],r[3]),y(r[0],r[1]),y(r[2],r[1]),y(r[2],r[3])][e]:v+r[e]}));if("padding"===t||"margin"===t||/^(border)?radius$/i.test(t)){u="".concat(a).split(" ").map((function(e){return/^-?\d+(rpx|px|vh|vw)?$/.test(e)?W(e):"margin"!=t&&/auto/.test(e)?0:e}),[])||[0];var b=p?g:t,w=u[0],m=u[1],S=u[2],z=u[3];f[b]=((i={})[x[0]]=D(w)?0:w,i[x[1]]=B(m)||D(m)?m:w,i[x[2]]=D(B(S)?S:w)?0:B(S)?S:w,i[x[3]]=B(z)?z:null!=m?m:w,i)}else"object"==typeof f[v]||(f[v]=((n={})[x[0]]=f[v]||0,n[x[1]]=f[v]||0,n[x[2]]=f[v]||0,n[x[3]]=f[v]||0,n)),f[v][t]="margin"==v&&D(a)||$(a)?a:W(a);return"continue"}if(/^transform$/i.test(t))return f[t]={},a.replace(/([a-zA-Z]+)\(([0-9,-\.%rpxdeg\s]+)\)/g,(function(e,i,n){var r=n.split(",").map((function(t){return t.replace(/(^\s*)|(\s*$)/g,"")})),o=function(t,e){return t.includes("deg")?1*t:e&&!$(e)?W(t,e):t};i.includes("matrix")?f[t][i]=r.map((function(t){return 1*t})):i.includes("rotate")?f[t][i]=1*n.match(/^-?\d+(\.\d+)?/)[0]:/[X, Y]/.test(i)?f[t][i]=/[X]/.test(i)?o(r[0],h.width):o(r[0],h.height):(f[t][i+"X"]=o(r[0],h.width),f[t][i+"Y"]=o(r[1]||r[0],h.height))})),"continue";if(/^font$/i.test(t)&&console.warn("font 不支持简写"),/^textindent/i.test(t)&&(f[t]=/^calc/.test(a)?a:W(a)),/^textstroke/i.test(t)){var I=t.match(/color|width|type$/i),M=(l="textStroke",a.split(" ").map((function(t){return/^\d+(rpx|px|vh|vw)?$/.test(t)?W(t):t})));return I?f[l]?f[l][I[0]]=M[0]:f[l]=((o={})[I[0]]=M[0],o):f[l]={width:M[0],color:M[1],type:M[2]},"continue"}/^left|top$/i.test(t)&&![q,G].includes(h.position)?f[t]=0:f[t]=/^-?[\d\.]+(px|rpx|vw|vh)?$/.test(a)?W(a):/em$/.test(a)&&s==U?W(a,h.fontSize):a},p=0,g=Object.keys(h);p<g.length;p++)u(g[p]);return f}(t,e);this.isAbsolute=s.position==ft,this.isFixed=s.position==lt,this.originStyle=s,this.styles=t.styles,Object.keys(s).forEach((function(t){Object.defineProperty(o.style,t,{configurable:!0,enumerable:!0,get:function(){return s[t]},set:function(e){s[t]=e}})}));var a={contentSize:A({},this.contentSize),clientSize:A({},this.clientSize),borderSize:A({},this.borderSize),offsetSize:A({},this.offsetSize)};Object.keys(a).forEach((function(t){Object.keys(o[t]).forEach((function(e){Object.defineProperty(o[t],e,{configurable:!0,enumerable:!0,get:function(){return a[t][e]},set:function(i){a[t][e]=i}})}))})),this.computedStyle=this.style}var e=t.prototype;return e.add=function(t){t.parent=this,this.children[t.id]=t},e.getChildren=function(){var t=this;return Object.keys(this.children).map((function(e){return t.children[e]}))},e.prev=function(t){void 0===t&&(t=this);var e=t.parent.getChildren();return e[e.findIndex((function(e){return e.id==t.id}))-1]},e.querySelector=function(t){var e=this.getChildren();if("string"!=typeof t)return null;var i=e.find((function(e){var i=e.id,n=e.attributes;return i==t||n&&n.uid==t}));return i||(this.parent&&this.parent.querySelector&&this.parent.querySelector(t)||null)},e.getLineRect=function(t,e){var i={width:0,height:0},n=e?e.lines:this.parent&&this.parent.lines;return n&&n.find((function(e){return e.ids.includes(t)}))||i},e.setPosition=function(t,e){var i={left:"width",top:"height",right:"width",bottom:"height"};Object.keys(i).forEach((function(n){var r=n==o?"left":"top";[o,s].includes(n)&&void 0!==t.style[n]&&!B(t.originStyle[r])?t.style[r]=e[i[n]]-t.offsetSize[i[n]]-W(t.style[n],e[i[n]]):t.style[n]=W(t.style[n],e[i[n]])}))},e.getAttributes=function(t){var e=t.attributes,i=void 0===e?{}:e,n=t.uid,r=t.url,o=t.src,s=t.replace,a=t.text;return n&&(i.uid=n),(r||o)&&(i.src=i.src||r||o),s&&(i.replace=s),a&&(i.text=a),i},e.getOffsetSize=function(t,e,i){void 0===i&&(i=a[3]);var n=e||{},r=n.margin,o=(r=void 0===r?{}:r).marginLeft,s=void 0===o?0:o,h=r.marginTop,c=void 0===h?0:h,f=r.marginRight,l=void 0===f?0:f,d=r.marginBottom,u=void 0===d?0:d,p=n.padding,g=(p=void 0===p?{}:p).paddingLeft,v=void 0===g?0:g,y=p.paddingTop,x=void 0===y?0:y,b=p.paddingRight,w=void 0===b?0:b,m=p.paddingBottom,S=void 0===m?0:m,z=n.border,I=(z=void 0===z?{}:z).borderWidth,M=void 0===I?0:I,k=n.borderTop,B=(k=void 0===k?{}:k).borderTopWidth,W=void 0===B?M:B,P=n.borderBottom,O=(P=void 0===P?{}:P).borderBottomWidth,T=void 0===O?M:O,L=n.borderRight,R=(L=void 0===L?{}:L).borderRightWidth,F=void 0===R?M:R,A=n.borderLeft,j=(A=void 0===A?{}:A).borderLeftWidth,E=void 0===j?M:j,C=s<0&&l<0?Math.abs(s+l):0,H=c<0&&u<0?Math.abs(c+u):0,D=s>=0&&l<0,$=c>=0&&u<0;return i==a[0]&&(this[i].left=t.left+s+v+E+(D?2*-l:0),this[i].top=t.top+c+x+W+($?2*-u:0),this[i].width=t.width+(this[i].widthAdd?0:C),this[i].height=t.height+(this[i].heightAdd?0:H),this[i].widthAdd=C,this[i].heightAdd=H),i==a[1]&&(this[i].left=t.left+s+E+(D<0?-l:0),this[i].top=t.top+c+W+($?-u:0),this[i].width=t.width+v+w,this[i].height=t.height+x+S),i==a[2]&&(this[i].left=t.left+s+E/2+(D<0?-l:0),this[i].top=t.top+c+W/2+($?-u:0),this[i].width=t.width+v+w+E/2+F/2,this[i].height=t.height+x+S+T/2+W/2),i==a[3]&&(this[i].left=t.left+(D<0?-l:0),this[i].top=t.top+($?-u:0),this[i].width=t.width+v+w+E+F+s+l,this[i].height=t.height+x+S+T+W+u+c),this[i]},e.layoutBoxUpdate=function(t,e,i,n){var r=this;if(void 0===i&&(i=-1),"border-box"==e.boxSizing){var o=e||{},s=o.border,h=(s=void 0===s?{}:s).borderWidth,c=void 0===h?0:h,f=o.borderTop,l=(f=void 0===f?{}:f).borderTopWidth,d=void 0===l?c:l,u=o.borderBottom,p=(u=void 0===u?{}:u).borderBottomWidth,g=void 0===p?c:p,v=o.borderRight,y=(v=void 0===v?{}:v).borderRightWidth,x=void 0===y?c:y,b=o.borderLeft,w=(b=void 0===b?{}:b).borderLeftWidth,m=void 0===w?c:w,S=o.padding,z=(S=void 0===S?{}:S).paddingTop,I=void 0===z?0:z,M=S.paddingRight,k=void 0===M?0:M,B=S.paddingBottom,W=void 0===B?0:B,P=S.paddingLeft,O=void 0===P?0:P;i||(t.width-=O+k+x+m),1!==i||n||(t.height-=I+W+d+g)}this.layoutBox&&(a.forEach((function(i){return r.layoutBox[i]=r.getOffsetSize(t,e,i)})),this.layoutBox=Object.assign({},this.layoutBox,this.layoutBox.borderSize))},e.getBoxPosition=function(){var t=this.computedStyle,e=this.fixedLine,i=this.lines,n=t.left,r=void 0===n?0:n,o=t.top,s=void 0===o?0:o,a=A({},this.contentSize,{left:r,top:s}),h=this.contentSize.top-this.offsetSize.top,c=this.contentSize.left-this.offsetSize.left;if(this.root.fixedLine&&!this.root.isDone){this.root.isDone=!0;for(var f,l=C(this.root.fixedLine.elements);!(f=l()).done;){var d=f.value;d.setPosition(d,this.root.offsetSize),d.getBoxPosition()}}if(e)for(var u,p=C(e.elements);!(u=p()).done;){var g=u.value,v=A({},this.borderSize,{left:r,top:s});g.setPosition(g,v);var y=this.borderSize.top-this.offsetSize.top,x=this.borderSize.left-this.offsetSize.left;g.style.left+=r+x,g.style.top+=s+y,g.getBoxPosition()}if(i)for(var b,w=C(i);!(b=w()).done;){b.value.layout(a.top+h,a.left+c)}return this.layoutBoxUpdate(a,t),this.layoutBox},e.getBoxState=function(t,e){return this.isBlock(t)||this.isBlock(e)},e.isBlock=function(t){return void 0===t&&(t=this),t&&t.style.display==at},e.isFlex=function(t){return void 0===t&&(t=this),t&&t.style.display==ct},e.isInFlow=function(){return!(this.isAbsolute||this.isFixed)},e.inFlexBox=function(t){return void 0===t&&(t=this),!!t.isInFlow()&&(!!t.parent&&(!(!t.parent||t.parent.style.display!==ct)||void 0))},e.isInline=function(t){return void 0===t&&(t=this),t&&t.style.display==ht},e.contrastSize=function(t,e,i){var n=t;return i&&(n=Math.min(n,i)),e&&(n=Math.max(n,e)),n},e.measureText=function(t,e){var i=this.ctx.measureText(t),n=i.width,r=i.actualBoundingBoxAscent,o=i.actualBoundingBoxDescent;return{ascent:r,descent:o,width:n,fontHeight:r+o||.7*e+1}},e.getParentSize=function(t,e){if(void 0===t&&(t=this),void 0===e&&(e=!1),t&&t.parent){if(t.parent.contentSize.width)return t.parent.contentSize;if(e)return this.getParentSize(t.parent,e)}return null},e.getBoxWidthHeight=function(){var t=this,e=this.name,i=this.computedStyle,n=this.attributes,r=this.parent,o=void 0===r?{}:r,s=this.ctx,a=this.getChildren(),h=i.left,c=void 0===h?0:h,f=i.top,l=void 0===f?0:f,d=i.bottom,u=i.right,p=i.width,g=void 0===p?0:p,v=i.minWidth,y=i.maxWidth,x=i.minHeight,b=i.maxHeight,w=i.height,m=void 0===w?0:w,S=i.fontSize,z=i.fontWeight,I=i.fontFamily,M=i.fontStyle,k=i.position;i.textIndent;var B=i.lineClamp,P=i.lineHeight,O=i.padding,T=void 0===O?{}:O,L=i.margin,R=void 0===L?{}:L,F=i.border,A=(F=void 0===F?{}:F).borderWidth,j=void 0===A?0:A,E=i.borderRight,C=(E=void 0===E?{}:E).borderRightWidth,H=void 0===C?j:C,Y=i.borderLeft,U=(Y=void 0===Y?{}:Y).borderLeftWidth,N=void 0===U?j:U,X=o.contentSize&&o.contentSize.width,_=o.contentSize&&o.contentSize.height;if($(g)&&X&&(g=W(g,X)),$(g)&&!X&&(g=null),$(m)&&_&&(m=W(m,_)),$(m)&&!_&&(m=null),$(v)&&X&&(v=W(v,X)),$(y)&&X&&(y=W(y,X)),$(x)&&_&&(x=W(x,_)),$(b)&&_&&(b=W(b,_)),i.padding&&X)for(var q in i.padding)Object.hasOwnProperty.call(T,q)&&(T[q]=W(T[q],X));var G=T.paddingRight,V=void 0===G?0:G,J=T.paddingLeft,Q=void 0===J?0:J;if(i.margin&&[R.marginLeft,R.marginRight].includes("auto"))if(g){var Z=X&&X-g-V-Q-N-H||0;R.marginLeft==R.marginRight?R.marginLeft=R.marginRight=Z/2:D(R.marginLeft)?R.marginLeft=Z:R.marginRight=Z}else R.marginLeft=R.marginRight=0;var K=R.marginRight,tt=void 0===K?0:K,it=R.marginLeft,at={width:g,height:m,left:0,top:0},ht=Q+V+N+H+(void 0===it?0:it)+tt;if(this.offsetWidth=ht,e==ot&&!this.attributes.widths){var ct=n.text||"";s.save(),s.setFonts({fontFamily:I,fontSize:S,fontWeight:z,fontStyle:M}),ct.length,"\n"==ct&&(ct="",this.isBr=!0),(""+ct).split("\n").map((function(e){var i=Array.from(e).map((function(e){var i=""+(/^[\u4e00-\u9fa5]+$/.test(e)?"cn":e)+I+S+z+M,n=pt.get(i);if(n)return{width:n,text:e};var r=t.measureText(e,S).width;return pt.set(i,r),{width:r,text:e}})),n=t.measureText(e,S),r=n.fontHeight,o=n.ascent,s=n.descent;t.attributes.fontHeight=r,t.attributes.ascent=o,t.attributes.descent=s,t.attributes.widths||(t.attributes.widths=[]),t.attributes.widths.push({widths:i,total:i.reduce((function(t,e){return t+e.width}),0)})})),s.restore()}if(e==rt&&null==g){var lt=n.width,dt=n.height;at.width=this.contrastSize(Math.round(lt*m/dt)||0,v,y),this.layoutBoxUpdate(at,i,0)}if(e==ot&&null==g){var ut=this.attributes.widths,gt=Math.max.apply(Math,ut.map((function(t){return t.total})));if(o&&X>0&&(gt>X||this.isBlock(this))&&!this.isAbsolute&&!this.isFixed)gt=X;at.width=this.contrastSize(gt,v,y),this.layoutBoxUpdate(at,i,0)}if(e==ot&&(o.style.flex||!this.attributes.lines)){var vt=this.attributes.widths.length;this.attributes.widths.forEach((function(t){return t.widths.reduce((function(t,e,i){return t+e.width>at.width?(vt++,e.width):t+e.width}),0)})),vt=B&&vt>B?B:vt,this.attributes.lines=vt}if(e==rt&&null==m){var yt=n.width,xt=n.height;n.text,at.height=this.contrastSize(W(at.width*xt/yt)||0,x,b),this.layoutBoxUpdate(at,i,1)}e==ot&&null==m&&(P=W(P,S),at.height=this.contrastSize(W(this.attributes.lines*P),x,b),this.layoutBoxUpdate(at,i,1,!0)),!g&&o&&o.children&&X&&(!this.isFlex(o)||o.isFlexCalc)&&([st,ot].includes(e)&&this.isFlex()||e==st&&this.isBlock(this)&&this.isInFlow())&&(at.width=this.contrastSize(X-(o.isFlexCalc?0:ht),v,y),this.layoutBoxUpdate(at,i)),g&&!$(g)&&(at.width=this.contrastSize(g,v,y),this.layoutBoxUpdate(at,i,0)),m&&!$(m)&&(at.height=this.contrastSize(at.height,x,b),this.layoutBoxUpdate(at,i,1));var bt=0;if(a.length){var wt=null,mt=!1;a.forEach((function(e,n){e.getBoxWidthHeight();var r=a[n+1];if(r&&r.isInFlow()&&(e.next=r),!t.line||!t.line.ids.includes(e.id))if(e.isInFlow()&&!e.inFlexBox()){var o=t.getBoxState(wt,e);if(e.isBr)return mt=!0;t.line&&t.line.canIEnter(e)&&!o&&!mt?t.line.add(e):(mt=!1,(new et).bind(e)),wt=e}else e.inFlexBox()?t.line&&(t.line.canIEnter(e)||"nowrap"==i.flexWrap)?t.line.add(e):(new nt).bind(e):e.isFixed?t.root.fixedLine?t.root.fixedLine.fixedAdd(e):(new et).fixedBind(e):t.fixedLine?t.fixedLine.fixedAdd(e):(new et).fixedBind(e,1)})),this.lines&&(bt=this.lines.reduce((function(t,e){return t+e.height}),0))}var St=0,zt=0;if(!g&&(this.isAbsolute||this.isFixed)&&X){var It=k==ft?X:this.root.width,Mt=It-($(c)?W(c,It):c)-($(u)?W(u,It):u);St=i.left?Mt:this.lineMaxWidth}if(!m&&(null!=l?l:this.isAbsolute||this.isFixed&&_)){var kt=k==ft?_:this.root.height,Bt=kt-($(l)?W(l,kt):l)-($(d)?W(d,kt):d);zt=i.top?Bt:0}if(g&&!$(g)||at.width||(at.width=St||this.contrastSize((this.isBlock(this)&&!this.isInFlow()?X||o.lineMaxWidth:this.lineMaxWidth)||this.lineMaxWidth,v,y),this.layoutBoxUpdate(at,i,0)),m||!bt&&!zt||(at.height=zt||this.contrastSize(bt,x,b),this.layoutBoxUpdate(at,i)),i.borderRadius&&this.borderSize&&this.borderSize.width)for(var q in i.borderRadius)Object.hasOwnProperty.call(i.borderRadius,q)&&(i.borderRadius[q]=W(i.borderRadius[q],this.borderSize.width));return this.layoutBox},e.layout=function(){return this.getBoxWidthHeight(),this.root.offsetSize=this.offsetSize,this.root.contentSize=this.contentSize,this.getBoxPosition(),this.offsetSize},t}(),vt=function(){var t,e,i,n,r,o,s=[0,11,15,19,23,27,31,16,18,20,22,24,26,28,20,22,24,24,26,28,28,22,24,24,26,26,28,28,24,24,26,26,26,28,28,24,26,26,26,28,28],a=[3220,1468,2713,1235,3062,1890,2119,1549,2344,2936,1117,2583,1330,2470,1667,2249,2028,3780,481,4011,142,3098,831,3445,592,2517,1776,2234,1951,2827,1070,2660,1345,3177],h=[30660,29427,32170,30877,26159,25368,27713,26998,21522,20773,24188,23371,17913,16590,20375,19104,13663,12392,16177,14854,9396,8579,11994,11245,5769,5054,7399,6608,1890,597,3340,2107],c=[1,0,19,7,1,0,16,10,1,0,13,13,1,0,9,17,1,0,34,10,1,0,28,16,1,0,22,22,1,0,16,28,1,0,55,15,1,0,44,26,2,0,17,18,2,0,13,22,1,0,80,20,2,0,32,18,2,0,24,26,4,0,9,16,1,0,108,26,2,0,43,24,2,2,15,18,2,2,11,22,2,0,68,18,4,0,27,16,4,0,19,24,4,0,15,28,2,0,78,20,4,0,31,18,2,4,14,18,4,1,13,26,2,0,97,24,2,2,38,22,4,2,18,22,4,2,14,26,2,0,116,30,3,2,36,22,4,4,16,20,4,4,12,24,2,2,68,18,4,1,43,26,6,2,19,24,6,2,15,28,4,0,81,20,1,4,50,30,4,4,22,28,3,8,12,24,2,2,92,24,6,2,36,22,4,6,20,26,7,4,14,28,4,0,107,26,8,1,37,22,8,4,20,24,12,4,11,22,3,1,115,30,4,5,40,24,11,5,16,20,11,5,12,24,5,1,87,22,5,5,41,24,5,7,24,30,11,7,12,24,5,1,98,24,7,3,45,28,15,2,19,24,3,13,15,30,1,5,107,28,10,1,46,28,1,15,22,28,2,17,14,28,5,1,120,30,9,4,43,26,17,1,22,28,2,19,14,28,3,4,113,28,3,11,44,26,17,4,21,26,9,16,13,26,3,5,107,28,3,13,41,26,15,5,24,30,15,10,15,28,4,4,116,28,17,0,42,26,17,6,22,28,19,6,16,30,2,7,111,28,17,0,46,28,7,16,24,30,34,0,13,24,4,5,121,30,4,14,47,28,11,14,24,30,16,14,15,30,6,4,117,30,6,14,45,28,11,16,24,30,30,2,16,30,8,4,106,26,8,13,47,28,7,22,24,30,22,13,15,30,10,2,114,28,19,4,46,28,28,6,22,28,33,4,16,30,8,4,122,30,22,3,45,28,8,26,23,30,12,28,15,30,3,10,117,30,3,23,45,28,4,31,24,30,11,31,15,30,7,7,116,30,21,7,45,28,1,37,23,30,19,26,15,30,5,10,115,30,19,10,47,28,15,25,24,30,23,25,15,30,13,3,115,30,2,29,46,28,42,1,24,30,23,28,15,30,17,0,115,30,10,23,46,28,10,35,24,30,19,35,15,30,17,1,115,30,14,21,46,28,29,19,24,30,11,46,15,30,13,6,115,30,14,23,46,28,44,7,24,30,59,1,16,30,12,7,121,30,12,26,47,28,39,14,24,30,22,41,15,30,6,14,121,30,6,34,47,28,46,10,24,30,2,64,15,30,17,4,122,30,29,14,46,28,49,10,24,30,24,46,15,30,4,18,122,30,13,32,46,28,48,14,24,30,42,32,15,30,20,4,117,30,40,7,47,28,43,22,24,30,10,67,15,30,19,6,118,30,18,31,47,28,34,34,24,30,20,61,15,30],f=[255,0,1,25,2,50,26,198,3,223,51,238,27,104,199,75,4,100,224,14,52,141,239,129,28,193,105,248,200,8,76,113,5,138,101,47,225,36,15,33,53,147,142,218,240,18,130,69,29,181,194,125,106,39,249,185,201,154,9,120,77,228,114,166,6,191,139,98,102,221,48,253,226,152,37,179,16,145,34,136,54,208,148,206,143,150,219,189,241,210,19,92,131,56,70,64,30,66,182,163,195,72,126,110,107,58,40,84,250,133,186,61,202,94,155,159,10,21,121,43,78,212,229,172,115,243,167,87,7,112,192,247,140,128,99,13,103,74,222,237,49,197,254,24,227,165,153,119,38,184,180,124,17,68,146,217,35,32,137,46,55,63,209,91,149,188,207,205,144,135,151,178,220,252,190,97,242,86,211,171,20,42,93,158,132,60,57,83,71,109,65,162,31,45,67,216,183,123,164,118,196,23,73,236,127,12,111,246,108,161,59,82,41,157,85,170,251,96,134,177,187,204,62,90,203,89,95,176,156,169,160,81,11,245,22,235,122,117,44,215,79,174,213,233,230,231,173,232,116,214,244,234,168,80,88,175],l=[1,2,4,8,16,32,64,128,29,58,116,232,205,135,19,38,76,152,45,90,180,117,234,201,143,3,6,12,24,48,96,192,157,39,78,156,37,74,148,53,106,212,181,119,238,193,159,35,70,140,5,10,20,40,80,160,93,186,105,210,185,111,222,161,95,190,97,194,153,47,94,188,101,202,137,15,30,60,120,240,253,231,211,187,107,214,177,127,254,225,223,163,91,182,113,226,217,175,67,134,17,34,68,136,13,26,52,104,208,189,103,206,129,31,62,124,248,237,199,147,59,118,236,197,151,51,102,204,133,23,46,92,184,109,218,169,79,158,33,66,132,21,42,84,168,77,154,41,82,164,85,170,73,146,57,114,228,213,183,115,230,209,191,99,198,145,63,126,252,229,215,179,123,246,241,255,227,219,171,75,150,49,98,196,149,55,110,220,165,87,174,65,130,25,50,100,200,141,7,14,28,56,112,224,221,167,83,166,81,162,89,178,121,242,249,239,195,155,43,86,172,69,138,9,18,36,72,144,61,122,244,245,247,243,251,235,203,139,11,22,44,88,176,125,250,233,207,131,27,54,108,216,173,71,142,0],d=[],u=[],p=[],g=[],v=[],y=2;function x(t,e){var i;t>e&&(i=t,t=e,e=i),i=e,i*=e,i+=e,i>>=1,g[i+=t]=1}function b(t,i){var n;for(p[t+e*i]=1,n=-2;n<2;n++)p[t+n+e*(i-2)]=1,p[t-2+e*(i+n+1)]=1,p[t+2+e*(i+n)]=1,p[t+n+1+e*(i+2)]=1;for(n=0;n<2;n++)x(t-1,i+n),x(t+1,i-n),x(t-n,i-1),x(t+n,i+1)}function w(t){for(;t>=255;)t=((t-=255)>>8)+(255&t);return t}var m=[];function S(t,e,i,n){var r,o,s;for(r=0;r<n;r++)d[i+r]=0;for(r=0;r<e;r++){if(255!=(s=f[d[t+r]^d[i]]))for(o=1;o<n;o++)d[i+o-1]=d[i+o]^l[w(s+m[n-o])];else for(o=i;o<i+n;o++)d[o]=d[o+1];d[i+n-1]=255==s?0:l[w(s+m[0])]}}function z(t,e){var i;return t>e&&(i=t,t=e,e=i),i=e,i+=e*e,i>>=1,g[i+=t]}function I(t){var i,n,r,o;switch(t){case 0:for(n=0;n<e;n++)for(i=0;i<e;i++)i+n&1||z(i,n)||(p[i+n*e]^=1);break;case 1:for(n=0;n<e;n++)for(i=0;i<e;i++)1&n||z(i,n)||(p[i+n*e]^=1);break;case 2:for(n=0;n<e;n++)for(r=0,i=0;i<e;i++,r++)3==r&&(r=0),r||z(i,n)||(p[i+n*e]^=1);break;case 3:for(o=0,n=0;n<e;n++,o++)for(3==o&&(o=0),r=o,i=0;i<e;i++,r++)3==r&&(r=0),r||z(i,n)||(p[i+n*e]^=1);break;case 4:for(n=0;n<e;n++)for(r=0,o=n>>1&1,i=0;i<e;i++,r++)3==r&&(r=0,o=!o),o||z(i,n)||(p[i+n*e]^=1);break;case 5:for(o=0,n=0;n<e;n++,o++)for(3==o&&(o=0),r=0,i=0;i<e;i++,r++)3==r&&(r=0),(i&n&1)+!(!r|!o)||z(i,n)||(p[i+n*e]^=1);break;case 6:for(o=0,n=0;n<e;n++,o++)for(3==o&&(o=0),r=0,i=0;i<e;i++,r++)3==r&&(r=0),(i&n&1)+(r&&r==o)&1||z(i,n)||(p[i+n*e]^=1);break;case 7:for(o=0,n=0;n<e;n++,o++)for(3==o&&(o=0),r=0,i=0;i<e;i++,r++)3==r&&(r=0),(r&&r==o)+(i+n&1)&1||z(i,n)||(p[i+n*e]^=1)}}function M(t){var e,i=0;for(e=0;e<=t;e++)v[e]>=5&&(i+=3+v[e]-5);for(e=3;e<t-1;e+=2)v[e-2]==v[e+2]&&v[e+2]==v[e-1]&&v[e-1]==v[e+1]&&3*v[e-1]==v[e]&&(0==v[e-3]||e+3>t||3*v[e-3]>=4*v[e]||3*v[e+3]>=4*v[e])&&(i+=40);return i}function k(){var t,i,n,r,o,s=0,a=0;for(i=0;i<e-1;i++)for(t=0;t<e-1;t++)(p[t+e*i]&&p[t+1+e*i]&&p[t+e*(i+1)]&&p[t+1+e*(i+1)]||!(p[t+e*i]||p[t+1+e*i]||p[t+e*(i+1)]||p[t+1+e*(i+1)]))&&(s+=3);for(i=0;i<e;i++){for(v[0]=0,n=r=t=0;t<e;t++)(o=p[t+e*i])==r?v[n]++:v[++n]=1,a+=(r=o)?1:-1;s+=M(n)}a<0&&(a=-a);var h=a,c=0;for(h+=h<<2,h<<=1;h>e*e;)h-=e*e,c++;for(s+=10*c,t=0;t<e;t++){for(v[0]=0,n=r=i=0;i<e;i++)(o=p[t+e*i])==r?v[n]++:v[++n]=1,r=o;s+=M(n)}return s}var B=null;return{api:{get ecclevel(){return y},set ecclevel(t){y=t},get size(){return _size},set size(t){_size=t},get canvas(){return B},set canvas(t){B=t},getFrame:function(v){return function(v){var M,B,W,P,O,T,L,R;P=v.length,t=0;do{if(t++,W=4*(y-1)+16*(t-1),i=c[W++],n=c[W++],r=c[W++],o=c[W],P<=(W=r*(i+n)+n-3+(t<=9)))break}while(t<40);for(e=17+4*t,O=r+(r+o)*(i+n)+n,P=0;P<O;P++)u[P]=0;for(d=v.slice(0),P=0;P<e*e;P++)p[P]=0;for(P=0;P<(e*(e+1)+1)/2;P++)g[P]=0;for(P=0;P<3;P++){for(W=0,B=0,1==P&&(W=e-7),2==P&&(B=e-7),p[B+3+e*(W+3)]=1,M=0;M<6;M++)p[B+M+e*W]=1,p[B+e*(W+M+1)]=1,p[B+6+e*(W+M)]=1,p[B+M+1+e*(W+6)]=1;for(M=1;M<5;M++)x(B+M,W+1),x(B+1,W+M+1),x(B+5,W+M),x(B+M+1,W+5);for(M=2;M<4;M++)p[B+M+e*(W+2)]=1,p[B+2+e*(W+M+1)]=1,p[B+4+e*(W+M)]=1,p[B+M+1+e*(W+4)]=1}if(t>1)for(P=s[t],B=e-7;;){for(M=e-7;M>P-3&&(b(M,B),!(M<P));)M-=P;if(B<=P+9)break;b(6,B-=P),b(B,6)}for(p[8+e*(e-8)]=1,B=0;B<7;B++)x(7,B),x(e-8,B),x(7,B+e-7);for(M=0;M<8;M++)x(M,7),x(M+e-8,7),x(M,e-8);for(M=0;M<9;M++)x(M,8);for(M=0;M<8;M++)x(M+e-8,8),x(8,M);for(B=0;B<7;B++)x(8,B+e-7);for(M=0;M<e-14;M++)1&M?(x(8+M,6),x(6,8+M)):(p[8+M+6*e]=1,p[6+e*(8+M)]=1);if(t>6)for(P=a[t-7],W=17,M=0;M<6;M++)for(B=0;B<3;B++,W--)1&(W>11?t>>W-12:P>>W)?(p[5-M+e*(2-B+e-11)]=1,p[2-B+e-11+e*(5-M)]=1):(x(5-M,2-B+e-11),x(2-B+e-11,5-M));for(B=0;B<e;B++)for(M=0;M<=B;M++)p[M+e*B]&&x(M,B);for(O=d.length,T=0;T<O;T++)u[T]=d.charCodeAt(T);if(d=u.slice(0),O>=(M=r*(i+n)+n)-2&&(O=M-2,t>9&&O--),T=O,t>9){for(d[T+2]=0,d[T+3]=0;T--;)P=d[T],d[T+3]|=255&P<<4,d[T+2]=P>>4;d[2]|=255&O<<4,d[1]=O>>4,d[0]=64|O>>12}else{for(d[T+1]=0,d[T+2]=0;T--;)P=d[T],d[T+2]|=255&P<<4,d[T+1]=P>>4;d[1]|=255&O<<4,d[0]=64|O>>4}for(T=O+3-(t<10);T<M;)d[T++]=236,d[T++]=17;for(m[0]=1,T=0;T<o;T++){for(m[T+1]=1,L=T;L>0;L--)m[L]=m[L]?m[L-1]^l[w(f[m[L]]+T)]:m[L-1];m[0]=l[w(f[m[0]]+T)]}for(T=0;T<=o;T++)m[T]=f[m[T]];for(W=M,B=0,T=0;T<i;T++)S(B,r,W,o),B+=r,W+=o;for(T=0;T<n;T++)S(B,r+1,W,o),B+=r+1,W+=o;for(B=0,T=0;T<r;T++){for(L=0;L<i;L++)u[B++]=d[T+L*r];for(L=0;L<n;L++)u[B++]=d[i*r+T+L*(r+1)]}for(L=0;L<n;L++)u[B++]=d[i*r+T+L*(r+1)];for(T=0;T<o;T++)for(L=0;L<i+n;L++)u[B++]=d[M+T+L*o];for(d=u,M=B=e-1,W=O=1,R=(r+o)*(i+n)+n,T=0;T<R;T++)for(P=d[T],L=0;L<8;L++,P<<=1){128&P&&(p[M+e*B]=1);do{O?M--:(M++,W?0!=B?B--:(W=!W,6==(M-=2)&&(M--,B=9)):B!=e-1?B++:(W=!W,6==(M-=2)&&(M--,B-=8))),O=!O}while(z(M,B))}for(d=p.slice(0),P=0,B=3e4,W=0;W<8&&(I(W),(M=k())<B&&(B=M,P=W),7!=P);W++)p=d.slice(0);for(P!=W&&I(P),B=h[P+(y-1<<3)],W=0;W<8;W++,B>>=1)1&B&&(p[e-1-W+8*e]=1,W<6?p[8+e*W]=1:p[8+e*(W+1)]=1);for(W=0;W<7;W++,B>>=1)1&B&&(p[8+e*(e-7+W)]=1,W?p[6-W+8*e]=1:p[7+8*e]=1);return p}(v)},utf16to8:function(t){var e,i,n,r;for(e="",n=t.length,i=0;i<n;i++)(r=t.charCodeAt(i))>=1&&r<=127?e+=t.charAt(i):r>2047?(e+=String.fromCharCode(224|r>>12&15),e+=String.fromCharCode(128|r>>6&63),e+=String.fromCharCode(128|r>>0&63)):(e+=String.fromCharCode(192|r>>6&31),e+=String.fromCharCode(128|r>>0&63));return e},draw:function(t,i,n,r,o){i.drawView(n,r);var s=i.ctx,a=n.contentSize,h=a.width,c=a.height,f=a.left,l=a.top;r.borderRadius,r.backgroundColor;var d=r.color,u=void 0===d?"#000000":d;r.border,n.contentSize.left,n.borderSize.left,n.contentSize.top,n.borderSize.top;if(y=o||y,s){s.save(),i.setOpacity(r),i.setTransform(n,r);var p=Math.min(h,c);t=this.utf16to8(t);var g=this.getFrame(t),v=p/e;s.setFillStyle(u);for(var x=0;x<e;x++)for(var b=0;b<e;b++)g[b*e+x]&&s.fillRect(f+v*x,l+v*b,v,v);s.restore(),i.setBorder(n,r)}else console.warn("No canvas provided to draw QR code in!")}}}}(),yt=p,xt=u,bt=g,wt=d,mt=f.TOP,St=f.MIDDLE,zt=f.BOTTOM,It=l.LEFT,Mt=l.CENTER,kt=l.RIGHT,Bt=function(){function r(t){var e,i,r=this;this.v="1.9.5.1",this.id=null,this.pixelRatio=1,this.width=0,this.height=0,this.sleep=1e3/30,this.count=0,this.isRate=!1,this.isDraw=!0,this.isCache=!0,this.fixed="",this.useCORS=!1,this.performance=!1,this.imageBus=[],this.createImage=function(t,e){return new Promise((function(i,n){var o=null;window||r.canvas.createImage?(o=r.canvas&&r.canvas.createImage?r.canvas.createImage():new Image,e&&o.setAttribute("crossOrigin","Anonymous"),o.src=t,o.onload=function(){i({width:o.naturalWidth||o.width,height:o.naturalHeight||o.height,path:o,src:this.src})},o.onerror=function(t){n(t)}):n({fail:"getImageInfo fail",src:t})}))},this.options=t,Object.assign(this,t),this.ctx=(e=t.context,i={get:function(t,i){if("setFonts"===i)return function(t){var i=t.fontFamily,r=void 0===i?"sans-serif":i,o=t.fontSize,s=void 0===o?14:o,a=t.fontWeight,h=void 0===a?"normal":a,c=t.fontStyle,f=void 0===c?"normal":c;I==n.MP_TOUTIAO&&(h="bold"==h?"bold":"",f="italic"==f?"italic":""),e.font="".concat(f," ").concat(h," ").concat(Math.round(s),"px ").concat(r)};if(!e.draw||!e.setFillStyle){if("setFillStyle"===i)return function(t){e.fillStyle=t};if("setStrokeStyle"===i)return function(t){e.strokeStyle=t};if("setLineWidth"===i)return function(t){e.lineWidth=t};if("setLineCap"===i)return function(t){e.lineCap=t};if("setFontSize"===i)return function(t){e.font="".concat(String(t),"px sans-serif")};if("setGlobalAlpha"===i)return function(t){e.globalAlpha=t};if("setLineJoin"===i)return function(t){e.lineJoin=t};if("setTextAlign"===i)return function(t){e.textAlign=t};if("setMiterLimit"===i)return function(t){e.miterLimit=t};if("setShadow"===i)return function(t,i,n,r){e.shadowOffsetX=t,e.shadowOffsetY=i,e.shadowBlur=n,e.shadowColor=r};if("setTextBaseline"===i)return function(t){e.textBaseline=t};if("createCircularGradient"===i)return function(){};if("draw"===i)return function(){};if("function"==typeof e[i])return function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];return e[i].apply(e,t)}}return t[i]},set:function(t,i,n){return e[i]=n,!0}},new Proxy(e,i)),this.progress=0,this.root={width:t.width,height:t.height,fontSizeRate:1,fixedLine:null},this.size=this.root;var o=0;Object.defineProperty(this,"progress",{configurable:!0,set:function(t){o=t,r.lifecycle("onProgress",t/r.count)},get:function(){return o||0}})}return r.prototype.lifecycle=function(t,e){this.options.listen&&this.options.listen[t]&&this.options.listen[t](e)},r.prototype.setContext=function(t){t&&(this.ctx=t)},r.prototype.init=function(){if(this.canvas.height||n.WEB==I){this.ctx.setTransform(1,0,0,1,0,0);var t=this.size.height*this.pixelRatio,e=this.size.width*this.pixelRatio;this.canvas.height=t,this.canvas.width=e,this.ctx.scale(this.pixelRatio,this.pixelRatio)}},r.prototype.clear=function(){this.ctx.clearRect(0,0,this.size.width,this.size.height)},r.prototype.clipPath=function(t,e,i,n,r,o,s){void 0===o&&(o=!1),void 0===s&&(s=!1);var a=this.ctx;if(/polygon/.test(r)){var h=r.match(/-?\d+(rpx|px|%)?\s+-?\d+(rpx|px|%)?/g)||[];a.beginPath(),h.map((function(r){var o=r.split(" "),s=o[0],a=o[1];return[W(s,i)+t,W(a,n)+e]})).forEach((function(t,e){0==e?a.moveTo(t[0],t[1]):a.lineTo(t[0],t[1])})),a.closePath(),s&&a.stroke(),o&&a.fill()}},r.prototype.roundRect=function(t,e,i,n,r,o,s){if(void 0===o&&(o=!1),void 0===s&&(s=!1),!(r<0)){var a=this.ctx;if(a.beginPath(),r){var h=r||{},c=h.borderTopLeftRadius,f=void 0===c?r||0:c,l=h.borderTopRightRadius,d=void 0===l?r||0:l,u=h.borderBottomRightRadius,p=void 0===u?r||0:u,g=h.borderBottomLeftRadius,v=void 0===g?r||0:g;a.arc(t+i-p,e+n-p,p,0,.5*Math.PI),a.lineTo(t+v,e+n),a.arc(t+v,e+n-v,v,.5*Math.PI,Math.PI),a.lineTo(t,e+f),a.arc(t+f,e+f,f,Math.PI,1.5*Math.PI),a.lineTo(t+i-d,e),a.arc(t+i-d,e+d,d,1.5*Math.PI,2*Math.PI),a.lineTo(t+i,e+n-p)}else a.rect(t,e,i,n);a.closePath(),s&&a.stroke(),o&&a.fill()}},r.prototype.setTransform=function(t,e){var i=e.transform,n=e.transformOrigin,r=this.ctx,o=i||{},s=o.scaleX,a=void 0===s?1:s,h=o.scaleY,c=void 0===h?1:h,f=o.translateX,l=void 0===f?0:f,d=o.translateY,u=void 0===d?0:d,p=o.rotate,g=void 0===p?0:p,v=o.skewX,y=void 0===v?0:v,x=o.skewY,b=void 0===x?0:x,w=t.left,m=t.top,S=t.width,z=t.height;l=W(l,S)||0,u=W(u,z)||0;var I=W("0%",1),M=W("50%",1),k=W("100%",1),P={top:I,center:M,bottom:k},O={left:I,center:M,right:k};if(n=n.split(" ").filter((function(t,e){return e<2})).reduce((function(t,e){if(/\d+/.test(e)){var i=W(e,1)/(/px|rpx$/.test(e)?B(t.x)?z:S:1);return B(t.x)?Object.assign(t,{y:i}):Object.assign(t,{x:i})}return B(O[e])&&!B(t.x)?Object.assign(t,{x:O[e]}):Object.assign(t,{y:P[e]||.5})}),{}),(l||u)&&r.translate(l,u),(a||c)&&r.scale(a,c),g){var T=w+S*n.x,L=m+z*n.y;r.translate(T,L),r.rotate(g*Math.PI/180),r.translate(-T,-L)}(y||b)&&r.transform(1,Math.tan(b*Math.PI/180),Math.tan(y*Math.PI/180),1,0,0)},r.prototype.setBackground=function(t,e,i,r,o){var s=this.ctx;t&&"transparent"!=t?T(t)?L(t,e,i,r,o,s):s.setFillStyle(t):[n.MP_TOUTIAO,n.MP_BAIDU].includes(I)?s.setFillStyle("rgba(0,0,0,0)"):s.setFillStyle("transparent")},r.prototype.setShadow=function(t){var e=t.boxShadow,i=void 0===e?[]:e,n=this.ctx;if(i.length){var r=i[0],o=i[1],s=i[2],a=i[3];n.setShadow(r,o,s,a)}},r.prototype.setBorder=function(t,e){var i=this.ctx,n=t.width,r=t.height,o=t.left,s=t.top,a=e.border,h=e.borderBottom,c=e.borderTop,f=e.borderRight,l=e.borderLeft,d=e.borderRadius,u=e.lineCap,p=a||{},g=p.borderWidth,v=void 0===g?0:g,y=p.borderStyle,x=p.borderColor,b=h||{},w=b.borderBottomWidth,m=void 0===w?v:w,S=b.borderBottomStyle,z=void 0===S?y:S,M=b.borderBottomColor,k=void 0===M?x:M,B=c||{},W=B.borderTopWidth,P=void 0===W?v:W,O=B.borderTopStyle,T=void 0===O?y:O,L=B.borderTopColor,R=void 0===L?x:L,F=f||{},A=F.borderRightWidth,j=void 0===A?v:A,E=F.borderRightStyle,C=void 0===E?y:E,H=F.borderRightColor,D=void 0===H?x:H,$=l||{},Y=$.borderLeftWidth,U=void 0===Y?v:Y,N=$.borderLeftStyle,X=void 0===N?y:N,_=$.borderLeftColor,q=void 0===_?x:_,G=d||{},V=G.borderTopLeftRadius,J=void 0===V?d||0:V,Q=G.borderTopRightRadius,Z=void 0===Q?d||0:Q,K=G.borderBottomRightRadius,tt=void 0===K?d||0:K,et=G.borderBottomLeftRadius,it=void 0===et?d||0:et;if(h||l||c||f||a){var nt=function(t,e,n){"dashed"==e?/mp/.test(I)?i.setLineDash([Math.ceil(4*t/3),Math.ceil(4*t/3)]):i.setLineDash([Math.ceil(6*t),Math.ceil(6*t)]):"dotted"==e&&i.setLineDash([t,t]),i.setStrokeStyle(n)},rt=function(t,e,n,r,o,s,a,h,c,f,l,d,p,g,v){i.save(),i.setLineCap(v?"square":u),i.setLineWidth(d),nt(d,p,g),i.beginPath(),i.arc(t,e,a,Math.PI*c,Math.PI*f),i.lineTo(n,r),i.arc(o,s,h,Math.PI*f,Math.PI*l),i.stroke(),i.restore()};if(i.save(),a&&!h&&!l&&!c&&!f)return i.setLineWidth(v),nt(v,y,x),this.roundRect(o,s,n,r,d,!1,!!x),void i.restore();m&&rt(o+n-tt,s+r-tt,o+it,s+r,o+it,s+r-it,tt,it,.25,.5,.75,m,z,k,U&&j),U&&rt(o+it,s+r-it,o,s+J,o+J,s+J,it,J,.75,1,1.25,U,X,q,P&&m),P&&rt(o+J,s+J,o+n-Z,s,o+n-Z,s+Z,J,Z,1.25,1.5,1.75,P,T,R,U&&j),j&&rt(o+n-Z,s+Z,o+n,s+r-tt,o+n-tt,s+r-tt,Z,tt,1.75,2,.25,j,C,D,P&&m)}},r.prototype.setOpacity=function(t){var e=t.opacity,i=void 0===e?1:e;this.ctx.setGlobalAlpha(i)},r.prototype.drawPattern=function(t,n,r){return e(this,void 0,void 0,(function(){var e=this;return i(this,(function(i){return[2,new Promise((function(i,o){e.drawView(n,r,!0,!1,!0);var s=e,a=s.ctx;s.canvas;var h=n.width,c=n.height,f=n.left,l=n.top,d=r||{},u=d.borderRadius,p=void 0===u?0:u,g=d.backgroundImage,v=d.backgroundRepeat,y=void 0===v?"repeat":v;g&&function(t){var o=a.createPattern(t.src,y);a.setFillStyle(o),e.roundRect(f,l,h,c,p,!0,!1),e.setBorder(n,r),i()}(t)}))]}))}))},r.prototype.drawView=function(t,e,i,n,r){void 0===i&&(i=!0),void 0===n&&(n=!0),void 0===r&&(r=!0);var o=this.ctx,s=t.width,a=t.height,h=t.left,c=t.top,f=e||{},l=f.borderRadius,d=void 0===l?0:l,u=f.backgroundColor,p=void 0===u?"transparent":u,g=f.overflow;e.opacity&&this.setOpacity(e),this.setTransform(t,e),r&&(o.save(),this.setShadow(e)),i&&this.setBackground(p,s,a,h,c),e.clipPath?this.clipPath(h,c,s,a,e.clipPath,i,!1):this.roundRect(h,c,s,a,d,i,!1),r&&o.restore(),n&&this.setBorder(t,e),"hidden"==g&&o.clip()},r.prototype.drawImage=function(t,r,o,s){return void 0===r&&(r={}),void 0===o&&(o={}),void 0===s&&(s=!0),e(this,void 0,void 0,(function(){var a=this;return i(this,(function(h){switch(h.label){case 0:return[4,new Promise((function(h,c){return e(a,void 0,void 0,(function(){var e,a,c,f,l,d,u,p,g,v,y,x,b,w,m,S,z,M,k,B,T,L=this;return i(this,(function(i){return e=this.ctx,a=o.borderRadius,c=void 0===a?0:a,f=o.backgroundColor,l=void 0===f?"transparent":f,d=o.objectFit,u=void 0===d?"fill":d,p=o.backgroundSize,g=void 0===p?"fill":p,v=o.objectPosition,y=o.backgroundPosition,x=o.boxShadow,o.backgroundImage&&(u=g,v=y),x&&this.drawView(r,Object.assign(o,{backgroundColor:l||x&&(l||"#ffffff")}),!0,!1,!0),b=r.width,w=r.height,m=r.left,S=r.top,e.save(),z=r.contentSize.left-r.borderSize.left,M=r.contentSize.top-r.borderSize.top,s||(this.setOpacity(o),this.setTransform(r,o),this.setBackground(l,b,w,m,S),this.roundRect(m,S,b,w,c,!!(c||!x&&l),!1)),m+=z,S+=M,e.clip(),k=function(t){if("fill"!==u){var i=function(t,e,i){var n=t.objectFit,r=t.objectPosition,o=e.width/e.height,s=i.width/i.height,a=1,h="contain",c="cover";n==h&&o>=s||n==c&&o<s?a=e.height/i.height:(n==h&&o<s||n==c&&o>=s)&&(a=e.width/i.width);var f=i.width*a,l=i.height*a,d=r||[],u=d[0],p=d[1],g=O(u)?W(u,e.width):(e.width-f)*(P(u)?W(u,1):{left:0,center:.5,right:1}[u||"center"]),v=O(p)?W(p,e.height):(e.height-l)*(P(p)?W(p,1):{top:0,center:.5,bottom:1}[p||"center"]),y=function(t,e){return[(t-g)/a,(e-v)/a]},x=y(0,0),b=x[0],w=x[1],m=y(e.width,e.height),S=m[0],z=m[1],I=Math.max,M=Math.min;return{sx:I(b,0),sy:I(w,0),sw:M(S-b,i.width),sh:M(z-w,i.height),dx:I(g,0),dy:I(v,0),dw:M(f,e.width),dh:M(l,e.height)}}({objectFit:u,objectPosition:v},r.contentSize,t),o=i.sx,s=i.sy,a=i.sh,h=i.sw,c=i.dx,f=i.dy,l=i.dh,d=i.dw;I==n.MP_BAIDU?e.drawImage(t.src,c+m,f+S,d,l,o,s,h,a):e.drawImage(t.src,o,s,h,a,c+m,f+S,d,l)}else e.drawImage(t.src,m,S,b,w)},B=function(){e.restore(),L.drawView(r,o,!1,!0,!1),h(1)},T=function(t){k(t),B()},T(t),[2]}))}))}))];case 1:return h.sent(),[2]}}))}))},r.prototype.drawText=function(t,e,i,n){var r=this,o=this.ctx,s=e.borderSize,a=e.contentSize,h=e.left,c=e.top,f=a.width,l=a.height,d=a.left-s.left||0,u=a.top-s.top||0,p=i.color,g=i.lineHeight,v=i.fontSize,y=i.fontWeight,x=i.fontFamily,b=i.fontStyle,w=i.textIndent,m=void 0===w?0:w,S=i.textAlign,z=i.textStroke,I=i.verticalAlign,M=void 0===I?St:I,k=i.backgroundColor,P=i.lineClamp,O=i.backgroundClip,T=i.textShadow,L=i.textDecoration;if(m=B(m)?m:0,this.drawView(e,i,O!=xt),g=W(g,v),t){o.save(),h+=d,c+=u;var R=n.fontHeight,F=n.descent,A=void 0===F?0:F,j=n.ascent,E=A+(void 0===j?0:j);switch(o.setFonts({fontFamily:x,fontSize:v,fontWeight:y,fontStyle:b}),o.setTextBaseline(St),o.setTextAlign(S),O?this.setBackground(k,f,l,h,c):o.setFillStyle(p),S){case It:break;case Mt:h+=.5*f;break;case kt:h+=f}var C=n.lines*g,H=Math.ceil((l-C)/2);switch(H<0&&(H=0),M){case mt:break;case St:c+=H;break;case zt:c+=2*H}var D=(g-R)/2,$=g/2,Y=function(t){var e=o.measureText(t),i=e.actualBoundingBoxDescent,n=void 0===i?0:i,r=e.actualBoundingBoxAscent;return M==mt?{fix:E?void 0===r?0:r:$-D/2,lineY:E?0:D-D/2}:M==St?{fix:E?$+n/4:$,lineY:E?0:D}:M==zt?{fix:E?g-n:$+D/2,lineY:E?2*D:D+D/2}:{fix:0,height:0,lineY:0}},U=function(t,e,i){var r=t;switch(S){case It:r+=i;break;case Mt:r=(t-=i/2)+i;break;case kt:r=t,t-=i}if(L){o.setLineWidth(v/13),o.beginPath();var s=.1*n.fontHeight;/\bunderline\b/.test(L)&&(o.moveTo(t,e+n.fontHeight+s),o.lineTo(r,e+n.fontHeight+s)),/\boverline\b/.test(L)&&(o.moveTo(t,e-s),o.lineTo(r,e-s)),/\bline-through\b/.test(L)&&(o.moveTo(t,e+.5*n.fontHeight),o.lineTo(r,e+.5*n.fontHeight)),o.closePath(),o.setStrokeStyle(p),o.stroke()}},N=function(t,e,i){var n=function(){o.setLineWidth(z.width),o.setStrokeStyle(z.color),o.strokeText(t,e,i)},s="outset";z&&z.type!==s?(o.save(),r.setShadow({boxShadow:T}),o.fillText(t,e,i),o.restore(),n()):z&&z.type==s?(o.save(),r.setShadow({boxShadow:T}),n(),o.restore(),o.save(),o.fillText(t,e,i),o.restore()):(r.setShadow({boxShadow:T}),o.fillText(t,e,i))};if(!n.widths||1==n.widths.length&&n.widths[0].total+m<=a.width){var X=Y(t),_=X.fix,q=void 0===_?0:_,G=X.lineY;return N(t,h+m,c+q),U(h+m,c+G,n&&n.widths&&n.widths[0].total||n.text),c+=g,o.restore(),void this.setBorder(e,i)}for(var V=c,J=h,Q="",Z=0,K=o.measureText("...").width,tt=n.widths,et=0;et<tt.length;et++){var it=tt[et].widths,nt=0;Q="",c+=1==(Z+=1)?0:g,1==Z&&m&&(nt=m,J=h+m);for(var rt=0;rt<it.length;rt++){1!==Z&&m&&(J=h);var ot=it[rt],st=ot.width,at=ot.text,ht=(it[rt+1]||{}).width;if(Q+=at,(nt+=st)+(void 0===ht?0:ht)+(0==Z?m:0)+(Z==P?K:0)>a.width){Z>=P&&(Q+="…"),Z++,nt=0;var ct=Y(Q);q=ct.fix,G=ct.lineY;N(Q,J,c+q),U(J,c+G,nt),c+=g,Q=""}else if(rt==it.length-1){et!=tt.length-1&&Z==P&&K+nt<a.width&&(Q+="…");var ft=Y(Q);q=ft.fix,G=ft.lineY;N(Q,J,c+q),U(J,c+G,nt)}if(c>V+l||Z>P)break}}o.restore()}},r.prototype.source=function(t){return e(this,void 0,void 0,(function(){var e,n,r,o,s=this;return i(this,(function(i){switch(i.label){case 0:if(this.node=null,e=+new Date,"{}"==JSON.stringify(t))return[2];if(t.styles=t.styles||t.css||{},!t.type)for(n in t.type=wt,t)["views","children","type","css","styles"].includes(n)||(t.styles[n]=t[n],delete t[n]);return t.styles.boxSizing||(t.styles.boxSizing="border-box"),[4,this.create(t)];case 1:return(r=i.sent())?(o=r.layout()||{},this.size=o,this.node=r,this.onEffectFinished().then((function(t){return s.lifecycle("onEffectSuccess",t)})).catch((function(t){return s.lifecycle("onEffectFail",t)})),this.performance&&console.log("布局用时："+(+new Date-e)+"ms"),[2,this.size]):[2,console.warn("no node")]}}))}))},r.prototype.getImageInfo=function(t){return this.imageBus[t]||(this.imageBus[t]=this.createImage(t,this.useCORS)),this.imageBus[t]},r.prototype.create=function(n,r){return e(this,void 0,void 0,(function(){function e(i,n,r){void 0===n&&(n={}),void 0===r&&(r=!0);var o=[];return i.forEach((function(i){var s=i.styles,a=void 0===s?{}:s,h=i.css,c=void 0===h?{}:h,f=i.children,l=void 0===f?[]:f,d=i.views,u=void 0===d?[]:d,p=i.text,g=void 0===p?"":p,v=i.type,y=void 0===v?"":v;!l&&u&&(i.children=l=u);var x={};x=t(t(r?t({},n):{},a),c);var b={},w={},m={};Object.keys(x).map((function(t){if(t.includes("padding")||t.includes("margin")){var e=J(t,x[t]);Object.keys(e).map((function(t){t.includes("Left")?w[t]=e[t]:t.includes("Right")?m[t]=e[t]:b[t]=e[t]}))}}));if(x.textIndent&&(w.textIndent=x.textIndent,delete n.textIndent),""!==g){var S=Array.from(g);S.forEach((function(t,e){var i=Object.assign({},x,b);0===e?Object.assign(i,w):e==S.length-1&&Object.assign(i,m),delete i.padding,delete i.margin,o.push({type:"text",text:t,styles:i})}))}if(y==yt||y==bt)o.push(i);else if("block"===a.display&&l.length>0){var z=e(l,x,!1);i.children=z,i.flattened=!0,o.push(i)}else if(l.length>0){z=e(l,x,r);o=o.concat(z)}})),o}var o,s,a,h,c,f,l,d,u,p,g,v,y,b,w,m,S,z,I,M,k,B,W,P;return i(this,(function(i){switch(i.label){case 0:if(!n)return[2];if(n.styles||(n.styles=n.css||{}),o=n.type,s=n.show,a=void 0===s||s,h=o==yt,c=[xt,bt].includes(o),f="textBox"==o,l=n.styles||{},d=l.backgroundImage,u=l.display,h&&!n.src&&!n.url)return[2];if(u==x||!a)return[2];if(c||f){if(p=n.children,g=n.views,!p&&g&&(n.children=p=g),!n.text&&(!p||p&&!p.length))return[2];p&&p.length&&!n.flattened&&(v=e(n.children||n.views),n.type="view",n.children=v)}if(!(h||n.type==wt&&d))return[3,4];y=h?n.src:"",b=/url\(['"]?(.*?)['"]?\)/.exec(d),d&&b&&b[1]&&(y=b[1]||""),i.label=1;case 1:return i.trys.push([1,3,,4]),[4,this.getImageInfo(y)];case 2:return w=i.sent(),m=w.width,S=w.height,!(z=w.path)&&h?[2]:(z&&(n.attributes=Object.assign(n.attributes||{},{width:m,height:S,path:z,src:z,naturalSrc:y})),[3,4]);case 3:return I=i.sent(),n.type!=wt?[2]:(this.lifecycle("onEffectFail",t(t({},I),{src:y})),[3,4]);case 4:if(this.count+=1,M=new gt(n,r,this.root,this.ctx),!(k=n.children||n.views))return[3,8];B=0,i.label=5;case 5:return B<k.length?(W=k[B],[4,this.create(W,M)]):[3,8];case 6:(P=i.sent())&&M.add(P),i.label=7;case 7:return B++,[3,5];case 8:return[2,M]}}))}))},r.prototype.drawNode=function(t,n){return void 0===n&&(n=!1),e(this,void 0,void 0,(function(){var e,r,o,s,a,h,c,f,l,d,u,p,g,v,y,x,b,w,m,S,z,I,M;return i(this,(function(i){switch(i.label){case 0:return e=t.layoutBox,r=t.computedStyle,o=t.attributes,s=t.name,a=t.children,h=t.fixedLine,c=t.attributes,f=c.src,l=c.text,d=r.position,u=r.backgroundImage,p=r.backgroundRepeat,["fixed"].includes(d)&&!n?[2]:(this.ctx.save(),s!==wt?[3,7]:f&&u?p?[4,this.drawPattern(o,e,r)]:[3,2]:[3,5]);case 1:return i.sent(),[3,4];case 2:return[4,this.drawImage(o,e,r,!1)];case 3:i.sent(),i.label=4;case 4:return[3,6];case 5:this.drawView(e,r),i.label=6;case 6:return[3,10];case 7:return s===yt&&f?[4,this.drawImage(o,e,r,!1)]:[3,9];case 8:return i.sent(),[3,10];case 9:s===xt?this.drawText(l,e,r,o):s===bt&&vt.api&&vt.api.draw(l,this,e,r),i.label=10;case 10:if(this.progress+=1,v=(g=h||{}).beforeElements,y=g.afterElements,!v)return[3,14];x=0,b=v,i.label=11;case 11:return x<b.length?(M=b[x],[4,this.drawNode(M)]):[3,14];case 12:i.sent(),i.label=13;case 13:return x++,[3,11];case 14:if(!a)return[3,18];w=Object.values?Object.values(a):Object.keys(a).map((function(t){return a[t]})),m=0,S=w,i.label=15;case 15:return m<S.length?"absolute"===(M=S[m]).computedStyle.position?[3,17]:[4,this.drawNode(M)]:[3,18];case 16:i.sent(),i.label=17;case 17:return m++,[3,15];case 18:if(!y)return[3,22];z=0,I=y,i.label=19;case 19:return z<I.length?(M=I[z],[4,this.drawNode(M)]):[3,22];case 20:i.sent(),i.label=21;case 21:return z++,[3,19];case 22:return this.ctx.restore(),[2]}}))}))},r.prototype.render=function(t){var n=this;return void 0===t&&(t=30),new Promise((function(r,o){return e(n,void 0,void 0,(function(){var e,n,s,a,h,c,f,l,d,u;return i(this,(function(i){switch(i.label){case 0:return e=+new Date,this.init(),[4,(p=t,void 0===p&&(p=0),new Promise((function(t){return setTimeout(t,p)})))];case 1:i.sent(),i.label=2;case 2:if(i.trys.push([2,14,,15]),!this.node)return[3,12];if(n=this.root.fixedLine||{},s=n.beforeElements,a=n.afterElements,!s)return[3,6];h=0,c=s,i.label=3;case 3:return h<c.length?(d=c[h],[4,this.drawNode(d,!0)]):[3,6];case 4:i.sent(),i.label=5;case 5:return h++,[3,3];case 6:return[4,this.drawNode(this.node)];case 7:if(i.sent(),!a)return[3,11];f=0,l=a,i.label=8;case 8:return f<l.length?(d=l[f],[4,this.drawNode(d,!0)]):[3,11];case 9:i.sent(),i.label=10;case 10:return f++,[3,8];case 11:return r(this.node),[3,13];case 12:this.lifecycle("onEffectFail","node is empty"),i.label=13;case 13:return[3,15];case 14:return u=i.sent(),this.lifecycle("onEffectFail",u),o(u),[3,15];case 15:return this.performance&&console.log("渲染用时："+(+new Date-e-30)+"ms"),[2]}var p}))}))}))},r.prototype.onEffectFinished=function(){var t=this,e=Object.keys(this.imageBus).map((function(e){return t.imageBus[e]}));return Promise.all(e)},r.prototype.destroy=function(){this.node=[]},r.prototype.save=function(t){try{var e=t||{},i=e.fileType,n=void 0===i?"png":i,r=e.quality,o=void 0===r?1:r;return this.canvas.toDataURL("image/".concat(n),o)}catch(t){return this.lifecycle("onEffectFail","image cross domain"),t}},r}();n.WEB==I&&(window.Painter=Bt);export{Bt as Painter,Bt as default};
diff --git a/uni_modules/lime-painter/components/l-painter/props.js b/uni_modules/lime-painter/components/l-painter/props.js
new file mode 100644
index 0000000..fee87cf
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter/props.js
@@ -0,0 +1,56 @@
+export default {
+	props: {
+		board: Object,
+		pathType: String, // 'base64'、'url'
+		fileType: {
+			type: String,
+			default: 'png'
+		},
+		hidden: Boolean,
+		quality: {
+			type: Number,
+			default: 1
+		},
+		css: [String, Object],
+		// styles: [String, Object],
+		width: [Number, String],
+		height: [Number, String],
+		pixelRatio: Number,
+		customStyle: String,
+		isCanvasToTempFilePath: Boolean,
+		// useCanvasToTempFilePath: Boolean,
+		sleep: {
+			type: Number,
+			default: 1000 / 30
+		},
+		beforeDelay: {
+			type: Number,
+			default: 100
+		},
+		afterDelay: {
+			type: Number,
+			default: 100
+		},
+		performance: Boolean,
+		// #ifdef MP-WEIXIN || MP-TOUTIAO || MP-ALIPAY
+		type: {
+			type: String,
+			default: '2d'
+		},
+		// #endif
+		// #ifdef APP-NVUE
+		hybrid: Boolean,
+		timeout: {
+			type: Number,
+			default: 2000
+		},
+		// #endif
+		// #ifdef H5 || APP-PLUS
+		useCORS: Boolean,
+		hidpi: {
+			type: Boolean,
+			default: true
+		}
+		// #endif
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/lime-painter/components/l-painter/single.js b/uni_modules/lime-painter/components/l-painter/single.js
new file mode 100644
index 0000000..a6038b9
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter/single.js
@@ -0,0 +1 @@
+var t=function(){return t=Object.assign||function(t){for(var e,i=1,n=arguments.length;i<n;i++)for(var r in e=arguments[i])Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r]);return t},t.apply(this,arguments)};function e(t,e,i,n){return new(i||(i=Promise))((function(r,o){function s(t){try{a(n.next(t))}catch(t){o(t)}}function h(t){try{a(n.throw(t))}catch(t){o(t)}}function a(t){var e;t.done?r(t.value):(e=t.value,e instanceof i?e:new i((function(t){t(e)}))).then(s,h)}a((n=n.apply(t,e||[])).next())}))}function i(t,e){var i,n,r,o,s={label:0,sent:function(){if(1&r[0])throw r[1];return r[1]},trys:[],ops:[]};return o={next:h(0),throw:h(1),return:h(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function h(o){return function(h){return function(o){if(i)throw new TypeError("Generator is already executing.");for(;s;)try{if(i=1,n&&(r=2&o[0]?n.return:o[0]?n.throw||((r=n.return)&&r.call(n),0):n.next)&&!(r=r.call(n,o[1])).done)return r;switch(n=0,r&&(o=[2&o[0],r.value]),o[0]){case 0:case 1:r=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,n=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(r=s.trys,(r=r.length>0&&r[r.length-1])||6!==o[0]&&2!==o[0])){s=0;continue}if(3===o[0]&&(!r||o[1]>r[0]&&o[1]<r[3])){s.label=o[1];break}if(6===o[0]&&s.label<r[1]){s.label=r[1],r=o;break}if(r&&s.label<r[2]){s.label=r[2],s.ops.push(o);break}r[2]&&s.ops.pop(),s.trys.pop();continue}o=e.call(t,s)}catch(t){o=[6,t],n=0}finally{i=r=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,h])}}}var n={MP_WEIXIN:"mp-weixin",MP_QQ:"mp-qq",MP_ALIPAY:"mp-alipay",MP_BAIDU:"mp-baidu",MP_TOUTIAO:"mp-toutiao",MP_DINGDING:"mp-dingding",H5:"h5",WEB:"web",PLUS:"plus"},r=["Top","Right","Bottom","Left"],o="right",s="bottom",h=["contentSize","clientSize","borderSize","offsetSize"],a="row",l="column",d={TOP:"top",MIDDLE:"middle",BOTTOM:s},c={LEFT:"left",CENTER:"center",RIGHT:o},f="view",u="text",p="image",g="qrcode",v="block",y="inline-block",x="none",b="flex",w="absolute",m="fixed",S={display:v,color:"#000000",lineHeight:"1.4em",fontSize:14,fontWeight:400,fontFamily:"sans-serif",lineCap:"butt",flexDirection:a,flexWrap:"nowrap",textAlign:"left",alignItems:"flex-start",justifyContent:"flex-start",position:"static",transformOrigin:"".concat("center"," ").concat("center")},z={upx2px:function(t){return window.innerWidth/750*t},getSystemInfoSync:function(){return{screenWidth:window.innerWidth,screenHeight:window.innerHeight}},getImageInfo:function(t){var e=t.src,i=t.success,n=t.fail,r=new Image;r.onload=function(){i({width:r.naturalWidth,height:r.naturalHeight,path:r.src,src:e})},r.onerror=n,r.src=e}},I="object"==typeof window?"undefined"==typeof uni||"undefined"!=typeof uni&&!uni.addInterceptor?n.WEB:n.H5:"object"==typeof swan?n.MP_BAIDU:"object"==typeof tt?n.MP_TOUTIAO:"object"==typeof plus?n.PLUS:"object"==typeof wx?n.MP_WEIXIN:void 0,M=I==n.MP_WEIXIN?wx:"undefined"!=typeof uni?uni.getImageInfo?{upx2px:function(t){return uni.upx2px(t)},getSystemInfoSync:function(){return uni.getSystemInfoSync()},getImageInfo:function(t){return uni.getImageInfo(t)},downloadFile:function(t){return uni.downloadFile(t)}}:Object.assign(uni,z):"undefined"!=typeof window?z:uni;if(!M.upx2px){var B=((M.getSystemInfoSync&&M.getSystemInfoSync()).screenWidth||375)/750;M.upx2px=function(t){return B*t}}function W(t){return/^-?\d+(\.\d+)?$/.test(t)}function k(t,e,i){if(W(t))return 1*t;if("string"==typeof t){var n=/^-?([0-9]+)?([.]{1}[0-9]+){0,1}(em|rpx|vw|vh|px|%)$/g.exec(t);if(!t||!n)return 0;var r=n[3];t=parseFloat(t);var o=0;if("rpx"===r)o=M.upx2px(t);else if("px"===r)o=1*t;else if("%"===r&&e)o=t*k(e)/100;else if("em"===r&&e)o=t*k(e||14);else if(["vw","vh"].includes(r)){var s=M.getSystemInfoSync(),h=s.screenWidth,a=s.screenHeight;o=t*("vw"==r?h:a)/100}return 1*o.toFixed(2)}return 0}function P(t){return/%$/.test(t)}function O(t){return/^-?([0-9]+)?([.]{1}[0-9]+){0,1}(rpx|px)$/.test(t)}var T=function(t){return!(!t||!t.startsWith("linear")&&!t.startsWith("radial"))},L=function(t,e,i,n,r,o){t.startsWith("linear")?function(t,e,i,n,r,o){for(var s=function(t,e,i,n,r){void 0===n&&(n=0);void 0===r&&(r=0);var o=t.match(/([-]?\d{1,3})deg/),s=o&&o[1]?parseFloat(o[1]):0;s>=360&&(s-=360);s<0&&(s+=360);if(0===(s=Math.round(s)))return{x0:Math.round(e/2)+n,y0:i+r,x1:Math.round(e/2)+n,y1:r};if(180===s)return{x0:Math.round(e/2)+n,y0:r,x1:Math.round(e/2)+n,y1:i+r};if(90===s)return{x0:n,y0:Math.round(i/2)+r,x1:e+n,y1:Math.round(i/2)+r};if(270===s)return{x0:e+n,y0:Math.round(i/2)+r,x1:n,y1:Math.round(i/2)+r};var h=Math.round(180*Math.asin(e/Math.sqrt(Math.pow(e,2)+Math.pow(i,2)))/Math.PI);if(s===h)return{x0:n,y0:i+r,x1:e+n,y1:r};if(s===180-h)return{x0:n,y0:r,x1:e+n,y1:i+r};if(s===180+h)return{x0:e+n,y0:r,x1:n,y1:i+r};if(s===360-h)return{x0:e+n,y0:i+r,x1:n,y1:r};var a=0,l=0,d=0,c=0;if(s<h||s>180-h&&s<180||s>180&&s<180+h||s>360-h){var f=s*Math.PI/180,u=s<h||s>360-h?i/2:-i/2,p=Math.tan(f)*u,g=s<h||s>180-h&&s<180?e/2-p:-e/2-p;a=-(d=p+(v=Math.pow(Math.sin(f),2)*g)),l=-(c=u+v/Math.tan(f))}if(s>h&&s<90||s>90&&s<90+h||s>180+h&&s<270||s>270&&s<360-h){var v;f=(90-s)*Math.PI/180,p=s>h&&s<90||s>90&&s<90+h?e/2:-e/2,u=Math.tan(f)*p,g=s>h&&s<90||s>270&&s<360-h?i/2-u:-i/2-u;a=-(d=p+(v=Math.pow(Math.sin(f),2)*g)/Math.tan(f)),l=-(c=u+v)}return a=Math.round(a+e/2)+n,l=Math.round(i/2-l)+r,d=Math.round(d+e/2)+n,c=Math.round(i/2-c)+r,{x0:a,y0:l,x1:d,y1:c}}(r,t,e,i,n),h=s.x0,a=s.y0,l=s.x1,d=s.y1,c=o.createLinearGradient(h,a,l,d),f=r.match(/linear-gradient\((.+)\)/)[1],u=R(f.substring(f.indexOf(",")+1)),p=0;p<u.colors.length;p++)c.addColorStop(u.percents[p],u.colors[p]);o.setFillStyle(c)}(e,i,n,r,t,o):t.startsWith("radial")&&function(t,e,i,n,r,o){for(var s=R(r.match(/radial-gradient\((.+)\)/)[1]),h=Math.round(t/2)+i,a=Math.round(e/2)+n,l=o.createRadialGradient(h,a,0,h,a,Math.max(t,e)/2),d=0;d<s.colors.length;d++)l.addColorStop(s.percents[d],s.colors[d]);o.setFillStyle(l)}(e,i,n,r,t,o)};function R(t){for(var e=[],i=[],n=0,r=t.substring(0,t.length-1).split("%,");n<r.length;n++){var o=r[n];e.push(o.substring(0,o.lastIndexOf(" ")).trim()),i.push(o.substring(o.lastIndexOf(" "),o.length)/100)}return{colors:e,percents:i}}function F(t,e,i){return e in t?Object.defineProperty(t,e,{value:i,enumerable:!0,configurable:!0,writable:!0}):t[e]=i,t}function A(){return A=Object.assign?Object.assign.bind():function(t){for(var e=1;e<arguments.length;e++){var i=arguments[e];for(var n in i)Object.prototype.hasOwnProperty.call(i,n)&&(t[n]=i[n])}return t},A.apply(this,arguments)}function j(t,e){return j=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},j(t,e)}function E(t,e){(null==e||e>t.length)&&(e=t.length);for(var i=0,n=new Array(e);i<e;i++)n[i]=t[i];return n}function H(t,e){var i="undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(i)return(i=i.call(t)).next.bind(i);if(Array.isArray(t)||(i=function(t,e){if(t){if("string"==typeof t)return E(t,e);var i=Object.prototype.toString.call(t).slice(8,-1);return"Object"===i&&t.constructor&&(i=t.constructor.name),"Map"===i||"Set"===i?Array.from(t):"Arguments"===i||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(i)?E(t,e):void 0}}(t))||e&&t&&"number"==typeof t.length){i&&(t=i);var n=0;return function(){return n>=t.length?{done:!0}:{done:!1,value:t[n++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function C(t){return"number"==typeof t}function D(t){return"auto"===t||null===t}function $(t){return/%$/.test(t)}var Y=p,U=u,N=f,X=g,_=y,q=w,G=m;function V(t){return t.replace(/-([a-z])/g,(function(t,e){return e.toUpperCase()}))}function J(t,e){var i,n,o=function(t){var e=t.match(/([a-z]+)/)[1];return[e,V(t.split(e)[1])]}(t),s=o[0],h=o[1],a=e.split(" ");if(h)return(i={})[s+h]=e,i;if(a.length&&!h){var l=a[0],d=a[1],c=a[2],f=a[3];return(n={})[s+r[0]]=l,n[s+r[1]]=d||l,n[s+r[2]]=c||l,n[s+r[3]]=f||d||l,n}}function Q(t){t=t.trim();for(var e=new Array,i="+",n="",r=t.length,o=0;o<r;++o){if("."===t[o]||!isNaN(Number(t[o]))&&" "!==t[o])n+=t[o];else if("("===t[o]){for(var s=1,h=o;s>0;)"("===t[h+=1]&&(s+=1),")"===t[h]&&(s-=1);n="".concat(Q(t.slice(o+1,h))),o=h}if(isNaN(Number(t[o]))&&"."!==t[o]||o===r-1){var a=parseFloat(n);switch(i){case"+":e.push(a);break;case"-":e.push(-a);break;case"*":e.push(e.pop()*a);break;case"/":e.push(e.pop()/a)}i=t[o],n=""}}for(var l=0;e.length;)l+=e.pop();return l}var Z,K=0,et=function(){function t(){F(this,"elements",[]),F(this,"afterElements",[]),F(this,"beforeElements",[]),F(this,"ids",[]),F(this,"width",0),F(this,"height",0),F(this,"top",0),F(this,"left",0),F(this,"pre",null),F(this,"offsetX",0),F(this,"offsetY",0),K++,this.id=K}var e=t.prototype;return e.fixedBind=function(t,e){void 0===e&&(e=0),this.container=e?t.parent:t.root,this.container.fixedLine=this,this.fixedAdd(t)},e.fixedAdd=function(t){if(!this.ids.includes(t.id)){this.ids.push(t.id),this.elements.push(t);var e=t.computedStyle.zIndex;(void 0===e?0:e)>=0?this.afterElements.push(t):this.beforeElements.push(t),this.refreshLayout()}},e.bind=function(t){this.container=t.parent,this.container.line=null,this.container.lines?(this.container.lines.push(this),this.pre=this.getPreLine(),this.top=this.pre.top+this.pre.height,this.left=this.container.contentSize.left):(this.top=this.container.contentSize.top,this.left=this.container.contentSize.left,this.container.lines=[this]),this.isInline=t.isInline(),this.container.line=this,this.outerWidth=t.parent&&t.parent.contentSize.width?t.parent.contentSize.width:1/0,this.add(t)},e.getPreLine=function(){return this.container.lines[this.container.lines.length-2]},e.canIEnter=function(t){return!((100*t.offsetSize.width+100*this.width)/100>this.outerWidth)||(this.closeLine(),!1)},e.closeLine=function(){delete this.container.line},e.add=function(t){this.ids.includes(t.id)||(this.ids.push(t.id),this.elements.push(t),this.refreshWidthHeight(t))},e.refreshWidthHeight=function(t){t.offsetSize.height>this.height&&(this.height=t.offsetSize.height),this.width+=t.offsetSize.width||0,(this.container.lineMaxWidth||0)<this.width&&(this.container.lineMaxWidth=this.width)},e.refreshXAlign=function(){if(this.isInline){var t=this.container.contentSize.width-this.width,e=this.container.style.textAlign;"center"===e?t/=2:"left"===e&&(t=0),this.offsetX=t}},e.getOffsetY=function(t){if(!t||!t.style)return 0;var e=(t.style||{}).verticalAlign;return e===s?this.height-t.contentSize.height:"middle"===e?(this.height-t.contentSize.height)/2:0},e.setIndent=function(t){var e=t.style.textIndent;if(e&&/^calc/.test(e)){var i=/^calc\((.+)\)$/.exec(e);if(i&&i[1]){var n=i[1].replace(/([^\s\(\+\-\*\/]+)\.(left|right|bottom|top|width|height)/g,(function(e){var i=e.split("."),n=i[0],r=i[1],o=t.parent.querySelector(n);if(o&&o.offsetSize){var s={right:o.offsetSize.left+o.offsetSize.width,bottom:o.offsetSize.top+o.offsetSize.height};return o.offsetSize[r]||s[r]||0}})),r=Q(n.replace(new RegExp(/-?[0-9]+(\.[0-9]+)?(rpx|px|%)/,"g"),k));t.style.textIndent=r}}},e.layout=function(t,e){var i=this;this.refreshXAlign(),this.pre?(this.top=this.pre.top+this.pre.height+this.offsetY,this.left=e+this.offsetX):(this.top=Math.max(this.top,this.container.contentSize.top,t)+this.offsetY,this.left=Math.max(this.left,this.container.contentSize.left,e)+this.offsetX),this.elements.forEach((function(t,e){i.setIndent(t);var n=i.elements[e-1],r=i.getOffsetY(t);t.style.top=i.top+r,t.style.left=n?n.offsetSize.left+n.offsetSize.width:i.left,t.getBoxPosition()}))},e.refreshLayout=function(){this.afterElements=this.afterElements.sort((function(t,e){return t.computedStyle.zIndex-e.computedStyle.zIndex})),this.beforeElements=this.beforeElements.sort((function(t,e){return t.computedStyle.zIndex-e.computedStyle.zIndex}))},t}(),it=((Z={})[a]={width:"width",contentWidth:"width",lineMaxWidth:"lineMaxWidth",left:"left",top:"top",height:"height",lineMaxHeight:"lineMaxHeight",marginLeft:"marginLeft"},Z[l]={width:"height",contentWidth:"height",lineMaxWidth:"lineMaxWidth",left:"top",top:"left",height:"width",lineMaxHeight:"lineMaxHeight",marginLeft:"marginTop"},Z),nt=function(t){var e,i;function n(){var e;return F(function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(e=t.call(this)||this),"outerWidth",0),e.exactValue=0,e.flexTotal=0,e.width=0,e.key=null,e.flexDirection="row",e}i=t,(e=n).prototype=Object.create(i.prototype),e.prototype.constructor=e,j(e,i);var r=n.prototype;return r.bind=function(t){this.container=t.parent,this.container.line=this,this.container.lines?(this.container.lines.push(this),this.pre=this.getPreLine(),this.top=this.pre.top+this.pre.height,this.left=this.container.contentSize.left):(this.top=this.container.contentSize.top,this.left=this.container.contentSize.left,this.container.lines=[this]),t.parent&&(this.flexDirection=t.parent.style.flexDirection,this.key=it[this.flexDirection]),this.initHeight(t),this.outerWidth=t.parent&&t.parent.contentSize[this.key.contentWidth]?t.parent.contentSize[this.key.contentWidth]:1/0,this.add(t)},r.add=function(t){this.ids.push(t.id);var e=t.style.flex;C(e)?this.flexTotal+=e:C(this.getWidth(t.style))&&(this.exactValue+=this.getWidth(t.offsetSize)),this.elements.push(t),this.refreshWidthHeight(t),t.next||this.closeLine()},r.closeLine=function(){this.calcFlex()},r.initHeight=function(t){this[this.key.height]=0},r.getWidth=function(t){return t[this.key.width]||0},r.getHeight=function(t){return t[this.key.height]||0},r.setWidth=function(t,e){t[this.key.width]=e},r.setHeight=function(t,e){t[this.key.height]=e},r.calcFlex=function(){var t=this,e=this.container.contentSize[this.key.contentWidth],i=0;this.elements.forEach((function(n){var r=n.style,o=n.contentSize,s=t.getWidth(r)||t.getWidth(o);C(r.flex)&&(s=r.flex/t.flexTotal*(e-t.exactValue)),t.setWidth(n.computedStyle,s),n.isFlexCalc=!0,delete n.line,delete n.lines,delete n.lineMaxWidth,n.getBoxWidthHeight(),i=Math.max(i,t.getHeight(n.offsetSize))})),this.setHeight(this,i)},r.refreshWidthHeight=function(t){var e=this.container.style.alignItems;e&&!t.style.alignSelf&&(t.style.alignSelf=e);var i=this.getHeight(t.offsetSize);i>this[this.key.height]&&(this.container[this.key.lineMaxHeight]=this[this.key.height]=i),this[this.key.width]+=this.getWidth(t.offsetSize);var n=Math.min(this.getWidth(this),!this.getWidth(this.container.contentSize)&&1/0);(this.container[this.key.lineMaxWidth]||0)<n&&(this.container[this.key.lineMaxWidth]=n)},r.refreshXAlign=function(){var t=this,e=this.elements.reduce((function(e,i){return e+t.getWidth(i.offsetSize)}),0),i=(this.outerWidth==1/0?0:this.outerWidth-e)||0,n=this.container.style.justifyContent;"center"===n?i/=2:"flex-start"===n?i=0:["space-between","space-around"].includes(n)&&(!function(e,i){void 0===i&&(i=0),i/=t.elements.length+(e?-1:1),t.elements.forEach((function(n,r){var o;e&&!r||(n.style.margin?n.style.margin[t.key.marginLeft]+=i:n.style.margin=((o={})[t.key.marginLeft]=i,o),n.getBoxPosition())})),i=0}("space-between"==n,i),i=0),this.offsetX=i||0,this.refreshYAlign()},r.refreshYAlign=function(){var t=this;if(1==this.container.lines.length)return 0;var e=this.container.lines.reduce((function(e,i){return e+t.getHeight(i)}),0),i=this.container.style.alignItems,n=this.getHeight(this.container.contentSize);if("center"===i){var r=(n-e)/(this.container.lines.length+1);this.container.lines.forEach((function(t){t.offsetY=r}))}if("flex-end"===i){var o=n-e;this.container.lines[0].offsetY=o}},r.getOffsetY=function(t){if(this.container.lines.length>1)return 0;var e=t.style.alignSelf,i=this.getHeight(this.container.contentSize),n=i-this.getHeight(t.offsetSize);return"flex-end"===e?n:"center"===e?n/2:"stretch"===e?(n&&t.name==f&&(t.style[this.key.width]=this.getWidth(t.offsetSize),t.style[this.key.height]=i,delete t.line,delete t.lines,t.getBoxWidthHeight()),0):0},r.layout=function(t,e){var i=this;this.refreshXAlign(),this.pre?(this.top=this.pre.top+this.pre.height+this.offsetY,this.left=e+this.offsetX):(this.top=Math.max(this.top,this.container.contentSize.top,t)+this.offsetY,this.left=Math.max(this.left,this.container.contentSize.left,e)+this.offsetX),this.elements.forEach((function(t,e){i.setIndent(t);var n=i.elements[e-1],r=i.getOffsetY(t);t.style[i.key.top]=i[i.key.top]+r,t.style[i.key.left]=n?n.offsetSize[i.key.left]+i.getWidth(n.offsetSize):i[i.key.left],t.getBoxPosition()}))},n}(et),rt=p,ot=u,st=f,ht=v,at=y,lt=b,dt=w,ct=m,ft=0,ut={left:null,top:null,width:null,height:null},pt=new Map,gt=function(){function t(t,e,i,n){var o=this;F(this,"id",ft++),F(this,"style",{left:null,top:null,width:null,height:null}),F(this,"computedStyle",{}),F(this,"originStyle",{}),F(this,"children",{}),F(this,"layoutBox",A({},ut)),F(this,"contentSize",A({},ut)),F(this,"clientSize",A({},ut)),F(this,"borderSize",A({},ut)),F(this,"offsetSize",A({},ut)),this.ctx=n,this.root=i,e&&(this.parent=e),this.name=t.type||t.name,this.attributes=this.getAttributes(t);var s=function(t,e){var i,n=["color","fontSize","lineHeight","verticalAlign","fontWeight","textAlign"],o=t.type,s=void 0===o?N:o,h=t.styles,a=void 0===h?{}:h,l=(e||{}).computedStyle,d=Object.assign({},S);if([U,Y,X].includes(s)&&!a.display&&(d.display=_),l)for(var c=0;c<n.length;c++){var f=n[c];(a[f]||l[f])&&(a[f]=a[(i=f,i.replace(/([A-Z])/g,"-$1").toLowerCase())]||a[f]||l[f])}for(var u=function(t){var e,i,n,o,h=a[t];if(/-/.test(t)&&(t=V(t),d[t]=h),/^(box|text)?shadow$/i.test(t)){var l=[];return h.replace(/((-?\d+(rpx|px|vw|vh)?\s+?){3})(.+)/,(function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];l=t[1].match(/-?\d+(rpx|px|vw|vh)?/g).map((function(t){return k(t)})).concat(t[4])})),/^text/.test(t)?d.textShadow=l:d.boxShadow=l,"continue"}if(/^border/i.test(t)&&!/radius$/i.test(t)){var c=t.match(/^border([BTRLa-z]+)?/)[0],f=t.match(/[W|S|C][a-z]+/),u=h.replace(/([\(,])\s+|\s+([\),])/g,"$1$2").split(" ").map((function(t){return/^\d/.test(t)?k(t,""):t}));return d[c]||(d[c]={}),1==u.length&&f?d[c][c+f[0]]=u[0]:d[c]=((e={})[c+"Width"]=W(u[0])?u[0]:0,e[c+"Style"]=u[1]||"solid",e[c+"Color"]=u[2]||"black",e),"continue"}if(/^background(color)?$/i.test(t))return d.backgroundColor=h,"continue";if(/^objectPosition$/i.test(t))return d[t]=h.split(" "),"continue";if(/^backgroundPosition$/i.test(t))return d[t]=h.split(" "),"continue";if(/padding|margin|radius/i.test(t)){var p=/radius$/i.test(t),g="borderRadius",v=p?g:t.match(/[a-z]+/)[0],y=function(t,e){return"border".concat(t).concat(e,"Radius")},x=[0,0,0,0].map((function(t,e){return p?[y(r[0],r[3]),y(r[0],r[1]),y(r[2],r[1]),y(r[2],r[3])][e]:v+r[e]}));if("padding"===t||"margin"===t||/^(border)?radius$/i.test(t)){u="".concat(h).split(" ").map((function(e){return/^-?\d+(rpx|px|vh|vw)?$/.test(e)?k(e):"margin"!=t&&/auto/.test(e)?0:e}),[])||[0];var b=p?g:t,w=u[0],m=u[1],S=u[2],z=u[3];d[b]=((i={})[x[0]]=D(w)?0:w,i[x[1]]=W(m)||D(m)?m:w,i[x[2]]=D(W(S)?S:w)?0:W(S)?S:w,i[x[3]]=W(z)?z:null!=m?m:w,i)}else"object"==typeof d[v]||(d[v]=((n={})[x[0]]=d[v]||0,n[x[1]]=d[v]||0,n[x[2]]=d[v]||0,n[x[3]]=d[v]||0,n)),d[v][t]="margin"==v&&D(h)||$(h)?h:k(h);return"continue"}if(/^transform$/i.test(t))return d[t]={},h.replace(/([a-zA-Z]+)\(([0-9,-\.%rpxdeg\s]+)\)/g,(function(e,i,n){var r=n.split(",").map((function(t){return t.replace(/(^\s*)|(\s*$)/g,"")})),o=function(t,e){return t.includes("deg")?1*t:e&&!$(e)?k(t,e):t};i.includes("matrix")?d[t][i]=r.map((function(t){return 1*t})):i.includes("rotate")?d[t][i]=1*n.match(/^-?\d+(\.\d+)?/)[0]:/[X, Y]/.test(i)?d[t][i]=/[X]/.test(i)?o(r[0],a.width):o(r[0],a.height):(d[t][i+"X"]=o(r[0],a.width),d[t][i+"Y"]=o(r[1]||r[0],a.height))})),"continue";if(/^font$/i.test(t)&&console.warn("font 不支持简写"),/^textindent/i.test(t)&&(d[t]=/^calc/.test(h)?h:k(h)),/^textstroke/i.test(t)){var I=t.match(/color|width|type$/i),M=(c="textStroke",h.split(" ").map((function(t){return/^\d+(rpx|px|vh|vw)?$/.test(t)?k(t):t})));return I?d[c]?d[c][I[0]]=M[0]:d[c]=((o={})[I[0]]=M[0],o):d[c]={width:M[0],color:M[1],type:M[2]},"continue"}/^left|top$/i.test(t)&&![q,G].includes(a.position)?d[t]=0:d[t]=/^-?[\d\.]+(px|rpx|vw|vh)?$/.test(h)?k(h):/em$/.test(h)&&s==U?k(h,a.fontSize):h},p=0,g=Object.keys(a);p<g.length;p++)u(g[p]);return d}(t,e);this.isAbsolute=s.position==dt,this.isFixed=s.position==ct,this.originStyle=s,this.styles=t.styles,Object.keys(s).forEach((function(t){Object.defineProperty(o.style,t,{configurable:!0,enumerable:!0,get:function(){return s[t]},set:function(e){s[t]=e}})}));var h={contentSize:A({},this.contentSize),clientSize:A({},this.clientSize),borderSize:A({},this.borderSize),offsetSize:A({},this.offsetSize)};Object.keys(h).forEach((function(t){Object.keys(o[t]).forEach((function(e){Object.defineProperty(o[t],e,{configurable:!0,enumerable:!0,get:function(){return h[t][e]},set:function(i){h[t][e]=i}})}))})),this.computedStyle=this.style}var e=t.prototype;return e.add=function(t){t.parent=this,this.children[t.id]=t},e.getChildren=function(){var t=this;return Object.keys(this.children).map((function(e){return t.children[e]}))},e.prev=function(t){void 0===t&&(t=this);var e=t.parent.getChildren();return e[e.findIndex((function(e){return e.id==t.id}))-1]},e.querySelector=function(t){var e=this.getChildren();if("string"!=typeof t)return null;var i=e.find((function(e){var i=e.id,n=e.attributes;return i==t||n&&n.uid==t}));return i||(this.parent&&this.parent.querySelector&&this.parent.querySelector(t)||null)},e.getLineRect=function(t,e){var i={width:0,height:0},n=e?e.lines:this.parent&&this.parent.lines;return n&&n.find((function(e){return e.ids.includes(t)}))||i},e.setPosition=function(t,e){var i={left:"width",top:"height",right:"width",bottom:"height"};Object.keys(i).forEach((function(n){var r=n==o?"left":"top";[o,s].includes(n)&&void 0!==t.style[n]&&!W(t.originStyle[r])?t.style[r]=e[i[n]]-t.offsetSize[i[n]]-k(t.style[n],e[i[n]]):t.style[n]=k(t.style[n],e[i[n]])}))},e.getAttributes=function(t){var e=t.attributes,i=void 0===e?{}:e,n=t.uid,r=t.url,o=t.src,s=t.replace,h=t.text;return n&&(i.uid=n),(r||o)&&(i.src=i.src||r||o),s&&(i.replace=s),h&&(i.text=h),i},e.getOffsetSize=function(t,e,i){void 0===i&&(i=h[3]);var n=e||{},r=n.margin,o=(r=void 0===r?{}:r).marginLeft,s=void 0===o?0:o,a=r.marginTop,l=void 0===a?0:a,d=r.marginRight,c=void 0===d?0:d,f=r.marginBottom,u=void 0===f?0:f,p=n.padding,g=(p=void 0===p?{}:p).paddingLeft,v=void 0===g?0:g,y=p.paddingTop,x=void 0===y?0:y,b=p.paddingRight,w=void 0===b?0:b,m=p.paddingBottom,S=void 0===m?0:m,z=n.border,I=(z=void 0===z?{}:z).borderWidth,M=void 0===I?0:I,B=n.borderTop,W=(B=void 0===B?{}:B).borderTopWidth,k=void 0===W?M:W,P=n.borderBottom,O=(P=void 0===P?{}:P).borderBottomWidth,T=void 0===O?M:O,L=n.borderRight,R=(L=void 0===L?{}:L).borderRightWidth,F=void 0===R?M:R,A=n.borderLeft,j=(A=void 0===A?{}:A).borderLeftWidth,E=void 0===j?M:j,H=s<0&&c<0?Math.abs(s+c):0,C=l<0&&u<0?Math.abs(l+u):0,D=s>=0&&c<0,$=l>=0&&u<0;return i==h[0]&&(this[i].left=t.left+s+v+E+(D?2*-c:0),this[i].top=t.top+l+x+k+($?2*-u:0),this[i].width=t.width+(this[i].widthAdd?0:H),this[i].height=t.height+(this[i].heightAdd?0:C),this[i].widthAdd=H,this[i].heightAdd=C),i==h[1]&&(this[i].left=t.left+s+E+(D<0?-c:0),this[i].top=t.top+l+k+($?-u:0),this[i].width=t.width+v+w,this[i].height=t.height+x+S),i==h[2]&&(this[i].left=t.left+s+E/2+(D<0?-c:0),this[i].top=t.top+l+k/2+($?-u:0),this[i].width=t.width+v+w+E/2+F/2,this[i].height=t.height+x+S+T/2+k/2),i==h[3]&&(this[i].left=t.left+(D<0?-c:0),this[i].top=t.top+($?-u:0),this[i].width=t.width+v+w+E+F+s+c,this[i].height=t.height+x+S+T+k+u+l),this[i]},e.layoutBoxUpdate=function(t,e,i,n){var r=this;if(void 0===i&&(i=-1),"border-box"==e.boxSizing){var o=e||{},s=o.border,a=(s=void 0===s?{}:s).borderWidth,l=void 0===a?0:a,d=o.borderTop,c=(d=void 0===d?{}:d).borderTopWidth,f=void 0===c?l:c,u=o.borderBottom,p=(u=void 0===u?{}:u).borderBottomWidth,g=void 0===p?l:p,v=o.borderRight,y=(v=void 0===v?{}:v).borderRightWidth,x=void 0===y?l:y,b=o.borderLeft,w=(b=void 0===b?{}:b).borderLeftWidth,m=void 0===w?l:w,S=o.padding,z=(S=void 0===S?{}:S).paddingTop,I=void 0===z?0:z,M=S.paddingRight,B=void 0===M?0:M,W=S.paddingBottom,k=void 0===W?0:W,P=S.paddingLeft,O=void 0===P?0:P;i||(t.width-=O+B+x+m),1!==i||n||(t.height-=I+k+f+g)}this.layoutBox&&(h.forEach((function(i){return r.layoutBox[i]=r.getOffsetSize(t,e,i)})),this.layoutBox=Object.assign({},this.layoutBox,this.layoutBox.borderSize))},e.getBoxPosition=function(){var t=this.computedStyle,e=this.fixedLine,i=this.lines,n=t.left,r=void 0===n?0:n,o=t.top,s=void 0===o?0:o,h=A({},this.contentSize,{left:r,top:s}),a=this.contentSize.top-this.offsetSize.top,l=this.contentSize.left-this.offsetSize.left;if(this.root.fixedLine&&!this.root.isDone){this.root.isDone=!0;for(var d,c=H(this.root.fixedLine.elements);!(d=c()).done;){var f=d.value;f.setPosition(f,this.root.offsetSize),f.getBoxPosition()}}if(e)for(var u,p=H(e.elements);!(u=p()).done;){var g=u.value,v=A({},this.borderSize,{left:r,top:s});g.setPosition(g,v);var y=this.borderSize.top-this.offsetSize.top,x=this.borderSize.left-this.offsetSize.left;g.style.left+=r+x,g.style.top+=s+y,g.getBoxPosition()}if(i)for(var b,w=H(i);!(b=w()).done;){b.value.layout(h.top+a,h.left+l)}return this.layoutBoxUpdate(h,t),this.layoutBox},e.getBoxState=function(t,e){return this.isBlock(t)||this.isBlock(e)},e.isBlock=function(t){return void 0===t&&(t=this),t&&t.style.display==ht},e.isFlex=function(t){return void 0===t&&(t=this),t&&t.style.display==lt},e.isInFlow=function(){return!(this.isAbsolute||this.isFixed)},e.inFlexBox=function(t){return void 0===t&&(t=this),!!t.isInFlow()&&(!!t.parent&&(!(!t.parent||t.parent.style.display!==lt)||void 0))},e.isInline=function(t){return void 0===t&&(t=this),t&&t.style.display==at},e.contrastSize=function(t,e,i){var n=t;return i&&(n=Math.min(n,i)),e&&(n=Math.max(n,e)),n},e.measureText=function(t,e){var i=this.ctx.measureText(t),n=i.width,r=i.actualBoundingBoxAscent,o=i.actualBoundingBoxDescent;return{ascent:r,descent:o,width:n,fontHeight:r+o||.7*e+1}},e.getParentSize=function(t,e){if(void 0===t&&(t=this),void 0===e&&(e=!1),t&&t.parent){if(t.parent.contentSize.width)return t.parent.contentSize;if(e)return this.getParentSize(t.parent,e)}return null},e.getBoxWidthHeight=function(){var t=this,e=this.name,i=this.computedStyle,n=this.attributes,r=this.parent,o=void 0===r?{}:r,s=this.ctx,h=this.getChildren(),a=i.left,l=void 0===a?0:a,d=i.top,c=void 0===d?0:d,f=i.bottom,u=i.right,p=i.width,g=void 0===p?0:p,v=i.minWidth,y=i.maxWidth,x=i.minHeight,b=i.maxHeight,w=i.height,m=void 0===w?0:w,S=i.fontSize,z=i.fontWeight,I=i.fontFamily,M=i.fontStyle,B=i.position;i.textIndent;var W=i.lineClamp,P=i.lineHeight,O=i.padding,T=void 0===O?{}:O,L=i.margin,R=void 0===L?{}:L,F=i.border,A=(F=void 0===F?{}:F).borderWidth,j=void 0===A?0:A,E=i.borderRight,H=(E=void 0===E?{}:E).borderRightWidth,C=void 0===H?j:H,Y=i.borderLeft,U=(Y=void 0===Y?{}:Y).borderLeftWidth,N=void 0===U?j:U,X=o.contentSize&&o.contentSize.width,_=o.contentSize&&o.contentSize.height;if($(g)&&X&&(g=k(g,X)),$(g)&&!X&&(g=null),$(m)&&_&&(m=k(m,_)),$(m)&&!_&&(m=null),$(v)&&X&&(v=k(v,X)),$(y)&&X&&(y=k(y,X)),$(x)&&_&&(x=k(x,_)),$(b)&&_&&(b=k(b,_)),i.padding&&X)for(var q in i.padding)Object.hasOwnProperty.call(T,q)&&(T[q]=k(T[q],X));var G=T.paddingRight,V=void 0===G?0:G,J=T.paddingLeft,Q=void 0===J?0:J;if(i.margin&&[R.marginLeft,R.marginRight].includes("auto"))if(g){var Z=X&&X-g-V-Q-N-C||0;R.marginLeft==R.marginRight?R.marginLeft=R.marginRight=Z/2:D(R.marginLeft)?R.marginLeft=Z:R.marginRight=Z}else R.marginLeft=R.marginRight=0;var K=R.marginRight,tt=void 0===K?0:K,it=R.marginLeft,ht={width:g,height:m,left:0,top:0},at=Q+V+N+C+(void 0===it?0:it)+tt;if(this.offsetWidth=at,e==ot&&!this.attributes.widths){var lt=n.text||"";s.save(),s.setFonts({fontFamily:I,fontSize:S,fontWeight:z,fontStyle:M}),lt.length,"\n"==lt&&(lt="",this.isBr=!0),(""+lt).split("\n").map((function(e){var i=Array.from(e).map((function(e){var i=""+(/^[\u4e00-\u9fa5]+$/.test(e)?"cn":e)+I+S+z+M,n=pt.get(i);if(n)return{width:n,text:e};var r=t.measureText(e,S).width;return pt.set(i,r),{width:r,text:e}})),n=t.measureText(e,S),r=n.fontHeight,o=n.ascent,s=n.descent;t.attributes.fontHeight=r,t.attributes.ascent=o,t.attributes.descent=s,t.attributes.widths||(t.attributes.widths=[]),t.attributes.widths.push({widths:i,total:i.reduce((function(t,e){return t+e.width}),0)})})),s.restore()}if(e==rt&&null==g){var ct=n.width,ft=n.height;ht.width=this.contrastSize(Math.round(ct*m/ft)||0,v,y),this.layoutBoxUpdate(ht,i,0)}if(e==ot&&null==g){var ut=this.attributes.widths,gt=Math.max.apply(Math,ut.map((function(t){return t.total})));if(o&&X>0&&(gt>X||this.isBlock(this))&&!this.isAbsolute&&!this.isFixed)gt=X;ht.width=this.contrastSize(gt,v,y),this.layoutBoxUpdate(ht,i,0)}if(e==ot&&(o.style.flex||!this.attributes.lines)){var vt=this.attributes.widths.length;this.attributes.widths.forEach((function(t){return t.widths.reduce((function(t,e,i){return t+e.width>ht.width?(vt++,e.width):t+e.width}),0)})),vt=W&&vt>W?W:vt,this.attributes.lines=vt}if(e==rt&&null==m){var yt=n.width,xt=n.height;n.text,ht.height=this.contrastSize(k(ht.width*xt/yt)||0,x,b),this.layoutBoxUpdate(ht,i,1)}e==ot&&null==m&&(P=k(P,S),ht.height=this.contrastSize(k(this.attributes.lines*P),x,b),this.layoutBoxUpdate(ht,i,1,!0)),!g&&o&&o.children&&X&&(!this.isFlex(o)||o.isFlexCalc)&&([st,ot].includes(e)&&this.isFlex()||e==st&&this.isBlock(this)&&this.isInFlow())&&(ht.width=this.contrastSize(X-(o.isFlexCalc?0:at),v,y),this.layoutBoxUpdate(ht,i)),g&&!$(g)&&(ht.width=this.contrastSize(g,v,y),this.layoutBoxUpdate(ht,i,0)),m&&!$(m)&&(ht.height=this.contrastSize(ht.height,x,b),this.layoutBoxUpdate(ht,i,1));var bt=0;if(h.length){var wt=null,mt=!1;h.forEach((function(e,n){e.getBoxWidthHeight();var r=h[n+1];if(r&&r.isInFlow()&&(e.next=r),!t.line||!t.line.ids.includes(e.id))if(e.isInFlow()&&!e.inFlexBox()){var o=t.getBoxState(wt,e);if(e.isBr)return mt=!0;t.line&&t.line.canIEnter(e)&&!o&&!mt?t.line.add(e):(mt=!1,(new et).bind(e)),wt=e}else e.inFlexBox()?t.line&&(t.line.canIEnter(e)||"nowrap"==i.flexWrap)?t.line.add(e):(new nt).bind(e):e.isFixed?t.root.fixedLine?t.root.fixedLine.fixedAdd(e):(new et).fixedBind(e):t.fixedLine?t.fixedLine.fixedAdd(e):(new et).fixedBind(e,1)})),this.lines&&(bt=this.lines.reduce((function(t,e){return t+e.height}),0))}var St=0,zt=0;if(!g&&(this.isAbsolute||this.isFixed)&&X){var It=B==dt?X:this.root.width,Mt=It-($(l)?k(l,It):l)-($(u)?k(u,It):u);St=i.left?Mt:this.lineMaxWidth}if(!m&&(null!=c?c:this.isAbsolute||this.isFixed&&_)){var Bt=B==dt?_:this.root.height,Wt=Bt-($(c)?k(c,Bt):c)-($(f)?k(f,Bt):f);zt=i.top?Wt:0}if(g&&!$(g)||ht.width||(ht.width=St||this.contrastSize((this.isBlock(this)&&!this.isInFlow()?X||o.lineMaxWidth:this.lineMaxWidth)||this.lineMaxWidth,v,y),this.layoutBoxUpdate(ht,i,0)),m||!bt&&!zt||(ht.height=zt||this.contrastSize(bt,x,b),this.layoutBoxUpdate(ht,i)),i.borderRadius&&this.borderSize&&this.borderSize.width)for(var q in i.borderRadius)Object.hasOwnProperty.call(i.borderRadius,q)&&(i.borderRadius[q]=k(i.borderRadius[q],this.borderSize.width));return this.layoutBox},e.layout=function(){return this.getBoxWidthHeight(),this.root.offsetSize=this.offsetSize,this.root.contentSize=this.contentSize,this.getBoxPosition(),this.offsetSize},t}(),vt=p,yt=u,xt=g,bt=f,wt=d.TOP,mt=d.MIDDLE,St=d.BOTTOM,zt=c.LEFT,It=c.CENTER,Mt=c.RIGHT,Bt=function(){function r(t){var e,i,r=this;this.v="1.9.5.1",this.id=null,this.pixelRatio=1,this.width=0,this.height=0,this.sleep=1e3/30,this.count=0,this.isRate=!1,this.isDraw=!0,this.isCache=!0,this.fixed="",this.useCORS=!1,this.performance=!1,this.imageBus=[],this.createImage=function(t,e){return new Promise((function(i,n){var o=null;window||r.canvas.createImage?(o=r.canvas&&r.canvas.createImage?r.canvas.createImage():new Image,e&&o.setAttribute("crossOrigin","Anonymous"),o.src=t,o.onload=function(){i({width:o.naturalWidth||o.width,height:o.naturalHeight||o.height,path:o,src:this.src})},o.onerror=function(t){n(t)}):n({fail:"getImageInfo fail",src:t})}))},this.options=t,Object.assign(this,t),this.ctx=(e=t.context,i={get:function(t,i){if("setFonts"===i)return function(t){var i=t.fontFamily,r=void 0===i?"sans-serif":i,o=t.fontSize,s=void 0===o?14:o,h=t.fontWeight,a=void 0===h?"normal":h,l=t.fontStyle,d=void 0===l?"normal":l;I==n.MP_TOUTIAO&&(a="bold"==a?"bold":"",d="italic"==d?"italic":""),e.font="".concat(d," ").concat(a," ").concat(Math.round(s),"px ").concat(r)};if(!e.draw||!e.setFillStyle){if("setFillStyle"===i)return function(t){e.fillStyle=t};if("setStrokeStyle"===i)return function(t){e.strokeStyle=t};if("setLineWidth"===i)return function(t){e.lineWidth=t};if("setLineCap"===i)return function(t){e.lineCap=t};if("setFontSize"===i)return function(t){e.font="".concat(String(t),"px sans-serif")};if("setGlobalAlpha"===i)return function(t){e.globalAlpha=t};if("setLineJoin"===i)return function(t){e.lineJoin=t};if("setTextAlign"===i)return function(t){e.textAlign=t};if("setMiterLimit"===i)return function(t){e.miterLimit=t};if("setShadow"===i)return function(t,i,n,r){e.shadowOffsetX=t,e.shadowOffsetY=i,e.shadowBlur=n,e.shadowColor=r};if("setTextBaseline"===i)return function(t){e.textBaseline=t};if("createCircularGradient"===i)return function(){};if("draw"===i)return function(){};if("function"==typeof e[i])return function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];return e[i].apply(e,t)}}return t[i]},set:function(t,i,n){return e[i]=n,!0}},new Proxy(e,i)),this.progress=0,this.root={width:t.width,height:t.height,fontSizeRate:1,fixedLine:null},this.size=this.root;var o=0;Object.defineProperty(this,"progress",{configurable:!0,set:function(t){o=t,r.lifecycle("onProgress",t/r.count)},get:function(){return o||0}})}return r.prototype.lifecycle=function(t,e){this.options.listen&&this.options.listen[t]&&this.options.listen[t](e)},r.prototype.setContext=function(t){t&&(this.ctx=t)},r.prototype.init=function(){if(this.canvas.height||n.WEB==I){this.ctx.setTransform(1,0,0,1,0,0);var t=this.size.height*this.pixelRatio,e=this.size.width*this.pixelRatio;this.canvas.height=t,this.canvas.width=e,this.ctx.scale(this.pixelRatio,this.pixelRatio)}},r.prototype.clear=function(){this.ctx.clearRect(0,0,this.size.width,this.size.height)},r.prototype.clipPath=function(t,e,i,n,r,o,s){void 0===o&&(o=!1),void 0===s&&(s=!1);var h=this.ctx;if(/polygon/.test(r)){var a=r.match(/-?\d+(rpx|px|%)?\s+-?\d+(rpx|px|%)?/g)||[];h.beginPath(),a.map((function(r){var o=r.split(" "),s=o[0],h=o[1];return[k(s,i)+t,k(h,n)+e]})).forEach((function(t,e){0==e?h.moveTo(t[0],t[1]):h.lineTo(t[0],t[1])})),h.closePath(),s&&h.stroke(),o&&h.fill()}},r.prototype.roundRect=function(t,e,i,n,r,o,s){if(void 0===o&&(o=!1),void 0===s&&(s=!1),!(r<0)){var h=this.ctx;if(h.beginPath(),r){var a=r||{},l=a.borderTopLeftRadius,d=void 0===l?r||0:l,c=a.borderTopRightRadius,f=void 0===c?r||0:c,u=a.borderBottomRightRadius,p=void 0===u?r||0:u,g=a.borderBottomLeftRadius,v=void 0===g?r||0:g;h.arc(t+i-p,e+n-p,p,0,.5*Math.PI),h.lineTo(t+v,e+n),h.arc(t+v,e+n-v,v,.5*Math.PI,Math.PI),h.lineTo(t,e+d),h.arc(t+d,e+d,d,Math.PI,1.5*Math.PI),h.lineTo(t+i-f,e),h.arc(t+i-f,e+f,f,1.5*Math.PI,2*Math.PI),h.lineTo(t+i,e+n-p)}else h.rect(t,e,i,n);h.closePath(),s&&h.stroke(),o&&h.fill()}},r.prototype.setTransform=function(t,e){var i=e.transform,n=e.transformOrigin,r=this.ctx,o=i||{},s=o.scaleX,h=void 0===s?1:s,a=o.scaleY,l=void 0===a?1:a,d=o.translateX,c=void 0===d?0:d,f=o.translateY,u=void 0===f?0:f,p=o.rotate,g=void 0===p?0:p,v=o.skewX,y=void 0===v?0:v,x=o.skewY,b=void 0===x?0:x,w=t.left,m=t.top,S=t.width,z=t.height;c=k(c,S)||0,u=k(u,z)||0;var I=k("0%",1),M=k("50%",1),B=k("100%",1),P={top:I,center:M,bottom:B},O={left:I,center:M,right:B};if(n=n.split(" ").filter((function(t,e){return e<2})).reduce((function(t,e){if(/\d+/.test(e)){var i=k(e,1)/(/px|rpx$/.test(e)?W(t.x)?z:S:1);return W(t.x)?Object.assign(t,{y:i}):Object.assign(t,{x:i})}return W(O[e])&&!W(t.x)?Object.assign(t,{x:O[e]}):Object.assign(t,{y:P[e]||.5})}),{}),(c||u)&&r.translate(c,u),(h||l)&&r.scale(h,l),g){var T=w+S*n.x,L=m+z*n.y;r.translate(T,L),r.rotate(g*Math.PI/180),r.translate(-T,-L)}(y||b)&&r.transform(1,Math.tan(b*Math.PI/180),Math.tan(y*Math.PI/180),1,0,0)},r.prototype.setBackground=function(t,e,i,r,o){var s=this.ctx;t&&"transparent"!=t?T(t)?L(t,e,i,r,o,s):s.setFillStyle(t):[n.MP_TOUTIAO,n.MP_BAIDU].includes(I)?s.setFillStyle("rgba(0,0,0,0)"):s.setFillStyle("transparent")},r.prototype.setShadow=function(t){var e=t.boxShadow,i=void 0===e?[]:e,n=this.ctx;if(i.length){var r=i[0],o=i[1],s=i[2],h=i[3];n.setShadow(r,o,s,h)}},r.prototype.setBorder=function(t,e){var i=this.ctx,n=t.width,r=t.height,o=t.left,s=t.top,h=e.border,a=e.borderBottom,l=e.borderTop,d=e.borderRight,c=e.borderLeft,f=e.borderRadius,u=e.lineCap,p=h||{},g=p.borderWidth,v=void 0===g?0:g,y=p.borderStyle,x=p.borderColor,b=a||{},w=b.borderBottomWidth,m=void 0===w?v:w,S=b.borderBottomStyle,z=void 0===S?y:S,M=b.borderBottomColor,B=void 0===M?x:M,W=l||{},k=W.borderTopWidth,P=void 0===k?v:k,O=W.borderTopStyle,T=void 0===O?y:O,L=W.borderTopColor,R=void 0===L?x:L,F=d||{},A=F.borderRightWidth,j=void 0===A?v:A,E=F.borderRightStyle,H=void 0===E?y:E,C=F.borderRightColor,D=void 0===C?x:C,$=c||{},Y=$.borderLeftWidth,U=void 0===Y?v:Y,N=$.borderLeftStyle,X=void 0===N?y:N,_=$.borderLeftColor,q=void 0===_?x:_,G=f||{},V=G.borderTopLeftRadius,J=void 0===V?f||0:V,Q=G.borderTopRightRadius,Z=void 0===Q?f||0:Q,K=G.borderBottomRightRadius,tt=void 0===K?f||0:K,et=G.borderBottomLeftRadius,it=void 0===et?f||0:et;if(a||c||l||d||h){var nt=function(t,e,n){"dashed"==e?/mp/.test(I)?i.setLineDash([Math.ceil(4*t/3),Math.ceil(4*t/3)]):i.setLineDash([Math.ceil(6*t),Math.ceil(6*t)]):"dotted"==e&&i.setLineDash([t,t]),i.setStrokeStyle(n)},rt=function(t,e,n,r,o,s,h,a,l,d,c,f,p,g,v){i.save(),i.setLineCap(v?"square":u),i.setLineWidth(f),nt(f,p,g),i.beginPath(),i.arc(t,e,h,Math.PI*l,Math.PI*d),i.lineTo(n,r),i.arc(o,s,a,Math.PI*d,Math.PI*c),i.stroke(),i.restore()};if(i.save(),h&&!a&&!c&&!l&&!d)return i.setLineWidth(v),nt(v,y,x),this.roundRect(o,s,n,r,f,!1,!!x),void i.restore();m&&rt(o+n-tt,s+r-tt,o+it,s+r,o+it,s+r-it,tt,it,.25,.5,.75,m,z,B,U&&j),U&&rt(o+it,s+r-it,o,s+J,o+J,s+J,it,J,.75,1,1.25,U,X,q,P&&m),P&&rt(o+J,s+J,o+n-Z,s,o+n-Z,s+Z,J,Z,1.25,1.5,1.75,P,T,R,U&&j),j&&rt(o+n-Z,s+Z,o+n,s+r-tt,o+n-tt,s+r-tt,Z,tt,1.75,2,.25,j,H,D,P&&m)}},r.prototype.setOpacity=function(t){var e=t.opacity,i=void 0===e?1:e;this.ctx.setGlobalAlpha(i)},r.prototype.drawPattern=function(t,n,r){return e(this,void 0,void 0,(function(){var e=this;return i(this,(function(i){return[2,new Promise((function(i,o){e.drawView(n,r,!0,!1,!0);var s=e,h=s.ctx;s.canvas;var a=n.width,l=n.height,d=n.left,c=n.top,f=r||{},u=f.borderRadius,p=void 0===u?0:u,g=f.backgroundImage,v=f.backgroundRepeat,y=void 0===v?"repeat":v;g&&function(t){var o=h.createPattern(t.src,y);h.setFillStyle(o),e.roundRect(d,c,a,l,p,!0,!1),e.setBorder(n,r),i()}(t)}))]}))}))},r.prototype.drawView=function(t,e,i,n,r){void 0===i&&(i=!0),void 0===n&&(n=!0),void 0===r&&(r=!0);var o=this.ctx,s=t.width,h=t.height,a=t.left,l=t.top,d=e||{},c=d.borderRadius,f=void 0===c?0:c,u=d.backgroundColor,p=void 0===u?"transparent":u,g=d.overflow;e.opacity&&this.setOpacity(e),this.setTransform(t,e),r&&(o.save(),this.setShadow(e)),i&&this.setBackground(p,s,h,a,l),e.clipPath?this.clipPath(a,l,s,h,e.clipPath,i,!1):this.roundRect(a,l,s,h,f,i,!1),r&&o.restore(),n&&this.setBorder(t,e),"hidden"==g&&o.clip()},r.prototype.drawImage=function(t,r,o,s){return void 0===r&&(r={}),void 0===o&&(o={}),void 0===s&&(s=!0),e(this,void 0,void 0,(function(){var h=this;return i(this,(function(a){switch(a.label){case 0:return[4,new Promise((function(a,l){return e(h,void 0,void 0,(function(){var e,h,l,d,c,f,u,p,g,v,y,x,b,w,m,S,z,M,B,W,T,L=this;return i(this,(function(i){return e=this.ctx,h=o.borderRadius,l=void 0===h?0:h,d=o.backgroundColor,c=void 0===d?"transparent":d,f=o.objectFit,u=void 0===f?"fill":f,p=o.backgroundSize,g=void 0===p?"fill":p,v=o.objectPosition,y=o.backgroundPosition,x=o.boxShadow,o.backgroundImage&&(u=g,v=y),x&&this.drawView(r,Object.assign(o,{backgroundColor:c||x&&(c||"#ffffff")}),!0,!1,!0),b=r.width,w=r.height,m=r.left,S=r.top,e.save(),z=r.contentSize.left-r.borderSize.left,M=r.contentSize.top-r.borderSize.top,s||(this.setOpacity(o),this.setTransform(r,o),this.setBackground(c,b,w,m,S),this.roundRect(m,S,b,w,l,!!(l||!x&&c),!1)),m+=z,S+=M,e.clip(),B=function(t){if("fill"!==u){var i=function(t,e,i){var n=t.objectFit,r=t.objectPosition,o=e.width/e.height,s=i.width/i.height,h=1,a="contain",l="cover";n==a&&o>=s||n==l&&o<s?h=e.height/i.height:(n==a&&o<s||n==l&&o>=s)&&(h=e.width/i.width);var d=i.width*h,c=i.height*h,f=r||[],u=f[0],p=f[1],g=O(u)?k(u,e.width):(e.width-d)*(P(u)?k(u,1):{left:0,center:.5,right:1}[u||"center"]),v=O(p)?k(p,e.height):(e.height-c)*(P(p)?k(p,1):{top:0,center:.5,bottom:1}[p||"center"]),y=function(t,e){return[(t-g)/h,(e-v)/h]},x=y(0,0),b=x[0],w=x[1],m=y(e.width,e.height),S=m[0],z=m[1],I=Math.max,M=Math.min;return{sx:I(b,0),sy:I(w,0),sw:M(S-b,i.width),sh:M(z-w,i.height),dx:I(g,0),dy:I(v,0),dw:M(d,e.width),dh:M(c,e.height)}}({objectFit:u,objectPosition:v},r.contentSize,t),o=i.sx,s=i.sy,h=i.sh,a=i.sw,l=i.dx,d=i.dy,c=i.dh,f=i.dw;I==n.MP_BAIDU?e.drawImage(t.src,l+m,d+S,f,c,o,s,a,h):e.drawImage(t.src,o,s,a,h,l+m,d+S,f,c)}else e.drawImage(t.src,m,S,b,w)},W=function(){e.restore(),L.drawView(r,o,!1,!0,!1),a(1)},T=function(t){B(t),W()},T(t),[2]}))}))}))];case 1:return a.sent(),[2]}}))}))},r.prototype.drawText=function(t,e,i,n){var r=this,o=this.ctx,s=e.borderSize,h=e.contentSize,a=e.left,l=e.top,d=h.width,c=h.height,f=h.left-s.left||0,u=h.top-s.top||0,p=i.color,g=i.lineHeight,v=i.fontSize,y=i.fontWeight,x=i.fontFamily,b=i.fontStyle,w=i.textIndent,m=void 0===w?0:w,S=i.textAlign,z=i.textStroke,I=i.verticalAlign,M=void 0===I?mt:I,B=i.backgroundColor,P=i.lineClamp,O=i.backgroundClip,T=i.textShadow,L=i.textDecoration;if(m=W(m)?m:0,this.drawView(e,i,O!=yt),g=k(g,v),t){o.save(),a+=f,l+=u;var R=n.fontHeight,F=n.descent,A=void 0===F?0:F,j=n.ascent,E=A+(void 0===j?0:j);switch(o.setFonts({fontFamily:x,fontSize:v,fontWeight:y,fontStyle:b}),o.setTextBaseline(mt),o.setTextAlign(S),O?this.setBackground(B,d,c,a,l):o.setFillStyle(p),S){case zt:break;case It:a+=.5*d;break;case Mt:a+=d}var H=n.lines*g,C=Math.ceil((c-H)/2);switch(C<0&&(C=0),M){case wt:break;case mt:l+=C;break;case St:l+=2*C}var D=(g-R)/2,$=g/2,Y=function(t){var e=o.measureText(t),i=e.actualBoundingBoxDescent,n=void 0===i?0:i,r=e.actualBoundingBoxAscent;return M==wt?{fix:E?void 0===r?0:r:$-D/2,lineY:E?0:D-D/2}:M==mt?{fix:E?$+n/4:$,lineY:E?0:D}:M==St?{fix:E?g-n:$+D/2,lineY:E?2*D:D+D/2}:{fix:0,height:0,lineY:0}},U=function(t,e,i){var r=t;switch(S){case zt:r+=i;break;case It:r=(t-=i/2)+i;break;case Mt:r=t,t-=i}if(L){o.setLineWidth(v/13),o.beginPath();var s=.1*n.fontHeight;/\bunderline\b/.test(L)&&(o.moveTo(t,e+n.fontHeight+s),o.lineTo(r,e+n.fontHeight+s)),/\boverline\b/.test(L)&&(o.moveTo(t,e-s),o.lineTo(r,e-s)),/\bline-through\b/.test(L)&&(o.moveTo(t,e+.5*n.fontHeight),o.lineTo(r,e+.5*n.fontHeight)),o.closePath(),o.setStrokeStyle(p),o.stroke()}},N=function(t,e,i){var n=function(){o.setLineWidth(z.width),o.setStrokeStyle(z.color),o.strokeText(t,e,i)},s="outset";z&&z.type!==s?(o.save(),r.setShadow({boxShadow:T}),o.fillText(t,e,i),o.restore(),n()):z&&z.type==s?(o.save(),r.setShadow({boxShadow:T}),n(),o.restore(),o.save(),o.fillText(t,e,i),o.restore()):(r.setShadow({boxShadow:T}),o.fillText(t,e,i))};if(!n.widths||1==n.widths.length&&n.widths[0].total+m<=h.width){var X=Y(t),_=X.fix,q=void 0===_?0:_,G=X.lineY;return N(t,a+m,l+q),U(a+m,l+G,n&&n.widths&&n.widths[0].total||n.text),l+=g,o.restore(),void this.setBorder(e,i)}for(var V=l,J=a,Q="",Z=0,K=o.measureText("...").width,tt=n.widths,et=0;et<tt.length;et++){var it=tt[et].widths,nt=0;Q="",l+=1==(Z+=1)?0:g,1==Z&&m&&(nt=m,J=a+m);for(var rt=0;rt<it.length;rt++){1!==Z&&m&&(J=a);var ot=it[rt],st=ot.width,ht=ot.text,at=(it[rt+1]||{}).width;if(Q+=ht,(nt+=st)+(void 0===at?0:at)+(0==Z?m:0)+(Z==P?K:0)>h.width){Z>=P&&(Q+="…"),Z++,nt=0;var lt=Y(Q);q=lt.fix,G=lt.lineY;N(Q,J,l+q),U(J,l+G,nt),l+=g,Q=""}else if(rt==it.length-1){et!=tt.length-1&&Z==P&&K+nt<h.width&&(Q+="…");var dt=Y(Q);q=dt.fix,G=dt.lineY;N(Q,J,l+q),U(J,l+G,nt)}if(l>V+c||Z>P)break}}o.restore()}},r.prototype.source=function(t){return e(this,void 0,void 0,(function(){var e,n,r,o,s=this;return i(this,(function(i){switch(i.label){case 0:if(this.node=null,e=+new Date,"{}"==JSON.stringify(t))return[2];if(!t.type)for(n in t.type=bt,t.styles=t.styles||t.css||{},t)["views","children","type","css","styles"].includes(n)||(t.styles[n]=t[n],delete t[n]);return t.styles.boxSizing||(t.styles.boxSizing="border-box"),[4,this.create(t)];case 1:return(r=i.sent())?(o=r.layout()||{},this.size=o,this.node=r,this.onEffectFinished().then((function(t){return s.lifecycle("onEffectSuccess",t)})).catch((function(t){return s.lifecycle("onEffectFail",t)})),this.performance&&console.log("布局用时："+(+new Date-e)+"ms"),[2,this.size]):[2,console.warn("no node")]}}))}))},r.prototype.getImageInfo=function(t){return this.imageBus[t]||(this.imageBus[t]=this.createImage(t,this.useCORS)),this.imageBus[t]},r.prototype.create=function(n,r){return e(this,void 0,void 0,(function(){function e(i,n,r){void 0===n&&(n={}),void 0===r&&(r=!0);var o=[];return i.forEach((function(i){var s=i.styles,h=void 0===s?{}:s,a=i.children,l=void 0===a?[]:a,d=i.text,c=void 0===d?"":d,f=i.type,u=void 0===f?"":f,p={};p=t(r?t({},n):{},h);var g={},v={},y={};Object.keys(p).map((function(t){if(t.includes("padding")||t.includes("margin")){var e=J(t,p[t]);Object.keys(e).map((function(t){t.includes("Left")?v[t]=e[t]:t.includes("Right")?y[t]=e[t]:g[t]=e[t]}))}}));if(p.textIndent&&(v.textIndent=p.textIndent,delete n.textIndent),""!==c){var x=Array.from(c);x.forEach((function(t,e){var i=Object.assign({},p,g);0===e?Object.assign(i,v):e==x.length-1&&Object.assign(i,y),delete i.padding,delete i.margin,o.push({type:"text",text:t,styles:i})}))}if(u==vt||u==xt)o.push(i);else if("block"===h.display&&l.length>0){var b=e(l,p,!1);i.children=b,i.flattened=!0,o.push(i)}else if(l.length>0){b=e(l,p,r);o=o.concat(b)}})),o}var o,s,h,a,l,d,c,f,u,p,g,v,y,b,w,m,S,z,I,M,B;return i(this,(function(i){switch(i.label){case 0:if(!n)return[2];if(n.styles||(n.styles=n.css||{}),o=n.type,s=o==vt,h=[yt,xt].includes(o),a="textBox"==o,l=n.styles||{},d=l.backgroundImage,c=l.display,s&&!n.src&&!n.url)return[2];if(c==x)return[2];if(h||a){if(f=n.children,!n.text&&(!f||f&&!f.length))return[2];f&&f.length&&!n.flattened&&(u=e(n.children),n.type="view",n.children=u)}if(!(s||n.type==bt&&d))return[3,4];p=s?n.src:"",g=/url\(['"]?(.*?)['"]?\)/.exec(d),d&&g&&g[1]&&(p=g[1]||""),i.label=1;case 1:return i.trys.push([1,3,,4]),[4,this.getImageInfo(p)];case 2:return v=i.sent(),y=v.width,b=v.height,!(w=v.path)&&s?[2]:(w&&(n.attributes=Object.assign(n.attributes||{},{width:y,height:b,path:w,src:w,naturalSrc:p})),[3,4]);case 3:return m=i.sent(),n.type!=bt?[2]:(this.lifecycle("onEffectFail",t(t({},m),{src:p})),[3,4]);case 4:if(this.count+=1,S=new gt(n,r,this.root,this.ctx),!(z=n.views||n.children))return[3,8];I=0,i.label=5;case 5:return I<z.length?(M=z[I],[4,this.create(M,S)]):[3,8];case 6:(B=i.sent())&&S.add(B),i.label=7;case 7:return I++,[3,5];case 8:return[2,S]}}))}))},r.prototype.drawNode=function(t,n){return void 0===n&&(n=!1),e(this,void 0,void 0,(function(){var e,r,o,s,h,a,l,d,c,f,u,p,g,v,y,x,b,w,m,S,z,I,M;return i(this,(function(i){switch(i.label){case 0:return e=t.layoutBox,r=t.computedStyle,o=t.attributes,s=t.name,h=t.children,a=t.fixedLine,l=t.attributes,d=l.src,c=l.text,f=r.position,u=r.backgroundImage,p=r.backgroundRepeat,["fixed"].includes(f)&&!n?[2]:(this.ctx.save(),s!==bt?[3,7]:d&&u?p?[4,this.drawPattern(o,e,r)]:[3,2]:[3,5]);case 1:return i.sent(),[3,4];case 2:return[4,this.drawImage(o,e,r,!1)];case 3:i.sent(),i.label=4;case 4:return[3,6];case 5:this.drawView(e,r),i.label=6;case 6:return[3,10];case 7:return s===vt&&d?[4,this.drawImage(o,e,r,!1)]:[3,9];case 8:return i.sent(),[3,10];case 9:s===yt?this.drawText(c,e,r,o):s===xt&&QR.api&&console.warn("single"),i.label=10;case 10:if(this.progress+=1,v=(g=a||{}).beforeElements,y=g.afterElements,!v)return[3,14];x=0,b=v,i.label=11;case 11:return x<b.length?(M=b[x],[4,this.drawNode(M)]):[3,14];case 12:i.sent(),i.label=13;case 13:return x++,[3,11];case 14:if(!h)return[3,18];w=Object.values?Object.values(h):Object.keys(h).map((function(t){return h[t]})),m=0,S=w,i.label=15;case 15:return m<S.length?"absolute"===(M=S[m]).computedStyle.position?[3,17]:[4,this.drawNode(M)]:[3,18];case 16:i.sent(),i.label=17;case 17:return m++,[3,15];case 18:if(!y)return[3,22];z=0,I=y,i.label=19;case 19:return z<I.length?(M=I[z],[4,this.drawNode(M)]):[3,22];case 20:i.sent(),i.label=21;case 21:return z++,[3,19];case 22:return this.ctx.restore(),[2]}}))}))},r.prototype.render=function(t){var n=this;return void 0===t&&(t=30),new Promise((function(r,o){return e(n,void 0,void 0,(function(){var e,n,s,h,a,l,d,c,f,u;return i(this,(function(i){switch(i.label){case 0:return e=+new Date,this.init(),[4,(p=t,void 0===p&&(p=0),new Promise((function(t){return setTimeout(t,p)})))];case 1:i.sent(),i.label=2;case 2:if(i.trys.push([2,14,,15]),!this.node)return[3,12];if(n=this.root.fixedLine||{},s=n.beforeElements,h=n.afterElements,!s)return[3,6];a=0,l=s,i.label=3;case 3:return a<l.length?(f=l[a],[4,this.drawNode(f,!0)]):[3,6];case 4:i.sent(),i.label=5;case 5:return a++,[3,3];case 6:return[4,this.drawNode(this.node)];case 7:if(i.sent(),!h)return[3,11];d=0,c=h,i.label=8;case 8:return d<c.length?(f=c[d],[4,this.drawNode(f,!0)]):[3,11];case 9:i.sent(),i.label=10;case 10:return d++,[3,8];case 11:return r(this.node),[3,13];case 12:this.lifecycle("onEffectFail","node is empty"),i.label=13;case 13:return[3,15];case 14:return u=i.sent(),this.lifecycle("onEffectFail",u),o(u),[3,15];case 15:return this.performance&&console.log("渲染用时："+(+new Date-e-30)+"ms"),[2]}var p}))}))}))},r.prototype.onEffectFinished=function(){var t=this,e=Object.keys(this.imageBus).map((function(e){return t.imageBus[e]}));return Promise.all(e)},r.prototype.destroy=function(){this.node=[]},r.prototype.save=function(t){try{var e=t||{},i=e.fileType,n=void 0===i?"png":i,r=e.quality,o=void 0===r?1:r;return this.canvas.toDataURL("image/".concat(n),o)}catch(t){return this.lifecycle("onEffectFail","image cross domain"),t}},r}();n.WEB==I&&(window.Painter=Bt);export{Bt as Painter,Bt as default};
diff --git a/uni_modules/lime-painter/components/l-painter/utils.js b/uni_modules/lime-painter/components/l-painter/utils.js
new file mode 100644
index 0000000..cea5c6e
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter/utils.js
@@ -0,0 +1,368 @@
+export const networkReg = /^(http|\/\/)/;
+export const isBase64 = (path) => /^data:image\/(\w+);base64/.test(path);
+export function sleep(delay) {
+	return new Promise(resolve => setTimeout(resolve, delay))
+}
+let {platform, SDKVersion} = uni.getSystemInfoSync() 
+export const isPC = /windows|mac/.test(platform)
+// 缓存图片
+let cache = {}
+export function isNumber(value) {
+	return /^-?\d+(\.\d+)?$/.test(value);
+}
+export function toPx(value, baseSize, isDecimal = false) {
+	// 如果是数字
+	if (typeof value === 'number') {
+		return value
+	}
+	// 如果是字符串数字
+	if (isNumber(value)) {
+		return value * 1
+	}
+	// 如果有单位
+	if (typeof value === 'string') {
+		const reg = /^-?([0-9]+)?([.]{1}[0-9]+){0,1}(em|rpx|px|%)$/g
+		const results = reg.exec(value);
+		if (!value || !results) {
+			return 0;
+		}
+		const unit = results[3];
+		value = parseFloat(value);
+		let res = 0;
+		if (unit === 'rpx') {
+			res = uni.upx2px(value);
+		} else if (unit === 'px') {
+			res = value * 1;
+		} else if (unit === '%') {
+			res = value * toPx(baseSize) / 100;
+		} else if (unit === 'em') {
+			res = value * toPx(baseSize || 14);
+		}
+		return isDecimal ? res.toFixed(2) * 1 : Math.round(res);
+	}
+	return 0
+}
+
+// 计算版本
+export function compareVersion(v1, v2) {
+	v1 = v1.split('.')
+	v2 = v2.split('.')
+	const len = Math.max(v1.length, v2.length)
+	while (v1.length < len) {
+		v1.push('0')
+	}
+	while (v2.length < len) {
+		v2.push('0')
+	}
+	for (let i = 0; i < len; i++) {
+		const num1 = parseInt(v1[i], 10)
+		const num2 = parseInt(v2[i], 10)
+
+		if (num1 > num2) {
+			return 1
+		} else if (num1 < num2) {
+			return -1
+		}
+	}
+	return 0
+}
+
+function gte(version) {
+  // #ifdef MP-ALIPAY
+  SDKVersion = my.SDKVersion
+  // #endif
+  return compareVersion(SDKVersion, version) >= 0;
+}
+export function canIUseCanvas2d() {
+	// #ifdef MP-WEIXIN
+	return gte('2.9.2');
+	// #endif
+	// #ifdef MP-ALIPAY
+	return gte('2.7.15');
+	// #endif
+	// #ifdef MP-TOUTIAO
+	return gte('1.78.0');
+	// #endif
+	return false
+}
+
+// #ifdef MP
+export const prefix = () => {
+	// #ifdef MP-TOUTIAO
+	return tt
+	// #endif
+	// #ifdef MP-WEIXIN
+	return wx
+	// #endif
+	// #ifdef MP-BAIDU
+	return swan
+	// #endif
+	// #ifdef MP-ALIPAY
+	return my
+	// #endif
+	// #ifdef MP-QQ
+	return qq
+	// #endif
+	// #ifdef MP-360
+	return qh
+	// #endif
+}
+// #endif
+
+
+
+/**
+ * base64转路径
+ * @param {Object} base64
+ */
+export function base64ToPath(base64) {
+	const [, format] = /^data:image\/(\w+);base64,/.exec(base64) || [];
+
+	return new Promise((resolve, reject) => {
+		// #ifdef MP
+		const fs = uni.getFileSystemManager()
+		//自定义文件名
+		if (!format) {
+			reject(new Error('ERROR_BASE64SRC_PARSE'))
+		}
+		const time = new Date().getTime();
+		let pre = prefix()
+		// #ifdef MP-TOUTIAO
+		const filePath = `${pre.getEnvInfoSync().common.USER_DATA_PATH}/${time}.${format}`
+		// #endif
+		// #ifndef MP-TOUTIAO
+		const filePath = `${pre.env.USER_DATA_PATH}/${time}.${format}`
+		// #endif
+		fs.writeFile({
+			filePath,
+			data: base64.split(',')[1],
+			encoding: 'base64',
+			success() {
+				resolve(filePath)
+			},
+			fail(err) {
+				console.error(err)
+				reject(err)
+			}
+		})
+		// #endif
+
+		// #ifdef H5
+		// mime类型
+		let mimeString = base64.split(',')[0].split(':')[1].split(';')[0];
+		//base64 解码
+		let byteString = atob(base64.split(',')[1]);
+		//创建缓冲数组
+		let arrayBuffer = new ArrayBuffer(byteString.length);
+		//创建视图
+		let intArray = new Uint8Array(arrayBuffer);
+		for (let i = 0; i < byteString.length; i++) {
+			intArray[i] = byteString.charCodeAt(i);
+		}
+		resolve(URL.createObjectURL(new Blob([intArray], {
+			type: mimeString
+		})))
+		// #endif
+
+		// #ifdef APP-PLUS
+		const bitmap = new plus.nativeObj.Bitmap('bitmap' + Date.now())
+		bitmap.loadBase64Data(base64, () => {
+			if (!format) {
+				reject(new Error('ERROR_BASE64SRC_PARSE'))
+			}
+			const time = new Date().getTime();
+			const filePath = `_doc/uniapp_temp/${time}.${format}`
+			bitmap.save(filePath, {},
+				() => {
+					bitmap.clear()
+					resolve(filePath)
+				},
+				(error) => {
+					bitmap.clear()
+					reject(error)
+				})
+		}, (error) => {
+			bitmap.clear()
+			reject(error)
+		})
+		// #endif
+	})
+}
+
+/**
+ * 路径转base64
+ * @param {Object} string
+ */
+export function pathToBase64(path) {
+	if (/^data:/.test(path)) return path
+	return new Promise((resolve, reject) => {
+		// #ifdef H5
+		let image = new Image();
+		image.setAttribute("crossOrigin", 'Anonymous');
+		image.onload = function() {
+			let canvas = document.createElement('canvas');
+			canvas.width = this.naturalWidth;
+			canvas.height = this.naturalHeight;
+			canvas.getContext('2d').drawImage(image, 0, 0);
+			let result = canvas.toDataURL('image/png')
+			resolve(result);
+			canvas.height = canvas.width = 0
+		}
+		image.src = path + '?v=' + Math.random()
+		image.onerror = (error) => {
+			reject(error);
+		};
+		// #endif
+
+		// #ifdef MP
+		if (uni.canIUse('getFileSystemManager')) {
+			uni.getFileSystemManager().readFile({
+				filePath: path,
+				encoding: 'base64',
+				success: (res) => {
+					resolve('data:image/png;base64,' + res.data)
+				},
+				fail: (error) => {
+					console.error({error, path})
+					reject(error)
+				}
+			})
+		}
+		// #endif
+
+		// #ifdef APP-PLUS
+		plus.io.resolveLocalFileSystemURL(getLocalFilePath(path), (entry) => {
+			entry.file((file) => {
+				const fileReader = new plus.io.FileReader()
+				fileReader.onload = (data) => {
+					resolve(data.target.result)
+				}
+				fileReader.onerror = (error) => {
+					reject(error)
+				}
+				fileReader.readAsDataURL(file)
+			}, reject)
+		}, reject)
+		// #endif
+	})
+}
+
+
+
+export function getImageInfo(path, useCORS) {
+	const isCanvas2D = this && this.canvas && this.canvas.createImage
+	return new Promise(async (resolve, reject) => {
+		// let time = +new Date()
+		let src = path.replace(/^@\//,'/')
+		if (cache[path] && cache[path].errMsg) {
+			resolve(cache[path])
+		} else {
+			try {
+				// #ifdef MP || APP-PLUS
+				if (isBase64(path) && (isCanvas2D ? isPC : true)) {
+					src = await base64ToPath(path)
+				}
+				// #endif
+				// #ifdef H5
+				if(useCORS) {
+					src = await pathToBase64(path)
+				}
+				// #endif
+			} catch (error) {
+				reject({
+					...error,
+					src
+				})
+			}
+			// #ifndef APP-NVUE
+			if(isCanvas2D && !isPC) {
+				const img = this.canvas.createImage()
+				img.onload = function() {
+					const image = {
+						path: img,
+						width:  img.width,
+						height:  img.height
+					}
+					cache[path] = image
+					resolve(cache[path])
+				}
+				img.onerror = function(err) {
+					reject({err,path})
+				}
+				img.src = src
+				return
+			}
+			// #endif
+			uni.getImageInfo({
+				src,
+				success: (image) => {
+					const localReg = /^\.|^\/(?=[^\/])/;
+					// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-TOUTIAO
+					image.path = localReg.test(src) ?  `/${image.path}` : image.path;
+					// #endif
+					if(isCanvas2D) {
+						const img = this.canvas.createImage()
+						img.onload = function() {
+							image.path = img
+							cache[path] = image
+							resolve(cache[path])
+						}
+						img.onerror = function(err) {
+							reject({err,path})
+						}
+						img.src = src
+						return
+					}
+					// #ifdef APP-PLUS
+					// console.log('getImageInfo', +new Date() - time)
+					// ios 比较严格 可能需要设置跨域
+					if(uni.getSystemInfoSync().osName == 'ios' && useCORS) {
+						pathToBase64(image.path).then(base64 => {
+							image.path = base64
+							cache[path] = image
+							resolve(cache[path])
+						}).catch(err => {
+							console.error({err, path})
+							reject({err,path})
+						})
+						return
+					}
+					// #endif
+					cache[path] = image
+					resolve(cache[path])
+				},
+				fail(err) {
+					console.error({err, path})
+					reject({err,path})
+				}
+			})
+		}
+	})
+}
+
+
+// #ifdef APP-PLUS
+const getLocalFilePath = (path) => {
+	if (path.indexOf('_www') === 0 || path.indexOf('_doc') === 0 || path.indexOf('_documents') === 0 || path
+		.indexOf('_downloads') === 0) {
+		return path
+	}
+	if (path.indexOf('file://') === 0) {
+		return path
+	}
+	if (path.indexOf('/storage/emulated/0/') === 0) {
+		return path
+	}
+	if (path.indexOf('/') === 0) {
+		const localFilePath = plus.io.convertAbsoluteFileSystem(path)
+		if (localFilePath !== path) {
+			return localFilePath
+		} else {
+			path = path.substr(1)
+		}
+	}
+	return '_www/' + path
+}
+// #endif
+
+
diff --git a/uni_modules/lime-painter/components/lime-painter/lime-painter.vue b/uni_modules/lime-painter/components/lime-painter/lime-painter.vue
new file mode 100644
index 0000000..f3b614b
--- /dev/null
+++ b/uni_modules/lime-painter/components/lime-painter/lime-painter.vue
@@ -0,0 +1,235 @@
+<template>
+	<view class="page">
+		<!-- <demo-block title="json用法">
+			<image :src="picture" v-if="picture" mode="widthFix"></image>
+			<l-painter :board="poster" @success="picture = $event" isCanvasToTempFilePath ref="json" style="position: fixed;left: 1500rpx;width: 750rpx;" path-type="url"></l-painter>
+		</demo-block> -->
+		<!-- <demo-block title="基础用法">
+			<l-painter ref="painter">
+				<l-painter-view css="background: #07c160; height: 120rpx; width: 120rpx; display: inline-block">
+				</l-painter-view>
+				<l-painter-view
+					css="background: #1989fa; height: 120rpx; width: 120rpx; border-top-right-radius: 60rpx; border-bottom-left-radius: 60rpx; display: inline-block; margin: 0 30rpx;">
+				</l-painter-view>
+				<l-painter-view
+					css="background: #ff9d00; height: 120rpx; width: 120rpx; border-radius: 50%; display: inline-block">
+				</l-painter-view>
+			</l-painter>
+		</demo-block> -->
+		<!-- <demo-block title="View 容器">
+			<l-painter>
+				<l-painter-view css="background: #f0f0f0; padding-top: 100rpx;">
+					<l-painter-view css="background: #d9d9d9; width: 33.33%; height: 100rpx; display: inline-block">
+					</l-painter-view>
+					<l-painter-view css="background: #bfbfbf; width: 66.66%; height: 100rpx; display: inline-block">
+					</l-painter-view>
+				</l-painter-view>
+			</l-painter>
+		</demo-block> -->
+		<!-- <demo-block title="Text 文本">
+			<l-painter>
+				<l-painter-view css="background: #f5f5f5; padding: 30rpx; color: #222a29">
+					<l-painter-text text="登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼" />
+					<l-painter-text text="登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼"
+						css="text-align:center; padding-top: 20rpx; text-decoration: line-through " />
+					<l-painter-text text="登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼" css="text-align:right; padding-top: 20rpx" />
+					<l-painter-text text="水调歌头\n明月几时有？把酒问青天。不知天上宫阙，今夕是何年。我欲乘风归去，又恐琼楼玉宇，高处不胜寒。起舞弄清影，何似在人间。"
+						css="line-clamp: 3; padding-top: 20rpx; background: linear-gradient(,#ff971b 0%, #1989fa 100%); background-clip: text" />
+				</l-painter-view>
+			</l-painter>
+		</demo-block> -->
+		<!-- <demo-block title="Image 图片">
+			<l-painter>
+				<l-painter-view>
+					<l-painter-text text="基础用法"
+						css="margin-top: 30rpx; display: block; padding-bottom:20rpx; color: #999" />
+					<l-painter-view>
+						<l-painter-image
+							src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+							css="width: 200rpx; height: 200rpx" />
+					</l-painter-view>
+				</l-painter-view>
+				<l-painter-view>
+					<l-painter-text text="填充方式"
+						css=" margin-top: 30rpx; display: block; padding-bottom:20rpx; color: #999" />
+					<l-painter-view css="display: inline-block; padding-right: 12rpx">
+						<l-painter-image
+							src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+							css="width: 200rpx; height: 200rpx; object-fit: contain; background: #f5f5f5" />
+						<l-painter-text text="contain" css="margin-top: 10rpx; display: block; text-align:center;" />
+					</l-painter-view>
+					<l-painter-view css="display: inline-block; padding: 0 12rpx">
+						<l-painter-image
+							src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+							css="width: 200rpx; height: 200rpx; object-fit: cover; background: #f5f5f5" />
+						<l-painter-text text="cover" css="margin-top: 10rpx; display: block; text-align:center;" />
+					</l-painter-view>
+					<l-painter-view css="display: inline-block; padding: 0 12rpx">
+						<l-painter-image
+							src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+							css="width: 200rpx; height: 200rpx; object-fit: fill; background: #f5f5f5" />
+						<l-painter-text text="fill" css="margin-top: 10rpx; display: block; text-align:center;" />
+					</l-painter-view>
+					<l-painter-view css="display: inline-block; margin-top: 30rpx">
+						<l-painter-image
+							src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+							css="width: 200rpx; height: 200rpx; object-fit: none; background: #f5f5f5" />
+						<l-painter-text text="none" css="margin-top: 10rpx; display: block; text-align:center;" />
+					</l-painter-view>
+				</l-painter-view>
+			</l-painter>
+		</demo-block> -->
+		<!-- <demo-block title="QRcode 二维码">
+			<l-painter>
+				<l-painter-qrcode text="limeui.qcoon.cn" css="width: 200rpx; height: 200rpx" />
+			</l-painter>
+		</demo-block> -->
+		<demo-block title="栗子海报">
+		<image v-if="picture2" :src="picture2" mode="widthFix"></image>
+		<l-painter css="width: 750rpx; padding-bottom: 100rpx; background: linear-gradient(180deg,#ff971b 0%, #ff5000 100%)" 
+				@fail="fail"
+				@done="done"
+				pathType="url"
+				ref="poster"
+				performance
+				>
+			<l-painter-image src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"  css="background: #ffffff; object-fit: cover; margin-left: 40rpx; margin-top: 40rpx; width: 84rpx; border: 2rpx solid #ffffff; box-sizing: border-box; height: 84rpx; border-radius: 50%;"/>
+			<l-painter-view css="margin-top: 40rpx; padding-left: 20rpx; display: inline-block">
+				<l-painter-text text="隔壁老王" css="display: block; padding-bottom: 10rpx; color: #ffffff; font-size: 32rpx; fontWeight: bold"/>
+				<l-painter-text text="为您挑选了一个好物?" css="color: rgba(255,255,255,.7); font-size: 24rpx"/>
+			</l-painter-view>
+			<l-painter-view css="margin-left: 40rpx; margin-top: 30rpx; padding: 32rpx; box-sizing: border-box; background: #ffffff; border-radius: 16rpx; width: 670rpx; box-shadow: 0 20rpx 58rpx rgba(0,0,0,.15)">
+				<l-painter-image src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"  css="object-fit: cover; object-position: 50% 50%; width: 606rpx; height: 606rpx;"/>
+				<l-painter-view css="margin-top: 32rpx; color: #FF0000; font-weight: bold; font-size: 28rpx; line-height: 1em;">
+					<l-painter-text text="￥" css="vertical-align: bottom"/>
+					<l-painter-text text="39" css="vertical-align: bottom; font-size: 58rpx"/>
+					<l-painter-text text=".39" css="vertical-align: bottom"/>
+					<l-painter-text text="￥59.99" css="vertical-align: bottom; padding-left: 10rpx; font-weight: normal; text-decoration: line-through; color: #999999"/>
+				</l-painter-view>
+				<l-painter-view css="margin-top: 32rpx; font-size: 26rpx; color: #8c5400">
+					<l-painter-text text="自营" css="color: #212121; background: #ffb400;"/>
+					<l-painter-text text="30天最低价" css="margin-left: 16rpx; background: #fff4d9; text-decoration: line-through;"/>
+					<l-painter-text text="满减优惠" css="margin-left: 16rpx; background: #fff4d9"/>
+					<l-painter-text text="超高好评" css="margin-left: 16rpx; background: #fff4d9"/>
+				</l-painter-view>
+				<l-painter-view css="margin-top: 30rpx; display: flex">
+					<l-painter-text uid="tag" css="position:absolute; top: 6rpx; padding: 5rpx 10rpx; color: #212121; background: #ffb400; font-size: 24rpx" text="京东自营"></l-painter-text>
+					<l-painter-text css="text-indent: calc(tag.width + 10rpx); flex: 1; padding-right: 20rpx; box-sizing: border-box; line-clamp: 2; color: #333333; line-height: 1.8em; font-size: 36rpx;" 
+						text="360儿童电话手表9X 智能语音问答定位支付手表 4G全网通20米游泳级防水视频通话拍照手表男女孩星空蓝"></l-painter-text>
+					<l-painter-qrcode css="width: 128rpx; height: 128rpx;" text="limeui.qcoon.cn"></l-painter-qrcode>
+				</l-painter-view>
+			</l-painter-view>
+		</l-painter>
+		<button type="default" @click="save">save</button>
+	</demo-block>
+	</view>
+</template>
+
+<script>
+	export default {
+		data: () => ({
+			picture: '',
+			picture2: '',
+			show: false,
+			"poster": {
+					"css": {
+						"width": "750rpx",
+						"height": "1333rpx"
+					},
+					"views": [{
+						"type": "image",
+						"src": "https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg",
+						"css": {
+							"width": "750rpx",
+							"height": "1333rpx",
+							"background": "white",
+							"position": "fixed",
+							"top": "0",
+							"left": "0",
+							"zIndex": -1
+						}
+					}, {
+						"css": {
+							"width": "750rpx",
+							"position": "fixed",
+							"top": "610rpx",
+							"left": "303rpx"
+						},
+						"views": [{
+							"type": "view",
+							"css": {
+								"width": "150rpx",
+								"height": "150rpx",
+								"background": "#FFF"
+							},
+							"views": [{
+								"type": "image",
+								"src": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHgAAAB4CAMAAAAOusbgAAAC91BMVEX/GAD/////AAD/CAD3rq3/FAD//Pz/DwD2pKP7zcr/wrz/5+T/YlH/MBv52db/jID/Oyb/GAD/8/L/STb/Lhj/JA3/gXP/fnD/cGL/////AAD/GAD/EwDjHRv/EAD/wrz/DAD/FgD/CQD/AwH/29ffAAD/Y1L+/Pz/HAP/BQD/5+T/GwH/STb/MBv/FQD/+/r/p57/Lhj/DgD/cGL/fnD/zsn/PCj/YE//Szn/jID//f3/JA3/NyL/8/Pra2v/ta7/1tL/rKTpTEvpX1//3tn/vbzqWVf/a1v/mY//yML/gXP/VUP/5ePkGBb/KBL/Njb/Mx7/joL/9/b/3tz/ubL/dmf/Gxv/4d3/vLX/Z1fhAQD/n57/U1H/IQvhCQf/y8j/wbz/emz/bl7/LBX/HwjaAAD/2Nf/k4f/kIT/Pyv/JhD/rqX/qJ//oZj/lYr/gYD/RjXkIR7/+fn/4+D/09H/v7j/UT//JiX/6ujW09T/l43/iH7/WUf/TjvkHhz/8O7/6ebn5eb/npT/nJHxh4b/fG7iExHiDw3/8vH/sqr/sKf/hnn/XUvoPj3/RTL/LhrlAAD/2tf/0s7/hHf/c3HkJSPW/f7/7er/pp3zmJjnNDP/Qy//KBz/GBj/HRHe3N33xcb/qKPufn7/dGXtXVz/OTjq6Or/pJrvdnbtZWX/ZGLqVFT/WlL/UE//Dg3kBwXoAADk/f3y8PLwpqj/pp7/n5f/cHDlLi3lEA7t6+3Y19r61NX2vL3zt7eurK3/kI/yjo1sb3HtcHD/IRn/KRjpDAv6///z///49vf54uPY4uPl3+HGxMW1trj/rq3flpaEh4j/a2H/XFvkR0jpRkX/RkP28/XQ8/Xb7/HdsbLLm5yAfX/fbGzoWVjjUVD/MyjG/f3G2ty71dfbysvntbbNp6mjl5njeXjcWVjrNzbcNTTnEhDo7u/QsbLfqqvap6fOoaJ1oaLhi4t3eHm7c3O0Tk6lMC8CLC3gHBrRGxr/FRUAExX7ExI4D1MFAAAAGXRSTlPy8vLy/vLx8v358vLy8vny8uXy8vLy8vLyQ/UAIwAAE0tJREFUaN6tm3dcFEcUx4H03svOrcfuncfdckU4WjhAkIgEEBQkIigo1YDGiD2IaBRFVBRR7BpbjCVRE2NJ77333nvvPX/kTVlm95b18PPx90ncMrPve7M75b2ZIeyiMFOdEnZOeHj4hRHkIuKCcKpTI06LuBCOF192Cr5/WsTZ4XqdDRkuPT08/PTzIkxNA9ZiLpsrWhCEREQuULJAlY58KBWOaSkKvi+iSEGvSCTaYwcIgtNrt5grDJN9Yi/iYJIBFRrBOMGKxpmDTU0DF8BuBRll14DdNrgx2wimT44yB5uYZmCfMinSqImiVQXLytLIyKyFwzzDCvVgUZofOS5rrjnY1DQBi2iwYNQUq6SCfeQzxiOElunBfmWWADIHm5qmYLBrVH8OFtEgAragOA24KEWx2hIEo8bBA9UUbGK6b+AaKOnhIHCiAGowARfDA/4pfQZPGhOlasxSLTh99F2jR+jB1nLIleQSOXjBmKgxE9n5PHhgSYCAjaZXGcAexBXLwUx6sFtEINnNwTPgulTQC8BG09UGcBSyqEJXhQCrGTk4GxLjjWCjac+JgwuZ7UgECi7xHLiuPMng8UfiiZZLFqk+Pn71whuSiZbW+Dk4/YbkG+JXk3xHrjlJYDeiUty0B1suMDXY9bX6OkRVcBLAfJDgiXnMblpwO05GzPbJBLMO3e62oCQVZIcbORrw9dCpS7jinlywf3lcXJzHb5ESryF6cHzV3pf3lkCGCQ/SO82SxT88Lm5v4ckFo/lwPgiqsh8xCUzVvBKgqpNSq42OwDVItlhkIpt7HgN4kEwFmaJOHDwHcQ0PArvx51yIwazEYElxqQAvXEtubNZQYqNprwG89JarVN2yQw+WxVS4uY6CxQbIsVGWJfcSGIsXw804eLJaJGBlTiRRVg7tq42m40KPTtrxuFgAUTBqhuNQCYqINLU6jlV9K6KSTUenEwO3a8B5ONHvBzdPlOxqO65in1EWsfo8HmcIRi3Wggexm4ehMHPwyAdN2q7tq0vhWnJDie12O9Ru7oGYmGY+V0x/o0aJfj14Vl3/usKR3pHL6lbWjdq0yRtrkSl4KtzIHun1pvgsvhqv11vt6wGbmiZgeGlWo6C26MGVyIqyA85AO/Kj4YGAc67aZW6EG/MDTmcygubkdDqnc5/L1DQDWyWj/MHga5FExuNRyAaNAqSC6yEBV/nxAMbOQAIHm5oG8Ck2UyFpKGmmCophjsC1cJyu+lzYyxxMmqmMrofjKvhFSVpwCjK3DeGPy1RSTTQukN1in8DA2WlpaYOwlwnHaFziSDhZzsDJdpc9Ca6LVfBwxdx2WNg50aYaGu3ElWpo9NAiCpZdKSkpNbJFdqeALHBSDkeXTMFpkHHB/vKUcplWLmHeUHPb54SFC30UgN1WRVFwq5EVkIzjOjiKbgymWoJwBgI+vsL7Dq5EtD7KtF5yiVY/VC6qGCTjDKjhJIJ3QFXxQ2lFqBqShuuWbAo6zMFuH1TLmhMDj5+ZOHMpOy/58MMP67Wh0dSxCQnxiqx4EhISJlitKtenzE9IGFsFT46nYKUerrsCapc2M1HVTDy+jWXXF+rAVQj1eDYZCDRV0AscARK4zZV6yiyiOmwfMldRMJohaDQcceGEUew8QgfOJT471WC/TbEEB4ML2CCR4fdzcCR36AnYI2g0GfmIVC8hElnxuSVMB07WgOdy74ZrYl/AcwSNViAqmxt6AbjuIm6EG8DnJiXdnoG/7+1JSalWCs64Pen2qG3btq1LGnPbmME0kageMoQCWxvAYpWTgadvG0S0zGaxxkJCNlxPIoF5BEJknPewnxXHAk2fAFLYWL8cUdndocHEGZCmCHqNp74viawH9OLsAZjF9N6AxmdPQionBBi+Bb5p7EBykYmzRwqluNSAECE/j1II2GXXeIJdkJcJoQRSqxXiDbYjkKsX8HgKJjW7iNRqFdwOsdhVEgWXQAi2qrIyvtJl7QFLM5ILrwPdMAH/5i1bCpgatuwoLCycs6VgS17h0tsqwUqVJBNwIHn1wiOD8Ws4QkI+LCkWwr7K2bOTL2Bgqus0tXoAj0QJGLpjE60tKSnBBZwyNWNTIu5p2Og0AH/TdNykqLePRZxjkfRcKpjH3twjA3FwofDQa0OYdg7sTe8fWpsdNOvDqw+X3esEsGmJpyCmHAa+TuiodRxXta8OjmJtwkp7raCpCHdv4GIIvWawbzz0waYHC19+OQ5E4jIGHuLop1UFsMoqKh4fuf/xv8gNx5BZeAKmbm/c3rhJTdc0NUjU9Py9cURz/LIOzH+WomnHosBlBLcscji6d7Yeun/r1s9++/3vgy0EnCmA+PsS3Xq/ehTqDRyFZFnTjtGKgDm4cZGjbd+htTTt4X//fOnIgSBwiWjD5vTgiQbwCBYLaMHD9V09QvEU3FhW0VhW9sj5cPfXB4SnnnrjuQeev+ON/EV6sJOVGEyr4t2alYF9tuT09PSrbDqwraA9/YX0IoFq9ut5rw8i4Ja2jq8dR8964oknnM53H3DeeffdkPzE041tFDz0hXSsF26d8XpeXo1ITL8wlYPFlLy810sDFEyjUL9bB3b7DOMxAbflP7tr9/lP3gnaJQh377oJ68n7DuRT8K2ISqa1mppewMFs6GJgi0wGTB0YXAufYok2gB0733x+zR3PAm3XU+++JLzx7M3P3vSUMBBSCHgQEn0gOg/itWPTotYhQx4OZvMqVjcdPpI0boIiGMBlZ775xU9v3Yy1656HH37gxpvuvunjB/KPMfAEJJP5RpfApl+xCxqDL1hHnqgBy74Vqamp5RByFaSmzlxFHCO4AeepkdOmTSvCveC0jGmzMLji6++e++SDH9fceM8999y4684vHn743Zde+vmPg40c7KuBJ5d3TZvWNRnM1PgoeB5YaJqZOrMZjisDuuZEekW9ilxIQWPhpBn5UTIGdx5a88nH3x77dM09N2Ldveu555//6P7/oE4zMHubJRKyk/jGgyi4EiwsI1/RhhrU5kRslwJ4vBCkYHD+wbc/eu7VxzuPvbhmzTMEffMdT97/eEWjFnwVLiAG48jrKgZeiPzkK+bowHQcsKFVwWCNI4CacIm//ear/IP9Gg90vvrDM2vefOaZt9bctL0TuCp4IlLQRjxiKQjZ60isqZBxrRLMN/MugoGLIdRKgpArGXd2i9MW488aSFucFq0B01fdeOzgIsC09Ovs3PDli++8886X3Z34Rk+JIcLzgLUMi98q9sclhhsTcSgJ5qPY0LViblraxQDGoVf5/gUQcqXhHn1/yv487N5u2YLjsh6wEksbDVNL/oGDLZ9//t5B3FlycBFYad9fvj91KgRmA3DRWci3GI5zKVi2QKR3GWlOkqKgJT1Do4ISqUOP4zIOrsFgru4DnW/D9y3L14GxEpAdlQsmAjAJ+U4JOwNiMAi0esCTkJ/Uy2ibguMUDi7QgRcd/eCXO96641Av4OlIQgVmYEgEs+qMgA9a+TqYvQgQr0xB9YFAAEpss8kmYFDnwDU3v/39Z529gRVUUxRwEtc6wMxysGKTCPgsiMHqFYuvwesd2YTj8LEJY28dueLReojRIsttZuD8Yy9+9eIH33z6uBG8GCykr9i0aRMemZaNXDGSvUw1MaFd9LMQZgZePrTbUS5LnYYQ/UoNihm4reO9zquPdr/HuUZHAAcoqXCcL+iVZpUYeDkSsdBsXgPIxM6AGiTZuwhYRCkc3NJW1q/fgX7H8vPLKlp6BY+wwhtdyXsunUoYmMeS8RxMHQE/+915cLRScGOFo8zRnVkG/lZ+haNjAxzLHGX9WvTg/qTEJuB5PeCELDrnWsLBosvjucXTnjUuq3nY5GGTsmBCVrgag9v2PNS6+7601u2tD23Yvl4oWn8qaH0L80CmQ+Y43MuPy8oal2YAA2rYZE+9LBOwQdwRwBcFNKoD7cPgij1bn551L/7/zO6Os4Q9mZm7d+8e2E/jCHi5ISO4mM52m4PxRLximaedRKU+l2OPMDBz55CdmVufdtTee19txyO1tbWORvaqlwDHYwLmpo8HdotqiTf2gPcR8HbhkZ1DXhu4r04A0H3bi4TW1od2tvVjr5pORZiDVxrAC17JfiWdg6WGw9cfXlD6SnZ2ip+C09fuweBFG65e33qvsH797sxFHXtaW0c4H1rfOoSC3xeaFdlfkE1UWhodBM4Ba3l+OQjs4auDvFbbifNCwZX9Sa3udmxfX/uI4Ki4r7Gi7NR9tWc6a1871ZFPwFcLssJn6Q21uomHMRxMPJBkDiZeN9txQcGFJQRccVTYU7teWOSYu7V2u9Bdu1Vw5AutDgauViyqJGv/IHAMceiNYB6JpqshDCJeoA7sOPP+2syhrRUVG+7t3rq7duesRyocA7va8ilYQUwWdyjwBcnJN5RQsDQDzovxWHxkIY6eZy+thAXSAkkHzu9oWdTR4YCO5OiGDW35r21wtED/2U3AQ4TZ8ABWnCyGAkew6DmKzTbkqY5ecK0eP29fLY4P8X9U9Iqr9qjQI58tBNg4+WJYhWHgVWsPvXp1b9qXmZn5PhyHbNjOu2Of1JcSF2vAuWYlnrNp2mCDYKjFoy37l2tlb7W6HXFFhJ0blTQmg4Ntc2KIRjfddtttSQtGx8TE2ij41luyrw3WjuEFj21JnjBhQvOW6n+SteNAFDytbccJo2NGzx4T1aNzNbWaTQJrwy6lpx2bqBwcCoRlU9AOYzIHV5HqwxWuB4NkKrIlo6hcweG1KZjFZWwlNf544Fw4RpmB3TY+S0J7rgbYn4RAxSZcp5dlkNwkADJqBgBHsXkdPfhstj8JwKLXQ5Uoyrbq6ZGRxeWS7Kv3kPE4WFmRdN1SFhPhiQLRokTBTVxb5maN49kSFVnJhWOpwsFp47Iizya1ehQFo0nqaM3GY7xarPQnHohR9qkETAOgONxV8blwLpHtpZDcHJxBavVpeA8aA1+nDiN47KJbzazKNOpzBUuRoxk4h9QdspJK4rJxyMqzybivJ0cOXinZxNPCIuy0xHmIe5mjoDxMiEyflOICwZXEJgZ9kKAMBbALqZOoNHeeGizYNSIxP0mkmkt8rktjH9ucg1/W5tjNTWqJNz8Wy/TYo8UjRozIs1vkFLhKkWnNd8XGPuqdB+CNmx/bvAQyVG0muTfHUbDsjtWoRoanWWIRZJ5O/OrTBwwYEMCuLDlSBQZolIjoisJsOG9ChIxScYLAngLnGM1Xc6tzmUUaC1EInmaJ4wxrEqZKRZIkWmjUfj0DJ2ozbEQ2tI5f0uk5fslifh7CSFLfwMMBDEJLcURHz42O5PXGPXtcURrwWGQjJs4IO915HNESW7FImNFEz8nCtVMH5vEZB9MbzLmhBgPTkZ+YOCPsPK+pHh0+C49wdf2x6tbi+li3kpzDUj0kBoGbYB1/hwbsXA4BWw4F+1KoyZEzwALW+dCcTMRajFF0c4KayMG5iLQYDnbxvsktMZP1apcZcgusUXQ7hs1FZm/ZxM461h2X4saogquR2jfRfRo+spuHgUNtge1dUyVwT9I04G245gXvEbBoS0yXtTg41BZYqlzY/norHJcM8xBB2OWzbPRQlYsWcTgcvXAsoEMMAQdysnrGH6UKTOYqsljOHrok1BZY7u0vJIuPTPCaLIgJ94gKLZDbTwdVY3OaT2foe7z9iFBbbqiWIZlvq8KiYz8/18kC4EAQuJDM0IuyzJ44LSSYxzcczDaEshEDBctt0fcwMHSROesJJJE+HRFqCyxVJLhqXRxsqwZ38HCNRH69LTdGr1ybbK1JiuLyWi3WRDC7Y/RdONHWsC4m5syQW2C5OBglMr8IpC47cI2gQS6XxCpBM03kc5nGrXMhwCH30Ft6E4riC7UnCl6KQC4KXoyY0g0l5mAXcX1dHJxOpnH6BJ60Ond1lzq2wGJpqSQT8JTxcAEiId+E1bk9KpV4hZeqIEe9xMFkoTY+Pvfy0GB30BRZFxIBHKQZ+lqtSkRTqSfIwHyhNiI0mE++6P9qgIuumPcibpqD+74v06UtMd/KrlcUXyLmDR3xeJDW6hMDL4Rd6jks7MqhYNyOR08sUqeuYOv6tdALJFp7LLB2zONBtR2PLu4rmCub/7mCW9Quw8XC+V1wXKCx4NW/Dt5zxZ44eCGS+VZ2WebLcJORSByBQm7BtK9Gk0NtgTXfQ7+Njk48MRUhUvuuo9+ZDEDiFIGrmY1tC+CYatgVsWqYR9WwuOOBI+k0KCSyITcJJk4LYZYVW0iFMbkcLDTT8ZiGd1VsNC+GjEnwwKDJkz2XmIxO5mDugUQzJ4P4c2z4aqcLXiCSSDVR4MphC4/hJwjmPhcFVyM/AWcjkQTmg7Tgajb/vk0H9qNYCjbfAmsOhi03dJtzOXOrliE7SZxPPyOP2hU7Ygs87Ek2aRgeYgusOVhy5fRfmVHPXOdK8KmTsVMG18s0YF81XmOp42ZjFB8Fh9gCaw7GT9nsYwM0WIADP3KwiKbD9TKkM0vB5ltgQ4L9kgIfyVwAVtdLuVlrD9hippBgugxnphBbboRQfz7IdUVEWMSV7PysM87AGc445axwc8GfD9K/LTw3Qmc24rzTIfF/OQkX7MfEGOgAAAAASUVORK5CYII=",
+								"css": {
+									"width": "138rpx",
+									"height": "138rpx",
+									"marginTop": "6rpx",
+									"marginLeft": "6rpx"
+								}
+							}]
+						}]
+					}]
+				},
+		}),
+		mounted() {
+			this.$refs.poster.canvasToTempFilePathSync({
+				fileType: 'jpg',
+				quality: 1,
+				success: (res) => {
+					console.log(`mounted`, res.tempFilePath)
+					this.picture2 = res.tempFilePath
+					this.saveImage()
+				}
+			})
+		},
+		methods: {
+			close() {
+				this.show = false
+			},
+			fail(v) {
+				console.log(v)
+			},
+			done(v) {
+				console.log('绘制完成:')
+			},
+			save() {
+				this.$refs.poster.canvasToTempFilePathSync({
+					fileType: 'jpg',
+					quality: 1,
+					success: (res) => {
+						console.log(res.tempFilePath)
+						this.picture2 = res.tempFilePath
+						this.saveImage()
+					},
+					fail(e) {
+						console.log('???????????',e)
+					}
+				})
+			},
+			// 保存图征
+			saveImage() {
+				// #ifndef H5
+				uni.saveImageToPhotosAlbum({
+					filePath: this.picture,
+					success(res) {
+						uni.showToast({
+							title: '已保存到相册',
+							icon: 'success',
+							duration: 2000
+						});
+					},
+				});
+				// #endif
+			}
+		}
+	};
+</script>
+
+<style lang="stylus" scoped>
+
+</style>
diff --git a/uni_modules/lime-painter/hybrid/html/index.html b/uni_modules/lime-painter/hybrid/html/index.html
new file mode 100644
index 0000000..fdf884e
--- /dev/null
+++ b/uni_modules/lime-painter/hybrid/html/index.html
@@ -0,0 +1,119 @@
+<!DOCTYPE html>
+<html lang="zh">
+
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta http-equiv="X-UA-Compatible" content="ie=edge">
+	<title></title>
+	<style type="text/css">
+		html,
+		body,
+		canvas {
+			padding: 0;
+			margin: 0;
+			width: 100%;
+			height: 100%;
+			overflow-y: hidden;
+			background-color: transparent;
+		}
+	</style>
+</head>
+
+<body>
+	<canvas id="lime-painter"></canvas>
+	<script type="text/javascript" src="./uni.webview.1.5.3.js"></script>
+	<script type="text/javascript" src="./painter.js"></script>
+	<script> 
+		var cache = [];
+		var painter = null;
+		var canvas = null;
+		var context = null;
+		var timer = null;
+		var pixelRatio = 1;
+		console.log = function (...args) {
+			postMessage(args);
+		};
+		// function stringify(key, value) {
+		// 	if (typeof value === 'object' && value !== null) {
+		// 		if (cache.indexOf(value) !== -1) {
+		// 			return;
+		// 		}
+		// 		cache.push(value);
+		// 	}
+		// 	return value;
+		// };
+
+		function emit(event, data) {
+			postMessage({
+				event,
+				data: (typeof data !== 'object' && data !== null ? data : JSON.stringify(data)) 
+			});
+			cache = [];
+		};
+		function postMessage(data) {
+			uni.postMessage({
+				data
+			});
+		};
+		
+		function init(dpr) {
+			canvas = document.querySelector('#lime-painter');
+			context = canvas.getContext('2d');
+			pixelRatio = dpr || window.devicePixelRatio;
+			painter = new Painter({
+				id: 'lime-painter',
+				context,
+				canvas,
+				pixelRatio,
+				width: canvas.offsetWidth,
+				height: canvas.offsetHeight,
+				listen: {
+					onProgress(v) {
+						emit('progressChange', v);
+					},
+					onEffectFail(err) {
+						//console.error(err)
+						emit('fail', err);
+					}
+				}
+			});
+			emit('inited', true);
+		};
+		function save(args) {
+			delete args.success;
+			delete args.fail;
+			clearTimeout(timer);
+			timer = setTimeout(() => {
+				const path = painter.save(args);
+				if (typeof path == 'string') {
+					const index = Math.ceil(path.length / 8);
+					for (var i = 0; i < 8; i++) {
+						if (i == 7) {
+							emit('success', path.substr(i * index, index));
+						} else {
+							emit('file', path.substr(i * index, index));
+						}
+					};
+				} else {
+					// console.log('canvas no data')
+					emit('fail', 'canvas no data');
+				};
+			}, 30);
+		};
+		async function source(args) {
+			let size = await painter.source(args);
+			emit('layoutChange', size);
+			if(!canvas.height) {
+				console.log('canvas no size')
+				emit('fail', 'canvas no size');
+			}
+			painter.render().catch(err => {
+				// console.error(err)
+				emit('fail', err);
+			});
+		};
+	</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/uni_modules/lime-painter/hybrid/html/painter.js b/uni_modules/lime-painter/hybrid/html/painter.js
new file mode 100644
index 0000000..de93edb
--- /dev/null
+++ b/uni_modules/lime-painter/hybrid/html/painter.js
@@ -0,0 +1 @@
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).Painter={})}(this,(function(t){"use strict";var e=function(){return e=Object.assign||function(t){for(var e,i=1,n=arguments.length;i<n;i++)for(var r in e=arguments[i])Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r]);return t},e.apply(this,arguments)};function i(t,e,i,n){return new(i||(i=Promise))((function(r,o){function s(t){try{h(n.next(t))}catch(t){o(t)}}function a(t){try{h(n.throw(t))}catch(t){o(t)}}function h(t){var e;t.done?r(t.value):(e=t.value,e instanceof i?e:new i((function(t){t(e)}))).then(s,a)}h((n=n.apply(t,e||[])).next())}))}function n(t,e){var i,n,r,o,s={label:0,sent:function(){if(1&r[0])throw r[1];return r[1]},trys:[],ops:[]};return o={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(i)throw new TypeError("Generator is already executing.");for(;s;)try{if(i=1,n&&(r=2&o[0]?n.return:o[0]?n.throw||((r=n.return)&&r.call(n),0):n.next)&&!(r=r.call(n,o[1])).done)return r;switch(n=0,r&&(o=[2&o[0],r.value]),o[0]){case 0:case 1:r=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,n=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(r=s.trys,(r=r.length>0&&r[r.length-1])||6!==o[0]&&2!==o[0])){s=0;continue}if(3===o[0]&&(!r||o[1]>r[0]&&o[1]<r[3])){s.label=o[1];break}if(6===o[0]&&s.label<r[1]){s.label=r[1],r=o;break}if(r&&s.label<r[2]){s.label=r[2],s.ops.push(o);break}r[2]&&s.ops.pop(),s.trys.pop();continue}o=e.call(t,s)}catch(t){o=[6,t],n=0}finally{i=r=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}}var r={MP_WEIXIN:"mp-weixin",MP_QQ:"mp-qq",MP_ALIPAY:"mp-alipay",MP_BAIDU:"mp-baidu",MP_TOUTIAO:"mp-toutiao",MP_DINGDING:"mp-dingding",H5:"h5",WEB:"web",PLUS:"plus"},o="width",s="height",a="margin",h="center",c="flex-start",f="flex-end",d=["Top","Right","Bottom","Left"],l="left",u="right",p="top",g="bottom",v="middle",y=["contentSize","clientSize","borderSize","offsetSize"],b="row",x="column",w={TOP:p,MIDDLE:v,BOTTOM:g},m={LEFT:l,CENTER:h,RIGHT:u},S="view",z="text",I="image",M="qrcode",k="block",B="inline-block",W="none",P="flex",O="absolute",T="fixed",L="transparent",R="fill",F={display:k,color:"#000000",lineHeight:"1.4em",fontSize:14,fontWeight:400,fontFamily:"sans-serif",lineCap:"butt",flexDirection:b,flexWrap:"nowrap",textAlign:l,alignItems:c,justifyContent:c,position:"static",transformOrigin:"".concat(h," ").concat(h)},A={upx2px:function(t){return window.innerWidth/750*t},getSystemInfoSync:function(){return{screenWidth:window.innerWidth,screenHeight:window.innerHeight}},getImageInfo:function(t){var e=t.src,i=t.success,n=t.fail,r=new Image;r.onload=function(){i({width:r.naturalWidth,height:r.naturalHeight,path:r.src,src:e})},r.onerror=n,r.src=e}},E="object",j="undefined",C=typeof window==E?typeof uni==j||typeof uni!==j&&!uni.addInterceptor?r.WEB:r.H5:typeof swan==E?r.MP_BAIDU:typeof tt==E?r.MP_TOUTIAO:typeof plus===E?r.PLUS:typeof wx==E?r.MP_WEIXIN:void 0,H=C==r.MP_WEIXIN?wx:typeof uni!=j?uni.getImageInfo?{upx2px:function(t){return uni.upx2px(t)},getSystemInfoSync:function(){return uni.getSystemInfoSync()},getImageInfo:function(t){return uni.getImageInfo(t)},downloadFile:function(t){return uni.downloadFile(t)}}:Object.assign(uni,A):typeof window!=j?A:uni;if(!H.upx2px){var D=((H.getSystemInfoSync&&H.getSystemInfoSync()).screenWidth||375)/750;H.upx2px=function(t){return D*t}}function $(t){return/^-?\d+(\.\d+)?$/.test(t)}function Y(t,e,i){if($(t))return 1*t;if("string"==typeof t){var n=/^-?([0-9]+)?([.]{1}[0-9]+){0,1}(em|rpx|vw|vh|px|%)$/g.exec(t);if(!t||!n)return 0;var r=n[3];t=parseFloat(t);var o=0;if("rpx"===r)o=H.upx2px(t);else if("px"===r)o=1*t;else if("%"===r&&e)o=t*Y(e)/100;else if("em"===r&&e)o=t*Y(e||14);else if(["vw","vh"].includes(r)){var s=H.getSystemInfoSync(),a=s.screenWidth,h=s.screenHeight;o=t*("vw"==r?a:h)/100}return 1*o.toFixed(2)}return 0}function U(t){return/%$/.test(t)}function N(t){return/^-?([0-9]+)?([.]{1}[0-9]+){0,1}(rpx|px)$/.test(t)}var _=function(t){return!(!t||!t.startsWith("linear")&&!t.startsWith("radial"))},X=function(t,e,i,n,r,o){t.startsWith("linear")?function(t,e,i,n,r,o){for(var s=function(t,e,i,n,r){void 0===n&&(n=0);void 0===r&&(r=0);var o=t.match(/([-]?\d{1,3})deg/),s=o&&o[1]?parseFloat(o[1]):0;s>=360&&(s-=360);s<0&&(s+=360);if(0===(s=Math.round(s)))return{x0:Math.round(e/2)+n,y0:i+r,x1:Math.round(e/2)+n,y1:r};if(180===s)return{x0:Math.round(e/2)+n,y0:r,x1:Math.round(e/2)+n,y1:i+r};if(90===s)return{x0:n,y0:Math.round(i/2)+r,x1:e+n,y1:Math.round(i/2)+r};if(270===s)return{x0:e+n,y0:Math.round(i/2)+r,x1:n,y1:Math.round(i/2)+r};var a=Math.round(180*Math.asin(e/Math.sqrt(Math.pow(e,2)+Math.pow(i,2)))/Math.PI);if(s===a)return{x0:n,y0:i+r,x1:e+n,y1:r};if(s===180-a)return{x0:n,y0:r,x1:e+n,y1:i+r};if(s===180+a)return{x0:e+n,y0:r,x1:n,y1:i+r};if(s===360-a)return{x0:e+n,y0:i+r,x1:n,y1:r};var h=0,c=0,f=0,d=0;if(s<a||s>180-a&&s<180||s>180&&s<180+a||s>360-a){var l=s*Math.PI/180,u=s<a||s>360-a?i/2:-i/2,p=Math.tan(l)*u,g=s<a||s>180-a&&s<180?e/2-p:-e/2-p;h=-(f=p+(v=Math.pow(Math.sin(l),2)*g)),c=-(d=u+v/Math.tan(l))}if(s>a&&s<90||s>90&&s<90+a||s>180+a&&s<270||s>270&&s<360-a){var v;l=(90-s)*Math.PI/180,p=s>a&&s<90||s>90&&s<90+a?e/2:-e/2,u=Math.tan(l)*p,g=s>a&&s<90||s>270&&s<360-a?i/2-u:-i/2-u;h=-(f=p+(v=Math.pow(Math.sin(l),2)*g)/Math.tan(l)),c=-(d=u+v)}return h=Math.round(h+e/2)+n,c=Math.round(i/2-c)+r,f=Math.round(f+e/2)+n,d=Math.round(i/2-d)+r,{x0:h,y0:c,x1:f,y1:d}}(r,t,e,i,n),a=s.x0,h=s.y0,c=s.x1,f=s.y1,d=o.createLinearGradient(a,h,c,f),l=r.match(/linear-gradient\((.+)\)/)[1],u=q(l.substring(l.indexOf(",")+1)),p=0;p<u.colors.length;p++)d.addColorStop(u.percents[p],u.colors[p]);o.setFillStyle(d)}(e,i,n,r,t,o):t.startsWith("radial")&&function(t,e,i,n,r,o){for(var s=q(r.match(/radial-gradient\((.+)\)/)[1]),a=Math.round(t/2)+i,h=Math.round(e/2)+n,c=o.createRadialGradient(a,h,0,a,h,Math.max(t,e)/2),f=0;f<s.colors.length;f++)c.addColorStop(s.percents[f],s.colors[f]);o.setFillStyle(c)}(e,i,n,r,t,o)};function q(t){for(var e=[],i=[],n=0,r=t.substring(0,t.length-1).split("%,");n<r.length;n++){var o=r[n];e.push(o.substring(0,o.lastIndexOf(" ")).trim()),i.push(o.substring(o.lastIndexOf(" "),o.length)/100)}return{colors:e,percents:i}}function G(t,e,i){return e in t?Object.defineProperty(t,e,{value:i,enumerable:!0,configurable:!0,writable:!0}):t[e]=i,t}function V(){return V=Object.assign?Object.assign.bind():function(t){for(var e=1;e<arguments.length;e++){var i=arguments[e];for(var n in i)Object.prototype.hasOwnProperty.call(i,n)&&(t[n]=i[n])}return t},V.apply(this,arguments)}function J(t,e){return J=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},J(t,e)}function Q(t,e){(null==e||e>t.length)&&(e=t.length);for(var i=0,n=new Array(e);i<e;i++)n[i]=t[i];return n}function Z(t,e){var i="undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(i)return(i=i.call(t)).next.bind(i);if(Array.isArray(t)||(i=function(t,e){if(t){if("string"==typeof t)return Q(t,e);var i=Object.prototype.toString.call(t).slice(8,-1);return"Object"===i&&t.constructor&&(i=t.constructor.name),"Map"===i||"Set"===i?Array.from(t):"Arguments"===i||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(i)?Q(t,e):void 0}}(t))||e&&t&&"number"==typeof t.length){i&&(t=i);var n=0;return function(){return n>=t.length?{done:!0}:{done:!1,value:t[n++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function K(t){return"number"==typeof t}function et(t){return"auto"===t||null===t}function it(t){return/%$/.test(t)}var nt=I,rt=z,ot=S,st=M,at=B,ht=O,ct=T;function ft(t){return t.replace(/-([a-z])/g,(function(t,e){return e.toUpperCase()}))}function dt(t,e){var i,n,r=function(t){var e=t.match(/([a-z]+)/)[1];return[e,ft(t.split(e)[1])]}(t),o=r[0],s=r[1],a=e.split(" ");if(s)return(i={})[o+s]=e,i;if(a.length&&!s){var h=a[0],c=a[1],f=a[2],l=a[3];return(n={})[o+d[0]]=h,n[o+d[1]]=c||h,n[o+d[2]]=f||h,n[o+d[3]]=l||c||h,n}}function lt(t){t=t.trim();for(var e=new Array,i="+",n="",r=t.length,o=0;o<r;++o){if("."===t[o]||!isNaN(Number(t[o]))&&" "!==t[o])n+=t[o];else if("("===t[o]){for(var s=1,a=o;s>0;)"("===t[a+=1]&&(s+=1),")"===t[a]&&(s-=1);n="".concat(lt(t.slice(o+1,a))),o=a}if(isNaN(Number(t[o]))&&"."!==t[o]||o===r-1){var h=parseFloat(n);switch(i){case"+":e.push(h);break;case"-":e.push(-h);break;case"*":e.push(e.pop()*h);break;case"/":e.push(e.pop()/h)}i=t[o],n=""}}for(var c=0;e.length;)c+=e.pop();return c}var ut,pt=0,gt=function(){function t(){G(this,"elements",[]),G(this,"afterElements",[]),G(this,"beforeElements",[]),G(this,"ids",[]),G(this,"width",0),G(this,"height",0),G(this,"top",0),G(this,"left",0),G(this,"pre",null),G(this,"offsetX",0),G(this,"offsetY",0),pt++,this.id=pt}var e=t.prototype;return e.fixedBind=function(t,e){void 0===e&&(e=0),this.container=e?t.parent:t.root,this.container.fixedLine=this,this.fixedAdd(t)},e.fixedAdd=function(t){if(!this.ids.includes(t.id)){this.ids.push(t.id),this.elements.push(t);var e=t.computedStyle.zIndex;(void 0===e?0:e)>=0?this.afterElements.push(t):this.beforeElements.push(t),this.refreshLayout()}},e.bind=function(t){this.container=t.parent,this.container.line=null,this.container.lines?(this.container.lines.push(this),this.pre=this.getPreLine(),this.top=this.pre.top+this.pre.height,this.left=this.container.contentSize.left):(this.top=this.container.contentSize.top,this.left=this.container.contentSize.left,this.container.lines=[this]),this.isInline=t.isInline(),this.container.line=this,this.outerWidth=t.parent&&t.parent.contentSize.width?t.parent.contentSize.width:1/0,this.add(t)},e.getPreLine=function(){return this.container.lines[this.container.lines.length-2]},e.canIEnter=function(t){return!((100*t.offsetSize.width+100*this.width)/100>this.outerWidth)||(this.closeLine(),!1)},e.closeLine=function(){delete this.container.line},e.add=function(t){this.ids.includes(t.id)||(this.ids.push(t.id),this.elements.push(t),this.refreshWidthHeight(t))},e.refreshWidthHeight=function(t){t.offsetSize.height>this.height&&(this.height=t.offsetSize.height),this.width+=t.offsetSize.width||0,(this.container.lineMaxWidth||0)<this.width&&(this.container.lineMaxWidth=this.width)},e.refreshXAlign=function(){if(this.isInline){var t=this.container.contentSize.width-this.width,e=this.container.style.textAlign;e===h?t/=2:e===l&&(t=0),this.offsetX=t}},e.getOffsetY=function(t){if(!t||!t.style)return 0;var e=(t.style||{}).verticalAlign;return e===g?this.height-t.contentSize.height:e===v?(this.height-t.contentSize.height)/2:0},e.setIndent=function(t){var e=t.style.textIndent;if(e&&/^calc/.test(e)){var i=/^calc\((.+)\)$/.exec(e);if(i&&i[1]){var n=i[1].replace(/([^\s\(\+\-\*\/]+)\.(left|right|bottom|top|width|height)/g,(function(e){var i=e.split("."),n=i[0],r=i[1],o=t.parent.querySelector(n);if(o&&o.offsetSize){var s={right:o.offsetSize.left+o.offsetSize.width,bottom:o.offsetSize.top+o.offsetSize.height};return o.offsetSize[r]||s[r]||0}})),r=lt(n.replace(new RegExp(/-?[0-9]+(\.[0-9]+)?(rpx|px|%)/,"g"),Y));t.style.textIndent=r}}},e.layout=function(t,e){var i=this;this.refreshXAlign(),this.pre?(this.top=this.pre.top+this.pre.height+this.offsetY,this.left=e+this.offsetX):(this.top=Math.max(this.top,this.container.contentSize.top,t)+this.offsetY,this.left=Math.max(this.left,this.container.contentSize.left,e)+this.offsetX),this.elements.forEach((function(t,e){i.setIndent(t);var n=i.elements[e-1],r=i.getOffsetY(t);t.style.top=i.top+r,t.style.left=n?n.offsetSize.left+n.offsetSize.width:i.left,t.getBoxPosition()}))},e.refreshLayout=function(){this.afterElements=this.afterElements.sort((function(t,e){return t.computedStyle.zIndex-e.computedStyle.zIndex})),this.beforeElements=this.beforeElements.sort((function(t,e){return t.computedStyle.zIndex-e.computedStyle.zIndex}))},t}(),vt="lineMaxHeight",yt="lineMaxWidth",bt=((ut={})[b]={width:o,contentWidth:o,lineMaxWidth:yt,left:l,top:p,height:s,lineMaxHeight:vt,marginLeft:"marginLeft"},ut[x]={width:s,contentWidth:s,lineMaxWidth:yt,left:p,top:l,height:o,lineMaxHeight:vt,marginLeft:"marginTop"},ut),xt=function(t){var e,i;function n(){var e;return G(function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(e=t.call(this)||this),"outerWidth",0),e.exactValue=0,e.flexTotal=0,e.width=0,e.key=null,e.flexDirection="row",e}i=t,(e=n).prototype=Object.create(i.prototype),e.prototype.constructor=e,J(e,i);var r=n.prototype;return r.bind=function(t){this.container=t.parent,this.container.line=this,this.container.lines?(this.container.lines.push(this),this.pre=this.getPreLine(),this.top=this.pre.top+this.pre.height,this.left=this.container.contentSize.left):(this.top=this.container.contentSize.top,this.left=this.container.contentSize.left,this.container.lines=[this]),t.parent&&(this.flexDirection=t.parent.style.flexDirection,this.key=bt[this.flexDirection]),this.initHeight(t),this.outerWidth=t.parent&&t.parent.contentSize[this.key.contentWidth]?t.parent.contentSize[this.key.contentWidth]:1/0,this.add(t)},r.add=function(t){this.ids.push(t.id);var e=t.style.flex;K(e)?this.flexTotal+=e:K(this.getWidth(t.style))&&(this.exactValue+=this.getWidth(t.offsetSize)),this.elements.push(t),this.refreshWidthHeight(t),t.next||this.closeLine()},r.closeLine=function(){this.calcFlex()},r.initHeight=function(t){this[this.key.height]=0},r.getWidth=function(t){return t[this.key.width]||0},r.getHeight=function(t){return t[this.key.height]||0},r.setWidth=function(t,e){t[this.key.width]=e},r.setHeight=function(t,e){t[this.key.height]=e},r.calcFlex=function(){var t=this,e=this.container.contentSize[this.key.contentWidth],i=0;this.elements.forEach((function(n){var r=n.style,o=n.contentSize,s=t.getWidth(r)||t.getWidth(o);K(r.flex)&&(s=r.flex/t.flexTotal*(e-t.exactValue)),t.setWidth(n.computedStyle,s),n.isFlexCalc=!0,delete n.line,delete n.lines,delete n.lineMaxWidth,n.getBoxWidthHeight(),i=Math.max(i,t.getHeight(n.offsetSize))})),this.setHeight(this,i)},r.refreshWidthHeight=function(t){var e=this.container.style.alignItems;e&&!t.style.alignSelf&&(t.style.alignSelf=e);var i=this.getHeight(t.offsetSize);i>this[this.key.height]&&(this.container[this.key.lineMaxHeight]=this[this.key.height]=i),this[this.key.width]+=this.getWidth(t.offsetSize);var n=Math.min(this.getWidth(this),!this.getWidth(this.container.contentSize)&&1/0);(this.container[this.key.lineMaxWidth]||0)<n&&(this.container[this.key.lineMaxWidth]=n)},r.refreshXAlign=function(){var t=this,e=this.elements.reduce((function(e,i){return e+t.getWidth(i.offsetSize)}),0),i=(this.outerWidth==1/0?0:this.outerWidth-e)||0,n=this.container.style.justifyContent;n===h?i/=2:n===c?i=0:["space-between","space-around"].includes(n)&&(!function(e,i){void 0===i&&(i=0),i/=t.elements.length+(e?-1:1),t.elements.forEach((function(n,r){var o;e&&!r||(n.style.margin?n.style.margin[t.key.marginLeft]+=i:n.style.margin=((o={})[t.key.marginLeft]=i,o),n.getBoxPosition())})),i=0}("space-between"==n,i),i=0),this.offsetX=i||0,this.refreshYAlign()},r.refreshYAlign=function(){var t=this;if(1==this.container.lines.length)return 0;var e=this.container.lines.reduce((function(e,i){return e+t.getHeight(i)}),0),i=this.container.style.alignItems,n=this.getHeight(this.container.contentSize);if(i===h){var r=(n-e)/(this.container.lines.length+1);this.container.lines.forEach((function(t){t.offsetY=r}))}if(i===f){var o=n-e;this.container.lines[0].offsetY=o}},r.getOffsetY=function(t){if(this.container.lines.length>1)return 0;var e=t.style.alignSelf,i=this.getHeight(this.container.contentSize),n=i-this.getHeight(t.offsetSize);return e===f?n:e===h?n/2:"stretch"===e?(n&&t.name==S&&(t.style[this.key.width]=this.getWidth(t.offsetSize),t.style[this.key.height]=i,delete t.line,delete t.lines,t.getBoxWidthHeight()),0):0},r.layout=function(t,e){var i=this;this.refreshXAlign(),this.pre?(this.top=this.pre.top+this.pre.height+this.offsetY,this.left=e+this.offsetX):(this.top=Math.max(this.top,this.container.contentSize.top,t)+this.offsetY,this.left=Math.max(this.left,this.container.contentSize.left,e)+this.offsetX),this.elements.forEach((function(t,e){i.setIndent(t);var n=i.elements[e-1],r=i.getOffsetY(t);t.style[i.key.top]=i[i.key.top]+r,t.style[i.key.left]=n?n.offsetSize[i.key.left]+i.getWidth(n.offsetSize):i[i.key.left],t.getBoxPosition()}))},n}(gt),wt=I,mt=z,St=S,zt=k,It=B,Mt=P,kt=O,Bt=T,Wt=0,Pt={left:null,top:null,width:null,height:null},Ot=new Map,Tt=function(){function t(t,e,i,n){var r=this;G(this,"id",Wt++),G(this,"style",{left:null,top:null,width:null,height:null}),G(this,"computedStyle",{}),G(this,"originStyle",{}),G(this,"children",{}),G(this,"layoutBox",V({},Pt)),G(this,"contentSize",V({},Pt)),G(this,"clientSize",V({},Pt)),G(this,"borderSize",V({},Pt)),G(this,"offsetSize",V({},Pt)),this.ctx=n,this.root=i,e&&(this.parent=e),this.name=t.type||t.name,this.attributes=this.getAttributes(t);var o=function(t,e){var i,n=["color","fontSize","lineHeight","verticalAlign","fontWeight","textAlign"],r=t.type,o=void 0===r?ot:r,s=t.styles,h=void 0===s?{}:s,c=(e||{}).computedStyle,f=Object.assign({},F);if([rt,nt,st].includes(o)&&!h.display&&(f.display=at),c)for(var l=0;l<n.length;l++){var u=n[l];(h[u]||c[u])&&(h[u]=h[(i=u,i.replace(/([A-Z])/g,"-$1").toLowerCase())]||h[u]||c[u])}for(var p=function(t){var e,i,n,r,s=h[t];if(/-/.test(t)&&(t=ft(t),f[t]=s),/^(box|text)?shadow$/i.test(t)){var c=[];return s.replace(/((-?\d+(rpx|px|vw|vh)?\s+?){3})(.+)/,(function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];c=t[1].match(/-?\d+(rpx|px|vw|vh)?/g).map((function(t){return Y(t)})).concat(t[4])})),/^text/.test(t)?f.textShadow=c:f.boxShadow=c,"continue"}if(/^border/i.test(t)&&!/radius$/i.test(t)){var l=t.match(/^border([BTRLa-z]+)?/)[0],u=t.match(/[W|S|C][a-z]+/),p=s.replace(/([\(,])\s+|\s+([\),])/g,"$1$2").split(" ").map((function(t){return/^\d/.test(t)?Y(t,""):t}));return f[l]||(f[l]={}),1==p.length&&u?f[l][l+u[0]]=p[0]:f[l]=((e={})[l+"Width"]=$(p[0])?p[0]:0,e[l+"Style"]=p[1]||"solid",e[l+"Color"]=p[2]||"black",e),"continue"}if(/^background(color)?$/i.test(t))return f.backgroundColor=s,"continue";if(/^objectPosition$/i.test(t))return f[t]=s.split(" "),"continue";if(/^backgroundPosition$/i.test(t))return f[t]=s.split(" "),"continue";if(/padding|margin|radius/i.test(t)){var g=/radius$/i.test(t),v="borderRadius",y=g?v:t.match(/[a-z]+/)[0],b=function(t,e){return"border".concat(t).concat(e,"Radius")},x=[0,0,0,0].map((function(t,e){return g?[b(d[0],d[3]),b(d[0],d[1]),b(d[2],d[1]),b(d[2],d[3])][e]:y+d[e]}));if("padding"===t||t===a||/^(border)?radius$/i.test(t)){p="".concat(s).split(" ").map((function(e){return/^-?\d+(rpx|px|vh|vw)?$/.test(e)?Y(e):t!=a&&/auto/.test(e)?0:e}),[])||[0];var w=g?v:t,m=p[0],S=p[1],z=p[2],I=p[3];f[w]=((i={})[x[0]]=et(m)?0:m,i[x[1]]=$(S)||et(S)?S:m,i[x[2]]=et($(z)?z:m)?0:$(z)?z:m,i[x[3]]=$(I)?I:null!=S?S:m,i)}else"object"==typeof f[y]||(f[y]=((n={})[x[0]]=f[y]||0,n[x[1]]=f[y]||0,n[x[2]]=f[y]||0,n[x[3]]=f[y]||0,n)),f[y][t]=y==a&&et(s)||it(s)?s:Y(s);return"continue"}if(/^transform$/i.test(t))return f[t]={},s.replace(/([a-zA-Z]+)\(([0-9,-\.%rpxdeg\s]+)\)/g,(function(e,i,n){var r=n.split(",").map((function(t){return t.replace(/(^\s*)|(\s*$)/g,"")})),o=function(t,e){return t.includes("deg")?1*t:e&&!it(e)?Y(t,e):t};i.includes("matrix")?f[t][i]=r.map((function(t){return 1*t})):i.includes("rotate")?f[t][i]=1*n.match(/^-?\d+(\.\d+)?/)[0]:/[X, Y]/.test(i)?f[t][i]=/[X]/.test(i)?o(r[0],h.width):o(r[0],h.height):(f[t][i+"X"]=o(r[0],h.width),f[t][i+"Y"]=o(r[1]||r[0],h.height))})),"continue";if(/^font$/i.test(t)&&console.warn("font 不支持简写"),/^textindent/i.test(t)&&(f[t]=/^calc/.test(s)?s:Y(s)),/^textstroke/i.test(t)){var M=t.match(/color|width|type$/i),k=(l="textStroke",s.split(" ").map((function(t){return/^\d+(rpx|px|vh|vw)?$/.test(t)?Y(t):t})));return M?f[l]?f[l][M[0]]=k[0]:f[l]=((r={})[M[0]]=k[0],r):f[l]={width:k[0],color:k[1],type:k[2]},"continue"}/^left|top$/i.test(t)&&![ht,ct].includes(h.position)?f[t]=0:f[t]=/^-?[\d\.]+(px|rpx|vw|vh)?$/.test(s)?Y(s):/em$/.test(s)&&o==rt?Y(s,h.fontSize):s},g=0,v=Object.keys(h);g<v.length;g++)p(v[g]);return f}(t,e);this.isAbsolute=o.position==kt,this.isFixed=o.position==Bt,this.originStyle=o,this.styles=t.styles,Object.keys(o).forEach((function(t){Object.defineProperty(r.style,t,{configurable:!0,enumerable:!0,get:function(){return o[t]},set:function(e){o[t]=e}})}));var s={contentSize:V({},this.contentSize),clientSize:V({},this.clientSize),borderSize:V({},this.borderSize),offsetSize:V({},this.offsetSize)};Object.keys(s).forEach((function(t){Object.keys(r[t]).forEach((function(e){Object.defineProperty(r[t],e,{configurable:!0,enumerable:!0,get:function(){return s[t][e]},set:function(i){s[t][e]=i}})}))})),this.computedStyle=this.style}var e=t.prototype;return e.add=function(t){t.parent=this,this.children[t.id]=t},e.getChildren=function(){var t=this;return Object.keys(this.children).map((function(e){return t.children[e]}))},e.prev=function(t){void 0===t&&(t=this);var e=t.parent.getChildren();return e[e.findIndex((function(e){return e.id==t.id}))-1]},e.querySelector=function(t){var e=this.getChildren();if("string"!=typeof t)return null;var i=e.find((function(e){var i=e.id,n=e.attributes;return i==t||n&&n.uid==t}));return i||(this.parent&&this.parent.querySelector&&this.parent.querySelector(t)||null)},e.getLineRect=function(t,e){var i={width:0,height:0},n=e?e.lines:this.parent&&this.parent.lines;return n&&n.find((function(e){return e.ids.includes(t)}))||i},e.setPosition=function(t,e){var i={left:o,top:s,right:o,bottom:s};Object.keys(i).forEach((function(n){var r=n==u?l:p;[u,g].includes(n)&&void 0!==t.style[n]&&!$(t.originStyle[r])?t.style[r]=e[i[n]]-t.offsetSize[i[n]]-Y(t.style[n],e[i[n]]):t.style[n]=Y(t.style[n],e[i[n]])}))},e.getAttributes=function(t){var e=t.attributes,i=void 0===e?{}:e,n=t.uid,r=t.url,o=t.src,s=t.replace,a=t.text;return n&&(i.uid=n),(r||o)&&(i.src=i.src||r||o),s&&(i.replace=s),a&&(i.text=a),i},e.getOffsetSize=function(t,e,i){void 0===i&&(i=y[3]);var n=e||{},r=n.margin,o=(r=void 0===r?{}:r).marginLeft,s=void 0===o?0:o,a=r.marginTop,h=void 0===a?0:a,c=r.marginRight,f=void 0===c?0:c,d=r.marginBottom,l=void 0===d?0:d,u=n.padding,p=(u=void 0===u?{}:u).paddingLeft,g=void 0===p?0:p,v=u.paddingTop,b=void 0===v?0:v,x=u.paddingRight,w=void 0===x?0:x,m=u.paddingBottom,S=void 0===m?0:m,z=n.border,I=(z=void 0===z?{}:z).borderWidth,M=void 0===I?0:I,k=n.borderTop,B=(k=void 0===k?{}:k).borderTopWidth,W=void 0===B?M:B,P=n.borderBottom,O=(P=void 0===P?{}:P).borderBottomWidth,T=void 0===O?M:O,L=n.borderRight,R=(L=void 0===L?{}:L).borderRightWidth,F=void 0===R?M:R,A=n.borderLeft,E=(A=void 0===A?{}:A).borderLeftWidth,j=void 0===E?M:E,C=s<0&&f<0?Math.abs(s+f):0,H=h<0&&l<0?Math.abs(h+l):0,D=s>=0&&f<0,$=h>=0&&l<0;return i==y[0]&&(this[i].left=t.left+s+g+j+(D?2*-f:0),this[i].top=t.top+h+b+W+($?2*-l:0),this[i].width=t.width+(this[i].widthAdd?0:C),this[i].height=t.height+(this[i].heightAdd?0:H),this[i].widthAdd=C,this[i].heightAdd=H),i==y[1]&&(this[i].left=t.left+s+j+(D<0?-f:0),this[i].top=t.top+h+W+($?-l:0),this[i].width=t.width+g+w,this[i].height=t.height+b+S),i==y[2]&&(this[i].left=t.left+s+j/2+(D<0?-f:0),this[i].top=t.top+h+W/2+($?-l:0),this[i].width=t.width+g+w+j/2+F/2,this[i].height=t.height+b+S+T/2+W/2),i==y[3]&&(this[i].left=t.left+(D<0?-f:0),this[i].top=t.top+($?-l:0),this[i].width=t.width+g+w+j+F+s+f,this[i].height=t.height+b+S+T+W+l+h),this[i]},e.layoutBoxUpdate=function(t,e,i,n){var r=this;if(void 0===i&&(i=-1),"border-box"==e.boxSizing){var o=e||{},s=o.border,a=(s=void 0===s?{}:s).borderWidth,h=void 0===a?0:a,c=o.borderTop,f=(c=void 0===c?{}:c).borderTopWidth,d=void 0===f?h:f,l=o.borderBottom,u=(l=void 0===l?{}:l).borderBottomWidth,p=void 0===u?h:u,g=o.borderRight,v=(g=void 0===g?{}:g).borderRightWidth,b=void 0===v?h:v,x=o.borderLeft,w=(x=void 0===x?{}:x).borderLeftWidth,m=void 0===w?h:w,S=o.padding,z=(S=void 0===S?{}:S).paddingTop,I=void 0===z?0:z,M=S.paddingRight,k=void 0===M?0:M,B=S.paddingBottom,W=void 0===B?0:B,P=S.paddingLeft,O=void 0===P?0:P;i||(t.width-=O+k+b+m),1!==i||n||(t.height-=I+W+d+p)}this.layoutBox&&(y.forEach((function(i){return r.layoutBox[i]=r.getOffsetSize(t,e,i)})),this.layoutBox=Object.assign({},this.layoutBox,this.layoutBox.borderSize))},e.getBoxPosition=function(){var t=this.computedStyle,e=this.fixedLine,i=this.lines,n=t.left,r=void 0===n?0:n,o=t.top,s=void 0===o?0:o,a=V({},this.contentSize,{left:r,top:s}),h=this.contentSize.top-this.offsetSize.top,c=this.contentSize.left-this.offsetSize.left;if(this.root.fixedLine&&!this.root.isDone){this.root.isDone=!0;for(var f,d=Z(this.root.fixedLine.elements);!(f=d()).done;){var l=f.value;l.setPosition(l,this.root.offsetSize),l.getBoxPosition()}}if(e)for(var u,p=Z(e.elements);!(u=p()).done;){var g=u.value,v=V({},this.borderSize,{left:r,top:s});g.setPosition(g,v);var y=this.borderSize.top-this.offsetSize.top,b=this.borderSize.left-this.offsetSize.left;g.style.left+=r+b,g.style.top+=s+y,g.getBoxPosition()}if(i)for(var x,w=Z(i);!(x=w()).done;){x.value.layout(a.top+h,a.left+c)}return this.layoutBoxUpdate(a,t),this.layoutBox},e.getBoxState=function(t,e){return this.isBlock(t)||this.isBlock(e)},e.isBlock=function(t){return void 0===t&&(t=this),t&&t.style.display==zt},e.isFlex=function(t){return void 0===t&&(t=this),t&&t.style.display==Mt},e.isInFlow=function(){return!(this.isAbsolute||this.isFixed)},e.inFlexBox=function(t){return void 0===t&&(t=this),!!t.isInFlow()&&(!!t.parent&&(!(!t.parent||t.parent.style.display!==Mt)||void 0))},e.isInline=function(t){return void 0===t&&(t=this),t&&t.style.display==It},e.contrastSize=function(t,e,i){var n=t;return i&&(n=Math.min(n,i)),e&&(n=Math.max(n,e)),n},e.measureText=function(t,e){var i=this.ctx.measureText(t),n=i.width,r=i.actualBoundingBoxAscent,o=i.actualBoundingBoxDescent;return{ascent:r,descent:o,width:n,fontHeight:r+o||.7*e+1}},e.getParentSize=function(t,e){if(void 0===t&&(t=this),void 0===e&&(e=!1),t&&t.parent){if(t.parent.contentSize.width)return t.parent.contentSize;if(e)return this.getParentSize(t.parent,e)}return null},e.getBoxWidthHeight=function(){var t=this,e=this.name,i=this.computedStyle,n=this.attributes,r=this.parent,o=void 0===r?{}:r,s=this.ctx,a=this.getChildren(),h=i.left,c=void 0===h?0:h,f=i.top,d=void 0===f?0:f,l=i.bottom,u=i.right,p=i.width,g=void 0===p?0:p,v=i.minWidth,y=i.maxWidth,b=i.minHeight,x=i.maxHeight,w=i.height,m=void 0===w?0:w,S=i.fontSize,z=i.fontWeight,I=i.fontFamily,M=i.fontStyle,k=i.position;i.textIndent;var B=i.lineClamp,W=i.lineHeight,P=i.padding,O=void 0===P?{}:P,T=i.margin,L=void 0===T?{}:T,R=i.border,F=(R=void 0===R?{}:R).borderWidth,A=void 0===F?0:F,E=i.borderRight,j=(E=void 0===E?{}:E).borderRightWidth,C=void 0===j?A:j,H=i.borderLeft,D=(H=void 0===H?{}:H).borderLeftWidth,$=void 0===D?A:D,U=o.contentSize&&o.contentSize.width,N=o.contentSize&&o.contentSize.height;if(it(g)&&U&&(g=Y(g,U)),it(g)&&!U&&(g=null),it(m)&&N&&(m=Y(m,N)),it(m)&&!N&&(m=null),it(v)&&U&&(v=Y(v,U)),it(y)&&U&&(y=Y(y,U)),it(b)&&N&&(b=Y(b,N)),it(x)&&N&&(x=Y(x,N)),i.padding&&U)for(var _ in i.padding)Object.hasOwnProperty.call(O,_)&&(O[_]=Y(O[_],U));var X=O.paddingRight,q=void 0===X?0:X,G=O.paddingLeft,V=void 0===G?0:G;if(i.margin&&[L.marginLeft,L.marginRight].includes("auto"))if(g){var J=U&&U-g-q-V-$-C||0;L.marginLeft==L.marginRight?L.marginLeft=L.marginRight=J/2:et(L.marginLeft)?L.marginLeft=J:L.marginRight=J}else L.marginLeft=L.marginRight=0;var Q=L.marginRight,Z=void 0===Q?0:Q,K=L.marginLeft,tt={width:g,height:m,left:0,top:0},nt=V+q+$+C+(void 0===K?0:K)+Z;if(this.offsetWidth=nt,e==mt&&!this.attributes.widths){var rt=n.text||"";s.save(),s.setFonts({fontFamily:I,fontSize:S,fontWeight:z,fontStyle:M}),rt.length,"\n"==rt&&(rt="",this.isBr=!0),(""+rt).split("\n").map((function(e){var i=Array.from(e).map((function(e){var i=""+(/^[\u4e00-\u9fa5]+$/.test(e)?"cn":e)+I+S+z+M,n=Ot.get(i);if(n)return{width:n,text:e};var r=t.measureText(e,S).width;return Ot.set(i,r),{width:r,text:e}})),n=t.measureText(e,S),r=n.fontHeight,o=n.ascent,s=n.descent;t.attributes.fontHeight=r,t.attributes.ascent=o,t.attributes.descent=s,t.attributes.widths||(t.attributes.widths=[]),t.attributes.widths.push({widths:i,total:i.reduce((function(t,e){return t+e.width}),0)})})),s.restore()}if(e==wt&&null==g){var ot=n.width,st=n.height;tt.width=this.contrastSize(Math.round(ot*m/st)||0,v,y),this.layoutBoxUpdate(tt,i,0)}if(e==mt&&null==g){var at=this.attributes.widths,ht=Math.max.apply(Math,at.map((function(t){return t.total})));if(o&&U>0&&(ht>U||this.isBlock(this))&&!this.isAbsolute&&!this.isFixed)ht=U;tt.width=this.contrastSize(ht,v,y),this.layoutBoxUpdate(tt,i,0)}if(e==mt&&(o.style.flex||!this.attributes.lines)){var ct=this.attributes.widths.length;this.attributes.widths.forEach((function(t){return t.widths.reduce((function(t,e,i){return t+e.width>tt.width?(ct++,e.width):t+e.width}),0)})),ct=B&&ct>B?B:ct,this.attributes.lines=ct}if(e==wt&&null==m){var ft=n.width,dt=n.height;n.text,tt.height=this.contrastSize(Y(tt.width*dt/ft)||0,b,x),this.layoutBoxUpdate(tt,i,1)}e==mt&&null==m&&(W=Y(W,S),tt.height=this.contrastSize(Y(this.attributes.lines*W),b,x),this.layoutBoxUpdate(tt,i,1,!0)),!g&&o&&o.children&&U&&(!this.isFlex(o)||o.isFlexCalc)&&([St,mt].includes(e)&&this.isFlex()||e==St&&this.isBlock(this)&&this.isInFlow())&&(tt.width=this.contrastSize(U-(o.isFlexCalc?0:nt),v,y),this.layoutBoxUpdate(tt,i)),g&&!it(g)&&(tt.width=this.contrastSize(g,v,y),this.layoutBoxUpdate(tt,i,0)),m&&!it(m)&&(tt.height=this.contrastSize(tt.height,b,x),this.layoutBoxUpdate(tt,i,1));var lt=0;if(a.length){var ut=null,pt=!1;a.forEach((function(e,n){e.getBoxWidthHeight();var r=a[n+1];if(r&&r.isInFlow()&&(e.next=r),!t.line||!t.line.ids.includes(e.id))if(e.isInFlow()&&!e.inFlexBox()){var o=t.getBoxState(ut,e);if(e.isBr)return pt=!0;t.line&&t.line.canIEnter(e)&&!o&&!pt?t.line.add(e):(pt=!1,(new gt).bind(e)),ut=e}else e.inFlexBox()?t.line&&(t.line.canIEnter(e)||"nowrap"==i.flexWrap)?t.line.add(e):(new xt).bind(e):e.isFixed?t.root.fixedLine?t.root.fixedLine.fixedAdd(e):(new gt).fixedBind(e):t.fixedLine?t.fixedLine.fixedAdd(e):(new gt).fixedBind(e,1)})),this.lines&&(lt=this.lines.reduce((function(t,e){return t+e.height}),0))}var vt=0,yt=0;if(!g&&(this.isAbsolute||this.isFixed)&&U){var bt=k==kt?U:this.root.width,zt=bt-(it(c)?Y(c,bt):c)-(it(u)?Y(u,bt):u);vt=i.left?zt:this.lineMaxWidth}if(!m&&(null!=d?d:this.isAbsolute||this.isFixed&&N)){var It=k==kt?N:this.root.height,Mt=It-(it(d)?Y(d,It):d)-(it(l)?Y(l,It):l);yt=i.top?Mt:0}if(g&&!it(g)||tt.width||(tt.width=vt||this.contrastSize((this.isBlock(this)&&!this.isInFlow()?U||o.lineMaxWidth:this.lineMaxWidth)||this.lineMaxWidth,v,y),this.layoutBoxUpdate(tt,i,0)),m||!lt&&!yt||(tt.height=yt||this.contrastSize(lt,b,x),this.layoutBoxUpdate(tt,i)),i.borderRadius&&this.borderSize&&this.borderSize.width)for(var _ in i.borderRadius)Object.hasOwnProperty.call(i.borderRadius,_)&&(i.borderRadius[_]=Y(i.borderRadius[_],this.borderSize.width));return this.layoutBox},e.layout=function(){return this.getBoxWidthHeight(),this.root.offsetSize=this.offsetSize,this.root.contentSize=this.contentSize,this.getBoxPosition(),this.offsetSize},t}(),Lt=function(){var t,e,i,n,r,o,s=[0,11,15,19,23,27,31,16,18,20,22,24,26,28,20,22,24,24,26,28,28,22,24,24,26,26,28,28,24,24,26,26,26,28,28,24,26,26,26,28,28],a=[3220,1468,2713,1235,3062,1890,2119,1549,2344,2936,1117,2583,1330,2470,1667,2249,2028,3780,481,4011,142,3098,831,3445,592,2517,1776,2234,1951,2827,1070,2660,1345,3177],h=[30660,29427,32170,30877,26159,25368,27713,26998,21522,20773,24188,23371,17913,16590,20375,19104,13663,12392,16177,14854,9396,8579,11994,11245,5769,5054,7399,6608,1890,597,3340,2107],c=[1,0,19,7,1,0,16,10,1,0,13,13,1,0,9,17,1,0,34,10,1,0,28,16,1,0,22,22,1,0,16,28,1,0,55,15,1,0,44,26,2,0,17,18,2,0,13,22,1,0,80,20,2,0,32,18,2,0,24,26,4,0,9,16,1,0,108,26,2,0,43,24,2,2,15,18,2,2,11,22,2,0,68,18,4,0,27,16,4,0,19,24,4,0,15,28,2,0,78,20,4,0,31,18,2,4,14,18,4,1,13,26,2,0,97,24,2,2,38,22,4,2,18,22,4,2,14,26,2,0,116,30,3,2,36,22,4,4,16,20,4,4,12,24,2,2,68,18,4,1,43,26,6,2,19,24,6,2,15,28,4,0,81,20,1,4,50,30,4,4,22,28,3,8,12,24,2,2,92,24,6,2,36,22,4,6,20,26,7,4,14,28,4,0,107,26,8,1,37,22,8,4,20,24,12,4,11,22,3,1,115,30,4,5,40,24,11,5,16,20,11,5,12,24,5,1,87,22,5,5,41,24,5,7,24,30,11,7,12,24,5,1,98,24,7,3,45,28,15,2,19,24,3,13,15,30,1,5,107,28,10,1,46,28,1,15,22,28,2,17,14,28,5,1,120,30,9,4,43,26,17,1,22,28,2,19,14,28,3,4,113,28,3,11,44,26,17,4,21,26,9,16,13,26,3,5,107,28,3,13,41,26,15,5,24,30,15,10,15,28,4,4,116,28,17,0,42,26,17,6,22,28,19,6,16,30,2,7,111,28,17,0,46,28,7,16,24,30,34,0,13,24,4,5,121,30,4,14,47,28,11,14,24,30,16,14,15,30,6,4,117,30,6,14,45,28,11,16,24,30,30,2,16,30,8,4,106,26,8,13,47,28,7,22,24,30,22,13,15,30,10,2,114,28,19,4,46,28,28,6,22,28,33,4,16,30,8,4,122,30,22,3,45,28,8,26,23,30,12,28,15,30,3,10,117,30,3,23,45,28,4,31,24,30,11,31,15,30,7,7,116,30,21,7,45,28,1,37,23,30,19,26,15,30,5,10,115,30,19,10,47,28,15,25,24,30,23,25,15,30,13,3,115,30,2,29,46,28,42,1,24,30,23,28,15,30,17,0,115,30,10,23,46,28,10,35,24,30,19,35,15,30,17,1,115,30,14,21,46,28,29,19,24,30,11,46,15,30,13,6,115,30,14,23,46,28,44,7,24,30,59,1,16,30,12,7,121,30,12,26,47,28,39,14,24,30,22,41,15,30,6,14,121,30,6,34,47,28,46,10,24,30,2,64,15,30,17,4,122,30,29,14,46,28,49,10,24,30,24,46,15,30,4,18,122,30,13,32,46,28,48,14,24,30,42,32,15,30,20,4,117,30,40,7,47,28,43,22,24,30,10,67,15,30,19,6,118,30,18,31,47,28,34,34,24,30,20,61,15,30],f=[255,0,1,25,2,50,26,198,3,223,51,238,27,104,199,75,4,100,224,14,52,141,239,129,28,193,105,248,200,8,76,113,5,138,101,47,225,36,15,33,53,147,142,218,240,18,130,69,29,181,194,125,106,39,249,185,201,154,9,120,77,228,114,166,6,191,139,98,102,221,48,253,226,152,37,179,16,145,34,136,54,208,148,206,143,150,219,189,241,210,19,92,131,56,70,64,30,66,182,163,195,72,126,110,107,58,40,84,250,133,186,61,202,94,155,159,10,21,121,43,78,212,229,172,115,243,167,87,7,112,192,247,140,128,99,13,103,74,222,237,49,197,254,24,227,165,153,119,38,184,180,124,17,68,146,217,35,32,137,46,55,63,209,91,149,188,207,205,144,135,151,178,220,252,190,97,242,86,211,171,20,42,93,158,132,60,57,83,71,109,65,162,31,45,67,216,183,123,164,118,196,23,73,236,127,12,111,246,108,161,59,82,41,157,85,170,251,96,134,177,187,204,62,90,203,89,95,176,156,169,160,81,11,245,22,235,122,117,44,215,79,174,213,233,230,231,173,232,116,214,244,234,168,80,88,175],d=[1,2,4,8,16,32,64,128,29,58,116,232,205,135,19,38,76,152,45,90,180,117,234,201,143,3,6,12,24,48,96,192,157,39,78,156,37,74,148,53,106,212,181,119,238,193,159,35,70,140,5,10,20,40,80,160,93,186,105,210,185,111,222,161,95,190,97,194,153,47,94,188,101,202,137,15,30,60,120,240,253,231,211,187,107,214,177,127,254,225,223,163,91,182,113,226,217,175,67,134,17,34,68,136,13,26,52,104,208,189,103,206,129,31,62,124,248,237,199,147,59,118,236,197,151,51,102,204,133,23,46,92,184,109,218,169,79,158,33,66,132,21,42,84,168,77,154,41,82,164,85,170,73,146,57,114,228,213,183,115,230,209,191,99,198,145,63,126,252,229,215,179,123,246,241,255,227,219,171,75,150,49,98,196,149,55,110,220,165,87,174,65,130,25,50,100,200,141,7,14,28,56,112,224,221,167,83,166,81,162,89,178,121,242,249,239,195,155,43,86,172,69,138,9,18,36,72,144,61,122,244,245,247,243,251,235,203,139,11,22,44,88,176,125,250,233,207,131,27,54,108,216,173,71,142,0],l=[],u=[],p=[],g=[],v=[],y=2;function b(t,e){var i;t>e&&(i=t,t=e,e=i),i=e,i*=e,i+=e,i>>=1,g[i+=t]=1}function x(t,i){var n;for(p[t+e*i]=1,n=-2;n<2;n++)p[t+n+e*(i-2)]=1,p[t-2+e*(i+n+1)]=1,p[t+2+e*(i+n)]=1,p[t+n+1+e*(i+2)]=1;for(n=0;n<2;n++)b(t-1,i+n),b(t+1,i-n),b(t-n,i-1),b(t+n,i+1)}function w(t){for(;t>=255;)t=((t-=255)>>8)+(255&t);return t}var m=[];function S(t,e,i,n){var r,o,s;for(r=0;r<n;r++)l[i+r]=0;for(r=0;r<e;r++){if(255!=(s=f[l[t+r]^l[i]]))for(o=1;o<n;o++)l[i+o-1]=l[i+o]^d[w(s+m[n-o])];else for(o=i;o<i+n;o++)l[o]=l[o+1];l[i+n-1]=255==s?0:d[w(s+m[0])]}}function z(t,e){var i;return t>e&&(i=t,t=e,e=i),i=e,i+=e*e,i>>=1,g[i+=t]}function I(t){var i,n,r,o;switch(t){case 0:for(n=0;n<e;n++)for(i=0;i<e;i++)i+n&1||z(i,n)||(p[i+n*e]^=1);break;case 1:for(n=0;n<e;n++)for(i=0;i<e;i++)1&n||z(i,n)||(p[i+n*e]^=1);break;case 2:for(n=0;n<e;n++)for(r=0,i=0;i<e;i++,r++)3==r&&(r=0),r||z(i,n)||(p[i+n*e]^=1);break;case 3:for(o=0,n=0;n<e;n++,o++)for(3==o&&(o=0),r=o,i=0;i<e;i++,r++)3==r&&(r=0),r||z(i,n)||(p[i+n*e]^=1);break;case 4:for(n=0;n<e;n++)for(r=0,o=n>>1&1,i=0;i<e;i++,r++)3==r&&(r=0,o=!o),o||z(i,n)||(p[i+n*e]^=1);break;case 5:for(o=0,n=0;n<e;n++,o++)for(3==o&&(o=0),r=0,i=0;i<e;i++,r++)3==r&&(r=0),(i&n&1)+!(!r|!o)||z(i,n)||(p[i+n*e]^=1);break;case 6:for(o=0,n=0;n<e;n++,o++)for(3==o&&(o=0),r=0,i=0;i<e;i++,r++)3==r&&(r=0),(i&n&1)+(r&&r==o)&1||z(i,n)||(p[i+n*e]^=1);break;case 7:for(o=0,n=0;n<e;n++,o++)for(3==o&&(o=0),r=0,i=0;i<e;i++,r++)3==r&&(r=0),(r&&r==o)+(i+n&1)&1||z(i,n)||(p[i+n*e]^=1)}}function M(t){var e,i=0;for(e=0;e<=t;e++)v[e]>=5&&(i+=3+v[e]-5);for(e=3;e<t-1;e+=2)v[e-2]==v[e+2]&&v[e+2]==v[e-1]&&v[e-1]==v[e+1]&&3*v[e-1]==v[e]&&(0==v[e-3]||e+3>t||3*v[e-3]>=4*v[e]||3*v[e+3]>=4*v[e])&&(i+=40);return i}function k(){var t,i,n,r,o,s=0,a=0;for(i=0;i<e-1;i++)for(t=0;t<e-1;t++)(p[t+e*i]&&p[t+1+e*i]&&p[t+e*(i+1)]&&p[t+1+e*(i+1)]||!(p[t+e*i]||p[t+1+e*i]||p[t+e*(i+1)]||p[t+1+e*(i+1)]))&&(s+=3);for(i=0;i<e;i++){for(v[0]=0,n=r=t=0;t<e;t++)(o=p[t+e*i])==r?v[n]++:v[++n]=1,a+=(r=o)?1:-1;s+=M(n)}a<0&&(a=-a);var h=a,c=0;for(h+=h<<2,h<<=1;h>e*e;)h-=e*e,c++;for(s+=10*c,t=0;t<e;t++){for(v[0]=0,n=r=i=0;i<e;i++)(o=p[t+e*i])==r?v[n]++:v[++n]=1,r=o;s+=M(n)}return s}var B=null;return{api:{get ecclevel(){return y},set ecclevel(t){y=t},get size(){return _size},set size(t){_size=t},get canvas(){return B},set canvas(t){B=t},getFrame:function(v){return function(v){var M,B,W,P,O,T,L,R;P=v.length,t=0;do{if(t++,W=4*(y-1)+16*(t-1),i=c[W++],n=c[W++],r=c[W++],o=c[W],P<=(W=r*(i+n)+n-3+(t<=9)))break}while(t<40);for(e=17+4*t,O=r+(r+o)*(i+n)+n,P=0;P<O;P++)u[P]=0;for(l=v.slice(0),P=0;P<e*e;P++)p[P]=0;for(P=0;P<(e*(e+1)+1)/2;P++)g[P]=0;for(P=0;P<3;P++){for(W=0,B=0,1==P&&(W=e-7),2==P&&(B=e-7),p[B+3+e*(W+3)]=1,M=0;M<6;M++)p[B+M+e*W]=1,p[B+e*(W+M+1)]=1,p[B+6+e*(W+M)]=1,p[B+M+1+e*(W+6)]=1;for(M=1;M<5;M++)b(B+M,W+1),b(B+1,W+M+1),b(B+5,W+M),b(B+M+1,W+5);for(M=2;M<4;M++)p[B+M+e*(W+2)]=1,p[B+2+e*(W+M+1)]=1,p[B+4+e*(W+M)]=1,p[B+M+1+e*(W+4)]=1}if(t>1)for(P=s[t],B=e-7;;){for(M=e-7;M>P-3&&(x(M,B),!(M<P));)M-=P;if(B<=P+9)break;x(6,B-=P),x(B,6)}for(p[8+e*(e-8)]=1,B=0;B<7;B++)b(7,B),b(e-8,B),b(7,B+e-7);for(M=0;M<8;M++)b(M,7),b(M+e-8,7),b(M,e-8);for(M=0;M<9;M++)b(M,8);for(M=0;M<8;M++)b(M+e-8,8),b(8,M);for(B=0;B<7;B++)b(8,B+e-7);for(M=0;M<e-14;M++)1&M?(b(8+M,6),b(6,8+M)):(p[8+M+6*e]=1,p[6+e*(8+M)]=1);if(t>6)for(P=a[t-7],W=17,M=0;M<6;M++)for(B=0;B<3;B++,W--)1&(W>11?t>>W-12:P>>W)?(p[5-M+e*(2-B+e-11)]=1,p[2-B+e-11+e*(5-M)]=1):(b(5-M,2-B+e-11),b(2-B+e-11,5-M));for(B=0;B<e;B++)for(M=0;M<=B;M++)p[M+e*B]&&b(M,B);for(O=l.length,T=0;T<O;T++)u[T]=l.charCodeAt(T);if(l=u.slice(0),O>=(M=r*(i+n)+n)-2&&(O=M-2,t>9&&O--),T=O,t>9){for(l[T+2]=0,l[T+3]=0;T--;)P=l[T],l[T+3]|=255&P<<4,l[T+2]=P>>4;l[2]|=255&O<<4,l[1]=O>>4,l[0]=64|O>>12}else{for(l[T+1]=0,l[T+2]=0;T--;)P=l[T],l[T+2]|=255&P<<4,l[T+1]=P>>4;l[1]|=255&O<<4,l[0]=64|O>>4}for(T=O+3-(t<10);T<M;)l[T++]=236,l[T++]=17;for(m[0]=1,T=0;T<o;T++){for(m[T+1]=1,L=T;L>0;L--)m[L]=m[L]?m[L-1]^d[w(f[m[L]]+T)]:m[L-1];m[0]=d[w(f[m[0]]+T)]}for(T=0;T<=o;T++)m[T]=f[m[T]];for(W=M,B=0,T=0;T<i;T++)S(B,r,W,o),B+=r,W+=o;for(T=0;T<n;T++)S(B,r+1,W,o),B+=r+1,W+=o;for(B=0,T=0;T<r;T++){for(L=0;L<i;L++)u[B++]=l[T+L*r];for(L=0;L<n;L++)u[B++]=l[i*r+T+L*(r+1)]}for(L=0;L<n;L++)u[B++]=l[i*r+T+L*(r+1)];for(T=0;T<o;T++)for(L=0;L<i+n;L++)u[B++]=l[M+T+L*o];for(l=u,M=B=e-1,W=O=1,R=(r+o)*(i+n)+n,T=0;T<R;T++)for(P=l[T],L=0;L<8;L++,P<<=1){128&P&&(p[M+e*B]=1);do{O?M--:(M++,W?0!=B?B--:(W=!W,6==(M-=2)&&(M--,B=9)):B!=e-1?B++:(W=!W,6==(M-=2)&&(M--,B-=8))),O=!O}while(z(M,B))}for(l=p.slice(0),P=0,B=3e4,W=0;W<8&&(I(W),(M=k())<B&&(B=M,P=W),7!=P);W++)p=l.slice(0);for(P!=W&&I(P),B=h[P+(y-1<<3)],W=0;W<8;W++,B>>=1)1&B&&(p[e-1-W+8*e]=1,W<6?p[8+e*W]=1:p[8+e*(W+1)]=1);for(W=0;W<7;W++,B>>=1)1&B&&(p[8+e*(e-7+W)]=1,W?p[6-W+8*e]=1:p[7+8*e]=1);return p}(v)},utf16to8:function(t){var e,i,n,r;for(e="",n=t.length,i=0;i<n;i++)(r=t.charCodeAt(i))>=1&&r<=127?e+=t.charAt(i):r>2047?(e+=String.fromCharCode(224|r>>12&15),e+=String.fromCharCode(128|r>>6&63),e+=String.fromCharCode(128|r>>0&63)):(e+=String.fromCharCode(192|r>>6&31),e+=String.fromCharCode(128|r>>0&63));return e},draw:function(t,i,n,r,o){i.drawView(n,r);var s=i.ctx,a=n.contentSize,h=a.width,c=a.height,f=a.left,d=a.top;r.borderRadius,r.backgroundColor;var l=r.color,u=void 0===l?"#000000":l;r.border,n.contentSize.left,n.borderSize.left,n.contentSize.top,n.borderSize.top;if(y=o||y,s){s.save(),i.setOpacity(r),i.setTransform(n,r);var p=Math.min(h,c);t=this.utf16to8(t);var g=this.getFrame(t),v=p/e;s.setFillStyle(u);for(var b=0;b<e;b++)for(var x=0;x<e;x++)g[x*e+b]&&s.fillRect(f+v*b,d+v*x,v,v);s.restore(),i.setBorder(n,r)}else console.warn("No canvas provided to draw QR code in!")}}}}(),Rt=I,Ft=z,At=M,Et=S,jt=w.TOP,Ct=w.MIDDLE,Ht=w.BOTTOM,Dt=m.LEFT,$t=m.CENTER,Yt=m.RIGHT,Ut=function(){function t(t){var e,i,n=this;this.v="1.9.5.1",this.id=null,this.pixelRatio=1,this.width=0,this.height=0,this.sleep=1e3/30,this.count=0,this.isRate=!1,this.isDraw=!0,this.isCache=!0,this.fixed="",this.useCORS=!1,this.performance=!1,this.imageBus=[],this.createImage=function(t,e){return new Promise((function(i,r){var o=null;window||n.canvas.createImage?(o=n.canvas&&n.canvas.createImage?n.canvas.createImage():new Image,e&&o.setAttribute("crossOrigin","Anonymous"),o.src=t,o.onload=function(){i({width:o.naturalWidth||o.width,height:o.naturalHeight||o.height,path:o,src:this.src})},o.onerror=function(t){r(t)}):r({fail:"getImageInfo fail",src:t})}))},this.options=t,Object.assign(this,t),this.ctx=(e=t.context,i={get:function(t,i){if("setFonts"===i)return function(t){var i=t.fontFamily,n=void 0===i?"sans-serif":i,o=t.fontSize,s=void 0===o?14:o,a=t.fontWeight,h=void 0===a?"normal":a,c=t.fontStyle,f=void 0===c?"normal":c;C==r.MP_TOUTIAO&&(h="bold"==h?"bold":"",f="italic"==f?"italic":""),e.font="".concat(f," ").concat(h," ").concat(Math.round(s),"px ").concat(n)};if(!e.draw||!e.setFillStyle){if("setFillStyle"===i)return function(t){e.fillStyle=t};if("setStrokeStyle"===i)return function(t){e.strokeStyle=t};if("setLineWidth"===i)return function(t){e.lineWidth=t};if("setLineCap"===i)return function(t){e.lineCap=t};if("setFontSize"===i)return function(t){e.font="".concat(String(t),"px sans-serif")};if("setGlobalAlpha"===i)return function(t){e.globalAlpha=t};if("setLineJoin"===i)return function(t){e.lineJoin=t};if("setTextAlign"===i)return function(t){e.textAlign=t};if("setMiterLimit"===i)return function(t){e.miterLimit=t};if("setShadow"===i)return function(t,i,n,r){e.shadowOffsetX=t,e.shadowOffsetY=i,e.shadowBlur=n,e.shadowColor=r};if("setTextBaseline"===i)return function(t){e.textBaseline=t};if("createCircularGradient"===i)return function(){};if("draw"===i)return function(){};if("function"==typeof e[i])return function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];return e[i].apply(e,t)}}return t[i]},set:function(t,i,n){return e[i]=n,!0}},new Proxy(e,i)),this.progress=0,this.root={width:t.width,height:t.height,fontSizeRate:1,fixedLine:null},this.size=this.root;var o=0;Object.defineProperty(this,"progress",{configurable:!0,set:function(t){o=t,n.lifecycle("onProgress",t/n.count)},get:function(){return o||0}})}return t.prototype.lifecycle=function(t,e){this.options.listen&&this.options.listen[t]&&this.options.listen[t](e)},t.prototype.setContext=function(t){t&&(this.ctx=t)},t.prototype.init=function(){if(this.canvas.height||r.WEB==C){this.ctx.setTransform(1,0,0,1,0,0);var t=this.size.height*this.pixelRatio,e=this.size.width*this.pixelRatio;this.canvas.height=t,this.canvas.width=e,this.ctx.scale(this.pixelRatio,this.pixelRatio)}},t.prototype.clear=function(){this.ctx.clearRect(0,0,this.size.width,this.size.height)},t.prototype.clipPath=function(t,e,i,n,r,o,s){void 0===o&&(o=!1),void 0===s&&(s=!1);var a=this.ctx;if(/polygon/.test(r)){var h=r.match(/-?\d+(rpx|px|%)?\s+-?\d+(rpx|px|%)?/g)||[];a.beginPath(),h.map((function(r){var o=r.split(" "),s=o[0],a=o[1];return[Y(s,i)+t,Y(a,n)+e]})).forEach((function(t,e){0==e?a.moveTo(t[0],t[1]):a.lineTo(t[0],t[1])})),a.closePath(),s&&a.stroke(),o&&a.fill()}},t.prototype.roundRect=function(t,e,i,n,r,o,s){if(void 0===o&&(o=!1),void 0===s&&(s=!1),!(r<0)){var a=this.ctx;if(a.beginPath(),r){var h=r||{},c=h.borderTopLeftRadius,f=void 0===c?r||0:c,d=h.borderTopRightRadius,l=void 0===d?r||0:d,u=h.borderBottomRightRadius,p=void 0===u?r||0:u,g=h.borderBottomLeftRadius,v=void 0===g?r||0:g;a.arc(t+i-p,e+n-p,p,0,.5*Math.PI),a.lineTo(t+v,e+n),a.arc(t+v,e+n-v,v,.5*Math.PI,Math.PI),a.lineTo(t,e+f),a.arc(t+f,e+f,f,Math.PI,1.5*Math.PI),a.lineTo(t+i-l,e),a.arc(t+i-l,e+l,l,1.5*Math.PI,2*Math.PI),a.lineTo(t+i,e+n-p)}else a.rect(t,e,i,n);a.closePath(),s&&a.stroke(),o&&a.fill()}},t.prototype.setTransform=function(t,e){var i=e.transform,n=e.transformOrigin,r=this.ctx,o=i||{},s=o.scaleX,a=void 0===s?1:s,h=o.scaleY,c=void 0===h?1:h,f=o.translateX,d=void 0===f?0:f,l=o.translateY,u=void 0===l?0:l,p=o.rotate,g=void 0===p?0:p,v=o.skewX,y=void 0===v?0:v,b=o.skewY,x=void 0===b?0:b,w=t.left,m=t.top,S=t.width,z=t.height;d=Y(d,S)||0,u=Y(u,z)||0;var I=Y("0%",1),M=Y("50%",1),k=Y("100%",1),B={top:I,center:M,bottom:k},W={left:I,center:M,right:k};if(n=n.split(" ").filter((function(t,e){return e<2})).reduce((function(t,e){if(/\d+/.test(e)){var i=Y(e,1)/(/px|rpx$/.test(e)?$(t.x)?z:S:1);return $(t.x)?Object.assign(t,{y:i}):Object.assign(t,{x:i})}return $(W[e])&&!$(t.x)?Object.assign(t,{x:W[e]}):Object.assign(t,{y:B[e]||.5})}),{}),(d||u)&&r.translate(d,u),(a||c)&&r.scale(a,c),g){var P=w+S*n.x,O=m+z*n.y;r.translate(P,O),r.rotate(g*Math.PI/180),r.translate(-P,-O)}(y||x)&&r.transform(1,Math.tan(x*Math.PI/180),Math.tan(y*Math.PI/180),1,0,0)},t.prototype.setBackground=function(t,e,i,n,o){var s=this.ctx;t&&t!=L?_(t)?X(t,e,i,n,o,s):s.setFillStyle(t):[r.MP_TOUTIAO,r.MP_BAIDU].includes(C)?s.setFillStyle("rgba(0,0,0,0)"):s.setFillStyle(L)},t.prototype.setShadow=function(t){var e=t.boxShadow,i=void 0===e?[]:e,n=this.ctx;if(i.length){var r=i[0],o=i[1],s=i[2],a=i[3];n.setShadow(r,o,s,a)}},t.prototype.setBorder=function(t,e){var i=this.ctx,n=t.width,r=t.height,o=t.left,s=t.top,a=e.border,h=e.borderBottom,c=e.borderTop,f=e.borderRight,d=e.borderLeft,l=e.borderRadius,u=e.lineCap,p=a||{},g=p.borderWidth,v=void 0===g?0:g,y=p.borderStyle,b=p.borderColor,x=h||{},w=x.borderBottomWidth,m=void 0===w?v:w,S=x.borderBottomStyle,z=void 0===S?y:S,I=x.borderBottomColor,M=void 0===I?b:I,k=c||{},B=k.borderTopWidth,W=void 0===B?v:B,P=k.borderTopStyle,O=void 0===P?y:P,T=k.borderTopColor,L=void 0===T?b:T,R=f||{},F=R.borderRightWidth,A=void 0===F?v:F,E=R.borderRightStyle,j=void 0===E?y:E,H=R.borderRightColor,D=void 0===H?b:H,$=d||{},Y=$.borderLeftWidth,U=void 0===Y?v:Y,N=$.borderLeftStyle,_=void 0===N?y:N,X=$.borderLeftColor,q=void 0===X?b:X,G=l||{},V=G.borderTopLeftRadius,J=void 0===V?l||0:V,Q=G.borderTopRightRadius,Z=void 0===Q?l||0:Q,K=G.borderBottomRightRadius,tt=void 0===K?l||0:K,et=G.borderBottomLeftRadius,it=void 0===et?l||0:et;if(h||d||c||f||a){var nt=function(t,e,n){"dashed"==e?/mp/.test(C)?i.setLineDash([Math.ceil(4*t/3),Math.ceil(4*t/3)]):i.setLineDash([Math.ceil(6*t),Math.ceil(6*t)]):"dotted"==e&&i.setLineDash([t,t]),i.setStrokeStyle(n)},rt=function(t,e,n,r,o,s,a,h,c,f,d,l,p,g,v){i.save(),i.setLineCap(v?"square":u),i.setLineWidth(l),nt(l,p,g),i.beginPath(),i.arc(t,e,a,Math.PI*c,Math.PI*f),i.lineTo(n,r),i.arc(o,s,h,Math.PI*f,Math.PI*d),i.stroke(),i.restore()};if(i.save(),a&&!h&&!d&&!c&&!f)return i.setLineWidth(v),nt(v,y,b),this.roundRect(o,s,n,r,l,!1,!!b),void i.restore();m&&rt(o+n-tt,s+r-tt,o+it,s+r,o+it,s+r-it,tt,it,.25,.5,.75,m,z,M,U&&A),U&&rt(o+it,s+r-it,o,s+J,o+J,s+J,it,J,.75,1,1.25,U,_,q,W&&m),W&&rt(o+J,s+J,o+n-Z,s,o+n-Z,s+Z,J,Z,1.25,1.5,1.75,W,O,L,U&&A),A&&rt(o+n-Z,s+Z,o+n,s+r-tt,o+n-tt,s+r-tt,Z,tt,1.75,2,.25,A,j,D,W&&m)}},t.prototype.setOpacity=function(t){var e=t.opacity,i=void 0===e?1:e;this.ctx.setGlobalAlpha(i)},t.prototype.drawPattern=function(t,e,r){return i(this,void 0,void 0,(function(){var i=this;return n(this,(function(n){return[2,new Promise((function(n,o){i.drawView(e,r,!0,!1,!0);var s=i,a=s.ctx;s.canvas;var h=e.width,c=e.height,f=e.left,d=e.top,l=r||{},u=l.borderRadius,p=void 0===u?0:u,g=l.backgroundImage,v=l.backgroundRepeat,y=void 0===v?"repeat":v;g&&function(t){var o=a.createPattern(t.src,y);a.setFillStyle(o),i.roundRect(f,d,h,c,p,!0,!1),i.setBorder(e,r),n()}(t)}))]}))}))},t.prototype.drawView=function(t,e,i,n,r){void 0===i&&(i=!0),void 0===n&&(n=!0),void 0===r&&(r=!0);var o=this.ctx,s=t.width,a=t.height,h=t.left,c=t.top,f=e||{},d=f.borderRadius,l=void 0===d?0:d,u=f.backgroundColor,p=void 0===u?L:u,g=f.overflow;e.opacity&&this.setOpacity(e),this.setTransform(t,e),r&&(o.save(),this.setShadow(e)),i&&this.setBackground(p,s,a,h,c),e.clipPath?this.clipPath(h,c,s,a,e.clipPath,i,!1):this.roundRect(h,c,s,a,l,i,!1),r&&o.restore(),n&&this.setBorder(t,e),"hidden"==g&&o.clip()},t.prototype.drawImage=function(t,e,o,s){return void 0===e&&(e={}),void 0===o&&(o={}),void 0===s&&(s=!0),i(this,void 0,void 0,(function(){var a=this;return n(this,(function(h){switch(h.label){case 0:return[4,new Promise((function(h,c){return i(a,void 0,void 0,(function(){var i,a,c,f,d,l,u,p,g,v,y,b,x,w,m,S,z,I,M,k,B,W=this;return n(this,(function(n){return i=this.ctx,a=o.borderRadius,c=void 0===a?0:a,f=o.backgroundColor,d=void 0===f?L:f,l=o.objectFit,u=void 0===l?R:l,p=o.backgroundSize,g=void 0===p?R:p,v=o.objectPosition,y=o.backgroundPosition,b=o.boxShadow,o.backgroundImage&&(u=g,v=y),b&&this.drawView(e,Object.assign(o,{backgroundColor:d||b&&(d||"#ffffff")}),!0,!1,!0),x=e.width,w=e.height,m=e.left,S=e.top,i.save(),z=e.contentSize.left-e.borderSize.left,I=e.contentSize.top-e.borderSize.top,s||(this.setOpacity(o),this.setTransform(e,o),this.setBackground(d,x,w,m,S),this.roundRect(m,S,x,w,c,!!(c||!b&&d),!1)),m+=z,S+=I,i.clip(),M=function(t){if(u!==R){var n=function(t,e,i){var n=t.objectFit,r=t.objectPosition,o=e.width/e.height,s=i.width/i.height,a=1,h="contain",c="cover";n==h&&o>=s||n==c&&o<s?a=e.height/i.height:(n==h&&o<s||n==c&&o>=s)&&(a=e.width/i.width);var f=i.width*a,d=i.height*a,l=r||[],u=l[0],p=l[1],g=N(u)?Y(u,e.width):(e.width-f)*(U(u)?Y(u,1):{left:0,center:.5,right:1}[u||"center"]),v=N(p)?Y(p,e.height):(e.height-d)*(U(p)?Y(p,1):{top:0,center:.5,bottom:1}[p||"center"]),y=function(t,e){return[(t-g)/a,(e-v)/a]},b=y(0,0),x=b[0],w=b[1],m=y(e.width,e.height),S=m[0],z=m[1],I=Math.max,M=Math.min;return{sx:I(x,0),sy:I(w,0),sw:M(S-x,i.width),sh:M(z-w,i.height),dx:I(g,0),dy:I(v,0),dw:M(f,e.width),dh:M(d,e.height)}}({objectFit:u,objectPosition:v},e.contentSize,t),o=n.sx,s=n.sy,a=n.sh,h=n.sw,c=n.dx,f=n.dy,d=n.dh,l=n.dw;C==r.MP_BAIDU?i.drawImage(t.src,c+m,f+S,l,d,o,s,h,a):i.drawImage(t.src,o,s,h,a,c+m,f+S,l,d)}else i.drawImage(t.src,m,S,x,w)},k=function(){i.restore(),W.drawView(e,o,!1,!0,!1),h(1)},B=function(t){M(t),k()},B(t),[2]}))}))}))];case 1:return h.sent(),[2]}}))}))},t.prototype.drawText=function(t,e,i,n){var r=this,o=this.ctx,s=e.borderSize,a=e.contentSize,h=e.left,c=e.top,f=a.width,d=a.height,l=a.left-s.left||0,u=a.top-s.top||0,p=i.color,g=i.lineHeight,v=i.fontSize,y=i.fontWeight,b=i.fontFamily,x=i.fontStyle,w=i.textIndent,m=void 0===w?0:w,S=i.textAlign,z=i.textStroke,I=i.verticalAlign,M=void 0===I?Ct:I,k=i.backgroundColor,B=i.lineClamp,W=i.backgroundClip,P=i.textShadow,O=i.textDecoration;if(m=$(m)?m:0,this.drawView(e,i,W!=Ft),g=Y(g,v),t){o.save(),h+=l,c+=u;var T=n.fontHeight,L=n.descent,R=void 0===L?0:L,F=n.ascent,A=R+(void 0===F?0:F);switch(o.setFonts({fontFamily:b,fontSize:v,fontWeight:y,fontStyle:x}),o.setTextBaseline(Ct),o.setTextAlign(S),W?this.setBackground(k,f,d,h,c):o.setFillStyle(p),S){case Dt:break;case $t:h+=.5*f;break;case Yt:h+=f}var E=n.lines*g,j=Math.ceil((d-E)/2);switch(j<0&&(j=0),M){case jt:break;case Ct:c+=j;break;case Ht:c+=2*j}var C=(g-T)/2,H=g/2,D=function(t){var e=o.measureText(t),i=e.actualBoundingBoxDescent,n=void 0===i?0:i,r=e.actualBoundingBoxAscent;return M==jt?{fix:A?void 0===r?0:r:H-C/2,lineY:A?0:C-C/2}:M==Ct?{fix:A?H+n/4:H,lineY:A?0:C}:M==Ht?{fix:A?g-n:H+C/2,lineY:A?2*C:C+C/2}:{fix:0,height:0,lineY:0}},U=function(t,e,i){var r=t;switch(S){case Dt:r+=i;break;case $t:r=(t-=i/2)+i;break;case Yt:r=t,t-=i}if(O){o.setLineWidth(v/13),o.beginPath();var s=.1*n.fontHeight;/\bunderline\b/.test(O)&&(o.moveTo(t,e+n.fontHeight+s),o.lineTo(r,e+n.fontHeight+s)),/\boverline\b/.test(O)&&(o.moveTo(t,e-s),o.lineTo(r,e-s)),/\bline-through\b/.test(O)&&(o.moveTo(t,e+.5*n.fontHeight),o.lineTo(r,e+.5*n.fontHeight)),o.closePath(),o.setStrokeStyle(p),o.stroke()}},N=function(t,e,i){var n=function(){o.setLineWidth(z.width),o.setStrokeStyle(z.color),o.strokeText(t,e,i)},s="outset";z&&z.type!==s?(o.save(),r.setShadow({boxShadow:P}),o.fillText(t,e,i),o.restore(),n()):z&&z.type==s?(o.save(),r.setShadow({boxShadow:P}),n(),o.restore(),o.save(),o.fillText(t,e,i),o.restore()):(r.setShadow({boxShadow:P}),o.fillText(t,e,i))};if(!n.widths||1==n.widths.length&&n.widths[0].total+m<=a.width){var _=D(t),X=_.fix,q=void 0===X?0:X,G=_.lineY;return N(t,h+m,c+q),U(h+m,c+G,n&&n.widths&&n.widths[0].total||n.text),c+=g,o.restore(),void this.setBorder(e,i)}for(var V=c,J=h,Q="",Z=0,K=o.measureText("...").width,tt=n.widths,et=0;et<tt.length;et++){var it=tt[et].widths,nt=0;Q="",c+=1==(Z+=1)?0:g,1==Z&&m&&(nt=m,J=h+m);for(var rt=0;rt<it.length;rt++){1!==Z&&m&&(J=h);var ot=it[rt],st=ot.width,at=ot.text,ht=(it[rt+1]||{}).width;if(Q+=at,(nt+=st)+(void 0===ht?0:ht)+(0==Z?m:0)+(Z==B?K:0)>a.width){Z>=B&&(Q+="…"),Z++,nt=0;var ct=D(Q);q=ct.fix,G=ct.lineY;N(Q,J,c+q),U(J,c+G,nt),c+=g,Q=""}else if(rt==it.length-1){et!=tt.length-1&&Z==B&&K+nt<a.width&&(Q+="…");var ft=D(Q);q=ft.fix,G=ft.lineY;N(Q,J,c+q),U(J,c+G,nt)}if(c>V+d||Z>B)break}}o.restore()}},t.prototype.source=function(t){return i(this,void 0,void 0,(function(){var e,i,r,o,s=this;return n(this,(function(n){switch(n.label){case 0:if(this.node=null,e=+new Date,"{}"==JSON.stringify(t))return[2];if(t.styles=t.styles||t.css||{},!t.type)for(i in t.type=Et,t)["views","children","type","css","styles"].includes(i)||(t.styles[i]=t[i],delete t[i]);return t.styles.boxSizing||(t.styles.boxSizing="border-box"),[4,this.create(t)];case 1:return(r=n.sent())?(o=r.layout()||{},this.size=o,this.node=r,this.onEffectFinished().then((function(t){return s.lifecycle("onEffectSuccess",t)})).catch((function(t){return s.lifecycle("onEffectFail",t)})),this.performance&&console.log("布局用时："+(+new Date-e)+"ms"),[2,this.size]):[2,console.warn("no node")]}}))}))},t.prototype.getImageInfo=function(t){return this.imageBus[t]||(this.imageBus[t]=this.createImage(t,this.useCORS)),this.imageBus[t]},t.prototype.create=function(t,r){return i(this,void 0,void 0,(function(){function i(t,n,r){void 0===n&&(n={}),void 0===r&&(r=!0);var o=[];return t.forEach((function(t){var s=t.styles,a=void 0===s?{}:s,h=t.css,c=void 0===h?{}:h,f=t.children,d=void 0===f?[]:f,l=t.views,u=void 0===l?[]:l,p=t.text,g=void 0===p?"":p,v=t.type,y=void 0===v?"":v;!d&&u&&(t.children=d=u);var b={};b=e(e(r?e({},n):{},a),c);var x={},w={},m={};Object.keys(b).map((function(t){if(t.includes("padding")||t.includes("margin")){var e=dt(t,b[t]);Object.keys(e).map((function(t){t.includes("Left")?w[t]=e[t]:t.includes("Right")?m[t]=e[t]:x[t]=e[t]}))}}));if(b.textIndent&&(w.textIndent=b.textIndent,delete n.textIndent),""!==g){var S=Array.from(g);S.forEach((function(t,e){var i=Object.assign({},b,x);0===e?Object.assign(i,w):e==S.length-1&&Object.assign(i,m),delete i.padding,delete i.margin,o.push({type:"text",text:t,styles:i})}))}if(y==Rt||y==At)o.push(t);else if("block"===a.display&&d.length>0){var z=i(d,b,!1);t.children=z,t.flattened=!0,o.push(t)}else if(d.length>0){z=i(d,b,r);o=o.concat(z)}})),o}var o,s,a,h,c,f,d,l,u,p,g,v,y,b,x,w,m,S,z,I,M,k,B,P;return n(this,(function(n){switch(n.label){case 0:if(!t)return[2];if(t.styles||(t.styles=t.css||{}),o=t.type,s=t.show,a=void 0===s||s,h=o==Rt,c=[Ft,At].includes(o),f="textBox"==o,d=t.styles||{},l=d.backgroundImage,u=d.display,h&&!t.src&&!t.url)return[2];if(u==W||!a)return[2];if(c||f){if(p=t.children,g=t.views,!p&&g&&(t.children=p=g),!t.text&&(!p||p&&!p.length))return[2];p&&p.length&&!t.flattened&&(v=i(t.children||t.views),t.type="view",t.children=v)}if(!(h||t.type==Et&&l))return[3,4];y=h?t.src:"",b=/url\(['"]?(.*?)['"]?\)/.exec(l),l&&b&&b[1]&&(y=b[1]||""),n.label=1;case 1:return n.trys.push([1,3,,4]),[4,this.getImageInfo(y)];case 2:return x=n.sent(),w=x.width,m=x.height,!(S=x.path)&&h?[2]:(S&&(t.attributes=Object.assign(t.attributes||{},{width:w,height:m,path:S,src:S,naturalSrc:y})),[3,4]);case 3:return z=n.sent(),t.type!=Et?[2]:(this.lifecycle("onEffectFail",e(e({},z),{src:y})),[3,4]);case 4:if(this.count+=1,I=new Tt(t,r,this.root,this.ctx),!(M=t.children||t.views))return[3,8];k=0,n.label=5;case 5:return k<M.length?(B=M[k],[4,this.create(B,I)]):[3,8];case 6:(P=n.sent())&&I.add(P),n.label=7;case 7:return k++,[3,5];case 8:return[2,I]}}))}))},t.prototype.drawNode=function(t,e){return void 0===e&&(e=!1),i(this,void 0,void 0,(function(){var i,r,o,s,a,h,c,f,d,l,u,p,g,v,y,b,x,w,m,S,z,I,M;return n(this,(function(n){switch(n.label){case 0:return i=t.layoutBox,r=t.computedStyle,o=t.attributes,s=t.name,a=t.children,h=t.fixedLine,c=t.attributes,f=c.src,d=c.text,l=r.position,u=r.backgroundImage,p=r.backgroundRepeat,["fixed"].includes(l)&&!e?[2]:(this.ctx.save(),s!==Et?[3,7]:f&&u?p?[4,this.drawPattern(o,i,r)]:[3,2]:[3,5]);case 1:return n.sent(),[3,4];case 2:return[4,this.drawImage(o,i,r,!1)];case 3:n.sent(),n.label=4;case 4:return[3,6];case 5:this.drawView(i,r),n.label=6;case 6:return[3,10];case 7:return s===Rt&&f?[4,this.drawImage(o,i,r,!1)]:[3,9];case 8:return n.sent(),[3,10];case 9:s===Ft?this.drawText(d,i,r,o):s===At&&Lt.api&&Lt.api.draw(d,this,i,r),n.label=10;case 10:if(this.progress+=1,v=(g=h||{}).beforeElements,y=g.afterElements,!v)return[3,14];b=0,x=v,n.label=11;case 11:return b<x.length?(M=x[b],[4,this.drawNode(M)]):[3,14];case 12:n.sent(),n.label=13;case 13:return b++,[3,11];case 14:if(!a)return[3,18];w=Object.values?Object.values(a):Object.keys(a).map((function(t){return a[t]})),m=0,S=w,n.label=15;case 15:return m<S.length?"absolute"===(M=S[m]).computedStyle.position?[3,17]:[4,this.drawNode(M)]:[3,18];case 16:n.sent(),n.label=17;case 17:return m++,[3,15];case 18:if(!y)return[3,22];z=0,I=y,n.label=19;case 19:return z<I.length?(M=I[z],[4,this.drawNode(M)]):[3,22];case 20:n.sent(),n.label=21;case 21:return z++,[3,19];case 22:return this.ctx.restore(),[2]}}))}))},t.prototype.render=function(t){var e=this;return void 0===t&&(t=30),new Promise((function(r,o){return i(e,void 0,void 0,(function(){var e,i,s,a,h,c,f,d,l,u;return n(this,(function(n){switch(n.label){case 0:return e=+new Date,this.init(),[4,(p=t,void 0===p&&(p=0),new Promise((function(t){return setTimeout(t,p)})))];case 1:n.sent(),n.label=2;case 2:if(n.trys.push([2,14,,15]),!this.node)return[3,12];if(i=this.root.fixedLine||{},s=i.beforeElements,a=i.afterElements,!s)return[3,6];h=0,c=s,n.label=3;case 3:return h<c.length?(l=c[h],[4,this.drawNode(l,!0)]):[3,6];case 4:n.sent(),n.label=5;case 5:return h++,[3,3];case 6:return[4,this.drawNode(this.node)];case 7:if(n.sent(),!a)return[3,11];f=0,d=a,n.label=8;case 8:return f<d.length?(l=d[f],[4,this.drawNode(l,!0)]):[3,11];case 9:n.sent(),n.label=10;case 10:return f++,[3,8];case 11:return r(this.node),[3,13];case 12:this.lifecycle("onEffectFail","node is empty"),n.label=13;case 13:return[3,15];case 14:return u=n.sent(),this.lifecycle("onEffectFail",u),o(u),[3,15];case 15:return this.performance&&console.log("渲染用时："+(+new Date-e-30)+"ms"),[2]}var p}))}))}))},t.prototype.onEffectFinished=function(){var t=this,e=Object.keys(this.imageBus).map((function(e){return t.imageBus[e]}));return Promise.all(e)},t.prototype.destroy=function(){this.node=[]},t.prototype.save=function(t){try{var e=t||{},i=e.fileType,n=void 0===i?"png":i,r=e.quality,o=void 0===r?1:r;return this.canvas.toDataURL("image/".concat(n),o)}catch(t){return this.lifecycle("onEffectFail","image cross domain"),t}},t}();r.WEB==C&&(window.Painter=Ut),t.Painter=Ut,t.default=Ut,Object.defineProperty(t,"__esModule",{value:!0})}));
diff --git a/uni_modules/lime-painter/hybrid/html/uni.webview.1.5.3.js b/uni_modules/lime-painter/hybrid/html/uni.webview.1.5.3.js
new file mode 100644
index 0000000..d6524fa
--- /dev/null
+++ b/uni_modules/lime-painter/hybrid/html/uni.webview.1.5.3.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e=e||self).uni=n()}(this,(function(){"use strict";try{var e={};Object.defineProperty(e,"passive",{get:function(){!0}}),window.addEventListener("test-passive",null,e)}catch(e){}var n=Object.prototype.hasOwnProperty;function i(e,i){return n.call(e,i)}var t=[];function o(){return window.__dcloud_weex_postMessage||window.__dcloud_weex_}var r=function(e,n){var i={options:{timestamp:+new Date},name:e,arg:n};if(o()){if("postMessage"===e){var r={data:[n]};return window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessage(r):window.__dcloud_weex_.postMessage(JSON.stringify(r))}var a={type:"WEB_INVOKE_APPSERVICE",args:{data:i,webviewIds:t}};window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessageToService(a):window.__dcloud_weex_.postMessageToService(JSON.stringify(a))}if(!window.plus)return window.parent.postMessage({type:"WEB_INVOKE_APPSERVICE",data:i,pageId:""},"*");if(0===t.length){var d=plus.webview.currentWebview();if(!d)throw new Error("plus.webview.currentWebview() is undefined");var s=d.parent(),w="";w=s?s.id:d.id,t.push(w)}if(plus.webview.getWebviewById("__uniapp__service"))plus.webview.postMessageToUniNView({type:"WEB_INVOKE_APPSERVICE",args:{data:i,webviewIds:t}},"__uniapp__service");else{var u=JSON.stringify(i);plus.webview.getLaunchWebview().evalJS('UniPlusBridge.subscribeHandler("'.concat("WEB_INVOKE_APPSERVICE",'",').concat(u,",").concat(JSON.stringify(t),");"))}},a={navigateTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;r("navigateTo",{url:encodeURI(n)})},navigateBack:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.delta;r("navigateBack",{delta:parseInt(n)||1})},switchTab:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;r("switchTab",{url:encodeURI(n)})},reLaunch:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;r("reLaunch",{url:encodeURI(n)})},redirectTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;r("redirectTo",{url:encodeURI(n)})},getEnv:function(e){o()?e({nvue:!0}):window.plus?e({plus:!0}):e({h5:!0})},postMessage:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};r("postMessage",e.data||{})}},d=/uni-app/i.test(navigator.userAgent),s=/Html5Plus/i.test(navigator.userAgent),w=/complete|loaded|interactive/;var u=window.my&&navigator.userAgent.indexOf("AlipayClient")>-1;var g=window.swan&&window.swan.webView&&/swan/i.test(navigator.userAgent);var c=window.qq&&window.qq.miniProgram&&/QQ/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var v=window.tt&&window.tt.miniProgram&&/toutiaomicroapp/i.test(navigator.userAgent);var m=window.wx&&window.wx.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var p=window.qa&&/quickapp/i.test(navigator.userAgent);var f=window.ks&&window.ks.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var l=window.tt&&window.tt.miniProgram&&/Lark|Feishu/i.test(navigator.userAgent);var _=window.jd&&window.jd.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);for(var E,b=function(){window.UniAppJSBridge=!0,document.dispatchEvent(new CustomEvent("UniAppJSBridgeReady",{bubbles:!0,cancelable:!0}))},h=[function(e){if(d||s)return window.__dcloud_weex_postMessage||window.__dcloud_weex_?document.addEventListener("DOMContentLoaded",e):window.plus&&w.test(document.readyState)?setTimeout(e,0):document.addEventListener("plusready",e),a},function(e){if(m)return window.WeixinJSBridge&&window.WeixinJSBridge.invoke?setTimeout(e,0):document.addEventListener("WeixinJSBridgeReady",e),window.wx.miniProgram},function(e){if(c)return window.QQJSBridge&&window.QQJSBridge.invoke?setTimeout(e,0):document.addEventListener("QQJSBridgeReady",e),window.qq.miniProgram},function(e){if(u){document.addEventListener("DOMContentLoaded",e);var n=window.my;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){if(g)return document.addEventListener("DOMContentLoaded",e),window.swan.webView},function(e){if(v)return document.addEventListener("DOMContentLoaded",e),window.tt.miniProgram},function(e){if(p){window.QaJSBridge&&window.QaJSBridge.invoke?setTimeout(e,0):document.addEventListener("QaJSBridgeReady",e);var n=window.qa;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){if(f)return window.WeixinJSBridge&&window.WeixinJSBridge.invoke?setTimeout(e,0):document.addEventListener("WeixinJSBridgeReady",e),window.ks.miniProgram},function(e){if(l)return document.addEventListener("DOMContentLoaded",e),window.tt.miniProgram},function(e){if(_)return window.JDJSBridgeReady&&window.JDJSBridgeReady.invoke?setTimeout(e,0):document.addEventListener("JDJSBridgeReady",e),window.jd.miniProgram},function(e){return document.addEventListener("DOMContentLoaded",e),a}],y=0;y<h.length&&!(E=h[y](b));y++);E||(E={});var B="undefined"!=typeof uni?uni:{};if(!B.navigateTo)for(var S in E)i(E,S)&&(B[S]=E[S]);return B.webView=E,B}));
diff --git a/uni_modules/lime-painter/package.json b/uni_modules/lime-painter/package.json
new file mode 100644
index 0000000..4c253e0
--- /dev/null
+++ b/uni_modules/lime-painter/package.json
@@ -0,0 +1,93 @@
+{
+  "id": "lime-painter",
+  "displayName": "海报画板",
+  "version": "1.9.6.6",
+  "description": "一款canvas海报组件，更优雅的海报生成方案，有限的支持富文本",
+  "keywords": [
+    "海报",
+    "富文本",
+    "生成海报",
+    "生成二维码",
+    "JSON"
+],
+  "repository": "https://gitee.com/liangei/lime-painter", 
+  "engines": {
+    "HBuilderX": "^3.4.14"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": "305716444"
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+        "QQ": "y",
+        "钉钉": "u",
+        "快手": "u",
+        "飞书": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  },
+  "name": "lime-painter",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC"
+}
diff --git a/uni_modules/lime-painter/parser.js b/uni_modules/lime-painter/parser.js
new file mode 100644
index 0000000..da36a87
--- /dev/null
+++ b/uni_modules/lime-painter/parser.js
@@ -0,0 +1,388 @@
+/*
+ * HTML5 Parser By Sam Blowes
+ *
+ * Designed for HTML5 documents
+ *
+ * Original code by John Resig (ejohn.org)
+ * http://ejohn.org/blog/pure-javascript-html-parser/
+ * Original code by Erik Arvidsson, Mozilla Public License
+ * http://erik.eae.net/simplehtmlparser/simplehtmlparser.js
+ *
+ * ----------------------------------------------------------------------------
+ * License
+ * ----------------------------------------------------------------------------
+ *
+ * This code is triple licensed using Apache Software License 2.0,
+ * Mozilla Public License or GNU Public License
+ *
+ * ////////////////////////////////////////////////////////////////////////////
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.  You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * ////////////////////////////////////////////////////////////////////////////
+ *
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is Simple HTML Parser.
+ *
+ * The Initial Developer of the Original Code is Erik Arvidsson.
+ * Portions created by Erik Arvidssson are Copyright (C) 2004. All Rights
+ * Reserved.
+ *
+ * ////////////////////////////////////////////////////////////////////////////
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * ----------------------------------------------------------------------------
+ * Usage
+ * ----------------------------------------------------------------------------
+ *
+ * // Use like so:
+ * HTMLParser(htmlString, {
+ *     start: function(tag, attrs, unary) {},
+ *     end: function(tag) {},
+ *     chars: function(text) {},
+ *     comment: function(text) {}
+ * });
+ *
+ * // or to get an XML string:
+ * HTMLtoXML(htmlString);
+ *
+ * // or to get an XML DOM Document
+ * HTMLtoDOM(htmlString);
+ *
+ * // or to inject into an existing document/DOM node
+ * HTMLtoDOM(htmlString, document);
+ * HTMLtoDOM(htmlString, document.body);
+ *
+ */
+// Regular Expressions for parsing tags and attributes
+var startTag = /^<([-A-Za-z0-9_]+)((?:\s+[a-zA-Z_:][-a-zA-Z0-9_:.]*(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/;
+var endTag = /^<\/([-A-Za-z0-9_]+)[^>]*>/;
+var attr = /([a-zA-Z_:][-a-zA-Z0-9_:.]*)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g; // Empty Elements - HTML 5
+
+var empty = makeMap('area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr'); // Block Elements - HTML 5
+// fixed by xxx 将 ins 标签从块级名单中移除
+
+var block = makeMap('a,address,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video'); // Inline Elements - HTML 5
+
+var inline = makeMap('abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var'); // Elements that you can, intentionally, leave open
+// (and which close themselves)
+
+var closeSelf = makeMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr'); // Attributes that have their values filled in disabled="disabled"
+
+var fillAttrs = makeMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'); // Special Elements (can contain anything)
+
+var special = makeMap('script,style');
+function HTMLParser(html, handler) {
+  var index;
+  var chars;
+  var match;
+  var stack = [];
+  var last = html;
+
+  stack.last = function () {
+    return this[this.length - 1];
+  };
+
+  while (html) {
+    chars = true; // Make sure we're not in a script or style element
+
+    if (!stack.last() || !special[stack.last()]) {
+      // Comment
+      if (html.indexOf('<!--') == 0) {
+        index = html.indexOf('-->');
+
+        if (index >= 0) {
+          if (handler.comment) {
+            handler.comment(html.substring(4, index));
+          }
+
+          html = html.substring(index + 3);
+          chars = false;
+        } // end tag
+
+      } else if (html.indexOf('</') == 0) {
+        match = html.match(endTag);
+
+        if (match) {
+          html = html.substring(match[0].length);
+          match[0].replace(endTag, parseEndTag);
+          chars = false;
+        } // start tag
+
+      } else if (html.indexOf('<') == 0) {
+        match = html.match(startTag);
+
+        if (match) {
+          html = html.substring(match[0].length);
+          match[0].replace(startTag, parseStartTag);
+          chars = false;
+        }
+      }
+
+      if (chars) {
+        index = html.indexOf('<');
+        var text = index < 0 ? html : html.substring(0, index);
+        html = index < 0 ? '' : html.substring(index);
+
+        if (handler.chars) {
+          handler.chars(text);
+        }
+      }
+    } else {
+      html = html.replace(new RegExp('([\\s\\S]*?)<\/' + stack.last() + '[^>]*>'), function (all, text) {
+        text = text.replace(/<!--([\s\S]*?)-->|<!\[CDATA\[([\s\S]*?)]]>/g, '$1$2');
+
+        if (handler.chars) {
+          handler.chars(text);
+        }
+
+        return '';
+      });
+      parseEndTag('', stack.last());
+    }
+
+    if (html == last) {
+      throw 'Parse Error: ' + html;
+    }
+
+    last = html;
+  } // Clean up any remaining tags
+
+
+  parseEndTag();
+
+  function parseStartTag(tag, tagName, rest, unary) {
+    tagName = tagName.toLowerCase();
+    if (block[tagName]) {
+      while (stack.last() && inline[stack.last()]) {
+        parseEndTag('', stack.last());
+      }
+    }
+
+    if (closeSelf[tagName] && stack.last() == tagName) {
+      parseEndTag('', tagName);
+    }
+
+    unary = empty[tagName] || !!unary;
+
+    if (!unary) {
+      stack.push(tagName);
+    }
+
+    if (handler.start) {
+      var attrs = [];
+      rest.replace(attr, function (match, name) {
+        var value = arguments[2] ? arguments[2] : arguments[3] ? arguments[3] : arguments[4] ? arguments[4] : fillAttrs[name] ? name : '';
+        attrs.push({
+          name: name,
+          value: value,
+          escaped: value.replace(/(^|[^\\])"/g, '$1\\\"') // "
+
+        });
+      });
+
+      if (handler.start) {
+        handler.start(tagName, attrs, unary);
+      }
+    }
+  }
+
+  function parseEndTag(tag, tagName) {
+    // If no tag name is provided, clean shop
+    if (!tagName) {
+      var pos = 0;
+    } // Find the closest opened tag of the same type
+    else {
+        for (var pos = stack.length - 1; pos >= 0; pos--) {
+          if (stack[pos] == tagName) {
+            break;
+          }
+        }
+      }
+
+    if (pos >= 0) {
+      // Close all the open elements, up the stack
+      for (var i = stack.length - 1; i >= pos; i--) {
+        if (handler.end) {
+          handler.end(stack[i]);
+        }
+      } // Remove the open elements from the stack
+
+
+      stack.length = pos;
+    }
+  }
+}
+
+function makeMap(str) {
+  var obj = {};
+  var items = str.split(',');
+
+  for (var i = 0; i < items.length; i++) {
+    obj[items[i]] = true;
+  }
+
+  return obj;
+}
+
+function removeDOCTYPE(html) {
+  return html.replace(/<\?xml.*\?>\n/, '').replace(/<!doctype.*>\n/, '').replace(/<!DOCTYPE.*>\n/, '');
+}
+
+function parseAttrs(attrs) {
+  return attrs.reduce(function (pre, attr) {
+    var value = attr.value;
+    var name = attr.name;
+    if (pre[name]) {
+			pre[name] = pre[name] + " " + value;
+    } else {
+			pre[name] = value;
+    }
+
+    return pre;
+  }, {});
+}
+function convertStyleStringToJSON(styleString) {
+  var styles = styleString.split(";"); // 通过分号将样式字符串分割为多个样式声明
+  var result = {};
+
+  styles.forEach(function(style) {
+    var styleParts = style.split(":"); // 通过冒号将样式声明分割为属性和值
+    var property = styleParts[0].trim();
+    var value = styleParts[1] && styleParts[1].trim();
+
+    if (property && value) {
+      result[property] = value; // 将属性和值添加到结果对象中
+    }
+  });
+
+  return result;
+}
+function parseHtml(html) {
+  html = removeDOCTYPE(html);
+  var stacks = [];
+  var results = {
+    node: 'root',
+    children: []
+  };
+  HTMLParser(html, {
+    start: function start(tag, attrs, unary) {
+      var node = {
+        name: tag
+      };
+
+      if (attrs.length !== 0) {
+        node.attrs = parseAttrs(attrs);
+		node.styles = node.attrs.style ? convertStyleStringToJSON(node.attrs.style) : {}
+      }
+	
+	if(!node.type) {
+	  if(inline[node.name] && node.name !== 'img' ) {
+		node.type = 'text';
+		if(node.name == 'br') {
+			node.text = '\n'
+		} else if(node.name == 'strong'){
+			node.styles.fontWeight = 'bold'
+		}
+	  } else if(node.name == 'img'){
+		 node.type = 'image' 
+		 node.src =  node.attrs.src
+	  } else {
+		   node.type = 'view' 
+		   if(['h1','h2','h3','h4','h5','h6'].includes(node.name)) {
+			   node.styles.fontWeight = 'bold'
+		   }
+	  }
+	}		
+      if (unary) {
+        var parent = stacks[0] || results;
+
+        if (!parent.children) {
+          parent.children = [];
+        }
+
+        parent.children.push(node);
+      } else {
+        stacks.unshift(node);
+      }
+    },
+    end: function end(tag) {
+      var node = stacks.shift();
+      if (node.name !== tag) console.error('invalid state: mismatch end tag');
+      if (stacks.length === 0) {
+        results.children.push(node);
+      } else {
+        var parent = stacks[0];
+
+        if (!parent.children) {
+          parent.children = [];
+        }
+        parent.children.push(node);
+      }
+	  const isTextBox = node.children && node.children.length > 1 && node.children.every(child => {
+		  return ['text','image'].includes(child.type)
+	  })
+	  if(isTextBox) {
+		  node.type = 'textBox'
+	  }
+    },
+    chars: function chars(text) {
+      var node = {
+        type: 'text',
+        text: text
+      };
+
+      if (stacks.length === 0) {
+        results.children.push(node);
+      } else {
+        var parent = stacks[0];
+
+        if (!parent.children) {
+          parent.children = [];
+        }
+
+        parent.children.push(node);
+      }
+    },
+    comment: function comment(text) {
+      var node = {
+        node: 'comment',
+        text: text
+      };
+      var parent = stacks[0];
+
+      if (!parent.children) {
+        parent.children = [];
+      }
+
+      parent.children.push(node);
+    }
+  });
+  return results.children;
+}
+
+export default parseHtml;
\ No newline at end of file
diff --git a/uni_modules/lime-painter/readme.md b/uni_modules/lime-painter/readme.md
new file mode 100644
index 0000000..b05000c
--- /dev/null
+++ b/uni_modules/lime-painter/readme.md
@@ -0,0 +1,961 @@
+# Painter 画板 测试版
+
+> uniapp 海报画板，更优雅的海报生成方案  
+> [查看更多](https://limeui.qcoon.cn/#/painter)  
+
+## 平台兼容
+
+| H5  | 微信小程序 | 支付宝小程序 | 百度小程序 | 头条小程序 | QQ 小程序 | App |
+| --- | ---------- | ------------ | ---------- | ---------- | --------- | --- |
+| √   | √          | √            | 未测       | √          | √         | √   |
+
+## 安装
+在市场导入**[海报画板](https://ext.dcloud.net.cn/plugin?id=2389)uni_modules**版本的即可，无需`import`
+
+## 代码演示
+
+### 插件demo
+- lime-painter 为 demo
+- 位于 uni_modules/lime-painter/components/lime-painter
+- 导入插件后直接使用可查看demo
+```vue
+<lime-painter />
+```
+
+
+### 基本用法
+
+- 插件提供 JSON 及 Template 的方式绘制海报
+- 参考 css 块状流布局模拟 css schema。
+- 另外flex布局还不是成完善，请谨慎使用，普通的流布局我觉得已经够用了。
+
+#### 方式一 Template
+
+- 提供`l-painter-view`、`l-painter-text`、`l-painter-image`、`l-painter-qrcode`四种类型组件
+- 通过 `css` 属性绘制样式，与 style 使用方式保持一致。
+```html
+<l-painter>
+	//如果使用Template出现顺序错乱，可使用`template` 等所有变量完成再显示
+	<template v-if="show">
+		<l-painter-view
+			css="background: #07c160; height: 120rpx; width: 120rpx; display: inline-block"
+		></l-painter-view>
+		<l-painter-view
+			css="background: #1989fa; height: 120rpx; width: 120rpx; border-top-right-radius: 60rpx; border-bottom-left-radius: 60rpx; display: inline-block; margin: 0 30rpx;"
+		></l-painter-view>
+		<l-painter-view
+			css="background: #ff9d00; height: 120rpx; width: 120rpx; border-radius: 50%; display: inline-block"
+		></l-painter-view>
+	<template>
+</l-painter>
+```
+
+#### 方式二 JSON
+
+- 在 json 里四种类型组件的`type`为`view`、`text`、`image`、`qrcode`
+- 通过 `board` 设置海报所需的 JSON 数据进行绘制或`ref`获取组件实例调用组件内的`render(json)`
+- 所有类型的 schema 都具有`css`字段，css 的 key 值使用**驼峰**如：`lineHeight`
+
+```html
+<l-painter :board="poster"/>
+```
+
+```js
+data() {
+	return {
+		poster: {
+			css: {
+				// 根节点若无尺寸，自动获取父级节点
+				width: '750rpx'
+			},
+			views: [
+				{
+					css: {
+						background: "#07c160",
+						height: "120rpx",
+						width: "120rpx",
+						display: "inline-block"
+					},
+					type: "view"
+				},
+				{
+					css: {
+						background: "#1989fa",
+						height: "120rpx",
+						width: "120rpx",
+						borderTopRightRadius: "60rpx",
+						borderBottomLeftRadius: "60rpx",
+						display: "inline-block",
+						margin: "0 30rpx"
+					},
+					views: [],
+					type: "view"
+				},
+				{
+					css: {
+						background: "#ff9d00",
+						height: "120rpx",
+						width: "120rpx",
+						borderRadius: "50%",
+						display: "inline-block"
+					},
+					views: [],
+					type: "view"
+				},
+			]
+		}
+	}
+}
+```
+
+### View 容器
+
+- 类似于 `div` 可以嵌套承载更多的 view、text、image，qrcode 共同构建一颗完整的节点树
+- 在 JSON 里具有 `views` 的数组字段，用于嵌套承载节点。
+
+#### 方式一 Template
+
+```html
+<l-painter>
+  <l-painter-view css="background: #f0f0f0; padding-top: 100rpx;">
+    <l-painter-view
+      css="background: #d9d9d9; width: 33.33%; height: 100rpx; display: inline-block"
+    ></l-painter-view>
+    <l-painter-view
+      css="background: #bfbfbf; width: 66.66%; height: 100rpx; display: inline-block"
+    ></l-painter-view>
+  </l-painter-view>
+</l-painter>
+```
+
+#### 方式二 JSON
+
+```js
+{
+	css: {},
+	views: [
+		{
+			type: 'view',
+			css: {
+				background: '#f0f0f0',
+				paddingTop: '100rpx'
+			},
+			views: [
+				{
+					type: 'view',
+					css: {
+						background: '#d9d9d9',
+						width: '33.33%',
+						height: '100rpx',
+						display: 'inline-block'
+					}
+				},
+				{
+					type: 'view',
+					css: {
+						background: '#bfbfbf',
+						width: '66.66%',
+						height: '100rpx',
+						display: 'inline-block'
+					}
+				}
+			],
+
+		}
+	]
+}
+```
+
+### Text 文本
+
+- 通过 `text` 属性填写文本内容。
+- 支持`\n`换行符
+- 支持省略号，使用 css 的`line-clamp`设置行数，当文字内容超过会显示省略号。
+- 支持`text-decoration`
+
+#### 方式一 Template
+
+```html
+<l-painter>
+  <l-painter-view css="background: #e0e2db; padding: 30rpx; color: #222a29">
+    <l-painter-text
+      text="登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼"
+    />
+    <l-painter-text
+      text="登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼"
+      css="text-align:center; padding-top: 20rpx; text-decoration: line-through "
+    />
+    <l-painter-text
+      text="登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼"
+      css="text-align:right; padding-top: 20rpx"
+    />
+    <l-painter-text
+      text="水调歌头\n明月几时有？把酒问青天。不知天上宫阙，今夕是何年。我欲乘风归去，又恐琼楼玉宇，高处不胜寒。起舞弄清影，何似在人间。"
+      css="line-clamp: 3; padding-top: 20rpx; background: linear-gradient(,#ff971b 0%, #ff5000 100%); background-clip: text"
+    />
+  </l-painter-view>
+</l-painter>
+```
+
+#### 方式二 JSON
+
+```js
+// 基础用法
+{
+	type: 'text',
+	text: '登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼',
+},
+{
+	type: 'text',
+	text: '登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼',
+	css: {
+		// 设置居中对齐
+		textAlign: 'center',
+		// 设置中划线
+		textDecoration: 'line-through'
+	}
+},
+{
+	type: 'text',
+	text: '登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼',
+	css: {
+		// 设置右对齐
+		textAlign: 'right',
+	}
+},
+{
+	type: 'text',
+	text: '登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼',
+	css: {
+		// 设置行数，超出显示省略号
+		lineClamp: 3,
+		// 渐变文字
+		background: 'linear-gradient(,#ff971b 0%, #1989fa 100%)',
+		backgroundClip: 'text'
+	}
+}
+```
+
+### Image 图片
+
+- 通过 `src` 属性填写图片路径。
+- 图片路径支持：网络图片，本地 static 里的图片路径，缓存路径，**字节的static目录是写相对路径**
+- 通过 `css` 的 `object-fit`属性可以设置图片的填充方式，可选值见下方 CSS 表格。
+- 通过 `css` 的 `object-position`配合 `object-fit` 可以设置图片的对齐方式，类似于`background-position`，详情见下方 CSS 表格。
+- 使用网络图片时：小程序需要去公众平台配置 [downloadFile](https://mp.weixin.qq.com/) 域名
+- 使用网络图片时：**H5 和 Nvue 需要决跨域问题**
+
+#### 方式一 Template
+
+```html
+<l-painter>
+  <!-- 基础用法 -->
+  <l-painter-image
+    src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+    css="width: 200rpx; height: 200rpx"
+  />
+  <!-- 填充方式 -->
+  <!-- css object-fit 设置 填充方式 见下方表格-->
+  <l-painter-image
+    src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+    css="width: 200rpx; height: 200rpx; object-fit: contain; background: #eee"
+  />
+  <!-- css object-position 设置 图片的对齐方式-->
+  <l-painter-image
+    src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+    css="width: 200rpx; height: 200rpx; object-fit: contain; object-position: 50% 50%; background: #eee"
+  />
+</l-painter>
+```
+
+#### 方式二 JSON
+
+```js
+// 基础用法
+{
+	type: 'image',
+	src: 'https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg',
+	css: {
+		width: '200rpx',
+		height: '200rpx'
+	}
+},
+// 填充方式
+// css objectFit 设置 填充方式 见下方表格
+{
+	type: 'image',
+	src: 'https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg',
+	css: {
+		width: '200rpx',
+		height: '200rpx',
+		objectFit: 'contain'
+	}
+},
+// css objectPosition 设置 图片的对齐方式
+{
+	type: 'image',
+	src: 'https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg',
+	css: {
+		width: '200rpx',
+		height: '200rpx',
+		objectFit: 'contain',
+		objectPosition: '50% 50%'
+	}
+}
+```
+
+### Qrcode 二维码
+
+- 通过`text`属性填写需要生成二维码的文本。
+- 通过 `css` 里的 `color` 可设置生成码点的颜色。
+- 通过 `css` 里的 `background`可设置背景色。
+- 通过 `css `里的 `width`、`height`设置尺寸。
+
+#### 方式一 Template
+
+```html
+<l-painter>
+  <l-painter-qrcode
+    text="limeui.qcoon.cn"
+    css="width: 200rpx; height: 200rpx"
+  />
+</l-painter>
+```
+
+#### 方式二 JSON
+
+```js
+{
+	type: 'qrcode',
+	text: 'limeui.qcoon.cn',
+	css: {
+		width: '200rpx',
+		height: '200rpx',
+	}
+}
+```
+
+### 富文本
+- 这是一个有限支持的测试能力，只能通过JSON方式，不要抱太大希望!
+- 首先需要把富文本转成JSON,这需要引入`parser`这个包，如果你不使用是不会进入主包
+
+```html
+<l-painter ref="painter"/>
+```
+```js
+import parseHtml from '@/uni_modules/lime-painter/parser'
+const json = parseHtml(`<p><span>测试测试</span><img src="/static/logo.png"/></p>`)
+this.$refs.painter.render(json)
+```
+
+### 生成图片
+
+- 方式1、通过设置`isCanvasToTempFilePath`自动生成图片并在 `@success` 事件里接收海报临时路径
+- 方式2、通过调用内部方法生成图片：
+
+```html
+<l-painter ref="painter">...code</l-painter>
+```
+
+```js
+this.$refs.painter.canvasToTempFilePathSync({
+  fileType: "jpg",
+  // 如果返回的是base64是无法使用 saveImageToPhotosAlbum，需要设置 pathType为url
+  pathType: 'url',
+  quality: 1,
+  success: (res) => {
+    console.log(res.tempFilePath);
+	// 非H5 保存到相册
+	// H5 提示用户长按图另存
+	uni.saveImageToPhotosAlbum({
+		filePath: res.tempFilePath,
+		success: function () {
+			console.log('save success');
+		}
+	});
+  },
+});
+```
+
+### 主动调用方式
+
+- 通过获取组件实例内部的`render`函数 传递`JSON`即可
+
+```html
+<l-painter ref="painter" />
+```
+
+```js
+// 渲染
+this.$refs.painter.render(jsonSchema);
+// 生成图片
+this.$refs.painter.canvasToTempFilePathSync({
+  fileType: "jpg",
+  // 如果返回的是base64是无法使用 saveImageToPhotosAlbum，需要设置 pathType为url
+  pathType: 'url',
+  quality: 1,
+  success: (res) => {
+    console.log(res.tempFilePath);
+	// 非H5 保存到相册
+	uni.saveImageToPhotosAlbum({
+		filePath: res.tempFilePath,
+		success: function () {
+			console.log('save success');
+		}
+	});
+  },
+});
+```
+
+
+### H5跨域
+- 一般是需要后端或管理OSS资源的大佬处理
+- 一般OSS的处理方式:
+
+1、设置来源
+```cmd
+*
+```
+
+2、允许Methods
+```html
+GET
+```
+
+3、允许Headers
+```html
+access-control-allow-origin:*
+```
+
+4、最后如果还是不行,可试下给插件设置`useCORS`
+```html
+<l-painter useCORS>
+```
+
+
+
+### 海报示例
+
+- 提供一份示例，只把插件当成生成图片的工具，非必要不要在弹窗里使用。
+- 通过设置`isCanvasToTempFilePath`主动生成图片，再由 `@success` 事件接收海报临时路径
+- 设置`hidden`隐藏画板。
+请注意，示例用到了图片，海报的渲染是包括下载图片的时间，也许在某天图片会失效或访问超级慢，请更换为你的图片再查看，另外如果你是小程序请在使用示例时把**不校验合法域名**勾上！！！！！不然不显示还以为是插件的锅，求求了大佬们！
+#### 方式一 Template
+
+```html
+<image :src="path" mode="widthFix"></image>
+<l-painter
+  isCanvasToTempFilePath
+  @success="path = $event"
+  hidden
+  css="width: 750rpx; padding-bottom: 40rpx; background: linear-gradient(,#ff971b 0%, #ff5000 100%)"
+>
+  <l-painter-image
+    src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+    css="margin-left: 40rpx; margin-top: 40rpx; width: 84rpx;  height: 84rpx; border-radius: 50%;"
+  />
+  <l-painter-view
+    css="margin-top: 40rpx; padding-left: 20rpx; display: inline-block"
+  >
+    <l-painter-text
+      text="隔壁老王"
+      css="display: block; padding-bottom: 10rpx; color: #fff; font-size: 32rpx; fontWeight: bold"
+    />
+    <l-painter-text
+      text="为您挑选了一个好物"
+      css="color: rgba(255,255,255,.7); font-size: 24rpx"
+    />
+  </l-painter-view>
+  <l-painter-view
+    css="margin-left: 40rpx; margin-top: 30rpx; padding: 32rpx; box-sizing: border-box; background: #fff; border-radius: 16rpx; width: 670rpx; box-shadow: 0 20rpx 58rpx rgba(0,0,0,.15)"
+  >
+    <l-painter-image
+      src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+      css="object-fit: cover; object-position: 50% 50%; width: 606rpx; height: 606rpx; border-radius: 12rpx;"
+    />
+    <l-painter-view
+      css="margin-top: 32rpx; color: #FF0000; font-weight: bold; font-size: 28rpx; line-height: 1em;"
+    >
+      <l-painter-text text="￥" css="vertical-align: bottom" />
+      <l-painter-text
+        text="39"
+        css="vertical-align: bottom; font-size: 58rpx"
+      />
+      <l-painter-text text=".39" css="vertical-align: bottom" />
+      <l-painter-text
+        text="￥59.99"
+        css="vertical-align: bottom; padding-left: 10rpx; font-weight: normal; text-decoration: line-through; color: #999999"
+      />
+    </l-painter-view>
+    <l-painter-view css="margin-top: 32rpx; font-size: 26rpx; color: #8c5400">
+      <l-painter-text text="自营" css="color: #212121; background: #ffb400;" />
+      <l-painter-text
+        text="30天最低价"
+        css="margin-left: 16rpx; background: #fff4d9; text-decoration: line-through;"
+      />
+      <l-painter-text
+        text="满减优惠"
+        css="margin-left: 16rpx; background: #fff4d9"
+      />
+      <l-painter-text
+        text="超高好评"
+        css="margin-left: 16rpx; background: #fff4d9"
+      />
+    </l-painter-view>
+    <l-painter-view css="margin-top: 30rpx">
+      <l-painter-text
+        css="line-clamp: 2; color: #333333; line-height: 1.8em; font-size: 36rpx; width: 478rpx; padding-right:32rpx; box-sizing: border-box"
+        text="360儿童电话手表9X 智能语音问答定位支付手表 4G全网通20米游泳级防水视频通话拍照手表男女孩星空蓝"
+      ></l-painter-text>
+      <l-painter-qrcode
+        css="width: 128rpx; height: 128rpx;"
+        text="limeui.qcoon.cn"
+      ></l-painter-qrcode>
+    </l-painter-view>
+  </l-painter-view>
+</l-painter>
+```
+
+```js
+data() {
+	return {
+		path: ''
+	}
+}
+```
+
+#### 方式二 JSON
+
+```html
+<image :src="path" mode="widthFix"></image>
+<l-painter
+  :board="poster"
+  isCanvasToTempFilePath
+  @success="path = $event"
+  hidden
+/>
+```
+
+```js
+data() {
+	return {
+		path: '',
+		poster: {
+		    css: {
+		        width: "750rpx",
+		        paddingBottom: "40rpx",
+		        background: "linear-gradient(,#000 0%, #ff5000 100%)"
+		    },
+		    views: [
+		        {
+		            src: "https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg",
+		            type: "image",
+		            css: {
+		                background: "#fff",
+		                objectFit: "cover",
+		                marginLeft: "40rpx",
+		                marginTop: "40rpx",
+		                width: "84rpx",
+		                border: "2rpx solid #fff",
+		                boxSizing: "border-box",
+		                height: "84rpx",
+		                borderRadius: "50%"
+		            }
+		        },
+		        {
+		            type: "view",
+		            css: {
+		                marginTop: "40rpx",
+		                paddingLeft: "20rpx",
+		                display: "inline-block"
+		            },
+		            views: [
+		                {
+		                    text: "隔壁老王",
+		                    type: "text",
+		                    css: {
+		                        display: "block",
+		                        paddingBottom: "10rpx",
+		                        color: "#fff",
+		                        fontSize: "32rpx",
+		                        fontWeight: "bold"
+		                    }
+		                },
+		                {
+		                    text: "为您挑选了一个好物",
+		                    type: "text",
+		                    css: {
+		                        color: "rgba(255,255,255,.7)",
+		                        fontSize: "24rpx"
+		                    },
+		                }
+		            ],
+		        },
+		        {
+		            css: {
+		                marginLeft: "40rpx",
+		                marginTop: "30rpx",
+		                padding: "32rpx",
+		                boxSizing: "border-box",
+		                background: "#fff",
+		                borderRadius: "16rpx",
+		                width: "670rpx",
+		                boxShadow: "0 20rpx 58rpx rgba(0,0,0,.15)"
+		            },
+		            views: [
+		                {
+							src: "https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg",
+							type: "image",
+		                    css: {
+		                        objectFit: "cover",
+		                        objectPosition: "50% 50%",
+		                        width: "606rpx",
+		                        height: "606rpx"
+		                    },
+		                }, {
+		                    css: {
+		                        marginTop: "32rpx",
+		                        color: "#FF0000",
+		                        fontWeight: "bold",
+		                        fontSize: "28rpx",
+		                        lineHeight: "1em"
+		                    },
+		                    views: [{
+								text: "￥",
+								type: "text",
+		                        css: {
+		                            verticalAlign: "bottom"
+		                        },
+		                    }, {
+								text: "39",
+								type: "text",
+		                        css: {
+		                            verticalAlign: "bottom",
+		                            fontSize: "58rpx"
+		                        },
+		                    }, {
+								text: ".39",
+								type: "text",
+		                        css: {
+		                            verticalAlign: "bottom"
+		                        },
+		                    }, {
+								text: "￥59.99",
+								type: "text",
+		                        css: {
+		                            verticalAlign: "bottom",
+		                            paddingLeft: "10rpx",
+		                            fontWeight: "normal",
+		                            textDecoration: "line-through",
+		                            color: "#999999"
+		                        }
+		                    }],
+
+		                    type: "view"
+		                }, {
+		                    css: {
+		                        marginTop: "32rpx",
+		                        fontSize: "26rpx",
+		                        color: "#8c5400"
+		                    },
+		                    views: [{
+								text: "自营",
+								type: "text",
+		                        css: {
+		                            color: "#212121",
+		                            background: "#ffb400"
+		                        },
+		                    }, {
+								text: "30天最低价",
+								type: "text",
+		                        css: {
+		                            marginLeft: "16rpx",
+		                            background: "#fff4d9",
+		                            textDecoration: "line-through"
+		                        },
+		                    }, {
+								text: "满减优惠",
+								type: "text",
+		                        css: {
+		                            marginLeft: "16rpx",
+		                            background: "#fff4d9"
+		                        },
+		                    }, {
+								text: "超高好评",
+								type: "text",
+		                        css: {
+		                            marginLeft: "16rpx",
+		                            background: "#fff4d9"
+		                        },
+
+		                    }],
+
+		                    type: "view"
+		                }, {
+		                    css: {
+		                        marginTop: "30rpx"
+		                    },
+		                    views: [
+								{
+									text: "360儿童电话手表9X 智能语音问答定位支付手表 4G全网通20米游泳级防水视频通话拍照手表男女孩星空蓝",
+									type: "text",
+									css: {
+										paddingRight: "32rpx",
+										boxSizing: "border-box",
+										lineClamp: 2,
+										color: "#333333",
+										lineHeight: "1.8em",
+										fontSize: "36rpx",
+										width: "478rpx"
+		                        },
+		                    }, {
+								text: "limeui.qcoon.cn",
+								type: "qrcode",
+		                        css: {
+		                            width: "128rpx",
+		                            height: "128rpx",
+		                        },
+
+		                    }],
+		                    type: "view"
+		                }],
+		            type: "view"
+		        }
+		    ]
+		}
+	}
+}
+```
+
+
+### 自定义字体
+- 需要平台的支持，已知微信小程序支持，其它的没试过，如果可行请告之
+
+```
+// 需要在app.vue中下载字体
+uni.loadFontFace({
+	global:true,
+	scopes: ['native'],
+	family: '自定义字体名称',
+	source: 'url("https://sungd.github.io/Pacifico.ttf")',
+  
+	success() {
+	  console.log('success')
+  }
+})
+
+
+// 然后就可以在插件的css中写font-family: '自定义字体名称'
+```
+
+
+### Nvue
+- 必须为HBX 3.4.11及以上
+
+
+### 原生小程序
+
+- 插件里的`painter.js`支持在原生小程序中使用
+- new Painter 之后在`source`里传入 JSON
+- 再调用`render`绘制海报
+- 如需生成图片，请查看微信小程序 cavnas 的[canvasToTempFilePath](https://developers.weixin.qq.com/miniprogram/dev/api/canvas/wx.canvasToTempFilePath.html)
+
+```html
+<canvas type="2d" id="painter" style="width: 100%"></canvas>
+```
+
+```js
+import { Painter } from "./painter";
+page({
+  data: {
+    poster: {
+      css: {
+        width: "750rpx",
+      },
+      views: [
+        {
+          type: "view",
+          css: {
+            background: "#d2d4c8",
+            paddingTop: "100rpx",
+          },
+          views: [
+            {
+              type: "view",
+              css: {
+                background: "#5f7470",
+                width: "33.33%",
+                height: "100rpx",
+                display: "inline-block",
+              },
+            },
+            {
+              type: "view",
+              css: {
+                background: "#889696",
+                width: "33.33%",
+                height: "100rpx",
+                display: "inline-block",
+              },
+            },
+            {
+              type: "view",
+              css: {
+                background: "#b8bdb5",
+                width: "33.33%",
+                height: "100rpx",
+                display: "inline-block",
+              },
+            },
+          ],
+        },
+      ],
+    },
+  },
+  async onLoad() {
+    const res = await this.getCentext();
+    const painter = new Painter(res);
+    // 返回计算布局后的整个内容尺寸
+    const { width, height } = await painter.source(this.data.poster);
+    // 得到计算后的尺寸后 可给canvas尺寸赋值，达到动态响应效果
+    // 渲染
+    await painter.render();
+  },
+  // 获取canvas 2d
+  // 非2d 需要传一个 createImage 方法用于获取图片信息 即把 getImageInfo 的 success 通过 promise resolve 返回
+  getCentext() {
+    return new Promise((resolve) => {
+      wx.createSelectorQuery()
+        .select(`#painter`)
+        .node()
+        .exec((res) => {
+          let { node: canvas } = res[0];
+          resolve({
+            canvas,
+            context: canvas.getContext("2d"),
+            width: canvas.width,
+            height: canvas.height,
+			// createImage: getImageInfo()
+            pixelRatio: 2,
+          });
+        });
+    });
+  },
+});
+```
+
+### 旧版(1.6.x)更新
+
+- 由于 1.8.x 版放弃了以定位的方式，所以 1.6.x 版更新之后要每个样式都加上`position: absolute`
+- 旧版的 `image` mode 模式被放弃，使用`object-fit`
+- 旧版的 `isRenderImage` 改成 `is-canvas-to-temp-file-path`
+- 旧版的 `maxLines` 改成 `line-clamp`
+
+## API
+
+### Props
+
+| 参数                       | 说明                                                         | 类型             | 默认值       |
+| -------------------------- | ------------------------------------------------------------ | ---------------- | ------------ |
+| board                      | JSON 方式的海报元素对象集                                    | <em>object</em>  | -            |
+| css                        | 海报内容最外层的样式，可以理解为`body`                           | <em>object</em>  | 参数请向下看 |
+| custom-style               | canvas 元素的样式                                            | <em>string</em>  |              |
+| hidden               		 | 隐藏画板                                                    | <em>boolean</em>  |   `false`    |
+| is-canvas-to-temp-file-path | 是否生成图片，在`@success`事件接收图片地址                   | <em>boolean</em> | `false`      |
+| after-delay                | 生成图片错乱，可延时生成图片                                 | <em>number</em>  | `100`        |
+| type                       | canvas 类型，对微信头条支付宝小程序可有效,可选值：`2d`，`''` | <em>string</em>  | `2d`         |
+| file-type                  | 生成图片的后缀类型, 可选值：`png`、`jpg`                     | <em>string</em>  | `png`        |
+| path-type                  | 生成图片路径类型，可选值`url`、`base64`                      | <em>string</em>  | `-`          |
+| pixel-ratio                | 生成图片的像素密度，默认为对应手机的像素密度，`nvue`无效     | <em>number</em>  | `-`          |
+| hidpi                | H5和APP是否使用高清处理     | <em>boolean</em>  | `true`          |
+| width                      | **废弃** 画板的宽度，一般只用于通过内部方法时加上            | <em>number</em>  | ``           |
+| height                     | **废弃** 画板的高度 ，同上                                   | <em>number</em>  | ``           |
+
+### css
+| 属性名                                                                              | 支持的值或类型                                                                                                                                                                       | 默认值   |
+| ----------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------- |
+| (min\max)width                                                                      | 支持`%`、`rpx`、`px`                                                                                                                                                                 | -        |
+| height                                                                              | 同上                                                                                                                                                                                 | -        |
+| color                                                                               | `string`                                                                                                                                                                             | -        |
+| position                                                                            | 定位，可选值：`absolute`、`fixed`                                                                                                                                                    | -        |
+| ↳ left、top、right、bottom                                                          | 配合`position`才生效，支持`%`、`rpx`、`px`                                                                                                                                           | -        |
+| margin                                                                              | 可简写或各方向分别写，如：`margin-top`，支持`auto`、`rpx`、`px`                                                                                                                      | -        |
+| padding                                                                             | 可简写或各方向分别写，支持`rpx`、`px`                                                                                                                                                | -        |
+| border                                                                              | 可简写或各个值分开写：`border-width`、`border-style` 、`border-color`，简写请按顺序写                                                                                                | -        |
+| line-clamp                                                                          | `number`，超过行数显示省略号                                                                                                                                                         | -        |
+| vertical-align                                                                      | 文字垂直对齐，可选值：`bottom`、`top`、`middle`                                                                                                                                      | `middle` |
+| line-height                                                                         | 文字行高，支持`rpx`、`px`、`em`                                                                                                                                                      | `1.4em`  |
+| font-weight                                                                         | 文字粗细，可选值：`normal`、`bold`                                                                                                                                                   | `normal` |
+| font-size                                                                           | 文字大小，`string`，支持`rpx`、`px`                                                                                                                                                  | `14px`   |
+| text-decoration                                                                     | 文本修饰，可选值：`underline` 、`line-through`、`overline`                                                                                                                           | -        |
+| text-stroke                                                                         | 文字描边，可简写或各个值分开写，如：`text-stroke-color`, `text-stroke-width`                                                                                                              | -        |
+| text-align                                                                          | 文本水平对齐，可选值：`right` 、`center`                                                                                                                                             | `left`   |
+| display                                                                             | 框类型，可选值：`block`、`inline-block`、`flex`、`none`，当为`none`时是不渲染该段, `flex`功能简陋。                                                                                                            | -        |
+| flex                                                                                | 配合 display: flex; 属性定义了在分配多余空间,目前只用为数值如： flex: 1                                                                                                           | -        |
+| align-self                                                                          | 配合 display: flex; 单个项目垂直轴对齐方式: `flex-start` `flex-end` `center`                                                                                                         | `flex-start`        |
+| justify-content                                                                     | 配合 display: flex; 水平轴对齐方式: `flex-start` `flex-end` `center`                                                                                                         | `flex-start`        |
+| align-items                                                                         | 配合 display: flex; 垂直轴对齐方式: `flex-start` `flex-end` `center`                                                                                                  | `flex-start`        |
+| border-radius                                                                       | 圆角边框，支持`%`、`rpx`、`px`                                                                                                                                                       | -        |
+| box-sizing                                                                          | 可选值：`border-box`                                                                                                                                                                 | -        |
+| box-shadow                                                                          | 投影                                                                                                                                                                                 | -        |
+| background(color)                                                                   | 支持渐变，但必须写百分比！如:`linear-gradient(,#ff971b 0%, #ff5000 100%)`、`radial-gradient(#0ff 15%, #f0f 60%)`,目前 radial-gradient 渐变的圆心为元素中点，半径为最长边，不支持设置 | -        |
+| background-clip                                                                	  | 文字渐变，配合`background`背景渐变，设置`background-clip: text` 达到文字渐变效果 | -        |
+| background-image                                                                    | view 元素背景：`url(src)`,若只是设置背景图，请不要设置`background-repeat`                                                                                                                                                           | -        |
+| background-repeat                                                                   | 设置是否及如何重复背景纹理，可选值：`repeat`、`repeat-x`、`repeat-y`、`no-repeat`                                                                                                    | `repeat` |
+| [object-fit](https://developer.mozilla.org/zh-CN/docs/Web/CSS/object-fit/)          | 图片元素适应容器方式,类似于`mode`,可选值：`cover`、 `contain`、 `fill`、 `none`                                                                                                      | -        |
+| [object-position](https://developer.mozilla.org/zh-CN/docs/Web/CSS/object-position) | 图片的对齐方式，配合`object-fit`使用                                                                                                                                                 | -        |
+
+### 图片填充模式 object-fit
+
+| 名称    | 含义                                                   |
+| ------- | ------------------------------------------------------ |
+| contain | 保持宽高缩放图片，使图片的长边能完全显示出来           |
+| cover   | 保持宽高缩放图片，使图片的短边能完全显示出来，裁剪长边 |
+| fill    | 拉伸图片，使图片填满元素                               |
+| none    | 保持图片原有尺寸                                       |
+
+### 事件 Events
+
+| 事件名   | 说明                                                             | 返回值 |
+| -------- | ---------------------------------------------------------------- | ------ |
+| success  | 生成图片成功,若使用`is-canvas-to-temp-filePath` 可以接收图片地址 | path   |
+| fail     | 生成图片失败                                                     | error  |
+| done     | 绘制成功                                                         |        |
+| progress | 绘制进度                                                         | number |
+
+### 暴露函数 Expose
+| 事件名   | 说明                                                             | 返回值 |
+| -------- | ---------------------------------------------------------------- | ------ |
+| render(object)   |  渲染器，传入JSON 绘制海报 | promise   |
+| [canvasToTempFilePath](https://uniapp.dcloud.io/api/canvas/canvasToTempFilePath.html#canvastotempfilepath)(object)   | 把当前画布指定区域的内容导出生成指定大小的图片，并返回文件临时路径。    |   |
+| canvasToTempFilePathSync(object)    | 同步接口，同上                                                         |        |
+
+
+## 常见问题
+
+- 1、H5 端使用网络图片需要解决跨域问题。
+- 2、小程序使用网络图片需要去公众平台增加下载白名单！二级域名也需要配！
+- 3、H5 端生成图片是 base64，有时显示只有一半可以使用原生标签`<IMG/>`
+- 4、发生保存图片倾斜变形或提示 native buffer exceed size limit 时，使用 pixel-ratio="2"参数，降分辨率。
+- 5、h5 保存图片不需要调接口，提示用户长按图片保存。
+- 6、画板不能隐藏，包括`v-if`，`v-show`、`display:none`、`opacity:0`，另外也不要把画板放在弹窗里。如果需要隐藏画板请设置 `custom-style="position: fixed; left: 200%"`
+- 7、微信小程序真机调试请使用 **真机调试2.0**，不支持1.0。
+- 8、微信小程序打开调试时可以生但并闭无法生成时，这种情况一般是没有在公众号配置download域名
+- 9、HBX 3.4.5之前的版本不支持vue3
+- 10、在微信开发工具上 canvas 层级最高无法zindex，并不影响真机
+- 11、请不要导入非uni_modules插件
+- 12、关于QQ小程序 报 Propertyor method"toJSON"is not defined 请把基础库调到 1.50.3
+- 13、支付宝小程序 IDE 不支持 生成图片 请以真机调试结果为准
+- 14、返回值为字符串 `data:,` 大概是尺寸超过限制，设置 pixel-ratio="2"
+- 华为手机 APP 上无法生成图片，请使用 HBX2.9.11++（已过时，忽略这条）
+- IOS APP 请勿使用 HBX2.9.3.20201014 的版本！这个版本无法生成图片。（已过时，忽略这条）
+- 苹果微信 7.0.20 存在闪退和图片无法 onload 为微信 bug（已过时，忽略这条）
+- 微信小程序 IOS 旧接口 如父级设置圆角，子级也设会导致子级的失效，为旧接口BUG。
+- 微信小程序 安卓 旧接口 如使用图片必须加背景色，为旧接口BUG。
+- 微信小程序 安卓端 [图片可能在首次可以加载成功，再次加载会不触发任何事件](https://developers.weixin.qq.com/community/develop/doc/000ee2b8dacf4009337f51f4556800?highLine=canvas%25202d%2520createImage)，临时解决方法是给图片加个时间戳
+## 打赏
+
+如果你觉得本插件，解决了你的问题，赠人玫瑰，手留余香。
+
+![](https://testingcf.jsdelivr.net/gh/liangei/image@1.9/alipay.png)
+![](https://testingcf.jsdelivr.net/gh/liangei/image@1.9/wpay.png)
\ No newline at end of file
diff --git a/uni_modules/lime-qrcode/changelog.md b/uni_modules/lime-qrcode/changelog.md
new file mode 100644
index 0000000..dff7a12
--- /dev/null
+++ b/uni_modules/lime-qrcode/changelog.md
@@ -0,0 +1,49 @@
+## 0.2.4（2025-09-22）
+- fix: uniappx ios报错
+## 0.2.3（2025-06-13）
+- fix: 修复uniapp x 安卓问题
+## 0.2.2（2025-06-13）
+- fix: 修复uniapp x ios问题
+## 0.2.1（2025-05-24）
+- feat: 支持uniapp x 鸿蒙next
+## 0.2.0（2025-02-09）
+- chore: 更新文档
+## 0.1.9（2024-11-24）
+- feat: 支持uniapp x 微信小程序
+## 0.1.8（2024-08-05）
+- fix: 修复因shared升级导致微信小程序可能不生效的问题
+## 0.1.7（2024-05-15）
+- fix: 修复uvue因缺少依赖无法使用
+## 0.1.6（2024-05-09）
+- fix: 修复vue2因type问题导致无法使用
+## 0.1.5（2024-04-14）
+- fix: 修复缺少依赖
+## 0.1.4（2024-04-10）
+- chore: 更新文档
+## 0.1.3（2024-04-01）
+- chore: 兼容uniapp x ios(app-js)
+## 0.1.2（2023-12-14）
+- fix: uvue 引入 API 自定义包出错
+## 0.1.1（2023-12-11）
+- chore: uvue的二维码API独立，需要单独下载
+## 0.1.0（2023-12-07）
+- fix: 修复因utssdk目录导致无法运行
+## 0.0.9（2023-12-06）
+- feat: 支持uvue
+## 0.0.8（2023-12-06）
+- feat: 支持uvue
+## 0.0.7（2023-12-06）
+- feat: 支持uvue
+## 0.0.6（2023-12-06）
+- feat: 支持uvue
+## 0.0.5（2023-07-30）
+- fix: 修复再次生成前没有清空，导致图形叠加
+## 0.0.4（2023-07-27）
+- fix: 修复相同尺寸无法再次生成
+## 0.0.3（2023-06-09）
+- feat: 支持通过`@vue/composition-api`在`vue2`上使用
+- chore: 更新文档
+## 0.0.2（2023-06-08）
+- chore: 更新文档
+## 0.0.1（2023-06-08）
+- 首次
diff --git a/uni_modules/lime-qrcode/components/l-qrcode/ios/index.uts b/uni_modules/lime-qrcode/components/l-qrcode/ios/index.uts
new file mode 100644
index 0000000..8233047
--- /dev/null
+++ b/uni_modules/lime-qrcode/components/l-qrcode/ios/index.uts
@@ -0,0 +1,180 @@
+// export * from '../qrcode'
+import { qrcodegen } from './qrcodegen'
+
+// export * from '@/uni_modules/lime-qrcodegen/utssdk/interface';
+// import { type QRCodePropsTypes , type ImageSettings, type QRCodeCallback } from '@/uni_modules/lime-qrcodegen/utssdk/interface'
+export type QRCodePropsTypes = {
+	value?: string
+	size?: number
+	fgColor?: string
+	level?: string
+	marginSize: number
+	includeMargin: boolean
+	imageSettings?: ImageSettings
+}
+export type ImageSettings = {
+	width: number
+	height: number
+	x?: number
+	y?: number
+	src?: string
+	excavate: boolean
+}
+export type QRCodeCallback = (cells : boolean[][]) => void
+
+
+const Ecc = qrcodegen.QrCode.Ecc
+const QrCode = qrcodegen.QrCode
+type Modules = boolean[][];
+type Excavation = { x : number; y : number; w : number; h : number };
+type ImageSettingExcavation = {
+	x: number 
+	y: number 
+	h: number 
+	w: number 
+	excavation: Excavation
+}
+const ERROR_LEVEL_MAP = {
+	L: Ecc.LOW,
+	M: Ecc.MEDIUM,
+	Q: Ecc.QUARTILE,
+	H: Ecc.HIGH,
+};
+
+const DEFAULT_SIZE:number = 128;
+const DEFAULT_LEVEL:string = 'L';
+// const DEFAULT_BGCOLOR:string = '#FFFFFF';
+const DEFAULT_FGCOLOR:string = '#000000';
+const DEFAULT_INCLUDEMARGIN:boolean = false;
+
+const SPEC_MARGIN_SIZE : number = 4;
+const DEFAULT_MARGIN_SIZE : number = 0;
+
+// This is *very* rough estimate of max amount of QRCode allowed to be covered.
+// It is "wrong" in a lot of ways (area is a terrible way to estimate, it
+// really should be number of modules covered), but if for some reason we don't
+// get an explicit height or width, I'd rather default to something than throw.
+const DEFAULT_IMG_SCALE = 0.1;
+
+// We could just do this in generatePath, except that we want to support
+// non-Path2D canvas, so we need to keep it an explicit step.
+function excavateModules(modules : Modules, excavation : Excavation) : Modules {
+	const ox = excavation.x
+	const oy = excavation.y
+	const oh = excavation.h
+	const ow = excavation.w
+	return modules.slice().map((row, y):boolean[] => {
+		if (y < oy || y >= oy + oh) {
+			return row;
+		}
+		return row.map((cell, x):boolean => {
+			if (x < ox || x >= ox + ow) {
+				return cell;
+			}
+			return false;
+		});
+	});
+}
+
+function getImageSettings(
+	cells : Modules,
+	size : number,
+	margin : number,
+	imageSettings: ImageSettings | null
+) : ImageSettingExcavation | null {
+	if (imageSettings == null) {
+		return null;
+	}
+	// const result : UTSJSONObject = {}
+	const numCells = cells.length + margin * 2;
+	const defaultSize = Math.floor(size * DEFAULT_IMG_SCALE);
+	const scale = numCells / size;
+	
+	const width = imageSettings.width
+	const height = imageSettings.height 
+	const ox = imageSettings.x
+	const oy = imageSettings.y
+	const excavate = imageSettings.excavate
+	
+	const w = (width > 0 ? width : defaultSize) * scale;
+	const h = (height > 0 ? height: defaultSize) * scale;
+	const x = ox == null ? cells.length / 2 - w / 2 : ox * scale;
+	const y = oy == null ? cells.length / 2 - h / 2 : oy * scale;
+
+	let excavation: Excavation = {
+		x: 0,
+		y: 0,
+		w: 0,
+		h: 0,
+	};
+	if (excavate) {
+		let floorX = Math.floor(x);
+		let floorY = Math.floor(y);
+		let ceilW = Math.ceil(w + x - floorX);
+		let ceilH = Math.ceil(h + y - floorY);
+		// excavation = { x: floorX, y: floorY, w: ceilW, h: ceilH };
+		excavation.x = floorX
+		excavation.y = floorY
+		excavation.w = ceilW
+		excavation.h = ceilH
+	}
+
+	return { x, y, h, w, excavation } as ImageSettingExcavation;
+}
+function getMarginSize(includeMargin : boolean, marginSize: number|null) : number {
+	if (marginSize != null) {
+		return Math.floor(marginSize);
+	}
+	return includeMargin ? SPEC_MARGIN_SIZE : DEFAULT_MARGIN_SIZE;
+}
+export class QRCodeCanvas {
+	ctx : DrawableContext
+	constructor(ctx : DrawableContext) {
+		this.ctx = ctx
+	}
+	render(props : QRCodePropsTypes, cb : QRCodeCallback | null=null) {
+		const ctx = this.ctx
+		const value = props.value
+		const size = props.size ?? DEFAULT_SIZE 
+		const level = props.level ?? DEFAULT_LEVEL 
+		const fgColor = props.fgColor ?? DEFAULT_FGCOLOR
+		const includeMargin = props.includeMargin || DEFAULT_INCLUDEMARGIN 
+		const marginSize = props.marginSize
+		const imageSettings = props.imageSettings
+		if (value == null || value == '') {
+			return;
+		}
+		let cells = QrCode.encodeText(value, ERROR_LEVEL_MAP[level] as Ecc).getModules();
+		const margin = getMarginSize(includeMargin, marginSize);
+		const numCells = cells.length + margin * 2;
+		const scale = (size / numCells);
+		const calculatedImageSettings = getImageSettings(
+			cells,
+			size,
+			margin,
+			imageSettings
+		)
+		const haveImageToRender = calculatedImageSettings != null 
+		const excavation: Excavation | null = haveImageToRender ? calculatedImageSettings?.excavation : null
+		
+		if(haveImageToRender && excavation != null) {
+			cells = excavateModules(cells, excavation);
+		}
+		ctx.reset()
+		// ctx.clearRect(0, 0, size, size)
+		// ctx.fillStyle = bgColor;
+		// ctx.fillRect(0, 0, numCells, numCells);
+		ctx.fillStyle = fgColor;
+		cells.forEach(function (row, rdx) {
+			row.forEach(function (cell, cdx) {
+				if (cell) {
+					ctx.fillRect((cdx + margin) * scale, (rdx + margin) * scale, scale, scale);
+				}
+			});
+		});
+		ctx.update()
+		if(cb != null){
+			cb(cells)
+		}
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/lime-qrcode/components/l-qrcode/ios/qrcodegen.js b/uni_modules/lime-qrcode/components/l-qrcode/ios/qrcodegen.js
new file mode 100644
index 0000000..b7602c0
--- /dev/null
+++ b/uni_modules/lime-qrcode/components/l-qrcode/ios/qrcodegen.js
@@ -0,0 +1,5 @@
+function e(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function t(e,t){for(var r=0;t.length>r;r++){var n=t[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}function r(e,r,n){return r&&t(e.prototype,r),n&&t(e,n),Object.defineProperty(e,"prototype",{writable:!1}),e}function n(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,n=Array(t);t>r;r++)n[r]=e[r];return n}function i(e,t){var r="undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(!r){if(Array.isArray(e)||(r=function(e,t){if(e){if("string"==typeof e)return n(e,t);var r=Object.prototype.toString.call(e).slice(8,-1);return"Object"===r&&e.constructor&&(r=e.constructor.name),"Map"===r||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?n(e,t):void 0}}(e))||t&&e&&"number"==typeof e.length){r&&(e=r);var i=0,o=function(){};return{s:o,n:function(){return e.length>i?{done:!1,value:e[i++]}:{done:!0}},e:function(e){throw e},f:o}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var a,s=!0,u=!1;return{s:function(){r=r.call(e)},n:function(){var e=r.next();return s=e.done,e},e:function(e){u=!0,a=e},f:function(){try{s||null==r.return||r.return()}finally{if(u)throw a}}}}
+/**
+
+ */
+var o;!function(t){var n=function(){function n(t,r,i,o){if(e(this,n),this.version=void 0,this.errorCorrectionLevel=void 0,this.size=void 0,this.mask=void 0,this.modules=[],this.isFunction=[],this.version=t,this.errorCorrectionLevel=r,n.MIN_VERSION>t||t>n.MAX_VERSION)throw new RangeError("Version value out of range");if(-1>o||o>7)throw new RangeError("Mask value out of range");this.size=4*t+17;for(var a=[],u=0;this.size>u;u++)a.push(!1);for(var h=0;this.size>h;h++)this.modules.push(a.slice()),this.isFunction.push(a.slice());this.drawFunctionPatterns();var l=this.addEccAndInterleave(i);if(this.drawCodewords(l),-1==o)for(var f=1e9,c=0;8>c;c++){this.applyMask(c),this.drawFormatBits(c);var d=this.getPenaltyScore();f>d&&(o=c,f=d),this.applyMask(c)}s(o>=0&&7>=o),this.mask=o,this.applyMask(o),this.drawFormatBits(o),this.isFunction=[]}return r(n,[{key:"getModule",value:function(e,t){return e>=0&&this.size>e&&t>=0&&this.size>t&&this.modules[t][e]}},{key:"getModules",value:function(){return this.modules}},{key:"drawFunctionPatterns",value:function(){for(var e=0;this.size>e;e++)this.setFunctionModule(6,e,e%2==0),this.setFunctionModule(e,6,e%2==0);this.drawFinderPattern(3,3),this.drawFinderPattern(this.size-4,3),this.drawFinderPattern(3,this.size-4);for(var t=this.getAlignmentPatternPositions(),r=t.length,n=0;r>n;n++)for(var i=0;r>i;i++)0==n&&0==i||0==n&&i==r-1||n==r-1&&0==i||this.drawAlignmentPattern(t[n],t[i]);this.drawFormatBits(0),this.drawVersion()}},{key:"drawFormatBits",value:function(e){for(var t=this.errorCorrectionLevel.formatBits<<3|e,r=t,n=0;10>n;n++)r=r<<1^1335*(r>>>9);var i=21522^(t<<10|r);s(i>>>15==0);for(var o=0;5>=o;o++)this.setFunctionModule(8,o,a(i,o));this.setFunctionModule(8,7,a(i,6)),this.setFunctionModule(8,8,a(i,7)),this.setFunctionModule(7,8,a(i,8));for(var u=9;15>u;u++)this.setFunctionModule(14-u,8,a(i,u));for(var h=0;8>h;h++)this.setFunctionModule(this.size-1-h,8,a(i,h));for(var l=8;15>l;l++)this.setFunctionModule(8,this.size-15+l,a(i,l));this.setFunctionModule(8,this.size-8,!0)}},{key:"drawVersion",value:function(){if(this.version>=7){for(var e=this.version,t=0;12>t;t++)e=e<<1^7973*(e>>>11);var r=this.version<<12|e;s(r>>>18==0);for(var n=0;18>n;n++){var i=a(r,n),o=this.size-11+n%3,u=Math.floor(n/3);this.setFunctionModule(o,u,i),this.setFunctionModule(u,o,i)}}}},{key:"drawFinderPattern",value:function(e,t){for(var r=-4;4>=r;r++)for(var n=-4;4>=n;n++){var i=Math.max(Math.abs(n),Math.abs(r)),o=e+n,a=t+r;o>=0&&this.size>o&&a>=0&&this.size>a&&this.setFunctionModule(o,a,2!=i&&4!=i)}}},{key:"drawAlignmentPattern",value:function(e,t){for(var r=-2;2>=r;r++)for(var n=-2;2>=n;n++)this.setFunctionModule(e+n,t+r,1!=Math.max(Math.abs(n),Math.abs(r)))}},{key:"setFunctionModule",value:function(e,t,r){this.modules[t][e]=r,this.isFunction[t][e]=!0}},{key:"addEccAndInterleave",value:function(e){var t=this.version,r=this.errorCorrectionLevel;if(e.length!=n.getNumDataCodewords(t,r))throw new RangeError("Invalid argument");for(var i=n.NUM_ERROR_CORRECTION_BLOCKS[r.ordinal][t],o=n.ECC_CODEWORDS_PER_BLOCK[r.ordinal][t],a=Math.floor(n.getNumRawDataModules(t)/8),u=i-a%i,h=Math.floor(a/i),l=[],f=n.reedSolomonComputeDivisor(o),c=0,d=0;i>c;c++){var v=e.slice(d,d+h-o+(u>c?0:1));d+=v.length;var m=n.reedSolomonComputeRemainder(v,f);u>c&&v.push(0),l.push(v.concat(m))}for(var g=[],y=function(e){l.forEach((function(t,r){e==h-o&&u>r||g.push(t[e])}))},E=0;l[0].length>E;E++)y(E);return s(g.length==a),g}},{key:"drawCodewords",value:function(e){if(e.length!=Math.floor(n.getNumRawDataModules(this.version)/8))throw new RangeError("Invalid argument");for(var t=0,r=this.size-1;r>=1;r-=2){6==r&&(r=5);for(var i=0;this.size>i;i++)for(var o=0;2>o;o++){var u=r-o,h=0==(r+1&2)?this.size-1-i:i;!this.isFunction[h][u]&&8*e.length>t&&(this.modules[h][u]=a(e[t>>>3],7-(7&t)),t++)}}s(t==8*e.length)}},{key:"applyMask",value:function(e){if(0>e||e>7)throw new RangeError("Mask value out of range");for(var t=0;this.size>t;t++)for(var r=0;this.size>r;r++){var n=void 0;switch(e){case 0:n=(r+t)%2==0;break;case 1:n=t%2==0;break;case 2:n=r%3==0;break;case 3:n=(r+t)%3==0;break;case 4:n=(Math.floor(r/3)+Math.floor(t/2))%2==0;break;case 5:n=r*t%2+r*t%3==0;break;case 6:n=(r*t%2+r*t%3)%2==0;break;case 7:n=((r+t)%2+r*t%3)%2==0;break;default:throw Error("Unreachable")}!this.isFunction[t][r]&&n&&(this.modules[t][r]=!this.modules[t][r])}}},{key:"getPenaltyScore",value:function(){for(var e=0,t=0;this.size>t;t++){for(var r=!1,o=0,a=[0,0,0,0,0,0,0],u=0;this.size>u;u++)this.modules[t][u]==r?5==++o?e+=n.PENALTY_N1:o>5&&e++:(this.finderPenaltyAddHistory(o,a),r||(e+=this.finderPenaltyCountPatterns(a)*n.PENALTY_N3),r=this.modules[t][u],o=1);e+=this.finderPenaltyTerminateAndCount(r,o,a)*n.PENALTY_N3}for(var h=0;this.size>h;h++){for(var l=!1,f=0,c=[0,0,0,0,0,0,0],d=0;this.size>d;d++)this.modules[d][h]==l?5==++f?e+=n.PENALTY_N1:f>5&&e++:(this.finderPenaltyAddHistory(f,c),l||(e+=this.finderPenaltyCountPatterns(c)*n.PENALTY_N3),l=this.modules[d][h],f=1);e+=this.finderPenaltyTerminateAndCount(l,f,c)*n.PENALTY_N3}for(var v=0;this.size-1>v;v++)for(var m=0;this.size-1>m;m++){var g=this.modules[v][m];g==this.modules[v][m+1]&&g==this.modules[v+1][m]&&g==this.modules[v+1][m+1]&&(e+=n.PENALTY_N2)}var y,E=0,C=i(this.modules);try{for(C.s();!(y=C.n()).done;){E=y.value.reduce((function(e,t){return e+(t?1:0)}),E)}}catch(e){C.e(e)}finally{C.f()}var M=this.size*this.size,w=Math.ceil(Math.abs(20*E-10*M)/M)-1;return s(w>=0&&9>=w),s((e+=w*n.PENALTY_N4)>=0&&2568888>=e),e}},{key:"getAlignmentPatternPositions",value:function(){if(1==this.version)return[];for(var e=Math.floor(this.version/7)+2,t=32==this.version?26:2*Math.ceil((4*this.version+4)/(2*e-2)),r=[6],n=this.size-7;e>r.length;n-=t)r.splice(1,0,n);return r}},{key:"finderPenaltyCountPatterns",value:function(e){var t=e[1];s(3*this.size>=t);var r=t>0&&e[2]==t&&e[3]==3*t&&e[4]==t&&e[5]==t;return(!r||4*t>e[0]||t>e[6]?0:1)+(!r||4*t>e[6]||t>e[0]?0:1)}},{key:"finderPenaltyTerminateAndCount",value:function(e,t,r){return e&&(this.finderPenaltyAddHistory(t,r),t=0),this.finderPenaltyAddHistory(t+=this.size,r),this.finderPenaltyCountPatterns(r)}},{key:"finderPenaltyAddHistory",value:function(e,t){0==t[0]&&(e+=this.size),t.pop(),t.unshift(e)}}],[{key:"encodeText",value:function(e,r){var i=t.QrSegment.makeSegments(e);return n.encodeSegments(i,r)}},{key:"encodeBinary",value:function(e,r){var i=t.QrSegment.makeBytes(e);return n.encodeSegments([i],r)}},{key:"encodeSegments",value:function(e,t){var r,a,h=arguments.length>2&&void 0!==arguments[2]?arguments[2]:1,l=arguments.length>3&&void 0!==arguments[3]?arguments[3]:40,f=arguments.length>4&&void 0!==arguments[4]?arguments[4]:-1,c=5>=arguments.length||void 0===arguments[5]||arguments[5];if(n.MIN_VERSION>h||h>l||l>n.MAX_VERSION||-1>f||f>7)throw new RangeError("Invalid value");for(r=h;;r++){var d=8*n.getNumDataCodewords(r,t),v=u.getTotalBits(e,r);if(d>=v){a=v;break}if(r>=l)throw new RangeError("Data too long")}for(var m=0,g=[n.Ecc.MEDIUM,n.Ecc.QUARTILE,n.Ecc.HIGH];g.length>m;m++){var y=g[m];c&&a<=8*n.getNumDataCodewords(r,y)&&(t=y)}var E,C=[],M=i(e);try{for(M.s();!(E=M.n()).done;){var w=E.value;o(w.mode.modeBits,4,C),o(w.numChars,w.mode.numCharCountBits(r),C);var R,A=i(w.getData());try{for(A.s();!(R=A.n()).done;){var N=R.value;C.push(N)}}catch(e){A.e(e)}finally{A.f()}}}catch(e){M.e(e)}finally{M.f()}s(C.length==a);var k=8*n.getNumDataCodewords(r,t);s(k>=C.length),o(0,Math.min(4,k-C.length),C),o(0,(8-C.length%8)%8,C),s(C.length%8==0);for(var p=236;k>C.length;p^=253)o(p,8,C);for(var P=[];C.length>8*P.length;)P.push(0);return C.forEach((function(e,t){return P[t>>>3]|=e<<7-(7&t)})),new n(r,t,P,f)}},{key:"getNumRawDataModules",value:function(e){if(n.MIN_VERSION>e||e>n.MAX_VERSION)throw new RangeError("Version number out of range");var t=(16*e+128)*e+64;if(e>=2){var r=Math.floor(e/7)+2;t-=(25*r-10)*r-55,7>e||(t-=36)}return s(t>=208&&29648>=t),t}},{key:"getNumDataCodewords",value:function(e,t){return Math.floor(n.getNumRawDataModules(e)/8)-n.ECC_CODEWORDS_PER_BLOCK[t.ordinal][e]*n.NUM_ERROR_CORRECTION_BLOCKS[t.ordinal][e]}},{key:"reedSolomonComputeDivisor",value:function(e){if(1>e||e>255)throw new RangeError("Degree out of range");for(var t=[],r=0;e-1>r;r++)t.push(0);t.push(1);for(var i=1,o=0;e>o;o++){for(var a=0;t.length>a;a++)t[a]=n.reedSolomonMultiply(t[a],i),t.length>a+1&&(t[a]^=t[a+1]);i=n.reedSolomonMultiply(i,2)}return t}},{key:"reedSolomonComputeRemainder",value:function(e,t){var r,o=t.map((function(e){return 0})),a=i(e);try{var s=function(){var e=r.value^o.shift();o.push(0),t.forEach((function(t,r){return o[r]^=n.reedSolomonMultiply(t,e)}))};for(a.s();!(r=a.n()).done;)s()}catch(e){a.e(e)}finally{a.f()}return o}},{key:"reedSolomonMultiply",value:function(e,t){if(e>>>8!=0||t>>>8!=0)throw new RangeError("Byte out of range");for(var r=0,n=7;n>=0;n--)r=r<<1^285*(r>>>7),r^=(t>>>n&1)*e;return s(r>>>8==0),r}}]),n}();function o(e,t,r){if(0>t||t>31||e>>>t!=0)throw new RangeError("Value out of range");for(var n=t-1;n>=0;n--)r.push(e>>>n&1)}function a(e,t){return 0!=(e>>>t&1)}function s(e){if(!e)throw Error("Assertion error")}n.MIN_VERSION=1,n.MAX_VERSION=40,n.PENALTY_N1=3,n.PENALTY_N2=3,n.PENALTY_N3=40,n.PENALTY_N4=10,n.ECC_CODEWORDS_PER_BLOCK=[[-1,7,10,15,20,26,18,20,24,30,18,20,24,26,30,22,24,28,30,28,28,28,28,30,30,26,28,30,30,30,30,30,30,30,30,30,30,30,30,30,30],[-1,10,16,26,18,24,16,18,22,22,26,30,22,22,24,24,28,28,26,26,26,26,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28],[-1,13,22,18,26,18,24,18,22,20,24,28,26,24,20,30,24,28,28,26,30,28,30,30,30,30,28,30,30,30,30,30,30,30,30,30,30,30,30,30,30],[-1,17,28,22,16,22,28,26,26,24,28,24,28,22,24,24,30,28,28,26,28,30,24,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30]],n.NUM_ERROR_CORRECTION_BLOCKS=[[-1,1,1,1,1,1,2,2,2,2,4,4,4,4,4,6,6,6,6,7,8,8,9,9,10,12,12,12,13,14,15,16,17,18,19,19,20,21,22,24,25],[-1,1,1,1,2,2,4,4,4,5,5,5,8,9,9,10,10,11,13,14,16,17,17,18,20,21,23,25,26,28,29,31,33,35,37,38,40,43,45,47,49],[-1,1,1,2,2,4,4,6,6,8,8,8,10,12,16,12,17,16,18,21,20,23,23,25,27,29,34,34,35,38,40,43,45,48,51,53,56,59,62,65,68],[-1,1,1,2,4,4,4,5,6,8,8,11,11,16,16,18,16,19,21,25,25,25,34,30,32,35,37,40,42,45,48,51,54,57,60,63,66,70,74,77,81]],t.QrCode=n;var u=function(){function t(r,n,i){if(e(this,t),this.mode=void 0,this.numChars=void 0,this.bitData=void 0,this.mode=r,this.numChars=n,this.bitData=i,0>n)throw new RangeError("Invalid argument");this.bitData=i.slice()}return r(t,[{key:"getData",value:function(){return this.bitData.slice()}}],[{key:"makeBytes",value:function(e){var r,n=[],a=i(e);try{for(a.s();!(r=a.n()).done;){o(r.value,8,n)}}catch(e){a.e(e)}finally{a.f()}return new t(t.Mode.BYTE,e.length,n)}},{key:"makeNumeric",value:function(e){if(!t.isNumeric(e))throw new RangeError("String contains non-numeric characters");for(var r=[],n=0;e.length>n;){var i=Math.min(e.length-n,3);o(parseInt(e.substring(n,n+i),10),3*i+1,r),n+=i}return new t(t.Mode.NUMERIC,e.length,r)}},{key:"makeAlphanumeric",value:function(e){if(!t.isAlphanumeric(e))throw new RangeError("String contains unencodable characters in alphanumeric mode");var r,n=[];for(r=0;e.length>=r+2;r+=2){var i=45*t.ALPHANUMERIC_CHARSET.indexOf(e.charAt(r));o(i+=t.ALPHANUMERIC_CHARSET.indexOf(e.charAt(r+1)),11,n)}return e.length>r&&o(t.ALPHANUMERIC_CHARSET.indexOf(e.charAt(r)),6,n),new t(t.Mode.ALPHANUMERIC,e.length,n)}},{key:"makeSegments",value:function(e){return""==e?[]:t.isNumeric(e)?[t.makeNumeric(e)]:t.isAlphanumeric(e)?[t.makeAlphanumeric(e)]:[t.makeBytes(t.toUtf8ByteArray(e))]}},{key:"makeEci",value:function(e){var r=[];if(0>e)throw new RangeError("ECI assignment value out of range");if(128>e)o(e,8,r);else if(16384>e)o(2,2,r),o(e,14,r);else{if(e>=1e6)throw new RangeError("ECI assignment value out of range");o(6,3,r),o(e,21,r)}return new t(t.Mode.ECI,0,r)}},{key:"isNumeric",value:function(e){return t.NUMERIC_REGEX.test(e)}},{key:"isAlphanumeric",value:function(e){return t.ALPHANUMERIC_REGEX.test(e)}},{key:"getTotalBits",value:function(e,t){var r,n=0,o=i(e);try{for(o.s();!(r=o.n()).done;){var a=r.value,s=a.mode.numCharCountBits(t);if(a.numChars>=1<<s)return 1/0;n+=4+s+a.bitData.length}}catch(e){o.e(e)}finally{o.f()}return n}},{key:"toUtf8ByteArray",value:function(e){e=encodeURI(e);for(var t=[],r=0;e.length>r;r++)"%"!=e.charAt(r)?t.push(e.charCodeAt(r)):(t.push(parseInt(e.substring(r+1,r+3),16)),r+=2);return t}}]),t}();u.NUMERIC_REGEX=/^[0-9]*$/,u.ALPHANUMERIC_REGEX=/^[A-Z0-9 $%*+.\/:-]*$/,u.ALPHANUMERIC_CHARSET="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:",t.QrSegment=u}(o||(o={})),function(t){!function(t){var n=r((function t(r,n){e(this,t),this.ordinal=void 0,this.formatBits=void 0,this.ordinal=r,this.formatBits=n}));n.LOW=new n(0,1),n.MEDIUM=new n(1,0),n.QUARTILE=new n(2,3),n.HIGH=new n(3,2),t.Ecc=n}(t.QrCode||(t.QrCode={}))}(o||(o={})),function(t){!function(t){var n=function(){function t(r,n){e(this,t),this.modeBits=void 0,this.numBitsCharCount=void 0,this.modeBits=r,this.numBitsCharCount=n}return r(t,[{key:"numCharCountBits",value:function(e){return this.numBitsCharCount[Math.floor((e+7)/17)]}}]),t}();n.NUMERIC=new n(1,[10,12,14]),n.ALPHANUMERIC=new n(2,[9,11,13]),n.BYTE=new n(4,[8,16,16]),n.KANJI=new n(8,[8,10,12]),n.ECI=new n(7,[0,0,0]),t.Mode=n}(t.QrSegment||(t.QrSegment={}))}(o||(o={}));var a=o;export{a as qrcodegen};
diff --git a/uni_modules/lime-qrcode/components/l-qrcode/l-qrcode.uvue b/uni_modules/lime-qrcode/components/l-qrcode/l-qrcode.uvue
new file mode 100644
index 0000000..76f3976
--- /dev/null
+++ b/uni_modules/lime-qrcode/components/l-qrcode/l-qrcode.uvue
@@ -0,0 +1,300 @@
+<template>
+	<!-- #ifndef APP || WEB -->
+	<canvas :style="styles" v-if="use2d" type="2d" :canvas-id="canvasId" :id="canvasId"></canvas>
+	<canvas :style="styles" v-else :canvas-id="canvasId" :id="canvasId"></canvas>
+	<!-- #endif  -->
+	<!-- #ifdef APP -->
+	<view class="l-qrcode" ref="drawableRef" :style="[styles]">
+		<image class="l-qrcode__icon" v-if="icon" :src="icon" :style="[iconStyle]"></image>
+	</view>
+	<!-- #endif  -->
+	<!-- #ifdef WEB -->
+	<view class="l-qrcode" ref="drawableRef" :style="[styles]"></view>
+	<!-- #endif  -->
+</template>
+<script lang="uts" setup>
+	/**
+	 * QRCode 二维码组件
+	 * @description 用于生成二维码图形，支持自定义图标和样式配置
+	 * <br>插件类型：LQrcodeComponentPublicInstance 
+	 * @tutorial https://ext.dcloud.net.cn/plugin?name=lime-qrcode
+	 * 
+	 * @property {string} value 二维码内容（支持文本/URL等）
+	 * @property {string} icon 中心图标路径（支持本地/网络路径）
+	 * @property {number | string} size 二维码尺寸
+	 * @property {number | string} iconSize 中心图标尺寸
+	 * @property {number} marginSize 二维码外边距（默认：0）
+	 * @property {string} color 二维码颜色（默认：#000000）
+	 * @property {string} bgColor 背景颜色（默认：#ffffff）
+	 * @property {boolean} bordered 显示边框（默认：false）
+	 * @property {'L' | 'M' | 'Q' | 'H'} errorLevel 容错等级（默认：'H'）
+	 * @value L 可恢复7%的数据
+	 * @value M 可恢复15%的数据  
+	 * @value Q 可恢复25%的数据
+	 * @value H 可恢复30%的数据
+	 * @property {boolean} useCanvasToTempFilePath 使用canvas生成临时路径（H5端可能需要）
+	 * @property {boolean} use2d 启用2D上下文渲染（性能优化，默认：false）
+	 */
+	import { type PropType, nextTick } from 'vue'
+	// #ifndef APP
+	import { createImage } from '@/uni_modules/lime-shared/createImage'
+	import { getCanvas, isCanvas2d } from './useCanvas'
+	import { QRCodeCanvas } from './qrcode.js';
+	import { QRCodePropsTypes , ImageSettings } from './type'
+	// #endif
+	// #ifdef APP-ANDROID || APP-HARMONY
+	import { QRCodeCanvas, type QRCodePropsTypes , type ImageSettings } from '@/uni_modules/lime-qrcodegen'
+	// #endif
+	// #ifdef APP-IOS
+	import { QRCodeCanvas, type QRCodePropsTypes , type ImageSettings } from './ios'
+	// #endif
+	// import { addUnit } from '@/uni_modules/lime-shared/addUnit'
+	// import { unitConvert } from '@/uni_modules/lime-shared/unitConvert'
+	// import { toBoolean } from '@/uni_modules/lime-shared/toBoolean'
+	import { addUnit, unitConvert } from './utils'
+	import { LQrcodeFailCallback, LQrcodeCompleteCallback, LQrcodeSuccessCallback} from './type'
+	
+	const name = 'l-qrcode'
+	const props = defineProps({
+		value: {
+			type: String
+		},
+		icon: {
+			type: String
+		},
+		// #ifdef APP-ANDROID
+		size: {
+			type: Object,
+			default: 160
+		},
+		iconSize: {
+			type: Object,
+			default: 40
+		},
+		// #endif
+		// #ifndef APP-ANDROID
+		size: {
+			type: [Number, String],
+			default: 160
+		},
+		iconSize: {
+			type: [Number, String],
+			default: 40
+		},
+		// #endif
+		marginSize: {
+			type: Number,
+			default: 0
+		},
+		color: {
+			type: String,
+			default: '#000'
+		},
+		bgColor: {
+			type: String,
+			default: 'transparent'
+		},
+		bordered: {
+			type: Boolean,
+			default: true
+		},
+		errorLevel: {
+			type: String as PropType<'L' | 'M' | 'Q' | 'H'>,
+			default: 'M' // 'L' | 'M' | 'Q' | 'H'
+		},
+		useCanvasToTempFilePath: {
+			type: Boolean,
+			default: false
+		},
+		use2d: {
+			type: Boolean,
+			default: true
+		}
+		// status: {
+		// 	type: String as PropType<'active'|'expired'|'loading'>,
+		// 	default: 'active' // active | expired | loading
+		// }
+	})
+	const emits = defineEmits(['success'])
+	const context = getCurrentInstance();
+	const canvasId = `l-qrcode${context!.uid}` 
+	const styles = computed<Map<string, any>>(():Map<string, any>=>{
+		const style = new Map<string, any>()
+		const size = addUnit(props.size);
+		if(size!=null){
+			style.set('width', size)
+			style.set('height', size)
+		}
+		style.set('background', props.bgColor)
+		return style
+	})
+	// #ifdef APP
+	const iconStyle = computed<Map<string, any>>(():Map<string, any>=>{
+		const style = new Map<string, any>()
+		const size = addUnit(props.iconSize);
+		// if(size!=null){
+			style.set('width', size)
+			style.set('height', size)
+		// }
+		return style
+	})
+	// #endif
+	const drawableRef = ref<UniElement|null>(null);
+	// #ifndef APP
+	let canvas:HTMLCanvasElement|null = null
+	// #endif
+	let qrcode:QRCodeCanvas|null = null
+	
+	const canvasToTempFilePath = (options: UTSJSONObject)=>{
+		const format =   options.getString('format') ?? 'png';
+		const fail =     options.get('fail') as LQrcodeFailCallback | null;
+		const complete = options.get('complete') as LQrcodeCompleteCallback | null;
+		const success =  options.get('success') as LQrcodeSuccessCallback | null;
+		// #ifdef APP
+		const newOptions = {
+			format,
+			fail,
+			complete,
+			success,
+		} as TakeSnapshotOptions
+		drawableRef.value!.takeSnapshot(newOptions)
+		// #endif
+		// #ifdef WEB
+		success?.({
+			tempFilePath: canvas?.toDataURL('image/'+format)
+		})
+		// #endif
+		
+	}
+	const render = ()=>{
+		const param:QRCodePropsTypes = {
+			value: props.value,
+			size:  unitConvert(props.size),
+			fgColor: props.color,
+			level: ['L', 'M', 'Q', 'H'].includes(props.errorLevel) ? props.errorLevel : 'M',
+			marginSize: props.marginSize,
+			includeMargin: props.bordered,
+			imageSettings: null,
+		} as QRCodePropsTypes
+		// #ifdef APP-HARMONY
+		param.value = props.value
+		param.size =  unitConvert(props.size)
+		param.fgColor = props.color
+		param.level = ['L', 'M', 'Q', 'H'].includes(props.errorLevel) ? props.errorLevel : 'M'
+		param.marginSize = props.marginSize
+		param.includeMargin = props.bordered
+		param.imageSettings = null
+		// #endif
+		if(props.icon != null){
+		// if(toBoolean(props.iconSize) && toBoolean(props.icon)){
+			const size = unitConvert(props.iconSize)
+			param.imageSettings = {
+				src: props.icon,
+				width: size,
+				height: size,
+				excavate: true
+			} as ImageSettings
+			
+			// #ifdef APP-HARMONY
+			param.imageSettings.src = props.icon
+			param.imageSettings.width = size
+			param.imageSettings.height = size
+			param.imageSettings.excavate = true
+			// #endif
+		}
+		qrcode?.render(param)
+		if(props.useCanvasToTempFilePath){
+			setTimeout(()=>{
+				canvasToTempFilePath({
+					success: (res: TakeSnapshotSuccess)=>{
+						emits('success', res.tempFilePath)
+					}
+				})
+			},100)
+		}
+	}
+	defineExpose({
+		canvasToTempFilePath
+	})
+	onMounted(()=>{
+		nextTick(()=>{
+			// #ifdef APP
+			requestAnimationFrame(()=> {
+				drawableRef.value?.getBoundingClientRectAsync()?.then(res => {
+					const ctx = drawableRef.value!.getDrawableContext();
+					qrcode = new QRCodeCanvas(ctx!)
+					watchEffect(()=>{
+						render()
+					})
+				})
+			})
+			
+			// #endif
+			// #ifdef WEB
+			canvas = document.createElement('canvas')
+			canvas!.style.width = '100%'
+			canvas!.style.height = '100%'
+			drawableRef.value!.appendChild(canvas!)
+			qrcode = new QRCodeCanvas(canvas, {
+				pixelRatio: uni.getSystemInfoSync().pixelRatio,
+				createImage: () => {
+					const image = new Image();
+					// @ts-ignore
+					image.crossOrigin = 'anonymous'; 
+					return image;
+				}
+			})
+			watchEffect(()=>{
+				render()
+			})
+			// #endif
+			// #ifndef APP || WEB
+			getCanvas(canvasId, { context }).then(res => {
+				canvas = res;
+				qrcode = new QRCodeCanvas(res, {
+					path2D: false,
+					pixelRatio: isCanvas2d && props.use2d ? uni.getSystemInfoSync().pixelRatio : 1,
+					createImage
+				})
+				watchEffect(()=>{
+					render()
+				})
+			})
+			// #endif
+			
+		})
+		
+	})
+	onUnmounted(()=>{
+		// #ifdef WEB
+		canvas?.remove();
+		// #endif
+		qrcode = null;
+	})
+</script>
+<style lang="scss">
+	.l-qrcode {
+		position: relative;
+		background-color: aqua;
+		justify-content: center;
+		align-items: center;
+
+		&-mask {
+			position: absolute;
+			// inset: 0;
+			// inset-block-start: 0;
+			// inset-inline-start: 0;
+			z-index: 10;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			// width: 100%;
+			// height: 100%;
+			color: rgba(0, 0, 0, 0.88);
+			line-height: 1.5714285714285714;
+			background: rgba(255, 255, 255, 0.96);
+			text-align: center;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/lime-qrcode/components/l-qrcode/l-qrcode.vue b/uni_modules/lime-qrcode/components/l-qrcode/l-qrcode.vue
new file mode 100644
index 0000000..abfa458
--- /dev/null
+++ b/uni_modules/lime-qrcode/components/l-qrcode/l-qrcode.vue
@@ -0,0 +1,249 @@
+<template>
+	<view class="l-qrcode" :style="[styles]">
+		<!-- #ifndef APP-NVUE -->
+		<canvas :style="styles" v-if="use2d" type="2d" :canvas-id="canvasId" :id="canvasId"></canvas>
+		<canvas :style="styles" v-else :canvas-id="canvasId" :id="canvasId"></canvas>
+		<!-- #endif  -->
+		<!-- #ifdef APP-NVUE  -->
+		<web-view 
+		ref="qrcodeRef"
+		@pagefinish="onFinished" 
+		@error="onError" 
+		@onPostMessage="onMessage"
+		:style="styles" src="/uni_modules/lime-qrcode/hybrid/html/index.html?v=1"></web-view>
+		<!-- #endif  -->
+		<!-- <view class="l-qrcode-mask" v-if="['loading', 'expired'].includes(props.status)">
+			<l-loading v-if="props.status == 'loading'"></l-loading>
+			<view class="l-qrcode-expired" v-if="props.status == 'expired'">
+				<slot></slot>
+			</view>
+		</view> -->
+	</view>
+</template>
+<script lang="ts">
+	// @ts-nocheck
+	/**
+	 * QRCode 二维码组件
+	 * @description 用于生成二维码图形，支持自定义图标和样式配置
+	 * <br>插件类型：LQrcodeComponentPublicInstance 
+	 * @tutorial https://ext.dcloud.net.cn/plugin?name=lime-qrcode
+	 * 
+	 * @property {string} value 二维码内容（支持文本/URL等）
+	 * @property {string} icon 中心图标路径（支持本地/网络路径）
+	 * @property {number | string} size 二维码尺寸
+	 * @property {number | string} iconSize 中心图标尺寸
+	 * @property {number} marginSize 二维码外边距（默认：0）
+	 * @property {string} color 二维码颜色（默认：#000000）
+	 * @property {string} bgColor 背景颜色（默认：#ffffff）
+	 * @property {boolean} bordered 显示边框（默认：false）
+	 * @property {'L' | 'M' | 'Q' | 'H'} errorLevel 容错等级（默认：'H'）
+	 * @value L 可恢复7%的数据
+	 * @value M 可恢复15%的数据  
+	 * @value Q 可恢复25%的数据
+	 * @value H 可恢复30%的数据
+	 * @property {boolean} useCanvasToTempFilePath 使用canvas生成临时路径（H5端可能需要）
+	 * @property {boolean} use2d 启用2D上下文渲染（性能优化，默认：false）
+	 */
+	import { computed, defineComponent, getCurrentInstance, watch, onUnmounted, onMounted } from '@/uni_modules/lime-shared/vue';
+	import QRCodeProps from './props'
+	// #ifndef APP-NVUE
+	import { getCanvas, isCanvas2d } from './useCanvas'
+	import { QRCodeCanvas } from './qrcode.js';
+	// #endif
+	import { addUnit } from '@/uni_modules/lime-shared/addUnit'
+	import { createImage } from '@/uni_modules/lime-shared/createImage'
+	import { unitConvert } from '@/uni_modules/lime-shared/unitConvert'
+	import { isBase64 } from '@/uni_modules/lime-shared/isBase64'
+	import { pathToBase64 } from '@/uni_modules/lime-shared/pathToBase64'
+	import { debounce } from '@/uni_modules/lime-shared/debounce'
+	const name = 'l-qrcode'
+	export default defineComponent({
+		name,
+		props: QRCodeProps,
+		emits: ['success'],
+		setup(props, {emit}) {
+			const context = getCurrentInstance();
+			const canvasId = `l-qrcode${context.uid}` 
+			const styles = computed(() => `width: ${addUnit(props.size)}; height: ${addUnit(props.size)};`)
+			let qrcode = null
+			let canvas = null
+			const qrCodeProps = computed(() => {
+				const { value, icon, size, color, bgColor, bordered, iconSize, errorLevel, marginSize } = props
+				const imageSettings = {
+					src: icon,
+					x: undefined,
+					y: undefined,
+					height: unitConvert(iconSize),
+					width: unitConvert(iconSize),
+					excavate: true,
+				}
+				return {
+					value,
+					size: unitConvert(size),
+					level: errorLevel,
+					bgColor,
+					fgColor: color,
+					imageSettings: icon ? imageSettings : undefined,
+					includeMargin: bordered,
+					marginSize: marginSize ?? 0
+				}
+
+			})
+			
+			// #ifdef APP-NVUE
+			const stacks = new Map()
+			// #endif
+			const canvasToTempFilePath = debounce((args: UniNamespace.CanvasToTempFilePathRes) => {
+				if(!canvas) return
+				// #ifndef APP-NVUE
+				const copyArgs = Object.assign({
+					canvasId,
+					canvas: null
+				}, args)
+				
+				if (isCanvas2d && props.use2d) {
+					// copyArgs.canvas = canvas
+					const tempFilePath = canvas.toDataURL();
+					copyArgs.success({
+						tempFilePath
+					})
+					return
+				}
+				if ('toTempFilePath' in canvas) {
+					canvas.toTempFilePath(copyArgs)
+				} else {
+					uni.canvasToTempFilePath(copyArgs, context);
+				}
+				// #endif
+				// #ifdef APP-NVUE
+				if(!stacks.size) {
+					const flie = 'file-' + Math.random();
+					const stack = {args, time: +new Date()}
+					stacks.set(`${flie}`, stack)
+					canvas.toDataURL(flie)
+					setTimeout(() => {
+						const stack = stacks.get(flie)
+						if(stack && 'fail' in stack.args) {
+							stack.args.fail({
+								error: '超时'
+							})
+							stacks.delete(flie)
+						}
+					},5000)
+				} 
+				// #endif
+			})
+			const useCanvasToTempFilePath = () => {
+				if(props.useCanvasToTempFilePath) {
+					canvasToTempFilePath({
+						success(res: UniNamespace.CanvasToTempFilePathRes) {
+							emit('success', res.tempFilePath)
+						}
+					})
+				}
+			}
+			// #ifdef APP-NVUE
+			const onFinished = () => {
+				const { pixelRatio } = uni.getSystemInfoSync()
+				canvas = {
+					toDataURL(flie: string) {
+						const ref: any = context.refs['qrcodeRef'];
+						if(ref) {
+							ref?.evalJS(`toDataURL('${flie}')`)
+						}
+					}
+				};
+				qrcode = {
+					async render(props: any) {
+						const ref: any = context.refs['qrcodeRef'];
+						const { src } = props.imageSettings || { };
+						if(!ref) return
+						if(src && !isBase64(src) && !/^http/.test(src) && /^\/static/.test(src)) {
+							props.imageSettings.src = await pathToBase64(src)
+						}
+						const _props = JSON.stringify(Object.assign({}, props, {pixelRatio}));
+						ref?.evalJS(`render(${_props})`);
+					}
+				}
+				qrcode.render(qrCodeProps.value)
+				useCanvasToTempFilePath()
+			}
+			const onError = () => {
+				console.warn('lime-qrcode 加载失败')
+			}
+			const onMessage = (e: any) => {
+				const {detail:{data: [res]}} = e
+				if(res.event == 'toDataURL') {
+					const {file, image, msg} = res.data;
+					const stack = stacks.get(file)
+					if(stack && image && 'success' in stack.args) {
+						stack.args.success({tempFilePath: image})
+						stacks.delete(file)
+					} else if(stack && 'fails' in stack.args) {
+						stack.args.fail({error: msg})
+						stacks.delete(file)
+					}
+				} 
+			}
+			// #endif
+			const propsWatch = watch(props, () => {
+				if (qrcode) {
+					qrcode.render(qrCodeProps.value)
+					useCanvasToTempFilePath()
+				}
+			})
+			onMounted(() => {
+				// #ifndef APP-NVUE
+				getCanvas(canvasId, { context }).then(res => {
+					canvas = res;
+					qrcode = new QRCodeCanvas(res, {
+						path2D: false,
+						pixelRatio: isCanvas2d && props.use2d ? uni.getSystemInfoSync().pixelRatio : 1,
+						createImage
+					})
+					qrcode.render(qrCodeProps.value)
+					useCanvasToTempFilePath()
+				})
+				// #endif
+			})
+			onUnmounted(() => {
+				propsWatch && propsWatch()
+			})
+			return {
+				canvasId,
+				styles,
+				props,
+				canvasToTempFilePath,
+				
+				// #ifdef APP-NVUE
+				onFinished,
+				onError,
+				onMessage
+				// #endif
+			}
+		}
+	})
+</script>
+<style lang="scss">
+	.l-qrcode {
+		position: relative;
+
+		&-mask {
+			position: absolute;
+			inset: 0;
+			// inset-block-start: 0;
+			// inset-inline-start: 0;
+			z-index: 10;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			// width: 100%;
+			// height: 100%;
+			color: rgba(0, 0, 0, 0.88);
+			line-height: 1.5714285714285714;
+			background: rgba(255, 255, 255, 0.96);
+			text-align: center;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/lime-qrcode/components/l-qrcode/props.ts b/uni_modules/lime-qrcode/components/l-qrcode/props.ts
new file mode 100644
index 0000000..231f725
--- /dev/null
+++ b/uni_modules/lime-qrcode/components/l-qrcode/props.ts
@@ -0,0 +1,40 @@
+// @ts-nocheck
+// import type { PropType } from './vue'
+export default {
+	value: String,
+	icon: String,
+	size: {
+		type: [Number, String],
+		default: 160
+	},
+	iconSize: {
+		type: [Number, String],
+		default: 40
+	},
+	marginSize: Number,
+	color: {
+		type: String,
+		default: '#000'
+	},
+	bgColor: {
+		type: String,
+		default: 'transparent'
+	},
+	bordered: {
+		type: Boolean,
+		default: true
+	},
+	errorLevel: {
+		type: String as PropType<'L'|'M'|'Q'|'H'>,
+		default: 'M' // 'L' | 'M' | 'Q' | 'H'
+	},
+	useCanvasToTempFilePath: Boolean,
+	use2d: {
+		type: Boolean,
+		default: true
+	}
+	// status: {
+	// 	type: String as PropType<'active'|'expired'|'loading'>,
+	// 	default: 'active' // active | expired | loading
+	// }
+}
\ No newline at end of file
diff --git a/uni_modules/lime-qrcode/components/l-qrcode/qrcode.js b/uni_modules/lime-qrcode/components/l-qrcode/qrcode.js
new file mode 100644
index 0000000..b04047b
--- /dev/null
+++ b/uni_modules/lime-qrcode/components/l-qrcode/qrcode.js
@@ -0,0 +1,6 @@
+function e(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function t(e,t){for(var n=0;t.length>n;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function n(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),Object.defineProperty(e,"prototype",{writable:!1}),e}function r(e,t){if(null==e)return{};var n,r,i=function(e,t){if(null==e)return{};var n,r,i={},o=Object.keys(e);for(r=0;o.length>r;r++)0>t.indexOf(n=o[r])&&(i[n]=e[n]);return i}(e,t);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);for(r=0;o.length>r;r++)0>t.indexOf(n=o[r])&&Object.prototype.propertyIsEnumerable.call(e,n)&&(i[n]=e[n])}return i}function i(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);t>n;n++)r[n]=e[n];return r}function o(e,t){var n="undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(!n){if(Array.isArray(e)||(n=function(e,t){if(e){if("string"==typeof e)return i(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);return"Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n?Array.from(e):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?i(e,t):void 0}}(e))||t&&e&&"number"==typeof e.length){n&&(e=n);var r=0,o=function(){};return{s:o,n:function(){return e.length>r?{done:!1,value:e[r++]}:{done:!0}},e:function(e){throw e},f:o}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var a,s=!0,u=!1;return{s:function(){n=n.call(e)},n:function(){var e=n.next();return s=e.done,e},e:function(e){u=!0,a=e},f:function(){try{s||null==n.return||n.return()}finally{if(u)throw a}}}}
+/**
+ * @license QR Code generator library (TypeScript)
+ * Copyright (c) Project Nayuki.
+ * SPDX-License-Identifier: MIT
+ */var a;!function(t){var r=function(){function r(t,n,i,o){if(e(this,r),this.version=void 0,this.errorCorrectionLevel=void 0,this.size=void 0,this.mask=void 0,this.modules=[],this.isFunction=[],this.version=t,this.errorCorrectionLevel=n,r.MIN_VERSION>t||t>r.MAX_VERSION)throw new RangeError("Version value out of range");if(-1>o||o>7)throw new RangeError("Mask value out of range");this.size=4*t+17;for(var a=[],u=0;this.size>u;u++)a.push(!1);for(var l=0;this.size>l;l++)this.modules.push(a.slice()),this.isFunction.push(a.slice());this.drawFunctionPatterns();var h=this.addEccAndInterleave(i);if(this.drawCodewords(h),-1==o)for(var c=1e9,f=0;8>f;f++){this.applyMask(f),this.drawFormatBits(f);var v=this.getPenaltyScore();c>v&&(o=f,c=v),this.applyMask(f)}s(o>=0&&7>=o),this.mask=o,this.applyMask(o),this.drawFormatBits(o),this.isFunction=[]}return n(r,[{key:"getModule",value:function(e,t){return e>=0&&this.size>e&&t>=0&&this.size>t&&this.modules[t][e]}},{key:"getModules",value:function(){return this.modules}},{key:"drawFunctionPatterns",value:function(){for(var e=0;this.size>e;e++)this.setFunctionModule(6,e,e%2==0),this.setFunctionModule(e,6,e%2==0);this.drawFinderPattern(3,3),this.drawFinderPattern(this.size-4,3),this.drawFinderPattern(3,this.size-4);for(var t=this.getAlignmentPatternPositions(),n=t.length,r=0;n>r;r++)for(var i=0;n>i;i++)0==r&&0==i||0==r&&i==n-1||r==n-1&&0==i||this.drawAlignmentPattern(t[r],t[i]);this.drawFormatBits(0),this.drawVersion()}},{key:"drawFormatBits",value:function(e){for(var t=this.errorCorrectionLevel.formatBits<<3|e,n=t,r=0;10>r;r++)n=n<<1^1335*(n>>>9);var i=21522^(t<<10|n);s(i>>>15==0);for(var o=0;5>=o;o++)this.setFunctionModule(8,o,a(i,o));this.setFunctionModule(8,7,a(i,6)),this.setFunctionModule(8,8,a(i,7)),this.setFunctionModule(7,8,a(i,8));for(var u=9;15>u;u++)this.setFunctionModule(14-u,8,a(i,u));for(var l=0;8>l;l++)this.setFunctionModule(this.size-1-l,8,a(i,l));for(var h=8;15>h;h++)this.setFunctionModule(8,this.size-15+h,a(i,h));this.setFunctionModule(8,this.size-8,!0)}},{key:"drawVersion",value:function(){if(this.version>=7){for(var e=this.version,t=0;12>t;t++)e=e<<1^7973*(e>>>11);var n=this.version<<12|e;s(n>>>18==0);for(var r=0;18>r;r++){var i=a(n,r),o=this.size-11+r%3,u=Math.floor(r/3);this.setFunctionModule(o,u,i),this.setFunctionModule(u,o,i)}}}},{key:"drawFinderPattern",value:function(e,t){for(var n=-4;4>=n;n++)for(var r=-4;4>=r;r++){var i=Math.max(Math.abs(r),Math.abs(n)),o=e+r,a=t+n;o>=0&&this.size>o&&a>=0&&this.size>a&&this.setFunctionModule(o,a,2!=i&&4!=i)}}},{key:"drawAlignmentPattern",value:function(e,t){for(var n=-2;2>=n;n++)for(var r=-2;2>=r;r++)this.setFunctionModule(e+r,t+n,1!=Math.max(Math.abs(r),Math.abs(n)))}},{key:"setFunctionModule",value:function(e,t,n){this.modules[t][e]=n,this.isFunction[t][e]=!0}},{key:"addEccAndInterleave",value:function(e){var t=this.version,n=this.errorCorrectionLevel;if(e.length!=r.getNumDataCodewords(t,n))throw new RangeError("Invalid argument");for(var i=r.NUM_ERROR_CORRECTION_BLOCKS[n.ordinal][t],o=r.ECC_CODEWORDS_PER_BLOCK[n.ordinal][t],a=Math.floor(r.getNumRawDataModules(t)/8),u=i-a%i,l=Math.floor(a/i),h=[],c=r.reedSolomonComputeDivisor(o),f=0,v=0;i>f;f++){var d=e.slice(v,v+l-o+(u>f?0:1));v+=d.length;var m=r.reedSolomonComputeRemainder(d,c);u>f&&d.push(0),h.push(d.concat(m))}for(var g=[],y=function(e){h.forEach((function(t,n){e==l-o&&u>n||g.push(t[e])}))},E=0;h[0].length>E;E++)y(E);return s(g.length==a),g}},{key:"drawCodewords",value:function(e){if(e.length!=Math.floor(r.getNumRawDataModules(this.version)/8))throw new RangeError("Invalid argument");for(var t=0,n=this.size-1;n>=1;n-=2){6==n&&(n=5);for(var i=0;this.size>i;i++)for(var o=0;2>o;o++){var u=n-o,l=0==(n+1&2)?this.size-1-i:i;!this.isFunction[l][u]&&8*e.length>t&&(this.modules[l][u]=a(e[t>>>3],7-(7&t)),t++)}}s(t==8*e.length)}},{key:"applyMask",value:function(e){if(0>e||e>7)throw new RangeError("Mask value out of range");for(var t=0;this.size>t;t++)for(var n=0;this.size>n;n++){var r=void 0;switch(e){case 0:r=(n+t)%2==0;break;case 1:r=t%2==0;break;case 2:r=n%3==0;break;case 3:r=(n+t)%3==0;break;case 4:r=(Math.floor(n/3)+Math.floor(t/2))%2==0;break;case 5:r=n*t%2+n*t%3==0;break;case 6:r=(n*t%2+n*t%3)%2==0;break;case 7:r=((n+t)%2+n*t%3)%2==0;break;default:throw Error("Unreachable")}!this.isFunction[t][n]&&r&&(this.modules[t][n]=!this.modules[t][n])}}},{key:"getPenaltyScore",value:function(){for(var e=0,t=0;this.size>t;t++){for(var n=!1,i=0,a=[0,0,0,0,0,0,0],u=0;this.size>u;u++)this.modules[t][u]==n?5==++i?e+=r.PENALTY_N1:i>5&&e++:(this.finderPenaltyAddHistory(i,a),n||(e+=this.finderPenaltyCountPatterns(a)*r.PENALTY_N3),n=this.modules[t][u],i=1);e+=this.finderPenaltyTerminateAndCount(n,i,a)*r.PENALTY_N3}for(var l=0;this.size>l;l++){for(var h=!1,c=0,f=[0,0,0,0,0,0,0],v=0;this.size>v;v++)this.modules[v][l]==h?5==++c?e+=r.PENALTY_N1:c>5&&e++:(this.finderPenaltyAddHistory(c,f),h||(e+=this.finderPenaltyCountPatterns(f)*r.PENALTY_N3),h=this.modules[v][l],c=1);e+=this.finderPenaltyTerminateAndCount(h,c,f)*r.PENALTY_N3}for(var d=0;this.size-1>d;d++)for(var m=0;this.size-1>m;m++){var g=this.modules[d][m];g==this.modules[d][m+1]&&g==this.modules[d+1][m]&&g==this.modules[d+1][m+1]&&(e+=r.PENALTY_N2)}var y,E=0,w=o(this.modules);try{for(w.s();!(y=w.n()).done;){E=y.value.reduce((function(e,t){return e+(t?1:0)}),E)}}catch(e){w.e(e)}finally{w.f()}var M=this.size*this.size,C=Math.ceil(Math.abs(20*E-10*M)/M)-1;return s(C>=0&&9>=C),s((e+=C*r.PENALTY_N4)>=0&&2568888>=e),e}},{key:"getAlignmentPatternPositions",value:function(){if(1==this.version)return[];for(var e=Math.floor(this.version/7)+2,t=32==this.version?26:2*Math.ceil((4*this.version+4)/(2*e-2)),n=[6],r=this.size-7;e>n.length;r-=t)n.splice(1,0,r);return n}},{key:"finderPenaltyCountPatterns",value:function(e){var t=e[1];s(3*this.size>=t);var n=t>0&&e[2]==t&&e[3]==3*t&&e[4]==t&&e[5]==t;return(!n||4*t>e[0]||t>e[6]?0:1)+(!n||4*t>e[6]||t>e[0]?0:1)}},{key:"finderPenaltyTerminateAndCount",value:function(e,t,n){return e&&(this.finderPenaltyAddHistory(t,n),t=0),this.finderPenaltyAddHistory(t+=this.size,n),this.finderPenaltyCountPatterns(n)}},{key:"finderPenaltyAddHistory",value:function(e,t){0==t[0]&&(e+=this.size),t.pop(),t.unshift(e)}}],[{key:"encodeText",value:function(e,n){var i=t.QrSegment.makeSegments(e);return r.encodeSegments(i,n)}},{key:"encodeBinary",value:function(e,n){var i=t.QrSegment.makeBytes(e);return r.encodeSegments([i],n)}},{key:"encodeSegments",value:function(e,t){var n,a,l=arguments.length>2&&void 0!==arguments[2]?arguments[2]:1,h=arguments.length>3&&void 0!==arguments[3]?arguments[3]:40,c=arguments.length>4&&void 0!==arguments[4]?arguments[4]:-1,f=5>=arguments.length||void 0===arguments[5]||arguments[5];if(r.MIN_VERSION>l||l>h||h>r.MAX_VERSION||-1>c||c>7)throw new RangeError("Invalid value");for(n=l;;n++){var v=8*r.getNumDataCodewords(n,t),d=u.getTotalBits(e,n);if(v>=d){a=d;break}if(n>=h)throw new RangeError("Data too long")}for(var m=0,g=[r.Ecc.MEDIUM,r.Ecc.QUARTILE,r.Ecc.HIGH];g.length>m;m++){var y=g[m];f&&a<=8*r.getNumDataCodewords(n,y)&&(t=y)}var E,w=[],M=o(e);try{for(M.s();!(E=M.n()).done;){var C=E.value;i(C.mode.modeBits,4,w),i(C.numChars,C.mode.numCharCountBits(n),w);var R,A=o(C.getData());try{for(A.s();!(R=A.n()).done;){var p=R.value;w.push(p)}}catch(e){A.e(e)}finally{A.f()}}}catch(e){M.e(e)}finally{M.f()}s(w.length==a);var P=8*r.getNumDataCodewords(n,t);s(P>=w.length),i(0,Math.min(4,P-w.length),w),i(0,(8-w.length%8)%8,w),s(w.length%8==0);for(var N=236;P>w.length;N^=253)i(N,8,w);for(var k=[];w.length>8*k.length;)k.push(0);return w.forEach((function(e,t){return k[t>>>3]|=e<<7-(7&t)})),new r(n,t,k,c)}},{key:"getNumRawDataModules",value:function(e){if(r.MIN_VERSION>e||e>r.MAX_VERSION)throw new RangeError("Version number out of range");var t=(16*e+128)*e+64;if(e>=2){var n=Math.floor(e/7)+2;t-=(25*n-10)*n-55,7>e||(t-=36)}return s(t>=208&&29648>=t),t}},{key:"getNumDataCodewords",value:function(e,t){return Math.floor(r.getNumRawDataModules(e)/8)-r.ECC_CODEWORDS_PER_BLOCK[t.ordinal][e]*r.NUM_ERROR_CORRECTION_BLOCKS[t.ordinal][e]}},{key:"reedSolomonComputeDivisor",value:function(e){if(1>e||e>255)throw new RangeError("Degree out of range");for(var t=[],n=0;e-1>n;n++)t.push(0);t.push(1);for(var i=1,o=0;e>o;o++){for(var a=0;t.length>a;a++)t[a]=r.reedSolomonMultiply(t[a],i),t.length>a+1&&(t[a]^=t[a+1]);i=r.reedSolomonMultiply(i,2)}return t}},{key:"reedSolomonComputeRemainder",value:function(e,t){var n,i=t.map((function(e){return 0})),a=o(e);try{var s=function(){var e=n.value^i.shift();i.push(0),t.forEach((function(t,n){return i[n]^=r.reedSolomonMultiply(t,e)}))};for(a.s();!(n=a.n()).done;)s()}catch(e){a.e(e)}finally{a.f()}return i}},{key:"reedSolomonMultiply",value:function(e,t){if(e>>>8!=0||t>>>8!=0)throw new RangeError("Byte out of range");for(var n=0,r=7;r>=0;r--)n=n<<1^285*(n>>>7),n^=(t>>>r&1)*e;return s(n>>>8==0),n}}]),r}();function i(e,t,n){if(0>t||t>31||e>>>t!=0)throw new RangeError("Value out of range");for(var r=t-1;r>=0;r--)n.push(e>>>r&1)}function a(e,t){return 0!=(e>>>t&1)}function s(e){if(!e)throw Error("Assertion error")}r.MIN_VERSION=1,r.MAX_VERSION=40,r.PENALTY_N1=3,r.PENALTY_N2=3,r.PENALTY_N3=40,r.PENALTY_N4=10,r.ECC_CODEWORDS_PER_BLOCK=[[-1,7,10,15,20,26,18,20,24,30,18,20,24,26,30,22,24,28,30,28,28,28,28,30,30,26,28,30,30,30,30,30,30,30,30,30,30,30,30,30,30],[-1,10,16,26,18,24,16,18,22,22,26,30,22,22,24,24,28,28,26,26,26,26,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28],[-1,13,22,18,26,18,24,18,22,20,24,28,26,24,20,30,24,28,28,26,30,28,30,30,30,30,28,30,30,30,30,30,30,30,30,30,30,30,30,30,30],[-1,17,28,22,16,22,28,26,26,24,28,24,28,22,24,24,30,28,28,26,28,30,24,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30]],r.NUM_ERROR_CORRECTION_BLOCKS=[[-1,1,1,1,1,1,2,2,2,2,4,4,4,4,4,6,6,6,6,7,8,8,9,9,10,12,12,12,13,14,15,16,17,18,19,19,20,21,22,24,25],[-1,1,1,1,2,2,4,4,4,5,5,5,8,9,9,10,10,11,13,14,16,17,17,18,20,21,23,25,26,28,29,31,33,35,37,38,40,43,45,47,49],[-1,1,1,2,2,4,4,6,6,8,8,8,10,12,16,12,17,16,18,21,20,23,23,25,27,29,34,34,35,38,40,43,45,48,51,53,56,59,62,65,68],[-1,1,1,2,4,4,4,5,6,8,8,11,11,16,16,18,16,19,21,25,25,25,34,30,32,35,37,40,42,45,48,51,54,57,60,63,66,70,74,77,81]],t.QrCode=r;var u=function(){function t(n,r,i){if(e(this,t),this.mode=void 0,this.numChars=void 0,this.bitData=void 0,this.mode=n,this.numChars=r,this.bitData=i,0>r)throw new RangeError("Invalid argument");this.bitData=i.slice()}return n(t,[{key:"getData",value:function(){return this.bitData.slice()}}],[{key:"makeBytes",value:function(e){var n,r=[],a=o(e);try{for(a.s();!(n=a.n()).done;){i(n.value,8,r)}}catch(e){a.e(e)}finally{a.f()}return new t(t.Mode.BYTE,e.length,r)}},{key:"makeNumeric",value:function(e){if(!t.isNumeric(e))throw new RangeError("String contains non-numeric characters");for(var n=[],r=0;e.length>r;){var o=Math.min(e.length-r,3);i(parseInt(e.substring(r,r+o),10),3*o+1,n),r+=o}return new t(t.Mode.NUMERIC,e.length,n)}},{key:"makeAlphanumeric",value:function(e){if(!t.isAlphanumeric(e))throw new RangeError("String contains unencodable characters in alphanumeric mode");var n,r=[];for(n=0;e.length>=n+2;n+=2){var o=45*t.ALPHANUMERIC_CHARSET.indexOf(e.charAt(n));i(o+=t.ALPHANUMERIC_CHARSET.indexOf(e.charAt(n+1)),11,r)}return e.length>n&&i(t.ALPHANUMERIC_CHARSET.indexOf(e.charAt(n)),6,r),new t(t.Mode.ALPHANUMERIC,e.length,r)}},{key:"makeSegments",value:function(e){return""==e?[]:t.isNumeric(e)?[t.makeNumeric(e)]:t.isAlphanumeric(e)?[t.makeAlphanumeric(e)]:[t.makeBytes(t.toUtf8ByteArray(e))]}},{key:"makeEci",value:function(e){var n=[];if(0>e)throw new RangeError("ECI assignment value out of range");if(128>e)i(e,8,n);else if(16384>e)i(2,2,n),i(e,14,n);else{if(e>=1e6)throw new RangeError("ECI assignment value out of range");i(6,3,n),i(e,21,n)}return new t(t.Mode.ECI,0,n)}},{key:"isNumeric",value:function(e){return t.NUMERIC_REGEX.test(e)}},{key:"isAlphanumeric",value:function(e){return t.ALPHANUMERIC_REGEX.test(e)}},{key:"getTotalBits",value:function(e,t){var n,r=0,i=o(e);try{for(i.s();!(n=i.n()).done;){var a=n.value,s=a.mode.numCharCountBits(t);if(a.numChars>=1<<s)return 1/0;r+=4+s+a.bitData.length}}catch(e){i.e(e)}finally{i.f()}return r}},{key:"toUtf8ByteArray",value:function(e){e=encodeURI(e);for(var t=[],n=0;e.length>n;n++)"%"!=e.charAt(n)?t.push(e.charCodeAt(n)):(t.push(parseInt(e.substring(n+1,n+3),16)),n+=2);return t}}]),t}();u.NUMERIC_REGEX=/^[0-9]*$/,u.ALPHANUMERIC_REGEX=/^[A-Z0-9 $%*+.\/:-]*$/,u.ALPHANUMERIC_CHARSET="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:",t.QrSegment=u}(a||(a={})),function(t){!function(t){var r=n((function t(n,r){e(this,t),this.ordinal=void 0,this.formatBits=void 0,this.ordinal=n,this.formatBits=r}));r.LOW=new r(0,1),r.MEDIUM=new r(1,0),r.QUARTILE=new r(2,3),r.HIGH=new r(3,2),t.Ecc=r}(t.QrCode||(t.QrCode={}))}(a||(a={})),function(t){!function(t){var r=function(){function t(n,r){e(this,t),this.modeBits=void 0,this.numBitsCharCount=void 0,this.modeBits=n,this.numBitsCharCount=r}return n(t,[{key:"numCharCountBits",value:function(e){return this.numBitsCharCount[Math.floor((e+7)/17)]}}]),t}();r.NUMERIC=new r(1,[10,12,14]),r.ALPHANUMERIC=new r(2,[9,11,13]),r.BYTE=new r(4,[8,16,16]),r.KANJI=new r(8,[8,10,12]),r.ECI=new r(7,[0,0,0]),t.Mode=r}(t.QrSegment||(t.QrSegment={}))}(a||(a={}));var s=a,u=["value","size","level","bgColor","fgColor","includeMargin","marginSize","imageSettings"],l={L:s.QrCode.Ecc.LOW,M:s.QrCode.Ecc.MEDIUM,Q:s.QrCode.Ecc.QUARTILE,H:s.QrCode.Ecc.HIGH};function h(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=[];return e.forEach((function(e,r){var i=null;e.forEach((function(o,a){if(!o&&null!==i)return n.push("M".concat(i+t," ").concat(r+t,"h").concat(a-i,"v1H").concat(i+t,"z")),void(i=null);if(a!==e.length-1)o&&null===i&&(i=a);else{if(!o)return;n.push(null===i?"M".concat(a+t,",").concat(r+t," h1v1H").concat(a+t,"z"):"M".concat(i+t,",").concat(r+t," h").concat(a+1-i,"v1H").concat(i+t,"z"))}}))})),n.join("")}function c(e,t){return e.slice().map((function(e,n){return t.y>n||n>=t.y+t.h?e:e.map((function(e,n){return(t.x>n||n>=t.x+t.w)&&e}))}))}var f=function(){function t(n,r){var i=this;for(var o in e(this,t),this.canvas=void 0,this.pixelRatio="undefined"!=typeof window?window.devicePixelRatio:1,this.path2D=!0,this.SUPPORTS_PATH2D=void 0,this.createImage=function(){return new Image},this.createPath2D=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:void 0,t="createPath2D";return i.canvas&&t in i.canvas?i.canvas[t](e):new Path2D(e)},this.canvas=n,r)o in this&&(this[o]=r[o]);this.SUPPORTS_PATH2D=function(){try{i.createPath2D()}catch(e){return!1}return!0}()}return n(t,[{key:"render",value:function(e,t){var n=this,i=e.value,o=e.size,a=void 0===o?128:o,f=e.level,v=void 0===f?"L":f,d=e.bgColor,m=void 0===d?"#FFFFFF":d,g=e.fgColor,y=void 0===g?"#000000":g,E=e.includeMargin,w=void 0!==E&&E,M=e.marginSize,C=e.imageSettings,R=(r(e,u),null==C?void 0:C.src),A=this.canvas,p=A.getContext("2d");if(p&&i){var P=s.QrCode.encodeText(i,l[v]).getModules(),N=function(e,t){return null!=t?Math.floor(t):e?4:0}(w,M),k=P.length+2*N,S=function(e,t,n,r){if(null==r)return null;var i=e.length+2*n,o=Math.floor(.1*t),a=i/t,s=(r.width||o)*a,u=(r.height||o)*a,l=null==r.x?e.length/2-s/2:r.x*a,h=null==r.y?e.length/2-u/2:r.y*a,c=null;if(r.excavate){var f=Math.floor(l),v=Math.floor(h);c={x:f,y:v,w:Math.ceil(s+l-f),h:Math.ceil(u+h-v)}}return{x:l,y:h,h:u,w:s,excavation:c}}(P,a,N,C),I=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:null,r=null!=S&&null!==e&&e.complete&&0!==e.naturalHeight&&0!==e.naturalWidth;r&&null!=S.excavation&&(P=c(P,S.excavation)),t&&t(P);var i=n.pixelRatio;p.clearRect(0,0,A.width,A.height),p.setTransform(1,0,0,1,0,0),A.height=A.width=a*i;var o=a/k*i;if(p.scale(o,o),p.fillStyle=m,p.fillRect(0,0,k,k),p.fillStyle=y,n.SUPPORTS_PATH2D&&n.path2D){var s=n.createPath2D(h(P,N));p.fill(s)}else P.forEach((function(e,t){e.forEach((function(e,n){e&&p.fillRect(n+N,t+N,1,1)}))}));var u=(null==e?void 0:e.path)||e;r&&p.drawImage(u,S.x+N,S.y+N,S.w,S.h),"draw"in p&&p.draw()};if(R){var b=this.createImage(A);b.onload=function(){I(b)},b.onerror=function(e){I(),console.warn(e)},b.src=R}else I()}}}]),t}();export{f as QRCodeCanvas};
diff --git a/uni_modules/lime-qrcode/components/l-qrcode/type.ts b/uni_modules/lime-qrcode/components/l-qrcode/type.ts
new file mode 100644
index 0000000..8a1556b
--- /dev/null
+++ b/uni_modules/lime-qrcode/components/l-qrcode/type.ts
@@ -0,0 +1,48 @@
+// @ts-nocheck
+export type ImageSettings = {
+	width: number
+	height: number
+	x?: number
+	y?: number
+	excavate: boolean
+}
+export type QRCodePropsTypes = {
+	value?: string
+	size?: number
+	fgColor?: string
+	level?: string
+	marginSize: number
+	includeMargin: boolean
+	imageSettings?: ImageSettings
+}
+
+export type QRCodeCallback = (cells : boolean[][]) => void
+
+export type Excavation = {
+	x: number
+	y: number
+	h: number
+	w: number
+}
+
+
+
+
+
+/**
+ * 成功回调函数定义
+ */
+export type TakeSnapshotSuccessCallback = (res: TakeSnapshotSuccess) => void
+/**
+ * 失败回调函数定义
+ */
+export type TakeSnapshotFailCallback = (res: TakeSnapshotFail) => void
+/**
+ * 完成回调函数定义
+ */
+export type TakeSnapshotCompleteCallback = (res: any) => void
+
+
+export type LQrcodeFailCallback = TakeSnapshotFailCallback
+export type LQrcodeCompleteCallback = TakeSnapshotCompleteCallback
+export type LQrcodeSuccessCallback  = TakeSnapshotSuccessCallback
\ No newline at end of file
diff --git a/uni_modules/lime-qrcode/components/l-qrcode/useCanvas.ts b/uni_modules/lime-qrcode/components/l-qrcode/useCanvas.ts
new file mode 100644
index 0000000..78ce660
--- /dev/null
+++ b/uni_modules/lime-qrcode/components/l-qrcode/useCanvas.ts
@@ -0,0 +1,78 @@
+
+// @ts-nocheck
+import type { ComponentInternalInstance } from '@/uni_modules/lime-shared/vue'
+import { getRect } from '@/uni_modules/lime-shared/getRect'
+import { canIUseCanvas2d } from '@/uni_modules/lime-shared/canIUseCanvas2d'
+export const isCanvas2d = canIUseCanvas2d()
+
+export async function getCanvas(canvasId: string, options: {context: ComponentInternalInstance}) {
+	let { context } = options
+	// #ifdef MP || VUE2
+	if (context.proxy) context = context.proxy
+	// #endif
+	return getRect('#' + canvasId, context, isCanvas2d).then(res => {
+		if(res.node){
+			return res.node
+		} else {
+			const ctx = uni.createCanvasContext(canvasId, context)
+			return {
+				getContext(type: string) {
+					if(type == '2d') {
+						return ctx
+					}
+				},
+				width: res.width,
+				height: res.height,
+			}
+			// #ifdef H5
+			// canvas.value = context.proxy.$el.querySelector('#'+ canvasId)
+			// #endif
+		}
+	})
+}
+
+// #ifndef H5 || APP-NVUE
+class Image {
+	currentSrc: string | null = null
+	naturalHeight: number = 0
+	naturalWidth: number = 0
+	width: number = 0
+	height: number = 0
+	tagName: string = 'IMG'
+	path: any = ''
+	crossOrigin: any = ''
+	referrerPolicy: any = ''
+	onload: () => void
+	onerror: () => void
+	constructor() {}
+	set src(src) {
+		this.currentSrc = src
+		uni.getImageInfo({
+			src,
+			success: (res) => {
+				this.path = res.path
+				this.naturalWidth = this.width = res.width
+				this.naturalHeight = this.height = res.height
+				this.onload()
+			},
+			fail: () => {
+				this.onerror()
+			}
+		})
+	}
+	get src() {
+		return this.currentSrc
+	}
+}
+// #endif
+
+export function createImage(canvas: WechatMiniprogram.Canvas) {
+	if(canvas && canvas.createImage) {
+		return canvas.createImage()
+	} else if(typeof window != 'undefined' && window.Image) {
+		return new window.Image()
+	}
+	// #ifndef H5 || APP-NVUE
+	return new Image()
+	// #endif
+}
\ No newline at end of file
diff --git a/uni_modules/lime-qrcode/components/l-qrcode/utils.uts b/uni_modules/lime-qrcode/components/l-qrcode/utils.uts
new file mode 100644
index 0000000..a88a930
--- /dev/null
+++ b/uni_modules/lime-qrcode/components/l-qrcode/utils.uts
@@ -0,0 +1,35 @@
+export function addUnit(value: any|null):string{
+	if(value == null){
+		return ''
+	}
+	value = `${value}` 
+	return /^(-)?\d+(\\.\d+)?$/.test(value) ?  `${value}px` : value
+}
+
+export function unitConvert(value: any|null): number{
+	if(typeof value == 'number'){
+		return value as number
+	}
+	if(typeof value == 'string'){
+		value = `${value}` 
+		if(/^(-)?\d+(\\.\d+)?$/.test(value)){
+			return parseFloat(value);
+		}
+		
+		const reg = /^-?([0-9]+)?([.]{1}[0-9]+){0,1}(em|rpx|px|%)$/g;
+		const results = reg.exec(value);
+		if (results == null) {
+			return 0;
+		}
+		const unit = results[3];
+		const v = parseFloat(value);
+		if (unit == 'rpx') {
+			const { windowWidth } = uni.getWindowInfo()
+			return windowWidth / 750 * v;
+		}
+		if (unit == 'px') {
+			return v;
+		}
+	}
+	return 0;
+}
\ No newline at end of file
diff --git a/uni_modules/lime-qrcode/components/lime-qrcode/lime-qrcode.uvue b/uni_modules/lime-qrcode/components/lime-qrcode/lime-qrcode.uvue
new file mode 100644
index 0000000..5470e16
--- /dev/null
+++ b/uni_modules/lime-qrcode/components/lime-qrcode/lime-qrcode.uvue
@@ -0,0 +1,146 @@
+<template>
+	<view class="demo-block">
+		<text class="demo-block__title-text ultra">QRCode</text>
+		<text class="demo-block__desc-text">能够将文本转换生成二维码的组件，支持自定义配色和 Logo 配置</text>	
+		<view class="demo-block__body">
+			<view class="demo-block card">
+				<text class="demo-block__title-text large">基础</text>
+				<view class="demo-block__body">
+					<l-qrcode value="https://limeui.qcoon.cn" size="300rpx" :use2d="false"></l-qrcode>
+				</view>	
+			</view>	
+			
+			<view class="demo-block card">
+				<text class="demo-block__title-text large">icon</text>
+				<view class="demo-block__body">
+					<image v-if="image !=''" :src="image" style="width: 300rpx;" mode="widthFix"></image>
+					<view style="flex-direction: row; justify-content: space-between">
+						<l-qrcode ref="qrcodeRef" value="https://limeui.qcoon.cn" size="300rpx" icon="https://img10.360buyimg.com/img/jfs/t1/182127/16/37474/11761/64659c31F0cd84976/21f25b952f03a49a.jpg" iconSize="70rpx"></l-qrcode>
+						<l-qrcode :useCanvasToTempFilePath="true" @success="success" value="https://limeui.qcoon.cn" size="300rpx" icon="https://img10.360buyimg.com/img/jfs/t1/182127/16/37474/11761/64659c31F0cd84976/21f25b952f03a49a.jpg" iconSize="70rpx"></l-qrcode>
+					</view>
+					<button type="primary" style="margin-top: 20rpx;" @click="onClick">生成图片</button>
+				</view>	
+			</view>
+			
+			<view class="demo-block card">
+				<text class="demo-block__title-text large">颜色</text>
+				<view class="demo-block__body">
+					<view style="flex-direction: row; justify-content: space-between">
+						<l-qrcode value="https://limeui.qcoon.cn" size="300rpx" color="rgba(82,196,26,1)"></l-qrcode>
+						<l-qrcode value="https://limeui.qcoon.cn" size="300rpx" color="rgba(22,119,255,1)" bgColor="rgb(245,245,245)"></l-qrcode>
+					</view>	
+				</view>	
+			</view>
+			
+			<view class="demo-block card">
+				<text class="demo-block__title-text large">纠错比例</text>
+				<view class="demo-block__body">
+					<l-qrcode value="img10.360buyimg.com/img/jfs/t1/182127/16/37474/11761/64659c31F0cd84976/21f25b952f03a49a.jpg" size="300rpx" :errorLevel="levels[index]"></l-qrcode>
+					<button type="primary" style="margin-top: 20rpx;" @click="onToggle">切换纠错等级：{{levels[index]}}</button>
+				</view>	
+			</view>
+			
+			<view class="demo-block card">
+				<text class="demo-block__title-text large">动态</text>
+				<view class="demo-block__body">
+					<l-qrcode :value="text" size="300rpx" :marginSize="1" bgColor="white"></l-qrcode>
+					<button type="primary" style="margin-top: 20rpx;"  @click="update">更新</button>
+				</view>	
+			</view>
+			
+		</view>	
+	</view>
+	
+</template>
+<script>
+	// import {ComponentPublicInstance} from 'vue'
+	export default {
+		name: 'lime-qrcode',
+		data() {
+			return {
+				text: 'qcoon.com.cn',
+				image: '',
+				index: 0,
+				levels: ['L', 'M', 'Q', 'H']
+			}
+		},
+		methods:{ 
+			success(src: string) {
+				console.log(`src`, src)
+			},
+			update() {
+				this.text =  `qcoon.cn?v=${Math.random()}`
+			},
+			onToggle() {
+				this.index++
+				this.index = this.index % this.levels.length
+			},
+			onClick() {
+				const el:LQrcodeComponentPublicInstance = this.$refs['qrcodeRef'] as LQrcodeComponentPublicInstance 
+				el.canvasToTempFilePath({
+					success:(res: TakeSnapshotSuccess)=>{
+						this.image = res.tempFilePath
+					}
+				})
+			}
+		},
+		mounted() {
+			
+		}
+	}
+</script>
+<style lang="scss">
+	$card-bg-color: var(--doc-card-bg-color, white);
+	// $page-bg-color: var(--doc-page-bg-color, #f5f5f5);
+	$title-color: var(--doc-title-color, #000000E6);
+	$summary-color: var(--doc-summary-color, #00000099);
+	
+	.demo-block {
+		margin: 32px 10px 0;
+		overflow: visible;
+		&.card{
+			background-color: $card-bg-color;
+			transition-property: background-color;
+			// transition-duration: 300ms;
+			padding: 30rpx;
+			margin-bottom: 20rpx;
+		}
+		&__title {
+			margin: 0;
+			margin-top: 8px;
+			&-text {
+				color: $summary-color;
+				font-weight: 400;
+				font-size: 14px;
+				line-height: 16px;
+				
+				&.large {
+					color: $title-color;
+					font-size: 18px;
+					font-weight: 700;
+					line-height: 26px;
+				}
+				&.ultra {
+					color: $title-color;
+					font-size: 24px;
+					font-weight: 700;
+					line-height: 32px;
+				}
+			}
+		}
+		&__desc-text {
+			color: $summary-color;
+			margin: 8px 16px 0 0;
+			font-size: 14px;
+			line-height: 22px;
+		}
+		&__body {
+			margin: 16px 0;
+			overflow: visible;
+			.demo-block {
+				// margin-top: 0px;
+				margin: 0;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/lime-qrcode/components/lime-qrcode/lime-qrcode.vue b/uni_modules/lime-qrcode/components/lime-qrcode/lime-qrcode.vue
new file mode 100644
index 0000000..f73a91f
--- /dev/null
+++ b/uni_modules/lime-qrcode/components/lime-qrcode/lime-qrcode.vue
@@ -0,0 +1,141 @@
+<template>
+	<view class="demo-block">
+		<text class="demo-block__title-text ultra">QRCode 二维码</text>
+		<text class="demo-block__desc-text">生成二维码</text>
+		<view class="demo-block__body">
+			
+			<view class="demo-block">
+				<text class="demo-block__title-text">基础</text>
+				<view class="demo-block__body">
+					<view style="display: flex; gap: 10px">
+					<image v-if="image" :src="image" style="width: 300rpx;" mode="widthFix"></image>
+					<l-qrcode :use2d="false" ref="qrcodeRef" value="https://limeui.qcoon.cn" size="300rpx" icon="https://img10.360buyimg.com/img/jfs/t1/182127/16/37474/11761/64659c31F0cd84976/21f25b952f03a49a.jpg" iconSize="70rpx"></l-qrcode>
+					<!-- <l-qrcode useCanvasToTempFilePath @success="success" value="https://limeui.qcoon.cn" size="300rpx" icon="https://img10.360buyimg.com/img/jfs/t1/182127/16/37474/11761/64659c31F0cd84976/21f25b952f03a49a.jpg" iconSize="70rpx"></l-qrcode> -->
+				</view>
+				<button @click="onClick">生成图片</button>				
+			</view>
+			</view>
+	
+			<view class="demo-block">
+				<text class="demo-block__title-text">颜色</text>
+				<view class="demo-block__body">
+					<view style="display: flex; gap: 10px">
+						<l-qrcode value="https://limeui.qcoon.cn" size="300rpx" color="rgb(82,196,26)"></l-qrcode>
+						<l-qrcode value="https://limeui.qcoon.cn" size="300rpx" color="rgb(22,119,255)" bgColor="rgb(245,245,245)"></l-qrcode>
+					</view>	
+				</view>
+			</view>
+			<view class="demo-block">
+				<text class="demo-block__title-text">纠错比例</text>
+				<view class="demo-block__body">
+					<l-qrcode value="img10.360buyimg.com/img/jfs/t1/182127/16/37474/11761/64659c31F0cd84976/21f25b952f03a49a.jpg" size="300rpx" :errorLevel="levels[index]"></l-qrcode>
+					<button @click="onToggle">切换纠错等级：{{levels[index]}}</button>
+				</view>
+			</view>
+			<view class="demo-block">
+				<text class="demo-block__title-text">动态</text>
+				<view class="demo-block__body">
+					<l-qrcode :value="text" size="300rpx" :marginSize="1" bgColor="white"></l-qrcode>
+					<button @click="update">更新</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	import {ref, defineComponent} from '@/uni_modules/lime-shared/vue'
+	export default defineComponent({
+		setup() {
+			const qrcodeRef = ref(null)
+			const image = ref(null)
+			const text = ref('qcoon.com.cn')
+			const levels = ['L', 'M', 'Q', 'H']
+			let index = ref(0)
+			const onToggle = () => {
+				index.value++
+				index.value = index.value % levels.length
+			}
+			const onClick = () => {
+				if(qrcodeRef.value) {
+					qrcodeRef.value.canvasToTempFilePath({
+						success(res) {
+							image.value = res.tempFilePath
+							console.log('success:::', res)
+						},
+						fail(err) {
+							console.log('err:::', err)
+						}
+					})
+				}
+			}
+			const success = (res) => {
+				console.log('res', res)
+			}
+			
+			const update = () =>{
+				text.value =  `qcoon.cn?v=${Math.random()}`
+			}
+			
+			return {
+				levels,
+				index,
+				image,
+				text,
+				qrcodeRef,
+				onClick,
+				update,
+				success,
+				onToggle,
+			}
+		}
+	})
+</script>
+<style lang="scss">
+	
+	.demo-block {
+		margin: 32px 10px 0;
+		overflow: visible;
+		&.card{
+			background-color: white;
+			padding: 30rpx;
+			margin-bottom: 20rpx;
+		}
+		&__title {
+			margin: 0;
+			margin-top: 8px;
+			&-text {
+				color: rgba(0, 0, 0, 0.6);
+				font-weight: 400;
+				font-size: 14px;
+				line-height: 16px;
+				display: flex;
+				&.large {
+					color: rgba(0, 0, 0, 0.9);
+					font-size: 18px;
+					font-weight: 700;
+					line-height: 26px;
+				}
+				&.ultra {
+					color: rgba(0, 0, 0, 0.9);
+					font-size: 24px;
+					font-weight: 700;
+					line-height: 32px;
+				}
+			}
+		}
+		&__desc-text {
+			color: rgba(0, 0, 0, 0.6);
+			margin: 8px 16px 0 0;
+			font-size: 14px;
+			line-height: 22px;
+		}
+		&__body {
+			margin: 16px 0;
+			overflow: visible;
+			.demo-block {
+				// margin-top: 0px;
+				margin: 0;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/lime-qrcode/hybrid/html/index.html b/uni_modules/lime-qrcode/hybrid/html/index.html
new file mode 100644
index 0000000..bf4def9
--- /dev/null
+++ b/uni_modules/lime-qrcode/hybrid/html/index.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+	<meta charset="UTF-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>lime-qrcode</title>
+	<style>
+		html,body,canvas {
+			margin: 0;
+			padding: 0;
+			width: 100%;
+			height: 100%;
+			pointer-events: none;
+			/* background-color: rgba(255,0,0,0.1) */
+		}
+	</style>
+</head>
+<body>
+	<canvas id="lime-qrcode"></canvas>
+	<script type="text/javascript" src="./uni.webview.1.5.3.js"></script>
+	<script type="text/javascript" src="./qrcode.min.js"></script>
+	<script>
+		var canvas = document.querySelector('#lime-qrcode')
+		var pixelRatio = window.devicePixelRatio || 1
+		function appendWatermark(image) {
+			emit('append', mark.toDataURL())
+		}
+		
+		var qrcode = new lime.QRCodeCanvas(canvas, {
+			pixelRatio,
+		})
+		function render(props) {
+			if(props.pixelRatio) {
+				pixelRatio = props.pixelRatio
+			}
+			if(qrcode) {
+				qrcode.render(props)
+			} 
+		}
+		function toDataURL(file) {
+			if(qrcode && canvas) {
+				try{
+					const image = canvas.toDataURL()
+					emit('toDataURL', {
+						file,
+						image
+					})
+				}catch(e){
+					emit('toDataURL', {
+						file,
+						msg: e
+					})
+				}
+				
+			} 
+		}
+		function emit(event, data) {
+			postMessage({
+				event,
+				data
+			});
+		};
+		function postMessage(data) {
+			uni.postMessage({
+				data
+			});
+		};
+		// render({
+		// 	content: ['Lime UI'],
+		// 	// rotate: -22,
+		// 	// baseSize: 2,
+		// 	// fontGap: 3
+		// })
+	</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/uni_modules/lime-qrcode/hybrid/html/qrcode.min.js b/uni_modules/lime-qrcode/hybrid/html/qrcode.min.js
new file mode 100644
index 0000000..a0c79ce
--- /dev/null
+++ b/uni_modules/lime-qrcode/hybrid/html/qrcode.min.js
@@ -0,0 +1,6 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).lime={})}(this,(function(e){"use strict";function t(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function n(e,t){for(var n=0;t.length>n;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function r(e,t,r){return t&&n(e.prototype,t),r&&n(e,r),Object.defineProperty(e,"prototype",{writable:!1}),e}function i(e,t){if(null==e)return{};var n,r,i=function(e,t){if(null==e)return{};var n,r,i={},o=Object.keys(e);for(r=0;o.length>r;r++)0>t.indexOf(n=o[r])&&(i[n]=e[n]);return i}(e,t);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);for(r=0;o.length>r;r++)0>t.indexOf(n=o[r])&&Object.prototype.propertyIsEnumerable.call(e,n)&&(i[n]=e[n])}return i}function o(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);t>n;n++)r[n]=e[n];return r}function a(e,t){var n="undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(!n){if(Array.isArray(e)||(n=function(e,t){if(e){if("string"==typeof e)return o(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);return"Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n?Array.from(e):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?o(e,t):void 0}}(e))||t&&e&&"number"==typeof e.length){n&&(e=n);var r=0,i=function(){};return{s:i,n:function(){return e.length>r?{done:!1,value:e[r++]}:{done:!0}},e:function(e){throw e},f:i}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var a,s=!0,u=!1;return{s:function(){n=n.call(e)},n:function(){var e=n.next();return s=e.done,e},e:function(e){u=!0,a=e},f:function(){try{s||null==n.return||n.return()}finally{if(u)throw a}}}}
+/**
+   * @license QR Code generator library (TypeScript)
+   * Copyright (c) Project Nayuki.
+   * SPDX-License-Identifier: MIT
+   */var s;!function(e){var n=function(){function n(e,r,i,o){if(t(this,n),this.version=void 0,this.errorCorrectionLevel=void 0,this.size=void 0,this.mask=void 0,this.modules=[],this.isFunction=[],this.version=e,this.errorCorrectionLevel=r,n.MIN_VERSION>e||e>n.MAX_VERSION)throw new RangeError("Version value out of range");if(-1>o||o>7)throw new RangeError("Mask value out of range");this.size=4*e+17;for(var a=[],u=0;this.size>u;u++)a.push(!1);for(var l=0;this.size>l;l++)this.modules.push(a.slice()),this.isFunction.push(a.slice());this.drawFunctionPatterns();var h=this.addEccAndInterleave(i);if(this.drawCodewords(h),-1==o)for(var c=1e9,f=0;8>f;f++){this.applyMask(f),this.drawFormatBits(f);var d=this.getPenaltyScore();c>d&&(o=f,c=d),this.applyMask(f)}s(o>=0&&7>=o),this.mask=o,this.applyMask(o),this.drawFormatBits(o),this.isFunction=[]}return r(n,[{key:"getModule",value:function(e,t){return e>=0&&this.size>e&&t>=0&&this.size>t&&this.modules[t][e]}},{key:"getModules",value:function(){return this.modules}},{key:"drawFunctionPatterns",value:function(){for(var e=0;this.size>e;e++)this.setFunctionModule(6,e,e%2==0),this.setFunctionModule(e,6,e%2==0);this.drawFinderPattern(3,3),this.drawFinderPattern(this.size-4,3),this.drawFinderPattern(3,this.size-4);for(var t=this.getAlignmentPatternPositions(),n=t.length,r=0;n>r;r++)for(var i=0;n>i;i++)0==r&&0==i||0==r&&i==n-1||r==n-1&&0==i||this.drawAlignmentPattern(t[r],t[i]);this.drawFormatBits(0),this.drawVersion()}},{key:"drawFormatBits",value:function(e){for(var t=this.errorCorrectionLevel.formatBits<<3|e,n=t,r=0;10>r;r++)n=n<<1^1335*(n>>>9);var i=21522^(t<<10|n);s(i>>>15==0);for(var a=0;5>=a;a++)this.setFunctionModule(8,a,o(i,a));this.setFunctionModule(8,7,o(i,6)),this.setFunctionModule(8,8,o(i,7)),this.setFunctionModule(7,8,o(i,8));for(var u=9;15>u;u++)this.setFunctionModule(14-u,8,o(i,u));for(var l=0;8>l;l++)this.setFunctionModule(this.size-1-l,8,o(i,l));for(var h=8;15>h;h++)this.setFunctionModule(8,this.size-15+h,o(i,h));this.setFunctionModule(8,this.size-8,!0)}},{key:"drawVersion",value:function(){if(this.version>=7){for(var e=this.version,t=0;12>t;t++)e=e<<1^7973*(e>>>11);var n=this.version<<12|e;s(n>>>18==0);for(var r=0;18>r;r++){var i=o(n,r),a=this.size-11+r%3,u=Math.floor(r/3);this.setFunctionModule(a,u,i),this.setFunctionModule(u,a,i)}}}},{key:"drawFinderPattern",value:function(e,t){for(var n=-4;4>=n;n++)for(var r=-4;4>=r;r++){var i=Math.max(Math.abs(r),Math.abs(n)),o=e+r,a=t+n;o>=0&&this.size>o&&a>=0&&this.size>a&&this.setFunctionModule(o,a,2!=i&&4!=i)}}},{key:"drawAlignmentPattern",value:function(e,t){for(var n=-2;2>=n;n++)for(var r=-2;2>=r;r++)this.setFunctionModule(e+r,t+n,1!=Math.max(Math.abs(r),Math.abs(n)))}},{key:"setFunctionModule",value:function(e,t,n){this.modules[t][e]=n,this.isFunction[t][e]=!0}},{key:"addEccAndInterleave",value:function(e){var t=this.version,r=this.errorCorrectionLevel;if(e.length!=n.getNumDataCodewords(t,r))throw new RangeError("Invalid argument");for(var i=n.NUM_ERROR_CORRECTION_BLOCKS[r.ordinal][t],o=n.ECC_CODEWORDS_PER_BLOCK[r.ordinal][t],a=Math.floor(n.getNumRawDataModules(t)/8),u=i-a%i,l=Math.floor(a/i),h=[],c=n.reedSolomonComputeDivisor(o),f=0,d=0;i>f;f++){var v=e.slice(d,d+l-o+(u>f?0:1));d+=v.length;var m=n.reedSolomonComputeRemainder(v,c);u>f&&v.push(0),h.push(v.concat(m))}for(var g=[],y=function(e){h.forEach((function(t,n){e==l-o&&u>n||g.push(t[e])}))},E=0;h[0].length>E;E++)y(E);return s(g.length==a),g}},{key:"drawCodewords",value:function(e){if(e.length!=Math.floor(n.getNumRawDataModules(this.version)/8))throw new RangeError("Invalid argument");for(var t=0,r=this.size-1;r>=1;r-=2){6==r&&(r=5);for(var i=0;this.size>i;i++)for(var a=0;2>a;a++){var u=r-a,l=0==(r+1&2)?this.size-1-i:i;!this.isFunction[l][u]&&8*e.length>t&&(this.modules[l][u]=o(e[t>>>3],7-(7&t)),t++)}}s(t==8*e.length)}},{key:"applyMask",value:function(e){if(0>e||e>7)throw new RangeError("Mask value out of range");for(var t=0;this.size>t;t++)for(var n=0;this.size>n;n++){var r=void 0;switch(e){case 0:r=(n+t)%2==0;break;case 1:r=t%2==0;break;case 2:r=n%3==0;break;case 3:r=(n+t)%3==0;break;case 4:r=(Math.floor(n/3)+Math.floor(t/2))%2==0;break;case 5:r=n*t%2+n*t%3==0;break;case 6:r=(n*t%2+n*t%3)%2==0;break;case 7:r=((n+t)%2+n*t%3)%2==0;break;default:throw Error("Unreachable")}!this.isFunction[t][n]&&r&&(this.modules[t][n]=!this.modules[t][n])}}},{key:"getPenaltyScore",value:function(){for(var e=0,t=0;this.size>t;t++){for(var r=!1,i=0,o=[0,0,0,0,0,0,0],u=0;this.size>u;u++)this.modules[t][u]==r?5==++i?e+=n.PENALTY_N1:i>5&&e++:(this.finderPenaltyAddHistory(i,o),r||(e+=this.finderPenaltyCountPatterns(o)*n.PENALTY_N3),r=this.modules[t][u],i=1);e+=this.finderPenaltyTerminateAndCount(r,i,o)*n.PENALTY_N3}for(var l=0;this.size>l;l++){for(var h=!1,c=0,f=[0,0,0,0,0,0,0],d=0;this.size>d;d++)this.modules[d][l]==h?5==++c?e+=n.PENALTY_N1:c>5&&e++:(this.finderPenaltyAddHistory(c,f),h||(e+=this.finderPenaltyCountPatterns(f)*n.PENALTY_N3),h=this.modules[d][l],c=1);e+=this.finderPenaltyTerminateAndCount(h,c,f)*n.PENALTY_N3}for(var v=0;this.size-1>v;v++)for(var m=0;this.size-1>m;m++){var g=this.modules[v][m];g==this.modules[v][m+1]&&g==this.modules[v+1][m]&&g==this.modules[v+1][m+1]&&(e+=n.PENALTY_N2)}var y,E=0,w=a(this.modules);try{for(w.s();!(y=w.n()).done;){E=y.value.reduce((function(e,t){return e+(t?1:0)}),E)}}catch(e){w.e(e)}finally{w.f()}var M=this.size*this.size,C=Math.ceil(Math.abs(20*E-10*M)/M)-1;return s(C>=0&&9>=C),s((e+=C*n.PENALTY_N4)>=0&&2568888>=e),e}},{key:"getAlignmentPatternPositions",value:function(){if(1==this.version)return[];for(var e=Math.floor(this.version/7)+2,t=32==this.version?26:2*Math.ceil((4*this.version+4)/(2*e-2)),n=[6],r=this.size-7;e>n.length;r-=t)n.splice(1,0,r);return n}},{key:"finderPenaltyCountPatterns",value:function(e){var t=e[1];s(3*this.size>=t);var n=t>0&&e[2]==t&&e[3]==3*t&&e[4]==t&&e[5]==t;return(!n||4*t>e[0]||t>e[6]?0:1)+(!n||4*t>e[6]||t>e[0]?0:1)}},{key:"finderPenaltyTerminateAndCount",value:function(e,t,n){return e&&(this.finderPenaltyAddHistory(t,n),t=0),this.finderPenaltyAddHistory(t+=this.size,n),this.finderPenaltyCountPatterns(n)}},{key:"finderPenaltyAddHistory",value:function(e,t){0==t[0]&&(e+=this.size),t.pop(),t.unshift(e)}}],[{key:"encodeText",value:function(t,r){var i=e.QrSegment.makeSegments(t);return n.encodeSegments(i,r)}},{key:"encodeBinary",value:function(t,r){var i=e.QrSegment.makeBytes(t);return n.encodeSegments([i],r)}},{key:"encodeSegments",value:function(e,t){var r,o,l=arguments.length>2&&void 0!==arguments[2]?arguments[2]:1,h=arguments.length>3&&void 0!==arguments[3]?arguments[3]:40,c=arguments.length>4&&void 0!==arguments[4]?arguments[4]:-1,f=5>=arguments.length||void 0===arguments[5]||arguments[5];if(n.MIN_VERSION>l||l>h||h>n.MAX_VERSION||-1>c||c>7)throw new RangeError("Invalid value");for(r=l;;r++){var d=8*n.getNumDataCodewords(r,t),v=u.getTotalBits(e,r);if(d>=v){o=v;break}if(r>=h)throw new RangeError("Data too long")}for(var m=0,g=[n.Ecc.MEDIUM,n.Ecc.QUARTILE,n.Ecc.HIGH];g.length>m;m++){var y=g[m];f&&o<=8*n.getNumDataCodewords(r,y)&&(t=y)}var E,w=[],M=a(e);try{for(M.s();!(E=M.n()).done;){var C=E.value;i(C.mode.modeBits,4,w),i(C.numChars,C.mode.numCharCountBits(r),w);var R,p=a(C.getData());try{for(p.s();!(R=p.n()).done;){var A=R.value;w.push(A)}}catch(e){p.e(e)}finally{p.f()}}}catch(e){M.e(e)}finally{M.f()}s(w.length==o);var P=8*n.getNumDataCodewords(r,t);s(P>=w.length),i(0,Math.min(4,P-w.length),w),i(0,(8-w.length%8)%8,w),s(w.length%8==0);for(var N=236;P>w.length;N^=253)i(N,8,w);for(var k=[];w.length>8*k.length;)k.push(0);return w.forEach((function(e,t){return k[t>>>3]|=e<<7-(7&t)})),new n(r,t,k,c)}},{key:"getNumRawDataModules",value:function(e){if(n.MIN_VERSION>e||e>n.MAX_VERSION)throw new RangeError("Version number out of range");var t=(16*e+128)*e+64;if(e>=2){var r=Math.floor(e/7)+2;t-=(25*r-10)*r-55,7>e||(t-=36)}return s(t>=208&&29648>=t),t}},{key:"getNumDataCodewords",value:function(e,t){return Math.floor(n.getNumRawDataModules(e)/8)-n.ECC_CODEWORDS_PER_BLOCK[t.ordinal][e]*n.NUM_ERROR_CORRECTION_BLOCKS[t.ordinal][e]}},{key:"reedSolomonComputeDivisor",value:function(e){if(1>e||e>255)throw new RangeError("Degree out of range");for(var t=[],r=0;e-1>r;r++)t.push(0);t.push(1);for(var i=1,o=0;e>o;o++){for(var a=0;t.length>a;a++)t[a]=n.reedSolomonMultiply(t[a],i),t.length>a+1&&(t[a]^=t[a+1]);i=n.reedSolomonMultiply(i,2)}return t}},{key:"reedSolomonComputeRemainder",value:function(e,t){var r,i=t.map((function(e){return 0})),o=a(e);try{var s=function(){var e=r.value^i.shift();i.push(0),t.forEach((function(t,r){return i[r]^=n.reedSolomonMultiply(t,e)}))};for(o.s();!(r=o.n()).done;)s()}catch(e){o.e(e)}finally{o.f()}return i}},{key:"reedSolomonMultiply",value:function(e,t){if(e>>>8!=0||t>>>8!=0)throw new RangeError("Byte out of range");for(var n=0,r=7;r>=0;r--)n=n<<1^285*(n>>>7),n^=(t>>>r&1)*e;return s(n>>>8==0),n}}]),n}();function i(e,t,n){if(0>t||t>31||e>>>t!=0)throw new RangeError("Value out of range");for(var r=t-1;r>=0;r--)n.push(e>>>r&1)}function o(e,t){return 0!=(e>>>t&1)}function s(e){if(!e)throw Error("Assertion error")}n.MIN_VERSION=1,n.MAX_VERSION=40,n.PENALTY_N1=3,n.PENALTY_N2=3,n.PENALTY_N3=40,n.PENALTY_N4=10,n.ECC_CODEWORDS_PER_BLOCK=[[-1,7,10,15,20,26,18,20,24,30,18,20,24,26,30,22,24,28,30,28,28,28,28,30,30,26,28,30,30,30,30,30,30,30,30,30,30,30,30,30,30],[-1,10,16,26,18,24,16,18,22,22,26,30,22,22,24,24,28,28,26,26,26,26,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28],[-1,13,22,18,26,18,24,18,22,20,24,28,26,24,20,30,24,28,28,26,30,28,30,30,30,30,28,30,30,30,30,30,30,30,30,30,30,30,30,30,30],[-1,17,28,22,16,22,28,26,26,24,28,24,28,22,24,24,30,28,28,26,28,30,24,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30]],n.NUM_ERROR_CORRECTION_BLOCKS=[[-1,1,1,1,1,1,2,2,2,2,4,4,4,4,4,6,6,6,6,7,8,8,9,9,10,12,12,12,13,14,15,16,17,18,19,19,20,21,22,24,25],[-1,1,1,1,2,2,4,4,4,5,5,5,8,9,9,10,10,11,13,14,16,17,17,18,20,21,23,25,26,28,29,31,33,35,37,38,40,43,45,47,49],[-1,1,1,2,2,4,4,6,6,8,8,8,10,12,16,12,17,16,18,21,20,23,23,25,27,29,34,34,35,38,40,43,45,48,51,53,56,59,62,65,68],[-1,1,1,2,4,4,4,5,6,8,8,11,11,16,16,18,16,19,21,25,25,25,34,30,32,35,37,40,42,45,48,51,54,57,60,63,66,70,74,77,81]],e.QrCode=n;var u=function(){function e(n,r,i){if(t(this,e),this.mode=void 0,this.numChars=void 0,this.bitData=void 0,this.mode=n,this.numChars=r,this.bitData=i,0>r)throw new RangeError("Invalid argument");this.bitData=i.slice()}return r(e,[{key:"getData",value:function(){return this.bitData.slice()}}],[{key:"makeBytes",value:function(t){var n,r=[],o=a(t);try{for(o.s();!(n=o.n()).done;){i(n.value,8,r)}}catch(e){o.e(e)}finally{o.f()}return new e(e.Mode.BYTE,t.length,r)}},{key:"makeNumeric",value:function(t){if(!e.isNumeric(t))throw new RangeError("String contains non-numeric characters");for(var n=[],r=0;t.length>r;){var o=Math.min(t.length-r,3);i(parseInt(t.substring(r,r+o),10),3*o+1,n),r+=o}return new e(e.Mode.NUMERIC,t.length,n)}},{key:"makeAlphanumeric",value:function(t){if(!e.isAlphanumeric(t))throw new RangeError("String contains unencodable characters in alphanumeric mode");var n,r=[];for(n=0;t.length>=n+2;n+=2){var o=45*e.ALPHANUMERIC_CHARSET.indexOf(t.charAt(n));i(o+=e.ALPHANUMERIC_CHARSET.indexOf(t.charAt(n+1)),11,r)}return t.length>n&&i(e.ALPHANUMERIC_CHARSET.indexOf(t.charAt(n)),6,r),new e(e.Mode.ALPHANUMERIC,t.length,r)}},{key:"makeSegments",value:function(t){return""==t?[]:e.isNumeric(t)?[e.makeNumeric(t)]:e.isAlphanumeric(t)?[e.makeAlphanumeric(t)]:[e.makeBytes(e.toUtf8ByteArray(t))]}},{key:"makeEci",value:function(t){var n=[];if(0>t)throw new RangeError("ECI assignment value out of range");if(128>t)i(t,8,n);else if(16384>t)i(2,2,n),i(t,14,n);else{if(t>=1e6)throw new RangeError("ECI assignment value out of range");i(6,3,n),i(t,21,n)}return new e(e.Mode.ECI,0,n)}},{key:"isNumeric",value:function(t){return e.NUMERIC_REGEX.test(t)}},{key:"isAlphanumeric",value:function(t){return e.ALPHANUMERIC_REGEX.test(t)}},{key:"getTotalBits",value:function(e,t){var n,r=0,i=a(e);try{for(i.s();!(n=i.n()).done;){var o=n.value,s=o.mode.numCharCountBits(t);if(o.numChars>=1<<s)return 1/0;r+=4+s+o.bitData.length}}catch(e){i.e(e)}finally{i.f()}return r}},{key:"toUtf8ByteArray",value:function(e){e=encodeURI(e);for(var t=[],n=0;e.length>n;n++)"%"!=e.charAt(n)?t.push(e.charCodeAt(n)):(t.push(parseInt(e.substring(n+1,n+3),16)),n+=2);return t}}]),e}();u.NUMERIC_REGEX=/^[0-9]*$/,u.ALPHANUMERIC_REGEX=/^[A-Z0-9 $%*+.\/:-]*$/,u.ALPHANUMERIC_CHARSET="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:",e.QrSegment=u}(s||(s={})),function(e){!function(e){var n=r((function e(n,r){t(this,e),this.ordinal=void 0,this.formatBits=void 0,this.ordinal=n,this.formatBits=r}));n.LOW=new n(0,1),n.MEDIUM=new n(1,0),n.QUARTILE=new n(2,3),n.HIGH=new n(3,2),e.Ecc=n}(e.QrCode||(e.QrCode={}))}(s||(s={})),function(e){!function(e){var n=function(){function e(n,r){t(this,e),this.modeBits=void 0,this.numBitsCharCount=void 0,this.modeBits=n,this.numBitsCharCount=r}return r(e,[{key:"numCharCountBits",value:function(e){return this.numBitsCharCount[Math.floor((e+7)/17)]}}]),e}();n.NUMERIC=new n(1,[10,12,14]),n.ALPHANUMERIC=new n(2,[9,11,13]),n.BYTE=new n(4,[8,16,16]),n.KANJI=new n(8,[8,10,12]),n.ECI=new n(7,[0,0,0]),e.Mode=n}(e.QrSegment||(e.QrSegment={}))}(s||(s={}));var u=s,l=["value","size","level","bgColor","fgColor","includeMargin","marginSize","imageSettings"],h={L:u.QrCode.Ecc.LOW,M:u.QrCode.Ecc.MEDIUM,Q:u.QrCode.Ecc.QUARTILE,H:u.QrCode.Ecc.HIGH};function c(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=[];return e.forEach((function(e,r){var i=null;e.forEach((function(o,a){if(!o&&null!==i)return n.push("M".concat(i+t," ").concat(r+t,"h").concat(a-i,"v1H").concat(i+t,"z")),void(i=null);if(a!==e.length-1)o&&null===i&&(i=a);else{if(!o)return;n.push(null===i?"M".concat(a+t,",").concat(r+t," h1v1H").concat(a+t,"z"):"M".concat(i+t,",").concat(r+t," h").concat(a+1-i,"v1H").concat(i+t,"z"))}}))})),n.join("")}function f(e,t){return e.slice().map((function(e,n){return t.y>n||n>=t.y+t.h?e:e.map((function(e,n){return(t.x>n||n>=t.x+t.w)&&e}))}))}var d=function(){function e(n,r){var i=this;for(var o in t(this,e),this.canvas=void 0,this.pixelRatio="undefined"!=typeof window?window.devicePixelRatio:1,this.path2D=!0,this.SUPPORTS_PATH2D=void 0,this.createImage=function(){return new Image},this.createPath2D=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:void 0,t="createPath2D";return i.canvas&&t in i.canvas?i.canvas[t](e):new Path2D(e)},this.canvas=n,r)o in this&&(this[o]=r[o]);this.SUPPORTS_PATH2D=function(){try{i.createPath2D()}catch(e){return!1}return!0}()}return r(e,[{key:"render",value:function(e,t){var n=this,r=e.value,o=e.size,a=void 0===o?128:o,s=e.level,d=void 0===s?"L":s,v=e.bgColor,m=void 0===v?"#FFFFFF":v,g=e.fgColor,y=void 0===g?"#000000":g,E=e.includeMargin,w=void 0!==E&&E,M=e.marginSize,C=e.imageSettings,R=(i(e,l),null==C?void 0:C.src),p=this.canvas,A=p.getContext("2d");if(A&&r){var P=u.QrCode.encodeText(r,h[d]).getModules(),N=function(e,t){return null!=t?Math.floor(t):e?4:0}(w,M),k=P.length+2*N,S=function(e,t,n,r){if(null==r)return null;var i=e.length+2*n,o=Math.floor(.1*t),a=i/t,s=(r.width||o)*a,u=(r.height||o)*a,l=null==r.x?e.length/2-s/2:r.x*a,h=null==r.y?e.length/2-u/2:r.y*a,c=null;if(r.excavate){var f=Math.floor(l),d=Math.floor(h);c={x:f,y:d,w:Math.ceil(s+l-f),h:Math.ceil(u+h-d)}}return{x:l,y:h,h:u,w:s,excavation:c}}(P,a,N,C),I=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:null,r=null!=S&&null!==e&&e.complete&&0!==e.naturalHeight&&0!==e.naturalWidth;r&&null!=S.excavation&&(P=f(P,S.excavation)),t&&t(P);var i=n.pixelRatio;A.clearRect(0,0,p.width,p.height),A.setTransform(1,0,0,1,0,0),p.height=p.width=a*i;var o=a/k*i;if(A.scale(o,o),A.fillStyle=m,A.fillRect(0,0,k,k),A.fillStyle=y,n.SUPPORTS_PATH2D&&n.path2D){var s=n.createPath2D(c(P,N));A.fill(s)}else P.forEach((function(e,t){e.forEach((function(e,n){e&&A.fillRect(n+N,t+N,1,1)}))}));var u=(null==e?void 0:e.path)||e;r&&A.drawImage(u,S.x+N,S.y+N,S.w,S.h),"draw"in A&&A.draw()};if(R){var b=this.createImage(p);b.onload=function(){I(b)},b.onerror=function(e){I(),console.warn(e)},b.src=R}else I()}}}]),e}();e.QRCodeCanvas=d,Object.defineProperty(e,"__esModule",{value:!0})}));
diff --git a/uni_modules/lime-qrcode/hybrid/html/uni.webview.1.5.3.js b/uni_modules/lime-qrcode/hybrid/html/uni.webview.1.5.3.js
new file mode 100644
index 0000000..d6524fa
--- /dev/null
+++ b/uni_modules/lime-qrcode/hybrid/html/uni.webview.1.5.3.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e=e||self).uni=n()}(this,(function(){"use strict";try{var e={};Object.defineProperty(e,"passive",{get:function(){!0}}),window.addEventListener("test-passive",null,e)}catch(e){}var n=Object.prototype.hasOwnProperty;function i(e,i){return n.call(e,i)}var t=[];function o(){return window.__dcloud_weex_postMessage||window.__dcloud_weex_}var r=function(e,n){var i={options:{timestamp:+new Date},name:e,arg:n};if(o()){if("postMessage"===e){var r={data:[n]};return window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessage(r):window.__dcloud_weex_.postMessage(JSON.stringify(r))}var a={type:"WEB_INVOKE_APPSERVICE",args:{data:i,webviewIds:t}};window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessageToService(a):window.__dcloud_weex_.postMessageToService(JSON.stringify(a))}if(!window.plus)return window.parent.postMessage({type:"WEB_INVOKE_APPSERVICE",data:i,pageId:""},"*");if(0===t.length){var d=plus.webview.currentWebview();if(!d)throw new Error("plus.webview.currentWebview() is undefined");var s=d.parent(),w="";w=s?s.id:d.id,t.push(w)}if(plus.webview.getWebviewById("__uniapp__service"))plus.webview.postMessageToUniNView({type:"WEB_INVOKE_APPSERVICE",args:{data:i,webviewIds:t}},"__uniapp__service");else{var u=JSON.stringify(i);plus.webview.getLaunchWebview().evalJS('UniPlusBridge.subscribeHandler("'.concat("WEB_INVOKE_APPSERVICE",'",').concat(u,",").concat(JSON.stringify(t),");"))}},a={navigateTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;r("navigateTo",{url:encodeURI(n)})},navigateBack:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.delta;r("navigateBack",{delta:parseInt(n)||1})},switchTab:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;r("switchTab",{url:encodeURI(n)})},reLaunch:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;r("reLaunch",{url:encodeURI(n)})},redirectTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;r("redirectTo",{url:encodeURI(n)})},getEnv:function(e){o()?e({nvue:!0}):window.plus?e({plus:!0}):e({h5:!0})},postMessage:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};r("postMessage",e.data||{})}},d=/uni-app/i.test(navigator.userAgent),s=/Html5Plus/i.test(navigator.userAgent),w=/complete|loaded|interactive/;var u=window.my&&navigator.userAgent.indexOf("AlipayClient")>-1;var g=window.swan&&window.swan.webView&&/swan/i.test(navigator.userAgent);var c=window.qq&&window.qq.miniProgram&&/QQ/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var v=window.tt&&window.tt.miniProgram&&/toutiaomicroapp/i.test(navigator.userAgent);var m=window.wx&&window.wx.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var p=window.qa&&/quickapp/i.test(navigator.userAgent);var f=window.ks&&window.ks.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var l=window.tt&&window.tt.miniProgram&&/Lark|Feishu/i.test(navigator.userAgent);var _=window.jd&&window.jd.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);for(var E,b=function(){window.UniAppJSBridge=!0,document.dispatchEvent(new CustomEvent("UniAppJSBridgeReady",{bubbles:!0,cancelable:!0}))},h=[function(e){if(d||s)return window.__dcloud_weex_postMessage||window.__dcloud_weex_?document.addEventListener("DOMContentLoaded",e):window.plus&&w.test(document.readyState)?setTimeout(e,0):document.addEventListener("plusready",e),a},function(e){if(m)return window.WeixinJSBridge&&window.WeixinJSBridge.invoke?setTimeout(e,0):document.addEventListener("WeixinJSBridgeReady",e),window.wx.miniProgram},function(e){if(c)return window.QQJSBridge&&window.QQJSBridge.invoke?setTimeout(e,0):document.addEventListener("QQJSBridgeReady",e),window.qq.miniProgram},function(e){if(u){document.addEventListener("DOMContentLoaded",e);var n=window.my;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){if(g)return document.addEventListener("DOMContentLoaded",e),window.swan.webView},function(e){if(v)return document.addEventListener("DOMContentLoaded",e),window.tt.miniProgram},function(e){if(p){window.QaJSBridge&&window.QaJSBridge.invoke?setTimeout(e,0):document.addEventListener("QaJSBridgeReady",e);var n=window.qa;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){if(f)return window.WeixinJSBridge&&window.WeixinJSBridge.invoke?setTimeout(e,0):document.addEventListener("WeixinJSBridgeReady",e),window.ks.miniProgram},function(e){if(l)return document.addEventListener("DOMContentLoaded",e),window.tt.miniProgram},function(e){if(_)return window.JDJSBridgeReady&&window.JDJSBridgeReady.invoke?setTimeout(e,0):document.addEventListener("JDJSBridgeReady",e),window.jd.miniProgram},function(e){return document.addEventListener("DOMContentLoaded",e),a}],y=0;y<h.length&&!(E=h[y](b));y++);E||(E={});var B="undefined"!=typeof uni?uni:{};if(!B.navigateTo)for(var S in E)i(E,S)&&(B[S]=E[S]);return B.webView=E,B}));
diff --git a/uni_modules/lime-qrcode/package.json b/uni_modules/lime-qrcode/package.json
new file mode 100644
index 0000000..2a06587
--- /dev/null
+++ b/uni_modules/lime-qrcode/package.json
@@ -0,0 +1,108 @@
+{
+  "id": "lime-qrcode",
+  "displayName": "qrcode 二维码生成",
+  "version": "0.2.4",
+  "description": "一款全平台通用的二维码生成插件，支持uniapp/uniappx",
+  "keywords": [
+    "qrcode",
+    "qr",
+    "uvue",
+    "生成图片",
+    "二维码"
+],
+  "repository": "",
+  "engines": {
+    "uni-app": "^4.41",
+    "uni-app-x": "^4.61"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": "305716444"
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "",
+    "darkmode": "x",
+    "i18n": "x",
+    "widescreen": "x"
+  },
+  "uni_modules": {
+    "dependencies": [
+      "lime-shared"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "√",
+        "aliyun": "√",
+        "alipay": "√"
+      },
+      "client": {
+        "uni-app": {
+          "vue": {
+            "vue2": "√",
+            "vue3": "√"
+          },
+          "web": {
+            "safari": "√",
+            "chrome": "√"
+          },
+          "app": {
+            "vue": "√",
+            "nvue": "√",
+            "android": {
+                "extVersion": "",
+                "minVersion": "21"
+            },
+            "ios": "√",
+            "harmony": "√"
+          },
+          "mp": {
+            "weixin": "√",
+            "alipay": "√",
+            "toutiao": "√",
+            "baidu": "√",
+            "kuaishou": "√",
+            "jd": "√",
+            "harmony": "-",
+            "qq": "√",
+            "lark": "√"
+          },
+          "quickapp": {
+            "huawei": "-",
+            "union": "-"
+          }
+        },
+        "uni-app-x": {
+          "web": {
+            "safari": "√",
+            "chrome": "√"
+          },
+          "app": {
+            "android": {
+                "extVersion": "",
+                "minVersion": "21"
+            },
+            "ios": "√",
+            "harmony": "√"
+          },
+          "mp": {
+            "weixin": "√"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/lime-qrcode/readme - 副本.md b/uni_modules/lime-qrcode/readme - 副本.md
new file mode 100644
index 0000000..e5e5e9f
--- /dev/null
+++ b/uni_modules/lime-qrcode/readme - 副本.md	
@@ -0,0 +1,166 @@
+# lime-qrcode 二维码
+- 一款全平台通用的二维码生成插件，支持uniapp/uniappx
+- uniappx app 需要导入[lime-qrcodegen](https://ext.dcloud.net.cn/plugin?id=15838)
+
+
+## 文档
+  [qrcode【站点1】](https://limex.qcoon.cn/components/qrcode.html)
+  [qrcode【站点2】](https://limeui.netlify.app/components/qrcode.html)
+  [qrcode【站点3】](https://limeui.familyzone.top/components/qrcode.html)
+
+
+
+## 安装
+在插件市场导入即可。
+
+**注意**
+- uniappx app 需要导入**[lime-qrcodegen](https://ext.dcloud.net.cn/plugin?id=15838)**,
+- 非uniappx app可直接使用
+
+## 代码演示
+
+### 基础使用
+
+```html
+<l-qrcode value="http://lime.qcoon.cn" />
+```
+
+
+### ICON
+- 带 Icon 的二维码
+
+```html
+<l-qrcode value="https://limeui.qcoon.cn" size="300rpx" icon="/static/logo.png" iconSize="70rpx"></l-qrcode>
+```
+
+### 颜色
+- 通过设置 `color` 自定义二维码颜色，通过设置 `bgColor` 自定义背景颜色。
+
+```html
+<l-qrcode value="https://limeui.qcoon.cn" size="300rpx" color="rgb(82,196,26)"></l-qrcode>
+<l-qrcode value="https://limeui.qcoon.cn" size="300rpx" color="rgb(22,119,255)" bgColor="rgb(245,245,245)"></l-qrcode>
+```
+
+### 纠错比例
+- 通过设置 `errorLevel` 调整不同的容错等级。
+
+```html
+<l-qrcode value="img10.360buyimg.com/img/jfs/t1/182127/16/37474/11761/64659c31F0cd84976/21f25b952f03a49a.jpg" size="300rpx" errorLevel="H"></l-qrcode>
+```
+
+### 生成图片
+如果是canvas 2d的环境生成的是base64
+- 1、通过调用插件的`canvasToTempFilePath`方法生成图片。
+
+```html
+<image v-if="image" :src="image" style="width: 300rpx;" mode="widthFix"></image>
+<l-qrcode ref="qrcodeRef" value="https://limeui.qcoon.cn" size="300rpx" icon="https://img10.360buyimg.com/img/jfs/t1/182127/16/37474/11761/64659c31F0cd84976/21f25b952f03a49a.jpg" iconSize="70rpx"></l-qrcode>
+<button @click="onClick">生成图片</button>
+```
+```js
+// vue3
+const qrcodeRef = ref(null)
+const onClick = () => {
+	if(!qrcodeRef.value) return
+	qrcodeRef.value.canvasToTempFilePath({
+		success(res) {
+			image.value = res.tempFilePath
+			console.log('success:::', res)
+		},
+		fail(err) {
+			console.log('err:::', err)
+		}
+	})
+}
+
+// vue2
+const el = this.$refs['qrcodeRef'] 
+el.canvasToTempFilePath({
+	success:(res)=>{
+		this.image = res.tempFilePath
+	},
+	fail(err) {
+		console.log('err:::', err)
+	}
+})
+
+// uvue
+const el:LQrcodeComponentPublicInstance = this.$refs['qrcodeRef'] as LQrcodeComponentPublicInstance 
+el.canvasToTempFilePath({
+	success:(res: TakeSnapshotSuccess)=>{
+		this.image = res.tempFilePath
+	},
+	fail(err: TakeSnapshotFail) {
+		console.log('err:::', err)
+	}
+})
+```
+
+- 2、通过设置`useCanvasToTempFilePath`在`success`事件里接收图片地址
+
+```html
+<image v-if="image" :src="image" style="width: 300rpx;" mode="widthFix"></image>
+<l-qrcode useCanvasToTempFilePath @success="success" value="https://limeui.qcoon.cn"></l-qrcode>
+```
+```js
+const image = ref(null)
+const success = (img) => {
+	image.value = img
+}
+```
+
+### Vue2使用
+- 插件使用了`composition-api`, 如果你希望在vue2中使用请按官方的教程[vue-composition-api](https://uniapp.dcloud.net.cn/tutorial/vue-composition-api.html)配置
+- 关键代码是: 在main.js中 在vue2部分加上这一段即可
+
+```js
+// main.js vue2
+import Vue from 'vue'
+import VueCompositionAPI from '@vue/composition-api'
+Vue.use(VueCompositionAPI)
+```
+另外插件也用到了TS，vue2可能会遇过官方的TS版本过低的问题,找到HX目录下的`compile-typescript`目录
+```cmd
+// \HBuilderX\plugins\compile-typescript
+yarn add typescript -D
+- or - 
+npm install typescript -D
+```
+
+### 查看示例
+- 导入后直接使用这个标签查看演示效果
+
+```html
+// 代码位于 uni_modules/lime-qrcode/compoents/lime-qrcode
+<lime-qrcode />
+```
+
+### 插件标签
+- 默认 l-qrcode 为 component
+- 默认 lime-qrcode 为 demo
+
+
+
+## API
+
+### Props
+
+| 参数                       | 说明                                                         | 类型             | 默认值       |
+| --------------------------| ------------------------------------------------------------ | ---------------- | ------------ |
+| value                     | 扫描后的文本                                       			| <em>string</em>  | `-`        |
+| icon                      | 二维码中图片的地址                                              | <em>string</em>  | `-`        |
+| size                      | 二维码大小                                                      | <em>number，string</em>  | `160`     |
+| iconSize           		| 二维码中图片的大小                                                | <em>number，string</em>  | `40`      |
+| color           	        | 二维码颜色                                                        | <em>string</em>  | `-`      |
+| bgColor           	    | 二维码背景颜色          	                                      | <em>string</em>  | `-`  |
+| errorLevel             	| 二维码纠错等级       					                         | `'L' | 'M' | 'Q' | 'H' ` | `M`  |
+| marginSize             	| 边距码大小，默认为0码点      					                          | <em>number</em>  | `0`     |
+
+### 常见问题
+- icon 是网络地址时，H5和Nvue需要解决跨域问题，小程序需要配置download
+
+## 打赏
+
+如果你觉得本插件，解决了你的问题，赠人玫瑰，手留余香。  
+![](https://testingcf.jsdelivr.net/gh/liangei/image@1.9/alipay.png)
+![](https://testingcf.jsdelivr.net/gh/liangei/image@1.9/wpay.png)
\ No newline at end of file
diff --git a/uni_modules/lime-qrcode/readme.md b/uni_modules/lime-qrcode/readme.md
new file mode 100644
index 0000000..10f53cc
--- /dev/null
+++ b/uni_modules/lime-qrcode/readme.md
@@ -0,0 +1,172 @@
+# lime-qrcode 二维码组件
+一个功能丰富的二维码生成组件，用于生成自定义二维码。支持自定义大小、颜色、图标、边框等多种配置，可用于分享链接、支付码、名片等多种场景。组件提供了丰富的自定义选项，可以满足各种二维码生成需求。
+
+> 插件依赖：`lime-shared`
+
+## 文档链接
+📚 组件详细文档请访问以下站点：
+- [二维码组件文档 - 站点1](https://limex.qcoon.cn/components/qrcode.html)
+- [二维码组件文档 - 站点2](https://limeui.netlify.app/components/qrcode.html)
+- [二维码组件文档 - 站点3](https://limeui.familyzone.top/components/qrcode.html)
+
+## 安装方法
+1. 在uni-app插件市场中搜索并导入`lime-qrcode`
+2. 导入后可能需要重新编译项目
+3. 在页面中使用`l-qrcode`组件
+
+::: tip 注意🔔 
+uniappx app 需要导入[【lime-qrcodegen】](https://ext.dcloud.net.cn/plugin?id=1583)这个依赖插件，它是收费的插件，普通授权则需要自定义基座，才能使用，如果您是UI组件库VIP则忽略。
+:::
+
+
+## 代码演示
+
+### 基础使用
+
+```html
+<l-qrcode value="http://lime.qcoon.cn" />
+```
+
+
+### ICON
+- 带 Icon 的二维码
+
+```html
+<l-qrcode value="https://limeui.qcoon.cn" size="300rpx" icon="/static/logo.png" iconSize="70rpx"></l-qrcode>
+```
+
+### 颜色
+- 通过设置 `color` 自定义二维码颜色，通过设置 `bgColor` 自定义背景颜色。
+
+```html
+<l-qrcode value="https://limeui.qcoon.cn" size="300rpx" color="rgb(82,196,26)"></l-qrcode>
+<l-qrcode value="https://limeui.qcoon.cn" size="300rpx" color="rgb(22,119,255)" bgColor="rgb(245,245,245)"></l-qrcode>
+```
+
+### 纠错比例
+- 通过设置 `errorLevel` 调整不同的容错等级。
+
+```html
+<l-qrcode value="img10.360buyimg.com/img/jfs/t1/182127/16/37474/11761/64659c31F0cd84976/21f25b952f03a49a.jpg" size="300rpx" errorLevel="H"></l-qrcode>
+```
+
+### 生成图片
+如果是canvas 2d的环境生成的是base64
+- 1、通过调用插件的`canvasToTempFilePath`方法生成图片。
+
+```html
+<image v-if="image" :src="image" style="width: 300rpx;" mode="widthFix"></image>
+<l-qrcode ref="qrcodeRef" value="https://limeui.qcoon.cn" size="300rpx" icon="https://img10.360buyimg.com/img/jfs/t1/182127/16/37474/11761/64659c31F0cd84976/21f25b952f03a49a.jpg" iconSize="70rpx"></l-qrcode>
+<button @click="onClick">生成图片</button>
+```
+```js
+// vue3
+const qrcodeRef = ref(null)
+const onClick = () => {
+	if(!qrcodeRef.value) return
+	qrcodeRef.value.canvasToTempFilePath({
+		success(res) {
+			image.value = res.tempFilePath
+			console.log('success:::', res)
+		},
+		fail(err) {
+			console.log('err:::', err)
+		}
+	})
+}
+
+// vue2
+const el = this.$refs['qrcodeRef'] 
+el.canvasToTempFilePath({
+	success:(res)=>{
+		this.image = res.tempFilePath
+	},
+	fail(err) {
+		console.log('err:::', err)
+	}
+})
+
+// uvue
+const el:LQrcodeComponentPublicInstance = this.$refs['qrcodeRef'] as LQrcodeComponentPublicInstance 
+el.canvasToTempFilePath({
+	success:(res: TakeSnapshotSuccess)=>{
+		this.image = res.tempFilePath
+	},
+	fail(err: TakeSnapshotFail) {
+		console.log('err:::', err)
+	}
+})
+```
+
+- 2、通过设置`useCanvasToTempFilePath`在`success`事件里接收图片地址
+
+```html
+<image v-if="image" :src="image" style="width: 300rpx;" mode="widthFix"></image>
+<l-qrcode useCanvasToTempFilePath @success="success" value="https://limeui.qcoon.cn"></l-qrcode>
+```
+```js
+const image = ref(null)
+const success = (img) => {
+	image.value = img
+}
+```
+
+## 快速预览
+导入插件后，可以直接使用以下标签查看演示效果：
+
+```html
+<!-- 代码位于 uni_modules/lime-qrcode/components/lime-qrcode -->
+<lime-qrcode />
+```
+
+## 插件标签说明
+
+| 标签名 | 说明 | 
+| --- | --- | 
+| `l-qrcode` | 组件标签 |
+| `lime-qrcode` | 演示标签 |
+
+## Vue2使用说明
+main.js中添加以下代码：
+```js
+// vue2项目中使用
+import Vue from 'vue'
+import VueCompositionAPI from '@vue/composition-api'
+Vue.use(VueCompositionAPI)
+```
+
+详细配置请参考官方文档：[Vue Composition API](https://uniapp.dcloud.net.cn/tutorial/vue-composition-api.html)
+
+
+## API文档
+
+### Props 属性说明
+
+| 属性名 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| value | 二维码内容 | _string_ | - |
+| size | 二维码大小 | _number \| string_ | `160` |
+| color | 二维码颜色 | _string_ | `#000` |
+| bgColor | 二维码背景色 | _string_ | `transparent` |
+| icon | 二维码中心图标 | _string_ | - |
+| iconSize | 图标大小 | _number \| string_ | `40` |
+| marginSize | 二维码外边距 | _number_ | - |
+| bordered | 是否显示边框 | _boolean_ | `true` |
+| errorLevel | 纠错级别，可选值为 `L`、`M`、`Q`、`H` | _string_ | `M` |
+| useCanvasToTempFilePath | 是否使用Canvas导出为临时文件 | _boolean_ | `false` |
+| use2d | 是否使用2D Canvas | _boolean_ | `true` |
+
+### Events 事件
+
+| 事件名 | 说明 | 回调参数 |
+| --- | --- | --- |
+| complete | 二维码生成完成时触发 | _path: string_ 临时文件路径（仅当 useCanvasToTempFilePath 为 true 时有效） |
+| error | 二维码生成失败时触发 | _error: Error_ 错误信息 |
+
+## 支持与赞赏
+
+如果你觉得本插件解决了你的问题，可以考虑支持作者：
+
+| 支付宝赞助 | 微信赞助 |
+|------------|------------|
+| ![](https://testingcf.jsdelivr.net/gh/liangei/image@1.9/alipay.png) | ![](https://testingcf.jsdelivr.net/gh/liangei/image@1.9/wpay.png) |
\ No newline at end of file
diff --git a/uni_modules/lime-shared/addUnit/index.ts b/uni_modules/lime-shared/addUnit/index.ts
new file mode 100644
index 0000000..4e41311
--- /dev/null
+++ b/uni_modules/lime-shared/addUnit/index.ts
@@ -0,0 +1,42 @@
+// @ts-nocheck
+import {isNumeric} from '../isNumeric'
+import {isDef} from '../isDef'
+/**
+ * 给一个值添加单位（像素 px）
+ * @param value 要添加单位的值，可以是字符串或数字
+ * @returns 添加了单位的值，如果值为 null 则返回 null
+ */
+
+// #ifndef UNI-APP-X && APP
+export function addUnit(value?: string | number): string | null {
+  if (!isDef(value)) {
+    return null;
+  }
+  value = String(value); // 将值转换为字符串
+  // 如果值是数字，则在后面添加单位 "px"，否则保持原始值
+  return isNumeric(value) ? `${value}px` : value;
+}
+// #endif
+
+
+// #ifdef UNI-APP-X && APP
+function addUnit(value: string): string|null
+function addUnit(value: number): string|null
+function addUnit(value: string|number|null): string|null  {
+  if (!isDef(value)) {
+    return null;
+  }
+  value = `${value}` //value.toString(); // 将值转换为字符串
+
+  // 如果值是数字，则在后面添加单位 "px"，否则保持原始值
+  return isNumeric(value) ? `${value}px` : value;
+}
+export {addUnit}
+// #endif
+
+
+// console.log(addUnit(100)); // 输出: "100px"
+// console.log(addUnit("200")); // 输出: "200px"
+// console.log(addUnit("300px")); // 输出: "300px"（已经包含单位）
+// console.log(addUnit()); // 输出: undefined（值为 undefined）
+// console.log(addUnit(null)); // 输出: undefined（值为 null）
\ No newline at end of file
diff --git a/uni_modules/lime-shared/animation/bezier.ts b/uni_modules/lime-shared/animation/bezier.ts
new file mode 100644
index 0000000..b4239e1
--- /dev/null
+++ b/uni_modules/lime-shared/animation/bezier.ts
@@ -0,0 +1,82 @@
+export function cubicBezier(p1x : number, p1y : number, p2x : number, p2y : number):(x: number)=> number {
+	const ZERO_LIMIT = 1e-6;
+	// Calculate the polynomial coefficients,
+	// implicit first and last control points are (0,0) and (1,1).
+	const ax = 3 * p1x - 3 * p2x + 1;
+	const bx = 3 * p2x - 6 * p1x;
+	const cx = 3 * p1x;
+
+	const ay = 3 * p1y - 3 * p2y + 1;
+	const by = 3 * p2y - 6 * p1y;
+	const cy = 3 * p1y;
+
+	function sampleCurveDerivativeX(t : number) : number {
+		// `ax t^3 + bx t^2 + cx t` expanded using Horner's rule
+		return (3 * ax * t + 2 * bx) * t + cx;
+	}
+
+	function sampleCurveX(t : number) : number {
+		return ((ax * t + bx) * t + cx) * t;
+	}
+
+	function sampleCurveY(t : number) : number {
+		return ((ay * t + by) * t + cy) * t;
+	}
+
+	// Given an x value, find a parametric value it came from.
+	function solveCurveX(x : number) : number {
+		let t2 = x;
+		let derivative : number;
+		let x2 : number;
+
+		// https://trac.webkit.org/browser/trunk/Source/WebCore/platform/animation
+		// first try a few iterations of Newton's method -- normally very fast.
+		// http://en.wikipedia.org/wikiNewton's_method
+		for (let i = 0; i < 8; i++) {
+			// f(t) - x = 0
+			x2 = sampleCurveX(t2) - x;
+			if (Math.abs(x2) < ZERO_LIMIT) {
+				return t2;
+			}
+			derivative = sampleCurveDerivativeX(t2);
+			// == 0, failure
+			/* istanbul ignore if */
+			if (Math.abs(derivative) < ZERO_LIMIT) {
+				break;
+			}
+			t2 -= x2 / derivative;
+		}
+
+		// Fall back to the bisection method for reliability.
+		// bisection
+		// http://en.wikipedia.org/wiki/Bisection_method
+		let t1 = 1;
+		/* istanbul ignore next */
+		let t0 = 0;
+
+		/* istanbul ignore next */
+		t2 = x;
+		/* istanbul ignore next */
+		while (t1 > t0) {
+			x2 = sampleCurveX(t2) - x;
+			if (Math.abs(x2) < ZERO_LIMIT) {
+				return t2;
+			}
+			if (x2 > 0) {
+				t1 = t2;
+			} else {
+				t0 = t2;
+			}
+			t2 = (t1 + t0) / 2;
+		}
+
+		// Failure
+		return t2;
+	}
+
+	return function (x : number) : number {
+		return sampleCurveY(solveCurveX(x));
+	}
+
+	// return solve;
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/animation/ease.ts b/uni_modules/lime-shared/animation/ease.ts
new file mode 100644
index 0000000..0af156e
--- /dev/null
+++ b/uni_modules/lime-shared/animation/ease.ts
@@ -0,0 +1,3 @@
+import {cubicBezier} from './bezier';
+export let ease = cubicBezier(0.25, 0.1, 0.25, 1);
+export let linear = cubicBezier(0,0,1,1);
\ No newline at end of file
diff --git a/uni_modules/lime-shared/animation/index.ts b/uni_modules/lime-shared/animation/index.ts
new file mode 100644
index 0000000..c384182
--- /dev/null
+++ b/uni_modules/lime-shared/animation/index.ts
@@ -0,0 +1,12 @@
+// @ts-nocheck
+// #ifdef UNI-APP-X && APP
+// export * from './uvue.uts'
+export { Timeline, Animation } from './uvue.uts'
+// #endif
+
+
+
+// #ifndef UNI-APP-X && APP
+// export * from './vue.ts'
+export { Timeline, Animation } from './vue.ts'
+// #endif
diff --git a/uni_modules/lime-shared/animation/useTransition.ts b/uni_modules/lime-shared/animation/useTransition.ts
new file mode 100644
index 0000000..238be97
--- /dev/null
+++ b/uni_modules/lime-shared/animation/useTransition.ts
@@ -0,0 +1,108 @@
+// @ts-nocheck
+import type { ComponentPublicInstance, Ref } from 'vue'
+import { ease, linear } from './ease';
+import { Timeline, Animation } from './';
+export type UseTransitionOptions = {
+	duration ?: number
+	immediate ?: boolean
+	context ?: ComponentPublicInstance
+}
+// #ifndef UNI-APP-X && APP
+import { ref, watch } from '@/uni_modules/lime-shared/vue'
+
+export function useTransition(percent : Ref<number>|(() => number), options : UseTransitionOptions) : Ref<number> {
+	const current = ref(0)
+	const { immediate, duration = 300 } = options
+	let tl:Timeline|null = null;
+	let timer = -1
+	const isFunction = typeof percent === 'function'
+	watch(isFunction ? percent : () => percent.value, (v) => {
+		if(tl == null){
+			tl = new Timeline()
+		}
+		tl.start();
+		tl.add(
+			new Animation(
+				current.value,
+				v,
+				duration,
+				0,
+				ease,
+				nowValue => {
+					current.value = nowValue
+					clearTimeout(timer)
+					if(current.value == v){
+						timer = setTimeout(()=>{
+							tl?.pause();
+							tl = null
+						}, duration)
+					}
+				}
+			)
+		);
+	}, { immediate })
+
+	return current
+}
+
+// #endif
+
+// #ifdef UNI-APP-X && APP
+type UseTransitionReturnType = Ref<number>
+export function useTransition(source : any, options : UseTransitionOptions) : UseTransitionReturnType {
+	const outputRef : Ref<number> = ref(0)
+	const immediate = options.immediate ?? false
+	const duration = options.duration ?? 300
+	const context = options.context //as ComponentPublicInstance | null
+	let tl:Timeline|null = null;
+	let timer = -1
+	const watchFunc = (v : number) => {
+		if(tl == null){
+			tl = new Timeline()
+		}
+		tl!.start();
+		tl!.add(
+			new Animation(
+				outputRef.value,
+				v,
+				duration,
+				0,
+				ease,
+				nowValue => {
+					outputRef.value = nowValue
+					clearTimeout(timer)
+					if(outputRef.value == v){
+						timer = setTimeout(()=>{
+							tl?.pause();
+							tl = null
+						}, duration)
+					}
+				}
+			), 
+			null
+		);
+	}
+
+	if (context != null && typeof source == 'string') {
+		context.$watch(source, watchFunc, { immediate } as WatchOptions)
+	} else if(typeof source == 'function'){
+		watch(source, watchFunc, { immediate })
+	} 
+	// #ifdef APP-ANDROID
+	else if(isRef(source) && source instanceof Ref<number>) {
+		watch(source as Ref<number>, watchFunc, { immediate })
+	}
+	// #endif
+	// #ifndef APP-ANDROID
+	else if(isRef(source) && typeof source.value == 'number') {
+		watch(source, watchFunc, { immediate })
+	}
+	// #endif
+	
+	const stop = ()=>{
+		
+	}
+	return outputRef //as UseTransitionReturnType
+}
+
+// #endif
\ No newline at end of file
diff --git a/uni_modules/lime-shared/animation/uvue.uts b/uni_modules/lime-shared/animation/uvue.uts
new file mode 100644
index 0000000..45a7a23
--- /dev/null
+++ b/uni_modules/lime-shared/animation/uvue.uts
@@ -0,0 +1,119 @@
+// @ts-nocheck
+import { raf,  cancelRaf} from '../raf'
+export class Timeline {
+	state : string
+	animations : Set<Animation> = new Set<Animation>()
+	delAnimations : Animation[] = []
+	startTimes : Map<Animation, number> = new Map<Animation, number>()
+	pauseTime : number = 0
+	pauseStart : number = Date.now()
+	tickHandler : number = 0
+	tickHandlers : number[] = []
+	tick : (() => void) | null = null
+	constructor() {
+		this.state = 'Initiated';
+	}
+	start() {
+		if (!(this.state == 'Initiated')) return;
+		this.state = 'Started';
+
+		let startTime = Date.now();
+		this.pauseTime = 0;
+		this.tick = () => {
+			let now = Date.now();
+			this.animations.forEach((animation : Animation) => {
+				let t:number;
+				const ani = this.startTimes.get(animation)
+				if (ani == null) return
+				if (ani < startTime) {
+					t = now - startTime - animation.delay - this.pauseTime;
+				} else {
+					t = now - ani - animation.delay - this.pauseTime;
+				}
+				if (t > animation.duration) {
+					this.delAnimations.push(animation)
+					// 不能在 foreach 里面 对 集合进行删除操作
+					// this.animations.delete(animation);
+					t = animation.duration;
+				}
+				if (t > 0) animation.run(t);
+			})
+			// 不能在 foreach 里面 对 集合进行删除操作
+			while (this.delAnimations.length > 0) {
+				const animation = this.delAnimations.pop();
+				if (animation == null) return
+				this.animations.delete(animation);
+			}
+			// cancelAnimationFrame(this.tickHandler);
+			if (this.state != 'Started') return
+		
+			 this.tickHandler = raf(()=>{
+				this.tick!()
+			})
+			
+			this.tickHandlers.push(this.tickHandler)
+		}
+		if(this.tick != null) {
+			this.tick!()
+		}
+		
+	}
+	pause() {
+		if (!(this.state === 'Started')) return;
+		this.state = 'Paused';
+		this.pauseStart = Date.now();
+		cancelRaf(this.tickHandler);
+		// cancelRaf(this.tickHandler);
+	}
+	resume() {
+		if (!(this.state === 'Paused')) return;
+		this.state = 'Started';
+		this.pauseTime += Date.now() - this.pauseStart;
+		this.tick!();
+	}
+	reset() {
+		this.pause();
+		this.state = 'Initiated';
+		this.pauseTime = 0;
+		this.pauseStart = 0;
+		this.animations.clear()
+		this.delAnimations.clear()
+		this.startTimes.clear()
+		this.tickHandler = 0;
+	}
+	add(animation : Animation, startTime ?: number | null) {
+		if (startTime == null) startTime = Date.now();
+		this.animations.add(animation);
+		this.startTimes.set(animation, startTime);
+	}
+}
+
+export class Animation {
+	startValue : number
+	endValue : number
+	duration : number
+	timingFunction : (t : number) => number
+	delay : number
+	template : (t : number) => void
+	constructor(
+		startValue : number,
+		endValue : number,
+		duration : number,
+		delay : number,
+		timingFunction : (t : number) => number,
+		template : (v : number) => void) {
+		this.startValue = startValue;
+		this.endValue = endValue;
+		this.duration = duration;
+		this.timingFunction = timingFunction;
+		this.delay = delay;
+		this.template = template;
+	}
+
+	run(time : number) {
+		let range = this.endValue - this.startValue;
+		let progress = time / this.duration
+		if(progress != 1) progress = this.timingFunction(progress)
+		this.template(this.startValue + range * progress)
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/animation/vue.ts b/uni_modules/lime-shared/animation/vue.ts
new file mode 100644
index 0000000..30f89e5
--- /dev/null
+++ b/uni_modules/lime-shared/animation/vue.ts
@@ -0,0 +1,123 @@
+// @ts-nocheck
+const TICK = Symbol('tick');
+const TICK_HANDLER = Symbol('tick-handler');
+const ANIMATIONS = Symbol('animations');
+const START_TIMES = Symbol('start-times');
+const PAUSE_START = Symbol('pause-start');
+const PAUSE_TIME = Symbol('pause-time');
+const _raf = typeof requestAnimationFrame !== 'undefined' ? requestAnimationFrame : function(cb: Function) {return setTimeout(cb, 1000/60)}
+const _caf = typeof cancelAnimationFrame !== 'undefined' ? cancelAnimationFrame: function(id: any) {clearTimeout(id)}
+
+// const TICK = 'tick';
+// const TICK_HANDLER = 'tick-handler';
+// const ANIMATIONS = 'animations';
+// const START_TIMES = 'start-times';
+// const PAUSE_START = 'pause-start';
+// const PAUSE_TIME = 'pause-time';
+// const _raf = function(callback):number|null {return setTimeout(callback, 1000/60)}
+// const _caf = function(id: number):void {clearTimeout(id)}
+
+export class Timeline {
+	state: string
+	constructor() {
+		this.state = 'Initiated';
+		this[ANIMATIONS] = new Set();
+		this[START_TIMES] = new Map();
+	}
+	start() {
+		if (!(this.state === 'Initiated')) return;
+		this.state = 'Started';
+
+		let startTime = Date.now();
+		this[PAUSE_TIME] = 0;
+		this[TICK] = () => {
+			let now = Date.now();
+			this[ANIMATIONS].forEach((animation) => {
+				 let t: number;
+				 if (this[START_TIMES].get(animation) < startTime) {
+				 	t = now - startTime - animation.delay - this[PAUSE_TIME];
+				 } else {
+				 	t = now - this[START_TIMES].get(animation) - animation.delay - this[PAUSE_TIME];
+				 }
+				 
+				 if (t > animation.duration) {
+				 	this[ANIMATIONS].delete(animation);
+				 	t = animation.duration;
+				 }
+				 if (t > 0) animation.run(t);
+			})
+			// for (let animation of this[ANIMATIONS]) {
+			// 	let t: number;
+			// 	console.log('animation', animation)
+			// 	if (this[START_TIMES].get(animation) < startTime) {
+			// 		t = now - startTime - animation.delay - this[PAUSE_TIME];
+			// 	} else {
+			// 		t = now - this[START_TIMES].get(animation) - animation.delay - this[PAUSE_TIME];
+			// 	}
+
+			// 	if (t > animation.duration) {
+			// 		this[ANIMATIONS].delete(animation);
+			// 		t = animation.duration;
+			// 	}
+			// 	if (t > 0) animation.run(t);
+			// }
+			this[TICK_HANDLER] = _raf(this[TICK]);
+		};
+		this[TICK]();
+	}
+	pause() {
+		if (!(this.state === 'Started')) return;
+		this.state = 'Paused';
+
+		this[PAUSE_START] = Date.now();
+		_caf(this[TICK_HANDLER]);
+	}
+	resume() {
+		if (!(this.state === 'Paused')) return;
+		this.state = 'Started';
+
+		this[PAUSE_TIME] += Date.now() - this[PAUSE_START];
+		this[TICK]();
+	}
+	reset() {
+		this.pause();
+		this.state = 'Initiated';
+		this[PAUSE_TIME] = 0;
+		this[PAUSE_START] = 0;
+		this[ANIMATIONS] = new Set();
+		this[START_TIMES] = new Map();
+		this[TICK_HANDLER] = null;
+	}
+	add(animation: any, startTime?: number) {
+		if (arguments.length < 2) startTime = Date.now();
+		this[ANIMATIONS].add(animation);
+		this[START_TIMES].set(animation, startTime);
+	}
+}
+
+export class Animation {
+	startValue: number
+	endValue: number
+	duration: number
+	timingFunction: (t: number) => number
+	delay: number
+	template: (t: number) => void
+	constructor(startValue: number, endValue: number, duration: number, delay: number, timingFunction: (t: number) => number, template: (v: number) => void) {
+		timingFunction = timingFunction || (v => v);
+		template = template || (v => v);
+		
+		this.startValue = startValue;
+		this.endValue = endValue;
+		this.duration = duration;
+		this.timingFunction = timingFunction;
+		this.delay = delay;
+		this.template = template;
+	}
+
+	run(time: number) {
+		let range = this.endValue - this.startValue;
+		let progress = time / this.duration
+		if(progress != 1) progress = this.timingFunction(progress)
+		this.template(this.startValue + range * progress)
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/areaData/city-china.json b/uni_modules/lime-shared/areaData/city-china.json
new file mode 100644
index 0000000..d9872a0
--- /dev/null
+++ b/uni_modules/lime-shared/areaData/city-china.json
@@ -0,0 +1,3888 @@
+{
+	"province_list": {
+		"110000": "北京市",
+		"120000": "天津市",
+		"130000": "河北省",
+		"140000": "山西省",
+		"150000": "内蒙古自治区",
+		"210000": "辽宁省",
+		"220000": "吉林省",
+		"230000": "黑龙江省",
+		"310000": "上海市",
+		"320000": "江苏省",
+		"330000": "浙江省",
+		"340000": "安徽省",
+		"350000": "福建省",
+		"360000": "江西省",
+		"370000": "山东省",
+		"410000": "河南省",
+		"420000": "湖北省",
+		"430000": "湖南省",
+		"440000": "广东省",
+		"450000": "广西壮族自治区",
+		"460000": "海南省",
+		"500000": "重庆市",
+		"510000": "四川省",
+		"520000": "贵州省",
+		"530000": "云南省",
+		"540000": "西藏自治区",
+		"610000": "陕西省",
+		"620000": "甘肃省",
+		"630000": "青海省",
+		"640000": "宁夏回族自治区",
+		"650000": "新疆维吾尔自治区",
+		"710000": "台湾省",
+		"810000": "香港特别行政区",
+		"820000": "澳门特别行政区"
+	},
+	"city_list": {
+		"110100": "北京市",
+		"120100": "天津市",
+		"130100": "石家庄市",
+		"130200": "唐山市",
+		"130300": "秦皇岛市",
+		"130400": "邯郸市",
+		"130500": "邢台市",
+		"130600": "保定市",
+		"130700": "张家口市",
+		"130800": "承德市",
+		"130900": "沧州市",
+		"131000": "廊坊市",
+		"131100": "衡水市",
+		"140100": "太原市",
+		"140200": "大同市",
+		"140300": "阳泉市",
+		"140400": "长治市",
+		"140500": "晋城市",
+		"140600": "朔州市",
+		"140700": "晋中市",
+		"140800": "运城市",
+		"140900": "忻州市",
+		"141000": "临汾市",
+		"141100": "吕梁市",
+		"150100": "呼和浩特市",
+		"150200": "包头市",
+		"150300": "乌海市",
+		"150400": "赤峰市",
+		"150500": "通辽市",
+		"150600": "鄂尔多斯市",
+		"150700": "呼伦贝尔市",
+		"150800": "巴彦淖尔市",
+		"150900": "乌兰察布市",
+		"152200": "兴安盟",
+		"152500": "锡林郭勒盟",
+		"152900": "阿拉善盟",
+		"210100": "沈阳市",
+		"210200": "大连市",
+		"210300": "鞍山市",
+		"210400": "抚顺市",
+		"210500": "本溪市",
+		"210600": "丹东市",
+		"210700": "锦州市",
+		"210800": "营口市",
+		"210900": "阜新市",
+		"211000": "辽阳市",
+		"211100": "盘锦市",
+		"211200": "铁岭市",
+		"211300": "朝阳市",
+		"211400": "葫芦岛市",
+		"220100": "长春市",
+		"220200": "吉林市",
+		"220300": "四平市",
+		"220400": "辽源市",
+		"220500": "通化市",
+		"220600": "白山市",
+		"220700": "松原市",
+		"220800": "白城市",
+		"222400": "延边朝鲜族自治州",
+		"230100": "哈尔滨市",
+		"230200": "齐齐哈尔市",
+		"230300": "鸡西市",
+		"230400": "鹤岗市",
+		"230500": "双鸭山市",
+		"230600": "大庆市",
+		"230700": "伊春市",
+		"230800": "佳木斯市",
+		"230900": "七台河市",
+		"231000": "牡丹江市",
+		"231100": "黑河市",
+		"231200": "绥化市",
+		"232700": "大兴安岭地区",
+		"310100": "上海市",
+		"320100": "南京市",
+		"320200": "无锡市",
+		"320300": "徐州市",
+		"320400": "常州市",
+		"320500": "苏州市",
+		"320600": "南通市",
+		"320700": "连云港市",
+		"320800": "淮安市",
+		"320900": "盐城市",
+		"321000": "扬州市",
+		"321100": "镇江市",
+		"321200": "泰州市",
+		"321300": "宿迁市",
+		"330100": "杭州市",
+		"330200": "宁波市",
+		"330300": "温州市",
+		"330400": "嘉兴市",
+		"330500": "湖州市",
+		"330600": "绍兴市",
+		"330700": "金华市",
+		"330800": "衢州市",
+		"330900": "舟山市",
+		"331000": "台州市",
+		"331100": "丽水市",
+		"340100": "合肥市",
+		"340200": "芜湖市",
+		"340300": "蚌埠市",
+		"340400": "淮南市",
+		"340500": "马鞍山市",
+		"340600": "淮北市",
+		"340700": "铜陵市",
+		"340800": "安庆市",
+		"341000": "黄山市",
+		"341100": "滁州市",
+		"341200": "阜阳市",
+		"341300": "宿州市",
+		"341500": "六安市",
+		"341600": "亳州市",
+		"341700": "池州市",
+		"341800": "宣城市",
+		"350100": "福州市",
+		"350200": "厦门市",
+		"350300": "莆田市",
+		"350400": "三明市",
+		"350500": "泉州市",
+		"350600": "漳州市",
+		"350700": "南平市",
+		"350800": "龙岩市",
+		"350900": "宁德市",
+		"360100": "南昌市",
+		"360200": "景德镇市",
+		"360300": "萍乡市",
+		"360400": "九江市",
+		"360500": "新余市",
+		"360600": "鹰潭市",
+		"360700": "赣州市",
+		"360800": "吉安市",
+		"360900": "宜春市",
+		"361000": "抚州市",
+		"361100": "上饶市",
+		"370100": "济南市",
+		"370200": "青岛市",
+		"370300": "淄博市",
+		"370400": "枣庄市",
+		"370500": "东营市",
+		"370600": "烟台市",
+		"370700": "潍坊市",
+		"370800": "济宁市",
+		"370900": "泰安市",
+		"371000": "威海市",
+		"371100": "日照市",
+		"371300": "临沂市",
+		"371400": "德州市",
+		"371500": "聊城市",
+		"371600": "滨州市",
+		"371700": "菏泽市",
+		"410100": "郑州市",
+		"410200": "开封市",
+		"410300": "洛阳市",
+		"410400": "平顶山市",
+		"410500": "安阳市",
+		"410600": "鹤壁市",
+		"410700": "新乡市",
+		"410800": "焦作市",
+		"410900": "濮阳市",
+		"411000": "许昌市",
+		"411100": "漯河市",
+		"411200": "三门峡市",
+		"411300": "南阳市",
+		"411400": "商丘市",
+		"411500": "信阳市",
+		"411600": "周口市",
+		"411700": "驻马店市",
+		"419000": "省直辖县",
+		"420100": "武汉市",
+		"420200": "黄石市",
+		"420300": "十堰市",
+		"420500": "宜昌市",
+		"420600": "襄阳市",
+		"420700": "鄂州市",
+		"420800": "荆门市",
+		"420900": "孝感市",
+		"421000": "荆州市",
+		"421100": "黄冈市",
+		"421200": "咸宁市",
+		"421300": "随州市",
+		"422800": "恩施土家族苗族自治州",
+		"429000": "省直辖县",
+		"430100": "长沙市",
+		"430200": "株洲市",
+		"430300": "湘潭市",
+		"430400": "衡阳市",
+		"430500": "邵阳市",
+		"430600": "岳阳市",
+		"430700": "常德市",
+		"430800": "张家界市",
+		"430900": "益阳市",
+		"431000": "郴州市",
+		"431100": "永州市",
+		"431200": "怀化市",
+		"431300": "娄底市",
+		"433100": "湘西土家族苗族自治州",
+		"440100": "广州市",
+		"440200": "韶关市",
+		"440300": "深圳市",
+		"440400": "珠海市",
+		"440500": "汕头市",
+		"440600": "佛山市",
+		"440700": "江门市",
+		"440800": "湛江市",
+		"440900": "茂名市",
+		"441200": "肇庆市",
+		"441300": "惠州市",
+		"441400": "梅州市",
+		"441500": "汕尾市",
+		"441600": "河源市",
+		"441700": "阳江市",
+		"441800": "清远市",
+		"441900": "东莞市",
+		"442000": "中山市",
+		"445100": "潮州市",
+		"445200": "揭阳市",
+		"445300": "云浮市",
+		"450100": "南宁市",
+		"450200": "柳州市",
+		"450300": "桂林市",
+		"450400": "梧州市",
+		"450500": "北海市",
+		"450600": "防城港市",
+		"450700": "钦州市",
+		"450800": "贵港市",
+		"450900": "玉林市",
+		"451000": "百色市",
+		"451100": "贺州市",
+		"451200": "河池市",
+		"451300": "来宾市",
+		"451400": "崇左市",
+		"460100": "海口市",
+		"460200": "三亚市",
+		"460300": "三沙市",
+		"460400": "儋州市",
+		"469000": "省直辖县",
+		"500100": "重庆市",
+		"500200": "县",
+		"510100": "成都市",
+		"510300": "自贡市",
+		"510400": "攀枝花市",
+		"510500": "泸州市",
+		"510600": "德阳市",
+		"510700": "绵阳市",
+		"510800": "广元市",
+		"510900": "遂宁市",
+		"511000": "内江市",
+		"511100": "乐山市",
+		"511300": "南充市",
+		"511400": "眉山市",
+		"511500": "宜宾市",
+		"511600": "广安市",
+		"511700": "达州市",
+		"511800": "雅安市",
+		"511900": "巴中市",
+		"512000": "资阳市",
+		"513200": "阿坝藏族羌族自治州",
+		"513300": "甘孜藏族自治州",
+		"513400": "凉山彝族自治州",
+		"520100": "贵阳市",
+		"520200": "六盘水市",
+		"520300": "遵义市",
+		"520400": "安顺市",
+		"520500": "毕节市",
+		"520600": "铜仁市",
+		"522300": "黔西南布依族苗族自治州",
+		"522600": "黔东南苗族侗族自治州",
+		"522700": "黔南布依族苗族自治州",
+		"530100": "昆明市",
+		"530300": "曲靖市",
+		"530400": "玉溪市",
+		"530500": "保山市",
+		"530600": "昭通市",
+		"530700": "丽江市",
+		"530800": "普洱市",
+		"530900": "临沧市",
+		"532300": "楚雄彝族自治州",
+		"532500": "红河哈尼族彝族自治州",
+		"532600": "文山壮族苗族自治州",
+		"532800": "西双版纳傣族自治州",
+		"532900": "大理白族自治州",
+		"533100": "德宏傣族景颇族自治州",
+		"533300": "怒江傈僳族自治州",
+		"533400": "迪庆藏族自治州",
+		"540100": "拉萨市",
+		"540200": "日喀则市",
+		"540300": "昌都市",
+		"540400": "林芝市",
+		"540500": "山南市",
+		"540600": "那曲市",
+		"542500": "阿里地区",
+		"610100": "西安市",
+		"610200": "铜川市",
+		"610300": "宝鸡市",
+		"610400": "咸阳市",
+		"610500": "渭南市",
+		"610600": "延安市",
+		"610700": "汉中市",
+		"610800": "榆林市",
+		"610900": "安康市",
+		"611000": "商洛市",
+		"620100": "兰州市",
+		"620200": "嘉峪关市",
+		"620300": "金昌市",
+		"620400": "白银市",
+		"620500": "天水市",
+		"620600": "武威市",
+		"620700": "张掖市",
+		"620800": "平凉市",
+		"620900": "酒泉市",
+		"621000": "庆阳市",
+		"621100": "定西市",
+		"621200": "陇南市",
+		"622900": "临夏回族自治州",
+		"623000": "甘南藏族自治州",
+		"630100": "西宁市",
+		"630200": "海东市",
+		"632200": "海北藏族自治州",
+		"632300": "黄南藏族自治州",
+		"632500": "海南藏族自治州",
+		"632600": "果洛藏族自治州",
+		"632700": "玉树藏族自治州",
+		"632800": "海西蒙古族藏族自治州",
+		"640100": "银川市",
+		"640200": "石嘴山市",
+		"640300": "吴忠市",
+		"640400": "固原市",
+		"640500": "中卫市",
+		"650100": "乌鲁木齐市",
+		"650200": "克拉玛依市",
+		"650400": "吐鲁番市",
+		"650500": "哈密市",
+		"652300": "昌吉回族自治州",
+		"652700": "博尔塔拉蒙古自治州",
+		"652800": "巴音郭楞蒙古自治州",
+		"652900": "阿克苏地区",
+		"653000": "克孜勒苏柯尔克孜自治州",
+		"653100": "喀什地区",
+		"653200": "和田地区",
+		"654000": "伊犁哈萨克自治州",
+		"654200": "塔城地区",
+		"654300": "阿勒泰地区",
+		"659000": "自治区直辖县级行政区划",
+		"710100": "台北市",
+		"710200": "高雄市",
+		"710300": "台南市",
+		"710400": "台中市",
+		"710500": "金门县",
+		"710600": "南投县",
+		"710700": "基隆市",
+		"710800": "新竹市",
+		"710900": "嘉义市",
+		"711100": "新北市",
+		"711200": "宜兰县",
+		"711300": "新竹县",
+		"711400": "桃园市",
+		"711500": "苗栗县",
+		"711700": "彰化县",
+		"711900": "嘉义县",
+		"712100": "云林县",
+		"712400": "屏东县",
+		"712500": "台东县",
+		"712600": "花莲县",
+		"712700": "澎湖县",
+		"712800": "连江县",
+		"810100": "香港岛",
+		"810200": "九龙",
+		"810300": "新界",
+		"820100": "澳门半岛",
+		"820200": "离岛"
+	},
+	"county_list": {
+		"110101": "东城区",
+		"110102": "西城区",
+		"110105": "朝阳区",
+		"110106": "丰台区",
+		"110107": "石景山区",
+		"110108": "海淀区",
+		"110109": "门头沟区",
+		"110111": "房山区",
+		"110112": "通州区",
+		"110113": "顺义区",
+		"110114": "昌平区",
+		"110115": "大兴区",
+		"110116": "怀柔区",
+		"110117": "平谷区",
+		"110118": "密云区",
+		"110119": "延庆区",
+		"120101": "和平区",
+		"120102": "河东区",
+		"120103": "河西区",
+		"120104": "南开区",
+		"120105": "河北区",
+		"120106": "红桥区",
+		"120110": "东丽区",
+		"120111": "西青区",
+		"120112": "津南区",
+		"120113": "北辰区",
+		"120114": "武清区",
+		"120115": "宝坻区",
+		"120116": "滨海新区",
+		"120117": "宁河区",
+		"120118": "静海区",
+		"120119": "蓟州区",
+		"130102": "长安区",
+		"130104": "桥西区",
+		"130105": "新华区",
+		"130107": "井陉矿区",
+		"130108": "裕华区",
+		"130109": "藁城区",
+		"130110": "鹿泉区",
+		"130111": "栾城区",
+		"130121": "井陉县",
+		"130123": "正定县",
+		"130125": "行唐县",
+		"130126": "灵寿县",
+		"130127": "高邑县",
+		"130128": "深泽县",
+		"130129": "赞皇县",
+		"130130": "无极县",
+		"130131": "平山县",
+		"130132": "元氏县",
+		"130133": "赵县",
+		"130171": "石家庄高新技术产业开发区",
+		"130172": "石家庄循环化工园区",
+		"130181": "辛集市",
+		"130183": "晋州市",
+		"130184": "新乐市",
+		"130202": "路南区",
+		"130203": "路北区",
+		"130204": "古冶区",
+		"130205": "开平区",
+		"130207": "丰南区",
+		"130208": "丰润区",
+		"130209": "曹妃甸区",
+		"130224": "滦南县",
+		"130225": "乐亭县",
+		"130227": "迁西县",
+		"130229": "玉田县",
+		"130273": "唐山高新技术产业开发区",
+		"130274": "河北唐山海港经济开发区",
+		"130281": "遵化市",
+		"130283": "迁安市",
+		"130284": "滦州市",
+		"130302": "海港区",
+		"130303": "山海关区",
+		"130304": "北戴河区",
+		"130306": "抚宁区",
+		"130321": "青龙满族自治县",
+		"130322": "昌黎县",
+		"130324": "卢龙县",
+		"130371": "秦皇岛市经济技术开发区",
+		"130372": "北戴河新区",
+		"130390": "经济技术开发区",
+		"130402": "邯山区",
+		"130403": "丛台区",
+		"130404": "复兴区",
+		"130406": "峰峰矿区",
+		"130407": "肥乡区",
+		"130408": "永年区",
+		"130423": "临漳县",
+		"130424": "成安县",
+		"130425": "大名县",
+		"130426": "涉县",
+		"130427": "磁县",
+		"130430": "邱县",
+		"130431": "鸡泽县",
+		"130432": "广平县",
+		"130433": "馆陶县",
+		"130434": "魏县",
+		"130435": "曲周县",
+		"130471": "邯郸经济技术开发区",
+		"130473": "邯郸冀南新区",
+		"130481": "武安市",
+		"130502": "襄都区",
+		"130503": "信都区",
+		"130505": "任泽区",
+		"130506": "南和区",
+		"130522": "临城县",
+		"130523": "内丘县",
+		"130524": "柏乡县",
+		"130525": "隆尧县",
+		"130528": "宁晋县",
+		"130529": "巨鹿县",
+		"130530": "新河县",
+		"130531": "广宗县",
+		"130532": "平乡县",
+		"130533": "威县",
+		"130534": "清河县",
+		"130535": "临西县",
+		"130571": "河北邢台经济开发区",
+		"130581": "南宫市",
+		"130582": "沙河市",
+		"130602": "竞秀区",
+		"130606": "莲池区",
+		"130607": "满城区",
+		"130608": "清苑区",
+		"130609": "徐水区",
+		"130623": "涞水县",
+		"130624": "阜平县",
+		"130626": "定兴县",
+		"130627": "唐县",
+		"130628": "高阳县",
+		"130629": "容城县",
+		"130630": "涞源县",
+		"130631": "望都县",
+		"130632": "安新县",
+		"130633": "易县",
+		"130634": "曲阳县",
+		"130635": "蠡县",
+		"130636": "顺平县",
+		"130637": "博野县",
+		"130638": "雄县",
+		"130671": "保定高新技术产业开发区",
+		"130672": "保定白沟新城",
+		"130681": "涿州市",
+		"130682": "定州市",
+		"130683": "安国市",
+		"130684": "高碑店市",
+		"130702": "桥东区",
+		"130703": "桥西区",
+		"130705": "宣化区",
+		"130706": "下花园区",
+		"130708": "万全区",
+		"130709": "崇礼区",
+		"130722": "张北县",
+		"130723": "康保县",
+		"130724": "沽源县",
+		"130725": "尚义县",
+		"130726": "蔚县",
+		"130727": "阳原县",
+		"130728": "怀安县",
+		"130730": "怀来县",
+		"130731": "涿鹿县",
+		"130732": "赤城县",
+		"130772": "张家口市察北管理区",
+		"130802": "双桥区",
+		"130803": "双滦区",
+		"130804": "鹰手营子矿区",
+		"130821": "承德县",
+		"130822": "兴隆县",
+		"130824": "滦平县",
+		"130825": "隆化县",
+		"130826": "丰宁满族自治县",
+		"130827": "宽城满族自治县",
+		"130828": "围场满族蒙古族自治县",
+		"130871": "承德高新技术产业开发区",
+		"130881": "平泉市",
+		"130902": "新华区",
+		"130903": "运河区",
+		"130921": "沧县",
+		"130922": "青县",
+		"130923": "东光县",
+		"130924": "海兴县",
+		"130925": "盐山县",
+		"130926": "肃宁县",
+		"130927": "南皮县",
+		"130928": "吴桥县",
+		"130929": "献县",
+		"130930": "孟村回族自治县",
+		"130971": "河北沧州经济开发区",
+		"130972": "沧州高新技术产业开发区",
+		"130973": "沧州渤海新区",
+		"130981": "泊头市",
+		"130982": "任丘市",
+		"130983": "黄骅市",
+		"130984": "河间市",
+		"131002": "安次区",
+		"131003": "广阳区",
+		"131022": "固安县",
+		"131023": "永清县",
+		"131024": "香河县",
+		"131025": "大城县",
+		"131026": "文安县",
+		"131028": "大厂回族自治县",
+		"131071": "廊坊经济技术开发区",
+		"131081": "霸州市",
+		"131082": "三河市",
+		"131090": "开发区",
+		"131102": "桃城区",
+		"131103": "冀州区",
+		"131121": "枣强县",
+		"131122": "武邑县",
+		"131123": "武强县",
+		"131124": "饶阳县",
+		"131125": "安平县",
+		"131126": "故城县",
+		"131127": "景县",
+		"131128": "阜城县",
+		"131171": "河北衡水经济开发区",
+		"131172": "衡水滨湖新区",
+		"131182": "深州市",
+		"140105": "小店区",
+		"140106": "迎泽区",
+		"140107": "杏花岭区",
+		"140108": "尖草坪区",
+		"140109": "万柏林区",
+		"140110": "晋源区",
+		"140121": "清徐县",
+		"140122": "阳曲县",
+		"140123": "娄烦县",
+		"140181": "古交市",
+		"140212": "新荣区",
+		"140213": "平城区",
+		"140214": "云冈区",
+		"140215": "云州区",
+		"140221": "阳高县",
+		"140222": "天镇县",
+		"140223": "广灵县",
+		"140224": "灵丘县",
+		"140225": "浑源县",
+		"140226": "左云县",
+		"140271": "山西大同经济开发区",
+		"140302": "城区",
+		"140303": "矿区",
+		"140311": "郊区",
+		"140321": "平定县",
+		"140322": "盂县",
+		"140403": "潞州区",
+		"140404": "上党区",
+		"140405": "屯留区",
+		"140406": "潞城区",
+		"140423": "襄垣县",
+		"140425": "平顺县",
+		"140426": "黎城县",
+		"140427": "壶关县",
+		"140428": "长子县",
+		"140429": "武乡县",
+		"140430": "沁县",
+		"140431": "沁源县",
+		"140471": "山西长治高新技术产业园区",
+		"140502": "城区",
+		"140521": "沁水县",
+		"140522": "阳城县",
+		"140524": "陵川县",
+		"140525": "泽州县",
+		"140581": "高平市",
+		"140602": "朔城区",
+		"140603": "平鲁区",
+		"140621": "山阴县",
+		"140622": "应县",
+		"140623": "右玉县",
+		"140671": "山西朔州经济开发区",
+		"140681": "怀仁市",
+		"140702": "榆次区",
+		"140703": "太谷区",
+		"140721": "榆社县",
+		"140722": "左权县",
+		"140723": "和顺县",
+		"140724": "昔阳县",
+		"140725": "寿阳县",
+		"140727": "祁县",
+		"140728": "平遥县",
+		"140729": "灵石县",
+		"140781": "介休市",
+		"140802": "盐湖区",
+		"140821": "临猗县",
+		"140822": "万荣县",
+		"140823": "闻喜县",
+		"140824": "稷山县",
+		"140825": "新绛县",
+		"140826": "绛县",
+		"140827": "垣曲县",
+		"140828": "夏县",
+		"140829": "平陆县",
+		"140830": "芮城县",
+		"140881": "永济市",
+		"140882": "河津市",
+		"140902": "忻府区",
+		"140921": "定襄县",
+		"140922": "五台县",
+		"140923": "代县",
+		"140924": "繁峙县",
+		"140925": "宁武县",
+		"140926": "静乐县",
+		"140927": "神池县",
+		"140928": "五寨县",
+		"140929": "岢岚县",
+		"140930": "河曲县",
+		"140931": "保德县",
+		"140932": "偏关县",
+		"140971": "五台山风景名胜区",
+		"140981": "原平市",
+		"141002": "尧都区",
+		"141021": "曲沃县",
+		"141022": "翼城县",
+		"141023": "襄汾县",
+		"141024": "洪洞县",
+		"141025": "古县",
+		"141026": "安泽县",
+		"141027": "浮山县",
+		"141028": "吉县",
+		"141029": "乡宁县",
+		"141030": "大宁县",
+		"141031": "隰县",
+		"141032": "永和县",
+		"141033": "蒲县",
+		"141034": "汾西县",
+		"141081": "侯马市",
+		"141082": "霍州市",
+		"141102": "离石区",
+		"141121": "文水县",
+		"141122": "交城县",
+		"141123": "兴县",
+		"141124": "临县",
+		"141125": "柳林县",
+		"141126": "石楼县",
+		"141127": "岚县",
+		"141128": "方山县",
+		"141129": "中阳县",
+		"141130": "交口县",
+		"141181": "孝义市",
+		"141182": "汾阳市",
+		"150102": "新城区",
+		"150103": "回民区",
+		"150104": "玉泉区",
+		"150105": "赛罕区",
+		"150121": "土默特左旗",
+		"150122": "托克托县",
+		"150123": "和林格尔县",
+		"150124": "清水河县",
+		"150125": "武川县",
+		"150172": "呼和浩特经济技术开发区",
+		"150202": "东河区",
+		"150203": "昆都仑区",
+		"150204": "青山区",
+		"150205": "石拐区",
+		"150206": "白云鄂博矿区",
+		"150207": "九原区",
+		"150221": "土默特右旗",
+		"150222": "固阳县",
+		"150223": "达尔罕茂明安联合旗",
+		"150271": "包头稀土高新技术产业开发区",
+		"150302": "海勃湾区",
+		"150303": "海南区",
+		"150304": "乌达区",
+		"150402": "红山区",
+		"150403": "元宝山区",
+		"150404": "松山区",
+		"150421": "阿鲁科尔沁旗",
+		"150422": "巴林左旗",
+		"150423": "巴林右旗",
+		"150424": "林西县",
+		"150425": "克什克腾旗",
+		"150426": "翁牛特旗",
+		"150428": "喀喇沁旗",
+		"150429": "宁城县",
+		"150430": "敖汉旗",
+		"150502": "科尔沁区",
+		"150521": "科尔沁左翼中旗",
+		"150522": "科尔沁左翼后旗",
+		"150523": "开鲁县",
+		"150524": "库伦旗",
+		"150525": "奈曼旗",
+		"150526": "扎鲁特旗",
+		"150571": "通辽经济技术开发区",
+		"150581": "霍林郭勒市",
+		"150602": "东胜区",
+		"150603": "康巴什区",
+		"150621": "达拉特旗",
+		"150622": "准格尔旗",
+		"150623": "鄂托克前旗",
+		"150624": "鄂托克旗",
+		"150625": "杭锦旗",
+		"150626": "乌审旗",
+		"150627": "伊金霍洛旗",
+		"150702": "海拉尔区",
+		"150703": "扎赉诺尔区",
+		"150721": "阿荣旗",
+		"150722": "莫力达瓦达斡尔族自治旗",
+		"150723": "鄂伦春自治旗",
+		"150724": "鄂温克族自治旗",
+		"150725": "陈巴尔虎旗",
+		"150726": "新巴尔虎左旗",
+		"150727": "新巴尔虎右旗",
+		"150781": "满洲里市",
+		"150782": "牙克石市",
+		"150783": "扎兰屯市",
+		"150784": "额尔古纳市",
+		"150785": "根河市",
+		"150802": "临河区",
+		"150821": "五原县",
+		"150822": "磴口县",
+		"150823": "乌拉特前旗",
+		"150824": "乌拉特中旗",
+		"150825": "乌拉特后旗",
+		"150826": "杭锦后旗",
+		"150902": "集宁区",
+		"150921": "卓资县",
+		"150922": "化德县",
+		"150923": "商都县",
+		"150924": "兴和县",
+		"150925": "凉城县",
+		"150926": "察哈尔右翼前旗",
+		"150927": "察哈尔右翼中旗",
+		"150928": "察哈尔右翼后旗",
+		"150929": "四子王旗",
+		"150981": "丰镇市",
+		"152201": "乌兰浩特市",
+		"152202": "阿尔山市",
+		"152221": "科尔沁右翼前旗",
+		"152222": "科尔沁右翼中旗",
+		"152223": "扎赉特旗",
+		"152224": "突泉县",
+		"152501": "二连浩特市",
+		"152502": "锡林浩特市",
+		"152522": "阿巴嘎旗",
+		"152523": "苏尼特左旗",
+		"152524": "苏尼特右旗",
+		"152525": "东乌珠穆沁旗",
+		"152526": "西乌珠穆沁旗",
+		"152527": "太仆寺旗",
+		"152528": "镶黄旗",
+		"152529": "正镶白旗",
+		"152530": "正蓝旗",
+		"152531": "多伦县",
+		"152571": "乌拉盖管委会",
+		"152921": "阿拉善左旗",
+		"152922": "阿拉善右旗",
+		"152923": "额济纳旗",
+		"152971": "内蒙古阿拉善经济开发区",
+		"210102": "和平区",
+		"210103": "沈河区",
+		"210104": "大东区",
+		"210105": "皇姑区",
+		"210106": "铁西区",
+		"210111": "苏家屯区",
+		"210112": "浑南区",
+		"210113": "沈北新区",
+		"210114": "于洪区",
+		"210115": "辽中区",
+		"210123": "康平县",
+		"210124": "法库县",
+		"210181": "新民市",
+		"210190": "经济技术开发区",
+		"210202": "中山区",
+		"210203": "西岗区",
+		"210204": "沙河口区",
+		"210211": "甘井子区",
+		"210212": "旅顺口区",
+		"210213": "金州区",
+		"210214": "普兰店区",
+		"210224": "长海县",
+		"210281": "瓦房店市",
+		"210283": "庄河市",
+		"210302": "铁东区",
+		"210303": "铁西区",
+		"210304": "立山区",
+		"210311": "千山区",
+		"210321": "台安县",
+		"210323": "岫岩满族自治县",
+		"210381": "海城市",
+		"210390": "高新区",
+		"210402": "新抚区",
+		"210403": "东洲区",
+		"210404": "望花区",
+		"210411": "顺城区",
+		"210421": "抚顺县",
+		"210422": "新宾满族自治县",
+		"210423": "清原满族自治县",
+		"210502": "平山区",
+		"210503": "溪湖区",
+		"210504": "明山区",
+		"210505": "南芬区",
+		"210521": "本溪满族自治县",
+		"210522": "桓仁满族自治县",
+		"210602": "元宝区",
+		"210603": "振兴区",
+		"210604": "振安区",
+		"210624": "宽甸满族自治县",
+		"210681": "东港市",
+		"210682": "凤城市",
+		"210702": "古塔区",
+		"210703": "凌河区",
+		"210711": "太和区",
+		"210726": "黑山县",
+		"210727": "义县",
+		"210781": "凌海市",
+		"210782": "北镇市",
+		"210793": "经济技术开发区",
+		"210802": "站前区",
+		"210803": "西市区",
+		"210804": "鲅鱼圈区",
+		"210811": "老边区",
+		"210881": "盖州市",
+		"210882": "大石桥市",
+		"210902": "海州区",
+		"210903": "新邱区",
+		"210904": "太平区",
+		"210905": "清河门区",
+		"210911": "细河区",
+		"210921": "阜新蒙古族自治县",
+		"210922": "彰武县",
+		"211002": "白塔区",
+		"211003": "文圣区",
+		"211004": "宏伟区",
+		"211005": "弓长岭区",
+		"211011": "太子河区",
+		"211021": "辽阳县",
+		"211081": "灯塔市",
+		"211102": "双台子区",
+		"211103": "兴隆台区",
+		"211104": "大洼区",
+		"211122": "盘山县",
+		"211202": "银州区",
+		"211204": "清河区",
+		"211221": "铁岭县",
+		"211223": "西丰县",
+		"211224": "昌图县",
+		"211281": "调兵山市",
+		"211282": "开原市",
+		"211302": "双塔区",
+		"211303": "龙城区",
+		"211321": "朝阳县",
+		"211322": "建平县",
+		"211324": "喀喇沁左翼蒙古族自治县",
+		"211381": "北票市",
+		"211382": "凌源市",
+		"211402": "连山区",
+		"211403": "龙港区",
+		"211404": "南票区",
+		"211421": "绥中县",
+		"211422": "建昌县",
+		"211481": "兴城市",
+		"220102": "南关区",
+		"220103": "宽城区",
+		"220104": "朝阳区",
+		"220105": "二道区",
+		"220106": "绿园区",
+		"220112": "双阳区",
+		"220113": "九台区",
+		"220122": "农安县",
+		"220171": "长春经济技术开发区",
+		"220172": "长春净月高新技术产业开发区",
+		"220173": "长春高新技术产业开发区",
+		"220174": "长春汽车经济技术开发区",
+		"220182": "榆树市",
+		"220183": "德惠市",
+		"220184": "公主岭市",
+		"220192": "经济技术开发区",
+		"220202": "昌邑区",
+		"220203": "龙潭区",
+		"220204": "船营区",
+		"220211": "丰满区",
+		"220221": "永吉县",
+		"220271": "吉林经济开发区",
+		"220272": "吉林高新技术产业开发区",
+		"220281": "蛟河市",
+		"220282": "桦甸市",
+		"220283": "舒兰市",
+		"220284": "磐石市",
+		"220302": "铁西区",
+		"220303": "铁东区",
+		"220322": "梨树县",
+		"220323": "伊通满族自治县",
+		"220382": "双辽市",
+		"220402": "龙山区",
+		"220403": "西安区",
+		"220421": "东丰县",
+		"220422": "东辽县",
+		"220502": "东昌区",
+		"220503": "二道江区",
+		"220521": "通化县",
+		"220523": "辉南县",
+		"220524": "柳河县",
+		"220581": "梅河口市",
+		"220582": "集安市",
+		"220602": "浑江区",
+		"220605": "江源区",
+		"220621": "抚松县",
+		"220622": "靖宇县",
+		"220623": "长白朝鲜族自治县",
+		"220681": "临江市",
+		"220702": "宁江区",
+		"220721": "前郭尔罗斯蒙古族自治县",
+		"220722": "长岭县",
+		"220723": "乾安县",
+		"220771": "吉林松原经济开发区",
+		"220781": "扶余市",
+		"220802": "洮北区",
+		"220821": "镇赉县",
+		"220822": "通榆县",
+		"220871": "吉林白城经济开发区",
+		"220881": "洮南市",
+		"220882": "大安市",
+		"222401": "延吉市",
+		"222402": "图们市",
+		"222403": "敦化市",
+		"222404": "珲春市",
+		"222405": "龙井市",
+		"222406": "和龙市",
+		"222424": "汪清县",
+		"222426": "安图县",
+		"230102": "道里区",
+		"230103": "南岗区",
+		"230104": "道外区",
+		"230108": "平房区",
+		"230109": "松北区",
+		"230110": "香坊区",
+		"230111": "呼兰区",
+		"230112": "阿城区",
+		"230113": "双城区",
+		"230123": "依兰县",
+		"230124": "方正县",
+		"230125": "宾县",
+		"230126": "巴彦县",
+		"230127": "木兰县",
+		"230128": "通河县",
+		"230129": "延寿县",
+		"230183": "尚志市",
+		"230184": "五常市",
+		"230202": "龙沙区",
+		"230203": "建华区",
+		"230204": "铁锋区",
+		"230205": "昂昂溪区",
+		"230206": "富拉尔基区",
+		"230207": "碾子山区",
+		"230208": "梅里斯达斡尔族区",
+		"230221": "龙江县",
+		"230223": "依安县",
+		"230224": "泰来县",
+		"230225": "甘南县",
+		"230227": "富裕县",
+		"230229": "克山县",
+		"230230": "克东县",
+		"230231": "拜泉县",
+		"230281": "讷河市",
+		"230302": "鸡冠区",
+		"230303": "恒山区",
+		"230304": "滴道区",
+		"230305": "梨树区",
+		"230306": "城子河区",
+		"230307": "麻山区",
+		"230321": "鸡东县",
+		"230381": "虎林市",
+		"230382": "密山市",
+		"230402": "向阳区",
+		"230403": "工农区",
+		"230404": "南山区",
+		"230405": "兴安区",
+		"230406": "东山区",
+		"230407": "兴山区",
+		"230421": "萝北县",
+		"230422": "绥滨县",
+		"230502": "尖山区",
+		"230503": "岭东区",
+		"230505": "四方台区",
+		"230506": "宝山区",
+		"230521": "集贤县",
+		"230522": "友谊县",
+		"230523": "宝清县",
+		"230524": "饶河县",
+		"230602": "萨尔图区",
+		"230603": "龙凤区",
+		"230604": "让胡路区",
+		"230605": "红岗区",
+		"230606": "大同区",
+		"230621": "肇州县",
+		"230622": "肇源县",
+		"230623": "林甸县",
+		"230624": "杜尔伯特蒙古族自治县",
+		"230671": "大庆高新技术产业开发区",
+		"230717": "伊美区",
+		"230718": "乌翠区",
+		"230719": "友好区",
+		"230722": "嘉荫县",
+		"230723": "汤旺县",
+		"230724": "丰林县",
+		"230725": "大箐山县",
+		"230726": "南岔县",
+		"230751": "金林区",
+		"230781": "铁力市",
+		"230803": "向阳区",
+		"230804": "前进区",
+		"230805": "东风区",
+		"230811": "郊区",
+		"230822": "桦南县",
+		"230826": "桦川县",
+		"230828": "汤原县",
+		"230881": "同江市",
+		"230882": "富锦市",
+		"230883": "抚远市",
+		"230902": "新兴区",
+		"230903": "桃山区",
+		"230904": "茄子河区",
+		"230921": "勃利县",
+		"231002": "东安区",
+		"231003": "阳明区",
+		"231004": "爱民区",
+		"231005": "西安区",
+		"231025": "林口县",
+		"231081": "绥芬河市",
+		"231083": "海林市",
+		"231084": "宁安市",
+		"231085": "穆棱市",
+		"231086": "东宁市",
+		"231102": "爱辉区",
+		"231123": "逊克县",
+		"231124": "孙吴县",
+		"231181": "北安市",
+		"231182": "五大连池市",
+		"231183": "嫩江市",
+		"231202": "北林区",
+		"231221": "望奎县",
+		"231222": "兰西县",
+		"231223": "青冈县",
+		"231224": "庆安县",
+		"231225": "明水县",
+		"231226": "绥棱县",
+		"231281": "安达市",
+		"231282": "肇东市",
+		"231283": "海伦市",
+		"232701": "漠河市",
+		"232721": "呼玛县",
+		"232722": "塔河县",
+		"232761": "加格达奇区",
+		"232762": "松岭区",
+		"232763": "新林区",
+		"232764": "呼中区",
+		"310101": "黄浦区",
+		"310104": "徐汇区",
+		"310105": "长宁区",
+		"310106": "静安区",
+		"310107": "普陀区",
+		"310109": "虹口区",
+		"310110": "杨浦区",
+		"310112": "闵行区",
+		"310113": "宝山区",
+		"310114": "嘉定区",
+		"310115": "浦东新区",
+		"310116": "金山区",
+		"310117": "松江区",
+		"310118": "青浦区",
+		"310120": "奉贤区",
+		"310151": "崇明区",
+		"320102": "玄武区",
+		"320104": "秦淮区",
+		"320105": "建邺区",
+		"320106": "鼓楼区",
+		"320111": "浦口区",
+		"320112": "江北新区",
+		"320113": "栖霞区",
+		"320114": "雨花台区",
+		"320115": "江宁区",
+		"320116": "六合区",
+		"320117": "溧水区",
+		"320118": "高淳区",
+		"320205": "锡山区",
+		"320206": "惠山区",
+		"320211": "滨湖区",
+		"320213": "梁溪区",
+		"320214": "新吴区",
+		"320281": "江阴市",
+		"320282": "宜兴市",
+		"320302": "鼓楼区",
+		"320303": "云龙区",
+		"320305": "贾汪区",
+		"320311": "泉山区",
+		"320312": "铜山区",
+		"320321": "丰县",
+		"320322": "沛县",
+		"320324": "睢宁县",
+		"320371": "徐州经济技术开发区",
+		"320381": "新沂市",
+		"320382": "邳州市",
+		"320391": "工业园区",
+		"320402": "天宁区",
+		"320404": "钟楼区",
+		"320411": "新北区",
+		"320412": "武进区",
+		"320413": "金坛区",
+		"320481": "溧阳市",
+		"320505": "虎丘区",
+		"320506": "吴中区",
+		"320507": "相城区",
+		"320508": "姑苏区",
+		"320509": "吴江区",
+		"320571": "苏州工业园区",
+		"320581": "常熟市",
+		"320582": "张家港市",
+		"320583": "昆山市",
+		"320585": "太仓市",
+		"320590": "工业园区",
+		"320591": "高新区",
+		"320611": "港闸区",
+		"320612": "通州区",
+		"320613": "崇川区",
+		"320614": "海门区",
+		"320623": "如东县",
+		"320681": "启东市",
+		"320682": "如皋市",
+		"320685": "海安市",
+		"320691": "高新区",
+		"320703": "连云区",
+		"320706": "海州区",
+		"320707": "赣榆区",
+		"320722": "东海县",
+		"320723": "灌云县",
+		"320724": "灌南县",
+		"320771": "连云港经济技术开发区",
+		"320803": "淮安区",
+		"320804": "淮阴区",
+		"320812": "清江浦区",
+		"320813": "洪泽区",
+		"320826": "涟水县",
+		"320830": "盱眙县",
+		"320831": "金湖县",
+		"320871": "淮安经济技术开发区",
+		"320890": "经济开发区",
+		"320902": "亭湖区",
+		"320903": "盐都区",
+		"320904": "大丰区",
+		"320921": "响水县",
+		"320922": "滨海县",
+		"320923": "阜宁县",
+		"320924": "射阳县",
+		"320925": "建湖县",
+		"320971": "盐城经济技术开发区",
+		"320981": "东台市",
+		"321002": "广陵区",
+		"321003": "邗江区",
+		"321012": "江都区",
+		"321023": "宝应县",
+		"321071": "扬州经济技术开发区",
+		"321081": "仪征市",
+		"321084": "高邮市",
+		"321090": "经济开发区",
+		"321102": "京口区",
+		"321111": "润州区",
+		"321112": "丹徒区",
+		"321150": "镇江新区",
+		"321181": "丹阳市",
+		"321182": "扬中市",
+		"321183": "句容市",
+		"321202": "海陵区",
+		"321203": "高港区",
+		"321204": "姜堰区",
+		"321271": "泰州医药高新技术产业开发区",
+		"321281": "兴化市",
+		"321282": "靖江市",
+		"321283": "泰兴市",
+		"321302": "宿城区",
+		"321311": "宿豫区",
+		"321322": "沭阳县",
+		"321323": "泗阳县",
+		"321324": "泗洪县",
+		"321371": "宿迁经济技术开发区",
+		"330102": "上城区",
+		"330105": "拱墅区",
+		"330106": "西湖区",
+		"330108": "滨江区",
+		"330109": "萧山区",
+		"330110": "余杭区",
+		"330111": "富阳区",
+		"330112": "临安区",
+		"330113": "临平区",
+		"330114": "钱塘区",
+		"330122": "桐庐县",
+		"330127": "淳安县",
+		"330182": "建德市",
+		"330203": "海曙区",
+		"330205": "江北区",
+		"330206": "北仑区",
+		"330211": "镇海区",
+		"330212": "鄞州区",
+		"330213": "奉化区",
+		"330225": "象山县",
+		"330226": "宁海县",
+		"330281": "余姚市",
+		"330282": "慈溪市",
+		"330302": "鹿城区",
+		"330303": "龙湾区",
+		"330304": "瓯海区",
+		"330305": "洞头区",
+		"330324": "永嘉县",
+		"330326": "平阳县",
+		"330327": "苍南县",
+		"330328": "文成县",
+		"330329": "泰顺县",
+		"330381": "瑞安市",
+		"330382": "乐清市",
+		"330383": "龙港市",
+		"330402": "南湖区",
+		"330411": "秀洲区",
+		"330421": "嘉善县",
+		"330424": "海盐县",
+		"330481": "海宁市",
+		"330482": "平湖市",
+		"330483": "桐乡市",
+		"330502": "吴兴区",
+		"330503": "南浔区",
+		"330521": "德清县",
+		"330522": "长兴县",
+		"330523": "安吉县",
+		"330602": "越城区",
+		"330603": "柯桥区",
+		"330604": "上虞区",
+		"330624": "新昌县",
+		"330681": "诸暨市",
+		"330683": "嵊州市",
+		"330702": "婺城区",
+		"330703": "金东区",
+		"330723": "武义县",
+		"330726": "浦江县",
+		"330727": "磐安县",
+		"330781": "兰溪市",
+		"330782": "义乌市",
+		"330783": "东阳市",
+		"330784": "永康市",
+		"330802": "柯城区",
+		"330803": "衢江区",
+		"330822": "常山县",
+		"330824": "开化县",
+		"330825": "龙游县",
+		"330881": "江山市",
+		"330902": "定海区",
+		"330903": "普陀区",
+		"330921": "岱山县",
+		"330922": "嵊泗县",
+		"331002": "椒江区",
+		"331003": "黄岩区",
+		"331004": "路桥区",
+		"331022": "三门县",
+		"331023": "天台县",
+		"331024": "仙居县",
+		"331081": "温岭市",
+		"331082": "临海市",
+		"331083": "玉环市",
+		"331102": "莲都区",
+		"331121": "青田县",
+		"331122": "缙云县",
+		"331123": "遂昌县",
+		"331124": "松阳县",
+		"331125": "云和县",
+		"331126": "庆元县",
+		"331127": "景宁畲族自治县",
+		"331181": "龙泉市",
+		"340102": "瑶海区",
+		"340103": "庐阳区",
+		"340104": "蜀山区",
+		"340111": "包河区",
+		"340121": "长丰县",
+		"340122": "肥东县",
+		"340123": "肥西县",
+		"340124": "庐江县",
+		"340171": "合肥高新技术产业开发区",
+		"340172": "合肥经济技术开发区",
+		"340173": "合肥新站高新技术产业开发区",
+		"340181": "巢湖市",
+		"340190": "高新技术开发区",
+		"340191": "经济技术开发区",
+		"340202": "镜湖区",
+		"340207": "鸠江区",
+		"340209": "弋江区",
+		"340210": "湾沚区",
+		"340212": "繁昌区",
+		"340223": "南陵县",
+		"340281": "无为市",
+		"340302": "龙子湖区",
+		"340303": "蚌山区",
+		"340304": "禹会区",
+		"340311": "淮上区",
+		"340321": "怀远县",
+		"340322": "五河县",
+		"340323": "固镇县",
+		"340371": "蚌埠市高新技术开发区",
+		"340372": "蚌埠市经济开发区",
+		"340402": "大通区",
+		"340403": "田家庵区",
+		"340404": "谢家集区",
+		"340405": "八公山区",
+		"340406": "潘集区",
+		"340421": "凤台县",
+		"340422": "寿县",
+		"340503": "花山区",
+		"340504": "雨山区",
+		"340506": "博望区",
+		"340521": "当涂县",
+		"340522": "含山县",
+		"340523": "和县",
+		"340602": "杜集区",
+		"340603": "相山区",
+		"340604": "烈山区",
+		"340621": "濉溪县",
+		"340705": "铜官区",
+		"340706": "义安区",
+		"340711": "郊区",
+		"340722": "枞阳县",
+		"340802": "迎江区",
+		"340803": "大观区",
+		"340811": "宜秀区",
+		"340822": "怀宁县",
+		"340825": "太湖县",
+		"340826": "宿松县",
+		"340827": "望江县",
+		"340828": "岳西县",
+		"340881": "桐城市",
+		"340882": "潜山市",
+		"341002": "屯溪区",
+		"341003": "黄山区",
+		"341004": "徽州区",
+		"341021": "歙县",
+		"341022": "休宁县",
+		"341023": "黟县",
+		"341024": "祁门县",
+		"341102": "琅琊区",
+		"341103": "南谯区",
+		"341122": "来安县",
+		"341124": "全椒县",
+		"341125": "定远县",
+		"341126": "凤阳县",
+		"341181": "天长市",
+		"341182": "明光市",
+		"341202": "颍州区",
+		"341203": "颍东区",
+		"341204": "颍泉区",
+		"341221": "临泉县",
+		"341222": "太和县",
+		"341225": "阜南县",
+		"341226": "颍上县",
+		"341271": "阜阳合肥现代产业园区",
+		"341282": "界首市",
+		"341302": "埇桥区",
+		"341321": "砀山县",
+		"341322": "萧县",
+		"341323": "灵璧县",
+		"341324": "泗县",
+		"341371": "宿州马鞍山现代产业园区",
+		"341372": "宿州经济技术开发区",
+		"341390": "经济开发区",
+		"341502": "金安区",
+		"341503": "裕安区",
+		"341504": "叶集区",
+		"341522": "霍邱县",
+		"341523": "舒城县",
+		"341524": "金寨县",
+		"341525": "霍山县",
+		"341602": "谯城区",
+		"341621": "涡阳县",
+		"341622": "蒙城县",
+		"341623": "利辛县",
+		"341702": "贵池区",
+		"341721": "东至县",
+		"341722": "石台县",
+		"341723": "青阳县",
+		"341802": "宣州区",
+		"341821": "郎溪县",
+		"341823": "泾县",
+		"341824": "绩溪县",
+		"341825": "旌德县",
+		"341871": "宣城市经济开发区",
+		"341881": "宁国市",
+		"341882": "广德市",
+		"350102": "鼓楼区",
+		"350103": "台江区",
+		"350104": "仓山区",
+		"350105": "马尾区",
+		"350111": "晋安区",
+		"350112": "长乐区",
+		"350121": "闽侯县",
+		"350122": "连江县",
+		"350123": "罗源县",
+		"350124": "闽清县",
+		"350125": "永泰县",
+		"350128": "平潭县",
+		"350181": "福清市",
+		"350203": "思明区",
+		"350205": "海沧区",
+		"350206": "湖里区",
+		"350211": "集美区",
+		"350212": "同安区",
+		"350213": "翔安区",
+		"350302": "城厢区",
+		"350303": "涵江区",
+		"350304": "荔城区",
+		"350305": "秀屿区",
+		"350322": "仙游县",
+		"350402": "梅列区",
+		"350404": "三元区",
+		"350405": "沙县区",
+		"350421": "明溪县",
+		"350423": "清流县",
+		"350424": "宁化县",
+		"350425": "大田县",
+		"350426": "尤溪县",
+		"350428": "将乐县",
+		"350429": "泰宁县",
+		"350430": "建宁县",
+		"350481": "永安市",
+		"350502": "鲤城区",
+		"350503": "丰泽区",
+		"350504": "洛江区",
+		"350505": "泉港区",
+		"350521": "惠安县",
+		"350524": "安溪县",
+		"350525": "永春县",
+		"350526": "德化县",
+		"350527": "金门县",
+		"350581": "石狮市",
+		"350582": "晋江市",
+		"350583": "南安市",
+		"350602": "芗城区",
+		"350603": "龙文区",
+		"350604": "龙海区",
+		"350605": "长泰区",
+		"350622": "云霄县",
+		"350623": "漳浦县",
+		"350624": "诏安县",
+		"350626": "东山县",
+		"350627": "南靖县",
+		"350628": "平和县",
+		"350629": "华安县",
+		"350702": "延平区",
+		"350703": "建阳区",
+		"350721": "顺昌县",
+		"350722": "浦城县",
+		"350723": "光泽县",
+		"350724": "松溪县",
+		"350725": "政和县",
+		"350781": "邵武市",
+		"350782": "武夷山市",
+		"350783": "建瓯市",
+		"350802": "新罗区",
+		"350803": "永定区",
+		"350821": "长汀县",
+		"350823": "上杭县",
+		"350824": "武平县",
+		"350825": "连城县",
+		"350881": "漳平市",
+		"350902": "蕉城区",
+		"350921": "霞浦县",
+		"350922": "古田县",
+		"350923": "屏南县",
+		"350924": "寿宁县",
+		"350925": "周宁县",
+		"350926": "柘荣县",
+		"350981": "福安市",
+		"350982": "福鼎市",
+		"360102": "东湖区",
+		"360103": "西湖区",
+		"360104": "青云谱区",
+		"360111": "青山湖区",
+		"360112": "新建区",
+		"360113": "红谷滩区",
+		"360121": "南昌县",
+		"360123": "安义县",
+		"360124": "进贤县",
+		"360190": "经济技术开发区",
+		"360192": "高新区",
+		"360202": "昌江区",
+		"360203": "珠山区",
+		"360222": "浮梁县",
+		"360281": "乐平市",
+		"360302": "安源区",
+		"360313": "湘东区",
+		"360321": "莲花县",
+		"360322": "上栗县",
+		"360323": "芦溪县",
+		"360402": "濂溪区",
+		"360403": "浔阳区",
+		"360404": "柴桑区",
+		"360423": "武宁县",
+		"360424": "修水县",
+		"360425": "永修县",
+		"360426": "德安县",
+		"360428": "都昌县",
+		"360429": "湖口县",
+		"360430": "彭泽县",
+		"360481": "瑞昌市",
+		"360482": "共青城市",
+		"360483": "庐山市",
+		"360490": "经济技术开发区",
+		"360502": "渝水区",
+		"360521": "分宜县",
+		"360602": "月湖区",
+		"360603": "余江区",
+		"360681": "贵溪市",
+		"360702": "章贡区",
+		"360703": "南康区",
+		"360704": "赣县区",
+		"360722": "信丰县",
+		"360723": "大余县",
+		"360724": "上犹县",
+		"360725": "崇义县",
+		"360726": "安远县",
+		"360728": "定南县",
+		"360729": "全南县",
+		"360730": "宁都县",
+		"360731": "于都县",
+		"360732": "兴国县",
+		"360733": "会昌县",
+		"360734": "寻乌县",
+		"360735": "石城县",
+		"360781": "瑞金市",
+		"360783": "龙南市",
+		"360802": "吉州区",
+		"360803": "青原区",
+		"360821": "吉安县",
+		"360822": "吉水县",
+		"360823": "峡江县",
+		"360824": "新干县",
+		"360825": "永丰县",
+		"360826": "泰和县",
+		"360827": "遂川县",
+		"360828": "万安县",
+		"360829": "安福县",
+		"360830": "永新县",
+		"360881": "井冈山市",
+		"360902": "袁州区",
+		"360921": "奉新县",
+		"360922": "万载县",
+		"360923": "上高县",
+		"360924": "宜丰县",
+		"360925": "靖安县",
+		"360926": "铜鼓县",
+		"360981": "丰城市",
+		"360982": "樟树市",
+		"360983": "高安市",
+		"361002": "临川区",
+		"361003": "东乡区",
+		"361021": "南城县",
+		"361022": "黎川县",
+		"361023": "南丰县",
+		"361024": "崇仁县",
+		"361025": "乐安县",
+		"361026": "宜黄县",
+		"361027": "金溪县",
+		"361028": "资溪县",
+		"361030": "广昌县",
+		"361102": "信州区",
+		"361103": "广丰区",
+		"361104": "广信区",
+		"361123": "玉山县",
+		"361124": "铅山县",
+		"361125": "横峰县",
+		"361126": "弋阳县",
+		"361127": "余干县",
+		"361128": "鄱阳县",
+		"361129": "万年县",
+		"361130": "婺源县",
+		"361181": "德兴市",
+		"370102": "历下区",
+		"370103": "市中区",
+		"370104": "槐荫区",
+		"370105": "天桥区",
+		"370112": "历城区",
+		"370113": "长清区",
+		"370114": "章丘区",
+		"370115": "济阳区",
+		"370116": "莱芜区",
+		"370117": "钢城区",
+		"370124": "平阴县",
+		"370126": "商河县",
+		"370171": "济南高新技术产业开发区",
+		"370190": "高新区",
+		"370202": "市南区",
+		"370203": "市北区",
+		"370211": "黄岛区",
+		"370212": "崂山区",
+		"370213": "李沧区",
+		"370214": "城阳区",
+		"370215": "即墨区",
+		"370271": "青岛高新技术产业开发区",
+		"370281": "胶州市",
+		"370283": "平度市",
+		"370285": "莱西市",
+		"370290": "开发区",
+		"370302": "淄川区",
+		"370303": "张店区",
+		"370304": "博山区",
+		"370305": "临淄区",
+		"370306": "周村区",
+		"370321": "桓台县",
+		"370322": "高青县",
+		"370323": "沂源县",
+		"370402": "市中区",
+		"370403": "薛城区",
+		"370404": "峄城区",
+		"370405": "台儿庄区",
+		"370406": "山亭区",
+		"370481": "滕州市",
+		"370502": "东营区",
+		"370503": "河口区",
+		"370505": "垦利区",
+		"370522": "利津县",
+		"370523": "广饶县",
+		"370571": "东营经济技术开发区",
+		"370572": "东营港经济开发区",
+		"370602": "芝罘区",
+		"370611": "福山区",
+		"370612": "牟平区",
+		"370613": "莱山区",
+		"370614": "蓬莱区",
+		"370634": "长岛县",
+		"370671": "烟台高新技术产业开发区",
+		"370672": "烟台经济技术开发区",
+		"370681": "龙口市",
+		"370682": "莱阳市",
+		"370683": "莱州市",
+		"370685": "招远市",
+		"370686": "栖霞市",
+		"370687": "海阳市",
+		"370690": "开发区",
+		"370702": "潍城区",
+		"370703": "寒亭区",
+		"370704": "坊子区",
+		"370705": "奎文区",
+		"370724": "临朐县",
+		"370725": "昌乐县",
+		"370772": "潍坊滨海经济技术开发区",
+		"370781": "青州市",
+		"370782": "诸城市",
+		"370783": "寿光市",
+		"370784": "安丘市",
+		"370785": "高密市",
+		"370786": "昌邑市",
+		"370790": "开发区",
+		"370791": "高新区",
+		"370811": "任城区",
+		"370812": "兖州区",
+		"370826": "微山县",
+		"370827": "鱼台县",
+		"370828": "金乡县",
+		"370829": "嘉祥县",
+		"370830": "汶上县",
+		"370831": "泗水县",
+		"370832": "梁山县",
+		"370871": "济宁高新技术产业开发区",
+		"370881": "曲阜市",
+		"370883": "邹城市",
+		"370890": "高新区",
+		"370902": "泰山区",
+		"370911": "岱岳区",
+		"370921": "宁阳县",
+		"370923": "东平县",
+		"370982": "新泰市",
+		"370983": "肥城市",
+		"371002": "环翠区",
+		"371003": "文登区",
+		"371071": "威海火炬高技术产业开发区",
+		"371072": "威海经济技术开发区",
+		"371082": "荣成市",
+		"371083": "乳山市",
+		"371091": "经济技术开发区",
+		"371102": "东港区",
+		"371103": "岚山区",
+		"371121": "五莲县",
+		"371122": "莒县",
+		"371171": "日照经济技术开发区",
+		"371302": "兰山区",
+		"371311": "罗庄区",
+		"371312": "河东区",
+		"371321": "沂南县",
+		"371322": "郯城县",
+		"371323": "沂水县",
+		"371324": "兰陵县",
+		"371325": "费县",
+		"371326": "平邑县",
+		"371327": "莒南县",
+		"371328": "蒙阴县",
+		"371329": "临沭县",
+		"371371": "临沂高新技术产业开发区",
+		"371402": "德城区",
+		"371403": "陵城区",
+		"371422": "宁津县",
+		"371423": "庆云县",
+		"371424": "临邑县",
+		"371425": "齐河县",
+		"371426": "平原县",
+		"371427": "夏津县",
+		"371428": "武城县",
+		"371472": "德州运河经济开发区",
+		"371481": "乐陵市",
+		"371482": "禹城市",
+		"371502": "东昌府区",
+		"371503": "茌平区",
+		"371521": "阳谷县",
+		"371522": "莘县",
+		"371524": "东阿县",
+		"371525": "冠县",
+		"371526": "高唐县",
+		"371581": "临清市",
+		"371602": "滨城区",
+		"371603": "沾化区",
+		"371621": "惠民县",
+		"371622": "阳信县",
+		"371623": "无棣县",
+		"371625": "博兴县",
+		"371681": "邹平市",
+		"371702": "牡丹区",
+		"371703": "定陶区",
+		"371721": "曹县",
+		"371722": "单县",
+		"371723": "成武县",
+		"371724": "巨野县",
+		"371725": "郓城县",
+		"371726": "鄄城县",
+		"371728": "东明县",
+		"371771": "菏泽经济技术开发区",
+		"371772": "菏泽高新技术开发区",
+		"410102": "中原区",
+		"410103": "二七区",
+		"410104": "管城回族区",
+		"410105": "金水区",
+		"410106": "上街区",
+		"410108": "惠济区",
+		"410122": "中牟县",
+		"410171": "郑州经济技术开发区",
+		"410172": "郑州高新技术产业开发区",
+		"410173": "郑州航空港经济综合实验区",
+		"410181": "巩义市",
+		"410182": "荥阳市",
+		"410183": "新密市",
+		"410184": "新郑市",
+		"410185": "登封市",
+		"410190": "高新技术开发区",
+		"410191": "经济技术开发区",
+		"410202": "龙亭区",
+		"410203": "顺河回族区",
+		"410204": "鼓楼区",
+		"410205": "禹王台区",
+		"410212": "祥符区",
+		"410221": "杞县",
+		"410222": "通许县",
+		"410223": "尉氏县",
+		"410225": "兰考县",
+		"410302": "老城区",
+		"410303": "西工区",
+		"410304": "瀍河回族区",
+		"410305": "涧西区",
+		"410307": "偃师区",
+		"410308": "孟津区",
+		"410311": "洛龙区",
+		"410323": "新安县",
+		"410324": "栾川县",
+		"410325": "嵩县",
+		"410326": "汝阳县",
+		"410327": "宜阳县",
+		"410328": "洛宁县",
+		"410329": "伊川县",
+		"410402": "新华区",
+		"410403": "卫东区",
+		"410404": "石龙区",
+		"410411": "湛河区",
+		"410421": "宝丰县",
+		"410422": "叶县",
+		"410423": "鲁山县",
+		"410425": "郏县",
+		"410471": "平顶山高新技术产业开发区",
+		"410481": "舞钢市",
+		"410482": "汝州市",
+		"410502": "文峰区",
+		"410503": "北关区",
+		"410505": "殷都区",
+		"410506": "龙安区",
+		"410522": "安阳县",
+		"410523": "汤阴县",
+		"410526": "滑县",
+		"410527": "内黄县",
+		"410581": "林州市",
+		"410590": "开发区",
+		"410602": "鹤山区",
+		"410603": "山城区",
+		"410611": "淇滨区",
+		"410621": "浚县",
+		"410622": "淇县",
+		"410702": "红旗区",
+		"410703": "卫滨区",
+		"410704": "凤泉区",
+		"410711": "牧野区",
+		"410721": "新乡县",
+		"410724": "获嘉县",
+		"410725": "原阳县",
+		"410726": "延津县",
+		"410727": "封丘县",
+		"410771": "新乡高新技术产业开发区",
+		"410772": "新乡经济技术开发区",
+		"410781": "卫辉市",
+		"410782": "辉县市",
+		"410783": "长垣市",
+		"410802": "解放区",
+		"410803": "中站区",
+		"410804": "马村区",
+		"410811": "山阳区",
+		"410821": "修武县",
+		"410822": "博爱县",
+		"410823": "武陟县",
+		"410825": "温县",
+		"410871": "焦作城乡一体化示范区",
+		"410882": "沁阳市",
+		"410883": "孟州市",
+		"410902": "华龙区",
+		"410922": "清丰县",
+		"410923": "南乐县",
+		"410926": "范县",
+		"410927": "台前县",
+		"410928": "濮阳县",
+		"410971": "河南濮阳工业园区",
+		"411002": "魏都区",
+		"411003": "建安区",
+		"411024": "鄢陵县",
+		"411025": "襄城县",
+		"411071": "许昌经济技术开发区",
+		"411081": "禹州市",
+		"411082": "长葛市",
+		"411102": "源汇区",
+		"411103": "郾城区",
+		"411104": "召陵区",
+		"411121": "舞阳县",
+		"411122": "临颍县",
+		"411171": "漯河经济技术开发区",
+		"411202": "湖滨区",
+		"411203": "陕州区",
+		"411221": "渑池县",
+		"411224": "卢氏县",
+		"411271": "河南三门峡经济开发区",
+		"411281": "义马市",
+		"411282": "灵宝市",
+		"411302": "宛城区",
+		"411303": "卧龙区",
+		"411321": "南召县",
+		"411322": "方城县",
+		"411323": "西峡县",
+		"411324": "镇平县",
+		"411325": "内乡县",
+		"411326": "淅川县",
+		"411327": "社旗县",
+		"411328": "唐河县",
+		"411329": "新野县",
+		"411330": "桐柏县",
+		"411372": "南阳市城乡一体化示范区",
+		"411381": "邓州市",
+		"411402": "梁园区",
+		"411403": "睢阳区",
+		"411421": "民权县",
+		"411422": "睢县",
+		"411423": "宁陵县",
+		"411424": "柘城县",
+		"411425": "虞城县",
+		"411426": "夏邑县",
+		"411481": "永城市",
+		"411502": "浉河区",
+		"411503": "平桥区",
+		"411521": "罗山县",
+		"411522": "光山县",
+		"411523": "新县",
+		"411524": "商城县",
+		"411525": "固始县",
+		"411526": "潢川县",
+		"411527": "淮滨县",
+		"411528": "息县",
+		"411602": "川汇区",
+		"411603": "淮阳区",
+		"411621": "扶沟县",
+		"411622": "西华县",
+		"411623": "商水县",
+		"411624": "沈丘县",
+		"411625": "郸城县",
+		"411627": "太康县",
+		"411628": "鹿邑县",
+		"411671": "河南周口经济开发区",
+		"411681": "项城市",
+		"411690": "经济开发区",
+		"411702": "驿城区",
+		"411721": "西平县",
+		"411722": "上蔡县",
+		"411723": "平舆县",
+		"411724": "正阳县",
+		"411725": "确山县",
+		"411726": "泌阳县",
+		"411727": "汝南县",
+		"411728": "遂平县",
+		"411729": "新蔡县",
+		"419001": "济源市",
+		"420102": "江岸区",
+		"420103": "江汉区",
+		"420104": "硚口区",
+		"420105": "汉阳区",
+		"420106": "武昌区",
+		"420107": "青山区",
+		"420111": "洪山区",
+		"420112": "东西湖区",
+		"420113": "汉南区",
+		"420114": "蔡甸区",
+		"420115": "江夏区",
+		"420116": "黄陂区",
+		"420117": "新洲区",
+		"420202": "黄石港区",
+		"420203": "西塞山区",
+		"420204": "下陆区",
+		"420205": "铁山区",
+		"420222": "阳新县",
+		"420281": "大冶市",
+		"420302": "茅箭区",
+		"420303": "张湾区",
+		"420304": "郧阳区",
+		"420322": "郧西县",
+		"420323": "竹山县",
+		"420324": "竹溪县",
+		"420325": "房县",
+		"420381": "丹江口市",
+		"420502": "西陵区",
+		"420503": "伍家岗区",
+		"420504": "点军区",
+		"420505": "猇亭区",
+		"420506": "夷陵区",
+		"420525": "远安县",
+		"420526": "兴山县",
+		"420527": "秭归县",
+		"420528": "长阳土家族自治县",
+		"420529": "五峰土家族自治县",
+		"420581": "宜都市",
+		"420582": "当阳市",
+		"420583": "枝江市",
+		"420590": "经济开发区",
+		"420602": "襄城区",
+		"420606": "樊城区",
+		"420607": "襄州区",
+		"420624": "南漳县",
+		"420625": "谷城县",
+		"420626": "保康县",
+		"420682": "老河口市",
+		"420683": "枣阳市",
+		"420684": "宜城市",
+		"420702": "梁子湖区",
+		"420703": "华容区",
+		"420704": "鄂城区",
+		"420802": "东宝区",
+		"420804": "掇刀区",
+		"420822": "沙洋县",
+		"420881": "钟祥市",
+		"420882": "京山市",
+		"420902": "孝南区",
+		"420921": "孝昌县",
+		"420922": "大悟县",
+		"420923": "云梦县",
+		"420981": "应城市",
+		"420982": "安陆市",
+		"420984": "汉川市",
+		"421002": "沙市区",
+		"421003": "荆州区",
+		"421022": "公安县",
+		"421024": "江陵县",
+		"421081": "石首市",
+		"421083": "洪湖市",
+		"421087": "松滋市",
+		"421088": "监利市",
+		"421102": "黄州区",
+		"421121": "团风县",
+		"421122": "红安县",
+		"421123": "罗田县",
+		"421124": "英山县",
+		"421125": "浠水县",
+		"421126": "蕲春县",
+		"421127": "黄梅县",
+		"421171": "龙感湖管理区",
+		"421181": "麻城市",
+		"421182": "武穴市",
+		"421202": "咸安区",
+		"421221": "嘉鱼县",
+		"421222": "通城县",
+		"421223": "崇阳县",
+		"421224": "通山县",
+		"421281": "赤壁市",
+		"421303": "曾都区",
+		"421321": "随县",
+		"421381": "广水市",
+		"422801": "恩施市",
+		"422802": "利川市",
+		"422822": "建始县",
+		"422823": "巴东县",
+		"422825": "宣恩县",
+		"422826": "咸丰县",
+		"422827": "来凤县",
+		"422828": "鹤峰县",
+		"429004": "仙桃市",
+		"429005": "潜江市",
+		"429006": "天门市",
+		"429021": "神农架林区",
+		"430102": "芙蓉区",
+		"430103": "天心区",
+		"430104": "岳麓区",
+		"430105": "开福区",
+		"430111": "雨花区",
+		"430112": "望城区",
+		"430121": "长沙县",
+		"430181": "浏阳市",
+		"430182": "宁乡市",
+		"430202": "荷塘区",
+		"430203": "芦淞区",
+		"430204": "石峰区",
+		"430211": "天元区",
+		"430212": "渌口区",
+		"430223": "攸县",
+		"430224": "茶陵县",
+		"430225": "炎陵县",
+		"430271": "云龙示范区",
+		"430281": "醴陵市",
+		"430302": "雨湖区",
+		"430304": "岳塘区",
+		"430321": "湘潭县",
+		"430373": "湘潭九华示范区",
+		"430381": "湘乡市",
+		"430382": "韶山市",
+		"430405": "珠晖区",
+		"430406": "雁峰区",
+		"430407": "石鼓区",
+		"430408": "蒸湘区",
+		"430412": "南岳区",
+		"430421": "衡阳县",
+		"430422": "衡南县",
+		"430423": "衡山县",
+		"430424": "衡东县",
+		"430426": "祁东县",
+		"430481": "耒阳市",
+		"430482": "常宁市",
+		"430502": "双清区",
+		"430503": "大祥区",
+		"430511": "北塔区",
+		"430522": "新邵县",
+		"430523": "邵阳县",
+		"430524": "隆回县",
+		"430525": "洞口县",
+		"430527": "绥宁县",
+		"430528": "新宁县",
+		"430529": "城步苗族自治县",
+		"430581": "武冈市",
+		"430582": "邵东市",
+		"430602": "岳阳楼区",
+		"430603": "云溪区",
+		"430611": "君山区",
+		"430621": "岳阳县",
+		"430623": "华容县",
+		"430624": "湘阴县",
+		"430626": "平江县",
+		"430681": "汨罗市",
+		"430682": "临湘市",
+		"430702": "武陵区",
+		"430703": "鼎城区",
+		"430721": "安乡县",
+		"430722": "汉寿县",
+		"430723": "澧县",
+		"430724": "临澧县",
+		"430725": "桃源县",
+		"430726": "石门县",
+		"430781": "津市市",
+		"430802": "永定区",
+		"430811": "武陵源区",
+		"430821": "慈利县",
+		"430822": "桑植县",
+		"430902": "资阳区",
+		"430903": "赫山区",
+		"430921": "南县",
+		"430922": "桃江县",
+		"430923": "安化县",
+		"430971": "益阳市大通湖管理区",
+		"430981": "沅江市",
+		"431002": "北湖区",
+		"431003": "苏仙区",
+		"431021": "桂阳县",
+		"431022": "宜章县",
+		"431023": "永兴县",
+		"431024": "嘉禾县",
+		"431025": "临武县",
+		"431026": "汝城县",
+		"431027": "桂东县",
+		"431028": "安仁县",
+		"431081": "资兴市",
+		"431102": "零陵区",
+		"431103": "冷水滩区",
+		"431122": "东安县",
+		"431123": "双牌县",
+		"431124": "道县",
+		"431125": "江永县",
+		"431126": "宁远县",
+		"431127": "蓝山县",
+		"431128": "新田县",
+		"431129": "江华瑶族自治县",
+		"431181": "祁阳市",
+		"431202": "鹤城区",
+		"431221": "中方县",
+		"431222": "沅陵县",
+		"431223": "辰溪县",
+		"431224": "溆浦县",
+		"431225": "会同县",
+		"431226": "麻阳苗族自治县",
+		"431227": "新晃侗族自治县",
+		"431228": "芷江侗族自治县",
+		"431229": "靖州苗族侗族自治县",
+		"431230": "通道侗族自治县",
+		"431271": "怀化市洪江管理区",
+		"431281": "洪江市",
+		"431302": "娄星区",
+		"431321": "双峰县",
+		"431322": "新化县",
+		"431381": "冷水江市",
+		"431382": "涟源市",
+		"433101": "吉首市",
+		"433122": "泸溪县",
+		"433123": "凤凰县",
+		"433124": "花垣县",
+		"433125": "保靖县",
+		"433126": "古丈县",
+		"433127": "永顺县",
+		"433130": "龙山县",
+		"440103": "荔湾区",
+		"440104": "越秀区",
+		"440105": "海珠区",
+		"440106": "天河区",
+		"440111": "白云区",
+		"440112": "黄埔区",
+		"440113": "番禺区",
+		"440114": "花都区",
+		"440115": "南沙区",
+		"440117": "从化区",
+		"440118": "增城区",
+		"440203": "武江区",
+		"440204": "浈江区",
+		"440205": "曲江区",
+		"440222": "始兴县",
+		"440224": "仁化县",
+		"440229": "翁源县",
+		"440232": "乳源瑶族自治县",
+		"440233": "新丰县",
+		"440281": "乐昌市",
+		"440282": "南雄市",
+		"440303": "罗湖区",
+		"440304": "福田区",
+		"440305": "南山区",
+		"440306": "宝安区",
+		"440307": "龙岗区",
+		"440308": "盐田区",
+		"440309": "龙华区",
+		"440310": "坪山区",
+		"440311": "光明区",
+		"440402": "香洲区",
+		"440403": "斗门区",
+		"440404": "金湾区",
+		"440507": "龙湖区",
+		"440511": "金平区",
+		"440512": "濠江区",
+		"440513": "潮阳区",
+		"440514": "潮南区",
+		"440515": "澄海区",
+		"440523": "南澳县",
+		"440604": "禅城区",
+		"440605": "南海区",
+		"440606": "顺德区",
+		"440607": "三水区",
+		"440608": "高明区",
+		"440703": "蓬江区",
+		"440704": "江海区",
+		"440705": "新会区",
+		"440781": "台山市",
+		"440783": "开平市",
+		"440784": "鹤山市",
+		"440785": "恩平市",
+		"440802": "赤坎区",
+		"440803": "霞山区",
+		"440804": "坡头区",
+		"440811": "麻章区",
+		"440823": "遂溪县",
+		"440825": "徐闻县",
+		"440881": "廉江市",
+		"440882": "雷州市",
+		"440883": "吴川市",
+		"440890": "经济技术开发区",
+		"440902": "茂南区",
+		"440904": "电白区",
+		"440981": "高州市",
+		"440982": "化州市",
+		"440983": "信宜市",
+		"441202": "端州区",
+		"441203": "鼎湖区",
+		"441204": "高要区",
+		"441223": "广宁县",
+		"441224": "怀集县",
+		"441225": "封开县",
+		"441226": "德庆县",
+		"441284": "四会市",
+		"441302": "惠城区",
+		"441303": "惠阳区",
+		"441322": "博罗县",
+		"441323": "惠东县",
+		"441324": "龙门县",
+		"441402": "梅江区",
+		"441403": "梅县区",
+		"441422": "大埔县",
+		"441423": "丰顺县",
+		"441424": "五华县",
+		"441426": "平远县",
+		"441427": "蕉岭县",
+		"441481": "兴宁市",
+		"441502": "城区",
+		"441521": "海丰县",
+		"441523": "陆河县",
+		"441581": "陆丰市",
+		"441602": "源城区",
+		"441621": "紫金县",
+		"441622": "龙川县",
+		"441623": "连平县",
+		"441624": "和平县",
+		"441625": "东源县",
+		"441702": "江城区",
+		"441704": "阳东区",
+		"441721": "阳西县",
+		"441781": "阳春市",
+		"441802": "清城区",
+		"441803": "清新区",
+		"441821": "佛冈县",
+		"441823": "阳山县",
+		"441825": "连山壮族瑶族自治县",
+		"441826": "连南瑶族自治县",
+		"441881": "英德市",
+		"441882": "连州市",
+		"441901": "中堂镇",
+		"441903": "南城街道",
+		"441904": "长安镇",
+		"441905": "东坑镇",
+		"441906": "樟木头镇",
+		"441907": "莞城街道",
+		"441908": "石龙镇",
+		"441909": "桥头镇",
+		"441910": "万江街道",
+		"441911": "麻涌镇",
+		"441912": "虎门镇",
+		"441913": "谢岗镇",
+		"441914": "石碣镇",
+		"441915": "茶山镇",
+		"441916": "东城街道",
+		"441917": "洪梅镇",
+		"441918": "道滘镇",
+		"441919": "高埗镇",
+		"441920": "企石镇",
+		"441921": "凤岗镇",
+		"441922": "大岭山镇",
+		"441923": "松山湖",
+		"441924": "清溪镇",
+		"441925": "望牛墩镇",
+		"441926": "厚街镇",
+		"441927": "常平镇",
+		"441928": "寮步镇",
+		"441929": "石排镇",
+		"441930": "横沥镇",
+		"441931": "塘厦镇",
+		"441932": "黄江镇",
+		"441933": "大朗镇",
+		"441934": "东莞港",
+		"441935": "东莞生态园",
+		"441990": "沙田镇",
+		"442001": "南头镇",
+		"442002": "神湾镇",
+		"442003": "东凤镇",
+		"442004": "五桂山街道",
+		"442005": "黄圃镇",
+		"442006": "小榄镇",
+		"442007": "石岐街道",
+		"442008": "横栏镇",
+		"442009": "三角镇",
+		"442010": "三乡镇",
+		"442011": "港口镇",
+		"442012": "沙溪镇",
+		"442013": "板芙镇",
+		"442015": "东升镇",
+		"442016": "阜沙镇",
+		"442017": "民众镇",
+		"442018": "东区街道",
+		"442019": "火炬开发区街道办事处",
+		"442020": "西区街道",
+		"442021": "南区街道",
+		"442022": "古镇镇",
+		"442023": "坦洲镇",
+		"442024": "大涌镇",
+		"442025": "南朗镇",
+		"445102": "湘桥区",
+		"445103": "潮安区",
+		"445122": "饶平县",
+		"445202": "榕城区",
+		"445203": "揭东区",
+		"445222": "揭西县",
+		"445224": "惠来县",
+		"445281": "普宁市",
+		"445302": "云城区",
+		"445303": "云安区",
+		"445321": "新兴县",
+		"445322": "郁南县",
+		"445381": "罗定市",
+		"450102": "兴宁区",
+		"450103": "青秀区",
+		"450105": "江南区",
+		"450107": "西乡塘区",
+		"450108": "良庆区",
+		"450109": "邕宁区",
+		"450110": "武鸣区",
+		"450123": "隆安县",
+		"450124": "马山县",
+		"450125": "上林县",
+		"450126": "宾阳县",
+		"450181": "横州市",
+		"450202": "城中区",
+		"450203": "鱼峰区",
+		"450204": "柳南区",
+		"450205": "柳北区",
+		"450206": "柳江区",
+		"450222": "柳城县",
+		"450223": "鹿寨县",
+		"450224": "融安县",
+		"450225": "融水苗族自治县",
+		"450226": "三江侗族自治县",
+		"450302": "秀峰区",
+		"450303": "叠彩区",
+		"450304": "象山区",
+		"450305": "七星区",
+		"450311": "雁山区",
+		"450312": "临桂区",
+		"450321": "阳朔县",
+		"450323": "灵川县",
+		"450324": "全州县",
+		"450325": "兴安县",
+		"450326": "永福县",
+		"450327": "灌阳县",
+		"450328": "龙胜各族自治县",
+		"450329": "资源县",
+		"450330": "平乐县",
+		"450332": "恭城瑶族自治县",
+		"450381": "荔浦市",
+		"450403": "万秀区",
+		"450405": "长洲区",
+		"450406": "龙圩区",
+		"450421": "苍梧县",
+		"450422": "藤县",
+		"450423": "蒙山县",
+		"450481": "岑溪市",
+		"450502": "海城区",
+		"450503": "银海区",
+		"450512": "铁山港区",
+		"450521": "合浦县",
+		"450602": "港口区",
+		"450603": "防城区",
+		"450621": "上思县",
+		"450681": "东兴市",
+		"450702": "钦南区",
+		"450703": "钦北区",
+		"450721": "灵山县",
+		"450722": "浦北县",
+		"450802": "港北区",
+		"450803": "港南区",
+		"450804": "覃塘区",
+		"450821": "平南县",
+		"450881": "桂平市",
+		"450902": "玉州区",
+		"450903": "福绵区",
+		"450921": "容县",
+		"450922": "陆川县",
+		"450923": "博白县",
+		"450924": "兴业县",
+		"450981": "北流市",
+		"451002": "右江区",
+		"451003": "田阳区",
+		"451022": "田东县",
+		"451024": "德保县",
+		"451026": "那坡县",
+		"451027": "凌云县",
+		"451028": "乐业县",
+		"451029": "田林县",
+		"451030": "西林县",
+		"451031": "隆林各族自治县",
+		"451081": "靖西市",
+		"451082": "平果市",
+		"451102": "八步区",
+		"451103": "平桂区",
+		"451121": "昭平县",
+		"451122": "钟山县",
+		"451123": "富川瑶族自治县",
+		"451202": "金城江区",
+		"451203": "宜州区",
+		"451221": "南丹县",
+		"451222": "天峨县",
+		"451223": "凤山县",
+		"451224": "东兰县",
+		"451225": "罗城仫佬族自治县",
+		"451226": "环江毛南族自治县",
+		"451227": "巴马瑶族自治县",
+		"451228": "都安瑶族自治县",
+		"451229": "大化瑶族自治县",
+		"451302": "兴宾区",
+		"451321": "忻城县",
+		"451322": "象州县",
+		"451323": "武宣县",
+		"451324": "金秀瑶族自治县",
+		"451381": "合山市",
+		"451402": "江州区",
+		"451421": "扶绥县",
+		"451422": "宁明县",
+		"451423": "龙州县",
+		"451424": "大新县",
+		"451425": "天等县",
+		"451481": "凭祥市",
+		"460105": "秀英区",
+		"460106": "龙华区",
+		"460107": "琼山区",
+		"460108": "美兰区",
+		"460202": "海棠区",
+		"460203": "吉阳区",
+		"460204": "天涯区",
+		"460205": "崖州区",
+		"460321": "西沙区",
+		"460322": "南沙区",
+		"460401": "那大镇",
+		"460402": "和庆镇",
+		"460403": "南丰镇",
+		"460404": "大成镇",
+		"460405": "雅星镇",
+		"460406": "兰洋镇",
+		"460407": "光村镇",
+		"460408": "木棠镇",
+		"460409": "海头镇",
+		"460410": "峨蔓镇",
+		"460411": "王五镇",
+		"460412": "白马井镇",
+		"460413": "中和镇",
+		"460414": "排浦镇",
+		"460415": "东成镇",
+		"460416": "新州镇",
+		"460417": "洋浦经济开发区",
+		"460418": "华南热作学院",
+		"469001": "五指山市",
+		"469002": "琼海市",
+		"469005": "文昌市",
+		"469006": "万宁市",
+		"469007": "东方市",
+		"469021": "定安县",
+		"469022": "屯昌县",
+		"469023": "澄迈县",
+		"469024": "临高县",
+		"469025": "白沙黎族自治县",
+		"469026": "昌江黎族自治县",
+		"469027": "乐东黎族自治县",
+		"469028": "陵水黎族自治县",
+		"469029": "保亭黎族苗族自治县",
+		"469030": "琼中黎族苗族自治县",
+		"500101": "万州区",
+		"500102": "涪陵区",
+		"500103": "渝中区",
+		"500104": "大渡口区",
+		"500105": "江北区",
+		"500106": "沙坪坝区",
+		"500107": "九龙坡区",
+		"500108": "南岸区",
+		"500109": "北碚区",
+		"500110": "綦江区",
+		"500111": "大足区",
+		"500112": "渝北区",
+		"500113": "巴南区",
+		"500114": "黔江区",
+		"500115": "长寿区",
+		"500116": "江津区",
+		"500117": "合川区",
+		"500118": "永川区",
+		"500119": "南川区",
+		"500120": "璧山区",
+		"500151": "铜梁区",
+		"500152": "潼南区",
+		"500153": "荣昌区",
+		"500154": "开州区",
+		"500155": "梁平区",
+		"500156": "武隆区",
+		"500229": "城口县",
+		"500230": "丰都县",
+		"500231": "垫江县",
+		"500233": "忠县",
+		"500235": "云阳县",
+		"500236": "奉节县",
+		"500237": "巫山县",
+		"500238": "巫溪县",
+		"500240": "石柱土家族自治县",
+		"500241": "秀山土家族苗族自治县",
+		"500242": "酉阳土家族苗族自治县",
+		"500243": "彭水苗族土家族自治县",
+		"510104": "锦江区",
+		"510105": "青羊区",
+		"510106": "金牛区",
+		"510107": "武侯区",
+		"510108": "成华区",
+		"510112": "龙泉驿区",
+		"510113": "青白江区",
+		"510114": "新都区",
+		"510115": "温江区",
+		"510116": "双流区",
+		"510117": "郫都区",
+		"510118": "新津区",
+		"510121": "金堂县",
+		"510129": "大邑县",
+		"510131": "蒲江县",
+		"510181": "都江堰市",
+		"510182": "彭州市",
+		"510183": "邛崃市",
+		"510184": "崇州市",
+		"510185": "简阳市",
+		"510191": "高新区",
+		"510302": "自流井区",
+		"510303": "贡井区",
+		"510304": "大安区",
+		"510311": "沿滩区",
+		"510321": "荣县",
+		"510322": "富顺县",
+		"510402": "东区",
+		"510403": "西区",
+		"510411": "仁和区",
+		"510421": "米易县",
+		"510422": "盐边县",
+		"510502": "江阳区",
+		"510503": "纳溪区",
+		"510504": "龙马潭区",
+		"510521": "泸县",
+		"510522": "合江县",
+		"510524": "叙永县",
+		"510525": "古蔺县",
+		"510603": "旌阳区",
+		"510604": "罗江区",
+		"510623": "中江县",
+		"510681": "广汉市",
+		"510682": "什邡市",
+		"510683": "绵竹市",
+		"510703": "涪城区",
+		"510704": "游仙区",
+		"510705": "安州区",
+		"510722": "三台县",
+		"510723": "盐亭县",
+		"510725": "梓潼县",
+		"510726": "北川羌族自治县",
+		"510727": "平武县",
+		"510781": "江油市",
+		"510791": "高新区",
+		"510802": "利州区",
+		"510811": "昭化区",
+		"510812": "朝天区",
+		"510821": "旺苍县",
+		"510822": "青川县",
+		"510823": "剑阁县",
+		"510824": "苍溪县",
+		"510903": "船山区",
+		"510904": "安居区",
+		"510921": "蓬溪县",
+		"510923": "大英县",
+		"510981": "射洪市",
+		"511002": "市中区",
+		"511011": "东兴区",
+		"511024": "威远县",
+		"511025": "资中县",
+		"511083": "隆昌市",
+		"511102": "市中区",
+		"511111": "沙湾区",
+		"511112": "五通桥区",
+		"511113": "金口河区",
+		"511123": "犍为县",
+		"511124": "井研县",
+		"511126": "夹江县",
+		"511129": "沐川县",
+		"511132": "峨边彝族自治县",
+		"511133": "马边彝族自治县",
+		"511181": "峨眉山市",
+		"511302": "顺庆区",
+		"511303": "高坪区",
+		"511304": "嘉陵区",
+		"511321": "南部县",
+		"511322": "营山县",
+		"511323": "蓬安县",
+		"511324": "仪陇县",
+		"511325": "西充县",
+		"511381": "阆中市",
+		"511402": "东坡区",
+		"511403": "彭山区",
+		"511421": "仁寿县",
+		"511423": "洪雅县",
+		"511424": "丹棱县",
+		"511425": "青神县",
+		"511502": "翠屏区",
+		"511503": "南溪区",
+		"511504": "叙州区",
+		"511523": "江安县",
+		"511524": "长宁县",
+		"511525": "高县",
+		"511526": "珙县",
+		"511527": "筠连县",
+		"511528": "兴文县",
+		"511529": "屏山县",
+		"511602": "广安区",
+		"511603": "前锋区",
+		"511621": "岳池县",
+		"511622": "武胜县",
+		"511623": "邻水县",
+		"511681": "华蓥市",
+		"511702": "通川区",
+		"511703": "达川区",
+		"511722": "宣汉县",
+		"511723": "开江县",
+		"511724": "大竹县",
+		"511725": "渠县",
+		"511781": "万源市",
+		"511802": "雨城区",
+		"511803": "名山区",
+		"511822": "荥经县",
+		"511823": "汉源县",
+		"511824": "石棉县",
+		"511825": "天全县",
+		"511826": "芦山县",
+		"511827": "宝兴县",
+		"511902": "巴州区",
+		"511903": "恩阳区",
+		"511921": "通江县",
+		"511922": "南江县",
+		"511923": "平昌县",
+		"511971": "巴中经济开发区",
+		"512002": "雁江区",
+		"512021": "安岳县",
+		"512022": "乐至县",
+		"513201": "马尔康市",
+		"513221": "汶川县",
+		"513222": "理县",
+		"513223": "茂县",
+		"513224": "松潘县",
+		"513225": "九寨沟县",
+		"513226": "金川县",
+		"513227": "小金县",
+		"513228": "黑水县",
+		"513230": "壤塘县",
+		"513231": "阿坝县",
+		"513232": "若尔盖县",
+		"513233": "红原县",
+		"513301": "康定市",
+		"513322": "泸定县",
+		"513323": "丹巴县",
+		"513324": "九龙县",
+		"513325": "雅江县",
+		"513326": "道孚县",
+		"513327": "炉霍县",
+		"513328": "甘孜县",
+		"513329": "新龙县",
+		"513330": "德格县",
+		"513331": "白玉县",
+		"513332": "石渠县",
+		"513333": "色达县",
+		"513334": "理塘县",
+		"513335": "巴塘县",
+		"513336": "乡城县",
+		"513337": "稻城县",
+		"513338": "得荣县",
+		"513401": "西昌市",
+		"513402": "会理市",
+		"513422": "木里藏族自治县",
+		"513423": "盐源县",
+		"513424": "德昌县",
+		"513426": "会东县",
+		"513427": "宁南县",
+		"513428": "普格县",
+		"513429": "布拖县",
+		"513430": "金阳县",
+		"513431": "昭觉县",
+		"513432": "喜德县",
+		"513433": "冕宁县",
+		"513434": "越西县",
+		"513435": "甘洛县",
+		"513436": "美姑县",
+		"513437": "雷波县",
+		"520102": "南明区",
+		"520103": "云岩区",
+		"520111": "花溪区",
+		"520112": "乌当区",
+		"520113": "白云区",
+		"520115": "观山湖区",
+		"520121": "开阳县",
+		"520122": "息烽县",
+		"520123": "修文县",
+		"520181": "清镇市",
+		"520201": "钟山区",
+		"520203": "六枝特区",
+		"520204": "水城区",
+		"520281": "盘州市",
+		"520302": "红花岗区",
+		"520303": "汇川区",
+		"520304": "播州区",
+		"520322": "桐梓县",
+		"520323": "绥阳县",
+		"520324": "正安县",
+		"520325": "道真仡佬族苗族自治县",
+		"520326": "务川仡佬族苗族自治县",
+		"520327": "凤冈县",
+		"520328": "湄潭县",
+		"520329": "余庆县",
+		"520330": "习水县",
+		"520381": "赤水市",
+		"520382": "仁怀市",
+		"520402": "西秀区",
+		"520403": "平坝区",
+		"520422": "普定县",
+		"520423": "镇宁布依族苗族自治县",
+		"520424": "关岭布依族苗族自治县",
+		"520425": "紫云苗族布依族自治县",
+		"520502": "七星关区",
+		"520521": "大方县",
+		"520523": "金沙县",
+		"520524": "织金县",
+		"520525": "纳雍县",
+		"520526": "威宁彝族回族苗族自治县",
+		"520527": "赫章县",
+		"520581": "黔西市",
+		"520602": "碧江区",
+		"520603": "万山区",
+		"520621": "江口县",
+		"520622": "玉屏侗族自治县",
+		"520623": "石阡县",
+		"520624": "思南县",
+		"520625": "印江土家族苗族自治县",
+		"520626": "德江县",
+		"520627": "沿河土家族自治县",
+		"520628": "松桃苗族自治县",
+		"522301": "兴义市",
+		"522302": "兴仁市",
+		"522323": "普安县",
+		"522324": "晴隆县",
+		"522325": "贞丰县",
+		"522326": "望谟县",
+		"522327": "册亨县",
+		"522328": "安龙县",
+		"522601": "凯里市",
+		"522622": "黄平县",
+		"522623": "施秉县",
+		"522624": "三穗县",
+		"522625": "镇远县",
+		"522626": "岑巩县",
+		"522627": "天柱县",
+		"522628": "锦屏县",
+		"522629": "剑河县",
+		"522630": "台江县",
+		"522631": "黎平县",
+		"522632": "榕江县",
+		"522633": "从江县",
+		"522634": "雷山县",
+		"522635": "麻江县",
+		"522636": "丹寨县",
+		"522701": "都匀市",
+		"522702": "福泉市",
+		"522722": "荔波县",
+		"522723": "贵定县",
+		"522725": "瓮安县",
+		"522726": "独山县",
+		"522727": "平塘县",
+		"522728": "罗甸县",
+		"522729": "长顺县",
+		"522730": "龙里县",
+		"522731": "惠水县",
+		"522732": "三都水族自治县",
+		"530102": "五华区",
+		"530103": "盘龙区",
+		"530111": "官渡区",
+		"530112": "西山区",
+		"530113": "东川区",
+		"530114": "呈贡区",
+		"530115": "晋宁区",
+		"530124": "富民县",
+		"530125": "宜良县",
+		"530126": "石林彝族自治县",
+		"530127": "嵩明县",
+		"530128": "禄劝彝族苗族自治县",
+		"530129": "寻甸回族彝族自治县",
+		"530181": "安宁市",
+		"530302": "麒麟区",
+		"530303": "沾益区",
+		"530304": "马龙区",
+		"530322": "陆良县",
+		"530323": "师宗县",
+		"530324": "罗平县",
+		"530325": "富源县",
+		"530326": "会泽县",
+		"530381": "宣威市",
+		"530402": "红塔区",
+		"530403": "江川区",
+		"530423": "通海县",
+		"530424": "华宁县",
+		"530425": "易门县",
+		"530426": "峨山彝族自治县",
+		"530427": "新平彝族傣族自治县",
+		"530428": "元江哈尼族彝族傣族自治县",
+		"530481": "澄江市",
+		"530502": "隆阳区",
+		"530521": "施甸县",
+		"530523": "龙陵县",
+		"530524": "昌宁县",
+		"530581": "腾冲市",
+		"530602": "昭阳区",
+		"530621": "鲁甸县",
+		"530622": "巧家县",
+		"530623": "盐津县",
+		"530624": "大关县",
+		"530625": "永善县",
+		"530626": "绥江县",
+		"530627": "镇雄县",
+		"530628": "彝良县",
+		"530629": "威信县",
+		"530681": "水富市",
+		"530702": "古城区",
+		"530721": "玉龙纳西族自治县",
+		"530722": "永胜县",
+		"530723": "华坪县",
+		"530724": "宁蒗彝族自治县",
+		"530802": "思茅区",
+		"530821": "宁洱哈尼族彝族自治县",
+		"530822": "墨江哈尼族自治县",
+		"530823": "景东彝族自治县",
+		"530824": "景谷傣族彝族自治县",
+		"530825": "镇沅彝族哈尼族拉祜族自治县",
+		"530826": "江城哈尼族彝族自治县",
+		"530827": "孟连傣族拉祜族佤族自治县",
+		"530828": "澜沧拉祜族自治县",
+		"530829": "西盟佤族自治县",
+		"530902": "临翔区",
+		"530921": "凤庆县",
+		"530922": "云县",
+		"530923": "永德县",
+		"530924": "镇康县",
+		"530925": "双江拉祜族佤族布朗族傣族自治县",
+		"530926": "耿马傣族佤族自治县",
+		"530927": "沧源佤族自治县",
+		"532301": "楚雄市",
+		"532302": "禄丰市",
+		"532322": "双柏县",
+		"532323": "牟定县",
+		"532324": "南华县",
+		"532325": "姚安县",
+		"532326": "大姚县",
+		"532327": "永仁县",
+		"532328": "元谋县",
+		"532329": "武定县",
+		"532501": "个旧市",
+		"532502": "开远市",
+		"532503": "蒙自市",
+		"532504": "弥勒市",
+		"532523": "屏边苗族自治县",
+		"532524": "建水县",
+		"532525": "石屏县",
+		"532527": "泸西县",
+		"532528": "元阳县",
+		"532529": "红河县",
+		"532530": "金平苗族瑶族傣族自治县",
+		"532531": "绿春县",
+		"532532": "河口瑶族自治县",
+		"532601": "文山市",
+		"532622": "砚山县",
+		"532623": "西畴县",
+		"532624": "麻栗坡县",
+		"532625": "马关县",
+		"532626": "丘北县",
+		"532627": "广南县",
+		"532628": "富宁县",
+		"532801": "景洪市",
+		"532822": "勐海县",
+		"532823": "勐腊县",
+		"532901": "大理市",
+		"532922": "漾濞彝族自治县",
+		"532923": "祥云县",
+		"532924": "宾川县",
+		"532925": "弥渡县",
+		"532926": "南涧彝族自治县",
+		"532927": "巍山彝族回族自治县",
+		"532928": "永平县",
+		"532929": "云龙县",
+		"532930": "洱源县",
+		"532931": "剑川县",
+		"532932": "鹤庆县",
+		"533102": "瑞丽市",
+		"533103": "芒市",
+		"533122": "梁河县",
+		"533123": "盈江县",
+		"533124": "陇川县",
+		"533301": "泸水市",
+		"533323": "福贡县",
+		"533324": "贡山独龙族怒族自治县",
+		"533325": "兰坪白族普米族自治县",
+		"533401": "香格里拉市",
+		"533422": "德钦县",
+		"533423": "维西傈僳族自治县",
+		"540102": "城关区",
+		"540103": "堆龙德庆区",
+		"540104": "达孜区",
+		"540121": "林周县",
+		"540122": "当雄县",
+		"540123": "尼木县",
+		"540124": "曲水县",
+		"540127": "墨竹工卡县",
+		"540202": "桑珠孜区",
+		"540221": "南木林县",
+		"540222": "江孜县",
+		"540223": "定日县",
+		"540224": "萨迦县",
+		"540225": "拉孜县",
+		"540226": "昂仁县",
+		"540227": "谢通门县",
+		"540228": "白朗县",
+		"540229": "仁布县",
+		"540230": "康马县",
+		"540231": "定结县",
+		"540232": "仲巴县",
+		"540233": "亚东县",
+		"540234": "吉隆县",
+		"540235": "聂拉木县",
+		"540236": "萨嘎县",
+		"540237": "岗巴县",
+		"540302": "卡若区",
+		"540321": "江达县",
+		"540322": "贡觉县",
+		"540323": "类乌齐县",
+		"540324": "丁青县",
+		"540325": "察雅县",
+		"540326": "八宿县",
+		"540327": "左贡县",
+		"540328": "芒康县",
+		"540329": "洛隆县",
+		"540330": "边坝县",
+		"540402": "巴宜区",
+		"540421": "工布江达县",
+		"540423": "墨脱县",
+		"540424": "波密县",
+		"540425": "察隅县",
+		"540426": "朗县",
+		"540481": "米林市",
+		"540502": "乃东区",
+		"540521": "扎囊县",
+		"540522": "贡嘎县",
+		"540523": "桑日县",
+		"540524": "琼结县",
+		"540525": "曲松县",
+		"540526": "措美县",
+		"540527": "洛扎县",
+		"540528": "加查县",
+		"540529": "隆子县",
+		"540531": "浪卡子县",
+		"540581": "错那市",
+		"540602": "色尼区",
+		"540621": "嘉黎县",
+		"540622": "比如县",
+		"540623": "聂荣县",
+		"540624": "安多县",
+		"540625": "申扎县",
+		"540626": "索县",
+		"540627": "班戈县",
+		"540628": "巴青县",
+		"540629": "尼玛县",
+		"540630": "双湖县",
+		"542521": "普兰县",
+		"542522": "札达县",
+		"542523": "噶尔县",
+		"542524": "日土县",
+		"542525": "革吉县",
+		"542526": "改则县",
+		"542527": "措勤县",
+		"610102": "新城区",
+		"610103": "碑林区",
+		"610104": "莲湖区",
+		"610111": "灞桥区",
+		"610112": "未央区",
+		"610113": "雁塔区",
+		"610114": "阎良区",
+		"610115": "临潼区",
+		"610116": "长安区",
+		"610117": "高陵区",
+		"610118": "鄠邑区",
+		"610122": "蓝田县",
+		"610124": "周至县",
+		"610202": "王益区",
+		"610203": "印台区",
+		"610204": "耀州区",
+		"610222": "宜君县",
+		"610302": "渭滨区",
+		"610303": "金台区",
+		"610304": "陈仓区",
+		"610305": "凤翔区",
+		"610323": "岐山县",
+		"610324": "扶风县",
+		"610326": "眉县",
+		"610327": "陇县",
+		"610328": "千阳县",
+		"610329": "麟游县",
+		"610330": "凤县",
+		"610331": "太白县",
+		"610402": "秦都区",
+		"610403": "杨陵区",
+		"610404": "渭城区",
+		"610422": "三原县",
+		"610423": "泾阳县",
+		"610424": "乾县",
+		"610425": "礼泉县",
+		"610426": "永寿县",
+		"610428": "长武县",
+		"610429": "旬邑县",
+		"610430": "淳化县",
+		"610431": "武功县",
+		"610481": "兴平市",
+		"610482": "彬州市",
+		"610502": "临渭区",
+		"610503": "华州区",
+		"610522": "潼关县",
+		"610523": "大荔县",
+		"610524": "合阳县",
+		"610525": "澄城县",
+		"610526": "蒲城县",
+		"610527": "白水县",
+		"610528": "富平县",
+		"610581": "韩城市",
+		"610582": "华阴市",
+		"610602": "宝塔区",
+		"610603": "安塞区",
+		"610621": "延长县",
+		"610622": "延川县",
+		"610625": "志丹县",
+		"610626": "吴起县",
+		"610627": "甘泉县",
+		"610628": "富县",
+		"610629": "洛川县",
+		"610630": "宜川县",
+		"610631": "黄龙县",
+		"610632": "黄陵县",
+		"610681": "子长市",
+		"610702": "汉台区",
+		"610703": "南郑区",
+		"610722": "城固县",
+		"610723": "洋县",
+		"610724": "西乡县",
+		"610725": "勉县",
+		"610726": "宁强县",
+		"610727": "略阳县",
+		"610728": "镇巴县",
+		"610729": "留坝县",
+		"610730": "佛坪县",
+		"610802": "榆阳区",
+		"610803": "横山区",
+		"610822": "府谷县",
+		"610824": "靖边县",
+		"610825": "定边县",
+		"610826": "绥德县",
+		"610827": "米脂县",
+		"610828": "佳县",
+		"610829": "吴堡县",
+		"610830": "清涧县",
+		"610831": "子洲县",
+		"610881": "神木市",
+		"610902": "汉滨区",
+		"610921": "汉阴县",
+		"610922": "石泉县",
+		"610923": "宁陕县",
+		"610924": "紫阳县",
+		"610925": "岚皋县",
+		"610926": "平利县",
+		"610927": "镇坪县",
+		"610929": "白河县",
+		"610981": "旬阳市",
+		"611002": "商州区",
+		"611021": "洛南县",
+		"611022": "丹凤县",
+		"611023": "商南县",
+		"611024": "山阳县",
+		"611025": "镇安县",
+		"611026": "柞水县",
+		"620102": "城关区",
+		"620103": "七里河区",
+		"620104": "西固区",
+		"620105": "安宁区",
+		"620111": "红古区",
+		"620121": "永登县",
+		"620122": "皋兰县",
+		"620123": "榆中县",
+		"620171": "兰州新区",
+		"620201": "市辖区",
+		"620290": "雄关区",
+		"620291": "长城区",
+		"620292": "镜铁区",
+		"620293": "新城镇",
+		"620294": "峪泉镇",
+		"620295": "文殊镇",
+		"620302": "金川区",
+		"620321": "永昌县",
+		"620402": "白银区",
+		"620403": "平川区",
+		"620421": "靖远县",
+		"620422": "会宁县",
+		"620423": "景泰县",
+		"620502": "秦州区",
+		"620503": "麦积区",
+		"620521": "清水县",
+		"620522": "秦安县",
+		"620523": "甘谷县",
+		"620524": "武山县",
+		"620525": "张家川回族自治县",
+		"620602": "凉州区",
+		"620621": "民勤县",
+		"620622": "古浪县",
+		"620623": "天祝藏族自治县",
+		"620702": "甘州区",
+		"620721": "肃南裕固族自治县",
+		"620722": "民乐县",
+		"620723": "临泽县",
+		"620724": "高台县",
+		"620725": "山丹县",
+		"620802": "崆峒区",
+		"620821": "泾川县",
+		"620822": "灵台县",
+		"620823": "崇信县",
+		"620825": "庄浪县",
+		"620826": "静宁县",
+		"620881": "华亭市",
+		"620902": "肃州区",
+		"620921": "金塔县",
+		"620922": "瓜州县",
+		"620923": "肃北蒙古族自治县",
+		"620924": "阿克塞哈萨克族自治县",
+		"620981": "玉门市",
+		"620982": "敦煌市",
+		"621002": "西峰区",
+		"621021": "庆城县",
+		"621022": "环县",
+		"621023": "华池县",
+		"621024": "合水县",
+		"621025": "正宁县",
+		"621026": "宁县",
+		"621027": "镇原县",
+		"621102": "安定区",
+		"621121": "通渭县",
+		"621122": "陇西县",
+		"621123": "渭源县",
+		"621124": "临洮县",
+		"621125": "漳县",
+		"621126": "岷县",
+		"621202": "武都区",
+		"621221": "成县",
+		"621222": "文县",
+		"621223": "宕昌县",
+		"621224": "康县",
+		"621225": "西和县",
+		"621226": "礼县",
+		"621227": "徽县",
+		"621228": "两当县",
+		"622901": "临夏市",
+		"622921": "临夏县",
+		"622922": "康乐县",
+		"622923": "永靖县",
+		"622924": "广河县",
+		"622925": "和政县",
+		"622926": "东乡族自治县",
+		"622927": "积石山保安族东乡族撒拉族自治县",
+		"623001": "合作市",
+		"623021": "临潭县",
+		"623022": "卓尼县",
+		"623023": "舟曲县",
+		"623024": "迭部县",
+		"623025": "玛曲县",
+		"623026": "碌曲县",
+		"623027": "夏河县",
+		"630102": "城东区",
+		"630103": "城中区",
+		"630104": "城西区",
+		"630105": "城北区",
+		"630106": "湟中区",
+		"630121": "大通回族土族自治县",
+		"630123": "湟源县",
+		"630202": "乐都区",
+		"630203": "平安区",
+		"630222": "民和回族土族自治县",
+		"630223": "互助土族自治县",
+		"630224": "化隆回族自治县",
+		"630225": "循化撒拉族自治县",
+		"632221": "门源回族自治县",
+		"632222": "祁连县",
+		"632223": "海晏县",
+		"632224": "刚察县",
+		"632301": "同仁市",
+		"632322": "尖扎县",
+		"632323": "泽库县",
+		"632324": "河南蒙古族自治县",
+		"632521": "共和县",
+		"632522": "同德县",
+		"632523": "贵德县",
+		"632524": "兴海县",
+		"632525": "贵南县",
+		"632621": "玛沁县",
+		"632622": "班玛县",
+		"632623": "甘德县",
+		"632624": "达日县",
+		"632625": "久治县",
+		"632626": "玛多县",
+		"632701": "玉树市",
+		"632722": "杂多县",
+		"632723": "称多县",
+		"632724": "治多县",
+		"632725": "囊谦县",
+		"632726": "曲麻莱县",
+		"632801": "格尔木市",
+		"632802": "德令哈市",
+		"632803": "茫崖市",
+		"632821": "乌兰县",
+		"632822": "都兰县",
+		"632823": "天峻县",
+		"632857": "大柴旦行政委员会",
+		"640104": "兴庆区",
+		"640105": "西夏区",
+		"640106": "金凤区",
+		"640121": "永宁县",
+		"640122": "贺兰县",
+		"640181": "灵武市",
+		"640202": "大武口区",
+		"640205": "惠农区",
+		"640221": "平罗县",
+		"640302": "利通区",
+		"640303": "红寺堡区",
+		"640323": "盐池县",
+		"640324": "同心县",
+		"640381": "青铜峡市",
+		"640402": "原州区",
+		"640422": "西吉县",
+		"640423": "隆德县",
+		"640424": "泾源县",
+		"640425": "彭阳县",
+		"640502": "沙坡头区",
+		"640521": "中宁县",
+		"640522": "海原县",
+		"650102": "天山区",
+		"650103": "沙依巴克区",
+		"650104": "新市区",
+		"650105": "水磨沟区",
+		"650106": "头屯河区",
+		"650107": "达坂城区",
+		"650109": "米东区",
+		"650121": "乌鲁木齐县",
+		"650202": "独山子区",
+		"650203": "克拉玛依区",
+		"650204": "白碱滩区",
+		"650205": "乌尔禾区",
+		"650402": "高昌区",
+		"650421": "鄯善县",
+		"650422": "托克逊县",
+		"650502": "伊州区",
+		"650521": "巴里坤哈萨克自治县",
+		"650522": "伊吾县",
+		"652301": "昌吉市",
+		"652302": "阜康市",
+		"652323": "呼图壁县",
+		"652324": "玛纳斯县",
+		"652325": "奇台县",
+		"652327": "吉木萨尔县",
+		"652328": "木垒哈萨克自治县",
+		"652701": "博乐市",
+		"652702": "阿拉山口市",
+		"652722": "精河县",
+		"652723": "温泉县",
+		"652801": "库尔勒市",
+		"652822": "轮台县",
+		"652823": "尉犁县",
+		"652824": "若羌县",
+		"652825": "且末县",
+		"652826": "焉耆回族自治县",
+		"652827": "和静县",
+		"652828": "和硕县",
+		"652829": "博湖县",
+		"652901": "阿克苏市",
+		"652902": "库车市",
+		"652922": "温宿县",
+		"652924": "沙雅县",
+		"652925": "新和县",
+		"652926": "拜城县",
+		"652927": "乌什县",
+		"652928": "阿瓦提县",
+		"652929": "柯坪县",
+		"653001": "阿图什市",
+		"653022": "阿克陶县",
+		"653023": "阿合奇县",
+		"653024": "乌恰县",
+		"653101": "喀什市",
+		"653121": "疏附县",
+		"653122": "疏勒县",
+		"653123": "英吉沙县",
+		"653124": "泽普县",
+		"653125": "莎车县",
+		"653126": "叶城县",
+		"653127": "麦盖提县",
+		"653128": "岳普湖县",
+		"653129": "伽师县",
+		"653130": "巴楚县",
+		"653131": "塔什库尔干塔吉克自治县",
+		"653201": "和田市",
+		"653221": "和田县",
+		"653222": "墨玉县",
+		"653223": "皮山县",
+		"653224": "洛浦县",
+		"653225": "策勒县",
+		"653226": "于田县",
+		"653227": "民丰县",
+		"654002": "伊宁市",
+		"654003": "奎屯市",
+		"654004": "霍尔果斯市",
+		"654021": "伊宁县",
+		"654022": "察布查尔锡伯自治县",
+		"654023": "霍城县",
+		"654024": "巩留县",
+		"654025": "新源县",
+		"654026": "昭苏县",
+		"654027": "特克斯县",
+		"654028": "尼勒克县",
+		"654201": "塔城市",
+		"654202": "乌苏市",
+		"654203": "沙湾市",
+		"654221": "额敏县",
+		"654224": "托里县",
+		"654225": "裕民县",
+		"654226": "和布克赛尔蒙古自治县",
+		"654301": "阿勒泰市",
+		"654321": "布尔津县",
+		"654322": "富蕴县",
+		"654323": "福海县",
+		"654324": "哈巴河县",
+		"654325": "青河县",
+		"654326": "吉木乃县",
+		"659001": "石河子市",
+		"659002": "阿拉尔市",
+		"659003": "图木舒克市",
+		"659004": "五家渠市",
+		"659005": "北屯市",
+		"659006": "铁门关市",
+		"659007": "双河市",
+		"659008": "可克达拉市",
+		"659009": "昆玉市",
+		"659010": "胡杨河市",
+		"659011": "新星市",
+		"659012": "白杨市",
+		"710101": "中正区",
+		"710102": "大同区",
+		"710103": "中山区",
+		"710104": "松山区",
+		"710105": "大安区",
+		"710106": "万华区",
+		"710107": "信义区",
+		"710108": "士林区",
+		"710109": "北投区",
+		"710110": "内湖区",
+		"710111": "南港区",
+		"710112": "文山区",
+		"710199": "其它区",
+		"710201": "新兴区",
+		"710202": "前金区",
+		"710203": "芩雅区",
+		"710204": "盐埕区",
+		"710205": "鼓山区",
+		"710206": "旗津区",
+		"710207": "前镇区",
+		"710208": "三民区",
+		"710209": "左营区",
+		"710210": "楠梓区",
+		"710211": "小港区",
+		"710241": "苓雅区",
+		"710242": "仁武区",
+		"710243": "大社区",
+		"710244": "冈山区",
+		"710245": "路竹区",
+		"710246": "阿莲区",
+		"710247": "田寮区",
+		"710248": "燕巢区",
+		"710249": "桥头区",
+		"710250": "梓官区",
+		"710251": "弥陀区",
+		"710252": "永安区",
+		"710253": "湖内区",
+		"710254": "凤山区",
+		"710255": "大寮区",
+		"710256": "林园区",
+		"710257": "鸟松区",
+		"710258": "大树区",
+		"710259": "旗山区",
+		"710260": "美浓区",
+		"710261": "六龟区",
+		"710262": "内门区",
+		"710263": "杉林区",
+		"710264": "甲仙区",
+		"710265": "桃源区",
+		"710266": "那玛夏区",
+		"710267": "茂林区",
+		"710268": "茄萣区",
+		"710299": "其它区",
+		"710301": "中西区",
+		"710302": "东区",
+		"710303": "南区",
+		"710304": "北区",
+		"710305": "安平区",
+		"710306": "安南区",
+		"710339": "永康区",
+		"710340": "归仁区",
+		"710341": "新化区",
+		"710342": "左镇区",
+		"710343": "玉井区",
+		"710344": "楠西区",
+		"710345": "南化区",
+		"710346": "仁德区",
+		"710347": "关庙区",
+		"710348": "龙崎区",
+		"710349": "官田区",
+		"710350": "麻豆区",
+		"710351": "佳里区",
+		"710352": "西港区",
+		"710353": "七股区",
+		"710354": "将军区",
+		"710355": "学甲区",
+		"710356": "北门区",
+		"710357": "新营区",
+		"710358": "后壁区",
+		"710359": "白河区",
+		"710360": "东山区",
+		"710361": "六甲区",
+		"710362": "下营区",
+		"710363": "柳营区",
+		"710364": "盐水区",
+		"710365": "善化区",
+		"710366": "大内区",
+		"710367": "山上区",
+		"710368": "新市区",
+		"710369": "安定区",
+		"710399": "其它区",
+		"710401": "中区",
+		"710402": "东区",
+		"710403": "南区",
+		"710404": "西区",
+		"710405": "北区",
+		"710406": "北屯区",
+		"710407": "西屯区",
+		"710408": "南屯区",
+		"710431": "太平区",
+		"710432": "大里区",
+		"710433": "雾峰区",
+		"710434": "乌日区",
+		"710435": "丰原区",
+		"710436": "后里区",
+		"710437": "石冈区",
+		"710438": "东势区",
+		"710439": "和平区",
+		"710440": "新社区",
+		"710441": "潭子区",
+		"710442": "大雅区",
+		"710443": "神冈区",
+		"710444": "大肚区",
+		"710445": "沙鹿区",
+		"710446": "龙井区",
+		"710447": "梧栖区",
+		"710448": "清水区",
+		"710449": "大甲区",
+		"710450": "外埔区",
+		"710451": "大安区",
+		"710499": "其它区",
+		"710507": "金沙镇",
+		"710508": "金湖镇",
+		"710509": "金宁乡",
+		"710510": "金城镇",
+		"710511": "烈屿乡",
+		"710512": "乌坵乡",
+		"710614": "南投市",
+		"710615": "中寮乡",
+		"710616": "草屯镇",
+		"710617": "国姓乡",
+		"710618": "埔里镇",
+		"710619": "仁爱乡",
+		"710620": "名间乡",
+		"710621": "集集镇",
+		"710622": "水里乡",
+		"710623": "鱼池乡",
+		"710624": "信义乡",
+		"710625": "竹山镇",
+		"710626": "鹿谷乡",
+		"710701": "仁爱区",
+		"710702": "信义区",
+		"710703": "中正区",
+		"710704": "中山区",
+		"710705": "安乐区",
+		"710706": "暖暖区",
+		"710707": "七堵区",
+		"710799": "其它区",
+		"710801": "东区",
+		"710802": "北区",
+		"710803": "香山区",
+		"710899": "其它区",
+		"710901": "东区",
+		"710902": "西区",
+		"710999": "其它区",
+		"711130": "万里区",
+		"711132": "板桥区",
+		"711133": "汐止区",
+		"711134": "深坑区",
+		"711135": "石碇区",
+		"711136": "瑞芳区",
+		"711137": "平溪区",
+		"711138": "双溪区",
+		"711139": "贡寮区",
+		"711140": "新店区",
+		"711141": "坪林区",
+		"711142": "乌来区",
+		"711143": "永和区",
+		"711144": "中和区",
+		"711145": "土城区",
+		"711146": "三峡区",
+		"711147": "树林区",
+		"711148": "莺歌区",
+		"711149": "三重区",
+		"711150": "新庄区",
+		"711151": "泰山区",
+		"711152": "林口区",
+		"711153": "芦洲区",
+		"711154": "五股区",
+		"711155": "八里区",
+		"711156": "淡水区",
+		"711157": "三芝区",
+		"711158": "石门区",
+		"711287": "宜兰市",
+		"711288": "头城镇",
+		"711289": "礁溪乡",
+		"711290": "壮围乡",
+		"711291": "员山乡",
+		"711292": "罗东镇",
+		"711293": "三星乡",
+		"711294": "大同乡",
+		"711295": "五结乡",
+		"711296": "冬山乡",
+		"711297": "苏澳镇",
+		"711298": "南澳乡",
+		"711299": "钓鱼台",
+		"711387": "竹北市",
+		"711388": "湖口乡",
+		"711389": "新丰乡",
+		"711390": "新埔镇",
+		"711391": "关西镇",
+		"711392": "芎林乡",
+		"711393": "宝山乡",
+		"711394": "竹东镇",
+		"711395": "五峰乡",
+		"711396": "横山乡",
+		"711397": "尖石乡",
+		"711398": "北埔乡",
+		"711399": "峨眉乡",
+		"711414": "中坜区",
+		"711415": "平镇区",
+		"711417": "杨梅区",
+		"711418": "新屋区",
+		"711419": "观音区",
+		"711420": "桃园区",
+		"711421": "龟山区",
+		"711422": "八德区",
+		"711423": "大溪区",
+		"711425": "大园区",
+		"711426": "芦竹区",
+		"711487": "中坜市",
+		"711488": "平镇市",
+		"711489": "龙潭乡",
+		"711490": "杨梅市",
+		"711491": "新屋乡",
+		"711492": "观音乡",
+		"711493": "桃园市",
+		"711494": "龟山乡",
+		"711495": "八德市",
+		"711496": "大溪镇",
+		"711497": "复兴乡",
+		"711498": "大园乡",
+		"711499": "芦竹乡",
+		"711520": "头份市",
+		"711582": "竹南镇",
+		"711583": "头份镇",
+		"711584": "三湾乡",
+		"711585": "南庄乡",
+		"711586": "狮潭乡",
+		"711587": "后龙镇",
+		"711588": "通霄镇",
+		"711589": "苑里镇",
+		"711590": "苗栗市",
+		"711591": "造桥乡",
+		"711592": "头屋乡",
+		"711593": "公馆乡",
+		"711594": "大湖乡",
+		"711595": "泰安乡",
+		"711596": "铜锣乡",
+		"711597": "三义乡",
+		"711598": "西湖乡",
+		"711599": "卓兰镇",
+		"711736": "员林市",
+		"711774": "彰化市",
+		"711775": "芬园乡",
+		"711776": "花坛乡",
+		"711777": "秀水乡",
+		"711778": "鹿港镇",
+		"711779": "福兴乡",
+		"711780": "线西乡",
+		"711781": "和美镇",
+		"711782": "伸港乡",
+		"711783": "员林镇",
+		"711784": "社头乡",
+		"711785": "永靖乡",
+		"711786": "埔心乡",
+		"711787": "溪湖镇",
+		"711788": "大村乡",
+		"711789": "埔盐乡",
+		"711790": "田中镇",
+		"711791": "北斗镇",
+		"711792": "田尾乡",
+		"711793": "埤头乡",
+		"711794": "溪州乡",
+		"711795": "竹塘乡",
+		"711796": "二林镇",
+		"711797": "大城乡",
+		"711798": "芳苑乡",
+		"711799": "二水乡",
+		"711982": "番路乡",
+		"711983": "梅山乡",
+		"711984": "竹崎乡",
+		"711985": "阿里山乡",
+		"711986": "中埔乡",
+		"711987": "大埔乡",
+		"711988": "水上乡",
+		"711989": "鹿草乡",
+		"711990": "太保市",
+		"711991": "朴子市",
+		"711992": "东石乡",
+		"711993": "六脚乡",
+		"711994": "新港乡",
+		"711995": "民雄乡",
+		"711996": "大林镇",
+		"711997": "溪口乡",
+		"711998": "义竹乡",
+		"711999": "布袋镇",
+		"712180": "斗南镇",
+		"712181": "大埤乡",
+		"712182": "虎尾镇",
+		"712183": "土库镇",
+		"712184": "褒忠乡",
+		"712185": "东势乡",
+		"712186": "台西乡",
+		"712187": "仑背乡",
+		"712188": "麦寮乡",
+		"712189": "斗六市",
+		"712190": "林内乡",
+		"712191": "古坑乡",
+		"712192": "莿桐乡",
+		"712193": "西螺镇",
+		"712194": "二仑乡",
+		"712195": "北港镇",
+		"712196": "水林乡",
+		"712197": "口湖乡",
+		"712198": "四湖乡",
+		"712199": "元长乡",
+		"712451": "崁顶乡",
+		"712467": "屏东市",
+		"712468": "三地门乡",
+		"712469": "雾台乡",
+		"712470": "玛家乡",
+		"712471": "九如乡",
+		"712472": "里港乡",
+		"712473": "高树乡",
+		"712474": "盐埔乡",
+		"712475": "长治乡",
+		"712476": "麟洛乡",
+		"712477": "竹田乡",
+		"712478": "内埔乡",
+		"712479": "万丹乡",
+		"712480": "潮州镇",
+		"712481": "泰武乡",
+		"712482": "来义乡",
+		"712483": "万峦乡",
+		"712484": "莰顶乡",
+		"712485": "新埤乡",
+		"712486": "南州乡",
+		"712487": "林边乡",
+		"712488": "东港镇",
+		"712489": "琉球乡",
+		"712490": "佳冬乡",
+		"712491": "新园乡",
+		"712492": "枋寮乡",
+		"712493": "枋山乡",
+		"712494": "春日乡",
+		"712495": "狮子乡",
+		"712496": "车城乡",
+		"712497": "牡丹乡",
+		"712498": "恒春镇",
+		"712499": "满州乡",
+		"712584": "台东市",
+		"712585": "绿岛乡",
+		"712586": "兰屿乡",
+		"712587": "延平乡",
+		"712588": "卑南乡",
+		"712589": "鹿野乡",
+		"712590": "关山镇",
+		"712591": "海端乡",
+		"712592": "池上乡",
+		"712593": "东河乡",
+		"712594": "成功镇",
+		"712595": "长滨乡",
+		"712596": "金峰乡",
+		"712597": "大武乡",
+		"712598": "达仁乡",
+		"712599": "太麻里乡",
+		"712686": "花莲市",
+		"712687": "新城乡",
+		"712688": "太鲁阁",
+		"712689": "秀林乡",
+		"712690": "吉安乡",
+		"712691": "寿丰乡",
+		"712692": "凤林镇",
+		"712693": "光复乡",
+		"712694": "丰滨乡",
+		"712695": "瑞穗乡",
+		"712696": "万荣乡",
+		"712697": "玉里镇",
+		"712698": "卓溪乡",
+		"712699": "富里乡",
+		"712794": "马公市",
+		"712795": "西屿乡",
+		"712796": "望安乡",
+		"712797": "七美乡",
+		"712798": "白沙乡",
+		"712799": "湖西乡",
+		"712896": "南竿乡",
+		"712897": "北竿乡",
+		"712898": "东引乡",
+		"712899": "莒光乡",
+		"810101": "中西区",
+		"810102": "湾仔区",
+		"810103": "东区",
+		"810104": "南区",
+		"810201": "九龙城区",
+		"810202": "油尖旺区",
+		"810203": "深水埗区",
+		"810204": "黄大仙区",
+		"810205": "观塘区",
+		"810301": "北区",
+		"810302": "大埔区",
+		"810303": "沙田区",
+		"810304": "西贡区",
+		"810305": "元朗区",
+		"810306": "屯门区",
+		"810307": "荃湾区",
+		"810308": "葵青区",
+		"810309": "离岛区",
+		"820102": "花地玛堂区",
+		"820103": "花王堂区",
+		"820104": "望德堂区",
+		"820105": "大堂区",
+		"820106": "风顺堂区",
+		"820202": "嘉模堂区",
+		"820203": "路氹填海区",
+		"820204": "圣方济各堂区"
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/areaData/index.ts b/uni_modules/lime-shared/areaData/index.ts
new file mode 100644
index 0000000..401f77f
--- /dev/null
+++ b/uni_modules/lime-shared/areaData/index.ts
@@ -0,0 +1,71 @@
+// @ts-nocheck
+import _areaList from './city-china.json';
+export const areaList = _areaList
+// #ifndef UNI-APP-X
+type UTSJSONObject = Record<string, string>
+// #endif
+// #ifdef UNI-APP-X
+type Object = UTSJSONObject
+// #endif
+type AreaList = {
+	province_list : Map<string, string>;
+	city_list : Map<string, string>;
+	county_list : Map<string, string>;
+}
+// type CascaderOption = {
+// 	text : string;
+// 	value : string;
+// 	children ?: CascaderOption[];
+// };
+
+const makeOption = (
+	label : string,
+	value : string,
+	children ?: UTSJSONObject[],
+) : UTSJSONObject => ({
+	label,
+	value,
+	children,
+});
+
+
+
+export function useCascaderAreaData() : UTSJSONObject[] {
+	const city = areaList['city_list'] as UTSJSONObject
+	const county = areaList['county_list'] as UTSJSONObject
+	const province = areaList['province_list'] as UTSJSONObject
+	const provinceMap = new Map<string, UTSJSONObject>();
+	Object.keys(province).forEach((code) => {
+		provinceMap.set(code.slice(0, 2), makeOption(`${province[code]}`, code, []));
+	});
+
+	const cityMap = new Map<string, UTSJSONObject>();
+
+	Object.keys(city).forEach((code) => {
+		const option = makeOption(`${city[code]}`, code, []);
+		cityMap.set(code.slice(0, 4), option);
+
+		const _province = provinceMap.get(code.slice(0, 2));
+		if (_province != null) {
+			(_province['children'] as UTSJSONObject[]).push(option)
+		}
+	});
+
+	Object.keys(county).forEach((code) => {
+		const _city = cityMap.get(code.slice(0, 4));
+		if (_city != null) {
+			(_city['children'] as UTSJSONObject[]).push(makeOption(`${county[code]}`, code, null));
+		}
+	});
+	
+	// #ifndef APP-ANDROID || APP-IOS
+	return Array.from(provinceMap.values());
+	// #endif
+	// #ifdef APP-ANDROID || APP-IOS
+	const obj : UTSJSONObject[] = []
+	provinceMap.forEach((value, code) => {
+		obj.push(value)
+	})
+	return obj
+	// #endif
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/arrayBufferToFile/index.ts b/uni_modules/lime-shared/arrayBufferToFile/index.ts
new file mode 100644
index 0000000..037c7ff
--- /dev/null
+++ b/uni_modules/lime-shared/arrayBufferToFile/index.ts
@@ -0,0 +1,10 @@
+// @ts-nocheck
+// #ifndef UNI-APP-X && APP
+// export * from './vue.ts'
+export { arrayBufferToFile } from './vue.ts'
+// #endif
+
+// #ifdef UNI-APP-X && APP
+// export * from './uvue.uts'
+export { arrayBufferToFile } from './uvue.uts'
+// #endif
\ No newline at end of file
diff --git a/uni_modules/lime-shared/arrayBufferToFile/uvue.uts b/uni_modules/lime-shared/arrayBufferToFile/uvue.uts
new file mode 100644
index 0000000..65c7b14
--- /dev/null
+++ b/uni_modules/lime-shared/arrayBufferToFile/uvue.uts
@@ -0,0 +1,10 @@
+// @ts-nocheck
+// import {platform} from '../platform'
+/**
+ * buffer转路径
+ * @param {Object} buffer
+ */
+// @ts-nocheck
+export function arrayBufferToFile(buffer: ArrayBuffer, name?: string, format?:string):Promise<(File|string)> {
+	console.error('[arrayBufferToFile] 当前环境不支持')
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/arrayBufferToFile/vue.ts b/uni_modules/lime-shared/arrayBufferToFile/vue.ts
new file mode 100644
index 0000000..9760b20
--- /dev/null
+++ b/uni_modules/lime-shared/arrayBufferToFile/vue.ts
@@ -0,0 +1,63 @@
+// @ts-nocheck
+import {platform} from '../platform'
+/**
+ * buffer转路径
+ * @param {Object} buffer
+ */
+// @ts-nocheck
+export function arrayBufferToFile(buffer: ArrayBuffer | Blob, name?: string, format?:string):Promise<(File|string)> {
+	return new Promise((resolve, reject) => {
+		// #ifdef MP
+		const fs = uni.getFileSystemManager()
+		//自定义文件名
+		if (!name && !format) {
+			reject(new Error('ERROR_NAME_PARSE'))
+		}
+		const fileName = `${name || new Date().getTime()}.${format.replace(/(.+)?\//,'')}`;
+		let pre = platform()
+		const filePath = `${pre.env.USER_DATA_PATH}/${fileName}`
+		fs.writeFile({
+			filePath,
+			data: buffer, 
+			success() {
+				resolve(filePath)
+			},
+			fail(err) {
+				console.error(err)
+				reject(err)
+			}
+		})
+		// #endif
+
+		// #ifdef H5
+		const file = new File([buffer], name, {
+		     type: format,
+		});
+		resolve(file)
+		// #endif
+
+		// #ifdef APP-PLUS
+		const bitmap = new plus.nativeObj.Bitmap('bitmap' + Date.now())
+		const base64 = uni.arrayBufferToBase64(buffer)
+		bitmap.loadBase64Data(base64, () => {
+			if (!name && !format) {
+				reject(new Error('ERROR_NAME_PARSE'))
+			}
+			const fileNmae = `${name || new Date().getTime()}.${format.replace(/(.+)?\//,'')}`;
+			const filePath = `_doc/uniapp_temp/${fileNmae}`
+			bitmap.save(filePath, {},
+				() => {
+					bitmap.clear()
+					resolve(filePath)
+				},
+				(error) => {
+					bitmap.clear()
+					reject(error)
+				})
+		}, (error) => {
+			bitmap.clear()
+			reject(error)
+		})
+		// #endif
+	})
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/base64ToArrayBuffer/index.ts b/uni_modules/lime-shared/base64ToArrayBuffer/index.ts
new file mode 100644
index 0000000..f83b640
--- /dev/null
+++ b/uni_modules/lime-shared/base64ToArrayBuffer/index.ts
@@ -0,0 +1,13 @@
+// @ts-nocheck
+// 未完成
+export function base64ToArrayBuffer(base64 : string) {
+	const [, format, bodyData] = /data:image\/(\w+);base64,(.*)/.exec(base64) || [];
+	if (!format) {
+		new Error('ERROR_BASE64SRC_PARSE')
+	}
+	if(uni.base64ToArrayBuffer) {
+		return uni.base64ToArrayBuffer(bodyData)
+	} else {
+		
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/base64ToPath/index.ts b/uni_modules/lime-shared/base64ToPath/index.ts
new file mode 100644
index 0000000..d73f301
--- /dev/null
+++ b/uni_modules/lime-shared/base64ToPath/index.ts
@@ -0,0 +1,11 @@
+// @ts-nocheck
+// #ifndef UNI-APP-X && APP
+// export * from './vue.ts'
+export { base64ToPath } from './vue.ts'
+// #endif
+
+
+// #ifdef UNI-APP-X && APP
+// export * from './uvue.uts'
+export { base64ToPath } from './uvue.uts'
+// #endif
diff --git a/uni_modules/lime-shared/base64ToPath/uvue.uts b/uni_modules/lime-shared/base64ToPath/uvue.uts
new file mode 100644
index 0000000..364b494
--- /dev/null
+++ b/uni_modules/lime-shared/base64ToPath/uvue.uts
@@ -0,0 +1,22 @@
+// @ts-nocheck
+import { processFile, type ProcessFileOptions  } from '@/uni_modules/lime-file-utils'
+
+/**
+ * base64转路径
+ * @param {Object} base64
+ */
+export function base64ToPath(base64: string, filename: string | null = null):Promise<string> {
+	return new Promise((resolve,reject) => {
+		processFile({
+		    type: 'toDataURL',
+		    path: base64,
+		    filename,
+		    success(res: string){
+		       resolve(res)
+		    },
+			fail(err){
+				reject(err)
+			}
+		} as ProcessFileOptions)
+	})
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/base64ToPath/vue.ts b/uni_modules/lime-shared/base64ToPath/vue.ts
new file mode 100644
index 0000000..735000f
--- /dev/null
+++ b/uni_modules/lime-shared/base64ToPath/vue.ts
@@ -0,0 +1,75 @@
+// @ts-nocheck
+import {platform} from '../platform'
+/**
+ * base64转路径
+ * @param {Object} base64
+ */
+export function base64ToPath(base64: string, filename?: string):Promise<string> {
+	const [, format] = /^data:image\/(\w+);base64,/.exec(base64) || [];
+	return new Promise((resolve, reject) => {
+		// #ifdef MP
+		const fs = uni.getFileSystemManager()
+		//自定义文件名
+		if (!filename && !format) {
+			reject(new Error('ERROR_BASE64SRC_PARSE'))
+		}
+		// const time = new Date().getTime();
+		const name = filename || `${new Date().getTime()}.${format}`;
+		let pre = platform()
+		const filePath = `${pre.env.USER_DATA_PATH}/${name}`
+		fs.writeFile({
+			filePath,
+			data: base64.split(',')[1], 
+			encoding: 'base64',
+			success() {
+				resolve(filePath)
+			},
+			fail(err) {
+				console.error(err)
+				reject(err)
+			}
+		})
+		// #endif
+
+		// #ifdef H5
+		// mime类型
+		let mimeString = base64.split(',')[0].split(':')[1].split(';')[0];
+		//base64 解码
+		let byteString = atob(base64.split(',')[1]);
+		//创建缓冲数组
+		let arrayBuffer = new ArrayBuffer(byteString.length);
+		//创建视图
+		let intArray = new Uint8Array(arrayBuffer);
+		for (let i = 0; i < byteString.length; i++) {
+			intArray[i] = byteString.charCodeAt(i);
+		}
+		resolve(URL.createObjectURL(new Blob([intArray], {
+			type: mimeString
+		})))
+		// #endif
+
+		// #ifdef APP-PLUS
+		const bitmap = new plus.nativeObj.Bitmap('bitmap' + Date.now())
+		bitmap.loadBase64Data(base64, () => {
+			if (!filename && !format) {
+				reject(new Error('ERROR_BASE64SRC_PARSE'))
+			}
+			// const time = new Date().getTime();
+			const name = filename || `${new Date().getTime()}.${format}`;
+			const filePath = `_doc/uniapp_temp/${name}`
+			bitmap.save(filePath, {},
+				() => {
+					bitmap.clear()
+					resolve(filePath)
+				},
+				(error) => {
+					bitmap.clear()
+					reject(error)
+				})
+		}, (error) => {
+			bitmap.clear()
+			reject(error)
+		})
+		// #endif
+	})
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/camelCase/index.ts b/uni_modules/lime-shared/camelCase/index.ts
new file mode 100644
index 0000000..dd470ab
--- /dev/null
+++ b/uni_modules/lime-shared/camelCase/index.ts
@@ -0,0 +1,21 @@
+/**
+ * 将字符串转换为 camelCase 或 PascalCase 风格的命名约定
+ * @param str 要转换的字符串
+ * @param isPascalCase 指示是否转换为 PascalCase 的布尔值，默认为 false
+ * @returns 转换后的字符串
+ */
+export function camelCase(str: string, isPascalCase: boolean = false): string {
+    // 将字符串分割成单词数组
+    let words: string[] = str.split(/[\s_-]+/);
+  
+    // 将数组中的每个单词首字母大写（除了第一个单词）
+    let camelCased: string[] = words.map((word, index):string => {
+      if (index == 0 && !isPascalCase) {
+        return word.toLowerCase(); // 第一个单词全小写
+      }
+      return word.charAt(0).toUpperCase() + word.slice(1).toLowerCase();
+    });
+  
+    // 将数组中的单词拼接成一个字符串
+    return camelCased.join('');
+};
\ No newline at end of file
diff --git a/uni_modules/lime-shared/canIUseCanvas2d/index.ts b/uni_modules/lime-shared/canIUseCanvas2d/index.ts
new file mode 100644
index 0000000..be5623a
--- /dev/null
+++ b/uni_modules/lime-shared/canIUseCanvas2d/index.ts
@@ -0,0 +1,67 @@
+// @ts-nocheck
+
+// #ifndef UNI-APP-X && APP
+
+// #ifdef MP-ALIPAY
+interface My {
+	SDKVersion: string
+}
+declare var my: My
+// #endif
+
+function compareVersion(v1:string, v2:string) {
+  let a1 = v1.split('.');
+  let a2 = v2.split('.');
+  const len = Math.max(a1.length, a2.length);
+
+  while (a1.length < len) {
+    a1.push('0');
+  }
+  while (a2.length < len) {
+    a2.push('0');
+  }
+
+  for (let i = 0; i < len; i++) {
+    const num1 = parseInt(a1[i], 10);
+    const num2 = parseInt(a2[i], 10);
+
+    if (num1 > num2) {
+      return 1;
+    }
+    if (num1 < num2) {
+      return -1;
+    }
+  }
+
+  return 0;
+}
+
+function gte(version: string) {
+	let {SDKVersion} = uni.getSystemInfoSync();
+	// #ifdef MP-ALIPAY
+	SDKVersion = my.SDKVersion
+	// #endif
+	return compareVersion(SDKVersion, version) >= 0;
+}
+// #endif
+
+
+/** 环境是否支持canvas 2d */
+export function canIUseCanvas2d(): boolean {
+	// #ifdef MP-WEIXIN
+	return gte('2.9.0');
+	// #endif
+	// #ifdef MP-ALIPAY
+	return gte('2.7.0');
+	// #endif
+	// #ifdef MP-TOUTIAO
+	return gte('1.78.0');
+	// #endif
+	// #ifdef UNI-APP-X && WEB ||  UNI-APP-X && APP
+	return true;
+	// #endif
+	// #ifndef MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO
+	return false
+	// #endif
+	
+}
diff --git a/uni_modules/lime-shared/capitalizedAmount/index.ts b/uni_modules/lime-shared/capitalizedAmount/index.ts
new file mode 100644
index 0000000..317e0af
--- /dev/null
+++ b/uni_modules/lime-shared/capitalizedAmount/index.ts
@@ -0,0 +1,111 @@
+// @ts-nocheck
+import { isString } from "../isString";
+import { isNumber } from "../isNumber";
+/**
+ * 将金额转换为中文大写形式
+ * @param {number | string} amount - 需要转换的金额，可以是数字或字符串
+ * @returns {string} 转换后的中文大写金额
+ */
+export function capitalizedAmount(amount : number) : string
+export function capitalizedAmount(amount : string) : string
+export function capitalizedAmount(amount : any | null) : string {
+	try {
+		let _amountStr :string;
+		let _amountNum :number = 0;
+		// 如果输入是字符串，先将其转换为数字，并去除逗号
+		if (typeof amount == 'string') {
+			 _amountNum = parseFloat((amount as string).replace(/,/g, ''));
+		}
+		if(isNumber(amount)) {
+			_amountNum = amount as number
+		}
+		// 判断输入是否为有效的金额  || isNaN(amount)
+		if (amount == null) throw new Error('不是有效的金额！');
+
+		let result = '';
+
+		// 处理负数情况
+		if (_amountNum < 0) {
+			result = '欠';
+			_amountNum = Math.abs(_amountNum);
+		}
+
+		// 金额不能超过千亿以上
+		if (_amountNum >= 10e11) throw new Error('计算金额过大！');
+
+		// 保留两位小数并转换为字符串
+		_amountStr = _amountNum.toFixed(2);
+
+		// 定义数字、单位和小数单位的映射
+		const digits = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+		const units = ['', '拾', '佰', '仟'];
+		const bigUnits = ['', '万', '亿'];
+		const decimalUnits = ['角', '分'];
+
+		// 分离整数部分和小数部分
+		const amountArray = _amountStr.split('.');
+		let integerPart = amountArray[0]; // string| number[]
+		const decimalPart = amountArray[1];
+
+		// 处理整数部分
+		if (integerPart != '0') {
+			let _integerPart = integerPart.split('').map((item):number => parseInt(item));
+
+			// 将整数部分按四位一级进行分组
+			const levels = _integerPart.reverse().reduce((prev:string[][], item, index):string[][] => {
+				// const level = prev?.[0]?.length < 4 ? prev[0] : [];
+				const level = prev.length > 0 && prev[0].length < 4 ? prev[0]: []
+
+				const value = item == 0 ? digits[item] : digits[item] + units[index % 4];
+
+				level.unshift(value);
+
+				if (level.length == 1) {
+					prev.unshift(level);
+				} else {
+					prev[0] = level;
+				}
+
+				return prev;
+			}, [] as string[][]);
+			// 将分组后的整数部分转换为中文大写形式
+			result += levels.reduce((prev, item, index):string => {
+				let _level = bigUnits[levels.length - index - 1];
+				let _item = item.join('').replace(/(零)\1+/g, '$1');
+
+				if (_item == '零') {
+					_level = '';
+					_item = '';
+				} else if (_item.endsWith('零')) {
+					_item = _item.slice(0, _item.length - 1);
+				}
+
+				return prev + _item + _level;
+			}, '');
+		} else {
+			result += '零';
+		}
+
+		// 添加元
+		result += '元';
+
+		// 处理小数部分
+		if (decimalPart != '00') {
+			if (result == '零元') result = '';
+
+			for (let i = 0; i < decimalPart.length; i++) {
+				const digit = parseInt(decimalPart.charAt(i));
+
+				if (digit != 0) {
+					result += digits[digit] + decimalUnits[i];
+				}
+			}
+		} else {
+			result += '整';
+		}
+
+		return result;
+	} catch (error : Error) {
+		return error.message;
+	}
+};
\ No newline at end of file
diff --git a/uni_modules/lime-shared/changelog.md b/uni_modules/lime-shared/changelog.md
new file mode 100644
index 0000000..cdc1c70
--- /dev/null
+++ b/uni_modules/lime-shared/changelog.md
@@ -0,0 +1,91 @@
+## 0.4.2（2025-09-26）
+- feat: 增加`cssToObj`
+## 0.4.1（2025-06-13）
+- fix：测试hbx4.71更新
+## 0.4.0（2025-06-04）
+- fix：测试hbx4.71更新
+## 0.3.9（2025-06-04）
+ - fix: 因hbx4.71更新导致mac用户下载的文件被重命名，故退回4.66
+## 0.3.8（2025-06-03）
+- fix: 修复`while`在vue2报错的问题
+## 0.3.7（2025-05-21）
+- fix: 修复`merge`在vue2报错的问题
+## 0.3.6（2025-05-17）
+- fix: 修复`raf`导错目录的问题
+## 0.3.5（2025-05-16）
+- feat: 增加`isIP`
+- feat: 增加`merge`
+- feat: 增加`isByteLength`
+- feat: 增加`isRegExp`
+## 0.3.4（2025-04-27）
+- fix: 修复exif缺少isBase64的问题
+## 0.3.3（2025-04-14）
+- fix: 修复4.61上的类型问题
+## 0.3.2（2025-04-14）
+- fix: 修复4.61上的类型问题
+## 0.3.1（2025-03-28）
+- fix: 修复getRect在nvue上的问题
+## 0.3.0（2025-02-27）
+- fix: 修复部分函数无法在uniappx上运行的问题
+## 0.2.9（2025-02-19）
+- chore: 更新文档
+## 0.2.8（2025-02-11）
+- chore: 更新文档
+## 0.2.7（2025-01-17）
+- fix: 针对canvas 平台判断优化
+## 0.2.6（2025-01-09）
+- feat: 增加`areaData`中国省市区数据
+## 0.2.5（2025-01-07）
+- fix: animation在app上类型问题
+## 0.2.4（2025-01-04）
+- feat: getRect类型问题
+## 0.2.3（2025-01-01）
+- chore: unitConvert使用uni.rpx2px
+## 0.2.2（2024-12-11）
+- chore: 动画使用`requestAnimationFrame`
+## 0.2.1（2024-11-20）
+- feat: 增加`characterLimit`
+## 0.2.0（2024-11-14）
+- fix: vue2的类型问题
+## 0.1.9（2024-11-14）
+- feat: 增加`shuffle`
+## 0.1.8（2024-10-08）
+- fix: vue2 条件编译 // #ifdef APP-IOS || APP-ANDROID 会生效
+## 0.1.7（2024-09-23）
+- fix: raf 类型跟随版本变更
+## 0.1.6（2024-07-24）
+- fix: vue2 app ts需要明确的后缀，所有补全
+- chore: 减少依赖
+## 0.1.5（2024-07-21）
+- feat: 删除 Hooks
+- feat: 兼容uniappx
+## 0.1.4（2023-09-05）
+- feat: 增加 Hooks `useIntersectionObserver`
+- feat: 增加 `floatAdd`
+- feat: 因为本人插件兼容 vue2 需要使用 `composition-api`，故增加vue文件代码插件的条件编译
+## 0.1.3（2023-08-13）
+- feat: 增加 `camelCase`
+## 0.1.2（2023-07-17）
+- feat: 增加 `getClassStr`
+## 0.1.1（2023-07-06）
+- feat: 增加 `isNumeric`， 区别于 `isNumber`
+## 0.1.0（2023-06-30）
+- fix: `clamp`忘记导出了
+## 0.0.9（2023-06-27）
+- feat: 增加`arrayBufferToFile`
+## 0.0.8（2023-06-19）
+- feat: 增加`createAnimation`、`clamp`
+## 0.0.7（2023-06-08）
+- chore: 更新注释
+## 0.0.6（2023-06-08）
+- chore: 增加`createImage`为`lime-watermark`和`lime-qrcode`提供依赖
+## 0.0.5（2023-06-03）
+- chore: 更新注释
+## 0.0.4（2023-05-22）
+- feat: 增加`range`,`exif`,`selectComponent`
+## 0.0.3（2023-05-08）
+- feat: 增加`fillZero`,`debounce`,`throttle`,`random`
+## 0.0.2（2023-05-05）
+- chore: 更新文档
+## 0.0.1（2023-05-05）
+- 无
diff --git a/uni_modules/lime-shared/characterLimit/index.ts b/uni_modules/lime-shared/characterLimit/index.ts
new file mode 100644
index 0000000..215de23
--- /dev/null
+++ b/uni_modules/lime-shared/characterLimit/index.ts
@@ -0,0 +1,63 @@
+// @ts-nocheck
+/**
+ * 计算字符串字符的长度并可以截取字符串。
+ * @param char 传入字符串（maxcharacter条件下，一个汉字表示两个字符）
+ * @param max 规定最大字符串长度
+ * @returns 当没有传入maxCharacter/maxLength 时返回字符串字符长度，当传入maxCharacter/maxLength时返回截取之后的字符串和长度。
+ */
+export type CharacterLengthResult = {
+	length : number;
+	characters : string;
+}
+// #ifdef APP-ANDROID
+type ChartType = any
+// #endif
+// #ifndef APP-ANDROID
+type ChartType = string | number
+// #endif
+
+export function characterLimit(type : string, char : ChartType, max : number) : CharacterLengthResult {
+	const str = `${char}`;
+
+	if (str.length == 0) {
+		return {
+			length: 0,
+			characters: '',
+		} as CharacterLengthResult
+	}
+
+	if (type == 'maxcharacter') {
+		let len = 0;
+		for (let i = 0; i < str.length; i += 1) {
+			let currentStringLength : number// = 0;
+			const code = str.charCodeAt(i)!
+			if (code > 127 || code == 94) {
+				currentStringLength = 2;
+			} else {
+				currentStringLength = 1;
+			}
+			if (len + currentStringLength > max) {
+				return {
+					length: len,
+					characters: str.slice(0, i),
+				} as CharacterLengthResult
+			}
+			len += currentStringLength;
+		}
+		return {
+			length: len,
+			characters: str,
+		} as CharacterLengthResult
+	} else if (type == 'maxlength') {
+		const length = str.length > max ? max : str.length;
+		return {
+			length: length,
+			characters: str.slice(0, length),
+		} as CharacterLengthResult
+	}
+
+	return {
+		length: str.length,
+		characters: str,
+	} as CharacterLengthResult
+};
\ No newline at end of file
diff --git a/uni_modules/lime-shared/clamp/index.ts b/uni_modules/lime-shared/clamp/index.ts
new file mode 100644
index 0000000..0e16358
--- /dev/null
+++ b/uni_modules/lime-shared/clamp/index.ts
@@ -0,0 +1,16 @@
+// @ts-nocheck
+/**
+ * 将一个值限制在指定的范围内
+ * @param val 要限制的值
+ * @param min 最小值
+ * @param max 最大值
+ * @returns 限制后的值
+ */
+export function clamp(val: number, min: number, max: number): number {
+  return Math.max(min, Math.min(max, val));
+}
+
+
+// console.log(clamp(5 ,0, 10)); // 输出: 5（在范围内，不做更改）
+// console.log(clamp(-5 ,0, 10)); // 输出: 0（小于最小值，被限制为最小值）
+// console.log(clamp(15 ,0, 10)); // 输出: 10（大于最大值，被限制为最大值）
\ No newline at end of file
diff --git a/uni_modules/lime-shared/classNames/index.ts b/uni_modules/lime-shared/classNames/index.ts
new file mode 100644
index 0000000..331f7af
--- /dev/null
+++ b/uni_modules/lime-shared/classNames/index.ts
@@ -0,0 +1,53 @@
+// @ts-nocheck
+
+// #ifdef UNI-APP-X && APP
+import { isNumber } from '../isNumber'
+import { isString } from '../isString'
+import { isDef } from '../isDef'
+// #endif
+
+/**
+ * 获取对象的类名字符串
+ * @param obj - 需要处理的对象
+ * @returns 由对象属性作为类名组成的字符串
+ */
+export function classNames<T>(obj : T) : string {
+	let classNames : string[] = [];
+	// #ifdef APP-ANDROID || APP-HARMONY
+	if (obj instanceof UTSJSONObject) {
+		(obj as UTSJSONObject).toMap().forEach((value, key) => {
+			if (isDef(value)) {
+				if (isNumber(value)) {
+					classNames.push(key);
+				}
+				if (isString(value) && value !== '') {
+					classNames.push(key);
+				}
+				if (typeof value == 'boolean' && (value as boolean)) {
+					classNames.push(key);
+				}
+			}
+		})
+	} 
+	// #endif
+	// #ifndef APP-ANDROID || APP-HARMONY
+	// 遍历对象的属性
+	for (let key in obj) {
+		// 检查属性确实属于对象自身且其值为true
+		if ((obj as any).hasOwnProperty(key) && obj[key]) {
+			// 将属性名添加到类名数组中
+			classNames.push(key);
+		}
+	}
+	// #endif
+
+
+	// 将类名数组用空格连接成字符串并返回
+	return classNames.join(' ');
+}
+
+
+// 示例
+// const obj = { foo: true, bar: false, baz: true };
+// const classNameStr = stringify(obj);
+// console.log(classNameStr); // 输出: "foo baz"
\ No newline at end of file
diff --git a/uni_modules/lime-shared/cloneDeep/index.ts b/uni_modules/lime-shared/cloneDeep/index.ts
new file mode 100644
index 0000000..22f8b94
--- /dev/null
+++ b/uni_modules/lime-shared/cloneDeep/index.ts
@@ -0,0 +1,12 @@
+// @ts-nocheck
+
+// #ifdef APP-ANDROID
+// export * from './uvue.uts'
+export { cloneDeep } from  './uvue.uts'
+// #endif
+
+
+// #ifndef APP-ANDROID
+// export * from './vue.ts'
+export { cloneDeep } from  './vue.ts'
+// #endif
\ No newline at end of file
diff --git a/uni_modules/lime-shared/cloneDeep/uvue.uts b/uni_modules/lime-shared/cloneDeep/uvue.uts
new file mode 100644
index 0000000..9ee42d9
--- /dev/null
+++ b/uni_modules/lime-shared/cloneDeep/uvue.uts
@@ -0,0 +1,39 @@
+// @ts-nocheck
+/**
+ * 深度克隆一个对象或数组
+ * @param obj 要克隆的对象或数组
+ * @returns 克隆后的对象或数组
+ */
+export function cloneDeep<T>(obj : any) : T {
+	if (obj instanceof Set) {
+		const set = new Set<any>();
+		obj.forEach((item : any) => {
+			set.add(item)
+		})
+		return set as T;
+	}
+	if (obj instanceof Map) {
+		const map = new Map<any, any>();
+		obj.forEach((value : any, key : any) => {
+			map.set(key, value)
+		})
+		return map as T;
+	}
+
+	if (obj instanceof RegExp) {
+		return new RegExp(obj) as T;
+	}
+
+	if (Array.isArray(obj)) {
+		return (obj as any[]).map((item : any):any => item) as T;
+	}
+
+	if (obj instanceof Date) {
+		return new Date(obj.getTime()) as T;
+	}
+
+	if (typeof obj == 'object') {
+		return UTSJSONObject.assign<T>({}, toRaw(obj))! 
+	}
+	return obj as T
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/cloneDeep/vue.ts b/uni_modules/lime-shared/cloneDeep/vue.ts
new file mode 100644
index 0000000..ded334d
--- /dev/null
+++ b/uni_modules/lime-shared/cloneDeep/vue.ts
@@ -0,0 +1,103 @@
+// @ts-nocheck
+/**
+ * 深度克隆一个对象或数组
+ * @param obj 要克隆的对象或数组
+ * @returns 克隆后的对象或数组
+ */
+export function cloneDeep<T>(obj: any): T {
+  // 如果传入的对象为空，返回空
+  if (obj === null) {
+    return null as unknown as T;
+  }
+
+  // 如果传入的对象是 Set 类型，则将其转换为数组，并通过新的 Set 构造函数创建一个新的 Set 对象
+  if (obj instanceof Set) {
+    return new Set([...obj]) as unknown as T;
+  }
+
+  // 如果传入的对象是 Map 类型，则将其转换为数组，并通过新的 Map 构造函数创建一个新的 Map 对象
+  if (obj instanceof Map) {
+    return new Map([...obj]) as unknown as T;
+  }
+
+  // 如果传入的对象是 WeakMap 类型，则直接用传入的 WeakMap 对象进行赋值
+  if (obj instanceof WeakMap) {
+    let weakMap = new WeakMap();
+    weakMap = obj;
+    return weakMap as unknown as T;
+  }
+
+  // 如果传入的对象是 WeakSet 类型，则直接用传入的 WeakSet 对象进行赋值
+  if (obj instanceof WeakSet) {
+    let weakSet = new WeakSet();
+    weakSet = obj;
+    return weakSet as unknown as T;
+  }
+
+  // 如果传入的对象是 RegExp 类型，则通过新的 RegExp 构造函数创建一个新的 RegExp 对象
+  if (obj instanceof RegExp) {
+    return new RegExp(obj) as unknown as T;
+  }
+
+  // 如果传入的对象是 undefined 类型，则返回 undefined
+  if (typeof obj === 'undefined') {
+    return undefined as unknown as T;
+  }
+
+  // 如果传入的对象是数组，则递归调用 cloneDeep 函数对数组中的每个元素进行克隆
+  if (Array.isArray(obj)) {
+    return obj.map(cloneDeep) as unknown as T;
+  }
+
+  // 如果传入的对象是 Date 类型，则通过新的 Date 构造函数创建一个新的 Date 对象
+  if (obj instanceof Date) {
+    return new Date(obj.getTime()) as unknown as T;
+  }
+
+  // 如果传入的对象是普通对象，则使用递归调用 cloneDeep 函数对对象的每个属性进行克隆
+  if (typeof obj === 'object') {
+    const newObj: any = {};
+    for (const [key, value] of Object.entries(obj)) {
+      newObj[key] = cloneDeep(value);
+    }
+    const symbolKeys = Object.getOwnPropertySymbols(obj);
+    for (const key of symbolKeys) {
+      newObj[key] = cloneDeep(obj[key]);
+    }
+    return newObj;
+  }
+
+  // 如果传入的对象是基本数据类型（如字符串、数字等），则直接返回
+  return obj;
+}
+
+// 示例使用
+
+// // 克隆一个对象
+// const obj = { name: 'John', age: 30 };
+// const clonedObj = cloneDeep(obj);
+
+// console.log(clonedObj); // 输出: { name: 'John', age: 30 }
+// console.log(clonedObj === obj); // 输出: false (副本与原对象是独立的)
+
+// // 克隆一个数组
+// const arr = [1, 2, 3];
+// const clonedArr = cloneDeep(arr);
+
+// console.log(clonedArr); // 输出: [1, 2, 3]
+// console.log(clonedArr === arr); // 输出: false (副本与原数组是独立的)
+
+// // 克隆一个包含嵌套对象的对象
+// const person = {
+//   name: 'Alice',
+//   age: 25,
+//   address: {
+//     city: 'New York',
+//     country: 'USA',
+//   },
+// };
+// const clonedPerson = cloneDeep(person);
+
+// console.log(clonedPerson); // 输出: { name: 'Alice', age: 25, address: { city: 'New York', country: 'USA' } }
+// console.log(clonedPerson === person); // 输出: false (副本与原对象是独立的)
+// console.log(clonedPerson.address === person.address); // 输出: false (嵌套对象的副本也是独立的)
\ No newline at end of file
diff --git a/uni_modules/lime-shared/closest/index.ts b/uni_modules/lime-shared/closest/index.ts
new file mode 100644
index 0000000..e6e79c2
--- /dev/null
+++ b/uni_modules/lime-shared/closest/index.ts
@@ -0,0 +1,22 @@
+// @ts-nocheck
+
+/**
+ * 在给定数组中找到最接近目标数字的元素。
+ * @param arr 要搜索的数字数组。
+ * @param target 目标数字。
+ * @returns 最接近目标数字的数组元素。
+ */
+export function closest(arr: number[], target: number):number {
+  return arr.reduce((pre: number, cur: number):number =>
+    Math.abs(pre - target) < Math.abs(cur - target) ? pre : cur
+  );
+}
+
+// 示例
+// // 定义一个数字数组
+// const numbers = [1, 3, 5, 7, 9];
+
+// // 在数组中找到最接近目标数字 6 的元素
+// const closestNumber = closest(numbers, 6);
+
+// console.log(closestNumber); // 输出结果: 5
\ No newline at end of file
diff --git a/uni_modules/lime-shared/components/lime-shared/lime-shared.vue b/uni_modules/lime-shared/components/lime-shared/lime-shared.vue
new file mode 100644
index 0000000..edbf6e8
--- /dev/null
+++ b/uni_modules/lime-shared/components/lime-shared/lime-shared.vue
@@ -0,0 +1,407 @@
+<template>
+	<view id="shared" style="height: 500px; width: 300px; background-color: aqua;">
+		
+	</view>
+</template>
+
+<script lang="ts">
+	// #ifdef WEB
+	import validator from 'validator'
+	// #endif
+	import { getRect, getAllRect } from '@/uni_modules/lime-shared/getRect'
+	
+	import { camelCase } from '@/uni_modules/lime-shared/camelCase'
+	import { canIUseCanvas2d } from '@/uni_modules/lime-shared/canIUseCanvas2d'
+	import { clamp } from '@/uni_modules/lime-shared/clamp'
+	import { cloneDeep } from '@/uni_modules/lime-shared/cloneDeep'
+	import { closest } from '@/uni_modules/lime-shared/closest'
+	import { debounce } from '@/uni_modules/lime-shared/debounce'
+	import { fillZero } from '@/uni_modules/lime-shared/fillZero'
+	import { floatAdd } from '@/uni_modules/lime-shared/floatAdd'
+	import { floatMul } from '@/uni_modules/lime-shared/floatMul'
+	import { floatDiv } from '@/uni_modules/lime-shared/floatDiv'
+	import { floatSub } from '@/uni_modules/lime-shared/floatSub'
+	import { getClassStr } from '@/uni_modules/lime-shared/getClassStr'
+	import { getCurrentPage } from '@/uni_modules/lime-shared/getCurrentPage'
+	import { getStyleStr } from '@/uni_modules/lime-shared/getStyleStr'
+	import { hasOwn } from '@/uni_modules/lime-shared/hasOwn'
+	import { isBase64 } from '@/uni_modules/lime-shared/isBase64'
+	import { isBrowser } from '@/uni_modules/lime-shared/isBrowser'
+	import { isDef } from '@/uni_modules/lime-shared/isDef'
+	import { isEmpty } from '@/uni_modules/lime-shared/isEmpty'
+	import { isFunction } from '@/uni_modules/lime-shared/isFunction'
+	import { isNumber } from '@/uni_modules/lime-shared/isNumber'
+	import { isNumeric } from '@/uni_modules/lime-shared/isNumeric'
+	import { isObject } from '@/uni_modules/lime-shared/isObject'
+	import { isPromise } from '@/uni_modules/lime-shared/isPromise'
+	import { isString } from '@/uni_modules/lime-shared/isString'
+	import { kebabCase } from '@/uni_modules/lime-shared/kebabCase'
+	import { raf, doubleRaf } from '@/uni_modules/lime-shared/raf'
+	import { random } from '@/uni_modules/lime-shared/random'
+	import { range } from '@/uni_modules/lime-shared/range'
+	import { sleep } from '@/uni_modules/lime-shared/sleep'
+	import { throttle } from '@/uni_modules/lime-shared/throttle'
+	import { toArray } from '@/uni_modules/lime-shared/toArray'
+	import { toBoolean } from '@/uni_modules/lime-shared/toBoolean'
+	import { toNumber } from '@/uni_modules/lime-shared/toNumber'
+	import { unitConvert } from '@/uni_modules/lime-shared/unitConvert'
+	import { getCurrentInstance } from '@/uni_modules/lime-shared/vue'
+	import { capitalizedAmount } from '@/uni_modules/lime-shared/capitalizedAmount'
+	
+	import { obj2url } from '@/uni_modules/lime-shared/obj2url'
+	import { isURL, type IsURLOptions } from '@/uni_modules/lime-shared/isURL'
+	import { isIP } from '@/uni_modules/lime-shared/isIP'
+	import { isDate, type IsDateOptions } from '@/uni_modules/lime-shared/isDate'
+	import { isEmail } from '@/uni_modules/lime-shared/isEmail'
+	import { isRegExp } from '@/uni_modules/lime-shared/isRegExp'
+	import { isValidDomain, type IsValidDomainOptions } from '@/uni_modules/lime-shared/isValidDomain'
+	import { merge } from '@/uni_modules/lime-shared/merge'
+	import { isByteLength, type IsByteLengthOptions } from '@/uni_modules/lime-shared/isByteLength'
+	
+	// #ifdef VUE2
+	type UTSJSONObject = any
+	// #endif
+	
+	const context = getCurrentInstance()
+	// getRect('#shared', context!).then(res =>{
+	// 	console.log('res', res.bottom)
+	// })
+	// getAllRect('#shared', context).then(res =>{
+	// 	console.log('res', res)
+	// })
+	
+	
+	// console.log('camelCase::', camelCase("hello world"));
+	// console.log('camelCase::', camelCase("my_name_is_john", true));
+	// console.log('canIUseCanvas2d::', canIUseCanvas2d());
+	// console.log('clamp::', clamp(5 ,0, 10));
+	// console.log('cloneDeep::', cloneDeep<UTSJSONObject>({a:5}));
+	// console.log('closest::', closest([1, 3, 5, 7, 9], 6));
+	
+	
+	
+	
+	// const saveData = (data: any) => {
+	// 	// 模拟保存数据的操作
+	// 	console.log(`Saving data: ${data}`);
+	// }
+	
+	// const debouncedSaveData = debounce(saveData, 500);
+	// debouncedSaveData('Data 1'); 
+	// debouncedSaveData('Data 2'); 
+	
+	// console.log('fillZero', fillZero(1))
+	// console.log('floatAdd', floatAdd(0.1, 0.2), floatAdd(1.05, 0.05), floatAdd(0.1, 0.7), floatAdd(0.0001, 0.0002), floatAdd(123.456 , 789.012))
+	// console.log('floatMul', floatMul(0.1, 0.02), floatMul(1.0255, 100))
+	// console.log('floatDiv', floatDiv(10.44, 100), floatDiv(1.0255, 100), floatDiv(5.419909340994699, 0.2))
+	// console.log('floatSub', floatSub(0.4, 0.1), floatSub(1.0255, 100))
+	// const now = () : number => System.nanoTime() / 1_000_000.0
+	// console.log('capitalizedAmount', capitalizedAmount(0.4))
+	// console.log('capitalizedAmount', capitalizedAmount(100))
+	// console.log('capitalizedAmount', capitalizedAmount(100000000))
+	// console.log('capitalizedAmount', capitalizedAmount('2023.04'))
+	// console.log('capitalizedAmount', capitalizedAmount(-1024))
+	// console.log('now', now(), Date.now())
+	// console.log('getClassStr', getClassStr({hover: true}))
+	// console.log('getStyleStr', getStyleStr({ color: 'red', fontSize: '16px', backgroundColor: '', border: null }))
+	// console.log('hasOwn', hasOwn({a: true}, 'key'))
+	// console.log('isBase64::', isBase64("SGVsbG8sIFdvcmxkIQ=="));
+	// console.log('isBrowser::', isBrowser);
+	// console.log('isDef::', isDef('6'));
+	// console.log('isEmpty::', isEmpty({a: true}));
+	
+	// const b = () =>{}
+	// console.log('isFunction::', isFunction(b));
+	// console.log('isNumber::', isNumber('6'));
+	// console.log('isNumeric::', isNumeric('6'));
+	// console.log('isObject::', isObject({}));
+	
+	// const promise = ():Promise<boolean> => {
+	// 	return new Promise((resolve) => {
+	// 		resolve(true)
+	// 	})
+	// }
+	// const a = promise()
+	// console.log('isPromise::', isPromise(a));
+	// console.log('isString::', isString('null'));
+	// console.log('kebabCase::', kebabCase('my love'));
+	// console.log('raf::', raf(()=>{
+	// 	console.log('raf:::1')
+	// }));
+	// console.log('doubleRaf::', doubleRaf(()=>{
+	// 	console.log('doubleRaf:::1')
+	// }));
+	// console.log('random', random(0, 10))
+	// console.log('random', random(0, 1, 2))
+	// console.log('range', range(0, 10, 2))
+	// console.log('sleep', sleep(300).then(res => {
+	// 	console.log('log')
+	// }))
+	
+	// const handleScroll = (a: string) => {
+	//   console.log("Scroll event handled!", a);
+	// }
+	
+	// // // 使用节流函数对 handleScroll 进行节流，间隔时间为 500 毫秒
+	// const throttledScroll = throttle(handleScroll, 500);
+	// throttledScroll('5');
+	// const page = getCurrentPage()
+	// console.log('getCurrentPage::', page)
+	
+	// console.log('toArray', toArray<number>(5))
+	// console.log('toBoolean', toBoolean(5))
+	// console.log('toNumber', toNumber('5'))
+	// console.log('unitConvert', unitConvert('5'))
+	
+	// uni.getImageInfo({
+	// 	src: '/static/logo.png',
+	// 	success(res) {
+	// 		console.log('res', res)
+	// 	}
+	// })
+	
+	// --------------------------
+	// IPv4 验证示例
+	// --------------------------
+	
+	// 标准IPv4格式
+	// console.log(isIP('192.168.1.1', 4));             // true
+	// console.log(isIP('255.255.255.255', { version: 4 })); // true
+	
+	// // 边界值验证
+	// console.log(isIP('0.0.0.0', 4));                 // true
+	// console.log(isIP('223.255.255.255', '4'));       // true
+	
+	// // 非法IPv4案例
+	// console.log(isIP('256.400.999.1', 4));           // false（数值超限）
+	// console.log(isIP('192.168.01', 4));              // false（段数不足）
+	
+	// // --------------------------
+	// // IPv6 验证示例
+	// // --------------------------
+	
+	// // 标准IPv6格式
+	// console.log(isIP('2001:0db8:85a3:0000:0000:8a2e:0370:7334', 6)); // true
+	// console.log(isIP('fe80::1%eth0', { version: 6 }));               // true（带区域标识）
+	
+	// // 压缩格式验证
+	// console.log(isIP('2001:db8::1', '6'));           // true（双冒号压缩）
+	// console.log(isIP('::1', 6));                     // true（本地环回简写）
+	
+	// // IPv4混合格式
+	// console.log(isIP('::ffff:192.168.1.1', 6));     // true（IPv4映射地址）
+	
+	// // 非法IPv6案例
+	// console.log(isIP('2001::gggg::1', 6));           // false（非法字符）
+	// console.log(isIP('fe80::1%', 6));                // false（空区域标识）
+	
+	// // --------------------------
+	// // 自动版本检测
+	// // --------------------------
+	
+	// // 有效地址检测
+	// console.log(isIP('172.16.254.1'));               // true（自动识别IPv4）
+	// console.log(isIP('2001:db8:3333:4444:5555:6666:7777:8888')); // true（自动识别IPv6）
+	
+	// // 无效地址检测
+	// console.log(isIP('192.168.1.256'));              // false（无效IPv4）
+	// console.log(isIP('2001::gggg::1'));              // false（无效IPv6）
+	
+	// // --------------------------
+	// // 特殊场景
+	// // --------------------------
+	
+	// // 带前后空格处理
+	// console.log(isIP(' 203.0.113.50 ', 4));          // true（自动trim）
+	// console.log(isIP(' fe80::1%1 ', 6));             // true（自动trim）
+	
+	// // 非法版本指定
+	// console.log(isIP('192.168.1.1', 5));             // false（不存在IPv5）
+	// console.log(isIP('2001:db8::1', 'ipv6'));        // false（版本参数格式错误）
+	
+	// // --------------------------
+	// // 边界案例
+	// // --------------------------
+	
+	// // 最小/最大有效值
+	// console.log(isIP('0.0.0.0', 4));                 // true
+	// console.log(isIP('255.255.255.255', 4));         // true
+	// console.log(isIP('0000:0000:0000:0000:0000:0000:0000:0000', 6)); // true
+	
+	// // 超长地址验证
+	// console.log(isIP('192.168.1.1.1', 4));           // false（IPv4段数过多）
+	// console.log(isIP('2001:db8:1:2:3:4:5:6:7', 6)); // false（IPv6段数过多）
+	
+	// const original = { color: 'red' };
+	// const merged = merge({ ...original }, { color: 'blue', size: 'M' });
+	
+	// console.log('original', original);    // 输出: { color: 'red' } (保持不变)
+	// console.log('merged', merged);      // 输出: { color: 'red', size: 'M' }
+	
+	
+	type ColorType = {
+		color?: string,
+		size?: string,
+	}
+	
+	const merged2 = merge({ color: 'red' }, { size: 'M' } as ColorType);
+	console.log('merged2:::', merged2)
+	
+	// // 使用配置对象参数
+	// console.log(isByteLength('hello', { min: 3, max: 7 } as ByteLengthOptions)); // true (5字节)
+	// console.log(isByteLength('hello', { min: 6 } as ByteLengthOptions));       // false (5 < 6)
+	// console.log(isByteLength('hello', { max: 4 } as ByteLengthOptions));       // false (5 > 4)
+	
+	// // 使用独立参数（旧式调用）
+	// console.log(isByteLength('hello', 3, 7));            // true
+	// console.log(isByteLength('hello', 6));                // false
+	// console.log(isByteLength('hello', null, 4));     // false
+	
+	// =====================
+	// 多字节字符处理示例
+	// =====================
+	
+	// 中文字符（UTF-8 每个汉字3字节）
+	// console.log(isByteLength('中国', { min: 6 }));         // true (2字 × 3字节 = 6)
+	// console.log(isByteLength('中国', { max: 5 }));         // false (6 > 5)
+	
+	// // 表情符号（多数占用4字节）
+	// console.log(isByteLength('🌟', { min: 4, max: 4 }));  // true
+	// console.log(isByteLength('👨👩👧👦', { max: 15 })); // false (家庭表情占25字节)
+	
+	// // 混合字符集
+	// console.log(isByteLength('aé🌟', { min: 7 }));        // true 
+	
+	// // URL编码字符
+	// console.log(isByteLength('%20', { min: 3 }));         // true（实际字节长度3）
+	// console.log(isByteLength('%E2%82%AC', { max: 3 }));  // false（欧元符号编码为3字节）
+	
+	// // 构造函数创建的正则表达式
+	// console.log(isRegExp(new RegExp('hello')));      // true
+	// console.log(isRegExp(new RegExp('\\d+', 'gi'))); // true
+	
+	// // 字面量正则表达式
+	// console.log(isRegExp(/abc/));                    // true
+	// console.log(isRegExp(/^[0-9]+$/gi));             // true
+	
+	// // 字符串（含正则格式字符串）
+	// console.log(isRegExp('/abc/'));                  // false
+	// console.log(isRegExp('new RegExp("abc")'));      // false
+	
+	// console.log(isEmail('"John"@example.com')) // false（实际有效）
+	// console.log(isEmail('中国@例子.中国'))       // false（实际有效）
+	
+	// // 简单键值对
+	// console.log(obj2url({ name: '张三', age: 25 }));
+	// // "name=%E5%BC%A0%E4%B8%89&age=25"
+	// // 包含布尔值
+	// console.log(obj2url({ active: true, admin: false }));
+	// // "active=true&admin=false"
+	
+	// // 数字处理
+	// console.log(obj2url({ page: 1, limit: 10 }));
+	// // "page=1&limit=10"
+
+	// 基础验证
+	// console.log("example.com =>", isValidDomain("example.com")); // true
+	// console.log("sub.example.co.uk =>", isValidDomain("sub.example.co.uk")); // true
+	
+	// // 缺少TLD的情况
+	// console.log("localhost =>", isValidDomain("localhost")); // false
+	// console.log("localhost (不要求TLD) =>", isValidDomain("localhost", { requireTld: false } as DomainOptions)); // true
+	
+	// // 带结尾点号的情况
+	// console.log("example.com. =>", isValidDomain("example.com.")); // false 
+	// console.log("example.com. (允许结尾点号) =>", isValidDomain("example.com.", { allowTrailingDot: true }  as DomainOptions)); // true
+	
+	// // 带下划线的情况
+	// console.log("my_site.com =>", isValidDomain("my_site.com")); // false
+	// console.log("my_site.com (允许下划线) =>", isValidDomain("my_site.com", { allowUnderscore: true } as DomainOptions)); // true
+	
+	// // 非法字符测试
+	// console.log("含有空格的域名 =>", isValidDomain("exa mple.com")); // false
+	// console.log("含有!的域名 =>", isValidDomain("exa!mple.com")); // false
+	
+	// // 长度测试
+	// const longPart = "a".repeat(64);
+	// console.log(`超长部分 (${longPart.length}字符) =>`, isValidDomain(`${longPart}.com`)); // false
+
+	// // 连字符测试
+	// console.log("以连字符开头 =>", isValidDomain("-example.com")); // false
+	// console.log("以连字符结尾 =>", isValidDomain("example-.com")); // false
+	
+	// // 国际化域名测试
+	// console.log("中文域名 =>", isValidDomain("中国.中国")); // true
+	// console.log("日文域名 =>", isValidDomain("ドメイン.テスト")); // true
+	
+	// // 基础格式验证
+	// console.log("1. 标准日期格式验证:");
+	// console.log("2023/12/31 =>", isDate("2023/12/31")); // true
+	// console.log("1999-01-01 =>", isDate("1999-01-01")); // true
+	// console.log("02.28.2023 =>", isDate("02.28.2023", { delimiters: ['.'], format: 'MM.DD.YYYY' } as DateOptions)); // true (自定义分隔符)
+	
+	// // 严格模式验证
+	// console.log("2. 严格模式验证:");
+	// console.log("严格匹配格式:", isDate("2023/02/28", { strictMode: true, format: "YYYY/MM/DD" }as DateOptions)); // true
+	// console.log("长度不符:", isDate("2023/2/28", { strictMode: true, format: "YYYY/MM/DD" }as DateOptions)); // false
+	// console.log("错误分隔符:", isDate("2023-02-28", { strictMode: true, format: "YYYY/MM/DD" }as DateOptions)); // false
+	
+	// // 两位年份处理
+	// console.log("3. 两位年份验证:");
+	// console.log("23 -> 2023:", isDate("23/12/31", { format: "YY/MM/DD" } as DateOptions)); // true → 2023-12-31
+	// console.log("87 -> 1987:", isDate("87-01-01", { format: "YY-MM-DD" } as DateOptions)); // true → 1987-01-01
+	// console.log("负数年份:", isDate("-100/12/31", { format: "YYYY/MM/DD" } as DateOptions)); // false
+	
+	// // 日期有效性验证
+	// console.log("4. 无效日期检测:");
+	// console.log("闰年2020-02-29:", isDate("2020/02/29")); // true
+	// console.log("非闰年2023-02-29:", isDate("2023/02/29")); // false
+	// console.log("月份溢出:", isDate("2023/13/01")); // false
+	// console.log("日期溢出:", isDate("2023/12/32")); // false
+	
+	// // Date对象验证
+	// console.log("5. Date对象验证:");
+	// console.log("有效Date对象:", isDate(new Date())); // true
+	// console.log("无效Date对象:", isDate(new Date("invalid")), new Date("invalid")); // false
+	// console.log("严格模式Date对象:", isDate(new Date(), { strictMode: true } as DateOptions)); // false
+	
+	// // 自定义格式验证
+	// console.log("6. 自定义格式测试:");
+	// console.log("MM-DD-YYYY:", isDate("12-31-2023", { format: "MM-DD-YYYY" } as DateOptions)); // true
+	// console.log("DD.MM.YY:", isDate("31.12.23", { format: "DD.MM.YY", delimiters: ['.'] } as DateOptions)); // true
+	// console.log("中文分隔符:", isDate("2023年12月31日", { 
+	//   format: "YYYY年MM月DD日",
+	//   strictMode: true,
+	//   delimiters: ['年', '月', '日']
+	// } as DateOptions )); // true
+	
+	
+	// 示例测试
+	// console.log("示例1 标准HTTP URL:", isURL("http://example.com")); // true
+	// console.log("示例2 需要端口时缺少端口:", isURL("https://example.com", { requirePort: true } as URLOptions)); // false
+	// console.log("示例3 协议相对URL:", isURL("//example.com", { allowProtocolRelativeUrls: true })); // true
+	console.log("示例4 IPv6地址:", isURL("http://[2001:db8::1]:8080", {})); // true
+	// console.log("示例5 带认证信息被禁用:", isURL("user:pass@example.com", { disallowAuth: true })); // false
+	console.log("示例6 查询参数被禁用:", isURL("http://example.com?q=test", { allowQueryComponents: true })); // false
+	console.log("示例7 非字符串输入:", isURL(null, {})); // false
+	console.log("示例8 邮件协议被排除:", isURL("mailto:test@example.com", {})); // false
+	console.log("示例9 自定义协议:", isURL("ftp://files.example.com", { protocols: ["ftp"] })); // true
+	console.log("示例10 白名单检查:", isURL("http://trusted.com", { hostWhitelist: ["trusted.com"] })); // true
+	
+	
+	// #ifdef WEB
+	// console.log('validator', validator.isURL())
+	console.log("示例4 IPv6地址:", validator.isURL("http://[2001:db8::1]:8080", {})); // true
+	console.log("示例6 查询参数被禁用:", validator.isURL("http://example.com?q=test", { allow_query_components: true })); // false
+	console.log("示例8 邮件协议被排除:", validator.isURL("mailto:test@example.com", {})); // false
+	console.log("示例9 自定义协议:", isURL("ftp://files.example.com", { protocols: ["ftp"] })); // true
+	// #endif
+	
+	export default {
+		
+	}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/uni_modules/lime-shared/createAnimation/index.ts b/uni_modules/lime-shared/createAnimation/index.ts
new file mode 100644
index 0000000..5417375
--- /dev/null
+++ b/uni_modules/lime-shared/createAnimation/index.ts
@@ -0,0 +1,11 @@
+// @ts-nocheck
+// #ifndef UNI-APP-X
+export * from './type.ts'
+// export * from './vue.ts'
+export { createAnimation } from './vue.ts'
+// #endif
+
+// #ifdef UNI-APP-X
+// export * from './uvue.ts'
+export { createAnimation } from './uvue.uts' 
+// #endif
\ No newline at end of file
diff --git a/uni_modules/lime-shared/createAnimation/type.ts b/uni_modules/lime-shared/createAnimation/type.ts
new file mode 100644
index 0000000..0f8ad34
--- /dev/null
+++ b/uni_modules/lime-shared/createAnimation/type.ts
@@ -0,0 +1,25 @@
+export type CreateAnimationOptions = {
+	/**
+	 * 动画持续时间，单位ms
+	 */
+	duration ?: number;
+	/**
+	 * 定义动画的效果
+	 * - linear: 动画从头到尾的速度是相同的
+	 * - ease: 动画以低速开始，然后加快，在结束前变慢
+	 * - ease-in: 动画以低速开始
+	 * - ease-in-out: 动画以低速开始和结束
+	 * - ease-out: 动画以低速结束
+	 * - step-start: 动画第一帧就跳至结束状态直到结束
+	 * - step-end: 动画一直保持开始状态，最后一帧跳到结束状态
+	 */
+	timingFunction ?: string //'linear' | 'ease' | 'ease-in' | 'ease-in-out' | 'ease-out' | 'step-start' | 'step-end';
+	/**
+	 * 动画延迟时间，单位 ms
+	 */
+	delay ?: number;
+	/**
+	 * 设置transform-origin
+	 */
+	transformOrigin ?: string;
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/createAnimation/uvue.uts b/uni_modules/lime-shared/createAnimation/uvue.uts
new file mode 100644
index 0000000..96d8263
--- /dev/null
+++ b/uni_modules/lime-shared/createAnimation/uvue.uts
@@ -0,0 +1,5 @@
+// @ts-nocheck
+// export * from '@/uni_modules/lime-animateIt'
+export function createAnimation() {
+	console.error('当前环境不支持,请使用：lime-animateIt')
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/createAnimation/vue.ts b/uni_modules/lime-shared/createAnimation/vue.ts
new file mode 100644
index 0000000..6934f27
--- /dev/null
+++ b/uni_modules/lime-shared/createAnimation/vue.ts
@@ -0,0 +1,148 @@
+// @ts-nocheck
+// nvue 需要在节点上设置ref或在export里传入
+// const animation = createAnimation({
+//   ref: this.$refs['xxx'],
+// 	 duration: 0,
+// 	 timingFunction: 'linear'
+// })
+// animation.opacity(1).translate(x, y).step({duration})
+// animation.export(ref)
+
+// 抹平nvue 与 uni.createAnimation的使用差距
+// 但是nvue动画太慢
+
+
+
+import { type CreateAnimationOptions } from './type'
+// #ifdef APP-NVUE
+const nvueAnimation = uni.requireNativePlugin('animation')
+
+type AnimationTypes = 'matrix' | 'matrix3d' | 'rotate' | 'rotate3d' | 'rotateX' | 'rotateY' | 'rotateZ' | 'scale' | 'scale3d' | 'scaleX' | 'scaleY' | 'scaleZ' | 'skew' | 'skewX' | 'skewY' | 'translate' | 'translate3d' | 'translateX' | 'translateY' | 'translateZ'
+	| 'opacity' | 'backgroundColor' | 'width' | 'height' | 'left' | 'right' | 'top' | 'bottom'
+
+interface Styles {
+	[key : string] : any
+}
+	
+interface StepConfig {
+	duration?: number
+	timingFunction?: string
+	delay?: number
+	needLayout?: boolean
+	transformOrigin?: string
+}
+interface StepAnimate {
+	styles?: Styles
+	config?: StepConfig
+}
+interface StepAnimates {
+	[key: number]: StepAnimate
+}
+// export interface CreateAnimationOptions extends UniApp.CreateAnimationOptions {
+// 	ref?: string
+// }
+
+type Callback = (time: number) => void
+const animateTypes1 : AnimationTypes[] = ['matrix', 'matrix3d', 'rotate', 'rotate3d', 'rotateX', 'rotateY', 'rotateZ', 'scale', 'scale3d',
+	'scaleX', 'scaleY', 'scaleZ', 'skew', 'skewX', 'skewY', 'translate', 'translate3d', 'translateX', 'translateY',
+	'translateZ'
+]
+const animateTypes2 : AnimationTypes[] = ['opacity', 'backgroundColor']
+const animateTypes3 : AnimationTypes[] = ['width', 'height', 'left', 'right', 'top', 'bottom']
+
+class LimeAnimation {
+	ref : any
+	context : any
+	options : UniApp.CreateAnimationOptions
+	// stack : any[] = []
+	next : number = 0
+	currentStepAnimates : StepAnimates = {}
+	duration : number = 0
+	constructor(options : CreateAnimationOptions) {
+		const {ref} = options
+		this.ref = ref
+		this.options = options
+	}
+	addAnimate(type : AnimationTypes, args: (string | number)[]) {
+		let aniObj = this.currentStepAnimates[this.next]
+		let stepAnimate:StepAnimate = {}
+		if (!aniObj) {
+			stepAnimate = {styles: {}, config: {}}
+		} else {
+			stepAnimate = aniObj
+		}
+
+		if (animateTypes1.includes(type)) {
+			if (!stepAnimate.styles.transform) {
+				stepAnimate.styles.transform = ''
+			}
+			let unit = ''
+			if (type === 'rotate') {
+				unit = 'deg'
+			}
+			stepAnimate.styles.transform += `${type}(${args.map((v: number) => v + unit).join(',')}) `
+		} else {
+			stepAnimate.styles[type] = `${args.join(',')}`
+		}
+		this.currentStepAnimates[this.next] = stepAnimate
+	}
+	animateRun(styles: Styles = {}, config:StepConfig = {}, ref: any) {
+		const el = ref || this.ref
+		if (!el) return
+		return new Promise((resolve) => {
+			const time = +new Date()
+			nvueAnimation.transition(el, {
+				styles,
+				...config
+			}, () => {
+				resolve(+new Date() - time)
+			})
+		})
+	}
+	nextAnimate(animates: StepAnimates, step: number = 0, ref: any, cb: Callback) {
+		let obj = animates[step]
+		if (obj) {
+			let { styles, config } = obj
+			// this.duration += config.duration
+			this.animateRun(styles, config, ref).then((time: number) => {
+				step += 1
+				this.duration += time
+				this.nextAnimate(animates, step, ref, cb)
+			})
+		} else {
+			this.currentStepAnimates = {}
+			cb && cb(this.duration)
+		}
+	}
+	step(config:StepConfig = {}) {
+		this.currentStepAnimates[this.next].config = Object.assign({}, this.options, config)
+		this.currentStepAnimates[this.next].styles.transformOrigin = this.currentStepAnimates[this.next].config.transformOrigin
+		this.next++
+		return this
+	}
+	export(ref: any, cb?: Callback) {
+		ref = ref || this.ref
+		if(!ref) return
+		this.duration = 0
+		this.next = 0
+		this.nextAnimate(this.currentStepAnimates, 0, ref, cb)
+		return null
+	}
+}
+
+
+animateTypes1.concat(animateTypes2, animateTypes3).forEach(type => {
+	LimeAnimation.prototype[type] = function(...args: (string | number)[]) {
+		this.addAnimate(type, args)
+		return this
+	}
+})
+// #endif
+export function createAnimation(options : CreateAnimationOptions) {
+	// #ifndef APP-NVUE
+	return uni.createAnimation({ ...options })
+	// #endif
+	// #ifdef APP-NVUE
+	return new LimeAnimation(options)
+	// #endif
+}
diff --git a/uni_modules/lime-shared/createCanvas/index.ts b/uni_modules/lime-shared/createCanvas/index.ts
new file mode 100644
index 0000000..987be92
--- /dev/null
+++ b/uni_modules/lime-shared/createCanvas/index.ts
@@ -0,0 +1,73 @@
+
+// @ts-nocheck
+// #ifndef UNI-APP-X && APP
+import type { ComponentInternalInstance } from '@/uni_modules/lime-shared/vue'
+import { getRect } from '@/uni_modules/lime-shared/getRect'
+import { canIUseCanvas2d } from '@/uni_modules/lime-shared/canIUseCanvas2d'
+export const isCanvas2d = canIUseCanvas2d()
+// #endif
+
+
+export function createCanvas(canvasId : string, component : ComponentInternalInstance) {
+	// #ifdef UNI-APP-X
+	uni.createCanvasContextAsync({
+		canvasId,
+		component,
+		success(context : CanvasContext) {
+
+		},
+		fail(error : UniError) {
+
+		}
+	})
+	// #endif
+	// #ifndef UNI-APP-X
+	const isCanvas2d = canIUseCanvas2d()
+	getRect('#' + canvasId, context, isCanvas2d).then(res => {
+		if (res.node) {
+			res.node.width = res.width
+			res.node.height = res.height
+			return res.node
+		} else {
+			const ctx = uni.createCanvasContext(canvasId, context)
+			if (!ctx._drawImage) {
+				ctx._drawImage = ctx.drawImage
+				ctx.drawImage = function (...args) {
+					const { path } = args.shift()
+					ctx._drawImage(path, ...args)
+				}
+			}
+			if (!ctx.getImageData) {
+				ctx.getImageData = function () {
+					return new Promise((resolve, reject) => {
+						uni.canvasGetImageData({
+							canvasId,
+							x: parseInt(arguments[0]),
+							y: parseInt(arguments[1]),
+							width: parseInt(arguments[2]),
+							height: parseInt(arguments[3]),
+							success(res) {
+								resolve(res)
+							},
+							fail(err) {
+								reject(err)
+							}
+						}, context)
+					})
+
+				}
+				return {
+					getContext(type: string) {
+						if(type == '2d') {
+							return ctx
+						}
+					},
+					width: res.width,
+					height: res.height,
+					createImage
+				}
+			}
+		}
+	})
+	// #endif
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/createImage/index.ts b/uni_modules/lime-shared/createImage/index.ts
new file mode 100644
index 0000000..c9e72fe
--- /dev/null
+++ b/uni_modules/lime-shared/createImage/index.ts
@@ -0,0 +1,71 @@
+// @ts-nocheck
+// #ifndef UNI-APP-X && APP
+import {isBrowser} from '../isBrowser'
+class Image {
+	currentSrc: string | null = null
+	naturalHeight: number = 0
+	naturalWidth: number = 0
+	width: number = 0
+	height: number = 0
+	tagName: string = 'IMG'
+	path: string = ''
+	crossOrigin: string = ''
+	referrerPolicy: string = ''
+	onload: () => void = () => {}
+	onerror: () => void = () => {}
+	complete: boolean = false
+	constructor() {}
+	set src(src: string) {
+		console.log('src', src)
+		if(!src) {
+			return this.onerror()
+		}
+		src = src.replace(/^@\//,'/')
+		this.currentSrc = src
+		uni.getImageInfo({
+			src,
+			success: (res) => {
+				const localReg = /^\.|^\/(?=[^\/])/;
+				// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-TOUTIAO
+				res.path = localReg.test(src) ?  `/${res.path}` : res.path;
+				// #endif
+				this.complete = true
+				this.path = res.path
+				this.naturalWidth = this.width = res.width
+				this.naturalHeight = this.height = res.height
+				this.onload()
+			},
+			fail: () => {
+				this.onerror()
+			}
+		})
+	}
+	get src() {
+		return this.currentSrc
+	}
+}
+interface UniImage extends WechatMiniprogram.Image {
+	complete?: boolean
+	naturalHeight?: number
+	naturalWidth?: number
+}
+/** 创建用于 canvas 的 img */
+export function createImage(canvas?: any): HTMLImageElement | UniImage {
+	if(canvas && canvas.createImage) {
+		return (canvas as WechatMiniprogram.Canvas).createImage()
+	} else if(this && this['tagName'] == 'canvas' && !('toBlob' in this) || canvas && !('toBlob' in canvas)){
+		return new Image()
+	} else if(isBrowser) {
+		return new window.Image()
+	}
+	return new Image()
+}
+// #endif
+
+
+// #ifdef UNI-APP-X && APP
+export function createImage():Image{
+	// console.error('当前环境不支持')
+	return new Image()
+}
+// #endif
diff --git a/uni_modules/lime-shared/cssToObj/index.ts b/uni_modules/lime-shared/cssToObj/index.ts
new file mode 100644
index 0000000..ec09623
--- /dev/null
+++ b/uni_modules/lime-shared/cssToObj/index.ts
@@ -0,0 +1,45 @@
+// @ts-nocheck
+// #ifndef UNI-APP-X
+type UTSJSONObject = Record<string, any>
+// #endif
+
+
+/**
+ * 将 CSS 字符串转换为样式对象
+ * @param css CSS 字符串，例如 "color: red; font-size: 16px;"
+ * @returns CSSProperties 对象
+ */
+export function cssToObj(css : string | UTSJSONObject | null) : UTSJSONObject {
+	// #ifdef APP-ANDROID
+	if(css == null) return {}
+	// #endif
+	// #ifndef APP-ANDROID
+	if(!css) return {}
+	// #endif
+	if(typeof css == 'object') return css as UTSJSONObject
+	
+	
+	const style : UTSJSONObject = {};
+
+	(css as string).split(';').forEach(decl => {
+		// #ifdef APP-ANDROID
+		const res = decl.split(':').map(s => s.trim());
+		if(res.length > 1) {
+			const [prop, val] = res;
+			if (prop != '' && val != '') {
+				const camelProp = prop!.replace(/-([a-z])/g, (_: string, _offset: number,c: string):string => c.toUpperCase());
+				style[camelProp] = val!;
+			}
+		}
+		// #endif
+		// #ifndef APP-ANDROID
+		const [prop, val] = decl.split(':').map(s => s.trim());
+		if (prop && val) {
+			const camelProp = prop.replace(/-([a-z])/g, (_, c) => c.toUpperCase());
+			style[camelProp] = val;
+		}
+		// #endif
+	});
+
+	return style;
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/debounce/index.ts b/uni_modules/lime-shared/debounce/index.ts
new file mode 100644
index 0000000..5a0e3c4
--- /dev/null
+++ b/uni_modules/lime-shared/debounce/index.ts
@@ -0,0 +1,11 @@
+// @ts-nocheck
+
+// #ifdef UNI-APP-X && APP
+// export * from './uvue.uts'
+export { debounce } from './uvue.uts'
+// #endif
+
+// #ifndef UNI-APP-X && APP
+// export * from './vue.ts'
+export { debounce } from './vue.ts'
+// #endif
\ No newline at end of file
diff --git a/uni_modules/lime-shared/debounce/uvue.uts b/uni_modules/lime-shared/debounce/uvue.uts
new file mode 100644
index 0000000..f1fc29d
--- /dev/null
+++ b/uni_modules/lime-shared/debounce/uvue.uts
@@ -0,0 +1,36 @@
+// @ts-nocheck
+/**
+ * 防抖函数，通过延迟一定时间来限制函数的执行频率。
+ * @param fn 要防抖的函数。
+ * @param wait 触发防抖的等待时间，单位为毫秒。
+ * @returns 防抖函数。
+ */
+export function debounce<A extends any>(fn : (args: A)=> void, wait = 300): (args: A)=> void {
+	let timer = -1
+	
+	return (args: A) => {
+		if (timer >-1) {clearTimeout(timer)};
+		
+		timer = setTimeout(()=>{
+			fn(args)
+		}, wait)
+	}
+};
+
+
+
+// 示例
+// 定义一个函数
+// function saveData(data: string) {
+//   // 模拟保存数据的操作
+//   console.log(`Saving data: ${data}`);
+// }
+
+// // 创建一个防抖函数，延迟 500 毫秒后调用 saveData 函数
+// const debouncedSaveData = debounce(saveData, 500);
+
+// // 连续调用防抖函数
+// debouncedSaveData('Data 1'); // 不会立即调用 saveData 函数
+// debouncedSaveData('Data 2'); // 不会立即调用 saveData 函数
+
+// 在 500 毫秒后，只会调用一次 saveData 函数，输出结果为 "Saving data: Data 2"
\ No newline at end of file
diff --git a/uni_modules/lime-shared/debounce/vue.ts b/uni_modules/lime-shared/debounce/vue.ts
new file mode 100644
index 0000000..694b44d
--- /dev/null
+++ b/uni_modules/lime-shared/debounce/vue.ts
@@ -0,0 +1,40 @@
+// @ts-nocheck
+type Timeout = ReturnType<typeof setTimeout> | null;
+/**
+ * 防抖函数，通过延迟一定时间来限制函数的执行频率。
+ * @param fn 要防抖的函数。
+ * @param wait 触发防抖的等待时间，单位为毫秒。
+ * @returns 防抖函数。
+ */
+export function debounce<A extends any, R>(
+	fn : (...args : A) => R,
+	wait : number = 300) : (...args : A) => void {
+	let timer : Timeout = null; 
+
+	return function (...args : A) {
+		if (timer) clearTimeout(timer); // 如果上一个 setTimeout 存在，则清除它
+
+		// 设置一个新的 setTimeout，在指定的等待时间后调用防抖函数
+		timer = setTimeout(() => {
+			fn.apply(this, args); // 使用提供的参数调用原始函数
+		}, wait);
+	};
+};
+
+
+
+// 示例
+// 定义一个函数
+// function saveData(data: string) {
+//   // 模拟保存数据的操作
+//   console.log(`Saving data: ${data}`);
+// }
+
+// // 创建一个防抖函数，延迟 500 毫秒后调用 saveData 函数
+// const debouncedSaveData = debounce(saveData, 500);
+
+// // 连续调用防抖函数
+// debouncedSaveData('Data 1'); // 不会立即调用 saveData 函数
+// debouncedSaveData('Data 2'); // 不会立即调用 saveData 函数
+
+// 在 500 毫秒后，只会调用一次 saveData 函数，输出结果为 "Saving data: Data 2"
\ No newline at end of file
diff --git a/uni_modules/lime-shared/dom/index.ts b/uni_modules/lime-shared/dom/index.ts
new file mode 100644
index 0000000..9c82e09
--- /dev/null
+++ b/uni_modules/lime-shared/dom/index.ts
@@ -0,0 +1,18 @@
+// @ts-nocheck
+export function findClosestElementWithStyle(startEl: UniElement | null, styleProperty: string): UniElement | null {
+    let currentEl: UniElement | null = startEl;
+    
+    while (currentEl != null) {
+        // Check if the current element has the style property with a non-empty value
+        const styleValue = currentEl?.style.getPropertyValue(styleProperty) ?? '';
+        if (styleValue.trim() != '') {
+            return currentEl;
+        }
+        
+        // Move to parent element
+        currentEl = currentEl.parentElement;
+    }
+    
+    // Return null if no element with the specified style was found
+    return null;
+};
\ No newline at end of file
diff --git a/uni_modules/lime-shared/exif/index.ts b/uni_modules/lime-shared/exif/index.ts
new file mode 100644
index 0000000..e1e6baf
--- /dev/null
+++ b/uni_modules/lime-shared/exif/index.ts
@@ -0,0 +1,11 @@
+// @ts-nocheck
+// #ifndef UNI-APP-X && APP
+// export * from './vue.ts'
+export { exif } from './vue.ts'
+// #endif
+
+
+// #ifdef UNI-APP-X && APP
+// export * from './uvue.uts'
+export { exif } from './uvue.uts'
+// #endif
diff --git a/uni_modules/lime-shared/exif/uvue.uts b/uni_modules/lime-shared/exif/uvue.uts
new file mode 100644
index 0000000..01d21a2
--- /dev/null
+++ b/uni_modules/lime-shared/exif/uvue.uts
@@ -0,0 +1,7 @@
+class EXIF {
+	constructor(){
+		console.error('当前环境不支持')
+	}
+}
+
+export const exif = new EXIF()
\ No newline at end of file
diff --git a/uni_modules/lime-shared/exif/vue.ts b/uni_modules/lime-shared/exif/vue.ts
new file mode 100644
index 0000000..6862263
--- /dev/null
+++ b/uni_modules/lime-shared/exif/vue.ts
@@ -0,0 +1,1057 @@
+// @ts-nocheck
+import { base64ToArrayBuffer } from '../base64ToArrayBuffer';
+import { pathToBase64 } from '../pathToBase64';
+// import { isBase64 } from '../isBase64';
+import { isDataURI } from '../isBase64';
+import { isString } from '../isString';
+
+interface File {
+	exifdata : any
+	iptcdata : any
+	xmpdata : any
+	src : string
+}
+class EXIF {
+	isXmpEnabled = false
+	debug = false
+	Tags = {
+		// version tags
+		0x9000: "ExifVersion", // EXIF version
+		0xA000: "FlashpixVersion", // Flashpix format version
+
+		// colorspace tags
+		0xA001: "ColorSpace", // Color space information tag
+
+		// image configuration
+		0xA002: "PixelXDimension", // Valid width of meaningful image
+		0xA003: "PixelYDimension", // Valid height of meaningful image
+		0x9101: "ComponentsConfiguration", // Information about channels
+		0x9102: "CompressedBitsPerPixel", // Compressed bits per pixel
+
+		// user information
+		0x927C: "MakerNote", // Any desired information written by the manufacturer
+		0x9286: "UserComment", // Comments by user
+
+		// related file
+		0xA004: "RelatedSoundFile", // Name of related sound file
+
+		// date and time
+		0x9003: "DateTimeOriginal", // Date and time when the original image was generated
+		0x9004: "DateTimeDigitized", // Date and time when the image was stored digitally
+		0x9290: "SubsecTime", // Fractions of seconds for DateTime
+		0x9291: "SubsecTimeOriginal", // Fractions of seconds for DateTimeOriginal
+		0x9292: "SubsecTimeDigitized", // Fractions of seconds for DateTimeDigitized
+
+		// picture-taking conditions
+		0x829A: "ExposureTime", // Exposure time (in seconds)
+		0x829D: "FNumber", // F number
+		0x8822: "ExposureProgram", // Exposure program
+		0x8824: "SpectralSensitivity", // Spectral sensitivity
+		0x8827: "ISOSpeedRatings", // ISO speed rating
+		0x8828: "OECF", // Optoelectric conversion factor
+		0x9201: "ShutterSpeedValue", // Shutter speed
+		0x9202: "ApertureValue", // Lens aperture
+		0x9203: "BrightnessValue", // Value of brightness
+		0x9204: "ExposureBias", // Exposure bias
+		0x9205: "MaxApertureValue", // Smallest F number of lens
+		0x9206: "SubjectDistance", // Distance to subject in meters
+		0x9207: "MeteringMode", // Metering mode
+		0x9208: "LightSource", // Kind of light source
+		0x9209: "Flash", // Flash status
+		0x9214: "SubjectArea", // Location and area of main subject
+		0x920A: "FocalLength", // Focal length of the lens in mm
+		0xA20B: "FlashEnergy", // Strobe energy in BCPS
+		0xA20C: "SpatialFrequencyResponse", //
+		0xA20E: "FocalPlaneXResolution", // Number of pixels in width direction per FocalPlaneResolutionUnit
+		0xA20F: "FocalPlaneYResolution", // Number of pixels in height direction per FocalPlaneResolutionUnit
+		0xA210: "FocalPlaneResolutionUnit", // Unit for measuring FocalPlaneXResolution and FocalPlaneYResolution
+		0xA214: "SubjectLocation", // Location of subject in image
+		0xA215: "ExposureIndex", // Exposure index selected on camera
+		0xA217: "SensingMethod", // Image sensor type
+		0xA300: "FileSource", // Image source (3 == DSC)
+		0xA301: "SceneType", // Scene type (1 == directly photographed)
+		0xA302: "CFAPattern", // Color filter array geometric pattern
+		0xA401: "CustomRendered", // Special processing
+		0xA402: "ExposureMode", // Exposure mode
+		0xA403: "WhiteBalance", // 1 = auto white balance, 2 = manual
+		0xA404: "DigitalZoomRation", // Digital zoom ratio
+		0xA405: "FocalLengthIn35mmFilm", // Equivalent foacl length assuming 35mm film camera (in mm)
+		0xA406: "SceneCaptureType", // Type of scene
+		0xA407: "GainControl", // Degree of overall image gain adjustment
+		0xA408: "Contrast", // Direction of contrast processing applied by camera
+		0xA409: "Saturation", // Direction of saturation processing applied by camera
+		0xA40A: "Sharpness", // Direction of sharpness processing applied by camera
+		0xA40B: "DeviceSettingDescription", //
+		0xA40C: "SubjectDistanceRange", // Distance to subject
+
+		// other tags
+		0xA005: "InteroperabilityIFDPointer",
+		0xA420: "ImageUniqueID" // Identifier assigned uniquely to each image
+	}
+	TiffTags = {
+		0x0100: "ImageWidth",
+		0x0101: "ImageHeight",
+		0x8769: "ExifIFDPointer",
+		0x8825: "GPSInfoIFDPointer",
+		0xA005: "InteroperabilityIFDPointer",
+		0x0102: "BitsPerSample",
+		0x0103: "Compression",
+		0x0106: "PhotometricInterpretation",
+		0x0112: "Orientation",
+		0x0115: "SamplesPerPixel",
+		0x011C: "PlanarConfiguration",
+		0x0212: "YCbCrSubSampling",
+		0x0213: "YCbCrPositioning",
+		0x011A: "XResolution",
+		0x011B: "YResolution",
+		0x0128: "ResolutionUnit",
+		0x0111: "StripOffsets",
+		0x0116: "RowsPerStrip",
+		0x0117: "StripByteCounts",
+		0x0201: "JPEGInterchangeFormat",
+		0x0202: "JPEGInterchangeFormatLength",
+		0x012D: "TransferFunction",
+		0x013E: "WhitePoint",
+		0x013F: "PrimaryChromaticities",
+		0x0211: "YCbCrCoefficients",
+		0x0214: "ReferenceBlackWhite",
+		0x0132: "DateTime",
+		0x010E: "ImageDescription",
+		0x010F: "Make",
+		0x0110: "Model",
+		0x0131: "Software",
+		0x013B: "Artist",
+		0x8298: "Copyright"
+	}
+	GPSTags = {
+		0x0000: "GPSVersionID",
+		0x0001: "GPSLatitudeRef",
+		0x0002: "GPSLatitude",
+		0x0003: "GPSLongitudeRef",
+		0x0004: "GPSLongitude",
+		0x0005: "GPSAltitudeRef",
+		0x0006: "GPSAltitude",
+		0x0007: "GPSTimeStamp",
+		0x0008: "GPSSatellites",
+		0x0009: "GPSStatus",
+		0x000A: "GPSMeasureMode",
+		0x000B: "GPSDOP",
+		0x000C: "GPSSpeedRef",
+		0x000D: "GPSSpeed",
+		0x000E: "GPSTrackRef",
+		0x000F: "GPSTrack",
+		0x0010: "GPSImgDirectionRef",
+		0x0011: "GPSImgDirection",
+		0x0012: "GPSMapDatum",
+		0x0013: "GPSDestLatitudeRef",
+		0x0014: "GPSDestLatitude",
+		0x0015: "GPSDestLongitudeRef",
+		0x0016: "GPSDestLongitude",
+		0x0017: "GPSDestBearingRef",
+		0x0018: "GPSDestBearing",
+		0x0019: "GPSDestDistanceRef",
+		0x001A: "GPSDestDistance",
+		0x001B: "GPSProcessingMethod",
+		0x001C: "GPSAreaInformation",
+		0x001D: "GPSDateStamp",
+		0x001E: "GPSDifferential"
+	}
+	// EXIF 2.3 Spec
+	IFD1Tags = {
+		0x0100: "ImageWidth",
+		0x0101: "ImageHeight",
+		0x0102: "BitsPerSample",
+		0x0103: "Compression",
+		0x0106: "PhotometricInterpretation",
+		0x0111: "StripOffsets",
+		0x0112: "Orientation",
+		0x0115: "SamplesPerPixel",
+		0x0116: "RowsPerStrip",
+		0x0117: "StripByteCounts",
+		0x011A: "XResolution",
+		0x011B: "YResolution",
+		0x011C: "PlanarConfiguration",
+		0x0128: "ResolutionUnit",
+		0x0201: "JpegIFOffset", // When image format is JPEG, this value show offset to JPEG data stored.(aka "ThumbnailOffset" or "JPEGInterchangeFormat")
+		0x0202: "JpegIFByteCount", // When image format is JPEG, this value shows data size of JPEG image (aka "ThumbnailLength" or "JPEGInterchangeFormatLength")
+		0x0211: "YCbCrCoefficients",
+		0x0212: "YCbCrSubSampling",
+		0x0213: "YCbCrPositioning",
+		0x0214: "ReferenceBlackWhite"
+	}
+	StringValues = {
+		ExposureProgram: {
+			0: "Not defined",
+			1: "Manual",
+			2: "Normal program",
+			3: "Aperture priority",
+			4: "Shutter priority",
+			5: "Creative program",
+			6: "Action program",
+			7: "Portrait mode",
+			8: "Landscape mode"
+		},
+		MeteringMode: {
+			0: "Unknown",
+			1: "Average",
+			2: "CenterWeightedAverage",
+			3: "Spot",
+			4: "MultiSpot",
+			5: "Pattern",
+			6: "Partial",
+			255: "Other"
+		},
+		LightSource: {
+			0: "Unknown",
+			1: "Daylight",
+			2: "Fluorescent",
+			3: "Tungsten (incandescent light)",
+			4: "Flash",
+			9: "Fine weather",
+			10: "Cloudy weather",
+			11: "Shade",
+			12: "Daylight fluorescent (D 5700 - 7100K)",
+			13: "Day white fluorescent (N 4600 - 5400K)",
+			14: "Cool white fluorescent (W 3900 - 4500K)",
+			15: "White fluorescent (WW 3200 - 3700K)",
+			17: "Standard light A",
+			18: "Standard light B",
+			19: "Standard light C",
+			20: "D55",
+			21: "D65",
+			22: "D75",
+			23: "D50",
+			24: "ISO studio tungsten",
+			255: "Other"
+		},
+		Flash: {
+			0x0000: "Flash did not fire",
+			0x0001: "Flash fired",
+			0x0005: "Strobe return light not detected",
+			0x0007: "Strobe return light detected",
+			0x0009: "Flash fired, compulsory flash mode",
+			0x000D: "Flash fired, compulsory flash mode, return light not detected",
+			0x000F: "Flash fired, compulsory flash mode, return light detected",
+			0x0010: "Flash did not fire, compulsory flash mode",
+			0x0018: "Flash did not fire, auto mode",
+			0x0019: "Flash fired, auto mode",
+			0x001D: "Flash fired, auto mode, return light not detected",
+			0x001F: "Flash fired, auto mode, return light detected",
+			0x0020: "No flash function",
+			0x0041: "Flash fired, red-eye reduction mode",
+			0x0045: "Flash fired, red-eye reduction mode, return light not detected",
+			0x0047: "Flash fired, red-eye reduction mode, return light detected",
+			0x0049: "Flash fired, compulsory flash mode, red-eye reduction mode",
+			0x004D: "Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected",
+			0x004F: "Flash fired, compulsory flash mode, red-eye reduction mode, return light detected",
+			0x0059: "Flash fired, auto mode, red-eye reduction mode",
+			0x005D: "Flash fired, auto mode, return light not detected, red-eye reduction mode",
+			0x005F: "Flash fired, auto mode, return light detected, red-eye reduction mode"
+		},
+		SensingMethod: {
+			1: "Not defined",
+			2: "One-chip color area sensor",
+			3: "Two-chip color area sensor",
+			4: "Three-chip color area sensor",
+			5: "Color sequential area sensor",
+			7: "Trilinear sensor",
+			8: "Color sequential linear sensor"
+		},
+		SceneCaptureType: {
+			0: "Standard",
+			1: "Landscape",
+			2: "Portrait",
+			3: "Night scene"
+		},
+		SceneType: {
+			1: "Directly photographed"
+		},
+		CustomRendered: {
+			0: "Normal process",
+			1: "Custom process"
+		},
+		WhiteBalance: {
+			0: "Auto white balance",
+			1: "Manual white balance"
+		},
+		GainControl: {
+			0: "None",
+			1: "Low gain up",
+			2: "High gain up",
+			3: "Low gain down",
+			4: "High gain down"
+		},
+		Contrast: {
+			0: "Normal",
+			1: "Soft",
+			2: "Hard"
+		},
+		Saturation: {
+			0: "Normal",
+			1: "Low saturation",
+			2: "High saturation"
+		},
+		Sharpness: {
+			0: "Normal",
+			1: "Soft",
+			2: "Hard"
+		},
+		SubjectDistanceRange: {
+			0: "Unknown",
+			1: "Macro",
+			2: "Close view",
+			3: "Distant view"
+		},
+		FileSource: {
+			3: "DSC"
+		},
+
+		Components: {
+			0: "",
+			1: "Y",
+			2: "Cb",
+			3: "Cr",
+			4: "R",
+			5: "G",
+			6: "B"
+		}
+	}
+	enableXmp() {
+		this.isXmpEnabled = true
+	}
+	disableXmp() {
+		this.isXmpEnabled = false;
+	}
+	/**
+	 * 获取图片数据
+	 * @param img 图片地址
+	 * @param callback 回调 返回图片数据
+	 * */
+	getData(img : any, callback : Function) {
+		// if (((self.Image && img instanceof self.Image) || (self.HTMLImageElement && img instanceof self.HTMLImageElement)) && !img.complete)
+		// 	return false;
+		let file : File = {
+			src: '',
+			exifdata: null,
+			iptcdata: null,
+			xmpdata: null,
+		}
+		if (isDataURI(img)) {
+			file.src = img
+		} else if (img.path) {
+			file.src = img.path
+		} else if (isString(img)) {
+			file.src = img
+		} else {
+			return false;
+		}
+
+
+		if (!imageHasData(file)) {
+			getImageData(file, callback);
+		} else {
+			if (callback) {
+				callback.call(file);
+			}
+		}
+		return true;
+	}
+	/**
+	 * 获取图片tag
+	 * @param img 图片数据
+	 * @param tag tag 类型
+	 * */
+	getTag(img : File, tag : string) {
+		if (!imageHasData(img)) return;
+		return img.exifdata[tag];
+	}
+	getIptcTag(img : File, tag : string) {
+		if (!imageHasData(img)) return;
+		return img.iptcdata[tag];
+	}
+	getAllTags(img : File) {
+		if (!imageHasData(img)) return {};
+		let a,
+			data = img.exifdata,
+			tags = {};
+		for (a in data) {
+			if (data.hasOwnProperty(a)) {
+				tags[a] = data[a];
+			}
+		}
+		return tags;
+	}
+	getAllIptcTags(img : File) {
+		if (!imageHasData(img)) return {};
+		let a,
+			data = img.iptcdata,
+			tags = {};
+		for (a in data) {
+			if (data.hasOwnProperty(a)) {
+				tags[a] = data[a];
+			}
+		}
+		return tags;
+	}
+	pretty(img : File) {
+		if (!imageHasData(img)) return "";
+		let a,
+			data = img.exifdata,
+			strPretty = "";
+		for (a in data) {
+			if (data.hasOwnProperty(a)) {
+				if (typeof data[a] == "object") {
+					if (data[a] instanceof Number) {
+						strPretty += a + " : " + data[a] + " [" + data[a].numerator + "/" + data[a]
+							.denominator + "]\r\n";
+					} else {
+						strPretty += a + " : [" + data[a].length + " values]\r\n";
+					}
+				} else {
+					strPretty += a + " : " + data[a] + "\r\n";
+				}
+			}
+		}
+		return strPretty;
+	}
+	readFromBinaryFile(file: ArrayBuffer) {
+		return findEXIFinJPEG(file);
+	}
+}
+
+export const exif = new EXIF()
+// export function getData(img, callback) {
+// 	const exif = new EXIF()
+// 	exif.getData(img, callback)
+// }
+
+// export default {getData}
+const ExifTags = exif.Tags
+const TiffTags = exif.TiffTags
+const IFD1Tags = exif.IFD1Tags
+const GPSTags = exif.GPSTags
+const StringValues = exif.StringValues
+
+
+function imageHasData(img : File) : boolean {
+	return !!(img.exifdata);
+}
+
+function objectURLToBlob(url : string, callback : Function) {
+	try {
+		const http = new XMLHttpRequest();
+		http.open("GET", url, true);
+		http.responseType = "blob";
+		http.onload = function (e) {
+			if (this.status == 200 || this.status === 0) {
+				callback(this.response);
+			}
+		};
+		http.send();
+	} catch (e) {
+		console.warn(e)
+	}
+}
+
+
+function getImageData(img : File, callback : Function) {
+	function handleBinaryFile(binFile: ArrayBuffer) {
+		const data = findEXIFinJPEG(binFile);
+		img.exifdata = data ?? {};
+		const iptcdata = findIPTCinJPEG(binFile);
+		img.iptcdata = iptcdata ?? {};
+		if (exif.isXmpEnabled) {
+			const xmpdata = findXMPinJPEG(binFile);
+			img.xmpdata = xmpdata ?? {};
+		}
+		if (callback) {
+			callback.call(img);
+		}
+	}
+
+	if (img.src) {
+		if (/^data\:/i.test(img.src)) { // Data URI
+			// var arrayBuffer = base64ToArrayBuffer(img.src);
+			handleBinaryFile(base64ToArrayBuffer(img.src));
+
+		} else if (/^blob\:/i.test(img.src) && typeof FileReader !== 'undefined') { // Object URL
+			var fileReader = new FileReader();
+			fileReader.onload = function (e) {
+				handleBinaryFile(e.target.result);
+			};
+			objectURLToBlob(img.src, function (blob : Blob) {
+				fileReader.readAsArrayBuffer(blob);
+			});
+		} else if (typeof XMLHttpRequest !== 'undefined') {
+			var http = new XMLHttpRequest();
+			http.onload = function () {
+				if (this.status == 200 || this.status === 0) {
+					handleBinaryFile(http.response);
+				} else {
+					throw "Could not load image";
+				}
+				http = null;
+			};
+			http.open("GET", img.src, true);
+			http.responseType = "arraybuffer";
+			http.send(null);
+		} else {
+			pathToBase64(img.src).then(res => {
+				handleBinaryFile(base64ToArrayBuffer(res));
+			})
+		}
+	} else if (typeof FileReader !== 'undefined' && self.FileReader && (img instanceof self.Blob || img instanceof self.File)) {
+		var fileReader = new FileReader();
+		fileReader.onload = function (e : any) {
+			if (exif.debug) console.log("Got file of length " + e.target.result.byteLength);
+			handleBinaryFile(e.target.result);
+		};
+
+		fileReader.readAsArrayBuffer(img);
+	}
+}
+
+function findEXIFinJPEG(file: ArrayBuffer) {
+	const dataView = new DataView(file);
+
+	if (exif.debug) console.log("Got file of length " + file.byteLength);
+	if ((dataView.getUint8(0) != 0xFF) || (dataView.getUint8(1) != 0xD8)) {
+		if (exif.debug) console.log("Not a valid JPEG");
+		return false; // not a valid jpeg
+	}
+
+	let offset = 2,
+		length = file.byteLength,
+		marker;
+
+	while (offset < length) {
+		if (dataView.getUint8(offset) != 0xFF) {
+			if (exif.debug) console.log("Not a valid marker at offset " + offset + ", found: " + dataView.getUint8(
+				offset));
+			return false; // not a valid marker, something is wrong
+		}
+
+		marker = dataView.getUint8(offset + 1);
+		if (exif.debug) console.log(marker);
+
+		// we could implement handling for other markers here,
+		// but we're only looking for 0xFFE1 for EXIF data
+
+		if (marker == 225) {
+			if (exif.debug) console.log("Found 0xFFE1 marker");
+
+			return readEXIFData(dataView, offset + 4, dataView.getUint16(offset + 2) - 2);
+
+			// offset += 2 + file.getShortAt(offset+2, true);
+
+		} else {
+			offset += 2 + dataView.getUint16(offset + 2);
+		}
+
+	}
+
+}
+
+function findIPTCinJPEG(file: ArrayBuffer) {
+	const dataView = new DataView(file);
+
+	if (exif.debug) console.log("Got file of length " + file.byteLength);
+	if ((dataView.getUint8(0) != 0xFF) || (dataView.getUint8(1) != 0xD8)) {
+		if (exif.debug) console.log("Not a valid JPEG");
+		return false; // not a valid jpeg
+	}
+
+	let offset = 2,
+		length = file.byteLength;
+
+
+	const isFieldSegmentStart = function (dataView, offset: number) {
+		return (
+			dataView.getUint8(offset) === 0x38 &&
+			dataView.getUint8(offset + 1) === 0x42 &&
+			dataView.getUint8(offset + 2) === 0x49 &&
+			dataView.getUint8(offset + 3) === 0x4D &&
+			dataView.getUint8(offset + 4) === 0x04 &&
+			dataView.getUint8(offset + 5) === 0x04
+		);
+	};
+
+	while (offset < length) {
+
+		if (isFieldSegmentStart(dataView, offset)) {
+
+			// Get the length of the name header (which is padded to an even number of bytes)
+			var nameHeaderLength = dataView.getUint8(offset + 7);
+			if (nameHeaderLength % 2 !== 0) nameHeaderLength += 1;
+			// Check for pre photoshop 6 format
+			if (nameHeaderLength === 0) {
+				// Always 4
+				nameHeaderLength = 4;
+			}
+
+			var startOffset = offset + 8 + nameHeaderLength;
+			var sectionLength = dataView.getUint16(offset + 6 + nameHeaderLength);
+
+			return readIPTCData(file, startOffset, sectionLength);
+
+			break;
+
+		}
+
+
+		// Not the marker, continue searching
+		offset++;
+
+	}
+
+}
+
+const IptcFieldMap = {
+	0x78: 'caption',
+	0x6E: 'credit',
+	0x19: 'keywords',
+	0x37: 'dateCreated',
+	0x50: 'byline',
+	0x55: 'bylineTitle',
+	0x7A: 'captionWriter',
+	0x69: 'headline',
+	0x74: 'copyright',
+	0x0F: 'category'
+};
+
+function readIPTCData(file: ArrayBuffer, startOffset: number, sectionLength: number) {
+	const dataView = new DataView(file);
+	let data = {};
+	let fieldValue, fieldName, dataSize, segmentType, segmentSize;
+	let segmentStartPos = startOffset;
+	while (segmentStartPos < startOffset + sectionLength) {
+		if (dataView.getUint8(segmentStartPos) === 0x1C && dataView.getUint8(segmentStartPos + 1) === 0x02) {
+			segmentType = dataView.getUint8(segmentStartPos + 2);
+			if (segmentType in IptcFieldMap) {
+				dataSize = dataView.getInt16(segmentStartPos + 3);
+				segmentSize = dataSize + 5;
+				fieldName = IptcFieldMap[segmentType];
+				fieldValue = getStringFromDB(dataView, segmentStartPos + 5, dataSize);
+				// Check if we already stored a value with this name
+				if (data.hasOwnProperty(fieldName)) {
+					// Value already stored with this name, create multivalue field
+					if (data[fieldName] instanceof Array) {
+						data[fieldName].push(fieldValue);
+					} else {
+						data[fieldName] = [data[fieldName], fieldValue];
+					}
+				} else {
+					data[fieldName] = fieldValue;
+				}
+			}
+
+		}
+		segmentStartPos++;
+	}
+	return data;
+}
+
+function readTags(file: DataView, tiffStart: number, dirStart: number, strings: any[], bigEnd: number) {
+	let entries = file.getUint16(dirStart, !bigEnd),
+		tags = {},
+		entryOffset, tag;
+
+	for (let i = 0; i < entries; i++) {
+		entryOffset = dirStart + i * 12 + 2;
+		tag = strings[file.getUint16(entryOffset, !bigEnd)];
+		if (!tag && exif.debug) console.log("Unknown tag: " + file.getUint16(entryOffset, !bigEnd));
+		tags[tag] = readTagValue(file, entryOffset, tiffStart, dirStart, bigEnd);
+	}
+	return tags;
+}
+
+function readTagValue(file: DataView, entryOffset: number, tiffStart: number, dirStart: number, bigEnd: number) {
+	let type = file.getUint16(entryOffset + 2, !bigEnd),
+		numValues = file.getUint32(entryOffset + 4, !bigEnd),
+		valueOffset = file.getUint32(entryOffset + 8, !bigEnd) + tiffStart,
+		offset,
+		vals, val, n,
+		numerator, denominator;
+
+	switch (type) {
+		case 1: // byte, 8-bit unsigned int
+		case 7: // undefined, 8-bit byte, value depending on field
+			if (numValues == 1) {
+				return file.getUint8(entryOffset + 8, !bigEnd);
+			} else {
+				offset = numValues > 4 ? valueOffset : (entryOffset + 8);
+				vals = [];
+				for (n = 0; n < numValues; n++) {
+					vals[n] = file.getUint8(offset + n);
+				}
+				return vals;
+			}
+
+		case 2: // ascii, 8-bit byte
+			offset = numValues > 4 ? valueOffset : (entryOffset + 8);
+			return getStringFromDB(file, offset, numValues - 1);
+
+		case 3: // short, 16 bit int
+			if (numValues == 1) {
+				return file.getUint16(entryOffset + 8, !bigEnd);
+			} else {
+				offset = numValues > 2 ? valueOffset : (entryOffset + 8);
+				vals = [];
+				for (n = 0; n < numValues; n++) {
+					vals[n] = file.getUint16(offset + 2 * n, !bigEnd);
+				}
+				return vals;
+			}
+
+		case 4: // long, 32 bit int
+			if (numValues == 1) {
+				return file.getUint32(entryOffset + 8, !bigEnd);
+			} else {
+				vals = [];
+				for (n = 0; n < numValues; n++) {
+					vals[n] = file.getUint32(valueOffset + 4 * n, !bigEnd);
+				}
+				return vals;
+			}
+
+		case 5: // rational = two long values, first is numerator, second is denominator
+			if (numValues == 1) {
+				numerator = file.getUint32(valueOffset, !bigEnd);
+				denominator = file.getUint32(valueOffset + 4, !bigEnd);
+				val = new Number(numerator / denominator);
+				val.numerator = numerator;
+				val.denominator = denominator;
+				return val;
+			} else {
+				vals = [];
+				for (n = 0; n < numValues; n++) {
+					numerator = file.getUint32(valueOffset + 8 * n, !bigEnd);
+					denominator = file.getUint32(valueOffset + 4 + 8 * n, !bigEnd);
+					vals[n] = new Number(numerator / denominator);
+					vals[n].numerator = numerator;
+					vals[n].denominator = denominator;
+				}
+				return vals;
+			}
+
+		case 9: // slong, 32 bit signed int
+			if (numValues == 1) {
+				return file.getInt32(entryOffset + 8, !bigEnd);
+			} else {
+				vals = [];
+				for (n = 0; n < numValues; n++) {
+					vals[n] = file.getInt32(valueOffset + 4 * n, !bigEnd);
+				}
+				return vals;
+			}
+
+		case 10: // signed rational, two slongs, first is numerator, second is denominator
+			if (numValues == 1) {
+				return file.getInt32(valueOffset, !bigEnd) / file.getInt32(valueOffset + 4, !bigEnd);
+			} else {
+				vals = [];
+				for (n = 0; n < numValues; n++) {
+					vals[n] = file.getInt32(valueOffset + 8 * n, !bigEnd) / file.getInt32(valueOffset + 4 + 8 *
+						n, !bigEnd);
+				}
+				return vals;
+			}
+	}
+}
+/**
+	 * Given an IFD (Image File Directory) start offset
+	 * returns an offset to next IFD or 0 if it's the last IFD.
+	 */
+function getNextIFDOffset(dataView: DataView, dirStart: number, bigEnd: number) {
+	//the first 2bytes means the number of directory entries contains in this IFD
+	var entries = dataView.getUint16(dirStart, !bigEnd);
+
+	// After last directory entry, there is a 4bytes of data,
+	// it means an offset to next IFD.
+	// If its value is '0x00000000', it means this is the last IFD and there is no linked IFD.
+
+	return dataView.getUint32(dirStart + 2 + entries * 12, !bigEnd); // each entry is 12 bytes long
+}
+
+function readThumbnailImage(dataView: DataView, tiffStart: number, firstIFDOffset: number, bigEnd: number) {
+	// get the IFD1 offset
+	const IFD1OffsetPointer = getNextIFDOffset(dataView, tiffStart + firstIFDOffset, bigEnd);
+
+	if (!IFD1OffsetPointer) {
+		// console.log('******** IFD1Offset is empty, image thumb not found ********');
+		return {};
+	} else if (IFD1OffsetPointer > dataView.byteLength) { // this should not happen
+		// console.log('******** IFD1Offset is outside the bounds of the DataView ********');
+		return {};
+	}
+	// console.log('*******  thumbnail IFD offset (IFD1) is: %s', IFD1OffsetPointer);
+
+	let thumbTags : any = readTags(dataView, tiffStart, tiffStart + IFD1OffsetPointer, IFD1Tags, bigEnd)
+
+	// EXIF 2.3 specification for JPEG format thumbnail
+
+	// If the value of Compression(0x0103) Tag in IFD1 is '6', thumbnail image format is JPEG.
+	// Most of Exif image uses JPEG format for thumbnail. In that case, you can get offset of thumbnail
+	// by JpegIFOffset(0x0201) Tag in IFD1, size of thumbnail by JpegIFByteCount(0x0202) Tag.
+	// Data format is ordinary JPEG format, starts from 0xFFD8 and ends by 0xFFD9. It seems that
+	// JPEG format and 160x120pixels of size are recommended thumbnail format for Exif2.1 or later.
+
+	if (thumbTags['Compression'] && typeof Blob !== 'undefined') {
+		// console.log('Thumbnail image found!');
+
+		switch (thumbTags['Compression']) {
+			case 6:
+				// console.log('Thumbnail image format is JPEG');
+				if (thumbTags.JpegIFOffset && thumbTags.JpegIFByteCount) {
+					// extract the thumbnail
+					var tOffset = tiffStart + thumbTags.JpegIFOffset;
+					var tLength = thumbTags.JpegIFByteCount;
+					thumbTags['blob'] = new Blob([new Uint8Array(dataView.buffer, tOffset, tLength)], {
+						type: 'image/jpeg'
+					});
+				}
+				break;
+
+			case 1:
+				console.log("Thumbnail image format is TIFF, which is not implemented.");
+				break;
+			default:
+				console.log("Unknown thumbnail image format '%s'", thumbTags['Compression']);
+		}
+	} else if (thumbTags['PhotometricInterpretation'] == 2) {
+		console.log("Thumbnail image format is RGB, which is not implemented.");
+	}
+	return thumbTags;
+}
+
+function getStringFromDB(buffer: DataView, start: number, length: number) {
+	let outstr = "";
+	for (let n = start; n < start + length; n++) {
+		outstr += String.fromCharCode(buffer.getUint8(n));
+	}
+	return outstr;
+}
+
+function readEXIFData(file: DataView, start: number) {
+	if (getStringFromDB(file, start, 4) != "Exif") {
+		if (exif.debug) console.log("Not valid EXIF data! " + getStringFromDB(file, start, 4));
+		return false;
+	}
+
+	let bigEnd,
+		tags, tag,
+		exifData, gpsData,
+		tiffOffset = start + 6;
+
+	// test for TIFF validity and endianness
+	if (file.getUint16(tiffOffset) == 0x4949) {
+		bigEnd = false;
+	} else if (file.getUint16(tiffOffset) == 0x4D4D) {
+		bigEnd = true;
+	} else {
+		if (exif.debug) console.log("Not valid TIFF data! (no 0x4949 or 0x4D4D)");
+		return false;
+	}
+
+	if (file.getUint16(tiffOffset + 2, !bigEnd) != 0x002A) {
+		if (exif.debug) console.log("Not valid TIFF data! (no 0x002A)");
+		return false;
+	}
+
+	const firstIFDOffset = file.getUint32(tiffOffset + 4, !bigEnd);
+
+	if (firstIFDOffset < 0x00000008) {
+		if (exif.debug) console.log("Not valid TIFF data! (First offset less than 8)", file.getUint32(tiffOffset + 4,
+			!bigEnd));
+		return false;
+	}
+
+	tags = readTags(file, tiffOffset, tiffOffset + firstIFDOffset, TiffTags, bigEnd);
+
+	if (tags.ExifIFDPointer) {
+		exifData = readTags(file, tiffOffset, tiffOffset + tags.ExifIFDPointer, ExifTags, bigEnd);
+		for (tag in exifData) {
+			switch (tag) {
+				case "LightSource":
+				case "Flash":
+				case "MeteringMode":
+				case "ExposureProgram":
+				case "SensingMethod":
+				case "SceneCaptureType":
+				case "SceneType":
+				case "CustomRendered":
+				case "WhiteBalance":
+				case "GainControl":
+				case "Contrast":
+				case "Saturation":
+				case "Sharpness":
+				case "SubjectDistanceRange":
+				case "FileSource":
+					exifData[tag] = StringValues[tag][exifData[tag]];
+					break;
+
+				case "ExifVersion":
+				case "FlashpixVersion":
+					exifData[tag] = String.fromCharCode(exifData[tag][0], exifData[tag][1], exifData[tag][2],
+						exifData[tag][3]);
+					break;
+
+				case "ComponentsConfiguration":
+					exifData[tag] =
+						StringValues.Components[exifData[tag][0]] +
+						StringValues.Components[exifData[tag][1]] +
+						StringValues.Components[exifData[tag][2]] +
+						StringValues.Components[exifData[tag][3]];
+					break;
+			}
+			tags[tag] = exifData[tag];
+		}
+	}
+
+	if (tags.GPSInfoIFDPointer) {
+		gpsData = readTags(file, tiffOffset, tiffOffset + tags.GPSInfoIFDPointer, GPSTags, bigEnd);
+		for (tag in gpsData) {
+			switch (tag) {
+				case "GPSVersionID":
+					gpsData[tag] = gpsData[tag][0] +
+						"." + gpsData[tag][1] +
+						"." + gpsData[tag][2] +
+						"." + gpsData[tag][3];
+					break;
+			}
+			tags[tag] = gpsData[tag];
+		}
+	}
+
+	// extract thumbnail
+	tags['thumbnail'] = readThumbnailImage(file, tiffOffset, firstIFDOffset, bigEnd);
+
+	return tags;
+}
+
+function findXMPinJPEG(file: ArrayBuffer) {
+
+	if (!('DOMParser' in self)) {
+		// console.warn('XML parsing not supported without DOMParser');
+		return;
+	}
+	const dataView = new DataView(file);
+
+	if (exif.debug) console.log("Got file of length " + file.byteLength);
+	if ((dataView.getUint8(0) != 0xFF) || (dataView.getUint8(1) != 0xD8)) {
+		if (exif.debug) console.log("Not a valid JPEG");
+		return false; // not a valid jpeg
+	}
+
+	let offset = 2,
+		length = file.byteLength,
+		dom = new DOMParser();
+
+	while (offset < (length - 4)) {
+		if (getStringFromDB(dataView, offset, 4) == "http") {
+			const startOffset = offset - 1;
+			const sectionLength = dataView.getUint16(offset - 2) - 1;
+			let xmpString = getStringFromDB(dataView, startOffset, sectionLength)
+			const xmpEndIndex = xmpString.indexOf('xmpmeta>') + 8;
+			xmpString = xmpString.substring(xmpString.indexOf('<x:xmpmeta'), xmpEndIndex);
+
+			const indexOfXmp = xmpString.indexOf('x:xmpmeta') + 10
+			//Many custom written programs embed xmp/xml without any namespace. Following are some of them.
+			//Without these namespaces, XML is thought to be invalid by parsers
+			xmpString = xmpString.slice(0, indexOfXmp) +
+				'xmlns:Iptc4xmpCore="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/" ' +
+				'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ' +
+				'xmlns:tiff="http://ns.adobe.com/tiff/1.0/" ' +
+				'xmlns:plus="http://schemas.android.com/apk/lib/com.google.android.gms.plus" ' +
+				'xmlns:ext="http://www.gettyimages.com/xsltExtension/1.0" ' +
+				'xmlns:exif="http://ns.adobe.com/exif/1.0/" ' +
+				'xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#" ' +
+				'xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#" ' +
+				'xmlns:crs="http://ns.adobe.com/camera-raw-settings/1.0/" ' +
+				'xmlns:xapGImg="http://ns.adobe.com/xap/1.0/g/img/" ' +
+				'xmlns:Iptc4xmpExt="http://iptc.org/std/Iptc4xmpExt/2008-02-29/" ' +
+				xmpString.slice(indexOfXmp)
+
+			var domDocument = dom.parseFromString(xmpString, 'text/xml');
+			return xml2Object(domDocument);
+		} else {
+			offset++;
+		}
+	}
+}
+
+
+function xml2json(xml: any) {
+	var json = {};
+
+	if (xml.nodeType == 1) { // element node
+		if (xml.attributes.length > 0) {
+			json['@attributes'] = {};
+			for (var j = 0; j < xml.attributes.length; j++) {
+				var attribute = xml.attributes.item(j);
+				json['@attributes'][attribute.nodeName] = attribute.nodeValue;
+			}
+		}
+	} else if (xml.nodeType == 3) { // text node
+		return xml.nodeValue;
+	}
+
+	// deal with children
+	if (xml.hasChildNodes()) {
+		for (var i = 0; i < xml.childNodes.length; i++) {
+			var child = xml.childNodes.item(i);
+			var nodeName = child.nodeName;
+			if (json[nodeName] == null) {
+				json[nodeName] = xml2json(child);
+			} else {
+				if (json[nodeName].push == null) {
+					var old = json[nodeName];
+					json[nodeName] = [];
+					json[nodeName].push(old);
+				}
+				json[nodeName].push(xml2json(child));
+			}
+		}
+	}
+
+	return json;
+}
+
+function xml2Object(xml: any) {
+	try {
+		var obj = {};
+		if (xml.children.length > 0) {
+			for (var i = 0; i < xml.children.length; i++) {
+				var item = xml.children.item(i);
+				var attributes = item.attributes;
+				for (var idx in attributes) {
+					var itemAtt = attributes[idx];
+					var dataKey = itemAtt.nodeName;
+					var dataValue = itemAtt.nodeValue;
+
+					if (dataKey !== undefined) {
+						obj[dataKey] = dataValue;
+					}
+				}
+				var nodeName = item.nodeName;
+
+				if (typeof (obj[nodeName]) == "undefined") {
+					obj[nodeName] = xml2json(item);
+				} else {
+					if (typeof (obj[nodeName].push) == "undefined") {
+						var old = obj[nodeName];
+
+						obj[nodeName] = [];
+						obj[nodeName].push(old);
+					}
+					obj[nodeName].push(xml2json(item));
+				}
+			}
+		} else {
+			obj = xml.textContent;
+		}
+		return obj;
+	} catch (e) {
+		console.log(e.message);
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/fillZero/index.ts b/uni_modules/lime-shared/fillZero/index.ts
new file mode 100644
index 0000000..9952c45
--- /dev/null
+++ b/uni_modules/lime-shared/fillZero/index.ts
@@ -0,0 +1,11 @@
+// @ts-nocheck
+/**
+ * 在数字前填充零，返回字符串形式的结果
+ * @param number 要填充零的数字
+ * @param length 填充零后的字符串长度，默认为2
+ * @returns 填充零后的字符串
+ */
+export function fillZero(number: number, length: number = 2): string {
+  // 将数字转换为字符串，然后使用 padStart 方法填充零到指定长度
+  return `${number}`.padStart(length, '0');
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/floatAdd/index.ts b/uni_modules/lime-shared/floatAdd/index.ts
new file mode 100644
index 0000000..aad3929
--- /dev/null
+++ b/uni_modules/lime-shared/floatAdd/index.ts
@@ -0,0 +1,36 @@
+import { isNumber } from '../isNumber'
+/**
+ * 返回两个浮点数相加的结果
+ * @param num1 第一个浮点数
+ * @param num2 第二个浮点数
+ * @returns 两个浮点数的相加结果
+ */
+export function floatAdd(num1 : number, num2 : number) : number {
+	// 检查 num1 和 num2 是否为数字类型
+	if (!(isNumber(num1) || isNumber(num2))) {
+		console.warn('Please pass in the number type');
+		return NaN;
+	}
+
+	let r1 : number, r2 : number, m : number;
+
+	try {
+		// 获取 num1 小数点后的位数
+		r1 = num1.toString().split('.')[1].length;
+	} catch (error) {
+		r1 = 0;
+	}
+
+	try {
+		// 获取 num2 小数点后的位数
+		r2 = num2.toString().split('.')[1].length;
+	} catch (error) {
+		r2 = 0;
+	}
+
+	// 计算需要扩大的倍数
+	m = Math.pow(10, Math.max(r1, r2));
+
+	// 返回相加结果
+	return (num1 * m + num2 * m) / m;
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/floatDiv/index.ts b/uni_modules/lime-shared/floatDiv/index.ts
new file mode 100644
index 0000000..195d4ab
--- /dev/null
+++ b/uni_modules/lime-shared/floatDiv/index.ts
@@ -0,0 +1,45 @@
+import { floatMul } from '../floatMul';
+import { isNumber } from '../isNumber';
+
+/**
+ * 除法函数，用于处理浮点数除法并保持精度。
+ * @param {number} num1 - 被除数。
+ * @param {number} num2 - 除数。
+ * @returns {number} 除法运算的结果，保留正确的精度。
+ */
+export function floatDiv(num1:number, num2:number):number {
+  // 如果传入的不是数字类型，则打印警告并返回NaN
+  if (!isNumber(num1) || !isNumber(num2)) {
+    console.warn('请传入数字类型');
+    return NaN;
+  }
+
+  let m1 = 0, // 被除数小数点后的位数
+    m2 = 0, // 除数小数点后的位数
+    s1 = num1.toString(), // 将被除数转换为字符串
+    s2 = num2.toString(); // 将除数转换为字符串
+
+  // 计算被除数小数点后的位数
+  try {
+    m1 += s1.split('.')[1].length;
+  } catch (error) {}
+
+  // 计算除数小数点后的位数
+  try {
+    m2 += s2.split('.')[1].length;
+  } catch (error) {}
+
+  // 进行除法运算并处理小数点后的位数，使用之前定义的乘法函数保持精度
+  // #ifdef APP-ANDROID
+  return floatMul(
+    parseFloat(s1.replace('.', '')) / parseFloat(s2.replace('.', '')),
+    Math.pow(10, m2 - m1),
+  );
+  // #endif
+  // #ifndef APP-ANDROID
+  return floatMul(
+    Number(s1.replace('.', '')) / Number(s2.replace('.', '')),
+    Math.pow(10, m2 - m1),
+  );
+  // #endif
+}
diff --git a/uni_modules/lime-shared/floatMul/index.ts b/uni_modules/lime-shared/floatMul/index.ts
new file mode 100644
index 0000000..51a867e
--- /dev/null
+++ b/uni_modules/lime-shared/floatMul/index.ts
@@ -0,0 +1,44 @@
+// @ts-nocheck
+import {isNumber} from '../isNumber';
+// #ifdef APP-ANDROID
+import BigDecimal from 'java.math.BigDecimal'
+// import BigDecimal from 'java.math.BigDecimal'
+// import StringBuilder from 'java.lang.StringBuilder'
+// import java.math.BigDecimal;
+// #endif
+
+/**
+ * 乘法函数，用于处理浮点数乘法并保持精度。
+ * @param {number} num1 - 第一个乘数。
+ * @param {number} num2 - 第二个乘数。
+ * @returns {number} 乘法运算的结果，保留正确的精度。
+ */
+export function floatMul(num1 : number, num2 : number) : number {
+	if (!(isNumber(num1) || isNumber(num2))) {
+		console.warn('Please pass in the number type');
+		return NaN;
+	}
+	let m = 0;
+	// #ifdef APP-ANDROID
+	let	s1 = BigDecimal.valueOf(num1.toDouble()).toPlainString(); //new UTSNumber(num1).toString() // //`${num1.toFloat()}`// num1.toString(),
+	let	s2 = BigDecimal.valueOf(num2.toDouble()).toPlainString(); //new UTSNumber(num2).toString() //`${num2.toFloat()}`//.toString();
+	// #endif
+	// #ifndef APP-ANDROID
+	let	s1:string = `${num1}`// num1.toString(),
+	let	s2:string = `${num2}`//.toString();
+	// #endif
+	
+	try {
+		m += s1.split('.')[1].length;
+	} catch (error) { }
+	try {
+		m += s2.split('.')[1].length;
+	} catch (error) { }
+	
+	// #ifdef APP-ANDROID
+	return parseFloat(s1.replace('.', '')) * parseFloat(s2.replace('.', '')) / Math.pow(10, m);
+	// #endif
+	// #ifndef APP-ANDROID
+	return Number(s1.replace('.', '')) * Number(s2.replace('.', '')) / Math.pow(10, m);
+	// #endif
+}
diff --git a/uni_modules/lime-shared/floatSub/index.ts b/uni_modules/lime-shared/floatSub/index.ts
new file mode 100644
index 0000000..9bc25cb
--- /dev/null
+++ b/uni_modules/lime-shared/floatSub/index.ts
@@ -0,0 +1,32 @@
+import { isNumber } from '../isNumber';
+/**
+ * 减法函数，用于处理浮点数减法并保持精度。
+ * @param {number} num1 - 被减数。
+ * @param {number} num2 - 减数。
+ * @returns {number} 减法运算的结果，保留正确的精度。
+ */
+export function floatSub(num1 : number, num2 : number) : number {
+	if (!(isNumber(num1) || isNumber(num2))) {
+		console.warn('Please pass in the number type');
+		return NaN;
+	}
+	let r1:number, r2:number, m:number, n:number;
+	try {
+		r1 = num1.toString().split('.')[1].length;
+	} catch (error) {
+		r1 = 0;
+	}
+	try {
+		r2 = num2.toString().split('.')[1].length;
+	} catch (error) {
+		r2 = 0;
+	}
+	m = Math.pow(10, Math.max(r1, r2));
+	n = r1 >= r2 ? r1 : r2;
+	// #ifndef APP-ANDROID
+	return Number(((num1 * m - num2 * m) / m).toFixed(n));
+	// #endif
+	// #ifdef APP-ANDROID
+	return parseFloat(((num1 * m - num2 * m) / m).toFixed(n));
+	// #endif
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/getClassStr/index.ts b/uni_modules/lime-shared/getClassStr/index.ts
new file mode 100644
index 0000000..34a26d2
--- /dev/null
+++ b/uni_modules/lime-shared/getClassStr/index.ts
@@ -0,0 +1,53 @@
+// @ts-nocheck
+
+// #ifdef UNI-APP-X && APP
+import { isNumber } from '../isNumber'
+import { isString } from '../isString'
+import { isDef } from '../isDef'
+// #endif
+
+/**
+ * 获取对象的类名字符串
+ * @param obj - 需要处理的对象
+ * @returns 由对象属性作为类名组成的字符串
+ */
+export function getClassStr<T>(obj : T) : string {
+	let classNames : string[] = [];
+	// #ifdef APP-ANDROID
+	if (obj instanceof UTSJSONObject) {
+		(obj as UTSJSONObject).toMap().forEach((value, key) => {
+			if (isDef(value)) {
+				if (isNumber(value)) {
+					classNames.push(key);
+				}
+				if (isString(value) && value !== '') {
+					classNames.push(key);
+				}
+				if (typeof value == 'boolean' && (value as boolean)) {
+					classNames.push(key);
+				}
+			}
+		})
+	} 
+	// #endif
+	// #ifndef APP-ANDROID
+	// 遍历对象的属性
+	for (let key in obj) {
+		// 检查属性确实属于对象自身且其值为true
+		if ((obj as any).hasOwnProperty(key) && obj[key]) {
+			// 将属性名添加到类名数组中
+			classNames.push(key);
+		}
+	}
+	// #endif
+
+
+	// 将类名数组用空格连接成字符串并返回
+	return classNames.join(' ');
+}
+
+
+// 示例
+// const obj = { foo: true, bar: false, baz: true };
+// const classNameStr = getClassStr(obj);
+// console.log(classNameStr); // 输出: "foo baz"
\ No newline at end of file
diff --git a/uni_modules/lime-shared/getCurrentPage/index.ts b/uni_modules/lime-shared/getCurrentPage/index.ts
new file mode 100644
index 0000000..eaf4523
--- /dev/null
+++ b/uni_modules/lime-shared/getCurrentPage/index.ts
@@ -0,0 +1,11 @@
+// @ts-nocheck
+// #ifndef UNI-APP-X && APP
+// export * from './vue.ts'
+export { getCurrentPage } from './vue.ts'
+// #endif
+
+
+// #ifdef UNI-APP-X && APP
+// export * from './uvue.uts'
+export { getCurrentPage } from './uvue.uts'
+// #endif
diff --git a/uni_modules/lime-shared/getCurrentPage/uvue.uts b/uni_modules/lime-shared/getCurrentPage/uvue.uts
new file mode 100644
index 0000000..9e96d2b
--- /dev/null
+++ b/uni_modules/lime-shared/getCurrentPage/uvue.uts
@@ -0,0 +1,5 @@
+// @ts-nocheck
+export const getCurrentPage = ():Page => {
+  const pages = getCurrentPages();
+  return pages[pages.length - 1]
+};
\ No newline at end of file
diff --git a/uni_modules/lime-shared/getCurrentPage/vue.ts b/uni_modules/lime-shared/getCurrentPage/vue.ts
new file mode 100644
index 0000000..79ecac8
--- /dev/null
+++ b/uni_modules/lime-shared/getCurrentPage/vue.ts
@@ -0,0 +1,6 @@
+// @ts-nocheck
+/** 获取当前页 */
+export const getCurrentPage = () => {
+  const pages = getCurrentPages();
+  return pages[pages.length - 1] //as T & WechatMiniprogram.Page.TrivialInstance;
+};
\ No newline at end of file
diff --git a/uni_modules/lime-shared/getLocalFilePath/index.ts b/uni_modules/lime-shared/getLocalFilePath/index.ts
new file mode 100644
index 0000000..c496a07
--- /dev/null
+++ b/uni_modules/lime-shared/getLocalFilePath/index.ts
@@ -0,0 +1,62 @@
+// @ts-nocheck
+// #ifdef APP-NVUE  || APP-VUE
+export const getLocalFilePath = (path : string) => {
+	if (typeof plus == 'undefined') return path
+	if (/^(_www|_doc|_documents|_downloads|file:\/\/|\/storage\/emulated\/0\/)/.test(path)) return path
+	if (/^\//.test(path)) {
+		const localFilePath = plus.io.convertAbsoluteFileSystem(path)
+		if (localFilePath !== path) {
+			return localFilePath
+		} else {
+			path = path.slice(1)
+		}
+	}
+	return '_www/' + path
+}
+// #endif
+
+
+// #ifdef UNI-APP-X && APP
+export { getResourcePath as getLocalFilePath } from '@/uni_modules/lime-file-utils'
+// export const getLocalFilePath = (path : string) : string => {
+// 	let uri = path
+// 	if (uri.startsWith("http") || uri.startsWith("<svg") || uri.startsWith("data:image/svg+xml")) {
+// 		return uri
+// 	}
+// 	if (uri.startsWith("file://")) {
+// 		uri = uri.substring("file://".length)
+// 	} else if (uri.startsWith("unifile://")) {
+// 		uri = UTSAndroid.convert2AbsFullPath(uri)
+// 	} else {
+// 		uri = UTSAndroid.convert2AbsFullPath(uri)
+// 		if (uri.startsWith("/android_asset/")) {
+// 			uri = uri.replace("/android_asset/", "")
+// 		}
+// 	}
+// 	if (new File(uri).exists()) {
+// 		return uri
+// 	} else {
+// 		return null
+// 	}
+// 	// return UTSAndroid.convert2AbsFullPath(path)
+// }
+// #endif
+// #ifdef APP-IOS
+// export const getLocalFilePath = (path : string) : string => {
+// 	try {
+// 		let uri = path
+// 		if (uri.startsWith("http") || uri.startsWith("<svg") || uri.startsWith("data:image/svg+xml")) {
+// 			return uri
+// 		}
+// 		if (uri.startsWith("file://")) {
+// 			return uri.substring("file://".length)
+// 		} else if (path.startsWith("/var/")) {
+// 			return path
+// 		}
+// 		return UTSiOS.getResourcePath(path)
+// 	} catch (e) {
+// 		return null
+// 	}
+// 	// return UTSiOS.getResourcePath(path)
+// }
+// #endif
diff --git a/uni_modules/lime-shared/getRect/index.ts b/uni_modules/lime-shared/getRect/index.ts
new file mode 100644
index 0000000..42556d7
--- /dev/null
+++ b/uni_modules/lime-shared/getRect/index.ts
@@ -0,0 +1,138 @@
+// @ts-nocheck
+// #ifdef UNI-APP-X && APP
+// export * from './uvue.uts'
+export { getRect, getAllRect } from './uvue.uts'
+// #endif
+
+
+// #ifndef UNI-APP-X && APP
+// export * from './vue.ts'
+export { getRect, getAllRect } from './vue.ts'
+// #endif
+
+
+
+/**
+ * 获取视口滚动条位置信息
+ */
+export function getViewportScrollInfo() : Promise<any> {
+	return new Promise(resolve => {
+		uni.createSelectorQuery()
+			.selectViewport()
+			.scrollOffset((res) => {
+				resolve(res);
+			}).exec();
+	})
+}
+
+/**
+```
+                      page
+                     ╱
+    ╭───────────────╮    viewport
+  ╭─│─ ─ ─ ─ ─ ─ ─ ─│─╮ ╱
+  │ │ ╭───────────╮ │ │
+  │ │ │  element  │ │ │
+  │ │ ╰───────────╯ │ │
+  ╰─│─ ─ ─ ─ ─ ─ ─ ─│─╯
+    │               │
+    │               │
+    ╰───────────────╯
+```
+
+# 参数
+- viewportHeight: viewport 高度
+- viewportScrollTop: viewport 垂直滚动值
+- elementHeight: element 高度
+- elementOffsetTop: element 距离页面顶部距离
+
+# 选项
+- position: element 在视窗中的位置(start, center, end, nearest)
+- startOffset: element 距离视窗顶部的偏移量
+- endOffset: element 距离视窗底部的偏移量
+
+# 结果值
+- viewportScrollTop: viewport 新的垂直滚动值
+
+*/
+
+export type ScrollIntoViewOptions = {
+	/** 元素顶部需要保留的缓冲距离（默认 0） */
+	startOffset ?: number;
+	/** 元素底部需要保留的缓冲距离（默认 0） */
+	endOffset ?: number;
+	/** 滚动对齐方式：start/center/end/nearest（默认 nearest） */
+	position ?: 'start' | 'center' | 'end' | 'nearest';
+}
+
+/**
+ * 计算元素需要滚动到可视区域的目标滚动位置
+ * @param viewportHeight 视口高度（像素）
+ * @param viewportScrollTop 当前滚动位置（像素）
+ * @param elementHeight 元素高度（像素）
+ * @param elementOffsetTop 元素相对于父容器顶部的偏移量（像素）
+ * @param options 配置选项
+ * @returns 计算后的目标滚动位置（像素）
+ *
+ * @example
+ * // 示例：将元素滚动到视口顶部对齐
+ * const scrollTop = getScrollIntoViewValue(
+ *   500,  // 视口高度
+ *   200,  // 当前滚动位置
+ *   100,  // 元素高度
+ *   300,  // 元素偏移量
+ *   { position: 'start' }
+ * );
+ */
+export function getScrollIntoViewValue(
+	viewportHeight : number,
+	viewportScrollTop : number,
+	elementHeight : number,
+	elementOffsetTop : number,
+	options : ScrollIntoViewOptions = {}
+) : number {
+	let { startOffset = 0, endOffset = 0, position = 'nearest'} = options;
+
+	// 计算元素相对于视口的上下偏移量
+	const elementToViewportTopOffset = elementOffsetTop - viewportScrollTop - startOffset;
+	const elementToViewportBottomOffset =
+		elementOffsetTop +
+		elementHeight -
+		viewportScrollTop -
+		viewportHeight +
+		endOffset;
+
+	// 处理 nearest 模式，自动选择最近边缘
+	if (position == 'nearest') {
+		if (elementToViewportTopOffset >= 0 && elementToViewportBottomOffset <= 0) {
+			return viewportScrollTop;
+		}
+		position =
+			Math.abs(elementToViewportTopOffset) > Math.abs(elementToViewportBottomOffset)
+				? 'end'
+				: 'start';
+	}
+
+	// 根据不同的对齐位置计算目标滚动位置
+	let nextScrollTop = 0;
+	switch (position) {
+		case 'start':
+			// 顶部对齐：元素顶部对齐视口顶部（考虑顶部缓冲）
+			nextScrollTop = elementOffsetTop - startOffset;
+			break;
+		case 'center':
+			// 居中对齐：元素中心对齐视口中心（考虑上下缓冲）
+			nextScrollTop =
+				elementOffsetTop -
+				(viewportHeight - elementHeight - endOffset - startOffset) / 2 +
+				startOffset;
+			break;
+		case 'end':
+			// 底部对齐：元素底部对齐视口底部（考虑底部缓冲）
+			nextScrollTop =
+				elementOffsetTop + elementHeight - viewportHeight + endOffset;
+			break;
+	}
+
+	return nextScrollTop;
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/getRect/uvue.uts b/uni_modules/lime-shared/getRect/uvue.uts
new file mode 100644
index 0000000..05f16ee
--- /dev/null
+++ b/uni_modules/lime-shared/getRect/uvue.uts
@@ -0,0 +1,17 @@
+// @ts-nocheck
+export function getRect(selector : string, context: ComponentPublicInstance):Promise<NodeInfo> {
+	return new Promise((resolve)=>{
+		uni.createSelectorQuery().in(context).select(selector).boundingClientRect(res =>{
+			resolve(res as NodeInfo)
+		}).exec();
+	})
+}
+
+export function getAllRect(selector : string, context: ComponentPublicInstance):Promise<NodeInfo[]> {
+	return new Promise((resolve)=>{
+		uni.createSelectorQuery().in(context).selectAll(selector).boundingClientRect(res =>{
+			resolve(res as NodeInfo[])
+		}).exec();
+	})
+}
+
diff --git a/uni_modules/lime-shared/getRect/vue.ts b/uni_modules/lime-shared/getRect/vue.ts
new file mode 100644
index 0000000..e44b60e
--- /dev/null
+++ b/uni_modules/lime-shared/getRect/vue.ts
@@ -0,0 +1,117 @@
+// @ts-nocheck
+
+// #ifdef APP-NVUE
+// 当编译环境是 APP-NVUE 时，引入 uni.requireNativePlugin('dom')，具体插件用途未知
+const dom = uni.requireNativePlugin('dom')
+// #endif
+
+/** 
+ * 获取节点信息
+ * @param selector 选择器字符串
+ * @param context ComponentInternalInstance 对象
+ * @param node 是否获取node
+ * @returns 包含节点信息的 Promise 对象
+ */
+export function getRect(selector : string, context : ComponentInternalInstance|ComponentPublicInstance, node: boolean = false) {
+	// 之前是个对象，现在改成实例，防止旧版会报错
+	if(context== null) {
+		return Promise.reject('context is null')
+	}
+	if(context.context){
+		context = context.context
+	}
+	// #ifdef MP || VUE2
+	if (context.proxy) context = context.proxy
+	// #endif
+	return new Promise<UniNamespace.NodeInfo>((resolve, reject) => {
+		// #ifndef APP-NVUE
+		const dom = uni.createSelectorQuery().in(context).select(selector);
+		const result = (rect: UniNamespace.NodeInfo) => {
+			if (rect) {
+				resolve(rect)
+			} else {
+				reject('no rect')
+			}
+		}
+		
+		if (!node) {
+			dom.boundingClientRect(result).exec()
+		} else {
+			dom.fields({
+				node: true,
+				size: true,
+				rect: true
+			}, result).exec()
+		}
+		// #endif
+		// #ifdef APP-NVUE
+		const refs = context.refs || context.$refs
+		if (/#|\./.test(selector) && refs) {
+			selector = selector.replace(/#|\./, '')
+			if (refs[selector]) {
+				selector = refs[selector]
+				if(Array.isArray(selector)) {
+					selector = selector[0]
+				}
+			}
+		}
+		dom.getComponentRect(selector, (res) => {
+			if (res.size) {
+				resolve(res.size)
+			} else {
+				reject('no rect')
+			}
+		})
+		// #endif
+	});
+};
+
+
+export function getAllRect(selector : string, context: ComponentInternalInstance|ComponentPublicInstance, node:boolean = false) {
+	if(context== null) {
+		return Promise.reject('context is null')
+	}
+	// #ifdef MP || VUE2
+	if (context.proxy) context = context.proxy
+	// #endif
+	return new Promise<UniNamespace.NodeInfo>((resolve, reject) => {
+		// #ifndef APP-NVUE
+		const dom = uni.createSelectorQuery().in(context).selectAll(selector);
+		const result = (rect: UniNamespace.NodeInfo[]) => {
+			if (rect) {
+				resolve(rect)
+			} else {
+				reject('no rect')
+			}
+		}
+		if (!node) {
+			dom.boundingClientRect(result).exec()
+		} else {
+			dom.fields({
+				node: true,
+				size: true,
+				rect: true
+			}, result).exec()
+		}
+		// #endif
+		// #ifdef APP-NVUE
+		let { context } = options
+		if (/#|\./.test(selector) && context.refs) {
+			selector = selector.replace(/#|\./, '')
+			if (context.refs[selector]) {
+				selector = context.refs[selector]
+				if(Array.isArray(selector)) {
+					selector = selector[0]
+				}
+			}
+		}
+		dom.getComponentRect(selector, (res) => {
+			if (res.size) {
+				resolve([res.size])
+			} else {
+				reject('no rect')
+			}
+		})
+		// #endif
+	});
+};
\ No newline at end of file
diff --git a/uni_modules/lime-shared/getStyleStr/index.ts b/uni_modules/lime-shared/getStyleStr/index.ts
new file mode 100644
index 0000000..665941c
--- /dev/null
+++ b/uni_modules/lime-shared/getStyleStr/index.ts
@@ -0,0 +1,54 @@
+// @ts-nocheck
+// #ifndef UNI-APP-X && APP
+interface CSSProperties {
+	[key : string] : string | number | null
+}
+// #endif
+
+// #ifdef VUE3
+// #ifdef UNI-APP-X && APP
+type CSSProperties = UTSJSONObject
+// #endif
+// #endif
+/**
+ * 将字符串转换为带有连字符分隔的小写形式
+ * @param key - 要转换的字符串
+ * @returns 转换后的字符串
+ */
+export function toLowercaseSeparator(key : string):string {
+	return key.replace(/([A-Z])/g, '-$1').toLowerCase();
+}
+
+/**
+ * 获取样式对象对应的样式字符串
+ * @param style - CSS样式对象
+ * @returns 由非空有效样式属性键值对组成的字符串
+ */
+export function getStyleStr(style : CSSProperties) : string {
+	
+	// #ifdef UNI-APP-X && APP
+	let styleStr = '';
+	style.toMap().forEach((value, key) => {
+		if(value !== null && value != '') {
+			styleStr += `${toLowercaseSeparator(key as string)}: ${value};`
+		}
+	})
+	return styleStr
+	// #endif
+	// #ifndef UNI-APP-X && APP
+	return Object.keys(style)
+		.filter(
+			(key) => 
+				style[key] !== undefined && 
+				style[key] !== null && 
+				style[key] !== '')
+		.map((key : string) => `${toLowercaseSeparator(key)}: ${style[key]};`)
+		.join(' ');
+	// #endif
+}
+
+// 示例
+// const style = { color: 'red', fontSize: '16px', backgroundColor: '', border: null };
+// const styleStr = getStyleStr(style);
+// console.log(styleStr);
+// 输出: "color: red; font-size: 16px;"
\ No newline at end of file
diff --git a/uni_modules/lime-shared/guid/index.ts b/uni_modules/lime-shared/guid/index.ts
new file mode 100644
index 0000000..675b250
--- /dev/null
+++ b/uni_modules/lime-shared/guid/index.ts
@@ -0,0 +1,28 @@
+/**
+ * 生成指定长度的伪随机字符串，通常用作唯一标识符（非标准GUID）
+ * 
+ * 此函数使用Math.random()生成基于36进制（数字+小写字母）的随机字符串。当长度超过11位时，
+ * 会通过递归拼接多个随机段实现。注意：该方法生成的并非标准GUID/UUID，不适合高安全性场景。
+ * 
+ * @param {number} [len=32] - 要生成的字符串长度，默认32位
+ * @returns {string} 生成的伪随机字符串，包含0-9和a-z字符
+ * 
+ * @example
+ * guid();    // 返回32位字符串，例如"3zyf6a5f3kb4ayy9jq9v1a70z0qdm0bk"
+ * guid(5);   // 返回5位字符串，例如"kf3a9"
+ * guid(20);  // 返回20位字符串，由两段随机字符串拼接而成
+ * 
+ * @note
+ * 1. 由于使用Math.random()，随机性存在安全缺陷，不适用于密码学用途
+ * 2. 当长度>11时采用递归拼接，可能略微影响性能（在极端大长度情况下）
+ * 3. 字符串补全时使用'0'填充，可能略微降低末尾字符的随机性
+ */
+export function guid(len:number = 32):string {
+	// crypto.randomUUID();
+	return len <= 11 
+		? Math.random()
+			.toString(36)
+			.substring(2, 2 + len)
+			.padEnd(len, '0')
+		: guid(11) + guid(len - 11);
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/hasOwn/index.ts b/uni_modules/lime-shared/hasOwn/index.ts
new file mode 100644
index 0000000..4c665ca
--- /dev/null
+++ b/uni_modules/lime-shared/hasOwn/index.ts
@@ -0,0 +1,11 @@
+// @ts-nocheck
+// #ifdef UNI-APP-X && APP
+// export * from './uvue.uts'
+export { hasOwn } from './uvue.uts'
+// #endif
+
+
+// #ifndef UNI-APP-X && APP
+// export * from './vue.ts'
+export { hasOwn } from './vue.ts'
+// #endif
\ No newline at end of file
diff --git a/uni_modules/lime-shared/hasOwn/uvue.uts b/uni_modules/lime-shared/hasOwn/uvue.uts
new file mode 100644
index 0000000..553ccdd
--- /dev/null
+++ b/uni_modules/lime-shared/hasOwn/uvue.uts
@@ -0,0 +1,43 @@
+// @ts-nocheck
+/**
+ * 检查对象或数组是否具有指定的属性或键
+ * @param obj 要检查的对象或数组
+ * @param key 指定的属性或键
+ * @returns 如果对象或数组具有指定的属性或键，则返回true；否则返回false
+ */
+function hasOwn(obj: UTSJSONObject, key: string): boolean
+function hasOwn(obj: Map<string, unknown>, key: string): boolean
+function hasOwn(obj: any, key: string): boolean {
+  if(obj instanceof UTSJSONObject){
+	 return obj[key] != null
+  }
+  if(obj instanceof Map<string, unknown>){
+  	 return (obj as Map<string, unknown>).has(key)
+  }
+  if(typeof obj == 'object') {
+	const obj2 = {...toRaw(obj)}
+	return obj2[key] != null
+  }
+  return false
+}
+export {
+	hasOwn
+}
+// 示例
+// const obj = { name: 'John', age: 30 };
+
+// if (hasOwn(obj, 'name')) {
+//   console.log("对象具有 'name' 属性");
+// } else {
+//   console.log("对象不具有 'name' 属性");
+// }
+// // 输出: 对象具有 'name' 属性
+
+// const arr = [1, 2, 3];
+
+// if (hasOwn(arr, 'length')) {
+//   console.log("数组具有 'length' 属性");
+// } else {
+//   console.log("数组不具有 'length' 属性");
+// }
+// 输出: 数组具有 'length' 属性
\ No newline at end of file
diff --git a/uni_modules/lime-shared/hasOwn/vue.ts b/uni_modules/lime-shared/hasOwn/vue.ts
new file mode 100644
index 0000000..7317879
--- /dev/null
+++ b/uni_modules/lime-shared/hasOwn/vue.ts
@@ -0,0 +1,30 @@
+// @ts-nocheck
+const hasOwnProperty = Object.prototype.hasOwnProperty
+/**
+ * 检查对象或数组是否具有指定的属性或键
+ * @param obj 要检查的对象或数组
+ * @param key 指定的属性或键
+ * @returns 如果对象或数组具有指定的属性或键，则返回true；否则返回false
+ */
+export function hasOwn(obj: Object | Array<any>, key: string): boolean {
+  return hasOwnProperty.call(obj, key);
+}
+
+// 示例
+// const obj = { name: 'John', age: 30 };
+
+// if (hasOwn(obj, 'name')) {
+//   console.log("对象具有 'name' 属性");
+// } else {
+//   console.log("对象不具有 'name' 属性");
+// }
+// // 输出: 对象具有 'name' 属性
+
+// const arr = [1, 2, 3];
+
+// if (hasOwn(arr, 'length')) {
+//   console.log("数组具有 'length' 属性");
+// } else {
+//   console.log("数组不具有 'length' 属性");
+// }
+// 输出: 数组具有 'length' 属性
\ No newline at end of file
diff --git a/uni_modules/lime-shared/index.ts b/uni_modules/lime-shared/index.ts
new file mode 100644
index 0000000..2eb1d94
--- /dev/null
+++ b/uni_modules/lime-shared/index.ts
@@ -0,0 +1,43 @@
+// @ts-nocheck
+// validator
+// export * from './isString'
+// export * from './isNumber'
+// export * from './isNumeric'
+// export * from './isDef'
+// export * from './isFunction'
+// export * from './isObject'
+// export * from './isPromise'
+// export * from './isBase64'
+
+// export * from './hasOwn'
+
+// // 单位转换
+// export * from './addUnit'
+// export * from './unitConvert'
+// export * from './toNumber'
+
+// export * from './random'
+// export * from './range'
+// export * from './fillZero'
+
+// // image 
+// export * from './base64ToPath'
+// export * from './pathToBase64'
+// export * from './exif'
+
+// // canvas
+// export * from './canIUseCanvas2d'
+
+// // page
+// export * from './getCurrentPage'
+
+// // dom
+// export * from './getRect'
+// export * from './selectComponent'
+// export * from './createAnimation'
+
+// // delay
+// export * from './sleep'
+// export * from './debounce'
+// export * from './throttle'
+
diff --git a/uni_modules/lime-shared/isBase64/index.ts b/uni_modules/lime-shared/isBase64/index.ts
new file mode 100644
index 0000000..53e065d
--- /dev/null
+++ b/uni_modules/lime-shared/isBase64/index.ts
@@ -0,0 +1,23 @@
+// @ts-nocheck
+
+/**
+ * 判断一个字符串是否为Base64编码。
+ * Base64编码的字符串只包含A-Z、a-z、0-9、+、/ 和 = 这些字符。
+ * @param {string} str - 要检查的字符串。
+ * @returns {boolean} 如果字符串是Base64编码，返回true，否则返回false。
+ */
+export function isBase64(str: string): boolean {
+    const base64Regex = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/;
+    return base64Regex.test(str);
+}
+
+/**
+ * 判断一个字符串是否为Base64编码的data URI。
+ * Base64编码的data URI通常以"data:"开头，后面跟着MIME类型和编码信息，然后是Base64编码的数据。
+ * @param {string} str - 要检查的字符串。
+ * @returns {boolean} 如果字符串是Base64编码的data URI，返回true，否则返回false。
+ */
+export function isDataURI(str: string): boolean {
+    const dataUriRegex = /^data:([a-zA-Z]+\/[a-zA-Z0-9-+.]+)(;base64)?,([a-zA-Z0-9+/]+={0,2})$/;
+    return dataUriRegex.test(str);
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/isBoolean/index.ts b/uni_modules/lime-shared/isBoolean/index.ts
new file mode 100644
index 0000000..8816788
--- /dev/null
+++ b/uni_modules/lime-shared/isBoolean/index.ts
@@ -0,0 +1,24 @@
+/**
+ * 检查一个值是否为严格的布尔值（仅限 `true` 或 `false`）
+ * 
+ * @example
+ * isBoolean(true);   // true
+ * isBoolean(false);  // true
+ * isBoolean(0);      // false
+ * isBoolean(null);   // false
+ * 
+ * @param {unknown} value - 要检查的值
+ * @returns {value is boolean} 如果值是 `true` 或 `false` 则返回 `true`，否则返回 `false`
+ * 
+ * @description
+ * 此函数使用严格相等（`===`）检查，避免隐式类型转换。
+ * 注意：不适用于 `Boolean` 包装对象（如 `new Boolean(true)`）。
+ */
+export function isBoolean(value: any|null): boolean {
+	// #ifdef APP-ANDROID
+	return value == true || value == false
+	// #endif
+	// #ifndef APP-ANDROID
+	return value === true || value === false
+	// #endif
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/isBrowser/index.ts b/uni_modules/lime-shared/isBrowser/index.ts
new file mode 100644
index 0000000..6baee2b
--- /dev/null
+++ b/uni_modules/lime-shared/isBrowser/index.ts
@@ -0,0 +1,8 @@
+// @ts-nocheck
+// #ifdef WEB
+export const isBrowser = typeof window !== 'undefined';
+// #endif
+
+// #ifndef WEB
+export const isBrowser = false;
+// #endif
\ No newline at end of file
diff --git a/uni_modules/lime-shared/isByteLength/index.ts b/uni_modules/lime-shared/isByteLength/index.ts
new file mode 100644
index 0000000..73774d8
--- /dev/null
+++ b/uni_modules/lime-shared/isByteLength/index.ts
@@ -0,0 +1,86 @@
+// @ts-nocheck
+// import assertString from './util/assertString';
+
+/**
+ * 字节长度验证配置选项
+ */
+export type IsByteLengthOptions = {
+	/** 允许的最小字节长度 */
+	min ?: number;
+	/** 允许的最大字节长度 */
+	max ?: number;
+}
+
+/**
+ * 检查字符串字节长度是否在指定范围内
+ * @function
+ * @overload 使用配置对象
+ * @param str - 要检查的字符串
+ * @param options - 配置选项对象
+ * @returns 是否满足字节长度要求
+ *
+ * @overload 使用独立参数
+ * @param str - 要检查的字符串
+ * @param min - 最小字节长度
+ * @param max - 最大字节长度（可选）
+ * @returns 是否满足字节长度要求
+ *
+ * @example
+ * // 使用配置对象
+ * isByteLength('🇨🇳', { min: 4, max: 8 }); // true（unicode 国旗符号占 8 字节）
+ *
+ * @example
+ * // 旧式参数调用
+ * isByteLength('hello', 3, 7); // true（实际字节长度 5）
+ *
+ * @description
+ * 1. 使用 URL 编码计算字节长度（更准确处理多字节字符）
+ * 2. 同时支持两种参数格式：
+ *    - 配置对象格式 { min, max }
+ *    - 独立参数格式 (min, max)
+ * 3. 不传 max 参数时只验证最小长度
+ * 4. 严格空值处理，允许设置 0 值
+ */
+export function isByteLength(str : string, optionsOrMin ?: IsByteLengthOptions) : boolean;
+export function isByteLength(str : string, optionsOrMin ?: number) : boolean;
+export function isByteLength(str : string, optionsOrMin : number, maxParam : number | null) : boolean;
+export function isByteLength(
+	str : string,
+	optionsOrMin ?: IsByteLengthOptions | number,
+	maxParam : number | null = null
+) : boolean {
+	// assertString(str);
+
+	/** 最终计算的最小长度 */
+	let min: number;
+
+	/** 最终计算的最大长度 */
+	let max : number | null;
+
+	// 参数逻辑处理
+	if (optionsOrMin != null && typeof optionsOrMin == 'object') {
+		// 使用对象配置的情况
+		const options = optionsOrMin as IsByteLengthOptions;
+		min = Math.max(options.min ?? 0, 0);  // 确保最小值为正整数
+		max = options.max;
+	} else {
+		// 使用独立参数的情况
+		min = Math.max(
+			typeof optionsOrMin == 'number' ? optionsOrMin : 0,
+			0
+		);
+		max = maxParam;
+	}
+
+	// URL 编码后的字节长度计算
+	const encoded = encodeURI(str);
+	const len = (encoded?.split(/%..|./).length ?? 0) - 1;
+
+	// 执行验证逻辑
+	// #ifndef APP-ANDROID
+	return len >= min && (typeof max == 'undefined' || len <= (max ?? 0));
+	// #endif
+	// #ifdef APP-ANDROID
+	return len >= min && (max == null || len <= max);
+	// #endif
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/isDate/index.ts b/uni_modules/lime-shared/isDate/index.ts
new file mode 100644
index 0000000..899b942
--- /dev/null
+++ b/uni_modules/lime-shared/isDate/index.ts
@@ -0,0 +1,189 @@
+// @ts-nocheck
+
+/**
+ * 日期验证配置选项
+ */
+export type IsDateOptions = {
+	/** 日期格式字符串，默认 'YYYY/MM/DD' */
+	format ?: string;
+	/** 允许的分隔符数组，默认 ['/', '-'] */
+	delimiters ?: string[];
+	/** 是否严格匹配格式，默认 false */
+	strictMode ?: boolean;
+}
+
+/**
+ * 验证日期格式字符串是否合法
+ * @param format - 需要验证的格式字符串
+ * @returns 是否合法格式
+ */
+function isValidFormat(format : string) : boolean {
+	return /(^(y{4}|y{2})[年./-](m{1,2})[月./-](d{1,2}(日)?)$)|(^(m{1,2})[./-](d{1,2})[./-]((y{4}|y{2})$))|(^(d{1,2})[./-](m{1,2})[./-]((y{4}|y{2})$))/i.test(format);
+}
+
+/**
+ * 将日期部分和格式部分组合成键值对数组
+ * @param date - 分割后的日期部分数组
+ * @param format - 分割后的格式部分数组
+ * @returns 组合后的二维数组
+ */
+function zip(date : string[], format : string[]) : string[][] {
+	const zippedArr : string[][] = [];
+	const len = Math.max(date.length, format.length);
+
+	for (let i = 0; i < len; i++) {
+		const key = i < date.length ? date[i] : ''
+		const value = i < format.length ? format[i] : ''
+
+		zippedArr.push([key, value])
+	}
+
+	return zippedArr;
+}
+
+
+/** 验证日期对象 */
+function validateDateObject(date : Date, strictMode : boolean) : boolean {
+	// #ifndef APP-ANDROID
+	return !strictMode && Object.prototype.toString.call(date) === '[object Date]' && !isNaN(date.getTime());
+	// #endif
+	// #ifdef APP-ANDROID
+	return !strictMode && !isNaN(date.getTime())
+	// #endif
+}
+
+
+function escapeRegExp(str: string): string {
+	return str//.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function enhancedSplit(
+	str: string,
+	delimiters: string[]
+): string[] {
+	// 构建动态分隔符正则表达式
+	const escapedDelimiters = delimiters.map(d => escapeRegExp(d));
+	const pattern = new RegExp(
+		`[${escapedDelimiters.join('')}]+`, // 匹配任意允许的分隔符
+		'g'
+	);
+	
+	return str.split(pattern).filter(p => p != '');
+}
+
+/**
+ * 验证输入是否为有效日期
+ * @param input - 输入值，可以是字符串或 Date 对象
+ * @param options - 配置选项，可以是字符串（简写格式）或配置对象
+ * @returns 是否为有效日期
+ * 
+ * @example
+ * isDate('2023/12/31'); // true
+ * isDate(new Date()); // true
+ * isDate('02-29-2023', { strictMode: true }); // false（2023年不是闰年）
+ */
+export function isDate(input : Date, options ?: IsDateOptions) : boolean;
+export function isDate(input : string, options ?: string | IsDateOptions) : boolean;
+export function isDate(input : string | Date, options : string | IsDateOptions | null = null) : boolean {
+	// 处理参数重载：允许第二个参数直接传格式字符串
+	// Date对象验证
+
+
+	let format = 'YYYY/MM/DD'
+	let delimiters = ['/', '-']
+	let strictMode = false
+
+
+	if (options != null) {
+		if (typeof options == 'string') {
+			format = options as string
+		} else {
+			format = (options as IsDateOptions).format ?? format
+			delimiters = (options as IsDateOptions).delimiters ?? delimiters
+			strictMode = (options as IsDateOptions).strictMode ?? strictMode
+		}
+	}
+	if (input instanceof Date) {
+		return validateDateObject(input, strictMode);
+	}
+
+
+	// 字符串类型验证
+	if (!isValidFormat(format)) return false;
+	// 严格模式长度检查
+	if (strictMode && input.length != format.length) {
+		return false;
+	}
+	// 获取格式中的分隔符
+	const formatDelimiter = delimiters.find((d) : boolean => format.indexOf(d) != -1);
+	// 获取实际使用的分隔符
+	const dateDelimiter = strictMode
+		? formatDelimiter
+		: delimiters.find((d) : boolean => input.indexOf(d) != -1);
+	// 分割日期和格式
+	const dateParts = strictMode ? enhancedSplit(input, delimiters) : input.split(dateDelimiter ?? '');
+	const formatParts = strictMode ? enhancedSplit(format.toLowerCase(), delimiters) : format.toLowerCase().split(formatDelimiter ?? '');
+	// 组合成键值对
+	const dateAndFormat = zip(dateParts, formatParts);
+	const dateObj = new Map<string, string>();
+
+
+	// 解析日期组成部分
+	for (const [dateWord, formatWord] of dateAndFormat) {
+		if (dateWord == '' || formatWord == '' || dateWord.length != formatWord.length) {
+			return false;
+		}
+		dateObj.set(formatWord.charAt(0), dateWord)
+	}
+
+	// 年份处理
+	let fullYear = dateObj.get('y');
+
+	if (fullYear == null) return false;
+
+	// 检查年份前导负号
+	if (fullYear.startsWith('-')) return false;
+
+	// 两位年份转四位
+	if (fullYear.length == 2) {
+		const parsedYear = parseInt(fullYear, 10);
+
+		if (isNaN(parsedYear)) {
+			return false;
+		}
+
+		const currentYear = new Date().getFullYear();
+		const century = currentYear - (currentYear % 100);
+		fullYear = (parseInt(fullYear, 10) < (currentYear % 100))
+			? `${century + 100 + parseInt(fullYear, 10)}`
+			: `${century + parseInt(fullYear, 10)}`;
+	}
+
+	// 月份补零
+	const month = dateObj.get('m')?.padStart(2, '0') ?? '';
+	// 日期补零
+	const day = dateObj.get('d')?.padStart(2, '0') ?? '';
+
+	const isoDate = `${fullYear}-${month}-${day}T00:00:00.000Z`;
+
+	// return new Date(time).getDate() == parseInt(day);
+
+	// 构造 ISO 日期字符串验证
+	try {
+		// #ifndef APP-ANDROID
+		const date = new Date(isoDate);
+		return date.getUTCDate() === parseInt(day, 10) &&
+			(date.getUTCMonth() + 1) === parseInt(month, 10) &&
+			date.getUTCFullYear() === parseInt(fullYear, 10);
+		// #endif
+		// #ifdef APP-ANDROID
+		const date = new Date(isoDate);
+		return date.getDate() == parseInt(day, 10) &&
+			(date.getMonth() + 1) == parseInt(month, 10) &&
+			date.getFullYear() == parseInt(fullYear, 10);
+		// #endif
+	} catch {
+		return false;
+	}
+
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/isDef/index.ts b/uni_modules/lime-shared/isDef/index.ts
new file mode 100644
index 0000000..f8ca9bc
--- /dev/null
+++ b/uni_modules/lime-shared/isDef/index.ts
@@ -0,0 +1,23 @@
+// @ts-nocheck
+/**
+ * 检查一个值是否已定义（不为 undefined）且不为 null
+ * @param value 要检查的值
+ * @returns 如果值已定义且不为 null，则返回 true；否则返回 false
+ */
+// #ifndef UNI-APP-X
+export function isDef(value: unknown): boolean {
+  return value !== undefined && value !== null;
+}
+// #endif
+
+
+// #ifdef UNI-APP-X
+export function isDef(value : any|null) : boolean {
+	// #ifdef UNI-APP-X && APP
+	return value != null;
+	// #endif
+	// #ifndef UNI-APP-X && APP
+	return value != null && value != undefined;
+	// #endif
+}
+// #endif
\ No newline at end of file
diff --git a/uni_modules/lime-shared/isEmail/index.ts b/uni_modules/lime-shared/isEmail/index.ts
new file mode 100644
index 0000000..01f78d4
--- /dev/null
+++ b/uni_modules/lime-shared/isEmail/index.ts
@@ -0,0 +1,11 @@
+// @ts-nocheck
+
+/**
+ * 验证电子邮件地址格式
+ * @param email - 要验证的字符串
+ * @returns 是否通过验证
+ */
+export function isEmail(email : string) : boolean {
+	const emailRegex = /\S+@\S+\.\S+/;
+	return emailRegex.test(email);
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/isEmpty/index.ts b/uni_modules/lime-shared/isEmpty/index.ts
new file mode 100644
index 0000000..2e89acb
--- /dev/null
+++ b/uni_modules/lime-shared/isEmpty/index.ts
@@ -0,0 +1,81 @@
+// @ts-nocheck
+import {isDef} from '../isDef'
+import {isString} from '../isString'
+import {isNumber} from '../isNumber'
+/**
+ * 判断一个值是否为空。
+ *
+ * 对于字符串，去除首尾空格后判断长度是否为0。
+ * 对于数组，判断长度是否为0。
+ * 对于对象，判断键的数量是否为0。
+ * 对于null或undefined，直接返回true。
+ * 其他类型（如数字、布尔值等）默认不为空。
+ *
+ * @param {any} value - 要检查的值。
+ * @returns {boolean} 如果值为空，返回true，否则返回false。
+ */
+
+
+// #ifdef UNI-APP-X && APP
+export function isEmpty(value : any | null) : boolean {
+	// 为null
+	if(!isDef(value)){
+		return true
+	}
+	// 为空字符
+	if(isString(value)){
+		return value.toString().trim().length == 0
+	}
+	// 为数值
+	if(isNumber(value)){
+		return false
+	}
+	if(typeof value == 'object'){
+		// 数组
+		if(Array.isArray(value)){
+			return (value as Array<unknown>).length == 0
+		}
+		// Map
+		if(value instanceof Map<unknown, unknown>) {
+			return value.size == 0
+		}
+		// Set
+		if(value instanceof Set<unknown>) {
+			return value.size == 0
+		}
+		if(value instanceof UTSJSONObject) {
+			return value.toMap().size == 0
+		}
+		return JSON.stringify(value) == '{}'
+	}
+	return false
+}
+// #endif
+
+
+// #ifndef UNI-APP-X && APP
+export function isEmpty(value: any): boolean {
+    // 检查是否为null或undefined
+    if (value == null || value == undefined || value == '') {
+        return true;
+    }
+
+    // 检查字符串是否为空
+    if (typeof value === 'string') {
+        return value.trim().length === 0;
+    }
+
+    // 检查数组是否为空
+    if (Array.isArray(value)) {
+        return value.length === 0;
+    }
+
+    // 检查对象是否为空
+    if (typeof value === 'object') {
+        return Object.keys(value).length === 0;
+    }
+
+    // 其他类型（如数字、布尔值等）不为空
+    return false;
+}
+// #endif
\ No newline at end of file
diff --git a/uni_modules/lime-shared/isFunction/index.ts b/uni_modules/lime-shared/isFunction/index.ts
new file mode 100644
index 0000000..12605c3
--- /dev/null
+++ b/uni_modules/lime-shared/isFunction/index.ts
@@ -0,0 +1,16 @@
+// @ts-nocheck
+/**
+ * 检查一个值是否为函数类型
+ * @param val 要检查的值
+ * @returns 如果值的类型是函数类型，则返回 true；否则返回 false
+ */
+
+// #ifdef UNI-APP-X && APP
+export const isFunction = (val: any):boolean => typeof val == 'function';
+ // #endif
+
+
+// #ifndef UNI-APP-X && APP
+export const isFunction = (val: unknown): val is Function =>
+  typeof val === 'function';
+// #endif
diff --git a/uni_modules/lime-shared/isIP/index.ts b/uni_modules/lime-shared/isIP/index.ts
new file mode 100644
index 0000000..36f4906
--- /dev/null
+++ b/uni_modules/lime-shared/isIP/index.ts
@@ -0,0 +1,64 @@
+// @ts-nocheck
+
+// #ifndef APP-ANDROID || APP-HARMONY || APP-IOS
+type UTSJSONObject = {
+	version : string | number | null;
+};
+// #endif
+// #ifdef APP-ANDROID || APP-HARMONY || APP-IOS
+// type Options = UTSJSONObject
+// #endif
+
+const IPv4SegmentFormat = '(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])';
+const IPv4AddressFormat = `(${IPv4SegmentFormat}\\.){3}${IPv4SegmentFormat}`;
+const IPv4AddressRegExp = new RegExp(`^${IPv4AddressFormat}$`);
+
+const IPv6SegmentFormat = '(?:[0-9a-fA-F]{1,4})';
+const IPv6AddressRegExp = new RegExp(
+	'^(' +
+	`(?:${IPv6SegmentFormat}:){7}(?:${IPv6SegmentFormat}|:)|` +
+	`(?:${IPv6SegmentFormat}:){6}(?:${IPv4AddressFormat}|:${IPv6SegmentFormat}|:)|` +
+	`(?:${IPv6SegmentFormat}:){5}(?::${IPv4AddressFormat}|(:${IPv6SegmentFormat}){1,2}|:)|` +
+	`(?:${IPv6SegmentFormat}:){4}(?:(:${IPv6SegmentFormat}){0,1}:${IPv4AddressFormat}|(:${IPv6SegmentFormat}){1,3}|:)|` +
+	`(?:${IPv6SegmentFormat}:){3}(?:(:${IPv6SegmentFormat}){0,2}:${IPv4AddressFormat}|(:${IPv6SegmentFormat}){1,4}|:)|` +
+	`(?:${IPv6SegmentFormat}:){2}(?:(:${IPv6SegmentFormat}){0,3}:${IPv4AddressFormat}|(:${IPv6SegmentFormat}){1,5}|:)|` +
+	`(?:${IPv6SegmentFormat}:){1}(?:(:${IPv6SegmentFormat}){0,4}:${IPv4AddressFormat}|(:${IPv6SegmentFormat}){1,6}|:)|` +
+	`(?::((?::${IPv6SegmentFormat}){0,5}:${IPv4AddressFormat}|(?::${IPv6SegmentFormat}){1,7}|:))` +
+	')(%[0-9a-zA-Z.]{1,})?$'
+);
+
+
+/**
+ * 验证IP地址格式
+ * @param {string} ipAddress - 要验证的IP地址
+ * @param {Options|string|number} options - 配置选项或版本号
+ * @returns {boolean} 是否匹配有效的IP地址格式
+ */
+export function isIP(ipAddress : string | null, options : UTSJSONObject | string | number | null = null) : boolean {
+	// assertString(ipAddress);
+	if(ipAddress == null) return false
+	let version : string | number | null;
+
+	if (typeof options == 'object') {
+		version = (options as UTSJSONObject|null)?.['version'];
+	} else {
+		version = options;
+	}
+
+	const versionStr = version != null ? `${version}` : '';
+
+	if (versionStr == '') {
+		return isIP(ipAddress, 4) || isIP(ipAddress, 6);
+	}
+
+	if (versionStr == '4') {
+		return IPv4AddressRegExp.test(ipAddress.trim());
+	}
+
+	if (versionStr == '6') {
+		return IPv6AddressRegExp.test(ipAddress.trim());
+	}
+
+	return false;
+}
+
diff --git a/uni_modules/lime-shared/isNumber/index.ts b/uni_modules/lime-shared/isNumber/index.ts
new file mode 100644
index 0000000..040bc11
--- /dev/null
+++ b/uni_modules/lime-shared/isNumber/index.ts
@@ -0,0 +1,26 @@
+// @ts-nocheck
+/**
+ * 检查一个值是否为数字类型
+ * @param value 要检查的值，可以是 number 类型或 string 类型的数字
+ * @returns 如果值是数字类型且不是 NaN，则返回 true；否则返回 false
+ */
+
+// #ifndef UNI-APP-X
+export function isNumber(value: number | string | null): boolean {
+  return typeof value === 'number' && !isNaN(value);
+}
+// #endif
+
+// #ifdef UNI-APP-X
+export function isNumber(value: any|null): boolean {
+	// #ifdef APP-ANDROID
+	return ['Byte', 'UByte','Short','UShort','Int','UInt','Long','ULong','Float','Double','number'].includes(typeof value)
+	// #endif
+	// #ifdef APP-IOS
+	return ['Int8', 'UInt8','Int16','UInt16','Int32','UInt32','Int64','UInt64','Int','UInt','Float','Float16','Float32','Float64','Double', 'number'].includes(typeof value)
+	// #endif
+	// #ifndef APP-ANDROID || APP-IOS
+	return typeof value === 'number' && !isNaN(value);
+	// #endif
+}
+// #endif
\ No newline at end of file
diff --git a/uni_modules/lime-shared/isNumeric/index.ts b/uni_modules/lime-shared/isNumeric/index.ts
new file mode 100644
index 0000000..af5020e
--- /dev/null
+++ b/uni_modules/lime-shared/isNumeric/index.ts
@@ -0,0 +1,33 @@
+// @ts-nocheck
+
+/**
+ * 检查一个值是否为数字类型或表示数字的字符串
+ * @param value 要检查的值，可以是 string 类型或 number 类型
+ * @returns 如果值是数字类型或表示数字的字符串，则返回 true；否则返回 false
+ */
+
+// #ifndef UNI-APP-X && APP
+export function isNumeric(value: string | number | undefined | null): boolean {
+  return /^(-)?\d+(\.\d+)?$/.test(value);
+}
+// #endif
+
+
+// #ifdef UNI-APP-X && APP
+import {isNumber} from '../isNumber';
+import {isString} from '../isString';
+export function isNumeric(value : any|null) : boolean {
+	if(value == null) {
+		return false
+	}
+	if(isNumber(value)) {
+		return true
+	} else if(isString(value)) {
+		// const regex = "-?\\d+(\\.\\d+)?".toRegex()
+		const regex = new RegExp("^(-)?\\d+(\\.\\d+)?$")
+		return  regex.test(value as string) //regex.matches(value as string) 
+	}
+	return false
+	// return /^(-)?\d+(\.\d+)?$/.test(value);
+}
+// #endif
diff --git a/uni_modules/lime-shared/isObject/index.ts b/uni_modules/lime-shared/isObject/index.ts
new file mode 100644
index 0000000..26fec28
--- /dev/null
+++ b/uni_modules/lime-shared/isObject/index.ts
@@ -0,0 +1,19 @@
+// @ts-nocheck
+/**
+ * 检查一个值是否为对象类型
+ * @param val 要检查的值
+ * @returns 如果值的类型是对象类型，则返回 true；否则返回 false
+ */
+
+// #ifndef APP-ANDROID
+export const isObject = (val : unknown) : val is Record<any, any> =>
+	val !== null && typeof val === 'object';
+	
+// #endif
+
+
+// #ifdef APP-ANDROID
+export const isObject = (val : any | null) : boolean =>{
+	return val != null && typeof val == 'object';
+}
+// #endif
diff --git a/uni_modules/lime-shared/isPromise/index.ts b/uni_modules/lime-shared/isPromise/index.ts
new file mode 100644
index 0000000..b13c10b
--- /dev/null
+++ b/uni_modules/lime-shared/isPromise/index.ts
@@ -0,0 +1,22 @@
+// @ts-nocheck
+import {isFunction} from '../isFunction'
+import {isObject} from '../isObject'
+/**
+ * 检查一个值是否为 Promise 类型
+ * @param val 要检查的值
+ * @returns 如果值的类型是 Promise 类型，则返回 true；否则返回 false
+ */
+// #ifndef APP-ANDROID
+export const isPromise = <T = any>(val: unknown): val is Promise<T> => {
+  // 使用 isObject 函数判断值是否为对象类型
+  // 使用 isFunction 函数判断值是否具有 then 方法和 catch 方法
+  return isObject(val) && isFunction(val.then) && isFunction(val.catch);
+};
+// #endif
+
+
+// #ifdef APP-ANDROID
+export const isPromise = (val: any): boolean => {
+  return val instanceof Promise<unknown>
+};
+// #endif
\ No newline at end of file
diff --git a/uni_modules/lime-shared/isRegExp/index.ts b/uni_modules/lime-shared/isRegExp/index.ts
new file mode 100644
index 0000000..8aaefdf
--- /dev/null
+++ b/uni_modules/lime-shared/isRegExp/index.ts
@@ -0,0 +1,33 @@
+// @ts-nocheck
+/**
+ * 检测输入值是否为正则表达式对象
+ * @param obj - 需要检测的任意类型值
+ * @returns 如果检测值是正则表达式返回 true，否则返回 false
+ * 
+ * @example
+ * // 基础检测
+ * isRegExp(/abc/);                // true
+ * isRegExp(new RegExp('abc'));    // true
+ * 
+ * @example
+ * // 非正则表达式检测
+ * isRegExp('hello');              // false
+ * isRegExp({});                   // false
+ * isRegExp(null);                 // false
+ * 
+ * @description
+ * 1. 通过 Object.prototype.toString 的可靠类型检测
+ * 2. 支持跨执行环境的可靠检测：
+ *    - 浏览器多 iframe 环境
+ *    - Node.js 的 vm 模块
+ * 3. 比 instanceof 检测更可靠
+ * 4. 支持 ES3+ 全环境兼容
+ */
+export function isRegExp(obj : any) : boolean {
+	// #ifndef APP-ANDROID
+	return Object.prototype.toString.call(obj) === '[object RegExp]';
+	// #endif
+	// #ifdef APP-ANDROID
+	return obj instanceof RegExp//Object.prototype.toString.call(obj) === '[object RegExp]';
+	// #endif
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/isString/index.ts b/uni_modules/lime-shared/isString/index.ts
new file mode 100644
index 0000000..143f876
--- /dev/null
+++ b/uni_modules/lime-shared/isString/index.ts
@@ -0,0 +1,19 @@
+// @ts-nocheck
+/**
+ * 检查一个值是否为字符串类型
+ * @param str 要检查的值
+ * @returns 如果值的类型是字符串类型，则返回 true；否则返回 false
+ */
+// #ifndef UNI-APP-X && APP
+// export const isString = (str: unknown): str is string => typeof str === 'string';
+export function isString (str: unknown): str is string {
+	return typeof str == 'string'
+}
+// #endif
+
+
+// #ifdef UNI-APP-X && APP
+export function isString (str: any|null): boolean {
+	return typeof str == 'string'
+}
+// #endif
diff --git a/uni_modules/lime-shared/isURL/index.ts b/uni_modules/lime-shared/isURL/index.ts
new file mode 100644
index 0000000..4121143
--- /dev/null
+++ b/uni_modules/lime-shared/isURL/index.ts
@@ -0,0 +1,198 @@
+// @ts-nocheck
+import { isValidDomain, type IsValidDomainOptions } from '../isValidDomain';
+import { isIP } from '../isIP';
+import { isRegExp } from '../isRegExp';
+// import {merge} from '../merge';
+
+/** URL 验证配置选项 */
+export type IsURLOptions = {
+	/** 允许的协议列表（默认 ['http', 'https', 'ftp']） */
+	protocols ?: string[];
+	/** 需要顶级域名（默认 true） */
+	requireTld ?: boolean;
+	/** 需要协议头（默认 false） */
+	requireProtocol ?: boolean;
+	/** 需要主机地址（默认 true） */
+	requireHost ?: boolean;
+	/** 需要端口号（默认 false） */
+	requirePort ?: boolean;
+	/** 需要有效协议（默认 true） */
+	requireValidProtocol ?: boolean;
+	/** 允许下划线（默认 false） */
+	allowUnderscores ?: boolean;
+	/** 允许结尾点号（默认 false） */
+	allowTrailingDot ?: boolean;
+	/** 允许协议相对地址（默认 false） */
+	allowProtocolRelativeUrls ?: boolean;
+	/** 允许片段标识（默认 true） */
+	allowFragments ?: boolean;
+	/** 允许查询参数（默认 true） */
+	allowQueryComponents ?: boolean;
+	/** 禁用认证信息（默认 false） */
+	disallowAuth ?: boolean;
+	/** 验证长度（默认 true） */
+	validateLength ?: boolean;
+	/** 最大允许长度（默认 2084） */
+	maxAllowedLength ?: number;
+	/** 白名单主机列表 */
+	hostWhitelist ?: Array<string | RegExp>;
+	/** 黑名单主机列表 */
+	hostBlacklist ?: Array<string | RegExp>;
+}
+
+export function checkHost(host : string, matches : any[]) : boolean {
+	for (let i = 0; i < matches.length; i++) {
+		let match = matches[i];
+		if (host == match || (isRegExp(match) && (match as RegExp).test(host))) {
+			return true;
+		}
+	}
+	return false;
+}
+
+// 辅助函数
+function isValidPort(port : number | null) : boolean {
+	return port != null && !isNaN(port) && port > 0 && port <= 65535;
+}
+
+function validateHost(host : string, options : IsURLOptions | null, isIPv6 : boolean) : boolean {
+	if (isIPv6) return isIP(host, 6);
+	return isIP(host) || isValidDomain(host, {
+		requireTld: options?.requireTld ?? true,
+		allowUnderscore: options?.allowUnderscores ?? true,
+		allowTrailingDot: options?.allowTrailingDot ?? false
+	} as IsValidDomainOptions);
+}
+
+
+
+
+/** 匹配 IPv6 地址的正则表达式 */
+const WRAPPED_IPV6_REGEX = /^\[([^\]]+)\](?::([0-9]+))?$/;
+
+/**
+ * 验证字符串是否为有效的 URL
+ * @param url - 需要验证的字符串
+ * @param options - 配置选项
+ * @returns 是否为有效 URL
+ *
+ * @example
+ * ```typescript
+ * isURL('https://example.com'); // true
+ * isURL('user:pass@example.com', { disallowAuth: true }); // false
+ * ```
+ */
+export function isURL(url : string | null, options : IsURLOptions | null = null) : boolean {
+	// assertString(url);
+
+	// 1. 基础格式校验
+	if (url == null || url == '' || url.length == 0 || /[\s<>]/.test(url) || url.startsWith('mailto:')) {
+		return false;
+	}
+	// 合并配置选项
+	let protocols = options?.protocols ?? ['http', 'https', 'ftp']
+	// let requireTld = options?.requireTld ?? true
+	let requireProtocol = options?.requireProtocol ?? false
+	let requireHost = options?.requireHost ?? true
+	let requirePort = options?.requirePort ?? false
+	let requireValidProtocol = options?.requireValidProtocol ?? true
+	// let allowUnderscores = options?.allowUnderscores ?? false
+	// let allowTrailingDot = options?.allowTrailingDot ?? false
+	let allowProtocolRelativeUrls = options?.allowProtocolRelativeUrls ?? false
+	let allowFragments = options?.allowFragments ?? true
+	let allowQueryComponents = options?.allowQueryComponents ?? true
+	let validateLength = options?.validateLength ?? true
+	let maxAllowedLength = options?.maxAllowedLength ?? 2084
+	let hostWhitelist = options?.hostWhitelist
+	let hostBlacklist = options?.hostBlacklist
+	let disallowAuth = options?.disallowAuth ?? false
+
+
+	// 2. 长度校验
+	if (validateLength && url!.length > maxAllowedLength) {
+		return false;
+	}
+	// 3. 片段和查询参数校验
+	if (!allowFragments && url.includes('#')) return false;
+	if (!allowQueryComponents && (url.includes('?') || url.includes('&'))) return false;
+
+	// 处理 URL 组成部分
+	const [urlWithoutFragment] = url.split('#');
+	const [baseUrl] = urlWithoutFragment.split('?');
+	// 4. 协议处理
+	const protocolParts = baseUrl.split('://');
+	let protocol:string;
+	let remainingUrl = baseUrl;
+
+	if (protocolParts.length > 1) {
+		protocol = protocolParts.shift()!.toLowerCase();
+		if (requireValidProtocol && !protocols!.includes(protocol)) {
+			return false;
+		}
+		remainingUrl = protocolParts.join('://');
+	} else if (requireProtocol) {
+		return false;
+	} else if (baseUrl.startsWith('//')) {
+		if (!allowProtocolRelativeUrls) return false;
+		remainingUrl = baseUrl.slice(2);
+	}
+
+	if (remainingUrl == '') return false;
+	
+	// 5. 处理主机部分
+	const [hostPart] = remainingUrl.split('/', 1);
+	const authParts = hostPart.split('@');
+	
+	// 认证信息校验
+	if (authParts.length > 1) {
+		if (disallowAuth || authParts[0] == '') return false;
+		const auth = authParts.shift()!;
+		if (auth.split(':').length > 2) return false;
+		const [user, password] = auth.split(':');
+		if (user == '' && password == '') return false;
+	}
+
+	const hostname = authParts.join('@');
+
+	// 6. 解析主机和端口
+	type HostInfo = {
+		host ?: string;
+		ipv6 ?: string;
+		port ?: number;
+	};
+
+	const hostInfo : HostInfo = {};
+	const ipv6Match = hostname.match(WRAPPED_IPV6_REGEX);
+	if (ipv6Match != null) {
+		hostInfo.ipv6 = ipv6Match.length > 1 ? ipv6Match[1] : null;
+		const portStr = ipv6Match.length > 2 ? ipv6Match[2] : null;
+		if (portStr != null) {
+			hostInfo.port = parseInt(portStr);
+			if (!isValidPort(hostInfo.port)) return false;
+		}
+	} else {
+		const [host, ...portParts] = hostname.split(':');
+		hostInfo.host = host;
+		if (portParts.length > 0) {
+			const portStr = portParts.join(':');
+			hostInfo.port = parseInt(portStr);
+			if (!isValidPort(hostInfo.port)) return false;
+		}
+	}
+
+	// 7. 端口校验
+	if (requirePort && hostInfo.port == null) return false;
+	// 8. 主机验证逻辑
+	const finalHost = hostInfo.host ?? hostInfo.ipv6;
+	if (finalHost == null) return requireHost ? false : true;
+	// 白名单/黑名单检查
+	if (hostWhitelist != null && !checkHost(finalHost!, hostWhitelist!)) return false;
+	if (hostBlacklist != null && checkHost(finalHost!, hostBlacklist!)) return false;
+	
+	// 9. 综合校验
+	return validateHost(
+		finalHost,
+		options,
+		!(hostInfo.ipv6 == null || hostInfo.ipv6 == '')
+	);
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/isValidDomain/index.ts b/uni_modules/lime-shared/isValidDomain/index.ts
new file mode 100644
index 0000000..40c717f
--- /dev/null
+++ b/uni_modules/lime-shared/isValidDomain/index.ts
@@ -0,0 +1,90 @@
+// @ts-nocheck
+/**
+ * 域名验证配置选项
+ */
+export type IsValidDomainOptions = {
+	/**
+	 * 是否要求必须包含顶级域名(TLD)
+	 * @default true
+	 * @example 
+	 * true -> "example.com" 有效
+	 * false -> "localhost" 有效
+	 */
+	requireTld : boolean;
+
+	/**
+	 * 是否允许域名部分包含下划线(_)
+	 * @default false
+	 * @example
+	 * true -> "my_site.com" 有效
+	 * false -> "my_site.com" 无效
+	 */
+	allowUnderscore : boolean;
+
+	/**
+	 * 是否允许域名以点号(.)结尾
+	 * @default false
+	 * @example
+	 * true -> "example.com." 有效
+	 * false -> "example.com." 无效
+	 */
+	allowTrailingDot : boolean;
+}
+
+
+/**
+ * 验证字符串是否为合法域名
+ * @param str 要验证的字符串
+ * @param options 配置选项，默认 {
+ *   requireTld: true,      // 需要顶级域名
+ *   allowUnderscore: false,// 允许下划线
+ *   allowTrailingDot: false// 允许结尾点号
+ * }
+ * @returns 验证结果
+ * 
+ * 示例：
+ * isValidDomain("example.com") // true
+ * isValidDomain("my_site.com", { allowUnderscore: true }) // true
+ */
+export function isValidDomain(
+	str : string,
+	options : IsValidDomainOptions = {
+		requireTld: true,
+		allowUnderscore: false,
+		allowTrailingDot: false
+	}
+) : boolean {
+	// 预处理字符串
+	let domain = str;
+
+	// 处理结尾点号
+	if (options.allowTrailingDot && domain.endsWith('.')) {
+		domain = domain.slice(0, -1);
+	}
+
+	// 分割域名部分
+	const parts = domain.split('.');
+	if (parts.length == 1 && options.requireTld) return false;
+
+	// 验证顶级域名
+	const tld = parts[parts.length - 1];
+	if (options.requireTld) {
+		if (!/^[a-z\u00A1-\uFFFF]{2,}$/i.test(tld) || /\s/.test(tld)) {
+			return false;
+		}
+	}
+
+	// 验证每个部分
+	const domainRegex = options.allowUnderscore
+		? /^[a-z0-9\u00A1-\uFFFF](?:[a-z0-9-\u00A1-\uFFFF_]*[a-z0-9\u00A1-\uFFFF])?$/i
+		: /^[a-z0-9\u00A1-\uFFFF](?:[a-z0-9-\u00A1-\uFFFF]*[a-z0-9\u00A1-\uFFFF])?$/i;
+
+	return parts.every(part => {
+		// 长度校验
+		if (part.length > 63) return false;
+		// 格式校验
+		if (!domainRegex.test(part)) return false;
+		// 禁止开头/结尾连字符
+		return !(part.startsWith('-') || part.endsWith('-'));
+	});
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/kebabCase/index.ts b/uni_modules/lime-shared/kebabCase/index.ts
new file mode 100644
index 0000000..bed6b1f
--- /dev/null
+++ b/uni_modules/lime-shared/kebabCase/index.ts
@@ -0,0 +1,24 @@
+// @ts-nocheck
+// export function toLowercaseSeparator(key: string) {
+//   return key.replace(/([A-Z])/g, '-$1').toLowerCase();
+// }
+
+/**
+ * 将字符串转换为指定连接符的命名约定
+ * @param str 要转换的字符串
+ * @param separator 指定的连接符，默认为 "-"
+ * @returns 转换后的字符串
+ */
+export function kebabCase(str : string, separator : string = "-") : string {
+	return str
+		
+		// #ifdef APP-ANDROID
+		.replace(/[A-Z]/g, (match : string, _ : number, _ : string) : string => `${separator}${match.toLowerCase()}`) // 将大写字母替换为连接符加小写字母
+		// #endif
+		// #ifndef APP-ANDROID
+		.replace(/[A-Z]/g, (match : string) : string => `${separator}${match.toLowerCase()}`) // 将大写字母替换为连接符加小写字母
+		// #endif
+		.replace(/[\s_-]+/g, separator) // 将空格、下划线和短横线替换为指定连接符
+		.replace(new RegExp(`^${separator}|${separator}$`, "g"), "") // 删除开头和结尾的连接符
+		.toLowerCase(); // 将结果转换为全小写
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/merge/index.ts b/uni_modules/lime-shared/merge/index.ts
new file mode 100644
index 0000000..b4dcf14
--- /dev/null
+++ b/uni_modules/lime-shared/merge/index.ts
@@ -0,0 +1,33 @@
+// @ts-nocheck
+/**
+ * 深度合并两个对象，用默认值填充目标对象中未定义的属性
+ * 
+ * @template T - 合并对象的泛型类型
+ * @param {T} obj - 目标对象（将被修改）
+ * @param {T} defaults - 包含默认值的对象
+ * @returns {T} 合并后的对象（即修改后的obj参数）
+ */
+
+export function merge<T>(obj : T, defaults : T) : T {
+	// #ifdef APP-ANDROID
+	try {
+		if(obj instanceof UTSJSONObject && defaults instanceof UTSJSONObject) {
+			return UTSJSONObject.assign<T>(obj, defaults)!// as T
+		}
+		const obj1 = { ...toRaw(obj) }
+		const obj2 = { ...toRaw(defaults) }
+		return UTSJSONObject.assign<T>(obj1, obj2)!
+	} catch (error) {
+		return defaults
+	}
+	// #endif
+
+	// #ifndef APP-ANDROID
+	for (const key in defaults) {
+		if (obj[key] === undefined || obj[key] === null) {
+			obj[key] = defaults[key];
+		}
+	}
+	return obj;
+	// #endif
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/obj2url/index.ts b/uni_modules/lime-shared/obj2url/index.ts
new file mode 100644
index 0000000..d0125cf
--- /dev/null
+++ b/uni_modules/lime-shared/obj2url/index.ts
@@ -0,0 +1,61 @@
+// @ts-nocheck
+// #ifndef UNI-APP-X
+type UTSJSONObject = Record<string, any>
+// #endif
+
+/**
+ * 将对象转换为URL查询字符串
+ * @param data - 需要转换的键值对对象
+ * @param isPrefix - 是否添加问号前缀，默认为false
+ * @returns 格式化后的URL查询参数字符串
+ * 
+ * @example
+ * // 基础用法
+ * obj2url({ name: '张三', age: 25 }); 
+ * // => "name=%E5%BC%A0%E4%B8%89&age=25"
+ * 
+ * @example
+ * // 数组参数处理
+ * obj2url({ tags: ['js', 'ts'] });
+ * // => "tags[]=js&tags[]=ts"
+ * 
+ * @example
+ * // 包含空值的过滤
+ * obj2url({ name: '', age: null, city: undefined });
+ * // => ""
+ * 
+ * @description
+ * 1. 自动过滤空值（空字符串、null、undefined）
+ * 2. 支持数组参数转换（自动添加[]后缀）
+ * 3. 自动进行URI编码
+ * 4. 支持自定义是否添加问号前缀
+ */
+export function obj2url(data : UTSJSONObject, isPrefix : boolean = false) : string {
+	const prefix = isPrefix ? '?' : '';
+
+	const _result:string[] = [];
+	const empty:(any|null)[] = ['', null]
+
+	// #ifndef APP-ANDROID
+	empty.push(undefined)
+	// #endif
+
+	for (const key in data) {
+		const value = data[key];
+
+		// 去掉为空的参数
+		if (empty.includes(value)) {
+			continue;
+		}
+		if (Array.isArray(value)) {
+			(value as any[]).forEach((_value) => {
+				_result.push(
+					encodeURIComponent(key) + '[]=' + encodeURIComponent(`${_value}`),
+				);
+			});
+		} else {
+			_result.push(encodeURIComponent(key) + '=' + encodeURIComponent(`${value}`));
+		}
+	}
+	return _result.length > 0 ? prefix + _result.join('&') : '';
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/objToCss/index.ts b/uni_modules/lime-shared/objToCss/index.ts
new file mode 100644
index 0000000..2175269
--- /dev/null
+++ b/uni_modules/lime-shared/objToCss/index.ts
@@ -0,0 +1,49 @@
+// @ts-nocheck
+// #ifndef UNI-APP-X 
+interface UTSJSONObject {
+	[key : string] : string | number | null
+}
+// #endif
+
+/**
+ * 将字符串转换为带有连字符分隔的小写形式
+ * @param key - 要转换的字符串
+ * @returns 转换后的字符串
+ */
+export function toLowercaseSeparator(key : string):string {
+	return key.replace(/([A-Z])/g, '-$1').toLowerCase();
+}
+
+/**
+ * 获取样式对象对应的样式字符串
+ * @param style - CSS样式对象
+ * @returns 由非空有效样式属性键值对组成的字符串
+ */
+export function objToCss(style : UTSJSONObject) : string {
+	
+	// #ifdef APP-ANDROID
+	let styleStr = '';
+	style.toMap().forEach((value, key) => {
+		if(value != null && value != '') {
+			styleStr += `${toLowercaseSeparator(key as string)}: ${value};`
+		}
+	})
+	return styleStr
+	// #endif
+	// #ifndef APP-ANDROID
+	return Object.keys(style)
+		.filter(
+			(key) => 
+				style[key] !== undefined && 
+				style[key] !== null && 
+				style[key] !== '')
+		.map((key : string) => `${toLowercaseSeparator(key)}: ${style[key]};`)
+		.join(' ');
+	// #endif
+}
+
+// 示例
+// const style = { color: 'red', fontSize: '16px', backgroundColor: '', border: null };
+// const styleStr = objToCss(style);
+// console.log(styleStr);
+// 输出: "color: red; font-size: 16px;"
\ No newline at end of file
diff --git a/uni_modules/lime-shared/package.json b/uni_modules/lime-shared/package.json
new file mode 100644
index 0000000..a37742c
--- /dev/null
+++ b/uni_modules/lime-shared/package.json
@@ -0,0 +1,110 @@
+{
+  "id": "lime-shared",
+  "displayName": "lime-shared",
+  "version": "0.4.2",
+  "description": "本人插件的几个公共函数，获取当前页，图片的base64转临时路径，图片的exif信息等",
+  "keywords": [
+    "lime-shared",
+    "exif"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0",
+    "uni-app": "^4.55",
+    "uni-app-x": "^4.55"
+  },
+  "dcloudext": {
+    "type": "sdk-js",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "",
+    "darkmode": "x",
+    "i18n": "x",
+    "widescreen": "x"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "√",
+        "aliyun": "√",
+        "alipay": "√"
+      },
+      "client": {
+        "uni-app": {
+          "vue": {
+            "vue2": "√",
+            "vue3": "√"
+          },
+          "web": {
+            "safari": "√",
+            "chrome": "√"
+          },
+          "app": {
+            "vue": "√",
+            "nvue": "-",
+            "android": {
+              "extVersion": "",
+              "minVersion": "21"
+            },
+            "ios": "√",
+            "harmony": "√"
+          },
+          "mp": {
+            "weixin": "√",
+            "alipay": "√",
+            "toutiao": "√",
+            "baidu": "√",
+            "kuaishou": "-",
+            "jd": "-",
+            "harmony": "-",
+            "qq": "-",
+            "lark": "-"
+          },
+          "quickapp": {
+            "huawei": "-",
+            "union": "-"
+          }
+        },
+        "uni-app-x": {
+          "web": {
+            "safari": "√",
+            "chrome": "√"
+          },
+          "app": {
+            "android": {
+              "extVersion": "",
+              "minVersion": "21"
+            },
+            "ios": "√",
+            "harmony": "√"
+          },
+          "mp": {
+            "weixin": "√"
+          }
+        },
+        "App": {
+          "app-harmony": "u",
+          "app-nvue": "u",
+          "app-uvue": "y",
+          "app-vue": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/pathToBase64/index.ts b/uni_modules/lime-shared/pathToBase64/index.ts
new file mode 100644
index 0000000..ce4e1b0
--- /dev/null
+++ b/uni_modules/lime-shared/pathToBase64/index.ts
@@ -0,0 +1,11 @@
+// @ts-nocheck
+// #ifndef UNI-APP-X && APP
+// export * from './vue.ts'
+export { pathToBase64 } from './vue.ts'
+// #endif
+
+
+// #ifdef UNI-APP-X && APP
+// export * from './uvue.uts'
+export { pathToBase64 } from './uvue.uts'
+// #endif
diff --git a/uni_modules/lime-shared/pathToBase64/uvue.uts b/uni_modules/lime-shared/pathToBase64/uvue.uts
new file mode 100644
index 0000000..d5bbdb1
--- /dev/null
+++ b/uni_modules/lime-shared/pathToBase64/uvue.uts
@@ -0,0 +1,17 @@
+// @ts-nocheck
+// import { processFile, ProcessFileOptions } from '@/uni_modules/lime-file-utils'
+export function pathToBase64(path : string) : Promise<string> {
+	console.error('pathToBase64: 当前环境不支持，请使用 【lime-file-utils】')
+	// return new Promise((resolve, reject) => {
+	// 	processFile({
+	// 		type: 'toDataURL',
+	// 		path,
+	// 		success(res : string) {
+	// 			resolve(res)
+	// 		},
+	// 		fail(err: any){
+	// 			reject(err)
+	// 		}
+	// 	} as ProcessFileOptions)
+	// })
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/pathToBase64/vue.ts b/uni_modules/lime-shared/pathToBase64/vue.ts
new file mode 100644
index 0000000..8167f88
--- /dev/null
+++ b/uni_modules/lime-shared/pathToBase64/vue.ts
@@ -0,0 +1,121 @@
+// @ts-nocheck
+
+// #ifdef APP-PLUS
+import { getLocalFilePath } from '../getLocalFilePath'
+// #endif
+function isImage(extension : string) {
+	const imageExtensions = ["jpg", "jpeg", "png", "gif", "bmp", "svg"];
+	return imageExtensions.includes(extension.toLowerCase());
+}
+// #ifdef H5
+function getSVGFromURL(url: string) {
+	return new Promise((resolve, reject) => {
+		const xhr = new XMLHttpRequest();
+		xhr.open('GET', url, true);
+		xhr.responseType = 'text';
+
+		xhr.onload = function () {
+			if (xhr.status === 200) {
+				const svg = xhr.responseText;
+				resolve(svg);
+			} else {
+				reject(new Error(xhr.statusText));
+			}
+		};
+
+		xhr.onerror = function () {
+			reject(new Error('Network error'));
+		};
+
+		xhr.send();
+	});
+}
+// #endif
+/**
+ * 路径转base64
+ * @param {Object} string
+ */
+export function pathToBase64(path : string) : Promise<string> {
+	if (/^data:/.test(path)) return path
+	let extension = path.substring(path.lastIndexOf('.') + 1);
+	const isImageFile = isImage(extension)
+	let prefix = ''
+	if (isImageFile) {
+		prefix = 'image/';
+		if(extension == 'svg') {
+			extension += '+xml'
+		}
+	} else if (extension === 'pdf') {
+		prefix = 'application/pdf';
+	} else if (extension === 'txt') {
+		prefix = 'text/plain';
+	} else {
+		// 添加更多文件类型的判断
+		// 如果不是图片、PDF、文本等类型，可以设定默认的前缀或采取其他处理
+		prefix = 'application/octet-stream';
+	}
+	return new Promise((resolve, reject) => {
+		// #ifdef H5
+		if (isImageFile) {
+			if(extension == 'svg') {
+				getSVGFromURL(path).then(svg => {
+					const base64 = btoa(svg);
+					resolve(`data:image/svg+xml;base64,${base64}`);
+				})
+			} else {
+				let image = new Image();
+				image.setAttribute("crossOrigin", 'Anonymous');
+				image.onload = function () {
+					let canvas = document.createElement('canvas');
+					canvas.width = this.naturalWidth;
+					canvas.height = this.naturalHeight;
+					canvas.getContext('2d').drawImage(image, 0, 0);
+					let result = canvas.toDataURL(`${prefix}${extension}`)
+					resolve(result);
+					canvas.height = canvas.width = 0
+				}
+				image.src = path + '?v=' + Math.random()
+				image.onerror = (error) => {
+					reject(error);
+				};
+			}
+			
+		} else {
+			reject('not image');
+		}
+
+		// #endif
+
+		// #ifdef MP
+		if (uni.canIUse('getFileSystemManager')) {
+			uni.getFileSystemManager().readFile({
+				filePath: path,
+				encoding: 'base64',
+				success: (res) => {
+					resolve(`data:${prefix}${extension};base64,${res.data}`)
+				},
+				fail: (error) => {
+					console.error({ error, path })
+					reject(error)
+				}
+			})
+		}
+		// #endif
+
+		// #ifdef APP-PLUS
+		plus.io.resolveLocalFileSystemURL(getLocalFilePath(path), (entry) => {
+			entry.file((file : any) => {
+				const fileReader = new plus.io.FileReader()
+				fileReader.onload = (data) => {
+					resolve(data.target.result)
+				}
+				fileReader.onerror = (error) => {
+					console.error({ error, path })
+					reject(error)
+				}
+				fileReader.readAsDataURL(file)
+			}, reject)
+		}, reject)
+		// #endif
+	})
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/platform/index.ts b/uni_modules/lime-shared/platform/index.ts
new file mode 100644
index 0000000..55fd412
--- /dev/null
+++ b/uni_modules/lime-shared/platform/index.ts
@@ -0,0 +1,34 @@
+// @ts-nocheck
+export function getPlatform():Uni {
+	// #ifdef MP-WEIXIN
+	return wx
+	// #endif
+	// #ifdef MP-BAIDU
+	return swan
+	// #endif
+	// #ifdef MP-ALIPAY
+	return my
+	// #endif
+	// #ifdef MP-JD
+	return jd
+	// #endif
+	// #ifdef MP-QQ
+	return qq
+	// #endif
+	// #ifdef MP-360
+	return qh
+	// #endif
+	// #ifdef MP-KUAISHOU
+	return ks
+	// #endif
+	// #ifdef MP-LARK||MP-TOUTIAO
+	return tt
+	// #endif
+	// #ifdef MP-DINGTALK
+	return dd
+	// #endif
+	// #ifdef QUICKAPP-WEBVIEW || QUICKAPP-WEBVIEW-UNION || QUICKAPP-WEBVIEW-HUAWEI
+	return qa
+	// #endif
+	return uni
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/raf/index.ts b/uni_modules/lime-shared/raf/index.ts
new file mode 100644
index 0000000..876efd4
--- /dev/null
+++ b/uni_modules/lime-shared/raf/index.ts
@@ -0,0 +1,12 @@
+// @ts-nocheck
+
+// #ifdef UNI-APP-X && APP
+// export * from './uvue'
+export { raf, doubleRaf, cancelRaf } from './uvue'
+// #endif
+
+
+// #ifndef UNI-APP-X && APP
+// export * from './vue'
+export { raf, doubleRaf, cancelRaf } from './vue'
+// #endif
diff --git a/uni_modules/lime-shared/raf/uvue.uts b/uni_modules/lime-shared/raf/uvue.uts
new file mode 100644
index 0000000..1b0d9f2
--- /dev/null
+++ b/uni_modules/lime-shared/raf/uvue.uts
@@ -0,0 +1,48 @@
+// @ts-nocheck
+// 是否支持被动事件监听
+export const supportsPassive = true;
+
+// #ifdef  uniVersion < 4.25
+// 请求动画帧
+export function raf(fn: TimerCallback): number {
+   return setTimeout(fn, 1000 / 60); 
+}
+
+// 取消动画帧
+export function cancelRaf(id: number) {
+  clearTimeout(id);
+}
+
+
+// 双倍动画帧
+export function doubleRaf(fn: TimerCallback): void {
+  raf(():number => raf(fn)); // 在下一帧回调中再次请求动画帧，实现双倍动画帧效果
+}
+// #endif
+
+
+// #ifdef  uniVersion >= 4.25
+// 请求动画帧
+export function raf(fn: UniAnimationFrameCallback): number
+export function raf(fn: UniAnimationFrameCallbackWithNoArgument): number
+export function raf(fn: any): number {
+	if(typeof fn == 'UniAnimationFrameCallback') {
+		return requestAnimationFrame(fn as UniAnimationFrameCallback); 
+	} else {
+		return requestAnimationFrame(fn as UniAnimationFrameCallbackWithNoArgument); 
+	}
+}
+
+// 取消动画帧
+export function cancelRaf(id: number) {
+  cancelAnimationFrame(id);
+}
+
+// 双倍动画帧
+export function doubleRaf(fn: UniAnimationFrameCallback): void 
+export function doubleRaf(fn: UniAnimationFrameCallbackWithNoArgument): void 
+export function doubleRaf(fn: any): void {
+  raf(():number => raf(fn)); // 在下一帧回调中再次请求动画帧，实现双倍动画帧效果
+}
+// #endif
+
diff --git a/uni_modules/lime-shared/raf/vue.ts b/uni_modules/lime-shared/raf/vue.ts
new file mode 100644
index 0000000..98a364e
--- /dev/null
+++ b/uni_modules/lime-shared/raf/vue.ts
@@ -0,0 +1,32 @@
+// @ts-nocheck
+type Callback = () => void//Function
+// 是否支持被动事件监听
+export const supportsPassive = true;
+
+// 请求动画帧
+export function raf(fn : Callback) : number {
+	// #ifndef WEB
+	return setTimeout(fn, 1000 / 60); // 请求动画帧
+	// #endif
+	// #ifdef WEB
+	return requestAnimationFrame(fn); // 请求动画帧
+	// #endif
+}
+
+// 取消动画帧
+export function cancelRaf(id : number) {
+	// 如果是在浏览器环境下，使用 cancelAnimationFrame 方法
+	// #ifdef WEB
+	cancelAnimationFrame(id); // 取消动画帧
+	// #endif
+	// #ifndef WEB
+	clearTimeout(id); // 取消动画帧
+	// #endif
+}
+
+// 双倍动画帧
+export function doubleRaf(fn : Callback) : void {
+	raf(() => {
+		raf(fn)
+	}); // 在下一帧回调中再次请求动画帧，实现双倍动画帧效果
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/random/index.ts b/uni_modules/lime-shared/random/index.ts
new file mode 100644
index 0000000..49a21ed
--- /dev/null
+++ b/uni_modules/lime-shared/random/index.ts
@@ -0,0 +1,24 @@
+// @ts-nocheck
+/**
+ * 生成一个指定范围内的随机数
+ * @param min 随机数的最小值
+ * @param max 随机数的最大值
+ * @param fixed 随机数的小数位数，默认为 0
+ * @returns 生成的随机数
+ */
+
+export function random(min: number, max: number, fixed: number = 0):number {
+  // 将 min 和 max 转换为数字类型
+  // min = +min || 0;
+  // max = +max || 0;
+  // 计算随机数范围内的一个随机数
+  const num = Math.random() * (max - min) + min;
+  // 如果 fixed 参数为 0，则返回四舍五入的整数随机数；否则保留固定小数位数
+  // Number
+  return fixed == 0 ? Math.round(num) : parseFloat(num.toFixed(fixed));
+}
+
+// 示例
+// console.log(random(0, 10)); // 输出：在 0 和 10 之间的一个整数随机数
+// console.log(random(0, 1, 2)); // 输出：在 0 和 1 之间的一个保留两位小数的随机数
+// console.log(random(1, 100, 3)); // 输出：在 1 和 100 之间的一个保留三位小数的随机数
\ No newline at end of file
diff --git a/uni_modules/lime-shared/range/index.ts b/uni_modules/lime-shared/range/index.ts
new file mode 100644
index 0000000..483b7d1
--- /dev/null
+++ b/uni_modules/lime-shared/range/index.ts
@@ -0,0 +1,36 @@
+// @ts-nocheck
+/**
+ * 生成一个数字范围的数组
+ * @param start 范围的起始值
+ * @param end 范围的结束值
+ * @param step 步长，默认为 1
+ * @param fromRight 是否从右侧开始生成，默认为 false
+ * @returns 生成的数字范围数组
+ */
+export function range(start : number, end : number, step : number = 1, fromRight : boolean = false) : number[] {
+	let index = -1;
+	// 计算范围的长度
+	let length = Math.max(Math.ceil((end - start) / step), 0);
+	// 创建一个长度为 length 的数组
+	// #ifdef APP-ANDROID
+	const result = Array.fromNative(new IntArray(length.toInt()));
+	// #endif
+	// #ifndef APP-ANDROID
+	const result = new Array(length);
+	// #endif
+
+	// 使用循环生成数字范围数组
+	let _start = start
+	while (length-- > 0) {
+		// 根据 fromRight 参数决定从左侧还是右侧开始填充数组
+		result[fromRight ? length : ++index] = _start;
+		_start += step;
+	}
+	return result;
+}
+
+
+// 示例
+// console.log(range(0, 5)); // 输出: [0, 1, 2, 3, 4]
+// console.log(range(1, 10, 2, true)); // 输出: [9, 7, 5, 3, 1]
+// console.log(range(5, 0, -1)); // 输出: [5, 4, 3, 2, 1]
\ No newline at end of file
diff --git a/uni_modules/lime-shared/readme.md b/uni_modules/lime-shared/readme.md
new file mode 100644
index 0000000..d6e8658
--- /dev/null
+++ b/uni_modules/lime-shared/readme.md
@@ -0,0 +1,516 @@
+# lime-shared 工具库
+- 本人插件的几个公共函数
+- 按需引入
+
+## 文档
+ 🚀 [shared【站点1】](https://limex.qcoon.cn/shared/overview.html)
+ 🌍 [shared【站点2】](https://limeui.netlify.app/shared/overview.html)
+ 🔥 [shared【站点3】](https://limeui.familyzone.top/shared/overview.html)
+
+
+## 安装
+在插件市场导入即可
+
+## 使用
+按需引入只会引入相关的方法，不要看着 插件函数列表多 而占空间，只要不引用不会被打包
+```js
+import {getRect} from '@/uni_modules/lime-shared/getRect'
+```
+
+## 目录
++ [getRect](#api_getRect): 获取节点尺寸信息
++ [addUnit](#api_addUnit): 将未带单位的数值添加px，如果有单位则返回原值
++ [unitConvert](#api_unitConvert): 将带有rpx|px的字符转成number,若本身是number则直接返回
++ [canIUseCanvas2d](#api_canIUseCanvas2d): 环境是否支持使用 canvas 2d
++ [getCurrentPage](#api_getCurrentPage): 获取当前页
++ [base64ToPath](#api_base64ToPath): 把base64的图片转成临时路径
++ [pathToBase64](#api_pathToBase64): 把图片的临时路径转成base64
++ [sleep](#api_sleep): async 内部程序等待一定时间后再执行
++ [throttle](#api_throttle): 节流
++ [debounce](#api_debounce): 防抖
++ [random](#api_random): 返回指定范围的随机数
++ [range](#api_range): 生成区间数组 
++ [clamp](#api_clamp): 夹在min和max之间的数值 
++ [floatAdd](#api_floatAdd): 返回两个浮点数相加的结果
++ [fillZero](#api_fillZero): 补零，如果传入的是个位数则在前面补0
++ [exif](#api_exif): 获取图片exif
++ [selectComponent](#api_selectComponent): 获取页面或当前实例的指定组件
++ [createAnimation](#api_createAnimation): uni.createAnimation
++ [animation](#api_animation): 数值从一个值到另一个值的过渡
++ [camelCase](#api_camelCase): 字符串转换为 camelCase 或 PascalCase 风格的命名约定
++ [kebabCase](#api_kebabCase): 将字符串转换为指定连接符的命名约定
++ [closest](#api_closest): 在给定数组中找到最接近目标数字的元素
++ [shuffle](#api_shuffle): 将给定的数组打乱
++ [merge](#api_merge): 深度合并两个对象
++ [isBase64](#api_isBase64): 判断字符串是否为base64
++ [isNumber](#api_isNumber): 检查一个值是否为数字类型
++ [isNumeric](#api_isNumeric): 检查一个值是否为数字类型或表示数字的字符串
++ [isString](#api_isString): 检查一个值是否为字符串类型
++ [isIP](#api_isIP): 检查一个值是否为IP地址格式
++ [composition-api](#api_composition-api): 为兼容vue2
+
+## Utils
+
+
+### getRect <a id="api_getRect"></a>
+- 返回节点尺寸信息
+
+```js
+// 组件内需要传入上下文
+// 如果是nvue 则需要在节点上加与id或class同名的ref
+getRect('#id',this).then(res => {})
+```
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+
+
+### addUnit <a id="api_addUnit"></a> 
+- 将未带单位的数值添加px，如果有单位则返回原值
+
+```js
+addUnit(10)
+// 10px
+```
+
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+
+
+### unitConvert <a id="api_unitConvert"></a>
+- 将带有rpx|px的字符转成number,若本身是number则直接返回
+
+```js
+unitConvert('10rpx') 
+// 5 设备不同 返回的值也不同
+unitConvert('10px') 
+// 10
+unitConvert(10) 
+// 10
+```
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+
+### canIUseCanvas2d <a id="api_canIUseCanvas2d"></a>
+- 环境是否支持使用 canvas 2d
+
+```js
+canIUseCanvas2d()
+// 若支持返回 true 否则 false
+```
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+
+### getCurrentPage <a id="api_getCurrentPage"></a>
+- 获取当前页
+
+```js
+const page = getCurrentPage()
+```
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+
+### base64ToPath <a id="api_base64ToPath"></a>
+- 把base64的图片转成临时路径
+
+```js
+base64ToPath(`xxxxx`).then(res => {})
+```
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+
+### pathToBase64 <a id="api_pathToBase64"></a>
+- 把图片的临时路径转成base64
+
+```js
+pathToBase64(`xxxxx/xxx.png`).then(res => {})
+```
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+
+### sleep <a id="api_sleep"></a>
+- 睡眠，让 async 内部程序等待一定时间后再执行
+
+```js
+async next () => {
+	await sleep(300)
+	console.log('limeui');
+}
+```
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+### throttle <a id="api_throttle"></a> 
+- 节流
+
+```js
+throttle((nama) => {console.log(nama)}, 200)('limeui');
+```
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+### debounce <a id="api_debounce"></a>
+- 防抖
+
+```js
+debounce((nama) => {console.log(nama)}, 200)('limeui');
+```
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+### random <a id="api_random"></a>
+- 返回指定范围的随机数
+
+```js
+random(1, 5);
+```
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+### range <a id="api_range"></a>
+- 生成区间数组
+
+```js
+range(0, 5)
+// [0,1,2,3,4,5]
+```
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+
+### clamp <a id="api_clamp"></a>
+- 夹在min和max之间的数值，如小于min，返回min, 如大于max，返回max，否侧原值返回
+
+```js
+clamp(0, 10, -1)
+// 0
+clamp(0, 10, 11)
+// 10
+clamp(0, 10, 9)
+// 9
+```
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+
+### floatAdd <a id="api_floatAdd"></a>
+- 返回两个浮点数相加的结果
+
+```js
+floatAdd(0.1, 0.2) // 0.3
+```
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+### fillZero <a id="api_fillZero"></a>
+- 补零，如果传入的是`个位数`则在前面补0
+
+```js
+fillZero(9);
+// 09
+```
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+### exif <a id="api_exif"></a>
+- 获取图片exif
+- 支持临时路径、base64
+
+```js
+uni.chooseImage({
+	count: 1, //最多可以选择的图片张数
+	sizeType: "original",
+	success: (res) => {
+		exif.getData(res.tempFiles[0], function() {
+			let tagj = exif.getTag(this, "GPSLongitude");
+			let	Orientation = exif.getTag(this, 'Orientation');  
+			console.log(tagj, Orientation)
+		})
+	}
+})
+```
+
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | x                 | 
+
+
+### selectComponent <a id="api_selectComponent"></a>
+- 获取页面或当前实例的指定组件，会在页面或实例向所有的节点查找（包括子组件或子子组件）
+- 仅vue3，vue2没有测试过
+
+```js
+// 当前页面
+const page = getCurrentPage()
+selectComponent('.custom', {context: page}).then(res => {
+})
+```
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | x                 | 
+
+
+
+### createAnimation <a id="api_createAnimation"></a>
+- 创建动画，与uni.createAnimation使用方法一致，只为了抹平nvue
+
+```html
+<view ref="ball" :animation="animationData"></view>
+```
+```js
+const ball = ref(null)
+const animation = createAnimation({
+  transformOrigin: "50% 50%",
+  duration: 1000,
+  timingFunction: "ease",
+  delay: 0
+})
+
+animation.scale(2,2).rotate(45).step()
+// nvue 无导出数据，这样写只为了平台一致，
+// nvue 需要把 ref 传入，其它平台不需要
+const animationData = animation.export(ball.value)
+```
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+
+### camelCase <a id="api_camelCase"></a>
+- 将字符串转换为 camelCase 或 PascalCase 风格的命名约定
+
+```js
+camelCase("hello world") // helloWorld
+camelCase("hello world", true) // HelloWorld
+```
+
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+### kebabCase <a id="api_kebabCase"></a>
+- 将字符串转换为指定连接符的命名约定
+
+```js
+kebabCase("helloWorld") // hello-world
+kebabCase("hello world_example") // hello-world-example
+kebabCase("helloWorld", "_") // hello_world
+```
+
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+
+
+### closest <a id="api_closest"></a>
+- 在给定数组中找到最接近目标数字的元素
+
+```js
+closest([1, 3, 5, 7, 9], 6) // 5
+```
+
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+### shuffle <a id="api_shuffle"></a>
+- 在给定数组中找到最接近目标数字的元素
+
+```js
+shuffle([1, 3, 5, 7, 9]) 
+```
+
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+### merge <a id="api_merge"></a>
+- 深度合并两个对象
+
+```js
+const original = { color: 'red' };
+const merged = merge({ ...original }, { color: 'blue', size: 'M' });
+
+console.log('original', original);    // 输出: { color: 'red' } (保持不变)
+console.log('merged', merged);      // 输出: { color: 'red', size: 'M' }
+
+
+type ColorType = {
+	color?: string,
+	size?: string,
+}
+
+const merged2 = merge({ color: 'red' } as ColorType, { color: 'blue', size: 'M' } as ColorType);
+console.log('merged2', merged2)
+```
+
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+
+
+### isBase64 <a id="api_isBase64"></a>
+- 判断字符串是否为base64
+
+```js
+isBase64('xxxxx')
+```
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+### isNumber <a id="api_isNumber"></a>
+-  检查一个值是否为数字类型
+
+```js
+isNumber('0') // false
+isNumber(0) // true
+```
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+### isNumeric <a id="api_isNumeric"></a>
+-  检查一个值是否为数字类型或表示数字的字符串
+
+```js
+isNumeric('0') // true
+isNumeric(0) // true
+```
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+### isString <a id="api_isString"></a>
+-  检查一个值是否为数字类型或表示数字的字符串
+
+```js
+isString('0') // true
+isString(0) // false
+```
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+### isIP <a id="api_isIP"></a>
+-  检查一个值是否为IP地址格式，可以检测ipv4,ipv6
+
+```js
+console.log(isIP('192.168.1.1'));             // true
+console.log(isIP('2001:0db8:85a3:0000:0000:8a2e:0370:7334')); // true
+
+console.log(isIP('192.168.1.1', 4));             // true
+console.log(isIP('255.255.255.255', { version: 4 })); // true
+
+// 标准IPv6格式
+console.log(isIP('2001:0db8:85a3:0000:0000:8a2e:0370:7334', 6)); // true
+console.log(isIP('fe80::1%eth0', { version: 6 }));               // true（带区域标识）
+
+```
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | √                 | 
+
+
+
+
+## composition-api <a id="api_composition-api"></a>
+- 因本人插件需要兼容vue2/vue3，故增加一个vue文件,代替条件编译
+- vue2需要在main.js加上这一段
+```js
+// vue2
+import Vue from 'vue'
+import VueCompositionAPI from '@vue/composition-api'
+Vue.use(VueCompositionAPI)
+```
+
+```js
+//使用
+import {computed, onMounted, watch, reactive} from '@/uni_modules/lime-shared/vue'
+```
+
+##### 兼容性
+| uni-app      | uni-app x                      | 
+|------------|----------------------------------|
+| √     | x                 | 
diff --git a/uni_modules/lime-shared/selectAllComponent/index.ts b/uni_modules/lime-shared/selectAllComponent/index.ts
new file mode 100644
index 0000000..e30a2c8
--- /dev/null
+++ b/uni_modules/lime-shared/selectAllComponent/index.ts
@@ -0,0 +1,10 @@
+// @ts-nocheck
+// #ifdef UNI-APP-X
+// export * from './uvue.uts'
+export { selectAllComponent } from './uvue.uts'
+// #endif
+
+// #ifndef UNI-APP-X
+// export * from './vue.ts'
+export { selectAllComponent } from './vue.ts'
+// #endif
\ No newline at end of file
diff --git a/uni_modules/lime-shared/selectAllComponent/uvue.uts b/uni_modules/lime-shared/selectAllComponent/uvue.uts
new file mode 100644
index 0000000..07c9fcd
--- /dev/null
+++ b/uni_modules/lime-shared/selectAllComponent/uvue.uts
@@ -0,0 +1,39 @@
+// @ts-nocheck
+import { type ComponentPublicInstance } from 'vue';
+
+type SelectOptions = {
+	context : ComponentPublicInstance,
+	needAll : boolean | null,
+	
+}
+
+export function selectAllComponent(selector : string, options : UTSJSONObject) : ComponentPublicInstance[]|null {
+	const context = options.get('context')! as ComponentPublicInstance;
+	let needAll = options.get('needAll') as  boolean;
+	let result:ComponentPublicInstance[] = []
+	
+	if(needAll == null) { needAll = true };
+	
+	if(context.$children.length > 0) {
+		const queue:ComponentPublicInstance[] = [...context.$children];
+		while(queue.length > 0) {
+			const child = queue.shift();
+			const name = child?.$options?.name;
+			if(name == selector) {
+				result.push(child as ComponentPublicInstance)
+			} else {
+				const children = child?.$children 
+				if(children !== null) {
+					queue.push(...children)
+				}
+			}
+			if(result.length > 0 && !needAll) {
+				break;
+			}
+		}
+	}
+	if(result.length > 0) {
+		return result
+	}
+	return null
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/selectAllComponent/vue.ts b/uni_modules/lime-shared/selectAllComponent/vue.ts
new file mode 100644
index 0000000..380bd7a
--- /dev/null
+++ b/uni_modules/lime-shared/selectAllComponent/vue.ts
@@ -0,0 +1,151 @@
+// @ts-nocheck
+interface SelectOptions {
+	context?: any
+	needAll?: boolean
+	node?: boolean
+}
+// #ifdef MP
+function selectMPComponent(key: string, name: string, context: any, needAll: boolean) {
+	const {proxy, $vm} = context
+	context = $vm || proxy
+	if(!['ref','component'].includes(key)) {
+		const queue = [context]
+		let result = null
+		const selector = (key == 'id' ? '#': '.') + name;
+		while(queue.length > 0) {
+			const child = queue.shift();
+			const flag = child?.selectComponent(selector)
+			if(flag) {
+				if(!needAll) {return result = flag.$vm}
+				return result = child.selectAllComponents(selector).map(item => item.$vm)
+			} else {
+				child.$children && (queue.push(...child.$children));
+			}
+		}
+		return result
+	} else {
+		const {$templateRefs} = context.$
+		const nameMap = {}
+		for (var i = 0; i < $templateRefs.length; i++) {
+			const item = $templateRefs[i]
+			nameMap[item.i] = item.r
+		}
+		let result = []
+		if(context.$children.length) {
+			const queue = [...context.$children]
+			while(queue.length > 0) {
+				const child = queue.shift();
+				if(key == 'component' && (child.type?.name === name || child.$?.type?.name === name)) {
+					result.push(child)
+				} else if(child.$refs && child.$refs[name]) {
+					result = child.$refs[name]
+				} else if(nameMap[child.id] === name){
+					result.push(child)
+				}  else {
+					child.$children && (queue.push(...child.$children));
+				}
+				if(result.length && !needAll) {
+					return;
+				}
+			}
+		}
+		return needAll ? result : result[0]
+	}
+}
+// #endif
+// #ifdef H5
+function selectH5Component(key: string, name: string, context: any, needAll: boolean) {
+	const {_, component } = context
+	const child = {component: _ || component || context, children: null , subTree: null, props: null}
+	let result = []
+	let queue = [child]
+	while(queue.length > 0 ) {
+		const child = queue.shift()
+		const {component, children , props, subTree} = child
+		if(key === 'component' && component?.type?.name == name) {
+			result.push(component)
+		} else if(key === 'ref' && component && (props?.ref == name || component[key][name])) {
+			if(props?.ref == name) {
+				//exposed
+				result.push(component)
+			} else if(component[key][name]) {
+				result.push(component[key][name])
+			}
+		} else if(key !== 'ref' && component?.exposed && new RegExp(`\\b${name}\\b`).test(component.attrs[key])) {
+			// exposed
+			result.push(component)
+		} else if(children && Array.isArray(children)) {
+			queue.push(...children)
+		} else if(!component && subTree) {
+			queue.push(subTree)
+		} else if(component?.subTree) {
+			queue.push(component.subTree)
+		}
+		if(result.length && !needAll) {
+			break
+		}
+	}
+	return needAll ? result : result[0]
+}
+// #endif
+// #ifdef APP
+function selectAPPComponent(key: string, name: string, context: any, needAll: boolean, node: boolean) {
+	let result = []
+	// const {_, component} = context
+	// const child = {component: _ || component || context, children: null, props: null, subTree: null}
+	const queue = [context]
+	while(queue.length > 0) {
+		const child = queue.shift()
+		const {component, children, props, subTree} = child
+		const isComp = component && props && component.exposed && !node
+		if(key == 'component' && child.type && child.type.name === name) {
+			result.push(component)
+		} else if(props?.[key] === name && node) {
+			result.push(child)
+		} else if(key === 'ref' && isComp && (props.ref === name || props.ref_key === name)) {
+			// exposed
+			result.push(component)
+		} else if(key !== 'ref' && isComp && new RegExp(`\\b${name}\\b`).test(props[key])) {
+			// exposed
+			result.push(component)
+		}
+		// else if(component && component.subTree && Array.isArray(component.subTree.children)){
+		// 	queue.push(...component.subTree.children)
+		// }
+		else if(subTree) {
+			queue.push(subTree)
+		} else if(component && component.subTree){
+			queue.push(component.subTree)
+		} 
+		 else if(children && Array.isArray(children)) {
+			queue.push(...children)
+		}
+		if(result.length && !needAll) {
+			break;
+		}
+	}
+	return needAll ? result : result[0]
+}
+// #endif
+export function selectAllComponent(selector: string, options: SelectOptions = {}) {
+	// . class
+	// # id
+	// $ ref
+	// @ component name
+	const reg = /^(\.|#|@|\$)([a-zA-Z_0-9\-]+)$/;
+	if(!reg.test(selector)) return null
+	let { context, needAll = true, node} = options
+	const [,prefix, name] = selector.match(reg)
+	const symbolMappings  = {'.': 'class', '#': 'id', '$':'ref', '@':'component'}
+	
+	const key = symbolMappings [prefix] //prefix === '.' ? 'class' : prefix === '#' ? 'id' : 'ref';
+	// #ifdef MP
+	return selectMPComponent(key, name, context, needAll)
+	// #endif
+	// #ifdef H5
+	return selectH5Component(key, name, context, needAll)
+	// #endif
+	// #ifdef APP
+	return selectAPPComponent(key, name, context, needAll, node)
+	// #endif
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/selectComponent/index.ts b/uni_modules/lime-shared/selectComponent/index.ts
new file mode 100644
index 0000000..759272e
--- /dev/null
+++ b/uni_modules/lime-shared/selectComponent/index.ts
@@ -0,0 +1,9 @@
+// @ts-nocheck
+// #ifndef UNI-APP-X
+// export * from './vue.ts'
+export { selectComponent } from './vue.ts'
+// #endif
+// #ifdef UNI-APP-X
+// export * from './uvue.uts'
+export { selectComponent } from './uvue.uts'
+// #endif
\ No newline at end of file
diff --git a/uni_modules/lime-shared/selectComponent/uvue.uts b/uni_modules/lime-shared/selectComponent/uvue.uts
new file mode 100644
index 0000000..c2aa2bc
--- /dev/null
+++ b/uni_modules/lime-shared/selectComponent/uvue.uts
@@ -0,0 +1,75 @@
+// @ts-nocheck
+import { type ComponentPublicInstance } from 'vue';
+// #ifdef APP
+function findChildren(selector: string, context: ComponentPublicInstance, needAll: boolean): ComponentPublicInstance [] | null{
+	let result:ComponentPublicInstance[] = []
+	
+	if(context !== null && context.$children.length > 0) {
+		const queue:ComponentPublicInstance[] = [...context.$children];
+		while(queue.length > 0) {
+			const child = queue.shift();
+			const name = child?.$options?.name;
+			if(name == selector) {
+				result.push(child as ComponentPublicInstance)
+			} else {
+				const children = child?.$children 
+				if(children !== null) {
+					queue.push(...children)
+				}
+			}
+			if(result.length > 0 && !needAll) {
+				break;
+			}
+		}
+	}
+	if(result.length > 0) {
+		return result
+	}
+	return null
+}
+
+class Query {
+	context : ComponentPublicInstance | null = null
+	selector : string = ''
+	// components : ComponentPublicInstance[] = []
+	constructor(selector : string, context : ComponentPublicInstance | null) {
+		this.selector = selector
+		this.context = context
+	}
+	in(context : ComponentPublicInstance) : Query {
+		return new Query(this.selector, context)
+	}
+	find(): ComponentPublicInstance | null {
+		const selector = this.selector
+		if(selector == '') return null
+		const component = findChildren(selector, this.context!, false)
+		return component != null ? component[0]: null
+	}
+	findAll():ComponentPublicInstance[] | null {
+		const selector = this.selector
+		if(selector == '') return null
+		return findChildren(selector, this.context!, true)
+	}
+	closest(): ComponentPublicInstance | null {
+		const selector = this.selector
+		if(selector == '') return null
+		let parent = this.context!.$parent
+		let name = parent?.$options?.name;
+		while (parent != null && (name == null || selector != name)) {
+			parent = parent.$parent
+			if (parent != null) {
+				name = parent.$options.name
+			}
+		}
+		return parent
+	}
+}
+
+export function selectComponent(selector: string): Query{
+	return new Query(selector, null)
+}
+// #endif
+
+// selectComponent('selector').in(this).find()
+// selectComponent('selector').in(this).findAll()
+// selectComponent('selector').in(this).closest()
diff --git a/uni_modules/lime-shared/selectComponent/vue.ts b/uni_modules/lime-shared/selectComponent/vue.ts
new file mode 100644
index 0000000..9fca0cd
--- /dev/null
+++ b/uni_modules/lime-shared/selectComponent/vue.ts
@@ -0,0 +1,149 @@
+// @ts-nocheck
+// #ifdef MP
+function findChildren(selector : string, context : ComponentPublicInstance, needAll : boolean) {
+	const { proxy, $vm } = context
+	context = $vm || proxy
+	if ((selector.startsWith('.') || selector.startsWith('#'))) {
+		const queue = [context]
+		let result = null
+		while (queue.length > 0) {
+			const child = queue.shift();
+			const flag = child?.selectComponent(selector)
+			if (flag) {
+				if (!needAll) { return result = flag.$vm }
+				return result = child.selectAllComponents(selector).map(item => item.$vm)
+			} else {
+				child.$children && (queue.push(...child.$children));
+			}
+		}
+		return result
+	} else {
+		const { $templateRefs } = context.$
+		const selectorValue = /#|\.|@|$/.test(selector) ? selector.substring(1) : selector
+		const nameMap = {}
+		for (var i = 0; i < $templateRefs.length; i++) {
+			const item = $templateRefs[i]
+			nameMap[item.i] = item.r
+		}
+		let result = []
+		if (context.$children.length) {
+			const queue = [...context.$children]
+			while (queue.length > 0) {
+				const child = queue.shift();
+				if (child.type?.name === selectorValue || child.$?.type?.name === selectorValue) {
+					result.push(child)
+				} else if (child.$refs && child.$refs[selectorValue]) {
+					result = child.$refs[selectorValue]
+				} else if (nameMap[child.id] === selectorValue) {
+					result.push(child)
+				} else {
+					child.$children && (queue.push(...child.$children));
+				}
+				if (result.length && !needAll) {
+					return;
+				}
+			}
+		}
+		return needAll ? result : result[0]
+	}
+}
+// #endif
+
+// #ifdef H5
+function findChildren(selector : string, context : ComponentPublicInstance, needAll : boolean){
+	const {_, component } = context
+	const child = {component: _ || component || context, children: null , subTree: null, props: null}
+	let result = []
+	let queue = [child]
+	const selectorValue = /#|\.|@|$/.test(selector) ? selector.substring(1) : selector
+	while(queue.length > 0 ) {
+		const child = queue.shift()
+		const {component, children , props, subTree} = child
+		if(component?.type?.name == selectorValue) {
+			result.push(component)
+		} else if(selector.startsWith('$') && component && (props?.ref == selectorValue || component[key][selectorValue])) {
+			if(props?.ref == selectorValue) {
+				//exposed
+				result.push(component)
+			} else if(component[key][selectorValue]) {
+				result.push(component[key][selectorValue])
+			}
+		} else if(!selector.startsWith('$') && component?.exposed && new RegExp(`\\b${selectorValue}\\b`).test(component.attrs[key])) {
+			// exposed
+			result.push(component)
+		} else if(children && Array.isArray(children)) {
+			queue.push(...children)
+		} else if(!component && subTree) {
+			queue.push(subTree)
+		} else if(component?.subTree) {
+			queue.push(component.subTree)
+		}
+		if(result.length && !needAll) {
+			break
+		}
+	}
+	return needAll ? result : result[0]
+}
+// #endif
+
+// #ifdef APP
+function findChildren(selector : string, context : ComponentPublicInstance, needAll : boolean){
+	let result = []
+	const selectorValue = /#|\.|@|$/.test(selector) ? selector.substring(1) : selector
+	const queue = [context]
+	while(queue.length > 0) {
+		const child = queue.shift()
+		const {component, children, props, subTree} = child
+		const isComp = component && props && component.exposed && !node
+		if(child.type && child.type.name === selectorValue) {
+			result.push(component)
+		} else if(props?.[key] === selectorValue && node) {
+			result.push(child)
+		} else if(selector.startsWith('$') && isComp && (props.ref === selectorValue || props.ref_key === selectorValue)) {
+			// exposed
+			result.push(component)
+		} else if(!selector.startsWith('$') && isComp && new RegExp(`\\b${selectorValue}\\b`).test(props[key])) {
+			// exposed
+			result.push(component)
+		}
+		else if(subTree) {
+			queue.push(subTree)
+		} else if(component && component.subTree){
+			queue.push(component.subTree)
+		} 
+		 else if(children && Array.isArray(children)) {
+			queue.push(...children)
+		}
+		if(result.length && !needAll) {
+			break;
+		}
+	}
+	return needAll ? result : result[0]
+}
+// #endif
+
+class Query {
+	context : ComponentPublicInstance | null = null
+	selector : string = ''
+	// components : ComponentPublicInstance[] = []
+	constructor(selector : string, context : ComponentPublicInstance | null) {
+		this.selector = selector
+		this.context = context
+	}
+	in(context : ComponentPublicInstance) : Query {
+		return new Query(this.selector, context)
+	}
+	find() : ComponentPublicInstance | null {
+		return findChildren(this.selector, this.context, false)
+	}
+	findAll() : ComponentPublicInstance[] | null {
+		return findChildren(this.selector, this.context, true)
+	}
+	closest() : ComponentPublicInstance | null {
+		return null
+	}
+}
+
+export function selectComponent(selector: string) {
+	return new Query(selector)
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/selectElement/index.ts b/uni_modules/lime-shared/selectElement/index.ts
new file mode 100644
index 0000000..fbe5fb4
--- /dev/null
+++ b/uni_modules/lime-shared/selectElement/index.ts
@@ -0,0 +1,277 @@
+// @ts-nocheck
+import {isDef} from '../isDef'
+// #ifdef UNI-APP-X
+import {type ComponentPublicInstance} from '../vue'
+// #endif
+
+type HasSelectorFunc = (selector : string, element : UniElement) => boolean
+
+const hasSelectorClassName : HasSelectorFunc = (selector : string, element : UniElement) : boolean => {
+	return element.classList.includes(selector)
+}
+const hasSelectorId : HasSelectorFunc = (selector : string, element : UniElement) : boolean => {
+	return element.getAttribute("id") == selector
+}
+const hasSelectorTagName : HasSelectorFunc = (selector : string, element : UniElement) : boolean => {
+	return element.tagName!.toLowerCase() == selector.toLowerCase()
+}
+
+type ProcessSelectorResult = {
+	selectorValue : string
+	hasSelector : HasSelectorFunc
+}
+const processSelector = (selector : string) : ProcessSelectorResult => {
+
+	const selectorValue = /#|\./.test(selector) ? selector.substring(1) : selector
+	let hasSelector : HasSelectorFunc
+
+	if (selector.startsWith('.')) {
+		hasSelector = hasSelectorClassName
+	} else if (selector.startsWith('#')) {
+		hasSelector = hasSelectorId
+	} else {
+		hasSelector = hasSelectorTagName
+	}
+
+	return {
+		selectorValue,
+		hasSelector
+	} as ProcessSelectorResult
+}
+
+
+function isNotEmptyString(str:string): boolean {
+  return str.length > 0;
+}
+
+function isElement(element:UniElement|null):boolean {
+  return isDef(element) && element?.tagName != 'COMMENT';
+}
+
+type ElementArray = Array<UniElement|null>
+class Query {
+	context : ComponentPublicInstance | null = null
+	selector : string = ''
+	elements : ElementArray = []
+	constructor(selector : string | null, context : ComponentPublicInstance | null) {
+		this.context = context
+		if(selector != null){
+			this.selector = selector
+		}
+		this.find(this.selector)
+	}
+	in(context : ComponentPublicInstance) : Query {
+		return new Query(this.selector, context)
+	}
+	findAll(selector : string): Query {
+		if (isDef(this.context)) {
+			const root = this.context?.$el //as Element | null;
+			if (isDef(root)) {
+				this.elements = [root!] //as ElementArray
+			}
+			const { selectorValue, hasSelector } = processSelector(selector)
+			const foundElements : ElementArray = [];
+		
+			function findChildren(element : UniElement) {
+				element.children.forEach((child : UniElement) => {
+					if (hasSelector(selectorValue, child)) {
+						foundElements.push(child)
+					}
+				})
+			}
+			this.elements.forEach(el => {
+				findChildren(el!);
+			});
+			this.elements = foundElements
+		} else if (selector.startsWith('#')) {
+			const element = uni.getElementById(selector)
+			if (isElement(element!)) {
+				this.elements = [element]
+			}
+		}
+		return this;
+	}
+	/**
+	 * 在当前元素集合中查找匹配的元素
+	 */
+	find(selector : string) : Query {
+		if (isDef(this.context)) {
+			const root = this.context?.$el //as Element | null;
+			if (isElement(root)) {
+				this.elements = [root] //as ElementArray
+			}
+			if(isNotEmptyString(selector) && this.elements.length > 0){
+				const { selectorValue, hasSelector } = processSelector(selector)
+				const foundElements : ElementArray = [];
+				function findChildren(element : UniElement) {
+					element.children.forEach((child : UniElement) => {
+						if (hasSelector(selectorValue, child) && foundElements.length < 1) {
+							foundElements.push(child)
+						}
+						if (foundElements.length < 1) {
+							findChildren(child);
+						}
+					})
+				}
+				this.elements.forEach(el => {
+					findChildren(el!);
+				});
+				this.elements = foundElements
+			}
+			
+		} else if (selector.startsWith('#')) {
+			const element = uni.getElementById(selector)
+			if (isElement(element!)) {
+				this.elements = [element]
+			}
+		}
+		return this;
+	}
+	/**
+	 * 获取当前元素集合的直接子元素
+	 */
+	children() : Query {
+		// if (this.elements.length > 0) {
+			// const children = this.elements.reduce((acc, el) => [...acc, ...Array.from(el.children)], []);
+			// this.elements = children;
+		// }
+		return this;
+	}
+	/**
+	 * 获取当前元素集合的父元素
+	 */
+	parent() : Query {
+		// if (this.elements.length > 0) {
+		// 	const parents = this.elements.map(el => el.parentElement).filter(parent => parent !== null) as ElementArray;
+		// 	this.elements = parents
+		// 	// this.elements = Array.from(new Set(parents));
+		// }
+		return this;
+	}
+	/**
+	 * 获取当前元素集合的兄弟元素
+	 */
+	siblings() : Query {
+		// if (this.elements.length > 0) {
+			// const siblings = this.elements.reduce((acc, el) => [...acc, ...Array.from(el.parentElement?.children || [])], []);
+			// this.elements = siblings.filter(sibling => sibling !== null && !this.elements?.includes(sibling));
+		// }
+		return this;
+	}
+	/**
+	 * 获取当前元素集合的下一个兄弟元素
+	 */
+	next() : Query {
+		// if (this.elements.length > 0) {
+		// 	const nextElements = this.elements.map(el => el.nextElementSibling).filter(next => next !== null) as ElementArray;
+		// 	this.elements = nextElements;
+		// }
+		return this;
+	}
+	/**
+	 * 获取当前元素集合的上一个兄弟元素
+	 */
+	prev() : Query {
+		// if (this.elements.length > 0) {
+		// 	const prevElements = this.elements.map(el => el.previousElementSibling).filter(prev => prev !== null) as ElementArray;
+		// 	this.elements = prevElements;
+		// }
+		return this;
+	}
+	/**
+	 * 从当前元素开始向上查找匹配的元素
+	 */
+	closest(selector : string) : Query {
+		if (isDef(this.context)) {
+			// && this.context.$parent != null && this.context.$parent.$el !== null
+			if(this.elements.length == 0 && isDef(this.context?.$parent) && isElement(this.context!.$parent?.$el)){
+				this.elements = [this.context!.$parent?.$el!]
+			}
+			
+			const selectorsArray = selector.split(',')
+			// const { selectorValue, hasSelector } = processSelector(selector)
+			const processedSelectors = selectorsArray.map((selector: string):ProcessSelectorResult => processSelector(selector)) 
+			const closestElements = this.elements.map((el) : UniElement | null => {
+				let closestElement : UniElement | null = el
+				while (closestElement !== null) {
+					// if (hasSelector(selectorValue, closestElement)) {
+					// 	break;
+					// }
+					const isMatchingSelector = processedSelectors.some(({selectorValue, hasSelector}):boolean => {
+						return hasSelector(selectorValue, closestElement!)
+					})
+					if(isMatchingSelector){
+						break;
+					}
+					closestElement = closestElement.parentElement;
+				}
+				return closestElement
+			})
+			this.elements = closestElements.filter((closest : UniElement | null) : boolean => isDef(closest))// as ElementArray
+			
+		}
+		return this;
+	}
+
+	/**
+	 * 从当前元素集合中过滤出匹配的元素
+	 */
+	filter() : Query {
+
+		return this;
+	}
+	/**
+	 * 从当前元素集合中排除匹配的元素
+	 */
+	not() { }
+	/**
+	 * 从当前元素集合中查找包含匹配元素的元素
+	 */
+	has() { }
+	/**
+	 * 获取当前元素集合的第一个
+	 */
+	first() : Query {
+		if (this.elements.length > 0) {
+			// this.elements = [this.elements[0]];
+		}
+		return this;
+	}
+	/**
+	 * 最后一个元素
+	 */
+	last() : Query {
+		if (this.elements.length > 0) {
+			// this.elements = [this.elements[this.elements.length - 1]];
+		}
+		return this;
+	}
+	/**
+	 * 获取当前元素在其兄弟元素中的索引
+	 */
+	index() : number | null {
+		// if (this.elements.length > 0 && this.elements.length > 0 && this.elements[0].parentElement !== null) {
+		// 	return Array.from(this.elements[0].parentElement.children).indexOf(this.elements[0]);
+		// }
+		return null;
+	}
+	get(index : number) : UniElement | null {
+		if (this.elements.length > index) {
+			return this.elements[index] //as Element
+		}
+		return null
+	}
+}
+
+export function selectElement(selector : string | null = null) : Query {
+	// if(typeof selector == 'string' || selector == null){
+	// 	return new Query(selector as string | null, null)
+	// } 
+	// else if(selector instanceof  ComponentPublicInstance){
+	// 	return new Query(null, selector)
+	// }
+	return new Query(selector, null)
+}
+
+// $('xxx').in(this).find('xxx')
+// $('xxx').in(this).get()
\ No newline at end of file
diff --git a/uni_modules/lime-shared/shuffle/index.ts b/uni_modules/lime-shared/shuffle/index.ts
new file mode 100644
index 0000000..5b3ab51
--- /dev/null
+++ b/uni_modules/lime-shared/shuffle/index.ts
@@ -0,0 +1,16 @@
+// @ts-nocheck
+/**
+ * 随机化数组中元素的顺序，使用 Fisher-Yates 算法
+ * @description 函数接受一个数组作为参数，返回一个新的数组，其中包含原数组随机化顺序后的元素。
+ * @param arr 要随机化的数组
+ * @returns 一个新的数组，其中包含原数组随机化顺序后的元素。
+ */
+export function shuffle<T>(arr : T[]) : T[] {
+	for (let i = arr.length - 1; i > 0; i--) {
+		const j = Math.floor(Math.random() * (i + 1))
+		const temp = arr[i]
+		arr[i] = arr[j]
+		arr[j] = temp
+	}
+	return arr
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/sleep/index.ts b/uni_modules/lime-shared/sleep/index.ts
new file mode 100644
index 0000000..a01cdfd
--- /dev/null
+++ b/uni_modules/lime-shared/sleep/index.ts
@@ -0,0 +1,44 @@
+// @ts-nocheck
+/**
+ * 延迟指定时间后解析的 Promise
+ * @param delay 延迟的时间（以毫秒为单位），默认为 300 毫秒
+ * @returns 一个 Promise，在延迟结束后解析
+ */
+
+
+// #ifdef UNI-APP-X && APP
+function sleep(delay: number = 300):Promise<boolean> {
+	return new Promise((resolve):void => {setTimeout(() => {resolve(true)}, delay)});
+}
+export {
+	sleep
+}
+
+// #endif
+
+// #ifndef UNI-APP-X && APP
+export const sleep = (delay: number = 300) =>
+  new Promise(resolve => setTimeout(resolve, delay));
+  
+// #endif
+  
+// 示例  
+// async function example() {
+//   console.log("Start");
+
+//   // 延迟 1 秒后执行
+//   await sleep(1000);
+//   console.log("1 second later");
+
+//   // 延迟 500 毫秒后执行
+//   await sleep(500);
+//   console.log("500 milliseconds later");
+
+//   // 延迟 2 秒后执行
+//   await sleep(2000);
+//   console.log("2 seconds later");
+
+//   console.log("End");
+// }
+
+// example();
\ No newline at end of file
diff --git a/uni_modules/lime-shared/throttle/index.ts b/uni_modules/lime-shared/throttle/index.ts
new file mode 100644
index 0000000..65604cb
--- /dev/null
+++ b/uni_modules/lime-shared/throttle/index.ts
@@ -0,0 +1,89 @@
+// @ts-nocheck
+/**
+ * 节流函数，用于限制函数的调用频率
+ * @param fn 要进行节流的函数
+ * @param interval 两次调用之间的最小间隔时间
+ * @returns 节流后的函数
+ */
+export type ThrottleOptions = {
+	/**
+	 * 是否在节流开始时立即执行
+	 * @default true
+	 */
+	leading ?: boolean;
+
+	/**
+	 * 是否在节流结束后执行最后一次调用
+	 * @default true
+	 */
+	trailing ?: boolean;
+}
+
+
+
+/**
+ * 节流函数，限制函数在一定时间内只能执行一次
+ * @param func 需要节流的函数
+ * @param wait 节流间隔时间（毫秒）
+ * @param options 配置选项
+ * @param options.leading 是否在节流开始时立即执行（默认 true）
+ * @param options.trailing 是否在节流结束时执行最后一次调用（默认 true）
+ * @returns 返回节流后的函数
+ */
+// #ifndef APP-ANDROID 
+export function throttle<T extends (...args : any[]) => any>(
+	func : T,
+	wait : number,
+	options : ThrottleOptions = {}
+) : (...args : Parameters<T>) => void {
+	let lastCallTime = 0;
+	let timerId : ReturnType<typeof setTimeout> | null = null;
+	const { leading = true, trailing = true } = options;
+	return function (...args : Parameters<T>) {
+		const now = Date.now();
+		const timeSinceLastCall = now - lastCallTime;
+		// 1. 如果 leading=true 且距离上次调用超过 wait，立即执行
+		if (leading && timeSinceLastCall >= wait) {
+			lastCallTime = now;
+			func.apply(this, args);
+		}
+		// 2. 如果 trailing=true，设置定时器在 wait 时间后执行最后一次调用
+		else if (trailing && !timerId) {
+			timerId = setTimeout(() => {
+				lastCallTime = Date.now();
+				func.apply(this, args);
+				timerId = null;
+			}, wait - timeSinceLastCall);
+		}
+	};
+}
+// #endif
+
+// #ifdef APP-ANDROID 
+export function throttle<T extends any|null>(
+	func: (args : T) => void, 
+	wait : number,
+	options : ThrottleOptions = {}
+) : (args : T) => void {
+	let lastCallTime = 0;
+	let timerId  = -1;
+	const { leading = true, trailing = true } = options;
+	return function (args : T) {
+		const now = Date.now();
+		const timeSinceLastCall = now - lastCallTime;
+		// 1. 如果 leading=true 且距离上次调用超过 wait，立即执行
+		if (leading && timeSinceLastCall >= wait) {
+			lastCallTime = now;
+			func(args);
+		}
+		// 2. 如果 trailing=true，设置定时器在 wait 时间后执行最后一次调用
+		else if (trailing && timerId > -1) {
+			timerId = setTimeout(() => {
+				lastCallTime = Date.now();
+				func(args);
+				timerId = -1;
+			}, wait - timeSinceLastCall);
+		}
+	};
+}
+// #endif
\ No newline at end of file
diff --git a/uni_modules/lime-shared/throttle/index_old.ts b/uni_modules/lime-shared/throttle/index_old.ts
new file mode 100644
index 0000000..914be49
--- /dev/null
+++ b/uni_modules/lime-shared/throttle/index_old.ts
@@ -0,0 +1,112 @@
+// @ts-nocheck
+/**
+ * 节流函数，用于限制函数的调用频率
+ * @param fn 要进行节流的函数
+ * @param delay 两次调用之间的最小间隔时间
+ * @returns 节流后的函数
+ */
+
+// #ifndef UNI-APP-X && APP
+// export function throttle(fn: (...args: any[]) => void, delay: number, options) {
+//   let flag = true; // 标记是否可以执行函数
+
+//   return (...args: any[]) => {
+//     if (flag) {
+//       flag = false; // 设置为不可执行状态
+//       fn(...args); // 执行传入的函数
+	
+//       setTimeout(() => {
+//         flag = true; // 经过指定时间后，设置为可执行状态
+//       }, delay);
+//     }
+//   };
+// }
+
+export function throttle<T extends (...args: any[]) => void>(
+  fn: T,
+  delay: number,
+  { leading = true, trailing = true }: { leading?: boolean; trailing?: boolean } = {}
+): (...args: Parameters<T>) => void {
+  let isCoolingDown = false;
+  let lastArgs: Parameters<T> | null = null;
+  let timerId: ReturnType<typeof setTimeout> | null = null;
+
+  const executeTrailing = () => {
+    if (trailing && lastArgs) {
+      fn(...lastArgs);
+      lastArgs = null;
+    }
+    isCoolingDown = false;
+    timerId = null;
+  };
+
+  return function (...args: Parameters<T>) {
+    // 1. 如果不在冷却期，且 leading=true，立即执行
+    if (!isCoolingDown && leading) {
+      fn(...args);
+      isCoolingDown = true;
+      timerId = setTimeout(executeTrailing, delay);
+    }
+    // 2. 如果在冷却期，记录最后一次调用的参数（用于 trailing）
+    else if (trailing) {
+      lastArgs = args;
+    }
+  };
+}
+// #endif
+
+
+// #ifdef UNI-APP-X && APP
+// type Rfun = (...args: any[]) => void
+// type Rfun = (...args: any[]) => void
+
+export function throttle<T extends any|null>(
+	fn: (args : T) => void, 
+	delay: number):(args : T) => void {
+	let flag = true; // 标记是否可以执行函数
+	
+	return (args : T) =>{
+		if(flag){
+			flag = false;
+			fn(args);
+			
+			setTimeout(()=>{
+				flag = true;
+			}, delay)
+		}
+	}
+  // return (...args: any[]) => {
+  //   // if (flag) {
+  //   //   flag = false; // 设置为不可执行状态
+  //   //   fn(...args); // 执行传入的函数
+
+  //   //   setTimeout(() => {
+  //   //     flag = true; // 经过指定时间后，设置为可执行状态
+  //   //   }, delay);
+  //   // }
+  // };
+}
+
+// #endif
+
+// // 示例
+// // 定义一个被节流的函数
+// function handleScroll() {
+//   console.log("Scroll event handled!");
+// }
+
+// // 使用节流函数对 handleScroll 进行节流，间隔时间为 500 毫秒
+// const throttledScroll = throttle(handleScroll, 500);
+
+// // 模拟多次调用 handleScroll
+// throttledScroll(); // 输出 "Scroll event handled!"
+// throttledScroll(); // 不会输出
+// throttledScroll(); // 不会输出
+
+// // 经过 500 毫秒后，再次调用 handleScroll
+// setTimeout(() => {
+//   throttledScroll(); // 输出 "Scroll event handled!"
+// }, 500);
+
+
+
diff --git a/uni_modules/lime-shared/toArray/index.ts b/uni_modules/lime-shared/toArray/index.ts
new file mode 100644
index 0000000..e0840d2
--- /dev/null
+++ b/uni_modules/lime-shared/toArray/index.ts
@@ -0,0 +1,21 @@
+// @ts-nocheck
+/**
+ * 将一个或多个元素转换为数组
+ * @param item 要转换为数组的元素
+ * @returns 转换后的数组
+ */
+// #ifndef UNI-APP-X && APP
+export const toArray = <T>(item: T | T[]): T[] => Array.isArray(item) ? item : [item];
+// #endif
+
+
+// #ifdef UNI-APP-X && APP
+export function toArray<T extends any>(item: any): T[] {
+	return Array.isArray(item) ? item as T[] : [item as T]// as T[]
+};
+// #endif
+// 示例
+// console.log(toArray(5)); // 输出: [5]
+// console.log(toArray("hello")); // 输出: ["hello"]
+// console.log(toArray([1, 2, 3])); // 输出: [1, 2, 3]
+// console.log(toArray(["apple", "banana"])); // 输出: ["apple", "banana"]
\ No newline at end of file
diff --git a/uni_modules/lime-shared/toBoolean/index.ts b/uni_modules/lime-shared/toBoolean/index.ts
new file mode 100644
index 0000000..6dda115
--- /dev/null
+++ b/uni_modules/lime-shared/toBoolean/index.ts
@@ -0,0 +1,40 @@
+// @ts-nocheck
+import { isNumber } from '../isNumber'
+import { isString } from '../isString'
+// 函数重载，定义多个函数签名
+// function toBoolean(value : any) : boolean;
+// function toBoolean(value : string) : boolean;
+// function toBoolean(value : number) : boolean;
+// function toBoolean(value : boolean) : boolean;
+
+// #ifdef UNI-APP-X && APP
+function toBoolean(value : any | null) : boolean {
+	// 根据输入值的类型，返回相应的布尔值
+	// if (isNumber(value)) {
+	// 	return (value as number) != 0;
+	// }
+	// if (isString(value)) {
+	// 	return `${value}`.length > 0;
+	// }
+	// if (typeof value == 'boolean') {
+	// 	return value as boolean;
+	// }
+	// #ifdef APP-IOS || APP-HARMONY
+	return value != null && value != undefined
+	// #endif
+	// #ifdef APP-ANDROID
+	return value != null
+	// #endif
+}
+// #endif
+
+
+// #ifndef UNI-APP-X && APP
+function toBoolean(value : any | null) : value is NonNullable<typeof value> {
+	return !!value//value !== null && value !== undefined;
+}
+// #endif
+
+export {
+	toBoolean
+}
\ No newline at end of file
diff --git a/uni_modules/lime-shared/toNumber/index.ts b/uni_modules/lime-shared/toNumber/index.ts
new file mode 100644
index 0000000..a8e1b1d
--- /dev/null
+++ b/uni_modules/lime-shared/toNumber/index.ts
@@ -0,0 +1,28 @@
+// @ts-nocheck
+/**
+ * 将字符串转换为数字
+ * @param val 要转换的字符串
+ * @returns 转换后的数字或原始字符串
+ */
+
+// #ifdef UNI-APP-X && APP
+// function toNumber(val: string): number
+// function toNumber(val: string): string 
+function toNumber(val: string): number|null {
+  const n = parseFloat(val); // 使用 parseFloat 函数将字符串转换为浮点数
+  return isNaN(n) ? null : n; // 使用 isNaN 函数判断是否为非数字，返回转换后的数字或原始字符串
+}
+export {toNumber}
+// #endif
+
+// #ifndef UNI-APP-X && APP
+export function toNumber(val: string): number | string {
+  const n = parseFloat(val); // 使用 parseFloat 函数将字符串转换为浮点数
+  return isNaN(n) ? val : n; // 使用 isNaN 函数判断是否为非数字，返回转换后的数字或原始字符串
+}
+// #endif
+
+// 示例
+// console.log(toNumber("123")); // 输出: 123
+// console.log(toNumber("3.14")); // 输出: 3.14
+// console.log(toNumber("hello")); // 输出: "hello"
\ No newline at end of file
diff --git a/uni_modules/lime-shared/unitConvert/index.ts b/uni_modules/lime-shared/unitConvert/index.ts
new file mode 100644
index 0000000..455d40d
--- /dev/null
+++ b/uni_modules/lime-shared/unitConvert/index.ts
@@ -0,0 +1,80 @@
+// @ts-nocheck
+import { isString } from '../isString'
+import { isNumeric } from '../isNumeric'
+
+/**
+ * 单位转换函数，将字符串数字或带有单位的字符串转换为数字
+ * @param value 要转换的值，可以是字符串数字或带有单位的字符串
+ * @returns 转换后的数字，如果无法转换则返回0
+ */
+// #ifndef UNI-APP-X && APP
+export function unitConvert(value : string | number | null | undefined, base: number = 0) : number {
+	// 如果是字符串数字
+	if (isNumeric(value)) {
+		return Number(value);
+	}
+	// 如果有单位
+	if (isString(value)) {
+		const reg = /^-?([0-9]+)?([.]{1}[0-9]+){0,1}(em|rpx|px|%)$/g;
+		const results = reg.exec(value);
+		if (!value || !results) {
+			return 0;
+		}
+		const unit = results[3];
+		const _value = parseFloat(value);
+		if (unit === 'rpx') {
+			return uni.upx2px(_value);
+		}
+		if (unit === 'px') {
+			return _value * 1;
+		}
+		if(unit == '%') {
+			return _value / 100 * base
+		}
+		// 如果是其他单位，可以继续添加对应的转换逻辑
+	}
+	return 0;
+}
+// #endif
+
+
+// #ifdef UNI-APP-X && APP
+import { isNumber } from '../isNumber'
+export function unitConvert(value : any | null, base: number = 0) : number {
+	if (isNumber(value)) {
+		return value as number
+	}
+	// 如果是字符串数字
+	if (isNumeric(value)) {
+		return parseFloat(value as string);
+	}
+	// 如果有单位
+	if (isString(value)) {
+		const reg = /^-?([0-9]+)?([.]{1}[0-9]+){0,1}(em|rpx|px|%)$/g;
+		const results = reg.exec(value as string);
+		if (results == null) {
+			return 0;
+		}
+		const unit = results[3];
+		const _value = parseFloat(value);
+		if (unit == 'rpx') {
+			// const { windowWidth } = uni.getWindowInfo()
+			// return windowWidth / 750 * _value;
+			return uni.rpx2px(_value)
+		}
+		if (unit == 'px') {
+			return _value;
+		}
+		if(unit == '%') {
+			return _value / 100 * base
+		}
+		// 如果是其他单位，可以继续添加对应的转换逻辑
+	}
+	return 0;
+}
+// #endif
+// 示例
+// console.log(unitConvert("123")); // 输出: 123 (字符串数字转换为数字)
+// console.log(unitConvert("3.14em")); // 输出: 0 (无法识别的单位)
+// console.log(unitConvert("20rpx")); // 输出: 根据具体情况而定 (根据单位进行转换)
+// console.log(unitConvert(10)); // 输出: 10 (数字不需要转换)
\ No newline at end of file
diff --git a/uni_modules/lime-shared/vue/index.ts b/uni_modules/lime-shared/vue/index.ts
new file mode 100644
index 0000000..07f7135
--- /dev/null
+++ b/uni_modules/lime-shared/vue/index.ts
@@ -0,0 +1,16 @@
+// @ts-nocheck
+
+// #ifdef VUE3
+export * from 'vue';
+// #endif
+
+// #ifndef VUE3
+export * from '@vue/composition-api';
+
+// #ifdef APP-NVUE
+import Vue from 'vue'
+import VueCompositionAPI from '@vue/composition-api'
+Vue.use(VueCompositionAPI)
+// #endif
+
+// #endif
diff --git a/uni_modules/lime-shared/while/index.ts b/uni_modules/lime-shared/while/index.ts
new file mode 100644
index 0000000..1b8a96b
--- /dev/null
+++ b/uni_modules/lime-shared/while/index.ts
@@ -0,0 +1,55 @@
+// @ts-nocheck
+
+// 来自kux大佬的神之一手
+// 原地址 https://ext.dcloud.net.cn/plugin?id=23291
+export type ControlCommand = 'continue' | 'break' | null;
+
+export type ControllableWhileReturn = {
+	start: () => void;
+	abort: () => void;
+	execContinue: () => 'continue';
+	execBreak: () => 'break';
+};
+
+export type Controller = {
+	abort: () => void;
+};
+
+export function controllableWhile(
+	condition : () => boolean,
+	body: (controller: Controller) => ControlCommand
+): ControllableWhileReturn {
+	let isActive = true;
+	
+	const controller: Controller = {
+		abort: () => {
+			isActive = false;
+		}
+	};
+	
+	const execContinue = () => 'continue';
+	const execBreak = () => 'break';
+	
+	return {
+		start: () => {
+			// #ifdef APP-ANDROID
+			UTSAndroid.getDispatcher('io').async((_) => {
+			// #endif
+				while (isActive && condition()) {
+					const result = body(controller);
+					if (result == 'break') {
+						controller.abort();
+						break;
+					} else if (result == 'continue') {
+						continue;
+					}
+				}
+			// #ifdef APP-ANDROID
+			}, null);
+			// #endif
+		},
+		abort: controller.abort,
+		execContinue: execContinue,
+		execBreak: execBreak
+	} as ControllableWhileReturn;
+}
\ No newline at end of file
diff --git a/uni_modules/uview-plus/README.md b/uni_modules/uview-plus/README.md
index 930e9cc..d5ba135 100644
--- a/uni_modules/uview-plus/README.md
+++ b/uni_modules/uview-plus/README.md
@@ -12,7 +12,7 @@
 
 ## 说明
 
-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(即将发布)的uni-app生态框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水。uview-plus是基于uView2.x移植的支持vue3的版本，感谢uView。
 
 ## 可视化设计
 
diff --git a/uni_modules/uview-plus/changelog.md b/uni_modules/uview-plus/changelog.md
index 82d2ea7..b84e996 100644
--- a/uni_modules/uview-plus/changelog.md
+++ b/uni_modules/uview-plus/changelog.md
@@ -1,3 +1,756 @@
+## 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）
diff --git a/uni_modules/uview-plus/components/u-action-sheet-data/u-action-sheet-data.vue b/uni_modules/uview-plus/components/u-action-sheet-data/u-action-sheet-data.vue
new file mode 100644
index 0000000..234d5cf
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-action-sheet/actionSheet.js b/uni_modules/uview-plus/components/u-action-sheet/actionSheet.js
index 086898d..6cb1e48 100644
--- a/uni_modules/uview-plus/components/u-action-sheet/actionSheet.js
+++ b/uni_modules/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组件
diff --git a/uni_modules/uview-plus/components/u-action-sheet/props.js b/uni_modules/uview-plus/components/u-action-sheet/props.js
index eb45834..408f32f 100644
--- a/uni_modules/uview-plus/components/u-action-sheet/props.js
+++ b/uni_modules/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'
 
diff --git a/uni_modules/uview-plus/components/u-action-sheet/u-action-sheet.vue b/uni_modules/uview-plus/components/u-action-sheet/u-action-sheet.vue
index 98174b8..10d9a06 100644
--- a/uni_modules/uview-plus/components/u-action-sheet/u-action-sheet.vue
+++ b/uni_modules/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,6 +65,7 @@
 							    @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
@@ -73,6 +77,7 @@
 									    class="u-action-sheet__item-wrap__item__subname"
 									>{{ item.subname }}</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
@@ -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/uni_modules/uview-plus/components/u-agreement/u-agreement.vue b/uni_modules/uview-plus/components/u-agreement/u-agreement.vue
new file mode 100644
index 0000000..438c467
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-album/album.js b/uni_modules/uview-plus/components/u-album/album.js
index 8aebaba..24f8eaa 100644
--- a/uni_modules/uview-plus/components/u-album/album.js
+++ b/uni_modules/uview-plus/components/u-album/album.js
@@ -3,9 +3,9 @@
  * @Description  :
  * @version      : 1.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/uni_modules/uview-plus/components/u-album/props.js b/uni_modules/uview-plus/components/u-album/props.js
index a219acb..a8d5474 100644
--- a/uni_modules/uview-plus/components/u-album/props.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-album/u-album.vue b/uni_modules/uview-plus/components/u-album/u-album.vue
index 08f987a..f9d79d1 100644
--- a/uni_modules/uview-plus/components/u-album/u-album.vue
+++ b/uni_modules/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,7 +68,7 @@ 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
 
@@ -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/uni_modules/uview-plus/components/u-alert/alert.js b/uni_modules/uview-plus/components/u-alert/alert.js
index 8f8182c..fb543c0 100644
--- a/uni_modules/uview-plus/components/u-alert/alert.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-alert/props.js b/uni_modules/uview-plus/components/u-alert/props.js
index 9f150b5..88fb972 100644
--- a/uni_modules/uview-plus/components/u-alert/props.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-alert/u-alert.vue b/uni_modules/uview-plus/components/u-alert/u-alert.vue
index 9f4fc4b..553c52f 100644
--- a/uni_modules/uview-plus/components/u-alert/u-alert.vue
+++ b/uni_modules/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>
@@ -70,7 +77,7 @@
 	 * @tutorial https://ijry.github.io/uview-plus/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/uni_modules/uview-plus/components/u-avatar-group/u-avatar-group.vue b/uni_modules/uview-plus/components/u-avatar-group/u-avatar-group.vue
index fdfeaad..67d1576 100644
--- a/uni_modules/uview-plus/components/u-avatar-group/u-avatar-group.vue
+++ b/uni_modules/uview-plus/components/u-avatar-group/u-avatar-group.vue
@@ -79,7 +79,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-avatar-group {
 		@include flex;
diff --git a/uni_modules/uview-plus/components/u-avatar/u-avatar.vue b/uni_modules/uview-plus/components/u-avatar/u-avatar.vue
index 1830e35..831f51e 100644
--- a/uni_modules/uview-plus/components/u-avatar/u-avatar.vue
+++ b/uni_modules/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"
@@ -151,7 +151,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-avatar {
 		@include flex;
diff --git a/uni_modules/uview-plus/components/u-back-top/u-back-top.vue b/uni_modules/uview-plus/components/u-back-top/u-back-top.vue
index fcdb045..d9d8b52 100644
--- a/uni_modules/uview-plus/components/u-back-top/u-back-top.vue
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-badge/u-badge.vue b/uni_modules/uview-plus/components/u-badge/u-badge.vue
index ecc843f..6e03954 100644
--- a/uni_modules/uview-plus/components/u-badge/u-badge.vue
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-barcode/u-barcode.vue b/uni_modules/uview-plus/components/u-barcode/u-barcode.vue
new file mode 100644
index 0000000..9512c43
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-box/u-box.vue b/uni_modules/uview-plus/components/u-box/u-box.vue
index ce47b5c..8ad979a 100644
--- a/uni_modules/uview-plus/components/u-box/u-box.vue
+++ b/uni_modules/uview-plus/components/u-box/u-box.vue
@@ -51,7 +51,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-box {
         /* #ifndef APP-NVUE */
diff --git a/uni_modules/uview-plus/components/u-button/u-button.vue b/uni_modules/uview-plus/components/u-button/u-button.vue
index c9a52ef..b1e3c0a 100644
--- a/uni_modules/uview-plus/components/u-button/u-button.vue
+++ b/uni_modules/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="[
@@ -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/uni_modules/uview-plus/components/u-calendar/calendar.js b/uni_modules/uview-plus/components/u-calendar/calendar.js
index fee5446..25d32a9 100644
--- a/uni_modules/uview-plus/components/u-calendar/calendar.js
+++ b/uni_modules/uview-plus/components/u-calendar/calendar.js
@@ -7,15 +7,16 @@
  * @lastTime     : 2021-08-20 16:52:43
  * @FilePath     : /u-view2.0/uview-ui/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,
@@ -38,6 +39,10 @@ export default {
         allowSameDay: false,
 		round: 0,
 		monthNum: 3,
-        weekText: ['一', '二', '三', '四', '五', '六', '日']
+        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/uni_modules/uview-plus/components/u-calendar/header.vue b/uni_modules/uview-plus/components/u-calendar/header.vue
index a3f3718..e289643 100644
--- a/uni_modules/uview-plus/components/u-calendar/header.vue
+++ b/uni_modules/uview-plus/components/u-calendar/header.vue
@@ -49,9 +49,9 @@
 			},
 			// 星期文本
 			weekText: {
-				type: Boolean,
+				type: Array,
 				default: () => {
-					return ['一', '二', '三', '四', '五', '六', '日']
+					return []
 				}
 			},
 		},
@@ -69,7 +69,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-calendar-header {
 		display: flex;
diff --git a/uni_modules/uview-plus/components/u-calendar/month.vue b/uni_modules/uview-plus/components/u-calendar/month.vue
index 76c81c5..8d206bc 100644
--- a/uni_modules/uview-plus/components/u-calendar/month.vue
+++ b/uni_modules/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))
@@ -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/uni_modules/uview-plus/components/u-calendar/props.js b/uni_modules/uview-plus/components/u-calendar/props.js
index 051dfe0..3dc0950 100644
--- a/uni_modules/uview-plus/components/u-calendar/props.js
+++ b/uni_modules/uview-plus/components/u-calendar/props.js
@@ -147,6 +147,23 @@ export const props = defineMixin({
         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/uni_modules/uview-plus/components/u-calendar/u-calendar.vue b/uni_modules/uview-plus/components/u-calendar/u-calendar.vue
index 904d0a9..c95d693 100644
--- a/uni_modules/uview-plus/components/u-calendar/u-calendar.vue
+++ b/uni_modules/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">
@@ -17,7 +18,7 @@
 			></uHeader>
 			<scroll-view
 				:style="{
-                    height: addUnit(listHeight)
+                    height: addUnit(listHeight, 'px')
                 }"
 				scroll-y
 				@scroll="onScroll"
@@ -42,6 +43,9 @@
 					:rangePrompt="rangePrompt"
 					:showRangePrompt="showRangePrompt"
 					:allowSameDay="allowSameDay"
+					:forbidDays="forbidDays"
+					:forbidDaysToast="forbidDaysToast"
+					:monthFormat="monthFormat"
 					ref="month"
 					@monthSelected="monthSelected"
 					@updateMonthTop="updateMonthTop"
@@ -69,11 +73,11 @@ 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 日历
@@ -184,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 ''
 			}
@@ -244,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() {
@@ -401,8 +413,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../../libs/css/components.scss';
-
 .u-calendar {
 	&__confirm {
 		padding: 7px 18px;
diff --git a/uni_modules/uview-plus/components/u-calendar/util.js b/uni_modules/uview-plus/components/u-calendar/util.js
index 18762c1..4483937 100644
--- a/uni_modules/uview-plus/components/u-calendar/util.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-car-keyboard/u-car-keyboard.vue b/uni_modules/uview-plus/components/u-car-keyboard/u-car-keyboard.vue
index d78aab0..cf0f7f0 100644
--- a/uni_modules/uview-plus/components/u-car-keyboard/u-car-keyboard.vue
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-card/card.js b/uni_modules/uview-plus/components/u-card/card.js
new file mode 100644
index 0000000..9d71214
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-card/props.js b/uni_modules/uview-plus/components/u-card/props.js
index d1de61c..fa8d72a 100644
--- a/uni_modules/uview-plus/components/u-card/props.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-card/u-card.vue b/uni_modules/uview-plus/components/u-card/u-card.vue
index f04758a..0d98131 100644
--- a/uni_modules/uview-plus/components/u-card/u-card.vue
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-cascader/u-cascader.vue b/uni_modules/uview-plus/components/u-cascader/u-cascader.vue
new file mode 100644
index 0000000..43b9762
--- /dev/null
+++ b/uni_modules/uview-plus/components/u-cascader/u-cascader.vue
@@ -0,0 +1,333 @@
+<template>
+	<up-popup :show="popupShow" mode="bottom" :popup="false"
+		:mask="true" :closeable="true" :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）
+	 */
+	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
+			}
+		},
+		data() {
+			return {
+				// 存储每一级的数据
+				levelList: [],
+				// 存储每一级选中的索引
+				selectedValueIndexs: [],
+				tabsIndex: 0,
+				popupShow: false,
+				// 新增confirmValues用于存储确认的值
+				confirmValues: []
+			}
+		},
+		watch: {
+			data: {
+				handler() {
+					this.initLevelList();
+				},
+				immediate: true
+			},
+			show() {
+				this.popupShow = this.show;
+			},
+			modelValue: {
+				handler() {
+					this.init();
+				},
+				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', 'change', 'confirm'],
+		methods: {
+			t,
+			init() {
+				// 初始化选中值
+				if (this.modelValue && this.modelValue.length > 0) {
+					this.setDefaultValue();
+				}
+			},
+			initLevelList() {
+				// 初始化第一级数据
+				if (this.data && this.data.length > 0) {
+					this.levelList = [this.data];
+					this.selectedValueIndexs = [];
+				}
+			},
+			setDefaultValue() {
+				// 根据默认值设置选中项
+				// 根据modelValue获取indexs给selectedValueIndexs
+				this.selectedValueIndexs = [];
+				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);
+					
+					if (index !== -1) {
+						this.selectedValueIndexs.push(index);
+						// 更新下一级的数据
+						if (currentLevelData[index][this.childrenKey]) {
+							currentLevelData = currentLevelData[index][this.childrenKey];
+						} else {
+							// 如果没有子级数据，则停止处理
+							break;
+						}
+					} else {
+						// 如果找不到匹配项，则停止处理
+						break;
+					}
+				}
+			},
+			close() {
+				this.$emit('update:show', false);
+			},
+			tabsChange(item) {
+			},
+			levelChange(levelIndex, index) {
+				// 设置当前级的选中值
+				this.$set(this.selectedValueIndexs, levelIndex, index);
+				
+				// 清除后续级别的选中值
+				for (let i = levelIndex + 1; i < this.selectedValueIndexs.length; i++) {
+					this.$set(this.selectedValueIndexs, i, undefined);
+				}
+				
+				// 获取当前选中项
+				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>
\ No newline at end of file
diff --git a/uni_modules/uview-plus/components/u-cate-tab/u-cate-tab.vue b/uni_modules/uview-plus/components/u-cate-tab/u-cate-tab.vue
index 8693fcc..93f1a06 100644
--- a/uni_modules/uview-plus/components/u-cate-tab/u-cate-tab.vue
+++ b/uni_modules/uview-plus/components/u-cate-tab/u-cate-tab.vue
@@ -1,49 +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">
                     </slot>
                     <text v-if="!$slots['tabItem']" class="u-line-1">{{item[tabKeyName]}}</text>
 				</view>
 			</scroll-view>
-			<scroll-view :scroll-top="scrollRightTop" scroll-with-animation
+			<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">
-                        </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 :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: () => {
@@ -57,18 +72,39 @@
             itemKeyName: {
                 type: String,
                 default: 'name'
+            },
+			current: {
+                type: Number,
+                default: 0
             }
         },
         watch: {
-            tabList() {
-                this.getMenuItemTop()
-            }
+			tabList: {
+				deep: true,
+				handler(newVal, oldVal) {
+					// this.observer();
+					sleep(30);
+					this.getMenuItemTop();
+					this.leftMenuStatus(this.innerCurrent);
+				}
+			},
+			current(nval) {
+				this.innerCurrent = nval;
+				this.leftMenuStatus(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
@@ -79,26 +115,32 @@
 				timer: null, // 定时器
 			}
 		},
-		onMounted() {
+		mounted() {
+			// this.observer();
+			this.innerCurrent = this.current;
+			this.leftMenuStatus(this.innerCurrent);
 			this.getMenuItemTop()
 		},
 		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();
+					}
+					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
@@ -117,54 +159,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 => {
+			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))
@@ -195,7 +256,7 @@
 							return ;
 						}
 					}
-				}, 10)
+				}, 100)
 			}
 		}
 	}
@@ -210,6 +271,7 @@
 	.u-cate-tab__wrap {
 		flex: 1;
 		display: flex;
+		flex-direction: row;
 		overflow: hidden;
 	}
 
diff --git a/uni_modules/uview-plus/components/u-cell-group/u-cell-group.vue b/uni_modules/uview-plus/components/u-cell-group/u-cell-group.vue
index 40ed2dd..0fd1fb4 100644
--- a/uni_modules/uview-plus/components/u-cell-group/u-cell-group.vue
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-cell/u-cell.vue b/uni_modules/uview-plus/components/u-cell/u-cell.vue
index fd20778..fd00a90 100644
--- a/uni_modules/uview-plus/components/u-cell/u-cell.vue
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-checkbox-group/u-checkbox-group.vue b/uni_modules/uview-plus/components/u-checkbox-group/u-checkbox-group.vue
index 0640d85..e0a0ac6 100644
--- a/uni_modules/uview-plus/components/u-checkbox-group/u-checkbox-group.vue
+++ b/uni_modules/uview-plus/components/u-checkbox-group/u-checkbox-group.vue
@@ -100,8 +100,7 @@
 						values.push(child.name)
 					}
 				})
-				// 发出事件
-				this.$emit('change', values)
+			
 				// 修改通过v-model绑定的值
 				// #ifdef VUE3
 				this.$emit("update:modelValue", values);
@@ -109,13 +108,14 @@
 				// #ifdef VUE2
 				this.$emit("input", values);
 				// #endif
+       			// 放在最后更新，否则change事件传出去的values不会更新
+				this.$emit('change', values)
 			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-checkbox-group {
 
diff --git a/uni_modules/uview-plus/components/u-checkbox/u-checkbox.vue b/uni_modules/uview-plus/components/u-checkbox/u-checkbox.vue
index adc3945..491b920 100644
--- a/uni_modules/uview-plus/components/u-checkbox/u-checkbox.vue
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-choose/u-choose.vue b/uni_modules/uview-plus/components/u-choose/u-choose.vue
new file mode 100644
index 0000000..f2c6d77
--- /dev/null
+++ b/uni_modules/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: width, 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/uni_modules/uview-plus/components/u-circle-progress/u-circle-progress.vue b/uni_modules/uview-plus/components/u-circle-progress/u-circle-progress.vue
index 6dd5c93..f252ed0 100644
--- a/uni_modules/uview-plus/components/u-circle-progress/u-circle-progress.vue
+++ b/uni_modules/uview-plus/components/u-circle-progress/u-circle-progress.vue
@@ -112,7 +112,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-circle-progress {
 		@include flex(row);
diff --git a/uni_modules/uview-plus/components/u-city-locate/u-city-locate.vue b/uni_modules/uview-plus/components/u-city-locate/u-city-locate.vue
new file mode 100644
index 0000000..c9a3688
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-code-input/u-code-input.vue b/uni_modules/uview-plus/components/u-code-input/u-code-input.vue
index d0c0061..d02a3aa 100644
--- a/uni_modules/uview-plus/components/u-code-input/u-code-input.vue
+++ b/uni_modules/uview-plus/components/u-code-input/u-code-input.vue
@@ -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/uni_modules/uview-plus/components/u-code/code.js b/uni_modules/uview-plus/components/u-code/code.js
index 693417a..8bce03e 100644
--- a/uni_modules/uview-plus/components/u-code/code.js
+++ b/uni_modules/uview-plus/components/u-code/code.js
@@ -5,16 +5,16 @@
  * @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
+ * @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/uni_modules/uview-plus/components/u-code/u-code.vue b/uni_modules/uview-plus/components/u-code/u-code.vue
index 32ba0a7..24b09d8 100644
--- a/uni_modules/uview-plus/components/u-code/u-code.vue
+++ b/uni_modules/uview-plus/components/u-code/u-code.vue
@@ -128,5 +128,4 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 </style>
diff --git a/uni_modules/uview-plus/components/u-col/u-col.vue b/uni_modules/uview-plus/components/u-col/u-col.vue
index 57a12d6..816bcbf 100644
--- a/uni_modules/uview-plus/components/u-col/u-col.vue
+++ b/uni_modules/uview-plus/components/u-col/u-col.vue
@@ -100,7 +100,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-col {
 		padding: 0;
diff --git a/uni_modules/uview-plus/components/u-collapse-item/collapseItem.js b/uni_modules/uview-plus/components/u-collapse-item/collapseItem.js
index 1225a7b..9611c47 100644
--- a/uni_modules/uview-plus/components/u-collapse-item/collapseItem.js
+++ b/uni_modules/uview-plus/components/u-collapse-item/collapseItem.js
@@ -21,6 +21,11 @@ export default {
         name: '',
         icon: '',
         duration: 300,
-        showRight: true
+        showRight: true,
+        titleStyle: {},
+        iconStyle: {},
+		rightIconStyle: {},
+        cellCustomStyle: {},
+        cellCustomClass: ''
     }
 }
diff --git a/uni_modules/uview-plus/components/u-collapse-item/props.js b/uni_modules/uview-plus/components/u-collapse-item/props.js
index b0b1426..095c571 100644
--- a/uni_modules/uview-plus/components/u-collapse-item/props.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-collapse-item/u-collapse-item.vue b/uni_modules/uview-plus/components/u-collapse-item/u-collapse-item.vue
index e9725bd..3f30e36 100644
--- a/uni_modules/uview-plus/components/u-collapse-item/u-collapse-item.vue
+++ b/uni_modules/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>
@@ -223,7 +225,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-collapse-item {
 
diff --git a/uni_modules/uview-plus/components/u-collapse/u-collapse.vue b/uni_modules/uview-plus/components/u-collapse/u-collapse.vue
index f7ec7f7..f556522 100644
--- a/uni_modules/uview-plus/components/u-collapse/u-collapse.vue
+++ b/uni_modules/uview-plus/components/u-collapse/u-collapse.vue
@@ -87,5 +87,4 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 </style>
diff --git a/uni_modules/uview-plus/components/u-color-picker/u-color-picker.vue b/uni_modules/uview-plus/components/u-color-picker/u-color-picker.vue
new file mode 100644
index 0000000..768f483
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-column-notice/u-column-notice.vue b/uni_modules/uview-plus/components/u-column-notice/u-column-notice.vue
index 81ca35a..d001b4e 100644
--- a/uni_modules/uview-plus/components/u-column-notice/u-column-notice.vue
+++ b/uni_modules/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>
@@ -128,7 +128,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-notice {
 		@include flex;
diff --git a/uni_modules/uview-plus/components/u-copy/u-copy.vue b/uni_modules/uview-plus/components/u-copy/u-copy.vue
index 3a71910..49c2cd4 100644
--- a/uni_modules/uview-plus/components/u-copy/u-copy.vue
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-count-down/u-count-down.vue b/uni_modules/uview-plus/components/u-count-down/u-count-down.vue
index f0896ba..0c6d231 100644
--- a/uni_modules/uview-plus/components/u-count-down/u-count-down.vue
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-count-to/u-count-to.vue b/uni_modules/uview-plus/components/u-count-to/u-count-to.vue
index 83ab13d..92623a9 100644
--- a/uni_modules/uview-plus/components/u-count-to/u-count-to.vue
+++ b/uni_modules/uview-plus/components/u-count-to/u-count-to.vue
@@ -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/uni_modules/uview-plus/components/u-coupon/u-coupon.vue b/uni_modules/uview-plus/components/u-coupon/u-coupon.vue
new file mode 100644
index 0000000..ef91d4b
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-cropper/u-cropper.vue b/uni_modules/uview-plus/components/u-cropper/u-cropper.vue
new file mode 100644
index 0000000..4c519ba
--- /dev/null
+++ b/uni_modules/uview-plus/components/u-cropper/u-cropper.vue
@@ -0,0 +1,1228 @@
+<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,
+				
+			};
+		},
+		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;
+				// #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 + 6 + 'px';
+				}
+				// #endif
+				// #ifdef MP
+				this.windowHeight = sysInfo.windowHeight + this.moreHeight;
+				this.cvsStyleHeight = this.windowHeight - tabHeight - 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/uni_modules/uview-plus/components/u-datetime-picker/datetimePicker.js b/uni_modules/uview-plus/components/u-datetime-picker/datetimePicker.js
index 96e8ab8..08c2a3f 100644
--- a/uni_modules/uview-plus/components/u-datetime-picker/datetimePicker.js
+++ b/uni_modules/uview-plus/components/u-datetime-picker/datetimePicker.js
@@ -7,6 +7,7 @@
  * @lastTime     : 2021-08-20 16:57:48
  * @FilePath     : /u-view2.0/uview-ui/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/uni_modules/uview-plus/components/u-datetime-picker/dayjs.esm.min.js b/uni_modules/uview-plus/components/u-datetime-picker/dayjs.esm.min.js
new file mode 100644
index 0000000..24c6ec9
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-datetime-picker/props.js b/uni_modules/uview-plus/components/u-datetime-picker/props.js
index e1711f9..46dded4 100644
--- a/uni_modules/uview-plus/components/u-datetime-picker/props.js
+++ b/uni_modules/uview-plus/components/u-datetime-picker/props.js
@@ -5,15 +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: () => false
+            default: () => defProps.input.disabled
         },
+		disabledColor:{
+			type: String,
+			default: () => defProps.input.disabledColor
+		},
         placeholder: {
             type: String,
-            default: () => '请选择'
+            default: () => defProps.input.placeholder
         },
         format: {
             type: String,
@@ -149,6 +163,11 @@ export const props = defineMixin({
         defaultIndex: {
             type: Array,
             default: () => defProps.datetimePicker.defaultIndex
+        },
+        // 是否页面内展示
+        pageInline:{
+            type: Boolean,
+            default: () => defProps.datetimePicker.pageInline
         }
     }
 })
diff --git a/uni_modules/uview-plus/components/u-datetime-picker/u-datetime-picker.vue b/uni_modules/uview-plus/components/u-datetime-picker/u-datetime-picker.vue
index 7871466..d4e14fe 100644
--- a/uni_modules/uview-plus/components/u-datetime-picker/u-datetime-picker.vue
+++ b/uni_modules/uview-plus/components/u-datetime-picker/u-datetime-picker.vue
@@ -1,23 +1,21 @@
 <template>
     <view class="u-datetime-picker">
         <view v-if="hasInput" class="u-datetime-picker__has-input"
-            @click="onShowByClickInput" 
+            @click="onShowByClickInput"
         >
             <slot name="trigger" :value="inputValue">
 				<up-input
-					:placeholder="placeholder"
 					:readonly="!!showByClickInput"
-					border="surround"
 					v-model="inputValue"
-					:disabled="disabled"
+					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"
@@ -31,6 +29,7 @@
             :cancelColor="cancelColor"
             :confirmColor="confirmColor"
             :toolbarRightSlot="toolbarRightSlot"
+			:pageInline="pageInline"
             @close="close"
             @cancel="cancel"
             @confirm="confirm"
@@ -60,7 +59,7 @@
 	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';
 	/**
@@ -111,6 +110,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)
 				}
 			},
@@ -133,7 +138,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() {
@@ -162,6 +177,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;
@@ -428,7 +446,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
@@ -467,14 +488,13 @@
 				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/uni_modules/uview-plus/components/u-divider/u-divider.vue b/uni_modules/uview-plus/components/u-divider/u-divider.vue
index 47dbf00..26bc710 100644
--- a/uni_modules/uview-plus/components/u-divider/u-divider.vue
+++ b/uni_modules/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"
@@ -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/uni_modules/uview-plus/components/u-dragsort/u-dragsort.vue b/uni_modules/uview-plus/components/u-dragsort/u-dragsort.vue
new file mode 100644
index 0000000..9045b02
--- /dev/null
+++ b/uni_modules/uview-plus/components/u-dragsort/u-dragsort.vue
@@ -0,0 +1,367 @@
+<template>
+    <view class="u-dragsort"
+        :class="[direction == 'horizontal' ? 'u-dragsort--horizontal' : '', direction == 'all' ? 'u-dragsort--all' : '']">
+        <movable-area class="u-dragsort-area" :style="movableAreaStyle">
+            <movable-view v-for="(item, index) in list" :key="item.id" :id="`u-dragsort-item-${index}`"
+                class="u-dragsort-item" :class="{ 'dragging': dragIndex === index }"
+                :direction="direction === 'all' ? 'all' : direction" :x="item.x" :y="item.y" :inertia="false"
+                :disabled="!draggable || (item.draggable === false)" @change="onChange(index, $event)"
+                @touchstart="onTouchStart(index)" @touchend="onTouchEnd" @touchcancel="onTouchEnd">
+                <view class="u-dragsort-item-content">
+                    <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 { addStyle, addUnit, 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
+        },
+        direction: {
+            type: String,
+            default: 'vertical',
+            validator: value => ['vertical', 'horizontal', 'all'].includes(value)
+        },
+        // 新增列数属性，用于all模式
+        columns: {
+            type: Number,
+            default: 3
+        }
+    },
+    data() {
+        return {
+            list: [],
+            dragIndex: -1,
+            itemHeight: 40,
+            itemWidth: 80,
+            areaWidth: 0, // 可拖动区域宽度
+            areaHeight: 0, // 可拖动区域高度
+            originalPositions: [], // 保存原始位置
+            currentPosition: {
+                x: 0,
+                y: 0
+            }
+        };
+    },
+    computed: {
+        movableAreaStyle() {
+            if (this.direction === 'vertical') {
+                return {
+                    height: `${this.list.length * this.itemHeight}px`,
+                    width: '100%'
+                };
+            } else if (this.direction === 'horizontal') {
+                return {
+                    height: '100%',
+                    width: `${this.list.length * this.itemWidth}px`
+                };
+            } else {
+                // all模式，计算网格布局所需的高度
+                const rows = Math.ceil(this.list.length / this.columns);
+                return {
+                    height: `${rows * this.itemHeight}px`,
+                    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 = 0, y = 0;
+
+                if (this.direction === 'horizontal') {
+                    x = index * this.itemWidth;
+                    y = 0;
+                } else if (this.direction === 'vertical') {
+                    x = 0;
+                    y = index * this.itemHeight;
+                } else {
+                    // 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
+                };
+            });
+            // 保存初始位置
+            this.saveOriginalPositions();
+        },
+        saveOriginalPositions() {
+            // 保存当前位置作为原始位置
+            this.originalPositions = this.list.map(item => ({
+                x: item.x,
+                y: item.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();
+                            // 保存原始位置
+                            this.saveOriginalPositions();
+                        }
+                        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() {
+            // 更新所有项目的位置
+            this.list.forEach((item, index) => {
+                if (this.direction === 'vertical') {
+                    item.y = index * this.itemHeight;
+                    item.x = 0;
+                } else if (this.direction === 'horizontal') {
+                    item.x = index * this.itemWidth;
+                    item.y = 0;
+                } else {
+                    // all模式，网格布局
+                    const col = index % this.columns;
+                    const row = Math.floor(index / this.columns);
+                    item.x = col * this.itemWidth;
+                    item.y = row * this.itemHeight;
+                }
+            });
+        },
+        onTouchStart(index) {
+            this.dragIndex = index;
+            // 保存当前位置作为原始位置
+            this.saveOriginalPositions();
+        },
+        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);
+
+            // 震动反馈
+            if (uni.vibrateShort) {
+                uni.vibrateShort();
+            }
+
+            // 更新当前拖拽项目的新索引
+            this.dragIndex = toIndex;
+
+            // 更新所有项目的位置
+            this.updatePositions();
+
+            // 保存当前位置作为原始位置
+            this.saveOriginalPositions();
+        },
+        onTouchEnd() {
+            // 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.list.forEach((item, index) => {
+                    item.x = this.originalPositions[index].x;
+                    item.y = this.originalPositions[index].y;
+                });
+                this.dragIndex = -1;
+                this.$emit('drag-end', [...this.list]);
+            });
+        }
+    },
+    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();
+                        this.saveOriginalPositions();
+                    });
+                }
+            }
+        }
+    }
+};
+</script>
+
+<style scoped lang="scss">
+.u-dragsort {
+    width: 100%;
+
+    .u-dragsort-area {
+        width: 100%;
+        position: relative;
+    }
+
+    .u-dragsort-item {
+        position: absolute;
+        width: 100%;
+
+        &.dragging {
+            z-index: 1000;
+            box-shadow: 0 6px 20px rgba(0, 0, 0, 0.15);
+        }
+
+        .u-dragsort-item-content {
+            padding: 0px;
+            text-align: center;
+            box-sizing: border-box;
+            padding-bottom: 6px;
+            border-radius: 8rpx;
+            transition: all 0.3s ease;
+        }
+    }
+
+    &.u-dragsort--horizontal {
+        .u-dragsort-area {
+            display: flex;
+            white-space: nowrap;
+            height: auto;
+        }
+
+        .u-dragsort-item {
+            display: flex;
+            width: auto;
+            height: 100%;
+        }
+    }
+
+    &.u-dragsort--all {
+        .u-dragsort-area {
+            height: auto;
+        }
+
+        .u-dragsort-item {
+            width: auto;
+            height: auto;
+        }
+    }
+}
+</style>
diff --git a/uni_modules/uview-plus/components/u-dropdown-item/u-dropdown-item.vue b/uni_modules/uview-plus/components/u-dropdown-item/u-dropdown-item.vue
index ec15a06..c31eddb 100644
--- a/uni_modules/uview-plus/components/u-dropdown-item/u-dropdown-item.vue
+++ b/uni_modules/uview-plus/components/u-dropdown-item/u-dropdown-item.vue
@@ -114,7 +114,6 @@
 </script>
 
 <style scoped lang="scss">
-	@import "../../libs/css/components.scss";
     .u-dropdown-item__scroll {
         background: #ffffff;
     }
diff --git a/uni_modules/uview-plus/components/u-dropdown/u-dropdown.vue b/uni_modules/uview-plus/components/u-dropdown/u-dropdown.vue
index 55fa086..539890b 100644
--- a/uni_modules/uview-plus/components/u-dropdown/u-dropdown.vue
+++ b/uni_modules/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>
@@ -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,9 +160,13 @@
 				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() {
@@ -181,7 +187,6 @@
 </script>
 
 <style scoped lang="scss">
-	@import "../../libs/css/components.scss";
 
 	.u-dropdown {
 		flex: 1;
diff --git a/uni_modules/uview-plus/components/u-empty/u-empty.vue b/uni_modules/uview-plus/components/u-empty/u-empty.vue
index f83677f..e7531d2 100644
--- a/uni_modules/uview-plus/components/u-empty/u-empty.vue
+++ b/uni_modules/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,6 +35,7 @@
 	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 该组件用于需要加载内容，但是加载的第一页数据就为空，提示一个"没有内容"的场景， 我们精心挑选了十几个场景的图标，方便您使用。
@@ -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/uni_modules/uview-plus/components/u-float-button/u-float-button.vue b/uni_modules/uview-plus/components/u-float-button/u-float-button.vue
index e23064e..c67f33a 100644
--- a/uni_modules/uview-plus/components/u-float-button/u-float-button.vue
+++ b/uni_modules/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',
@@ -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/uni_modules/uview-plus/components/u-form-item/u-form-item.vue b/uni_modules/uview-plus/components/u-form-item/u-form-item.vue
index c763ca7..80183ab 100644
--- a/uni_modules/uview-plus/components/u-form-item/u-form-item.vue
+++ b/uni_modules/uview-plus/components/u-form-item/u-form-item.vue
@@ -15,7 +15,7 @@
 					v-if="required || leftIcon || label"
 					:style="{
 						width: addUnit(labelWidth || parentData.labelWidth),
-						marginBottom: parentData.labelPosition === 'left' ? 0 : '5px',
+						marginBottom: (labelPosition || parentData.labelPosition) === 'left' ? 0 : '5px',
 					}"
 				>
 					<!-- 为了块对齐 -->
@@ -29,10 +29,10 @@
 							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"
@@ -62,7 +62,7 @@
 				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>
@@ -185,7 +185,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-form-item {
 		@include flex(column);
@@ -240,10 +239,8 @@
 
 					&__slot {
 						flex: 1;
-						/* #ifndef MP */
 						@include flex;
 						align-items: center;
-						/* #endif */
 					}
 
 					&__icon {
diff --git a/uni_modules/uview-plus/components/u-form/u-form.vue b/uni_modules/uview-plus/components/u-form/u-form.vue
index bcbdb9f..32fb721 100644
--- a/uni_modules/uview-plus/components/u-form/u-form.vue
+++ b/uni_modules/uview-plus/components/u-form/u-form.vue
@@ -25,7 +25,7 @@
 	 * @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",
@@ -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/uni_modules/uview-plus/components/u-gap/u-gap.vue b/uni_modules/uview-plus/components/u-gap/u-gap.vue
index 36863a5..5ed32d3 100644
--- a/uni_modules/uview-plus/components/u-gap/u-gap.vue
+++ b/uni_modules/uview-plus/components/u-gap/u-gap.vue
@@ -37,5 +37,4 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 </style>
diff --git a/uni_modules/uview-plus/components/u-goods-sku/u-goods-sku.vue b/uni_modules/uview-plus/components/u-goods-sku/u-goods-sku.vue
new file mode 100644
index 0000000..846ab3e
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-grid-item/u-grid-item.vue b/uni_modules/uview-plus/components/u-grid-item/u-grid-item.vue
index 43c5ce7..65c320e 100644
--- a/uni_modules/uview-plus/components/u-grid-item/u-grid-item.vue
+++ b/uni_modules/uview-plus/components/u-grid-item/u-grid-item.vue
@@ -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/uni_modules/uview-plus/components/u-grid/u-grid.vue b/uni_modules/uview-plus/components/u-grid/u-grid.vue
index fd23002..31a0a78 100644
--- a/uni_modules/uview-plus/components/u-grid/u-grid.vue
+++ b/uni_modules/uview-plus/components/u-grid/u-grid.vue
@@ -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,7 +105,7 @@
 		// 在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);
 		/* #endif */
diff --git a/uni_modules/uview-plus/components/u-icon/u-icon.vue b/uni_modules/uview-plus/components/u-icon/u-icon.vue
index 0255905..b7b24bd 100644
--- a/uni_modules/uview-plus/components/u-icon/u-icon.vue
+++ b/uni_modules/uview-plus/components/u-icon/u-icon.vue
@@ -35,24 +35,14 @@
 </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 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 config from '../../libs/config/config';
+	import fontUtil from './util';
 	/**
 	 * icon 图标
 	 * @description 基于字体的图标集，包含了大多数常见场景的图标。
@@ -82,18 +72,12 @@
 	export default {
 		name: 'u-icon',
 		beforeCreate() {
-			// #ifdef APP-NVUE
-			if (this.customFontFamily) {
-				domModule.addRule('fontFace', {
-					'fontFamily': `${this.customPrefix}-${this.customFontFamily}`,
-					'src': `url('${this.customFontUrl}')`
-				})
+			if (!fontUtil.params.loaded) {
+				fontUtil.loadFont();
 			}
-        	// #endif
     	},
 		data() {
 			return {
-
 			}
 		},
 		emits: ['click'],
@@ -102,7 +86,7 @@
 			uClasses() {
 				let classes = []
 				classes.push(this.customPrefix + '-' + this.name)
-				// uView的自定义图标类名为u-iconfont
+				// uview-plus内置图标类名为u-iconfont
 				if (this.customPrefix == 'uicon') {
 					classes.push('u-iconfont')
 				} else {
@@ -127,6 +111,9 @@
 					// 某些特殊情况需要设置一个到顶部的距离，才能更好的垂直居中
 					top: addUnit(this.top)
 				}
+				if (this.customPrefix !== 'uicon') {
+					style.fontFamily = this.customPrefix
+				}
 				// 非主题色值时，才当作颜色值
 				if (this.color && !config.type.includes(this.color)) style.color = this.color
 
@@ -147,7 +134,7 @@
 			icon() {
 				// 使用自定义图标的时候页面上会把name属性也展示出来，所以在这里处理一下
 				if (this.customPrefix !== "uicon") {
-					return this.customIcons[this.customPrefix + '-' + this.name] || this.name;
+					return config.customIcons[this.name] || this.name;
 				}
 				// 如果内置的图标中找不到对应的图标，就直接返回name值，因为用户可能传入的是unicode代码
 				return icons['uicon-' + this.name] || this.name
@@ -166,8 +153,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
-
 	// 变量定义
 	$u-icon-primary: $u-primary !default;
 	$u-icon-success: $u-success !default;
@@ -176,13 +161,12 @@
 	$u-icon-error: $u-error !default;
 	$u-icon-label-line-height:1 !default;
 
-	/* #ifndef APP-NVUE */
-	// 非nvue下加载字体
+	/* #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('https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf') format('truetype');
 	}
-
 	/* #endif */
 
 	.u-icon {
diff --git a/uni_modules/uview-plus/components/u-icon/util.js b/uni_modules/uview-plus/components/u-icon/util.js
new file mode 100644
index 0000000..907f8dd
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-image/u-image.vue b/uni_modules/uview-plus/components/u-image/u-image.vue
index 8e462f0..24e3b10 100644
--- a/uni_modules/uview-plus/components/u-image/u-image.vue
+++ b/uni_modules/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>
@@ -132,12 +135,12 @@
 				// #endif
 				// #ifndef APP-NVUE
 				if (this.loading || this.isError || this.width == '100%' || this.mode != 'heightFix') {
-					style.width = this.width;
+					style.width = addUnit(this.width);
 				} else {
 					style.width = 'fit-content';
 				}
 				if (this.loading || this.isError || this.height == '100%' || this.mode != 'widthFix') {
-					style.height = this.height;
+					style.height = addUnit(this.height);
 				} else {
 					style.height = 'fit-content';
 				}
@@ -153,12 +156,12 @@
 				// #endif
 				// #ifndef APP-NVUE
 				if (this.loading || this.isError || this.width == '100%' || this.mode != 'heightFix') {
-					style.width = this.width;
+					style.width = addUnit(this.width);
 				} else {
 					style.width = 'fit-content';
 				}
 				if (this.loading || this.isError || this.height == '100%' || this.mode != 'widthFix') {
-					style.height = this.height;
+					style.height = addUnit(this.height);
 				} else {
 					style.height = 'fit-content';
 				}
@@ -220,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/uni_modules/uview-plus/components/u-index-anchor/indexAnchor.js b/uni_modules/uview-plus/components/u-index-anchor/indexAnchor.js
index bb20d46..208a79c 100644
--- a/uni_modules/uview-plus/components/u-index-anchor/indexAnchor.js
+++ b/uni_modules/uview-plus/components/u-index-anchor/indexAnchor.js
@@ -13,7 +13,7 @@ export default {
         text: '',
         color: '#606266',
         size: 14,
-        bgColor: '#dedede',
+        bgColor: '#f1f1f1',
         height: 32
     }
 }
diff --git a/uni_modules/uview-plus/components/u-index-anchor/u-index-anchor.vue b/uni_modules/uview-plus/components/u-index-anchor/u-index-anchor.vue
index 91c43e9..4044d53 100644
--- a/uni_modules/uview-plus/components/u-index-anchor/u-index-anchor.vue
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-index-item/u-index-item.vue b/uni_modules/uview-plus/components/u-index-item/u-index-item.vue
index 13cc30f..5d9346a 100644
--- a/uni_modules/uview-plus/components/u-index-item/u-index-item.vue
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-index-list/indexList.js b/uni_modules/uview-plus/components/u-index-list/indexList.js
index 4f31b37..ae61c40 100644
--- a/uni_modules/uview-plus/components/u-index-list/indexList.js
+++ b/uni_modules/uview-plus/components/u-index-list/indexList.js
@@ -15,6 +15,7 @@ export default {
         indexList: [],
         sticky: true,
         customNavHeight: 0,
-        safeBottomFix: false
+        safeBottomFix: false,
+        itemMargin: '0rpx'
     }
 }
diff --git a/uni_modules/uview-plus/components/u-index-list/props.js b/uni_modules/uview-plus/components/u-index-list/props.js
index 46a1fba..07ec35f 100644
--- a/uni_modules/uview-plus/components/u-index-list/props.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-index-list/u-index-list.vue b/uni_modules/uview-plus/components/u-index-list/u-index-list.vue
index eb29ec0..8718637 100644
--- a/uni_modules/uview-plus/components/u-index-list/u-index-list.vue
+++ b/uni_modules/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>
@@ -284,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
 
@@ -389,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
@@ -406,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
@@ -419,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
@@ -489,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
@@ -531,7 +540,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-index-list {
 
diff --git a/uni_modules/uview-plus/components/u-input/input.js b/uni_modules/uview-plus/components/u-input/input.js
index 6c310ea..14f3c4a 100644
--- a/uni_modules/uview-plus/components/u-input/input.js
+++ b/uni_modules/uview-plus/components/u-input/input.js
@@ -3,9 +3,9 @@
  * @Description  :
  * @version      : 1.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: '',
+		passwordVisibilityToggle: true
 	}
 }
diff --git a/uni_modules/uview-plus/components/u-input/props.js b/uni_modules/uview-plus/components/u-input/props.js
index e5e343e..59ace51 100644
--- a/uni_modules/uview-plus/components/u-input/props.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-input/u-input.vue b/uni_modules/uview-plus/components/u-input/u-input.vue
index 69d35e2..efd5c54 100644
--- a/uni_modules/uview-plus/components/u-input/u-input.vue
+++ b/uni_modules/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";
@@ -334,8 +368,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
-
 .u-input {
     @include flex(row);
     align-items: center;
diff --git a/uni_modules/uview-plus/components/u-keyboard/keyboard.js b/uni_modules/uview-plus/components/u-keyboard/keyboard.js
index 57182bd..d20611c 100644
--- a/uni_modules/uview-plus/components/u-keyboard/keyboard.js
+++ b/uni_modules/uview-plus/components/u-keyboard/keyboard.js
@@ -7,6 +7,7 @@
  * @lastTime     : 2021-08-20 17:07:49
  * @FilePath     : /u-view2.0/uview-ui/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/uni_modules/uview-plus/components/u-keyboard/u-keyboard.vue b/uni_modules/uview-plus/components/u-keyboard/u-keyboard.vue
index 868f0c5..1e9658d 100644
--- a/uni_modules/uview-plus/components/u-keyboard/u-keyboard.vue
+++ b/uni_modules/uview-plus/components/u-keyboard/u-keyboard.vue
@@ -132,7 +132,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-keyboard {
 
diff --git a/uni_modules/uview-plus/components/u-lazy-load/u-lazy-load.vue b/uni_modules/uview-plus/components/u-lazy-load/u-lazy-load.vue
index c49add0..0a30b44 100644
--- a/uni_modules/uview-plus/components/u-lazy-load/u-lazy-load.vue
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-line-progress/lineProgress.js b/uni_modules/uview-plus/components/u-line-progress/lineProgress.js
index cdfcb0e..51531a6 100644
--- a/uni_modules/uview-plus/components/u-line-progress/lineProgress.js
+++ b/uni_modules/uview-plus/components/u-line-progress/lineProgress.js
@@ -14,6 +14,7 @@ export default {
         inactiveColor: '#ececec',
         percentage: 0,
         showText: true,
-        height: 12
+        height: 12,
+		fromRight: false,
     }
 }
diff --git a/uni_modules/uview-plus/components/u-line-progress/props.js b/uni_modules/uview-plus/components/u-line-progress/props.js
index 3e03e61..2690e29 100644
--- a/uni_modules/uview-plus/components/u-line-progress/props.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-line-progress/u-line-progress.vue b/uni_modules/uview-plus/components/u-line-progress/u-line-progress.vue
index 577f877..983394a 100644
--- a/uni_modules/uview-plus/components/u-line-progress/u-line-progress.vue
+++ b/uni_modules/uview-plus/components/u-line-progress/u-line-progress.vue
@@ -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/uni_modules/uview-plus/components/u-line/u-line.vue b/uni_modules/uview-plus/components/u-line/u-line.vue
index 4acc0a0..5b3e276 100644
--- a/uni_modules/uview-plus/components/u-line/u-line.vue
+++ b/uni_modules/uview-plus/components/u-line/u-line.vue
@@ -55,7 +55,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-line {
 		/* #ifndef APP-NVUE */
diff --git a/uni_modules/uview-plus/components/u-link/link.js b/uni_modules/uview-plus/components/u-link/link.js
index a5d0450..71bc5b5 100644
--- a/uni_modules/uview-plus/components/u-link/link.js
+++ b/uni_modules/uview-plus/components/u-link/link.js
@@ -8,6 +8,7 @@
  * @FilePath     : /u-view2.0/uview-ui/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/uni_modules/uview-plus/components/u-link/u-link.vue b/uni_modules/uview-plus/components/u-link/u-link.vue
index 5103893..5462707 100644
--- a/uni_modules/uview-plus/components/u-link/u-link.vue
+++ b/uni_modules/uview-plus/components/u-link/u-link.vue
@@ -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/uni_modules/uview-plus/components/u-list-item/u-list-item.vue b/uni_modules/uview-plus/components/u-list-item/u-list-item.vue
index eeaccdc..28ed02a 100644
--- a/uni_modules/uview-plus/components/u-list-item/u-list-item.vue
+++ b/uni_modules/uview-plus/components/u-list-item/u-list-item.vue
@@ -113,7 +113,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-list-item {}
 </style>
diff --git a/uni_modules/uview-plus/components/u-list/u-list.vue b/uni_modules/uview-plus/components/u-list/u-list.vue
index 41de947..e8e28e8 100644
--- a/uni_modules/uview-plus/components/u-list/u-list.vue
+++ b/uni_modules/uview-plus/components/u-list/u-list.vue
@@ -174,7 +174,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-list {
 		@include flex(column);
diff --git a/uni_modules/uview-plus/components/u-loading-icon/u-loading-icon.vue b/uni_modules/uview-plus/components/u-loading-icon/u-loading-icon.vue
index 300b774..d399d26 100644
--- a/uni_modules/uview-plus/components/u-loading-icon/u-loading-icon.vue
+++ b/uni_modules/uview-plus/components/u-loading-icon/u-loading-icon.vue
@@ -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;
diff --git a/uni_modules/uview-plus/components/u-loading-page/loadingPage.js b/uni_modules/uview-plus/components/u-loading-page/loadingPage.js
index 6ed7485..3e37e11 100644
--- a/uni_modules/uview-plus/components/u-loading-page/loadingPage.js
+++ b/uni_modules/uview-plus/components/u-loading-page/loadingPage.js
@@ -7,10 +7,11 @@
  * @lastTime     : 2021-08-20 17:00:23
  * @FilePath     : /u-view2.0/uview-ui/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/uni_modules/uview-plus/components/u-loading-page/u-loading-page.vue b/uni_modules/uview-plus/components/u-loading-page/u-loading-page.vue
index d81dff2..b878d5b 100644
--- a/uni_modules/uview-plus/components/u-loading-page/u-loading-page.vue
+++ b/uni_modules/uview-plus/components/u-loading-page/u-loading-page.vue
@@ -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/uni_modules/uview-plus/components/u-loadmore/loadmore.js b/uni_modules/uview-plus/components/u-loadmore/loadmore.js
index 67c1160..5dcf89b 100644
--- a/uni_modules/uview-plus/components/u-loadmore/loadmore.js
+++ b/uni_modules/uview-plus/components/u-loadmore/loadmore.js
@@ -7,6 +7,7 @@
  * @lastTime     : 2021-08-20 17:15:26
  * @FilePath     : /u-view2.0/uview-ui/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/uni_modules/uview-plus/components/u-loadmore/u-loadmore.vue b/uni_modules/uview-plus/components/u-loadmore/u-loadmore.vue
index 62c99c0..13f6b78 100644
--- a/uni_modules/uview-plus/components/u-loadmore/u-loadmore.vue
+++ b/uni_modules/uview-plus/components/u-loadmore/u-loadmore.vue
@@ -123,7 +123,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-loadmore {
 		@include flex(row);
diff --git a/uni_modules/uview-plus/components/u-markdown/marked.esm.js b/uni_modules/uview-plus/components/u-markdown/marked.esm.js
new file mode 100644
index 0000000..c1b6a08
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-markdown/u-markdown.vue b/uni_modules/uview-plus/components/u-markdown/u-markdown.vue
new file mode 100644
index 0000000..8312b88
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-modal/modal.js b/uni_modules/uview-plus/components/u-modal/modal.js
index 02dadaa..10fabdf 100644
--- a/uni_modules/uview-plus/components/u-modal/modal.js
+++ b/uni_modules/uview-plus/components/u-modal/modal.js
@@ -7,14 +7,15 @@
  * @lastTime     : 2021-08-20 17:15:59
  * @FilePath     : /u-view2.0/uview-ui/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.inOperatio") + '...',
+        asyncCancelClose: false,
+        contentStyle: {}
     }
 }
diff --git a/uni_modules/uview-plus/components/u-modal/props.js b/uni_modules/uview-plus/components/u-modal/props.js
index 0e7443b..0f0177b 100644
--- a/uni_modules/uview-plus/components/u-modal/props.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-modal/u-modal.vue b/uni_modules/uview-plus/components/u-modal/u-modal.vue
index ed2d578..044ad58 100644
--- a/uni_modules/uview-plus/components/u-modal/u-modal.vue
+++ b/uni_modules/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>
 
@@ -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/uni_modules/uview-plus/components/u-navbar-mini/u-navbar-mini.vue b/uni_modules/uview-plus/components/u-navbar-mini/u-navbar-mini.vue
index 72e4b37..279da76 100644
--- a/uni_modules/uview-plus/components/u-navbar-mini/u-navbar-mini.vue
+++ b/uni_modules/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,
@@ -97,7 +96,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-navbar-mini {
 
diff --git a/uni_modules/uview-plus/components/u-navbar/props.js b/uni_modules/uview-plus/components/u-navbar/props.js
index 5e0a632..b66f87e 100644
--- a/uni_modules/uview-plus/components/u-navbar/props.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-navbar/u-navbar.vue b/uni_modules/uview-plus/components/u-navbar/u-navbar.vue
index ca86634..78cd359 100644
--- a/uni_modules/uview-plus/components/u-navbar/u-navbar.vue
+++ b/uni_modules/uview-plus/components/u-navbar/u-navbar.vue
@@ -10,7 +10,7 @@
 		<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,6 +77,7 @@
 	import { props } from './props';
 	import { mpMixin } from '../../libs/mixin/mpMixin';
 	import { mixin } from '../../libs/mixin/mixin';
+	import config  from '../../libs/config/config';
 	import { addUnit, addStyle, getPx, getWindowInfo } from '../../libs/function/index';
 	/**
 	 * Navbar 自定义导航栏
@@ -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 ）
@@ -120,8 +122,12 @@
 			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/uni_modules/uview-plus/components/u-no-network/noNetwork.js b/uni_modules/uview-plus/components/u-no-network/noNetwork.js
index 74dba1b..078b16a 100644
--- a/uni_modules/uview-plus/components/u-no-network/noNetwork.js
+++ b/uni_modules/uview-plus/components/u-no-network/noNetwork.js
@@ -7,12 +7,12 @@
  * @lastTime     : 2021-08-20 17:16:39
  * @FilePath     : /u-view2.0/uview-ui/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/uni_modules/uview-plus/components/u-no-network/u-no-network.vue b/uni_modules/uview-plus/components/u-no-network/u-no-network.vue
index 62f85ff..bc9350e 100644
--- a/uni_modules/uview-plus/components/u-no-network/u-no-network.vue
+++ b/uni_modules/uview-plus/components/u-no-network/u-no-network.vue
@@ -12,27 +12,27 @@
 		<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
 				    size="mini"
-				    text="重试"
+				    :text="t('up.common.retry')"
 				    type="primary"
 					plain
 				    @click="retry"
@@ -47,6 +47,7 @@
 	import { mpMixin } from '../../libs/mixin/mpMixin';
 	import { mixin } from '../../libs/mixin/mixin';
 	import { toast, getDeviceInfo } from '../../libs/function/index';
+	import { t } from '../../libs/i18n'
 	/**
 	 * noNetwork 无网络提示
 	 * @description 该组件无需任何配置，引入即可，内部自动处理所有功能和事件。
@@ -87,6 +88,7 @@
 		},
 		emits: ["disconnected", "connected"],
 		methods: {
+			t,
 			retry() {
 				// 重新检查网络
 				uni.getNetworkType({
@@ -94,10 +96,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 +186,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-no-network {
 		@include flex(column);
diff --git a/uni_modules/uview-plus/components/u-notice-bar/u-notice-bar.vue b/uni_modules/uview-plus/components/u-notice-bar/u-notice-bar.vue
index 7fa4bfa..122a4cc 100644
--- a/uni_modules/uview-plus/components/u-notice-bar/u-notice-bar.vue
+++ b/uni_modules/uview-plus/components/u-notice-bar/u-notice-bar.vue
@@ -96,7 +96,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-notice-bar {
 		overflow: hidden;
diff --git a/uni_modules/uview-plus/components/u-notify/u-notify.vue b/uni_modules/uview-plus/components/u-notify/u-notify.vue
index 160d6ba..2970f4d 100644
--- a/uni_modules/uview-plus/components/u-notify/u-notify.vue
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-number-box/numberBox.js b/uni_modules/uview-plus/components/u-number-box/numberBox.js
index ac79ad0..e6fb3b7 100644
--- a/uni_modules/uview-plus/components/u-number-box/numberBox.js
+++ b/uni_modules/uview-plus/components/u-number-box/numberBox.js
@@ -29,6 +29,7 @@ export default {
         buttonSize: 30,
         buttonRadius: '0px',
         bgColor: '#EBECEE',
+        disabledBgColor: '#f7f8fa',
         inputBgColor: '#EBECEE',
         cursorSpacing: 100,
         disableMinus: false,
diff --git a/uni_modules/uview-plus/components/u-number-box/props.js b/uni_modules/uview-plus/components/u-number-box/props.js
index ac12d18..ada9952 100644
--- a/uni_modules/uview-plus/components/u-number-box/props.js
+++ b/uni_modules/uview-plus/components/u-number-box/props.js
@@ -106,6 +106,11 @@ export const props = defineMixin({
             type: String,
             default: () => defProps.numberBox.bgColor
         },
+        // 按钮禁用背景色
+        disabledBgColor: {
+            type: String,
+            default: () => defProps.numberBox.disabledBgColor
+        },
         // 输入框背景颜色
         inputBgColor: {
             type: String,
diff --git a/uni_modules/uview-plus/components/u-number-box/u-number-box.vue b/uni_modules/uview-plus/components/u-number-box/u-number-box.vue
index 807fc1a..09ae4f5 100644
--- a/uni_modules/uview-plus/components/u-number-box/u-number-box.vue
+++ b/uni_modules/uview-plus/components/u-number-box/u-number-box.vue
@@ -20,13 +20,13 @@
 		    :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>
 
 		<template v-if="!hideMinus">
@@ -81,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>
@@ -184,7 +184,7 @@
 						borderRadius: this.buttonRadius
 					}
 					if (this.isDisabled(type)) {
-						style.backgroundColor = '#f7f8fa'
+						style.backgroundColor = this.disabledBgColor
 					}
 					return style
 				}
@@ -311,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)
@@ -325,8 +331,8 @@
 				// #endif 
 			
 			},
-			// 发出change事件
-			emitChange(value) {
+			// 发出change事件，type目前只支持点击时有值，手动输入不支持。
+			emitChange(value, type = '') {
 				// 如果开启了异步变更值，则不修改内部的值，需要用户手动在外部通过v-model变更
 				if (!this.asyncChange) {
 					this.$nextTick(() => {
@@ -343,6 +349,7 @@
 				this.$emit('change', {
 					value,
 					name: this.name,
+					type: type // 当前变更类型
 				});
 			},
 			onChange() {
@@ -354,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)
 			},
 			// 对值扩大后进行四舍五入，再除以扩大因子，避免出现浮点数操作的精度问题
@@ -400,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/uni_modules/uview-plus/components/u-number-keyboard/u-number-keyboard.vue b/uni_modules/uview-plus/components/u-number-keyboard/u-number-keyboard.vue
index 2013bc7..2290793 100644
--- a/uni_modules/uview-plus/components/u-number-keyboard/u-number-keyboard.vue
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-overlay/u-overlay.vue b/uni_modules/uview-plus/components/u-overlay/u-overlay.vue
index 71e4342..c10a213 100644
--- a/uni_modules/uview-plus/components/u-overlay/u-overlay.vue
+++ b/uni_modules/uview-plus/components/u-overlay/u-overlay.vue
@@ -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/uni_modules/uview-plus/components/u-pagination/u-pagination.vue b/uni_modules/uview-plus/components/u-pagination/u-pagination.vue
new file mode 100644
index 0000000..b256aa6
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-parse/node/node.vue b/uni_modules/uview-plus/components/u-parse/node/node.vue
index a6a4fe2..bc5b262 100644
--- a/uni_modules/uview-plus/components/u-parse/node/node.vue
+++ b/uni_modules/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',
@@ -122,7 +127,7 @@ export default {
     return {
       ctrl: {},
       // #ifdef MP-WEIXIN
-      isiOS: uni.getDeviceInfo().system.includes('iOS')
+      isiOS: uni.getSystemInfoSync().system.includes('iOS')
       // #endif
     }
   },
@@ -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/uni_modules/uview-plus/components/u-parse/parse.js b/uni_modules/uview-plus/components/u-parse/parse.js
index feb22b9..a70dabe 100644
--- a/uni_modules/uview-plus/components/u-parse/parse.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-parse/parser.js b/uni_modules/uview-plus/components/u-parse/parser.js
index dc93c9d..e8fc979 100644
--- a/uni_modules/uview-plus/components/u-parse/parser.js
+++ b/uni_modules/uview-plus/components/u-parse/parser.js
@@ -71,19 +71,23 @@ const config = {
     viewbox: 'viewBox',
     attributename: 'attributeName',
     repeatcount: 'repeatCount',
-    repeatdur: 'repeatDur'
+    repeatdur: 'repeatDur',
+    foreignobject: 'foreignObject'
   }
 }
-const tagSelector={}
-// #ifdef APP || H5 || MP-WEIXIN
-const { windowWidth } = uni.getWindowInfo()
-const { system } = uni.getDeviceInfo()
+const tagSelector = {}
+let windowWidth, system
+// #ifdef MP-WEIXIN
+if (uni.canIUse('getWindowInfo')) {
+  windowWidth = uni.getWindowInfo().windowWidth
+  system = uni.getDeviceInfo().system
+} else {
 // #endif
-// #ifndef APP || H5 || MP-WEIXIN
-const {
-  windowWidth,
-  system
-} = uni.getSystemInfoSync()
+  const systemInfo = uni.getSystemInfoSync()
+  windowWidth = systemInfo.windowWidth
+  // #ifdef MP-WEIXIN
+  system = systemInfo.system
+}
 // #endif
 const blankChar = makeMap(' ,\r,\n,\t,\f')
 let idIndex = 0
@@ -325,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 可用
   }
 }
 
@@ -335,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 {
       // 剩余的移除以减小大小
@@ -461,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://')) {
@@ -555,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)
@@ -681,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) {
@@ -707,6 +733,7 @@ Parser.prototype.popNode = function () {
     node.children = undefined
     // #endif
     this.xml = false
+    config.ignoreTags.style = true
     return
   }
 
@@ -843,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'
@@ -860,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 || [])
           }
@@ -986,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/uni_modules/uview-plus/components/u-parse/props.js b/uni_modules/uview-plus/components/u-parse/props.js
index 50760dc..5a7b4eb 100644
--- a/uni_modules/uview-plus/components/u-parse/props.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-parse/u-parse.vue b/uni_modules/uview-plus/components/u-parse/u-parse.vue
index 6d535c6..e0871fe 100644
--- a/uni_modules/uview-plus/components/u-parse/u-parse.vue
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-pdf-reader/props.js b/uni_modules/uview-plus/components/u-pdf-reader/props.js
new file mode 100644
index 0000000..dbaa178
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-pdf-reader/u-pdf-reader.vue b/uni_modules/uview-plus/components/u-pdf-reader/u-pdf-reader.vue
new file mode 100644
index 0000000..2ff0747
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-picker-column/u-picker-column.vue b/uni_modules/uview-plus/components/u-picker-column/u-picker-column.vue
index a2490d9..f788634 100644
--- a/uni_modules/uview-plus/components/u-picker-column/u-picker-column.vue
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-picker-data/u-picker-data.vue b/uni_modules/uview-plus/components/u-picker-data/u-picker-data.vue
new file mode 100644
index 0000000..285ab12
--- /dev/null
+++ b/uni_modules/uview-plus/components/u-picker-data/u-picker-data.vue
@@ -0,0 +1,144 @@
+<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>
+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')
+        }
+    }
+}
+</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/uni_modules/uview-plus/components/u-picker/picker.js b/uni_modules/uview-plus/components/u-picker/picker.js
index 3d4d936..222c963 100644
--- a/uni_modules/uview-plus/components/u-picker/picker.js
+++ b/uni_modules/uview-plus/components/u-picker/picker.js
@@ -7,6 +7,7 @@
  * @lastTime     : 2021-08-20 17:18:20
  * @FilePath     : /u-view2.0/uview-ui/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/uni_modules/uview-plus/components/u-picker/props.js b/uni_modules/uview-plus/components/u-picker/props.js
index 610c70e..f13a2da 100644
--- a/uni_modules/uview-plus/components/u-picker/props.js
+++ b/uni_modules/uview-plus/components/u-picker/props.js
@@ -10,9 +10,23 @@ export const props = defineMixin({
             type: Boolean,
             default: false
         },
+        inputProps: {
+            type: Object,
+            default: () => {
+                return {}
+            }
+        },
+        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 +93,11 @@ export const props = defineMixin({
             type: String,
             default: () => defProps.picker.keyName
         },
+		// 选项对象中，需要获取的属性值键名
+		valueName: {
+		    type: String,
+		    default: () => defProps.picker.valueName
+		},
         // 是否允许点击遮罩关闭选择器
         closeOnClickOverlay: {
             type: Boolean,
@@ -104,5 +123,30 @@ 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
+		}
     }
 })
diff --git a/uni_modules/uview-plus/components/u-picker/u-picker.vue b/uni_modules/uview-plus/components/u-picker/u-picker.vue
index 056ef6a..7dde850 100644
--- a/uni_modules/uview-plus/components/u-picker/u-picker.vue
+++ b/uni_modules/uview-plus/components/u-picker/u-picker.vue
@@ -1,15 +1,27 @@
 <template>
-    <view class="u-picker-warrper">
-		<view v-if="hasInput" class="u-picker-input cursor-pointer" @click="showByClickInput = !showByClickInput">
-			<slot>
-				<up-input :placeholder="placeholder" :readonly="true" border="surround" v-model="inputLabel"></up-input>
-				<div class="input-cover"></div>
+    <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">
@@ -31,11 +43,11 @@
 				<slot name="toolbar-bottom"></slot>
 				<picker-view
 					class="u-picker__view"
-					:indicatorStyle="`height: ${addUnit(itemHeight)}`"
+					:indicatorStyle="`height: ${addUnit(itemHeight, 'px')}`"
 					:value="innerIndex"
 					:immediateChange="immediateChange"
 					:style="{
-						height: `${addUnit(visibleItemCount * itemHeight)}`
+						height: `${addUnit(visibleItemCount * itemHeight, 'px')}`
 					}"
 					@change="changeHandler"
 				>
@@ -51,8 +63,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'
 							}"
@@ -89,6 +101,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		当选择值变化时触发
@@ -117,6 +133,14 @@ export default {
 		}
 	},
 	watch: {
+		// 监听columns参数的变化
+		columns: {
+			immediate: true,
+			deep:true,
+			handler(n) {
+				this.setColumns(n)
+			}
+		},
 		// 监听默认索引的变化，重新设置对应的值
 		defaultIndex: {
 			immediate: true,
@@ -130,17 +154,57 @@ export default {
 				}
 			}
 		},
-		// 监听columns参数的变化
-		columns: {
+		modelValue: {
 			immediate: true,
 			deep:true,
-			handler(n) {
-				this.setColumns(n)
+			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: {
+		// 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];
@@ -161,9 +225,9 @@ export default {
 			let res = []
 			//区分是不是对象数组
 			if (items[0] && Object.prototype.toString.call(items[0]) === '[object Object]') {
-				//对象数组返回id集合
+				//对象数组返回属性值集合
 				items.forEach(element => {
-					res.push(element && element['id'])
+					res.push(element && element[this.valueName])
 				});
 			} else {
 				//非对象数组返回元素集合
@@ -177,6 +241,11 @@ export default {
 	methods: {
 		addUnit,
 		testArray: test.array,
+		onShowByClickInput(){
+			if(!this.disabled){
+				this.showByClickInput=!this.showByClickInput;
+			}
+		},
 		// 获取item需要显示的文字，判别为对象还是文本
 		getItemText(item) {
 			if (test.object(item)) {
@@ -191,6 +260,7 @@ export default {
                 if (this.hasInput) {
                     this.showByClickInput = false
                 }
+				this.setDefault()
 				this.$emit('update:show', false)
 				this.$emit('close')
 			}
@@ -200,14 +270,13 @@ export default {
             if (this.hasInput) {
                 this.showByClickInput = false
             }
+			this.setDefault()
 			this.$emit('update:show', false)
 			this.$emit('cancel')
 		},
-		// 点击工具栏的确定按钮
-		confirm() {
-			//如果用户有没有触发过change
-			if (!this.currentActiveValue.length) {
-				let arr = [0]
+		setDefault() {
+			let arr = [0]
+			if (this.lastIndex.length == 0) {
 				//如果有默认值&&默认值的数组长度是正确的，就用默认值
 				if (Array.isArray(this.defaultIndex) && this.defaultIndex.length == this.innerColumns.length) {
 					arr = [...this.defaultIndex];
@@ -215,13 +284,23 @@ export default {
 					//否则默认都选中第一个
 					arr = Array(this.innerColumns.length).fill(0);
 				}
-				this.setLastIndex(arr)
-				this.setIndexs(arr)
+			} 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,
@@ -241,7 +320,7 @@ export default {
 			// 通过对比前后两次的列索引，得出当前变化的是哪一列
 			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则为变化列中的变化项的索引
@@ -252,13 +331,14 @@ export default {
 			this.columnIndex = columnIndex
 			const values = this.innerColumns
 			// 将当前的各项变化索引，设置为"上一次"的索引变化值
-			this.setLastIndex(value)
+			// this.setLastIndex(value)
 			this.setIndexs(value)
 			//如果是非自带输入框才会在change时候触发v-model绑值的变化
 			//否则会非常的奇怪，用户未确认，值就变了
-			if (!this.hasInput) {
-				this.$emit('update:modelValue', this.inputValue)
-			}
+			// if (!this.hasInput) {
+			// 	this.$emit('update:modelValue', this.inputValue)
+			// }
+			
 			this.$emit('change', {
 				// #ifndef MP-WEIXIN || MP-LARK
 				// 微信小程序不能传递this，会因为循环引用而报错
@@ -337,7 +417,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-picker {
 		position: relative;
diff --git a/uni_modules/uview-plus/components/u-popover/props.js b/uni_modules/uview-plus/components/u-popover/props.js
new file mode 100644
index 0000000..64f1855
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-popover/u-popover.vue b/uni_modules/uview-plus/components/u-popover/u-popover.vue
new file mode 100644
index 0000000..fb9a2dd
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-popup/popup.js b/uni_modules/uview-plus/components/u-popup/popup.js
index 5440c3c..5c39f0b 100644
--- a/uni_modules/uview-plus/components/u-popup/popup.js
+++ b/uni_modules/uview-plus/components/u-popup/popup.js
@@ -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/uni_modules/uview-plus/components/u-popup/props.js b/uni_modules/uview-plus/components/u-popup/props.js
index 78e976b..68e7c86 100644
--- a/uni_modules/uview-plus/components/u-popup/props.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-popup/u-popup.vue b/uni_modules/uview-plus/components/u-popup/u-popup.vue
index caf24fa..2c2c653 100644
--- a/uni_modules/uview-plus/components/u-popup/u-popup.vue
+++ b/uni_modules/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>
@@ -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,6 +168,23 @@
 					})
 				}
 			},
+			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值来判断是否需要预留顶部状态栏和底部安全局的位置
@@ -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/uni_modules/uview-plus/components/u-poster/u-poster.vue b/uni_modules/uview-plus/components/u-poster/u-poster.vue
new file mode 100644
index 0000000..84e6e87
--- /dev/null
+++ b/uni_modules/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://ijry.github.io/uview-plus/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/uni_modules/uview-plus/components/u-pull-refresh/u-pull-refresh.vue b/uni_modules/uview-plus/components/u-pull-refresh/u-pull-refresh.vue
new file mode 100644
index 0000000..a71a27e
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-qrcode/qrcode.js b/uni_modules/uview-plus/components/u-qrcode/qrcode.js
index 7ec89fc..4cdac0a 100644
--- a/uni_modules/uview-plus/components/u-qrcode/qrcode.js
+++ b/uni_modules/uview-plus/components/u-qrcode/qrcode.js
@@ -1037,6 +1037,9 @@ let QRCode = {};
             showLoading: opt.showLoading,
             loadingText: opt.loadingText,
         };
+
+        let canvas = null;
+
         if (typeof opt === 'string') { // 只编码ASCII字符串
             opt = {
                 text: opt
@@ -1083,8 +1086,29 @@ let QRCode = {};
             }
             return options.foreground;
         }
+
+        let getCanvas = async (id) => {
+            return new Promise((resolve, reject)=>{
+                try {
+                    const query = uni.createSelectorQuery().in(this.options.context);
+                    query.select(`#${id}`)
+                    .fields({ node: true, size: true })
+                    .exec((res) => {
+                        resolve(res[0].node)
+                    })
+                }
+                catch (e) {
+                    console.error("createCanvasContextFail",e)
+                }
+            })
+        }
         // 创建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,
@@ -1094,9 +1118,27 @@ let QRCode = {};
             var ctx = '';
             if (options.nvueContext) {
                 ctx = options.nvueContext;
-            } else {
-                ctx = uni.createCanvasContext(options.canvasId, options.context);
             }
+            else {
+                // 获取canvas node节点
+                canvas = await getCanvas(options.canvasId);
+                // #ifdef MP
+                // 不清楚是小程序的bug还是什么原因，canvas的node节点宽高和设置的宽高不一致 重新设置下
+                canvas.width = options.size;
+                canvas.height = options.size;
+                // #endif
+                // #ifdef APP
+                ctx = uni.createCanvasContext(options.canvasId, options.context);
+                // #endif
+                // #ifndef APP
+                ctx = canvas.getContext('2d');
+                // #endif
+
+            }
+            // 设置组件中data里面的ctx
+            options.context.ctx = ctx;
+            options.context.canvas = canvas;
+
             var count = qrCodeAlg.getModuleCount();
             var ratioSize = options.size;
             var ratioImgSize = options.imageSize;
@@ -1107,14 +1149,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.nvueContext) {
+                        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 +1168,49 @@ 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);
+                if (options.nvueContext) {
+                    ctx.drawImage(options.image, x, y, ratioImgSize, ratioImgSize);
+                }
+                else {
+                    // #ifdef H5 || APP
+                    const img = new Image();
+                    // #endif
+
+                    // #ifndef H5 || APP
+                    const img = canvas.createImage();
+                    // #endif
+
+                    img.onload = () => {
+                        ctx.drawImage(img, x, y, ratioImgSize, ratioImgSize);
+                    };
+                    img.src = options.image;
+                }
                 // 画圆角矩形
                 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.nvueContext || 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,57 +1221,64 @@ 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.nvueContext || isApp){
+                    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)
                                         }
                                     }
-                                },
-                                fail: function (res) {
-                                    if (options.cbResult) {
-                                        options.cbResult(res)
-                                    }
-                                },
-                                complete: function () {
-                                    uni.hideLoading();
-                                },
-                            }, options.context);
-                        }
-                    }, options.text.length + 100);
-                });
+                                );
+                            } 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 {
+                                                options.cbResult(res.tempFilePath)
+                                            }
+                                        }
+                                    },
+                                    fail: function (res) {
+                                        if (options.cbResult) {
+                                            options.cbResult(res)
+                                        }
+                                    },
+                                    complete: function () {
+                                        uni.hideLoading();
+                                    },
+                                }, options.context);
+                            }
+                        }, options.text.length + 100);
+                    });
+                }
+                else{
+                    options.cbResult("")
+                }
+
             }, options.usingComponents ? 0 : 150);
         }
         createCanvas(this.options);
@@ -1232,4 +1316,4 @@ let QRCode = {};
     };
 })()
 
-export default QRCode
\ No newline at end of file
+export default QRCode
diff --git a/uni_modules/uview-plus/components/u-qrcode/u-qrcode.vue b/uni_modules/uview-plus/components/u-qrcode/u-qrcode.vue
index dc9574b..4b95df2 100644
--- a/uni_modules/uview-plus/components/u-qrcode/u-qrcode.vue
+++ b/uni_modules/uview-plus/components/u-qrcode/u-qrcode.vue
@@ -1,25 +1,50 @@
 <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">
+
+            <!-- #ifndef APP-NVUE || APP-PLUS -->
+            <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-PLUS -->
+            <canvas
+                class="u-qrcode__canvas"
+                :id="cid"
+                :canvas-id="cid"
+                :style="{ width: sizeLocal + unit, height: sizeLocal + unit }" />
+            <!-- #endif -->
+
+            <!-- #ifdef APP-NVUE -->
+            <gcanvas 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>
@@ -27,278 +52,404 @@ import QRCode from "./qrcode.js"
 // #ifdef APP-NVUE
 // https://github.com/dcloudio/NvueCanvasDemo/blob/master/README.md
 import {
-	enable,
-	WeexBridge
+    enable,
+    WeexBridge
 } from '../../libs/util/gcanvas/index.js';
 // #endif
 let qrcode
 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: () => `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: ['result', 'longpressCallback'],
+    data() {
+        return {
+            loading: false,
+            result: '',
+            popupShow: false,
+            list: [
+                {
+                    name: '保存二维码',
+                }
+            ],
+            rootId: `rootId${Number(Math.random() * 100).toFixed(0)}`,
+            ganvas: null,
+            context: '',
+            canvasObj: {},
+            sizeLocal: this.size,
+            ctx: null, // ctx 在new Qrcode 时js文件内部设置
+            canvas: null, // ctx 在new Qrcode 时js文件内部设置
+        }
+    },
+    async mounted(){
+        // 如果使用根节点的宽高 则 重新设置 size
+        if(this.useRootHeightAndWidth){
+            await this.setNewSize()
+        }
 
-		if (this.loadMake) {
-			if (!this._empty(this.val)) {
-				setTimeout(() => {
-					this._makeCode()
-				}, 0);
-			}
-		}
-	},
-	methods: {
-		_makeCode() {
-			let that = this
-			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;
-							}
-						},
-						fail: function(err) {
-							console.log(err.errMsg);
-						}
-					}
-				});
-			}
-			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);
-				}
-			}
-		},
-		val: function (n, o) {
-			if (this.onval) {
-				if (n != o && !this._empty(n)) {
-					setTimeout(() => {
-						this._makeCode()
-					}, 0);
-				}
-			}
-		}
-	},
-	computed: {
-	}
+        // #ifdef APP-NVUE
+        /*获取元素引用*/
+        this.ganvas = this.$refs["gcanvess"]
+        /*通过元素引用获取canvas对象*/
+        this.canvasObj = enable(this.ganvas, {
+            bridge: WeexBridge
+        })
+        /*获取绘图所需的上下文，目前不支持3d*/
+        this.context = this.canvasObj.getContext('2d')
+        // #endif
+
+        if (this.loadMake) {
+            if (!this._empty(this.val)) {
+                setTimeout(() => {
+                    setTimeout(()=>{
+                        this._makeCode()
+                    })
+                }, 0);
+            }
+        }
+    },
+    methods: {
+        _makeCode() {
+            let that = this
+            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.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)
+                    },
+                });
+            } 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;
+                            }
+                        },
+                        fail: function(err) {
+                            console.log(err.errMsg);
+                        }
+                    }
+                });
+            }
+            this.$emit('preview', {
+                url: this.result
+            }, e)
+        },
+        async toTempFilePath({success, fail}) {
+            if (this.context) {
+                this.ctx.toTempFilePath(
+                    0,
+                    0,
+                    this.sizeLocal,
+                    this.sizeLocal,
+                    this.sizeLocal,
+                    this.sizeLocal,
+                    "",
+                    1,
+                    res => {
+                        success(res)
+                    }
+                );
+            }
+            else {
+                // #ifdef MP-TOUTIAO || H5
+                success({
+                    tempFilePath: this.ctx.canvas.toDataURL("image/png", 1)
+                })
+                // #endif
+
+                // #ifdef APP-PLUS
+                uni.canvasToTempFilePath(
+                    {
+                        canvasId: this.cid,
+                        success :res => {
+                            success(res)
+                        },
+                        fail: fail
+                    },
+                    this)
+                // #endif
+
+                // #ifndef MP-TOUTIAO || H5 || APP-PLUS
+                const canvas = await this.getNode(this.cid,true);
+                uni.canvasToTempFilePath(
+                    {
+                        canvas,
+                        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.getNode(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 getNode(id,isCanvas){
+            return new Promise((resolve, reject)=>{
+                try {
+                    const query = uni.createSelectorQuery().in(this);
+                    query.select(`#${id}`)
+                    .fields({ node: true, size: true })
+                    .exec((res) => {
+                        if(isCanvas){
+                            resolve(res[0].node)
+                        }
+                        else{
+                            resolve(res[0])
+                        }
+
+                    })
+                }
+                catch (e) {
+                    console.error("获取节点失败",e)
+                }
+            })
+        },
+
+        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/uni_modules/uview-plus/components/u-radio-group/u-radio-group.vue b/uni_modules/uview-plus/components/u-radio-group/u-radio-group.vue
index 794c2c5..f49f06c 100644
--- a/uni_modules/uview-plus/components/u-radio-group/u-radio-group.vue
+++ b/uni_modules/uview-plus/components/u-radio-group/u-radio-group.vue
@@ -118,7 +118,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-radio-group {
 		flex: 1;
diff --git a/uni_modules/uview-plus/components/u-radio/u-radio.vue b/uni_modules/uview-plus/components/u-radio/u-radio.vue
index 7ce5923..c9e9241 100644
--- a/uni_modules/uview-plus/components/u-radio/u-radio.vue
+++ b/uni_modules/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"
@@ -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/uni_modules/uview-plus/components/u-rate/u-rate.vue b/uni_modules/uview-plus/components/u-rate/u-rate.vue
index a98322d..258349b 100644
--- a/uni_modules/uview-plus/components/u-rate/u-rate.vue
+++ b/uni_modules/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>
@@ -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/uni_modules/uview-plus/components/u-read-more/readMore.js b/uni_modules/uview-plus/components/u-read-more/readMore.js
index 09b11cc..f5be690 100644
--- a/uni_modules/uview-plus/components/u-read-more/readMore.js
+++ b/uni_modules/uview-plus/components/u-read-more/readMore.js
@@ -7,13 +7,14 @@
  * @lastTime     : 2021-08-20 17:18:41
  * @FilePath     : /u-view2.0/uview-ui/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/uni_modules/uview-plus/components/u-read-more/u-read-more.vue b/uni_modules/uview-plus/components/u-read-more/u-read-more.vue
index d4405c0..e26be02 100644
--- a/uni_modules/uview-plus/components/u-read-more/u-read-more.vue
+++ b/uni_modules/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>
@@ -140,8 +140,6 @@
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
-
 .u-read-more {
 
 	&__content {
diff --git a/uni_modules/uview-plus/components/u-refresh-virtual-list/u-refresh-virtual-list.vue b/uni_modules/uview-plus/components/u-refresh-virtual-list/u-refresh-virtual-list.vue
new file mode 100644
index 0000000..9313ac3
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-row-notice/u-row-notice.vue b/uni_modules/uview-plus/components/u-row-notice/u-row-notice.vue
index 565072c..887a858 100644
--- a/uni_modules/uview-plus/components/u-row-notice/u-row-notice.vue
+++ b/uni_modules/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>
@@ -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/uni_modules/uview-plus/components/u-row/u-row.vue b/uni_modules/uview-plus/components/u-row/u-row.vue
index ded929b..fc43477 100644
--- a/uni_modules/uview-plus/components/u-row/u-row.vue
+++ b/uni_modules/uview-plus/components/u-row/u-row.vue
@@ -89,7 +89,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	
 	.u-row {
 		@include flex;
diff --git a/uni_modules/uview-plus/components/u-safe-bottom/u-safe-bottom.vue b/uni_modules/uview-plus/components/u-safe-bottom/u-safe-bottom.vue
index e895baa..31bd6ba 100644
--- a/uni_modules/uview-plus/components/u-safe-bottom/u-safe-bottom.vue
+++ b/uni_modules/uview-plus/components/u-safe-bottom/u-safe-bottom.vue
@@ -34,7 +34,7 @@
 		computed: {
 			style() {
 				const style = {};
-				// #ifdef APP-NVUE || MP-TOUTIAO
+				// #ifdef APP-NVUE || MP-TOUTIAO || MP-WEIXIN
 				// nvue下，高度使用js计算填充
 				style.height = addUnit(getWindowInfo().safeAreaInsets.bottom, 'px');
 				// #endif
@@ -42,7 +42,7 @@
 			},
 		},
 		mounted() {
-			// #ifdef APP-NVUE
+			// #ifdef APP-NVUE || MP-TOUTIAO || MP-WEIXIN
 			// 标识为是否nvue
 			this.isNvue = true;
 			// #endif
diff --git a/uni_modules/uview-plus/components/u-scroll-list/u-scroll-list.vue b/uni_modules/uview-plus/components/u-scroll-list/u-scroll-list.vue
index 5f2af6b..f694d85 100644
--- a/uni_modules/uview-plus/components/u-scroll-list/u-scroll-list.vue
+++ b/uni_modules/uview-plus/components/u-scroll-list/u-scroll-list.vue
@@ -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/uni_modules/uview-plus/components/u-search/props.js b/uni_modules/uview-plus/components/u-search/props.js
index cf79927..8925ec9 100644
--- a/uni_modules/uview-plus/components/u-search/props.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-search/search.js b/uni_modules/uview-plus/components/u-search/search.js
index 8f393c8..1d11111 100644
--- a/uni_modules/uview-plus/components/u-search/search.js
+++ b/uni_modules/uview-plus/components/u-search/search.js
@@ -7,17 +7,18 @@
  * @lastTime     : 2021-08-20 17:19:45
  * @FilePath     : /u-view2.0/uview-ui/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,6 +28,7 @@ export default {
         color: '#606266',
         placeholderColor: '#909399',
         searchIcon: 'search',
+        iconPosition: 'left',
         margin: '0',
         animation: false,
         value: '',
diff --git a/uni_modules/uview-plus/components/u-search/u-search.vue b/uni_modules/uview-plus/components/u-search/u-search.vue
index 248d847..9c145ed 100644
--- a/uni_modules/uview-plus/components/u-search/u-search.vue
+++ b/uni_modules/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,12 +21,12 @@
 				</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"
@@ -54,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]"
@@ -100,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 输入框内容发生变化时触发
@@ -122,7 +126,6 @@
 		data() {
 			return {
 				keyword: '',
-				showClear: false, // 是否显示右边的清除图标
 				show: false,
 				// 标记input当前状态是否处于聚焦中，如果是，才会显示右侧的清除控件
 				focused: this.focus
@@ -162,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'],
@@ -231,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;
@@ -328,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/uni_modules/uview-plus/components/u-section/section.js b/uni_modules/uview-plus/components/u-section/section.js
index f432648..acfb8e7 100644
--- a/uni_modules/uview-plus/components/u-section/section.js
+++ b/uni_modules/uview-plus/components/u-section/section.js
@@ -7,11 +7,12 @@
  * @lastTime     : 2021-08-20 17:07:33
  * @FilePath     : /u-view2.0/uview-ui/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/uni_modules/uview-plus/components/u-select/u-select.vue b/uni_modules/uview-plus/components/u-select/u-select.vue
new file mode 100644
index 0000000..062e41e
--- /dev/null
+++ b/uni_modules/uview-plus/components/u-select/u-select.vue
@@ -0,0 +1,218 @@
+<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 { getWindowInfo } from '../../libs/function/index';
+export default {
+	name:"up-select",
+	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();
+			}
+		});
+      },
+	  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 => {
+			console.log(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/uni_modules/uview-plus/components/u-short-video/u-short-video.vue b/uni_modules/uview-plus/components/u-short-video/u-short-video.vue
new file mode 100644
index 0000000..b755043
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-signature/u-signature.vue b/uni_modules/uview-plus/components/u-signature/u-signature.vue
new file mode 100644
index 0000000..4adfc2e
--- /dev/null
+++ b/uni_modules/uview-plus/components/u-signature/u-signature.vue
@@ -0,0 +1,485 @@
+<template>
+	<view class="u-signature">
+		<view class="u-signature__canvas-wrap">
+			<canvas 
+				class="u-signature__canvas" 
+				:canvas-id="canvasId" 
+				:disable-scroll="true"
+				@touchstart="touchStart"
+				@touchmove="touchMove"
+				@touchend="touchEnd"
+				:style="{
+					width: canvasWidth + 'px',
+					height: canvasHeight + 'px',
+					background: bgColor
+				}"
+			></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: [], // 当前绘制路径
+				ctx: null,
+				isEmpty: true,
+				presetColors: [
+					'#000000', // 黑色
+					'#ff0000', // 红色
+					'#00ff00', // 绿色
+					'#0000ff', // 蓝色
+					'#ffff00', // 黄色
+					'#00ffff', // 青色
+					'#ff00ff', // 紫色
+					'#ffffff'  // 白色
+				],
+				showBrushSettings: false,
+				showColorSettings: false,
+				lastPoint: null // 保存上一个点的坐标
+			}
+		},
+		mounted() {
+			this.initCanvas()
+		},
+		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: {
+			initCanvas() {
+				// #ifndef APP-NVUE
+				const ctx = uni.createCanvasContext(this.canvasId, this)
+				this.ctx = ctx
+				this.clearCanvas()
+				// #endif
+				
+				// #ifdef APP-NVUE
+				// NVUE环境下的处理
+				// #endif
+			},
+			
+			touchStart(e) {
+				if (!this.ctx) return
+				
+				this.isDrawing = true
+				this.isEmpty = false
+				this.currentPath = []
+				
+				const { x, y } = this.getCanvasPoint(e)
+				this.ctx.beginPath()
+				this.ctx.moveTo(x, y)
+				this.ctx.setLineCap('round')
+				this.ctx.setLineJoin('round')
+				this.ctx.setStrokeStyle(this.lineColor)
+				this.ctx.setLineWidth(this.lineWidth)
+				
+				// 记录起始点
+				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.ctx) return
+				
+				// 阻止默认事件以提高性能
+				e.preventDefault()
+				
+				const { x, y } = this.getCanvasPoint(e)
+				
+				// 使用更密集的点采样确保线条连贯性
+				if (this.lastPoint) {
+					// 计算两点间距离
+					const distance = Math.sqrt(Math.pow(x - this.lastPoint.x, 2) + Math.pow(y - this.lastPoint.y, 2))
+					// 根据距离确定插值点数量，确保点间距不超过1像素以获得更平滑的线条
+					const steps = Math.max(1, Math.floor(distance / 1))
+					
+					// 在两点间插入插值点
+					for (let i = 1; i <= steps; i++) {
+						const t = i / steps
+						const midX = this.lastPoint.x + (x - this.lastPoint.x) * t
+						const midY = this.lastPoint.y + (y - this.lastPoint.y) * t
+						
+						this.ctx.lineTo(midX, midY)
+						this.ctx.stroke()
+						this.currentPath.push({
+							x: midX,
+							y: midY,
+							type: 'move'
+						})
+					}
+				} else {
+					this.ctx.lineTo(x, y)
+					this.ctx.stroke()
+					this.currentPath.push({
+						x,
+						y,
+						type: 'move'
+					})
+				}
+				
+				this.ctx.draw(true)
+				
+				// 更新上一个点
+				this.lastPoint = { x, y }
+			},
+			
+			touchEnd(e) {
+				if (!this.isDrawing || !this.ctx) return
+				
+				this.isDrawing = false
+				this.ctx.closePath()
+				this.lastPoint = null
+				
+				// 将当前路径加入栈中用于回退
+				if (this.currentPath.length > 0) {
+					this.pathStack.push([...this.currentPath])
+				}
+			},
+			
+			// 同步获取canvas坐标点（兼容处理）
+			getCanvasPoint(e) {
+				const touch = e.touches[0]
+				const canvas = uni.createSelectorQuery().in(this).select('.u-signature__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() {
+				this.clearCanvas()
+				
+				if (this.pathStack.length === 0) {
+					this.isEmpty = true
+					return
+				}
+				
+				this.isEmpty = false
+				
+				// #ifndef APP-NVUE
+				this.pathStack.forEach(path => {
+					if (path.length === 0) return
+					
+					this.ctx.beginPath()
+					this.ctx.setLineCap('round')
+					this.ctx.setLineJoin('round')
+					
+					let lastPoint = null
+					path.forEach((point, index) => {
+						if (index === 0 && point.type === 'start') {
+							// 设置起始点样式
+							this.ctx.setStrokeStyle(point.color)
+							this.ctx.setLineWidth(point.width)
+							this.ctx.moveTo(point.x, point.y)
+							lastPoint = { x: point.x, y: point.y }
+						} else if (point.type === 'move') {
+							this.ctx.lineTo(point.x, point.y)
+							lastPoint = { x: point.x, y: point.y }
+						}
+					})
+					
+					this.ctx.stroke()
+					this.ctx.draw(true)
+				})
+				// #endif
+			},
+			
+			// 清空画布
+			clear() {
+				this.pathStack = []
+				this.currentPath = []
+				this.isEmpty = true
+				this.lastPoint = null
+				this.clearCanvas()
+			},
+			
+			// 清空画布内容
+			clearCanvas() {
+				if (!this.ctx) return
+				
+				// #ifndef APP-NVUE
+				this.ctx.setFillStyle(this.bgColor)
+				this.ctx.fillRect(0, 0, this.canvasWidth, this.canvasHeight)
+				this.ctx.draw()
+				// #endif
+			},
+			
+			// 导出签名图片
+			exportSignature() {
+				if (this.isEmpty) return
+				
+				// #ifndef APP-NVUE
+				uni.canvasToTempFilePath({
+					canvasId: this.canvasId,
+					fileType: 'png',
+					quality: 1,
+					success: (res) => {
+						this.$emit('confirm', res.tempFilePath)
+					},
+					fail: (err) => {
+						this.$emit('error', err)
+					}
+				}, this)
+				// #endif
+				
+				// #ifdef APP-NVUE
+				// NVUE环境下可能需要特殊处理
+				// #endif
+			},
+			
+			// 切换笔画设置显示
+			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/uni_modules/uview-plus/components/u-skeleton/u-skeleton.vue b/uni_modules/uview-plus/components/u-skeleton/u-skeleton.vue
index a34e806..7c7d45a 100644
--- a/uni_modules/uview-plus/components/u-skeleton/u-skeleton.vue
+++ b/uni_modules/uview-plus/components/u-skeleton/u-skeleton.vue
@@ -187,7 +187,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	@mixin background {
 		/* #ifdef APP-NVUE */
diff --git a/uni_modules/uview-plus/components/u-slider/props.js b/uni_modules/uview-plus/components/u-slider/props.js
index b950f31..4cbe120 100644
--- a/uni_modules/uview-plus/components/u-slider/props.js
+++ b/uni_modules/uview-plus/components/u-slider/props.js
@@ -86,6 +86,10 @@ export const props = defineMixin({
         height: {
             type: String,
             default: () => defProps.slider.height
-        }
+        },
+        innerStyle: {
+            type: Object,
+            default: () => defProps.slider.innerStyle
+        },
     }
 })
diff --git a/uni_modules/uview-plus/components/u-slider/slider.js b/uni_modules/uview-plus/components/u-slider/slider.js
index 4e3a31a..b81b0b6 100644
--- a/uni_modules/uview-plus/components/u-slider/slider.js
+++ b/uni_modules/uview-plus/components/u-slider/slider.js
@@ -22,6 +22,7 @@ export default {
 		disabled:false,
         blockStyle: {},
         useNative: false,
-        height: '2px'
+        height: '2px',
+        innerStyle: {}
     }
 }
diff --git a/uni_modules/uview-plus/components/u-slider/u-slider.vue b/uni_modules/uview-plus/components/u-slider/u-slider.vue
index 0933913..96e4df4 100644
--- a/uni_modules/uview-plus/components/u-slider/u-slider.vue
+++ b/uni_modules/uview-plus/components/u-slider/u-slider.vue
@@ -7,9 +7,7 @@
 			<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"
@@ -58,7 +56,7 @@
 					<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"/>
+						<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),
@@ -69,7 +67,8 @@
 				<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"/>
+					<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),
@@ -148,20 +147,27 @@
 			// #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'){
+					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
@@ -169,6 +175,13 @@
 		},
 		created() {
 		},
+		computed: {
+			innerStyleCpu() {
+				let style = this.innerStyle;
+				style.height = (this.isRange && this.showValue) ? (getPx(this.blockSize) + 24) + 'px' : (getPx(this.blockSize)) + 'px';
+				return style;
+			}
+		},
 		async mounted() {
 			// 获取滑块条的尺寸信息
 			if (!this.useNative) {
@@ -386,7 +399,7 @@
 					return this.rangeValue
 				} else {
 					return valueFormat
-				} 
+				}
 			},
 			format(value, index = 1) {
 				// 将小数变成整数，为了减少对视图的更新，造成视图层与逻辑层的阻塞
@@ -419,7 +432,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	.u-slider {
 		position: relative;
 		display: flex;
diff --git a/uni_modules/uview-plus/components/u-status-bar/props.js b/uni_modules/uview-plus/components/u-status-bar/props.js
index 930cb53..d3bf7ee 100644
--- a/uni_modules/uview-plus/components/u-status-bar/props.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-status-bar/statusBar.js b/uni_modules/uview-plus/components/u-status-bar/statusBar.js
index d237a83..fda1bab 100644
--- a/uni_modules/uview-plus/components/u-status-bar/statusBar.js
+++ b/uni_modules/uview-plus/components/u-status-bar/statusBar.js
@@ -10,6 +10,7 @@
 export default {
     // statusBar
     statusBar: {
-        bgColor: 'transparent'
+        bgColor: 'transparent',
+		height: 0
     }
 }
diff --git a/uni_modules/uview-plus/components/u-status-bar/u-status-bar.vue b/uni_modules/uview-plus/components/u-status-bar/u-status-bar.vue
index 1f0491d..582ba6a 100644
--- a/uni_modules/uview-plus/components/u-status-bar/u-status-bar.vue
+++ b/uni_modules/uview-plus/components/u-status-bar/u-status-bar.vue
@@ -34,11 +34,13 @@
 			this.isH5 = true
 			// #endif
 		},
+		emits: ['update:height'],
 		computed: {
 			style() {
 				const style = {}
 				// 状态栏高度，由于某些安卓和微信开发工具无法识别css的顶部状态栏变量，所以使用js获取的方式
 				let sheight = getWindowInfo().statusBarHeight
+				this.$emit('update:height', sheight)
 				if (sheight == 0) {
 					this.isH5 = true
 				} else {
diff --git a/uni_modules/uview-plus/components/u-steps-item/u-steps-item.vue b/uni_modules/uview-plus/components/u-steps-item/u-steps-item.vue
index c3e1dea..b4faad8 100644
--- a/uni_modules/uview-plus/components/u-steps-item/u-steps-item.vue
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-steps/u-steps.vue b/uni_modules/uview-plus/components/u-steps/u-steps.vue
index 7f48cb3..121b5ee 100644
--- a/uni_modules/uview-plus/components/u-steps/u-steps.vue
+++ b/uni_modules/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>
 	 */
@@ -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/uni_modules/uview-plus/components/u-sticky/u-sticky.vue b/uni_modules/uview-plus/components/u-sticky/u-sticky.vue
index 4cc483d..e55e71e 100644
--- a/uni_modules/uview-plus/components/u-sticky/u-sticky.vue
+++ b/uni_modules/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"
 		>
@@ -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]
 				})
diff --git a/uni_modules/uview-plus/components/u-subsection/props.js b/uni_modules/uview-plus/components/u-subsection/props.js
index 684afcc..799f518 100644
--- a/uni_modules/uview-plus/components/u-subsection/props.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-subsection/subsection.js b/uni_modules/uview-plus/components/u-subsection/subsection.js
index 9a165ff..b67293d 100644
--- a/uni_modules/uview-plus/components/u-subsection/subsection.js
+++ b/uni_modules/uview-plus/components/u-subsection/subsection.js
@@ -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/uni_modules/uview-plus/components/u-subsection/u-subsection.vue b/uni_modules/uview-plus/components/u-subsection/u-subsection.vue
index 37fb4b5..1fb3192 100644
--- a/uni_modules/uview-plus/components/u-subsection/u-subsection.vue
+++ b/uni_modules/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>
@@ -60,16 +62,19 @@ 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' ）
+ * @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/uni_modules/uview-plus/components/u-swipe-action-item/u-swipe-action-item.vue b/uni_modules/uview-plus/components/u-swipe-action-item/u-swipe-action-item.vue
index d655166..74e5c12 100644
--- a/uni_modules/uview-plus/components/u-swipe-action-item/u-swipe-action-item.vue
+++ b/uni_modules/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',
@@ -201,7 +201,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-swipe-action-item {
 		position: relative;
diff --git a/uni_modules/uview-plus/components/u-swiper-indicator/u-swiper-indicator.vue b/uni_modules/uview-plus/components/u-swiper-indicator/u-swiper-indicator.vue
index 7820d47..a6c2214 100644
--- a/uni_modules/uview-plus/components/u-swiper-indicator/u-swiper-indicator.vue
+++ b/uni_modules/uview-plus/components/u-swiper-indicator/u-swiper-indicator.vue
@@ -79,7 +79,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-swiper-indicator {
 
diff --git a/uni_modules/uview-plus/components/u-swiper/u-swiper.vue b/uni_modules/uview-plus/components/u-swiper/u-swiper.vue
index 11fea9a..33b27c1 100644
--- a/uni_modules/uview-plus/components/u-swiper/u-swiper.vue
+++ b/uni_modules/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
@@ -214,7 +214,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	
 	.u-swiper__wrapper {
 		flex: 1;
diff --git a/uni_modules/uview-plus/components/u-switch/u-switch.vue b/uni_modules/uview-plus/components/u-switch/u-switch.vue
index e486041..811b15a 100644
--- a/uni_modules/uview-plus/components/u-switch/u-switch.vue
+++ b/uni_modules/uview-plus/components/u-switch/u-switch.vue
@@ -165,7 +165,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-switch {
 		@include flex(row);
diff --git a/uni_modules/uview-plus/components/u-tabbar-item/props.js b/uni_modules/uview-plus/components/u-tabbar-item/props.js
index ae33b62..9d208aa 100644
--- a/uni_modules/uview-plus/components/u-tabbar-item/props.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-tabbar-item/tabbarItem.js b/uni_modules/uview-plus/components/u-tabbar-item/tabbarItem.js
index d036ce5..82a2798 100644
--- a/uni_modules/uview-plus/components/u-tabbar-item/tabbarItem.js
+++ b/uni_modules/uview-plus/components/u-tabbar-item/tabbarItem.js
@@ -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/uni_modules/uview-plus/components/u-tabbar-item/u-tabbar-item.vue b/uni_modules/uview-plus/components/u-tabbar-item/u-tabbar-item.vue
index baa19fc..6395d89 100644
--- a/uni_modules/uview-plus/components/u-tabbar-item/u-tabbar-item.vue
+++ b/uni_modules/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"
@@ -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/uni_modules/uview-plus/components/u-tabbar/props.js b/uni_modules/uview-plus/components/u-tabbar/props.js
index 8ce1d2f..2645a2e 100644
--- a/uni_modules/uview-plus/components/u-tabbar/props.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-tabbar/tabbar.js b/uni_modules/uview-plus/components/u-tabbar/tabbar.js
index 187112d..0835e90 100644
--- a/uni_modules/uview-plus/components/u-tabbar/tabbar.js
+++ b/uni_modules/uview-plus/components/u-tabbar/tabbar.js
@@ -17,6 +17,8 @@ export default {
         activeColor: '#1989fa',
         inactiveColor: '#7d7e80',
         fixed: true,
-        placeholder: true
+        placeholder: true,
+        borderColor: '',
+        backgroundColor: ''
     }
 }
diff --git a/uni_modules/uview-plus/components/u-tabbar/u-tabbar.vue b/uni_modules/uview-plus/components/u-tabbar/u-tabbar.vue
index d67a634..918460d 100644
--- a/uni_modules/uview-plus/components/u-tabbar/u-tabbar.vue
+++ b/uni_modules/uview-plus/components/u-tabbar/u-tabbar.vue
@@ -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/uni_modules/uview-plus/components/u-table/u-table.vue b/uni_modules/uview-plus/components/u-table/u-table.vue
index 8bf5af7..f003bf6 100644
--- a/uni_modules/uview-plus/components/u-table/u-table.vue
+++ b/uni_modules/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>
 
@@ -12,20 +14,91 @@
 	 * Table 表格 
 	 * @description 表格组件一般用于展示大量结构化数据的场景 本组件标签类似HTML的table表格，由table、tr、th、td四个组件组成
 	 * @tutorial https://ijry.github.io/uview-plus/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/uni_modules/uview-plus/components/u-table2/tableRow.vue b/uni_modules/uview-plus/components/u-table2/tableRow.vue
new file mode 100644
index 0000000..6f7b8cd
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-table2/u-table2.vue b/uni_modules/uview-plus/components/u-table2/u-table2.vue
new file mode 100644
index 0000000..db075b5
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-tabs/props.js b/uni_modules/uview-plus/components/u-tabs/props.js
index bce1598..5684818 100644
--- a/uni_modules/uview-plus/components/u-tabs/props.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-tabs/tabs.js b/uni_modules/uview-plus/components/u-tabs/tabs.js
index 817e2d2..5f4b6d0 100644
--- a/uni_modules/uview-plus/components/u-tabs/tabs.js
+++ b/uni_modules/uview-plus/components/u-tabs/tabs.js
@@ -12,7 +12,7 @@ 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/uni_modules/uview-plus/components/u-tabs/u-tabs.vue b/uni_modules/uview-plus/components/u-tabs/u-tabs.vue
index 1fb1d54..fe9941f 100644
--- a/uni_modules/uview-plus/components/u-tabs/u-tabs.vue
+++ b/uni_modules/uview-plus/components/u-tabs/u-tabs.vue
@@ -27,6 +27,15 @@
 								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" />
@@ -169,7 +178,14 @@
 		},
 		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,
@@ -220,6 +236,8 @@
 				}, index)
 				// 如果disabled状态，返回
 				if (item.disabled) return
+				// 如果点击当前不触发change
+				if (this.innerCurrent == index) return
 				this.innerCurrent = index
 				this.resize()
 				this.$emit('update:current', index)
@@ -328,7 +346,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-tabs {
 
diff --git a/uni_modules/uview-plus/components/u-tag/props.js b/uni_modules/uview-plus/components/u-tag/props.js
index 998a5f2..a752b14 100644
--- a/uni_modules/uview-plus/components/u-tag/props.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-tag/tag.js b/uni_modules/uview-plus/components/u-tag/tag.js
index e686e50..8519fa1 100644
--- a/uni_modules/uview-plus/components/u-tag/tag.js
+++ b/uni_modules/uview-plus/components/u-tag/tag.js
@@ -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/uni_modules/uview-plus/components/u-tag/u-tag.vue b/uni_modules/uview-plus/components/u-tag/u-tag.vue
index dd4d714..5c3fdf5 100644
--- a/uni_modules/uview-plus/components/u-tag/u-tag.vue
+++ b/uni_modules/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,6 +78,7 @@
 	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组件一般用于标记和选择，我们提供了更加丰富的表现形式，能够较全面的涵盖您的使用场景
@@ -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/uni_modules/uview-plus/components/u-td/u-td.vue b/uni_modules/uview-plus/components/u-td/u-td.vue
index 257e87e..599a674 100644
--- a/uni_modules/uview-plus/components/u-td/u-td.vue
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-text/u-text.vue b/uni_modules/uview-plus/components/u-text/u-text.vue
index d852eed..8fd1db6 100644
--- a/uni_modules/uview-plus/components/u-text/u-text.vue
+++ b/uni_modules/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>
@@ -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/uni_modules/uview-plus/components/u-textarea/u-textarea.vue b/uni_modules/uview-plus/components/u-textarea/u-textarea.vue
index 6266cc6..fadc540 100644
--- a/uni_modules/uview-plus/components/u-textarea/u-textarea.vue
+++ b/uni_modules/uview-plus/components/u-textarea/u-textarea.vue
@@ -3,7 +3,7 @@
         <textarea
             class="u-textarea__field"
             :value="innerValue"
-            :style="{ height: addUnit(height) }"
+            :style="fieldStyle"
             :placeholder="placeholder"
             :placeholder-style="addStyle(placeholderStyle, typeof placeholderStyle === 'string' ? 'string' : 'object')"
             :placeholder-class="placeholderClass"
@@ -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/uni_modules/uview-plus/components/u-th/props.js b/uni_modules/uview-plus/components/u-th/props.js
new file mode 100644
index 0000000..a37e438
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-th/u-th.vue b/uni_modules/uview-plus/components/u-th/u-th.vue
new file mode 100644
index 0000000..fe3a9f8
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-title/u-title.vue b/uni_modules/uview-plus/components/u-title/u-title.vue
new file mode 100644
index 0000000..7e19030
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-toast/toast.js b/uni_modules/uview-plus/components/u-toast/toast.js
index 2dd2ed1..405830e 100644
--- a/uni_modules/uview-plus/components/u-toast/toast.js
+++ b/uni_modules/uview-plus/components/u-toast/toast.js
@@ -12,7 +12,7 @@ export default {
     toast: {
         zIndex: 10090,
         loading: false,
-        text: '',
+        message: '',
         icon: '',
         type: '',
         loadingMode: '',
diff --git a/uni_modules/uview-plus/components/u-toast/u-toast.vue b/uni_modules/uview-plus/components/u-toast/u-toast.vue
index dd1b942..6e05973 100644
--- a/uni_modules/uview-plus/components/u-toast/u-toast.vue
+++ b/uni_modules/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"
@@ -77,6 +77,7 @@
 				config: {
 					message: '', // 显示文本
 					type: '', // 主题类型，primary，success，error，warning，black
+					zIndex: 10090, // 层级
 					duration: 2000, // 显示的时间，毫秒
 					icon: true, // 显示的图标
 					position: 'center', // toast出现的位置
@@ -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/uni_modules/uview-plus/components/u-toolbar/toolbar.js b/uni_modules/uview-plus/components/u-toolbar/toolbar.js
index 3289967..7d2a2c6 100644
--- a/uni_modules/uview-plus/components/u-toolbar/toolbar.js
+++ b/uni_modules/uview-plus/components/u-toolbar/toolbar.js
@@ -7,14 +7,15 @@
  * @lastTime     : 2021-08-20 17:24:55
  * @FilePath     : /u-view2.0/uview-ui/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/uni_modules/uview-plus/components/u-toolbar/u-toolbar.vue b/uni_modules/uview-plus/components/u-toolbar/u-toolbar.vue
index 68e9f36..8d61d4a 100644
--- a/uni_modules/uview-plus/components/u-toolbar/u-toolbar.vue
+++ b/uni_modules/uview-plus/components/u-toolbar/u-toolbar.vue
@@ -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/uni_modules/uview-plus/components/u-tooltip/props.js b/uni_modules/uview-plus/components/u-tooltip/props.js
index 9eaf570..121a6f8 100644
--- a/uni_modules/uview-plus/components/u-tooltip/props.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-tooltip/tooltip.js b/uni_modules/uview-plus/components/u-tooltip/tooltip.js
index 875604d..e896838 100644
--- a/uni_modules/uview-plus/components/u-tooltip/tooltip.js
+++ b/uni_modules/uview-plus/components/u-tooltip/tooltip.js
@@ -20,6 +20,9 @@ export default {
         showCopy: true,
         buttons: [],
         overlay: true,
-        showToast: true
+        showToast: true,
+        popupBgColor: '',
+        triggerMode: 'longpress',
+        forcePosition: {}
     }
 }
diff --git a/uni_modules/uview-plus/components/u-tooltip/u-tooltip.vue b/uni_modules/uview-plus/components/u-tooltip/u-tooltip.vue
index ac1ad7b..fbe73b2 100644
--- a/uni_modules/uview-plus/components/u-tooltip/u-tooltip.vue
+++ b/uni_modules/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>
@@ -101,17 +111,18 @@
 	 * 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	定义需要用到的外部样式
+	 * @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%'})`,
-					},
+			tooltipStyleCpu() {
+				if (!this.calcReacted) {
+					return {}
+				}
+				const style = {},
 					sysInfo = getWindowInfo()
-				if (this.tooltipInfo.width / 2 > this.textInfo.left + this.textInfo.width / 2 - this.screenGap) {
+				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 = {}
-					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.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'
+					}
 				}
-				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://ijry.github.io/uview-plus/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/uni_modules/uview-plus/components/u-tr/u-tr.vue b/uni_modules/uview-plus/components/u-tr/u-tr.vue
index fa0d3bd..23f13b4 100644
--- a/uni_modules/uview-plus/components/u-tr/u-tr.vue
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-transition/u-transition.vue b/uni_modules/uview-plus/components/u-transition/u-transition.vue
index 7fa94d1..8e0551b 100644
--- a/uni_modules/uview-plus/components/u-transition/u-transition.vue
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-tree/tree-node.vue b/uni_modules/uview-plus/components/u-tree/tree-node.vue
new file mode 100644
index 0000000..f82d9e3
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-tree/u-tree.vue b/uni_modules/uview-plus/components/u-tree/u-tree.vue
new file mode 100644
index 0000000..a0e9114
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-upload/props.js b/uni_modules/uview-plus/components/u-upload/props.js
index b157320..529a4b2 100644
--- a/uni_modules/uview-plus/components/u-upload/props.js
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-upload/u-upload.vue b/uni_modules/uview-plus/components/u-upload/u-upload.vue
index c7706c2..91fff93 100644
--- a/uni_modules/uview-plus/components/u-upload/u-upload.vue
+++ b/uni_modules/uview-plus/components/u-upload/u-upload.vue
@@ -12,24 +12,60 @@
 					    :src="item.thumb || item.url"
 					    :mode="imageMode"
 					    class="u-upload__wrap__preview__image"
-					    @tap="onPreviewImage(item, index)"
+					    @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)
+						}]"
 					>
-						<u-icon
+						<up-icon
 						    color="#80CBF9"
 						    size="26"
 						    :name="item.isVideo || (item.type && item.type === 'video') ? 'movie' : 'folder'"
-						></u-icon>
+						></up-icon>
 						<text class="u-upload__wrap__preview__other__text">
-							{{item.isVideo || (item.type && item.type === 'video') ? '视频' : '文件'}}
+							{{item.isVideo || (item.type && item.type === 'video') ? item.name || t("up.common.video") : item.name || t("up.common.file")}}
 						</text>
 					</view>
 					<view
@@ -37,7 +73,7 @@
 					    v-if="item.status === 'uploading' || item.status === 'failed'"
 					>
 						<view class="u-upload__status__icon">
-							<u-icon
+							<up-icon
 							    v-if="item.status === 'failed'"
 							    name="close-circle"
 							    color="#ffffff"
@@ -46,7 +82,6 @@
 							<u-loading-icon
 							    size="22"
 							    mode="circle"
-							    color="#ffffff"
 							    v-else
 							/>
 						</view>
@@ -54,6 +89,8 @@
 						    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"
@@ -61,37 +98,39 @@
 					    @tap.stop="deleteItem(index)"
 					>
 						<view class="u-upload__deletable__icon">
-							<u-icon
+							<up-icon
 							    name="close"
 							    color="#ffffff"
 							    size="10"
-							></u-icon>
+							></up-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>
+					<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>
-						<!-- #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"
@@ -117,11 +156,11 @@
 						height: addUnit(height)
 					}]"
 				>
-					<u-icon
+					<up-icon
 					    :name="uploadIcon"
 					    size="26"
 					    :color="uploadIconColor"
-					></u-icon>
+					></up-icon>
 					<text
 					    v-if="uploadText"
 					    class="u-upload__button__text"
@@ -129,6 +168,19 @@
 				</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>
 
@@ -142,12 +194,14 @@
 	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 ）
@@ -185,6 +239,8 @@
 				// #endif
 				lists: [],
 				isInCount: true,
+				popupShow: false,
+				currentItemIndex: -1
 			}
 		},
 		watch: {
@@ -204,60 +260,117 @@
 			},
 			accept(newVal) {
 				this.formatFileList()
+			},
+			popupShow(newVal) {
+				if (!newVal) {
+					this.currentItemIndex = -1;
+				}
 			}
 		},
 		// #ifdef VUE3
-		emits: ['error', 'beforeRead', 'oversize', 'afterRead', 'delete', 'clickPreview'],
+		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) =>
-					Object.assign(Object.assign({}, item), {
+				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: 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,
+						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() {
+			chooseFile(params) {
 				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,
-						})
-					)
+				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) => {
-						this.onBeforeRead(multiple ? res : res[0]);
+						const result = chooseParams.multiple ? res : res[0]
+						this.onBeforeRead(result);
+						return result
 					})
 					.catch((error) => {
 						this.$emit('error', error);
@@ -269,7 +382,7 @@
 					beforeRead,
 					useBeforeRead,
 				} = this;
-				let res = true
+				let res = file
 				// beforeRead是否为一个方法
 				if (test.func(beforeRead)) {
 					// 如果用户定义了此方法，则去执行此方法，并传入读取的文件回调
@@ -289,13 +402,10 @@
 						);
 					});
 				}
-				if (!res) {
-					return;
-				}
 				if (test.promise(res)) {
 					res.then((data) => this.onAfterRead(data || file));
 				} else {
-					this.onAfterRead(file);
+					this.onAfterRead(res || file);
 				}
 			},
 			getDetail(index) {
@@ -304,7 +414,7 @@
 					index: index == null ? this.fileList.length : index,
 				};
 			},
-			onAfterRead(file) {
+			async onAfterRead(file) {
 				const {
 					maxSize,
 					afterRead
@@ -313,25 +423,200 @@
 					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;
 				}
-				if (typeof afterRead === 'function') {
-					afterRead(file, this.getDetail());
+				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()));
 				}
-				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) {
-				this.$emit(
-					'delete',
-					Object.assign(Object.assign({}, this.getDetail(index)), {
-						file: this.fileList[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) {
@@ -356,11 +641,11 @@
                     urls: urls,
                     current: current,
 					fail() {
-						toast('预览图片失败')
+						toast(t("up.upload.previewImageFail"))
 					},
 				});
 			},
-			onPreviewVideo(index) {
+			onPreviewVideo(previewItem, index) {
 				if (!this.previewFullImage) return;
                 let current = 0;
                 const sources = [];
@@ -380,24 +665,33 @@
                 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('预览视频失败')
+						toast(t("up.upload.previewVideoFail"))
 					},
 				});
 				// #endif
 			},
 			onClickPreview(item, index) {
-				if (!this.previewFullImage) return;
-				switch (item.type) {
-					case 'video':
-						this.onPreviewVideo(index);
-						break;
-					default:
-						break;
+				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',
@@ -409,7 +703,6 @@
 </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;
@@ -483,6 +776,7 @@
 					height: $u-upload-image-height;
 				}
 
+				&__video,
 				&__other {
 					width: $u-upload-image-width;
 					height: $u-upload-image-height;
@@ -500,6 +794,21 @@
 				}
 			}
 		}
+		&__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;
@@ -557,6 +866,12 @@
 				/* #endif */
 			}
 		}
+		&__progress {
+			background-color: $u-primary !important;
+			position: absolute;
+			bottom: 0;
+			left: 0;
+		}
 
 		&__status {
 			position: absolute;
diff --git a/uni_modules/uview-plus/components/u-upload/upload.js b/uni_modules/uview-plus/components/u-upload/upload.js
index c727c27..f7fb8ac 100644
--- a/uni_modules/uview-plus/components/u-upload/upload.js
+++ b/uni_modules/uview-plus/components/u-upload/upload.js
@@ -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/uni_modules/uview-plus/components/u-upload/utils.js b/uni_modules/uview-plus/components/u-upload/utils.js
index 64e46d1..3779ea7 100644
--- a/uni_modules/uview-plus/components/u-upload/utils.js
+++ b/uni_modules/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,8 +130,8 @@ export function chooseFile({
                 fail: reject
             })
             break
-            // #ifdef MP-WEIXIN || H5
-            // 只有微信小程序才支持chooseMessageFile接口
+        // #ifdef MP-WEIXIN || H5
+        // 只有微信小程序才支持chooseMessageFile接口
         case 'file':
             // #ifdef MP-WEIXIN
             wx.chooseMessageFile({
@@ -137,7 +155,7 @@ export function chooseFile({
             uni.chooseFile(params)
             // #endif
             break
-				// #endif
+		// #endif
 		default: 
 			// 此为保底选项，在accept不为上面任意一项的时候选取全部文件
 			// #ifdef MP-WEIXIN
diff --git a/uni_modules/uview-plus/components/u-view/u-view.vue b/uni_modules/uview-plus/components/u-view/u-view.vue
index efb2f1d..8943362 100644
--- a/uni_modules/uview-plus/components/u-view/u-view.vue
+++ b/uni_modules/uview-plus/components/u-view/u-view.vue
@@ -66,8 +66,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../../libs/css/components.scss';
-
 .u-view {
 }
 </style>
diff --git a/uni_modules/uview-plus/components/u-virtual-list/u-virtual-list.vue b/uni_modules/uview-plus/components/u-virtual-list/u-virtual-list.vue
new file mode 100644
index 0000000..c4dd8fa
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/components/u-waterfall/u-waterfall.vue b/uni_modules/uview-plus/components/u-waterfall/u-waterfall.vue
index f978c05..b0c793d 100644
--- a/uni_modules/uview-plus/components/u-waterfall/u-waterfall.vue
+++ b/uni_modules/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(false);
-                    // 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(false);
                     // console.log('clear');
                     return [];
                 } else {
@@ -100,47 +173,138 @@
                 // #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(bak = true) {
-                this.leftList = [];
-                this.rightList = [];
+                this.initColumnList();
                 // 同时清除父组件列表中的数据
                 if (bak) {
                     // #ifdef VUE2
@@ -150,69 +314,73 @@
                     this.$emit('update:modelValue', []);
                     // #endif
                 }
-                this.tempList = [];
             },
+            
             // 清除某一条指定的数据，根据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
-
                 }
             }
         }
@@ -220,8 +388,6 @@
 </script>
 
 <style lang="scss" scoped>
-    @import "../../libs/css/components.scss";
-
     .u-waterfall {
         @include flex;
         flex-direction: row;
@@ -236,6 +402,10 @@
         /* #ifndef APP-NVUE */
         height: 100%;
         /* #endif */
+        // 添加列之间的间距
+        &:not(:first-child) {
+            margin-left: 10rpx;
+        }
     }
 
     .u-image {
@@ -243,4 +413,4 @@
         max-width: 100%;
         /* #endif */
     }
-</style>
+</style>
\ No newline at end of file
diff --git a/uni_modules/uview-plus/index.js b/uni_modules/uview-plus/index.js
index 62c49b8..254e91f 100644
--- a/uni_modules/uview-plus/index.js
+++ b/uni_modules/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/uni_modules/uview-plus/index.scss b/uni_modules/uview-plus/index.scss
index b1585f4..964827e 100644
--- a/uni_modules/uview-plus/index.scss
+++ b/uni_modules/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/uni_modules/uview-plus/libs/config/config.js b/uni_modules/uview-plus/libs/config/config.js
index 73896e6..13f4fb6 100644
--- a/uni_modules/uview-plus/libs/config/config.js
+++ b/uni_modules/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://ijry.github.io/uview-plus/ \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/uni_modules/uview-plus/libs/config/props.js b/uni_modules/uview-plus/libs/config/props.js
index d59c1cd..5655a1e 100644
--- a/uni_modules/uview-plus/libs/config/props.js
+++ b/uni_modules/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'
@@ -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,
@@ -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/uni_modules/uview-plus/libs/css/common.scss b/uni_modules/uview-plus/libs/css/common.scss
index dd8ed64..f6a3ae2 100644
--- a/uni_modules/uview-plus/libs/css/common.scss
+++ b/uni_modules/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/uni_modules/uview-plus/libs/css/components.scss b/uni_modules/uview-plus/libs/css/components.scss
index c461a04..6610774 100644
--- a/uni_modules/uview-plus/libs/css/components.scss
+++ b/uni_modules/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/uni_modules/uview-plus/libs/css/flex.scss b/uni_modules/uview-plus/libs/css/flex.scss
index 152baec..06bdf96 100644
--- a/uni_modules/uview-plus/libs/css/flex.scss
+++ b/uni_modules/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-en !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 */
diff --git a/uni_modules/uview-plus/libs/function/calc.js b/uni_modules/uview-plus/libs/function/calc.js
new file mode 100644
index 0000000..3cd9288
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/libs/function/http.js b/uni_modules/uview-plus/libs/function/http.js
new file mode 100644
index 0000000..f4e8f66
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/libs/function/index.js b/uni_modules/uview-plus/libs/function/index.js
index 7b208f3..cc6e82a 100644
--- a/uni_modules/uview-plus/libs/function/index.js
+++ b/uni_modules/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 毫秒
@@ -361,6 +375,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仅支持/作为分割符的字符串时间
@@ -730,6 +748,93 @@ 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,
@@ -762,5 +867,6 @@ export default {
 	page,
 	pages,
 	getValueByPath,
-	// setConfig
+	genLightColor,
+	rpx2px
 }
diff --git a/uni_modules/uview-plus/libs/function/test.js b/uni_modules/uview-plus/libs/function/test.js
index 35d1879..579b976 100644
--- a/uni_modules/uview-plus/libs/function/test.js
+++ b/uni_modules/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/uni_modules/uview-plus/libs/i18n/index.js b/uni_modules/uview-plus/libs/i18n/index.js
new file mode 100644
index 0000000..09234cf
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/libs/i18n/locales/de.json b/uni_modules/uview-plus/libs/i18n/locales/de.json
new file mode 100644
index 0000000..0ffc53c
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/libs/i18n/locales/en.json b/uni_modules/uview-plus/libs/i18n/locales/en.json
new file mode 100644
index 0000000..1a7cc93
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/libs/i18n/locales/es.json b/uni_modules/uview-plus/libs/i18n/locales/es.json
new file mode 100644
index 0000000..de08574
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/libs/i18n/locales/fr.json b/uni_modules/uview-plus/libs/i18n/locales/fr.json
new file mode 100644
index 0000000..65e5ec6
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/libs/i18n/locales/ja.json b/uni_modules/uview-plus/libs/i18n/locales/ja.json
new file mode 100644
index 0000000..965561c
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/libs/i18n/locales/ko.json b/uni_modules/uview-plus/libs/i18n/locales/ko.json
new file mode 100644
index 0000000..7e3c838
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/libs/i18n/locales/ru.json b/uni_modules/uview-plus/libs/i18n/locales/ru.json
new file mode 100644
index 0000000..4ee2528
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/libs/i18n/locales/th.json b/uni_modules/uview-plus/libs/i18n/locales/th.json
new file mode 100644
index 0000000..8d23888
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/libs/i18n/locales/zh-Hans.json b/uni_modules/uview-plus/libs/i18n/locales/zh-Hans.json
new file mode 100644
index 0000000..b474ff4
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/libs/i18n/locales/zh-Hant.json b/uni_modules/uview-plus/libs/i18n/locales/zh-Hant.json
new file mode 100644
index 0000000..48e780b
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/libs/luch-request/core/Request.js b/uni_modules/uview-plus/libs/luch-request/core/Request.js
index cc48566..11e6dd5 100644
--- a/uni_modules/uview-plus/libs/luch-request/core/Request.js
+++ b/uni_modules/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/uni_modules/uview-plus/package.json b/uni_modules/uview-plus/package.json
index 368f830..a13acf2 100644
--- a/uni_modules/uview-plus/package.json
+++ b/uni_modules/uview-plus/package.json
@@ -1,96 +1,111 @@
 {
-	"id": "uview-plus",
-	"name": "uview-plus",
-	"displayName": "零云®uview-plus3.0重磅发布，全面的Vue3鸿蒙移动组件库。",
-	"version": "3.3.65",
-	"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.6.7",
+  "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": {
+    "clipboard": "^2.0.11",
+    "dayjs": "^1.11.3"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uview-plus/types/comps.d.ts b/uni_modules/uview-plus/types/comps.d.ts
index 2b90704..22fd434 100644
--- a/uni_modules/uview-plus/types/comps.d.ts
+++ b/uni_modules/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/uni_modules/uview-plus/types/comps/modal.d.ts b/uni_modules/uview-plus/types/comps/modal.d.ts
index b9e2b57..e91c813 100644
--- a/uni_modules/uview-plus/types/comps/modal.d.ts
+++ b/uni_modules/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/uni_modules/uview-plus/types/comps/navbar.d.ts b/uni_modules/uview-plus/types/comps/navbar.d.ts
index b44b2a8..eb15a90 100644
--- a/uni_modules/uview-plus/types/comps/navbar.d.ts
+++ b/uni_modules/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/uni_modules/uview-plus/types/comps/qrcode.d.ts b/uni_modules/uview-plus/types/comps/qrcode.d.ts
new file mode 100644
index 0000000..f4ae62e
--- /dev/null
+++ b/uni_modules/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/uni_modules/uview-plus/types/comps/search.d.ts b/uni_modules/uview-plus/types/comps/search.d.ts
index 26c3337..d5e4bed 100644
--- a/uni_modules/uview-plus/types/comps/search.d.ts
+++ b/uni_modules/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/uni_modules/uview-plus/types/comps/subsection.d.ts b/uni_modules/uview-plus/types/comps/subsection.d.ts
index c98fc1e..e8a30b3 100644
--- a/uni_modules/uview-plus/types/comps/subsection.d.ts
+++ b/uni_modules/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/uni_modules/uview-plus/types/comps/toast.d.ts b/uni_modules/uview-plus/types/comps/toast.d.ts
index 0fa115c..592f299 100644
--- a/uni_modules/uview-plus/types/comps/toast.d.ts
+++ b/uni_modules/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/uni_modules/uview-plus/types/comps/upload.d.ts b/uni_modules/uview-plus/types/comps/upload.d.ts
index 7699168..89d64d8 100644
--- a/uni_modules/uview-plus/types/comps/upload.d.ts
+++ b/uni_modules/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/uni_modules/wmf-code/README.md b/uni_modules/wmf-code/README.md
new file mode 100644
index 0000000..231b420
--- /dev/null
+++ b/uni_modules/wmf-code/README.md
@@ -0,0 +1,84 @@
+<a href="https://meet-ui.com" target="_blank">
+    <h1 align="center">文档地址</h1>
+</a>
+<h1 align="center">https://meet-ui.com/#/</h1>
+<p align="center">为了能够第一时间解决问题，为了不影响各位在项目中使用特此提供微信群交流</p>
+<center>
+<img src="https://img.lovewmf.com/2022-10-19.png"/>
+<img src="https://img.lovewmf.com/2022-05-10.png"/>
+</center>
+
+# 温馨提示
+
+如果使用cli创建的应用请在`vue.config.js`里面添加如下配置
+```
+module.exports = {
+    transpileDependencies: [
+		/[/\\]node_modules[/\\](.+?)?@uni-ui(.*)[/\\]code-plugs/,
+		/[/\\]node_modules[/\\](.+?)?@uni-ui(.*)[/\\]code-ui/
+    ]
+}
+```
+# 微信小程序特别说明
+
+如果在弹窗里面使用，并且弹窗有动画 当弹窗显示的时候二维码会发生偏移或抖动
+因为微信小程序的canvas在真机预览渲染的是原生组件并不是 h5的canavas 所以在开发工具里面没问题但是真机会有问题
+
+解决方案：
+
+	1. 如果是使用uView组件的弹窗 请关闭动画
+	2. 如果是使用uni-popup组件 关闭动画无效 因为uni的弹窗动画关闭 其实是动画时长为0并且是包含在uni-transition详情请查看uni-popup代码
+
+## 如果是使用uni_modules而非Npm
+
+在`pages.json`里面配置如下
+
+```js
+"easycom": {
+	"^w-(.*)": "@/uni_modules/wmf-code/components/w-$1/w-$1.vue"//二维码条形码的配置 如果是uni_modules
+},
+"pages": [
+  //...
+]
+```
+
+## 如果是使用npm而非uni_modules
+
+在`pages.json`里面配置如下
+
+```js
+"easycom": {
+	"^w-(.*)": "@uni-ui/code-ui/components/w-$1/index.vue"//二维码条形码的配置 如果是npm方式使用
+},
+"pages": [
+  //...
+]
+```
+
+## 条形码支持添加文字
+
+<img src="https://img.lovewmf.com/WeChat315bd9b33217fabb1beaaa0d65421bee.png" style="margin-bottom: 10px;" />
+<img src="https://img.lovewmf.com/WeChat9e319e9cd08e96369c09099f2863bff5.png" style="margin-bottom: 10px;" />
+
+<center>
+<figure>
+<img src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/07d4381cff624fc79ab28cdd1bf3cc6a~tplv-k3u1fbpfcp-watermark.image" style="margin-bottom: 10px;" />
+<img src="https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/71d7c20e8c91495c81d245ccfc83d7e7~tplv-k3u1fbpfcp-watermark.image" style="margin-bottom: 10px;" />
+</figure>
+</center>
+
+# 
+<center>
+<figure>
+<img src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/bfe9eb88cea44007b2627bb640343dcc~tplv-k3u1fbpfcp-watermark.image" style="margin-bottom: 10px;" />
+<img src="https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/b625254802404a9b84bd699e67b03db4~tplv-k3u1fbpfcp-watermark.image" style="margin-bottom: 10px;" />
+</figure>
+</center>
+
+# 
+<center>
+<figure>
+<img src="https://p9-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/f84328d92b104edbad4c34a8665b4c72~tplv-k3u1fbpfcp-watermark.image" style="margin-bottom: 10px;" />
+<img src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/c1548ccd6c944bbe90ef288817077b8c~tplv-k3u1fbpfcp-watermark.image" style="margin-bottom: 10px;" />
+</figure>
+</center>
diff --git a/uni_modules/wmf-code/changelog.md b/uni_modules/wmf-code/changelog.md
new file mode 100644
index 0000000..7d21184
--- /dev/null
+++ b/uni_modules/wmf-code/changelog.md
@@ -0,0 +1,108 @@
+## 1.6.2（2022-10-24）
+* 修复已知问题
+## 1.6.1（2022-10-19）
+* 支付宝小程序适配问题
+* 修改文档 
+## 1.6.0（2022-07-27）
+* 修改条形码bug
+## 1.5.9（2022-07-26）
+* 修复条形码保存图片部分黑底问题
+## 1.5.8（2022-07-26）
+* 修复支付宝小程序图片保存缺失问题
+## 1.5.7（2022-07-09）
+* 修复条形码保存缺失问题
+## 1.5.6（2022-07-01）
+修改引入错误
+## 1.5.5（2022-07-01）
+* 修复vue3无法通过ref获取保存图片方法
+## 1.5.4（2022-06-01）
+* 条形码支持添加文字
+## 1.5.3（2022-05-31）
+* 修复二维码有时候无法识别问题
+* 建议使用npm方式
+## 1.5.2（2022-05-31）
+修改条形码垂直方向生成图片 参数互换
+## 1.5.1（2022-05-31）
+条形码增加垂直方向 默认水平方向
+## 1.5.0（2022-05-30）
+修改uni_modules引入错误
+## 1.4.9（2022-05-25）
+支持vue3
+## 1.4.8（2021-12-06）
+* 百度小程序不支持canvas的arcTo方法 如果在百度小程序中不支持的全部默认值
+* 小程序平台绘制文字不支持渐变 取color数组第一个
+## 1.4.7（2021-12-05）
+* 修复已知问题
+## 1.4.5（2021-12-05）
+* 修复已知问题
+## 1.4.4（2021-11-30）
+*  level默认值修改为2
+## 1.4.3（2021-11-30）
+* 修复引用js_sdk引用路径
+## 1.4.2（2021-11-29）
+* 修复设置画布大小时没有带单位px导致显示不全
+## 1.4.1（2021-11-29）
+1. 修复在高分辨率屏幕上支付宝小程序显示模糊问题
+2. 修复保存相册图片模糊问题
+## 1.4.0（2021-11-23）
+1.  使用TS重构
+2.  新增二维码文字绘制
+3.  新增二维码padding
+4.  新增二维码中间图片圆角 圆形
+5.  新增长按事件
+6.  二维码边框支持透明
+7.  颜色最多支持10中颜色渐变
+## 1.3.7（2021-11-08）
+修改引入
+## 1.3.6（2021-11-02）
+修改引用路径
+## 1.3.5（2021-10-19）
+canvas 增加 type="2d"
+## 1.3.4（2021-10-14）
+1. 修改百度小程序修改参数无法重新渲染问题
+2. 修改纯中文无法识别问题
+## 1.3.3（2021-09-04）
+修改uni_module引用路径
+## 1.3.2（2021-09-03）
+* 【重要】多个条形码或者二维码同时渲染
+* 增加示例
+## 1.3.1（2021-08-31）
+uni_modules支持组件方式
+## 1.3.0（2021-08-31）
+支持纯文字以及文字数字 字母的混合
+## 1.2.9（2021-08-30）
+新增二维码创建成功回调方法中返回生成的二维码图片
+## 1.2.8（2021-08-20）
+支持vue3
+## 1.2.7（2021-08-20）
+修改版本号
+## 1.2.6（2021-06-28）
+1. 修改自定义组件时微信小程序无法显示二维码的问题
+2. 统一二维码的大小单位为rpx
+## 1.2.5（2021-06-25）
+二维码logo大小增加默认值：30
+## 1.2.4（2021-06-24）
+1. nvue 二维码支持渐变色
+## 1.2.3（2021-06-23）
+1. 修改app不支持颜色渐变问题
+2. 修改判断方式Object.prototype.toString.call()
+## 1.2.2（2021-06-23）
+修改插件描述
+## 1.2.1（2021-06-23）
+修改return 错误
+## 1.1.2（2021-06-23）
+修改文档
+## 1.1.1（2021-06-23）
+ 二维码支持渐变色
+## 1.0.8（2021-06-22）
+兼容nvue
+## 1.0.7（2021-06-09）
+1. 修改保存二维码图片的方法名以及传参方式
+2. 修改微信小程序保存二维码时显示为黑色
+3. 二维码增加参数
+## 1.0.6（2021-06-04）
+修改 description说明
+## 1.0.5（2021-06-04）
+修改文档展示名称
+## 1.0.4（2021-06-04）
+修改符合uni_modules规范
diff --git a/uni_modules/wmf-code/common/helper.js b/uni_modules/wmf-code/common/helper.js
new file mode 100644
index 0000000..b150cd7
--- /dev/null
+++ b/uni_modules/wmf-code/common/helper.js
@@ -0,0 +1,105 @@
+// 判断arr是否为一个数组，返回一个bool值
+function isArray(arr) {
+	return Object.prototype.toString.call(arr) === '[object Array]';
+}
+// 深度克隆
+function deepClone(obj) {
+	// 对常见的“非”值，直接返回原来值
+	if ([null, undefined, NaN, false].includes(obj)) return obj;
+	if (typeof obj !== "object" && typeof obj !== 'function') {
+		//原始类型直接返回
+		return obj;
+	}
+	var o = isArray(obj) ? [] : {};
+	for (let i in obj) {
+		if (obj.hasOwnProperty(i)) {
+			o[i] = typeof obj[i] === "object" ? deepClone(obj[i]) : obj[i];
+		}
+	}
+	return o;
+}
+
+function getUUid(len = 32, firstU = true, radix = null) {
+	let chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
+	let uuid = [];
+	radix = radix || chars.length;
+
+	if (len) {
+		// 如果指定uuid长度,只是取随机的字符,0|x为位运算,能去掉x的小数位,返回整数位
+		for (let i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix];
+	} else {
+		let r;
+		// rfc4122标准要求返回的uuid中,某些位为固定的字符
+		uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
+		uuid[14] = '4';
+
+		for (let i = 0; i < 36; i++) {
+			if (!uuid[i]) {
+				r = 0 | Math.random() * 16;
+				uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
+			}
+		}
+	}
+	// 移除第一个字符,并用u替代,因为第一个字符为数值时,该guuid不能用作id或者class
+	if (firstU) {
+		uuid.shift();
+		return 'u' + uuid.join('');
+	} else {
+		return uuid.join('');
+	}
+}
+function platform () {
+	let val = null;
+	// #ifdef  VUE3
+	val = 'VUE3'
+	// #endif
+	// #ifdef  APP-PLUS
+	val = 'APP-PLUS'
+	// #endif
+	// #ifdef  APP-PLUS-NVUE || APP-NVUE
+	val = 'NVUE'
+	// #endif
+	// #ifdef  H5
+	val = 'H5'
+	// #endif
+	// #ifdef  MP-WEIXIN
+	val = 'MP-WEIXIN'
+	// #endif
+	// #ifdef  MP-ALIPAY
+	val = 'MP-ALIPAY'
+	// #endif
+	// #ifdef  MP-BAIDU
+	val = 'MP-BAIDU'
+	// #endif
+	// #ifdef  MP-TOUTIAO
+	val = 'MP-TOUTIAO'
+	// #endif
+	// #ifdef  MP-LARK
+	val = 'MP-LARK'
+	// #endif
+	// #ifdef  MP-TOUTIAO
+	val = 'MP-QQ'
+	// #endif
+	// #ifdef  MP-KUAISHOU
+	val = 'MP-KUAISHOU'
+	// #endif
+	// #ifdef  MP-360
+	val = 'MP-360'
+	// #endif
+	// #ifdef  QUICKAPP-WEBVIEW
+	val = 'QUICKAPP-WEBVIEW'
+	// #endif
+	// #ifdef  QUICKAPP-WEBVIEW-UNION
+	val = 'QUICKAPP-WEBVIEW-UNION'
+	// #endif
+	// #ifdef  QUICKAPP-WEBVIEW-HUAWEI
+	val = 'QUICKAPP-WEBVIEW-HUAWEI'
+	// #endif
+	return val;
+
+}
+export {
+	deepClone,
+	getUUid,
+	platform
+};
diff --git a/uni_modules/wmf-code/components/w-barcode/w-barcode.vue b/uni_modules/wmf-code/components/w-barcode/w-barcode.vue
new file mode 100644
index 0000000..3661053
--- /dev/null
+++ b/uni_modules/wmf-code/components/w-barcode/w-barcode.vue
@@ -0,0 +1,203 @@
+<template>
+	<view @longtap.stop="longtap">
+		<canvas 
+			:width="info.orient == 'vertical' ? info.destHeight : info.destWidth " 
+			:height="info.orient == 'vertical' ? info.destWidth : info.destHeight" 
+			:canvas-id="item.id" 
+			:id="item.id" 
+			:style="{width:info.orient == 'vertical' ? info.height : info.width,height: info.orient == 'vertical' ? info.width : info.height}" 
+			v-for="item in info.listCode" 
+			:key="item.id"
+			@error="handleError"></canvas>
+	</view>
+</template>
+ <!-- #ifdef  VUE3 -->
+<script setup name="WBarcode">
+	import { 
+		reactive,
+		watch,
+		onMounted,
+		nextTick,
+		getCurrentInstance,
+		defineExpose
+	} from 'vue';
+	import { 
+		BarCode, 
+		GetImg,
+		GetPixelRatio,
+		GetPx ,
+	} from '../../js_sdk/index.js';
+	import { 
+		getUUid, 
+		deepClone,
+		platform,
+	} from '../../common/helper.js'
+	//定义props
+	const props = defineProps({
+	    options:{
+	    	type: Object,
+	    	required: true,
+	    	default: () =>{
+	    	  	return {}
+	    	}
+	    }
+	});
+	const emits = defineEmits(['generate','press','error'])
+	const opt = props.options;
+	const that = getCurrentInstance();
+	const HSize = opt.text ? opt.text.size || 40 +  opt.text.padding || 20 : 0;
+	let info = reactive({
+		id: getUUid(),
+		destWidth: GetPixelRatio() * GetPx(opt.width) + 'px',
+		destHeight: GetPixelRatio() * GetPx(opt.height + HSize) + 'px',
+		width: GetPx(opt.width) + 'px',
+		height: GetPx(opt.height + HSize) + 'px',
+		orient: opt.orient || 'horizontal',
+		listCode: []
+	})
+	onMounted(()=>{
+		SpecialTreatment(opt);
+		nextTick(()=>{
+			generateCode(opt)
+		})
+	});
+	watch(()=>props.options,(val)=>{
+		SpecialTreatment(val);
+		const HSize = val.text ? val.text.size || 40 +  val.text.padding || 20 : 0;
+		info.destWidth= GetPixelRatio() * GetPx(val.width) + 'px',
+		info.destHeight= GetPixelRatio() * GetPx(val.height + HSize) + 'px',
+		info.orient = val.orient || 'horizontal',
+		info.width= GetPx(val.width) + 'px',
+		info.height= GetPx(val.height + HSize) + 'px',
+		setTimeout(()=>{
+			generateCode(val)
+		},100)
+	},{ deep: true })
+	const generateCode = (val)=> {
+		try{
+			const parameter = {...val,orient: info.orient,source: platform(),id: info.id,ctx: that};
+			BarCode(parameter,(res)=>{
+		  		emits('generate',res)
+		  	})
+		}catch(err){console.warn(err)}
+	}
+	const GetCodeImg = async ()=> {
+		try{
+		  	return await GetImg({id: info.id,source: platform(),width: opt.orient == 'vertical' ? opt.height : opt.width,height: opt.orient == 'vertical' ? opt.width : opt.height,ctx: that});
+		}catch(e){console.warn(e)}
+	};
+	const SpecialTreatment = (val) => {//渲染多个canvas特殊处理
+		let obj = deepClone(val);
+		obj.id = info.id;
+		info.listCode = [obj];
+	};
+	// 长按事件
+	const longtap = (e)=>{
+		emits('press',e)
+	}
+	// canvas创建错误 触发
+	const handleError = (e)=>{
+		emits('error',e.detail)
+	}
+	defineExpose({
+	    GetCodeImg
+	})
+
+</script>
+<!-- #endif -->
+
+<!-- #ifndef VUE3 -->
+<script>
+	import { BarCode, GetImg,GetPixelRatio,GetPx } from '../../js_sdk/index.js';
+	import { getUUid, deepClone,platform } from '../../common/helper.js'
+	export default {
+		name: 'WBarcode',
+		props:{
+			options:{
+				type: Object,
+				required: true,
+				default: () =>{
+					return {
+						
+					}
+				}
+			}
+		},
+		data () {
+			return {
+				info:{
+					destHeight: 0,
+					destWidth: 0,
+					width: 0,
+					height: 0,
+					listCode: [],
+					orient: 'horizontal'
+				},
+				id: getUUid()
+			}
+		},
+		mounted() {
+			const HSize = this.options.text ? ((this.options.text.size || 40) + ( this.options.text.padding || 20)) : 0;
+			this.info.height = GetPx(this.options.height + HSize) + 'px';
+			this.info.orient = this.options.orient || 'horizontal';
+			this.info.width = GetPx(this.options.width) + 'px';
+			this.info.destHeight = GetPx(this.options.height + HSize) * GetPixelRatio() + 'px';
+			this.info.destWidth = GetPx(this.options.width) * GetPixelRatio() + 'px';
+			this.SpecialTreatment(this.options)
+			this.$nextTick(()=>{
+				this.generateCode();
+			})
+		},
+		watch: {
+			options:{
+				deep: true,
+				handler (val) {
+					const HSize = val.text ? val.text.size || 40 +  val.text.padding || 20 : 0;
+					this.info.height = GetPx(val.height + HSize) + 'px';
+					this.info.width = GetPx(val.width) + 'px';
+					this.info.destHeight = GetPx(val.height + HSize) * GetPixelRatio() + 'px';
+					this.info.destWidth = GetPx(val.width) * GetPixelRatio() + 'px';
+					this.info.orient = val.orient || 'horizontal'
+					this.SpecialTreatment(val)
+					setTimeout(()=>{// h5平台动态改变canvas大小
+						this.generateCode();
+					},100)
+				}
+			}
+		},
+		methods: {
+			longtap (e){
+				this.$emit('press',e)
+			},
+			handleError (e) {//当发生错误时触发 error 事件，字节跳动小程序与飞书小程序不支持
+				this.$emit('error',e.detail)
+			},
+			SpecialTreatment (val) {//微信小程序渲染多个canvas特殊处理
+				let obj = deepClone(val);
+				obj.id = this.id;
+				this.info.listCode = [obj]
+			},
+			generateCode () {
+				try{
+					const parameter = {...this.options,orient: this.info.orient,source: platform(),id: this.id,ctx: this};
+					BarCode(parameter,(res)=>{
+						this.$emit('generate',res)
+					})
+				}catch(err){console.log(err)}
+			},
+			async GetCodeImg (){
+				try{
+					const pars = {
+						id: this.id,
+						source: platform(),
+						width: this.options.orient == 'vertical' ? this.info.height : this.info.width,
+						height: this.options.orient == 'vertical' ? this.info.width : this.info.height,
+						ctx: this,
+					}
+					return  await GetImg(pars);
+				}catch(e){console.warn(e)}
+			}
+		}
+	}
+</script>
+<!-- #endif -->
diff --git a/uni_modules/wmf-code/components/w-qrcode/w-qrcode.vue b/uni_modules/wmf-code/components/w-qrcode/w-qrcode.vue
new file mode 100644
index 0000000..e2f2f36
--- /dev/null
+++ b/uni_modules/wmf-code/components/w-qrcode/w-qrcode.vue
@@ -0,0 +1,184 @@
+<template>
+	<view @longtap.stop="longtap">
+		<canvas 
+		class="canvas"
+			:width="info.destWidth" 
+			:height="info.destHeight" 
+			:canvas-id="item.id" 
+			:id="item.id" 
+			:style="{width:info.width,height: info.height,opacity:opacity}" 
+			v-for="item in info.listCode" 
+			:key="item.id" 
+			@error="handleError"></canvas>
+	</view>
+</template>
+ <!-- #ifdef  VUE3 -->
+<script setup name="WQrcode">
+	import {reactive, watch,onMounted,nextTick,getCurrentInstance ,defineExpose } from 'vue';
+	import { QRCode, GetImg,GetPixelRatio,GetPx } from '@/uni_modules/wmf-code/js_sdk/index.js';
+	import { getUUid, deepClone,platform } from '../../common/helper.js'
+	//定义props
+	const props = defineProps({
+	    options:{
+	    	type: Object,
+	    	required: true,
+	    	default: () =>{
+	    	  	return {}
+	    	}
+	    },
+		opacity:{
+			type: Number,
+			default: 0
+		}
+	});
+	const emits = defineEmits(['generate','press','error'])
+	const opt = props.options;
+	const that = getCurrentInstance();
+	const SIZE = GetPx(opt.size);
+	let info = reactive({
+		destHeight: SIZE * GetPixelRatio() + 'px',
+		destWidth: SIZE * GetPixelRatio() + 'px',
+		width: SIZE + 'px',
+		height: SIZE + 'px',
+		listCode:[],
+		id: getUUid(),  
+	})
+	onMounted(()=>{
+		console.log('w-qrcode:mounted')
+		SpecialTreatment(opt);
+		nextTick(()=>{
+			generateCode(opt)
+		})
+	});
+	watch(()=>props.options,(val)=>{
+		SpecialTreatment(val);
+		const SIZE_Dynamic = GetPx(val.size);
+		info.destWidth= GetPixelRatio() * SIZE_Dynamic + 'px',
+		info.destHeight= GetPixelRatio() * SIZE_Dynamic + 'px',
+		info.width= SIZE_Dynamic + 'px',
+		info.height= SIZE_Dynamic + 'px',
+			setTimeout(()=>{
+				generateCode(val)
+		},50)
+	},{ deep: true })
+	const SpecialTreatment =(val)=> {//渲染多个canvas特殊处理
+		let obj = deepClone(val);
+		obj.id = info.id;
+		info.listCode = [obj]
+	};
+	const generateCode = (val)=>{
+		try{
+			const parameter = {...val,source: platform(),id: info.id,ctx: that};
+			QRCode(parameter,(res)=>{
+			   	emits('generate',res)
+			})
+		}catch(err){console.warn(err)}
+	};
+	const GetCodeImg = async ()=> {
+		try{
+		   	return await GetImg({id: info.id,source: platform(),width: opt.width,height: opt.height,ctx: that});
+		}catch(e){console.warn(e)}
+	};
+	// 长按事件
+	const longtap = (e)=>{
+		emits('press',e)
+	}
+	// canvas创建错误 触发
+	const handleError = (e)=>{
+		emits('error',e.detail)
+	}
+	defineExpose({
+	    GetCodeImg
+	})
+</script>
+<!-- #endif -->
+
+<!-- #ifndef VUE3 -->
+<script>
+	import { QRCode, GetImg,GetPixelRatio,GetPx } from '@/uni_modules/wmf-code/js_sdk/index.js';
+	import { getUUid, deepClone,platform } from '../../common/helper.js'
+	export default {
+		name: 'WQrcode',
+		props:{
+			options:{
+				type: Object,
+				required: true,
+				default: () =>{
+					return {
+						
+					}
+				}
+			}
+		},
+		data () {
+			return {
+				info:{
+					destHeight: 0,
+					destWidth: 0,
+					width: 0,
+					height: 0,
+					listCode:[],
+				},
+				destHeight: 0,
+				destWidth: 0,
+				width: 0,
+				height: 0,
+				listCode:[],
+				id: getUUid(),
+			}
+		},
+		mounted() {
+			this.info.height = this.info.width = GetPx(this.options.size) + 'px';
+			this.info.destHeight = this.info.destWidth = GetPx(this.options.size) * GetPixelRatio() + 'px';
+			this.SpecialTreatment(this.options)
+			this.$nextTick(()=>{
+				this.generateCode();
+			})
+		},
+		watch: {
+			options:{
+				deep: true,
+				handler (val) {
+					this.info.height = this.info.width = GetPx(val.size) + 'px';
+					this.info.destHeight = this.info.destWidth = GetPx(val.size) * GetPixelRatio() + 'px';
+					this.SpecialTreatment(val)
+					setTimeout(()=>{// h5平台动态改变canvas大小
+						this.generateCode();
+					},50)
+				}
+			}
+		},
+		methods: {
+			longtap (e){// 长按事件
+				this.$emit('press',e);
+			},
+			handleError (e) {//当发生错误时触发 error 事件，字节跳动小程序与飞书小程序不支持
+				this.$emit('error',e.detail)
+			},
+			SpecialTreatment (val) {//微信小程序渲染多个canvas特殊处理
+					let obj = deepClone(val);
+					obj.id = this.id;
+					this.info.listCode = [obj]
+			},
+			// 生成二维码
+			generateCode () {
+				try{
+					const parameter = {...this.options,source: platform(),id: this.id,ctx: this};
+					QRCode(parameter,(res)=>{
+						this.$emit('generate',res)
+					})
+				}catch(err){console.warn(err)}
+			},
+			// 获取二维码图片
+			async GetCodeImg (){
+				try{
+					return  await GetImg({id: this.id,source: platform(),width: this.options.size,height: this.options.size,ctx: this});
+				}catch(e){console.warn(e)}
+			}
+		}
+	}
+</script>
+<!-- #endif -->
+ <style >
+
+</style>
\ No newline at end of file
diff --git a/uni_modules/wmf-code/js_sdk/index.js b/uni_modules/wmf-code/js_sdk/index.js
new file mode 100644
index 0000000..026287b
--- /dev/null
+++ b/uni_modules/wmf-code/js_sdk/index.js
@@ -0,0 +1 @@
+var __assign=function(){return(__assign=Object.assign||function(t){for(var e,i=1,r=arguments.length;i<r;i++)for(var o in e=arguments[i])Object.prototype.hasOwnProperty.call(e,o)&&(t[o]=e[o]);return t}).apply(this,arguments)};function __awaiter(t,n,h,a){return new(h=h||Promise)(function(i,e){function r(t){try{s(a.next(t))}catch(t){e(t)}}function o(t){try{s(a.throw(t))}catch(t){e(t)}}function s(t){var e;t.done?i(t.value):((e=t.value)instanceof h?e:new h(function(t){t(e)})).then(r,o)}s((a=a.apply(t,n||[])).next())})}function __generator(i,r){var o,s,n,h={label:0,sent:function(){if(1&n[0])throw n[1];return n[1]},trys:[],ops:[]},t={next:e(0),throw:e(1),return:e(2)};return"function"==typeof Symbol&&(t[Symbol.iterator]=function(){return this}),t;function e(e){return function(t){return function(e){if(o)throw new TypeError("Generator is already executing.");for(;h;)try{if(o=1,s&&(n=2&e[0]?s.return:e[0]?s.throw||((n=s.return)&&n.call(s),0):s.next)&&!(n=n.call(s,e[1])).done)return n;switch(s=0,(e=n?[2&e[0],n.value]:e)[0]){case 0:case 1:n=e;break;case 4:return h.label++,{value:e[1],done:!1};case 5:h.label++,s=e[1],e=[0];continue;case 7:e=h.ops.pop(),h.trys.pop();continue;default:if(!(n=0<(n=h.trys).length&&n[n.length-1])&&(6===e[0]||2===e[0])){h=0;continue}if(3===e[0]&&(!n||e[1]>n[0]&&e[1]<n[3])){h.label=e[1];break}if(6===e[0]&&h.label<n[1]){h.label=n[1],n=e;break}if(n&&h.label<n[2]){h.label=n[2],h.ops.push(e);break}n[2]&&h.ops.pop(),h.trys.pop();continue}e=r.call(i,h)}catch(t){e=[6,t],s=0}finally{o=n=0}if(5&e[0])throw e[1];return{value:e[0]?e[1]:void 0,done:!0}}([e,t])}}}var ADELTA=[0,11,15,19,23,27,31,16,18,20,22,24,26,28,20,22,24,24,26,28,28,22,24,24,26,26,28,28,24,24,26,26,26,28,28,24,26,26,26,28,28],VPAT=[3220,1468,2713,1235,3062,1890,2119,1549,2344,2936,1117,2583,1330,2470,1667,2249,2028,3780,481,4011,142,3098,831,3445,592,2517,1776,2234,1951,2827,1070,2660,1345,3177],fmtword=[30660,29427,32170,30877,26159,25368,27713,26998,21522,20773,24188,23371,17913,16590,20375,19104,13663,12392,16177,14854,9396,8579,11994,11245,5769,5054,7399,6608,1890,597,3340,2107],ECBLOCKS=[1,0,19,7,1,0,16,10,1,0,13,13,1,0,9,17,1,0,34,10,1,0,28,16,1,0,22,22,1,0,16,28,1,0,55,15,1,0,44,26,2,0,17,18,2,0,13,22,1,0,80,20,2,0,32,18,2,0,24,26,4,0,9,16,1,0,108,26,2,0,43,24,2,2,15,18,2,2,11,22,2,0,68,18,4,0,27,16,4,0,19,24,4,0,15,28,2,0,78,20,4,0,31,18,2,4,14,18,4,1,13,26,2,0,97,24,2,2,38,22,4,2,18,22,4,2,14,26,2,0,116,30,3,2,36,22,4,4,16,20,4,4,12,24,2,2,68,18,4,1,43,26,6,2,19,24,6,2,15,28,4,0,81,20,1,4,50,30,4,4,22,28,3,8,12,24,2,2,92,24,6,2,36,22,4,6,20,26,7,4,14,28,4,0,107,26,8,1,37,22,8,4,20,24,12,4,11,22,3,1,115,30,4,5,40,24,11,5,16,20,11,5,12,24,5,1,87,22,5,5,41,24,5,7,24,30,11,7,12,24,5,1,98,24,7,3,45,28,15,2,19,24,3,13,15,30,1,5,107,28,10,1,46,28,1,15,22,28,2,17,14,28,5,1,120,30,9,4,43,26,17,1,22,28,2,19,14,28,3,4,113,28,3,11,44,26,17,4,21,26,9,16,13,26,3,5,107,28,3,13,41,26,15,5,24,30,15,10,15,28,4,4,116,28,17,0,42,26,17,6,22,28,19,6,16,30,2,7,111,28,17,0,46,28,7,16,24,30,34,0,13,24,4,5,121,30,4,14,47,28,11,14,24,30,16,14,15,30,6,4,117,30,6,14,45,28,11,16,24,30,30,2,16,30,8,4,106,26,8,13,47,28,7,22,24,30,22,13,15,30,10,2,114,28,19,4,46,28,28,6,22,28,33,4,16,30,8,4,122,30,22,3,45,28,8,26,23,30,12,28,15,30,3,10,117,30,3,23,45,28,4,31,24,30,11,31,15,30,7,7,116,30,21,7,45,28,1,37,23,30,19,26,15,30,5,10,115,30,19,10,47,28,15,25,24,30,23,25,15,30,13,3,115,30,2,29,46,28,42,1,24,30,23,28,15,30,17,0,115,30,10,23,46,28,10,35,24,30,19,35,15,30,17,1,115,30,14,21,46,28,29,19,24,30,11,46,15,30,13,6,115,30,14,23,46,28,44,7,24,30,59,1,16,30,12,7,121,30,12,26,47,28,39,14,24,30,22,41,15,30,6,14,121,30,6,34,47,28,46,10,24,30,2,64,15,30,17,4,122,30,29,14,46,28,49,10,24,30,24,46,15,30,4,18,122,30,13,32,46,28,48,14,24,30,42,32,15,30,20,4,117,30,40,7,47,28,43,22,24,30,10,67,15,30,19,6,118,30,18,31,47,28,34,34,24,30,20,61,15,30],GLOG=[255,0,1,25,2,50,26,198,3,223,51,238,27,104,199,75,4,100,224,14,52,141,239,129,28,193,105,248,200,8,76,113,5,138,101,47,225,36,15,33,53,147,142,218,240,18,130,69,29,181,194,125,106,39,249,185,201,154,9,120,77,228,114,166,6,191,139,98,102,221,48,253,226,152,37,179,16,145,34,136,54,208,148,206,143,150,219,189,241,210,19,92,131,56,70,64,30,66,182,163,195,72,126,110,107,58,40,84,250,133,186,61,202,94,155,159,10,21,121,43,78,212,229,172,115,243,167,87,7,112,192,247,140,128,99,13,103,74,222,237,49,197,254,24,227,165,153,119,38,184,180,124,17,68,146,217,35,32,137,46,55,63,209,91,149,188,207,205,144,135,151,178,220,252,190,97,242,86,211,171,20,42,93,158,132,60,57,83,71,109,65,162,31,45,67,216,183,123,164,118,196,23,73,236,127,12,111,246,108,161,59,82,41,157,85,170,251,96,134,177,187,204,62,90,203,89,95,176,156,169,160,81,11,245,22,235,122,117,44,215,79,174,213,233,230,231,173,232,116,214,244,234,168,80,88,175],GEXP=[1,2,4,8,16,32,64,128,29,58,116,232,205,135,19,38,76,152,45,90,180,117,234,201,143,3,6,12,24,48,96,192,157,39,78,156,37,74,148,53,106,212,181,119,238,193,159,35,70,140,5,10,20,40,80,160,93,186,105,210,185,111,222,161,95,190,97,194,153,47,94,188,101,202,137,15,30,60,120,240,253,231,211,187,107,214,177,127,254,225,223,163,91,182,113,226,217,175,67,134,17,34,68,136,13,26,52,104,208,189,103,206,129,31,62,124,248,237,199,147,59,118,236,197,151,51,102,204,133,23,46,92,184,109,218,169,79,158,33,66,132,21,42,84,168,77,154,41,82,164,85,170,73,146,57,114,228,213,183,115,230,209,191,99,198,145,63,126,252,229,215,179,123,246,241,255,227,219,171,75,150,49,98,196,149,55,110,220,165,87,174,65,130,25,50,100,200,141,7,14,28,56,112,224,221,167,83,166,81,162,89,178,121,242,249,239,195,155,43,86,172,69,138,9,18,36,72,144,61,122,244,245,247,243,251,235,203,139,11,22,44,88,176,125,250,233,207,131,27,54,108,216,173,71,142,0],PATTERNS=[[2,1,2,2,2,2,0,0],[2,2,2,1,2,2,0,0],[2,2,2,2,2,1,0,0],[1,2,1,2,2,3,0,0],[1,2,1,3,2,2,0,0],[1,3,1,2,2,2,0,0],[1,2,2,2,1,3,0,0],[1,2,2,3,1,2,0,0],[1,3,2,2,1,2,0,0],[2,2,1,2,1,3,0,0],[2,2,1,3,1,2,0,0],[2,3,1,2,1,2,0,0],[1,1,2,2,3,2,0,0],[1,2,2,1,3,2,0,0],[1,2,2,2,3,1,0,0],[1,1,3,2,2,2,0,0],[1,2,3,1,2,2,0,0],[1,2,3,2,2,1,0,0],[2,2,3,2,1,1,0,0],[2,2,1,1,3,2,0,0],[2,2,1,2,3,1,0,0],[2,1,3,2,1,2,0,0],[2,2,3,1,1,2,0,0],[3,1,2,1,3,1,0,0],[3,1,1,2,2,2,0,0],[3,2,1,1,2,2,0,0],[3,2,1,2,2,1,0,0],[3,1,2,2,1,2,0,0],[3,2,2,1,1,2,0,0],[3,2,2,2,1,1,0,0],[2,1,2,1,2,3,0,0],[2,1,2,3,2,1,0,0],[2,3,2,1,2,1,0,0],[1,1,1,3,2,3,0,0],[1,3,1,1,2,3,0,0],[1,3,1,3,2,1,0,0],[1,1,2,3,1,3,0,0],[1,3,2,1,1,3,0,0],[1,3,2,3,1,1,0,0],[2,1,1,3,1,3,0,0],[2,3,1,1,1,3,0,0],[2,3,1,3,1,1,0,0],[1,1,2,1,3,3,0,0],[1,1,2,3,3,1,0,0],[1,3,2,1,3,1,0,0],[1,1,3,1,2,3,0,0],[1,1,3,3,2,1,0,0],[1,3,3,1,2,1,0,0],[3,1,3,1,2,1,0,0],[2,1,1,3,3,1,0,0],[2,3,1,1,3,1,0,0],[2,1,3,1,1,3,0,0],[2,1,3,3,1,1,0,0],[2,1,3,1,3,1,0,0],[3,1,1,1,2,3,0,0],[3,1,1,3,2,1,0,0],[3,3,1,1,2,1,0,0],[3,1,2,1,1,3,0,0],[3,1,2,3,1,1,0,0],[3,3,2,1,1,1,0,0],[3,1,4,1,1,1,0,0],[2,2,1,4,1,1,0,0],[4,3,1,1,1,1,0,0],[1,1,1,2,2,4,0,0],[1,1,1,4,2,2,0,0],[1,2,1,1,2,4,0,0],[1,2,1,4,2,1,0,0],[1,4,1,1,2,2,0,0],[1,4,1,2,2,1,0,0],[1,1,2,2,1,4,0,0],[1,1,2,4,1,2,0,0],[1,2,2,1,1,4,0,0],[1,2,2,4,1,1,0,0],[1,4,2,1,1,2,0,0],[1,4,2,2,1,1,0,0],[2,4,1,2,1,1,0,0],[2,2,1,1,1,4,0,0],[4,1,3,1,1,1,0,0],[2,4,1,1,1,2,0,0],[1,3,4,1,1,1,0,0],[1,1,1,2,4,2,0,0],[1,2,1,1,4,2,0,0],[1,2,1,2,4,1,0,0],[1,1,4,2,1,2,0,0],[1,2,4,1,1,2,0,0],[1,2,4,2,1,1,0,0],[4,1,1,2,1,2,0,0],[4,2,1,1,1,2,0,0],[4,2,1,2,1,1,0,0],[2,1,2,1,4,1,0,0],[2,1,4,1,2,1,0,0],[4,1,2,1,2,1,0,0],[1,1,1,1,4,3,0,0],[1,1,1,3,4,1,0,0],[1,3,1,1,4,1,0,0],[1,1,4,1,1,3,0,0],[1,1,4,3,1,1,0,0],[4,1,1,1,1,3,0,0],[4,1,1,3,1,1,0,0],[1,1,3,1,4,1,0,0],[1,1,4,1,3,1,0,0],[3,1,1,1,4,1,0,0],[4,1,1,1,3,1,0,0],[2,1,1,4,1,2,0,0],[2,1,1,2,1,4,0,0],[2,1,1,2,3,2,0,0],[2,3,3,1,1,1,2,0]],UNIT_CONVERSION=function(t){return uni.upx2px(Number(t))},getPixelRatio=function(t){return uni.getSystemInfoSync()[t||"pixelRatio"]},getTimeDate=function(){var t=new Date;return t.toLocaleDateString().replace(/\//g,"-")+" "+t.toTimeString().slice(0,8)},GETSIZE={"MP-ALIPAY":function(t){return UNIT_CONVERSION(t)*getPixelRatio()},"MP-WEIXIN":function(t){return UNIT_CONVERSION(t)},"MP-BAIDU":function(t){return UNIT_CONVERSION(t)},"MP-TOUTIAO":function(t){return UNIT_CONVERSION(t)},"MP-QQ":function(t){return UNIT_CONVERSION(t)},"MP-LARK":function(t){return UNIT_CONVERSION(t)},"MP-KUAISHOU":function(t){return UNIT_CONVERSION(t)},"MP-360":function(t){return UNIT_CONVERSION(t)},"QUICKAPP-WEBVIEW":function(t){return UNIT_CONVERSION(t)},"QUICKAPP-WEBVIEW-UNION":function(t){return UNIT_CONVERSION(t)},"QUICKAPP-WEBVIEW-HUAWEI":function(t){return UNIT_CONVERSION(t)},MP:function(t){return UNIT_CONVERSION(t)},"APP-PLUS":function(t){return UNIT_CONVERSION(t)},NVUE:function(t){return UNIT_CONVERSION(t)},H5:function(t){return UNIT_CONVERSION(t)},none:function(t){return UNIT_CONVERSION(t)}},UtF16TO8=function(t){for(var e,i=t.toString(),r="",o=0;o<i.length;o++)1<=(e=i.charCodeAt(o))&&e<=127?r+=i.charAt(o):(2047<e?(r+=String.fromCharCode(224|e>>12&15),r+=String.fromCharCode(128|e>>6&63)):r+=String.fromCharCode(192|e>>6&31),r+=String.fromCharCode(128|e>>0&63));return r},SaveCodeImg=function(t){var i=UNIT_CONVERSION(Number(t.width)),r=UNIT_CONVERSION(Number(t.height)),e=getPixelRatio("pixelRatio"),o=i*e,s=r*e;return"MP-ALIPAY"==t.source&&(i=o,r=s),new Promise(function(e){"[object String]"==Object.prototype.toString.call(t.id)?uni.canvasToTempFilePath({canvasId:t.id,width:i,height:r,destWidth:o,destHeight:s,fileType:t.type||"jpg",quality:t.quality||1,complete:function(t){e(t)}},t.ctx):"[object Object]"==Object.prototype.toString.call(t.id)&&t.id.toTempFilePath(0,0,i,r,o,s,t.type||"png",1,function(t){e(t)})})},SetGradient=function(t,e,i,r){i=t.createLinearGradient(0,0,e,i);return 1===r.length&&(i.addColorStop(0,r[0]),i.addColorStop(1,r[0])),2===r.length&&(i.addColorStop(0,r[0]),i.addColorStop(1,r[1])),3===r.length&&(i.addColorStop(0,r[0]),i.addColorStop(.5,r[1]),i.addColorStop(1,r[2])),4===r.length&&(i.addColorStop(0,r[0]),i.addColorStop(.35,r[1]),i.addColorStop(.7,r[2]),i.addColorStop(1,r[3])),5===r.length&&(i.addColorStop(0,r[0]),i.addColorStop(.35,r[1]),i.addColorStop(.6,r[2]),i.addColorStop(.8,r[3]),i.addColorStop(1,r[4])),6===r.length&&(i.addColorStop(0,r[0]),i.addColorStop(.25,r[1]),i.addColorStop(.45,r[2]),i.addColorStop(.65,r[3]),i.addColorStop(.85,r[4]),i.addColorStop(1,r[5])),7===r.length&&(i.addColorStop(0,r[0]),i.addColorStop(.15,r[1]),i.addColorStop(.35,r[2]),i.addColorStop(.45,r[3]),i.addColorStop(.65,r[4]),i.addColorStop(.85,r[5]),i.addColorStop(1,r[6])),8===r.length&&(i.addColorStop(0,r[0]),i.addColorStop(.1,r[1]),i.addColorStop(.25,r[2]),i.addColorStop(.45,r[3]),i.addColorStop(.65,r[4]),i.addColorStop(.85,r[5]),i.addColorStop(.9,r[6]),i.addColorStop(1,r[7])),9===r.length&&(i.addColorStop(0,r[0]),i.addColorStop(.2,r[1]),i.addColorStop(.3,r[2]),i.addColorStop(.5,r[3]),i.addColorStop(.6,r[4]),i.addColorStop(.7,r[5]),i.addColorStop(.8,r[6]),i.addColorStop(.9,r[7]),i.addColorStop(1,r[8])),10<=r.length&&(i.addColorStop(0,r[0]),i.addColorStop(.1,r[1]),i.addColorStop(.2,r[2]),i.addColorStop(.3,r[3]),i.addColorStop(.4,r[4]),i.addColorStop(.5,r[5]),i.addColorStop(.6,r[6]),i.addColorStop(.7,r[7]),i.addColorStop(.85,r[8]),i.addColorStop(1,r[9])),i},QRCodeInit=function(){function t(t){void 0===t&&(t=2),this.strinbuf=[],this.eccbuf=[],this.qrframe=[],this.framask=[],this.rlens=[],this.genpoly=[],this.ecclevel=2,this.N1=3,this.N2=3,this.N3=40,this.N4=10,this.neccblk2=0,this.width=0,this.neccblk1=0,this.datablkw=0,this.eccblkwid=0,this.ecclevel=t}return t.prototype.setmask=function(t,e){var i=null;e<t&&(i=t,t=e,e=i),i=e,i*=e,i+=e,i>>=1,this.framask[i+=t]=1},t.prototype.getWidth=function(){return this.width},t.prototype.putalign=function(t,e){this.qrframe[t+this.width*e]=1;for(var i=-2;i<2;i++)this.qrframe[t+i+this.width*(e-2)]=1,this.qrframe[t-2+this.width*(e+i+1)]=1,this.qrframe[t+2+this.width*(e+i)]=1,this.qrframe[t+i+1+this.width*(e+2)]=1;for(i=0;i<2;i++)this.setmask(t-1,e+i),this.setmask(t+1,e-i),this.setmask(t-i,e-1),this.setmask(t+i,e+1)},t.prototype.modnn=function(t){for(;255<=t;)t=((t-=255)>>8)+(255&t);return t},t.prototype.appendrs=function(t,e,i,r){for(var o,s=0;s<r;s++)this.strinbuf[i+s]=0;for(s=0;s<e;s++){if(255!=(o=GLOG[this.strinbuf[t+s]^this.strinbuf[i]]))for(var n=1;n<r;n++)this.strinbuf[i+n-1]=this.strinbuf[i+n]^GEXP[this.modnn(o+this.genpoly[r-n])];else for(n=i;n<i+r;n++)this.strinbuf[n]=this.strinbuf[n+1];this.strinbuf[i+r-1]=255==o?0:GEXP[this.modnn(o+this.genpoly[0])]}},t.prototype.ismasked=function(t,e){var i;return e<t&&(i=t,t=e,e=i),i=e,i+=e*e,i>>=1,this.framask[i+=t]},t.prototype.badruns=function(t){for(var e=0,i=0;i<=t;i++)5<=this.rlens[i]&&(e+=this.N1+this.rlens[i]-5);for(i=3;i<t-1;i+=2)this.rlens[i-2]==this.rlens[i+2]&&this.rlens[i+2]==this.rlens[i-1]&&this.rlens[i-1]==this.rlens[i+1]&&3*this.rlens[i-1]==this.rlens[i]&&(0==this.rlens[i-3]||t<i+3||3*this.rlens[i-3]>=4*this.rlens[i]||3*this.rlens[i+3]>=4*this.rlens[i])&&(e+=this.N3);return e},t.prototype.toNum=function(t){return 0===t?1:0},t.prototype.applymask=function(t){switch(t){case 0:for(var e=0;e<this.width;e++)for(var i=0;i<this.width;i++)i+e&1||this.ismasked(i,e)||(this.qrframe[i+e*this.width]^=1);break;case 1:for(e=0;e<this.width;e++)for(i=0;i<this.width;i++)1&e||this.ismasked(i,e)||(this.qrframe[i+e*this.width]^=1);break;case 2:for(e=0;e<this.width;e++)for(var r=0,i=0;i<this.width;i++,r++)(r=3==r?0:r)||this.ismasked(i,e)||(this.qrframe[i+e*this.width]^=1);break;case 3:for(var o=0,e=0;e<this.width;e++,o++)for(r=o=3==o?0:o,i=0;i<this.width;i++,r++)(r=3==r?0:r)||this.ismasked(i,e)||(this.qrframe[i+e*this.width]^=1);break;case 4:for(e=0;e<this.width;e++)for(r=0,o=e>>1&1,i=0;i<this.width;i++,r++)(o=3==r?(r=0)<o?0:1:o)||this.ismasked(i,e)||(this.qrframe[i+e*this.width]^=1);break;case 5:for(o=0,e=0;e<this.width;e++,o++){3==o&&(o=0);for(r=0,i=0;i<this.width;i++,r++)3==r&&(r=0),(i&e&1)+this.toNum(this.toNum(r)|this.toNum(o))||this.ismasked(i,e)||(this.qrframe[i+e*this.width]^=1)}break;case 6:for(o=0,e=0;e<this.width;e++,o++){3==o&&(o=0);for(r=0,i=0;i<this.width;i++,r++)(i&e&1)+((r=3==r?0:r)&&(r==o?1:0))&1||this.ismasked(i,e)||(this.qrframe[i+e*this.width]^=1)}break;case 7:for(o=0,e=0;e<this.width;e++,o++){3==o&&(o=0);for(r=0,i=0;i<this.width;i++,r++)((r=3==r?0:r)&&(r==o?1:0))+(i+e&1)&1||this.ismasked(i,e)||(this.qrframe[i+e*this.width]^=1)}}},t.prototype.Genframe=function(t){var e=t.length,i=t.slice(0),r=0,o=0,s=0,n=0,h=0,a=0;do{if(o=4*(this.ecclevel-1)+16*(++h-1),this.neccblk1=ECBLOCKS[o++],this.neccblk2=ECBLOCKS[o++],this.datablkw=ECBLOCKS[o++],this.eccblkwid=ECBLOCKS[o],e<=(o=this.datablkw*(this.neccblk1+this.neccblk2)+this.neccblk2-3+(h<=9?1:0)))break}while(h<40);this.width=17+4*h;for(var n=this.datablkw+(this.datablkw+this.eccblkwid)*(this.neccblk1+this.neccblk2)+this.neccblk2,l=0;l<n;l++)this.eccbuf[l]=0;for(l=0;l<this.width*this.width;l++)this.qrframe[l]=0;for(l=0;l<(this.width*(this.width+1)+1)/2;l++)this.framask[l]=0;for(l=0;l<3;l++){s=o=0,1==l&&(o=this.width-7),2==l&&(s=this.width-7),this.qrframe[s+3+this.width*(o+3)]=1;for(var c=0;c<6;c++)this.qrframe[s+c+this.width*o]=1,this.qrframe[s+this.width*(o+c+1)]=1,this.qrframe[s+6+this.width*(o+c)]=1,this.qrframe[s+c+1+this.width*(o+6)]=1;for(c=1;c<5;c++)this.setmask(s+c,o+1),this.setmask(s+1,o+c+1),this.setmask(s+5,o+c),this.setmask(s+c+1,o+5);for(c=2;c<4;c++)this.qrframe[s+c+this.width*(o+2)]=1,this.qrframe[s+2+this.width*(o+c+1)]=1,this.qrframe[s+4+this.width*(o+c)]=1,this.qrframe[s+c+1+this.width*(o+4)]=1}if(1<h)for(e=ADELTA[h],s=this.width-7;;){for(r=this.width-7;e-3<r&&(this.putalign(r,s),!(r<e));)r-=e;if(s<=e+9)break;s-=e,this.putalign(6,s),this.putalign(s,6)}this.qrframe[8+this.width*(this.width-8)]=1;for(var d=0;d<7;d++)this.setmask(7,d),this.setmask(this.width-8,d),this.setmask(7,d+this.width-7);for(c=0;c<8;c++)this.setmask(c,7),this.setmask(c+this.width-8,7),this.setmask(c,this.width-8);for(c=0;c<9;c++)this.setmask(c,8);for(c=0;c<8;c++)this.setmask(c+this.width-8,8),this.setmask(8,c);for(d=0;d<7;d++)this.setmask(8,d+this.width-7);for(c=0;c<this.width-14;c++)1&c?(this.setmask(8+c,6),this.setmask(6,8+c)):(this.qrframe[8+c+6*this.width]=1,this.qrframe[6+this.width*(8+c)]=1);if(6<h)for(e=VPAT[h-7],o=17,c=0;c<6;c++)for(d=0;d<3;d++,o--)1&(11<o?h>>o-12:e>>o)?(this.qrframe[5-c+this.width*(2-d+this.width-11)]=1,this.qrframe[2-d+this.width-11+this.width*(5-c)]=1):(this.setmask(5-c,2-d+this.width-11),this.setmask(2-d+this.width-11,5-c));for(d=0;d<this.width;d++)for(c=0;c<=d;c++)this.qrframe[c+this.width*d]&&this.setmask(c,d);n=i.length;for(var f=0;f<n;f++)this.eccbuf[f]=i.charCodeAt(f);if(this.strinbuf=this.eccbuf.slice(0),(r=this.datablkw*(this.neccblk1+this.neccblk2)+this.neccblk2)-2<=n&&(n=r-2,9<h&&n--),a=n,9<h){for(this.strinbuf[a+2]=0,this.strinbuf[a+3]=0;a--;)e=this.strinbuf[a],this.strinbuf[a+3]|=255&e<<4,this.strinbuf[a+2]=e>>4;this.strinbuf[2]|=255&n<<4,this.strinbuf[1]=n>>4,this.strinbuf[0]=64|n>>12}else{for(this.strinbuf[a+1]=0,this.strinbuf[a+2]=0;a--;)e=this.strinbuf[a],this.strinbuf[a+2]|=255&e<<4,this.strinbuf[a+1]=e>>4;this.strinbuf[1]|=255&n<<4,this.strinbuf[0]=64|n>>4}for(a=n+3-(h<10?1:0);a<r;)this.strinbuf[a++]=236,this.strinbuf[a++]=17;this.genpoly[0]=1;for(f=0;f<this.eccblkwid;f++){this.genpoly[f+1]=1;for(var u=f;0<u;u--)this.genpoly[u]=this.genpoly[u]?this.genpoly[u-1]^GEXP[this.modnn(GLOG[this.genpoly[u]]+f)]:this.genpoly[u-1];this.genpoly[0]=GEXP[this.modnn(GLOG[this.genpoly[0]]+f)]}for(f=0;f<=this.eccblkwid;f++)this.genpoly[f]=GLOG[this.genpoly[f]];o=r;for(s=0,f=0;f<this.neccblk1;f++)this.appendrs(s,this.datablkw,o,this.eccblkwid),s+=this.datablkw,o+=this.eccblkwid;for(f=0;f<this.neccblk2;f++)this.appendrs(s,this.datablkw+1,o,this.eccblkwid),s+=this.datablkw+1,o+=this.eccblkwid;for(f=s=0;f<this.datablkw;f++){for(u=0;u<this.neccblk1;u++)this.eccbuf[s++]=this.strinbuf[f+u*this.datablkw];for(u=0;u<this.neccblk2;u++)this.eccbuf[s++]=this.strinbuf[this.neccblk1*this.datablkw+f+u*(this.datablkw+1)]}for(u=0;u<this.neccblk2;u++)this.eccbuf[s++]=this.strinbuf[this.neccblk1*this.datablkw+a+u*(this.datablkw+1)];for(f=0;f<this.eccblkwid;f++)for(u=0;u<this.neccblk1+this.neccblk2;u++)this.eccbuf[s++]=this.strinbuf[r+f+u*this.eccblkwid];this.strinbuf=this.eccbuf,r=s=this.width-1,o=n=1;for(var p=(this.datablkw+this.eccblkwid)*(this.neccblk1+this.neccblk2)+this.neccblk2,f=0;f<p;f++){e=this.strinbuf[f];for(u=0;u<8;u++,e<<=1)for(128&e&&(this.qrframe[r+this.width*s]=1);n?r--:(r++,o?0!=s?s--:(o=0===o?1:0,6==(r-=2)&&(r--,s=9)):s!=this.width-1?s++:(o=0===o?1:0,6==(r-=2)&&(r--,s-=8))),n=0<n?0:1,this.ismasked(r,s););}for(this.strinbuf=this.qrframe.slice(0),s=3e4,o=e=0;o<8&&(this.applymask(o),(r=this.badcheck())<s&&(s=r,e=o),7!=e);o++)this.qrframe=this.strinbuf.slice(0);e!=o&&this.applymask(e),s=fmtword[e+(this.ecclevel-1<<3)];for(var S=0;S<8;S++,s>>=1)1&s&&(this.qrframe[this.width-1-S+8*this.width]=1,S<6?this.qrframe[8+this.width*S]=1:this.qrframe[8+this.width*(S+1)]=1);for(S=0;S<7;S++,s>>=1)1&s&&(this.qrframe[8+this.width*(this.width-7+S)]=1,S?this.qrframe[6-S+8*this.width]=1:this.qrframe[7+8*this.width]=1);return this.qrframe},t.prototype.badcheck=function(){for(var t=0,e=0,i=0,r=0,o=0,s=0,n=0,h=0;h<this.width-1;h++)for(var a=0;a<this.width-1;a++)(this.qrframe[a+this.width*h]&&this.qrframe[a+1+this.width*h]&&this.qrframe[a+this.width*(h+1)]&&this.qrframe[a+1+this.width*(h+1)]||!(this.qrframe[a+this.width*h]||this.qrframe[a+1+this.width*h]||this.qrframe[a+this.width*(h+1)]||this.qrframe[a+1+this.width*(h+1)]))&&(t+=this.N2);for(h=0;h<this.width;h++){for(i=r=s=this.rlens[0]=0;s<this.width;s++)(o=this.qrframe[s+this.width*h])==r?this.rlens[i]++:this.rlens[++i]=1,e+=(r=o)?1:-1;t+=this.badruns(i)}var l=e=e<0?-e:e,c=0;for(l+=l<<2,l<<=1;l>this.width*this.width;)l-=this.width*this.width,c++;t+=c*this.N4;for(a=0;a<this.width;a++){for(i=r=n=this.rlens[0]=0;n<this.width;n++)(o=this.qrframe[a+this.width*n])==r?this.rlens[i]++:this.rlens[++i]=1,r=o;t+=this.badruns(i)}return t},t}(),StringToCode128=function(t){var s={currcs:5},e=GetBytes(t),i=126==e[0]?1:0,t=0<e.length?CodeSetAllowedFor(e[i++]):2,i=0<e.length?CodeSetAllowedFor(e[i++]):2;s.currcs=getBestStartSet(t,i),s.currcs=function(t,e){for(var i=0;i<t.length;i++){var r=t[i];if((r<48||57<r)&&126!=r)return e}return 5}(e,s.currcs);var r=[];switch(s.currcs){case 3:r.push(103);break;case 4:r.push(104);break;default:r.push(105)}for(var o=0;o<e.length;o++){var n=e[o];n in REPLACE_CODES&&(r.push(REPLACE_CODES[n]),n=e[++o]);var h=e.length>o+1?e[o+1]:-1,r=r.concat(function(t,e,i){var r=[],o=-1;if(charCompatible(t,i))5==i&&(-1==e?(o=100,i=4):charCompatible(e,i)||(i=charCompatible(e,3)?(o=101,3):(o=100,4)));else if(-1==e||charCompatible(e,i))o=98;else switch(i){case 3:o=100,i=4;break;case 4:o=101,i=3}return-1!=o?(r.push(o),r.push(codeValue(t))):5==i?r.push(codeValue(t,e)):r.push(codeValue(t)),s.currcs=i,r}(n,h,s.currcs));5==s.currcs&&o++}for(var a=r[0],l=1;l<r.length;l++)a+=l*r[l];return r.push(a%103),r.push(106),r},GetBytes=function(t){for(var e=[],i=0;i<t.length;i++)e.push(t.charCodeAt(i));return e},CodeSetAllowedFor=function(t){return 48<=t&&t<=57?1:32<=t&&t<=95?2:t<32?3:4},getBestStartSet=function(t,e){var i=0;return i+=3==t?1:0,i+=4==t?-1:0,i+=3==e?1:0,0<(i+=4==e?-1:0)?3:4},codeValue=function(t,e){return void 0===e?32<=t?t-32:t+64:parseInt(String.fromCharCode(t)+String.fromCharCode(e))},charCompatible=function(t,e){t=codeSetAllowedFor(t);return 1==t||(2==t||(3==t&&3==e||4==t&&4==e))},codeSetAllowedFor=function(t){return 48<=t&&t<=57?1:32<=t&&t<=95?2:t<32?3:4},REPLACE_CODES={CHAR_TILDE:102},BarCode128=StringToCode128,OperationCode=function(t,e){var i,r;t.code?t.id?(r=(new Date).getTime(),"[object String]"==Object.prototype.toString.call(t.id)?(i=uni.createCanvasContext(t.id,t.ctx||null),BarCodeCanvas(r,t,i,e)):"[object Object]"==Object.prototype.toString.call(t.id)&&(i=t.id,BarCodeCanvas(r,t,i,e))):console.warn("没有找到条形码canvas id或者实列!"):console.warn("没有找到条形码code")},BarCodeCanvas=function(t,e,i,r){var o=e.text?(e.text.size||40)+(e.text.padding||20):0,s=GETSIZE[e.source||"none"](e.width),n=GETSIZE[e.source||"none"](e.height),h=UtF16TO8(e.code);i.setFillStyle(e.bgColor||"#FFFFFF"),"horizontal"==e.orient?i.fillRect(0,0,s,GETSIZE[e.source||"none"](e.height+o)):i.fillRect(0,0,GETSIZE[e.source||"none"](e.height+o),s),i.setFillStyle(e.bgColor||"#FFFFFF");o=new GraphicContentInit(i,s,n);e.color?SetBarCodeColors(i,s,n,e.color||["#000000"],e.orient):i.setFillStyle("#000000"),SetBarCodeType[e.type||"CODE128"](h,o,n,e.orient,e.text),e.text&&setBarCodeText(i,e.text,s,n,e.source||"H5",e.orient||"horizontal"),starDraw$1(i,e,t,r)},starDraw$1=function(t,s,n,h){var e=this;setTimeout(function(){t.draw(!1,function(o){return __awaiter(e,void 0,void 0,function(){var e,i,r;return __generator(this,function(t){switch(t.label){case 0:return h?(e=h,i=[__assign({},o)],r={createTime:getTimeDate(),takeUpTime:(new Date).getTime()-n},[4,SaveCodeImg({width:"vertical"==s.orient?s.height:s.width,height:"vertical"==s.orient?s.width:s.height,id:s.id,source:s.source,ctx:s.ctx||null})]):[3,2];case 1:return e.apply(void 0,[__assign.apply(void 0,i.concat([(r.img=t.sent(),r.model=getPixelRatio("model"),r.system=getPixelRatio("system"),r.platform=getPixelRatio("platform"),r.code=s.code,r.source=s.source,r.with=UNIT_CONVERSION(s.width),r.height=UNIT_CONVERSION(s.height),r.id="[object String]"==Object.prototype.toString.call(s.id)?s.id:"nvue",r)]))]),[3,3];case 2:t.label=3;case 3:return[2]}})})})})},SetBarCodeColors=function(t,e,i,r,o){r=SetGradient(t,"vertical"==(o=void 0===o?"horizontal":o)?i:e,"vertical"==o?e:i,r);t.setFillStyle(r)},setBarCodeText=function(t,e,i,r,o,s){var n=e.color||["#000000"],h=SetGradient(t,i,r,n);t.setGlobalAlpha((null==e?void 0:e.opacity)||1),t.setTextAlign("center"),t.setTextBaseline("middle"),t.setFillStyle("#000000"),t.setFontSize(UNIT_CONVERSION(e.size||40)),"H5"==o?t.setFillStyle(h):t.setFillStyle(n[0]);n="bottom"==e.position?r+UNIT_CONVERSION((e.padding||40)+(e.size||20)/2):UNIT_CONVERSION(e.size)/2;"vertical"==s?(t.rotate(90*Math.PI/180),"bottom"==e.position?(t.translate(i,-r),t.fillText(e.content,-i/2,-UNIT_CONVERSION(e.padding||20+(e.size||40)/2))):(t.translate(-i/2,-n),t.fillText(e.content,i,-n))):t.fillText(e.content,i/2,n),t.setGlobalAlpha(1)},SetBarCodeType={CODE128:function(t,e,i,r,o){void 0===r&&(r="horizontal");var s=BarCode128(t),n=e.area.width/(11*(s.length-3)+35),h=e.area.left,t=0;o&&"bottom"!=o.position&&(t=UNIT_CONVERSION(((null==o?void 0:o.size)||40)+((null==o?void 0:o.padding)||20)));for(var a=e.area.top+t,l=i-e.area.top,c=0;c<s.length;c++)for(var d=s[c],f=0;f<8;f+=2){var u=PATTERNS[d][f]*n,p=PATTERNS[d][f+1]*n;0<u&&e.fillFgRect("vertical"==r?a:h,"vertical"==r?h:a,"vertical"==r?l:u,"vertical"==r?u:l),h+=u+p}},CODE39:function(t,e,i){console.error("条形码编码类型：CODE39暂未实现")},EAN13:function(t,e,i){-1!==t.search(/^[0-9]{12}$/)?console.error("条形码编码类型：EAN暂未实现"):console.error("条形码编码：code不符合EAN13规范")},UPCE:function(t,e,i){-1!==t.search(/^[0-9]{6}$/)?console.error("条形码编码类型：EAN暂未实现"):console.error("条形码编码：code不符合UPCE规范")},UPC:function(t,e,i){-1!==t.search(/^[0-9]{1}$/)?console.error("条形码编码类型：EAN暂未实现"):console.error("条形码编码：code不符合UPC规范")},ITF:function(t,e,i){-1!==t.search(/^([0-9]{2})+$/)?console.error("条形码编码类型：ITF暂未实现"):console.error("条形码编码：code不符合ITF规范")},ITF14:function(t,e,i){-1!==t.search(/^[0-9]{14}$/)?console.error("条形码编码类型：ITF14暂未实现"):console.error("条形码编码：code不符合ITF14规范")},MSI:function(t,e,i){-1!==t.search(/^[0-9]+$/)?console.error("条形码编码类型：MSI暂未实现"):console.error("条形码编码：code不符合MSI规范")},Codabar:function(t,e,i){-1!==t.search(/^[A-D][0-9\-\$\:\.\+\/]+[A-D]$/)?console.error("条形码编码类型：Codabar暂未实现"):console.error("条形码编码：code不符合Codabar规范")},Pharmacode:function(t,e,i){!isNaN(parseInt(t,10))&&3<=Number(t)&&Number(t)<=131070?console.error("条形码编码类型：Pharmacode暂未实现"):console.error("条形码编码：code不符合Pharmacode类型")}},GraphicContentInit=function(){function t(t,e,i){this.borderSize=0,this.paddingWidth=0,this.ctx=t,this.width=e,this.height=i,this.quiet=Math.round(this.width/40),this.area={width:e-2*this.paddingWidth-2*this.quiet,height:i-2*this.borderSize,top:this.borderSize-4,left:this.borderSize+this.quiet},this.fillBgRect(0,0,e,i),this.fillBgRect(0,this.borderSize,e,i-2*this.borderSize)}return t.prototype.fillFgRect=function(t,e,i,r){this.FILLRECT(t,e,i,r)},t.prototype.fillBgRect=function(t,e,i,r){this.FILLRECT(t,e,i,r)},t.prototype.FILLRECT=function(t,e,i,r){this.ctx.fillRect(t,e,i,r)},t}(),WidgetCode=function(t,e){var i,r,o,s;t.code?t.id?(r=(new Date).getTime(),s=new QRCodeInit(t.level),(o=UtF16TO8(t.code))?(o=s.Genframe(o),s=s.getWidth(),"[object String]"==Object.prototype.toString.call(t.id)?(i=uni.createCanvasContext(t.id,t.ctx||null),RepaintCanvas(r,t,i,o,s,e)):"[object Object]"==Object.prototype.toString.call(t.id)&&(i=t.id,RepaintCanvas(r,t,i,o,s,e))):console.warn("二维码code转换错误")):console.warn("没有找到二维码canvas id或者实列!"):console.warn("没有找到二维码code")},RepaintCanvas=function(t,e,i,r,o,s){var n=GETSIZE[e.source||"none"]?GETSIZE[e.source||"none"](e.size):UNIT_CONVERSION(e.size),h=GETSIZE[e.source||"none"]?GETSIZE[e.source||"none"](e.size):UNIT_CONVERSION(e.size),a=GETSIZE[e.source||"none"]?GETSIZE[e.source||"none"](e.size):UNIT_CONVERSION(e.size),l=(UNIT_CONVERSION(e.padding||0)||0)+(e.border?e.border.lineWidth||5:0),c=Math.round(n/(o+l)),d=Math.floor((n-c*o)/2);i.clearRect(0,0,h,a),i.setFillStyle(e.bgColor||"#FFFFFF"),i.fillRect(0,0,h,a),e.src&&i.drawImage(e.src,0,0,n,n),e.color?SetColorCode(i,h,a,e.color):i.setFillStyle("#000000");for(var f=0;f<o;f++)for(var u=0;u<o;u++)r[u*o+f]&&(SetCodeType[e.type||"none"],SetCodeType[e.type||"none"](e.bgColor,i,c*f+d,c*u+d,c,c,e.source));e.img&&(SetImageType[(null===(l=e.img)||void 0===l?void 0:l.type)||"none"]?SetImageType[(null===(l=e.img)||void 0===l?void 0:l.type)||"none"](i,n,e.img,e.source||"none"):SetImageType.none(i,n,e.img,e.source||"none")),e.text&&SetTextCode(i,h,a,e.text,e.source||"none"),e.border&&SetBorderCode(i,h,a,e.border,e.source||"none"),i.restore(),starDraw(i,e,t,s)},starDraw=function(t,s,n,h){var e=this;setTimeout(function(){t.draw(!1,function(o){return __awaiter(e,void 0,void 0,function(){var e,i,r;return __generator(this,function(t){switch(t.label){case 0:return h?(e=h,i=[__assign({},o)],r={createTime:getTimeDate(),takeUpTime:(new Date).getTime()-n},[4,SaveCodeImg({width:s.size,height:s.size,id:s.id,source:s.source,ctx:s.ctx||null})]):[3,2];case 1:return e.apply(void 0,[__assign.apply(void 0,i.concat([(r.img=t.sent(),r.source=s.source,r.model=getPixelRatio("model"),r.system=getPixelRatio("system"),r.platform=getPixelRatio("platform"),r.code=s.code,r.size=UNIT_CONVERSION(s.size),r.id="[object String]"==Object.prototype.toString.call(s.id)?s.id:"nvue",r)]))]),[3,3];case 2:t.label=3;case 3:return[2]}})})})},300)},SetCodeType={none:function(t,e,i,r,o,s,n){e.fillRect(i,r,o,s)},starry:function(t,e,i,r,o,s,n){e.drawImage("",i,r,o,s)},dots:function(t,e,i,r,o,s,n){void 0===t&&(t="#ffffff"),e.save(),e.beginPath(),e.arc(i,r,o/2,0,2*Math.PI),e.closePath(),e.fill(),e.setLineWidth(1),e.setStrokeStyle(t),e.stroke(),e.clip(),e.restore()},square:function(t,e,i,r,o,s,n){void 0===t&&(t="#ffffff"),"MP-BAIDU"!=n?(e.save(),e.beginPath(),e.moveTo(i,r),e.arcTo(i+o,r,i+o,r+s,0),e.arcTo(i+o,r+s,i,r+s,0),e.arcTo(i,r+s,i,r,0),e.arcTo(i,r,i+o,r,0),e.fill(),e.closePath(),e.setLineWidth(1),e.setStrokeStyle(t),e.stroke(),e.clip(),e.restore()):e.fillRect(i,r,o,s)},custom:function(t,e,i,r,o,s,n){e.drawImage("",i,r,o,s)}},SetColorCode=function(t,e,i,r){r=SetGradient(t,e,i,r);t.setFillStyle(r)},SetImageType={none:function(t,e,i,r){r=GETSIZE[r](i.size||30),e=Number(((e-r)/2).toFixed(2));t.save(),t.drawImage(i.src,e,e,r,r)},circle:function(t,e,i,r){var o=GETSIZE[r](i.size||30),s=2*o,n=e/2-o,h=e/2-o,a=n+o,e=h+o;t.save(),t.beginPath(),t.arc(a,e,o,0,2*Math.PI),t.closePath(),t.setLineWidth(GETSIZE[r](i.width||5)),t.setStrokeStyle(i.color||"#FFFFFF"),t.stroke(),t.clip(),t.drawImage(i.src,n,h,s,s)},round:function(t,e,i,r){if("MP-BAIDU"==r){var o=GETSIZE[r](i.size||30),s=2*o,n=e/2-o,h=e/2-o,a=n+o,l=h+o;return t.save(),t.beginPath(),t.arc(a,l,o,0,2*Math.PI),t.closePath(),t.setLineWidth(GETSIZE[r](i.width||5)),t.setStrokeStyle(i.color||"#FFFFFF"),t.stroke(),t.clip(),void t.drawImage(i.src,n,h,s,s)}l=i.degree||5,o=GETSIZE[r](i.size||30),n=o,h=o,s=e/2-o/2,o=e/2-o/2;h<2*(l=n<2*l?n/2:l)&&(l=h/2),t.save(),t.beginPath(),t.moveTo(s+l,o),t.arcTo(s+n,o,s+n,o+h,l),t.arcTo(s+n,o+h,s,o+h,l),t.arcTo(s,o+h,s,o,l),t.arcTo(s,o,s+n,o,l),t.closePath(),t.setLineWidth(GETSIZE[r](i.width||5)),t.setStrokeStyle(i.color||"#FFFFFF"),t.stroke(),t.clip(),t.drawImage(i.src,s,o,n,n)}},SetBorderCode=function(t,e,i,r,o){var s=(null==r?void 0:r.color)||["#000000"],n=(null==r?void 0:r.degree)||5,s=SetGradient(t,e,i,s);t.restore(),t.setGlobalAlpha((null==r?void 0:r.opacity)||1),"MP-BAIDU"==o?(t.setLineWidth((null==r?void 0:r.lineWidth)||5),t.setStrokeStyle(s),t.strokeRect(0,0,e,i)):(t.beginPath(),t.moveTo(0+n,0),t.arcTo(0+e,0,0+e,0+i,n),t.arcTo(0+e,0+i,0,0+i,n),t.arcTo(0,0+i,0,0,n),t.arcTo(0,0,0+e,0,n),t.closePath(),t.setLineWidth((null==r?void 0:r.lineWidth)||5),t.setStrokeStyle(s),t.stroke(),t.clip()),t.setGlobalAlpha(1)},SetTextCode=function(t,e,i,r,o){var s=r.color||["#FFFFFF"],i=SetGradient(t,e,i,s);t.restore(),t.setGlobalAlpha((null==r?void 0:r.opacity)||1),t.setTextAlign("center"),t.setTextBaseline("middle"),t.font=(null==r?void 0:r.font)||"normal 20px system-ui","H5"==o?t.setFillStyle(i):t.setFillStyle(s[0]),t.fillText(r.content,e/2,e/2),t.setGlobalAlpha(1)},BarCode=OperationCode,QRCode=WidgetCode,GetImg=SaveCodeImg,GetPixelRatio=getPixelRatio,GetUtF16TO8=UtF16TO8,GetPx=UNIT_CONVERSION;export{BarCode,GetImg,GetPixelRatio,GetPx,GetUtF16TO8,QRCode};
diff --git a/uni_modules/wmf-code/package.json b/uni_modules/wmf-code/package.json
new file mode 100644
index 0000000..0c71ce1
--- /dev/null
+++ b/uni_modules/wmf-code/package.json
@@ -0,0 +1,77 @@
+{
+  "id": "wmf-code",
+  "displayName": "二维码 条形码生成 支持链接 支持nvue 支持纯文字",
+  "version": "1.6.2",
+  "description": "二维码 条形码生成，支持渐变色边框 保存二维码图片,支持链接 ,支持nvue 支持纯文字",
+  "keywords": [
+    "二维码",
+    "条形码"
+],
+  "repository": "https://github.com/lovewmf/uni-code",
+"engines": {
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无 ",
+      "permissions": "无 "
+    },
+    "npmurl": "https://www.npmjs.com/package/@uni-ui/code-ui",
+    "type": "sdk-js"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "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"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/user/components/registermember.vue b/user/components/registermember.vue
index b215fdf..0596a4b 100644
--- a/user/components/registermember.vue
+++ b/user/components/registermember.vue
@@ -118,6 +118,10 @@
 			type: Boolean,
 			default: false
 		},
+		shopId: {
+			type: String,
+			default: ''
+		},
 	});
 
 	// 定义事件发射器
@@ -145,11 +149,11 @@
 
 	const init = async () => {
 
-		// if (uni.cache.get('shopUserInfo') && uni.cache.get('shopId') == uni.cache.get('shopUserInfo').id) {
+		// if (uni.cache.get('shopUserInfo') && props.shopId||uni.cache.get('shopId') == uni.cache.get('shopUserInfo').id) {
 		// 	shopUserInfo = uni.cache.get('shopUserInfo');
 		// } else {
 		// 	let res = await this.api.shopUserInfo({
-		// 		"shopId": uni.cache.get('shopId'),
+		// 		"shopId": props.shopId||uni.cache.get('shopId'),
 		// 		"userId": uni.cache.get('userInfo').id,
 		// 	})
 		// 	if (res.code == 0) {
@@ -192,7 +196,7 @@
 			url: uni.conf.baseUrl + '/account/user/common/upload',
 			filePath: avatarUrl,
 			header: {
-				shopId: uni.cache.get('shopId'),
+				shopId: props.shopId||uni.cache.get('shopId'),
 				token: uni.cache.get('token') || '',
 				'content-type': 'multipart/form-data'
 			},
@@ -339,7 +343,7 @@
 		}
 		const submitForm={
 			// id: uni.cache.get('userInfo').id,
-			// shopId: uni.cache.get('shopId'),
+			shopId: props.shopId||uni.cache.get('shopId'),
 			nickName: formInfo.nickName,
 			headImg: userHeadImg.value,
 			phone: formInfo.telephone,
@@ -348,7 +352,7 @@
 		}
 		await APIshopUser(submitForm)
 		let APIshopUserInfores = await APIshopUserInfo({
-			shopId: uni.cache.get('shopId')
+			shopId: props.shopId||uni.cache.get('shopId')
 		})
 		uni.cache.set('orderVIP', APIshopUserInfores)
 		uni.cache.set('ordershopUserInfo', APIshopUserInfores.shopInfo)
diff --git a/user/exchange/components/confirm.vue b/user/exchange/components/confirm.vue
new file mode 100644
index 0000000..2901778
--- /dev/null
+++ b/user/exchange/components/confirm.vue
@@ -0,0 +1,112 @@
+<template>
+  <view class="">
+    <up-popup
+      :show="show"
+      bgColor="transparent"
+      :safeAreaInsetBottom="false"
+       :closeOnClickOverlay="false"
+        @close="close"
+      mode="center"
+    >
+      <view class="box">
+        <view class="u-flex top justify-between u-p-32">
+          <text class="title">确认信息</text>
+          <up-icon name="close" @click="close"></up-icon>
+        </view>
+        <view class="info">
+          <view class="color-333">兑换码包含内容如下:</view>
+          <view class="u-m-t-32 u-flex u-col-center">
+            <view class="color-333 font-bold small-title">店铺</view>
+            <text class="color-666 u-m-l-38">{{data.shopName}}</text>
+          </view>
+          <view class="u-m-t-32 u-flex u-col-center">
+            <view class="color-333 font-bold small-title">名称</view>
+            <text class="color-666 u-m-l-38">{{data.name}}</text>
+          </view>
+          <view class="u-m-t-32 u-flex u-col-center" v-if="data.couponInfoList&&data.couponInfoList.length">
+            <view class="color-333 font-bold small-title">优惠券</view>
+            <text class="color-666 u-m-l-38">{{data.couponInfoList.map(item=>item.title+'*'+item.num).join('、')}}</text>
+          </view>
+          <view class="u-m-t-32 u-flex u-col-center" v-if="data.amount">
+            <view class="color-333 font-bold small-title">金额</view>
+            <text class="color-666 u-m-l-38">{{data.amount}}</text>
+          </view>
+          <view class="u-m-t-32 u-flex u-col-center" style="gap: 54rpx">
+            <view class="cancel" @click="close">取消</view>
+            <view class="confirm" @click="confirm">确认</view>
+          </view>
+        </view>
+      </view>
+    </up-popup>
+  </view>
+</template>
+
+<script setup>
+import { ref } from "vue";
+const props=defineProps({
+  //兑换码信息
+  data:{
+    type:Object,
+    default:()=>({}),
+  },
+})
+const show = defineModel({
+  type: Boolean,
+  default: false,
+});
+const emits = defineEmits(["cancel", "confirm"]);
+function close() {
+  show.value = false;
+  emits("cancel");
+}
+function confirm() {
+  show.value = false;
+  emits("confirm");
+}
+</script>
+<style lang="scss" scoped>
+.box {
+  width: 586rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+  overflow: hidden;
+  .title {
+    color: #000000;
+    font-size: 32rpx;
+    font-weight: 700;
+  }
+  .top {
+    border-bottom: 2rpx solid #ededed;
+  }
+  .info {
+    padding: 32rpx 40rpx 40rpx 40rpx;
+    font-size: 28rpx;
+  }
+  .small-title {
+    min-width: 84rpx;
+    text-align: right;
+  }
+}
+
+.cancel {
+  padding: 14rpx 76rpx;
+  border-radius: 36rpx;
+  border: 2rpx solid #e8ad7b;
+  color: #e8ad7b;
+  font-size: 32rpx;
+  font-weight: 400;
+  white-space: nowrap;
+  line-height: 48rpx;
+}
+.confirm {
+  padding: 14rpx 76rpx;
+  border-radius: 36rpx;
+  background-color: #e8ad7b;
+  border: 2rpx solid #e8ad7b;
+  color: #fff;
+  font-size: 32rpx;
+  font-weight: 400;
+  line-height: 48rpx;
+  white-space: nowrap;
+}
+</style>
diff --git a/user/exchange/components/result.vue b/user/exchange/components/result.vue
new file mode 100644
index 0000000..c9597e7
--- /dev/null
+++ b/user/exchange/components/result.vue
@@ -0,0 +1,81 @@
+<template>
+    <view class="">
+      <up-popup
+        :show="show"
+        bgColor="transparent"
+        :safeAreaInsetBottom="false"
+        :closeOnClickOverlay="false"
+        @close="close"
+        mode="center"
+      >
+        <view class="box">
+         <view class="title">{{ title }}</view>
+         <view class="u-flex justify-center" style="margin-top: 72rpx;">
+            <view class="confirm" @click="confirm">确认</view>
+         </view>
+        </view>
+      </up-popup>
+    </view>
+  </template>
+  
+  <script setup>
+  import { ref } from "vue";
+  const show = defineModel({
+    type: Boolean,
+    default: false,
+  });
+  const props=defineProps({
+    title: {
+      type: String,
+      default: "",
+    },
+  });
+  const emits = defineEmits(["cancel", "confirm"]);
+  function close() {
+    show.value = false;
+    emits("cancel");
+  }
+  function confirm() {
+    show.value = false;
+    emits("confirm");
+  }
+  </script>
+  <style lang="scss" scoped>
+  .box {
+    width: 586rpx;
+    background-color: #fff;
+    border-radius: 16rpx;
+    overflow: hidden;
+    padding: 64rpx 32rpx 32rpx 32rpx;
+    .title {
+      color: #000000;
+      font-size: 32rpx;
+      font-weight: 700;
+      text-align: center;
+    }
+    
+  }
+  
+  .cancel {
+    padding: 14rpx 76rpx;
+    border-radius: 36rpx;
+    border: 2rpx solid #e8ad7b;
+    color: #e8ad7b;
+    font-size: 32rpx;
+    font-weight: 400;
+    white-space: nowrap;
+    line-height: 48rpx;
+  }
+  .confirm {
+    padding: 14rpx 76rpx;
+    border-radius: 36rpx;
+    background-color: #e8ad7b;
+    border: 2rpx solid #e8ad7b;
+    color: #fff;
+    font-size: 32rpx;
+    font-weight: 400;
+    line-height: 48rpx;
+    white-space: nowrap;
+  }
+  </style>
+  
\ No newline at end of file
diff --git a/user/exchange/index.vue b/user/exchange/index.vue
new file mode 100644
index 0000000..013abd9
--- /dev/null
+++ b/user/exchange/index.vue
@@ -0,0 +1,171 @@
+<template>
+  <view class="">
+    <up-navbar
+      bg-color="transparent"
+      title="兑换中心"
+      @leftClick="back"
+    ></up-navbar>
+
+    <view class="top"> </view>
+    <view class="box">
+      <view class="info">
+        <view class="titile">兑换您的专属福利 </view>
+        <view class="u-flex justify-center">
+          <view class="input-box u-flex">
+            <image class="icon" src="/user/static/duihuan.png"></image>
+            <view class="u-flex-1">
+              <input placeholder="请输入兑换码" v-model="code" />
+            </view>
+          </view>
+        </view>
+        <view class="u-flex justify-center u-m-t-24">
+          <button class="duihuan" @click="confirmExchange">确认兑换</button>
+        </view>
+      </view>
+
+      <view class="desc">
+        <view>兑换说明:</view>
+        <view>
+          1、请直接输入您获得的兑换码，点击立即兑换即可
+          <br />
+          2、兑换码为一次性，兑换完成之后即失效
+          <br />
+          3、兑换获得的奖励，将直接发送至您的账号，可直接前往余额或优惠券查看
+          <br />
+          4、兑换码为赠品，不可转赠、不退不换
+          <br />
+          5、兑换码需在有效期内完成兑换，过期即作废
+        </view>
+      </view>
+    </view>
+
+    <confirmModal v-model="modal.confirm.show" :data="modal.confirm.data" @confirm="exchange"></confirmModal>
+    <resultModal
+      v-model="modal.result.show"
+      :title="modal.result.title"
+    ></resultModal>
+  </view>
+</template>
+
+<script setup>
+import confirmModal from "./components/confirm.vue";
+import resultModal from "./components/result.vue";
+import * as exchangeApi from "@/common/api/market/exchange.js";
+import { reactive, ref } from "vue";
+const modal = reactive({
+  confirm: {
+    show: false,
+  },
+  result: {
+    show: false,
+    title: "该兑换码无效，请输入有效兑换码",
+  },
+});
+
+const code = ref("");
+function confirmExchange() {
+  if (code.value == "") {
+    uni.showToast({
+      title: "请输入兑换码",
+      icon: "none",
+    });
+    return;
+  }
+  exchangeApi.redemption({
+    code: code.value,
+  }).then((res) => {
+    if (res) {
+      modal.confirm.show = true;
+      modal.confirm.data = res;
+    }
+  })
+}
+
+function exchange() {
+  exchangeApi
+    .exchange({
+      code: code.value,
+    })
+    .then((res) => {
+      if (res) {
+        modal.result.title = "兑换成功！奖励已发放至您的账户";
+        modal.result.show = true;
+        code.value = "";
+      }
+    })
+    .catch((err) => {
+      console.log("err,", err);
+      modal.result.title = err.message || "该兑换码无效，请输入有效兑换码";
+      modal.result.show = true;
+    });
+}
+
+function back() {
+  uni.navigateBack();
+}
+</script>
+
+<style scoped lang="scss">
+.top {
+  width: 962rpx;
+  height: 648rpx;
+  flex-shrink: 0;
+  border-radius: 962rpx;
+  background: linear-gradient(357deg, #faf7ee 3.12%, #d8b285 71.51%);
+  position: relative;
+  transform: translateX(-104rpx) translateY(-136rpx);
+}
+.box {
+  position: relative;
+  transform: translateY(-340rpx);
+  .info {
+    padding: 0 74rpx;
+  }
+}
+.input-box {
+  display: flex;
+  width: 604rpx;
+  height: 106rpx;
+  padding: 30rpx 40rpx;
+  align-items: center;
+  gap: 20rpx;
+  flex-shrink: 0;
+  border-radius: 70rpx;
+  border: 2rpx solid #c58e4d;
+  background: #fff;
+  margin-top: 60rpx;
+  .icon {
+    width: 30rpx;
+    height: 30rpx;
+  }
+}
+.titile {
+  color: #5c2602;
+  font-family: "Source Han Sans CN";
+  font-size: 48rpx;
+  font-style: normal;
+  font-weight: 700;
+  line-height: normal;
+  letter-spacing: 0.01rpx;
+  text-align: center;
+}
+.duihuan {
+  padding: 22rpx 236rpx;
+  border-radius: 110rpx;
+  background: #e8ad7b;
+  line-height: 48rpx;
+  margin: 0;
+  white-space: nowrap;
+  font-size: 32rpx;
+  color: #ffffff;
+  font-weight: 700;
+}
+.desc {
+  color: #666666;
+  font-size: 24rpx;
+  font-weight: 400;
+  letter-spacing: 0.01rpx;
+  padding: 0 44rpx;
+  margin-top: 160rpx;
+}
+</style>
\ No newline at end of file
diff --git a/user/static/duihuan.png b/user/static/duihuan.png
new file mode 100644
index 0000000..f83fb4e
Binary files /dev/null and b/user/static/duihuan.png differ
diff --git a/user/vip/buy-vip.vue b/user/vip/buy-vip.vue
index ede2699..d608abf 100644
--- a/user/vip/buy-vip.vue
+++ b/user/vip/buy-vip.vue
@@ -137,7 +137,7 @@
 				</view>
 			</view>
 		</up-popup>
-		<registermember :memberOpen="memberOpen" :shopUserInfo="shopInfo" @emitsmemberOpen="emitsmemberOpen">
+		<registermember :memberOpen="memberOpen" :shopUserInfo="shopInfo" @emitsmemberOpen="emitsmemberOpen" :shopId="option.shopId">
 		</registermember>
 	</view>
 </template>
@@ -182,8 +182,9 @@
 		}
 		if (name == '周期福利') {
 			model.title = '周期福利'
+			let couponLen=memberLevel.value.cycleRewardCouponList?memberLevel.value.cycleRewardCouponList.length:0
 			modelContent.value =
-				`每${memberLevel.value.cycleUnit}赠送${memberLevel.value.cycleRewardPoints}积分,${memberLevel.value.cycleRewardCouponList.length}张优惠券`
+				`每${memberLevel.value.cycleUnit}赠送${memberLevel.value.cycleRewardPoints}积分${couponLen?(','+couponLen+'张优惠券'):''}`
 		}
 		if (name == '会员说明') {
 			model.title = '会员说明'
diff --git a/user/vip/vip.vue b/user/vip/vip.vue
index 694b4a2..03f2904 100644
--- a/user/vip/vip.vue
+++ b/user/vip/vip.vue
@@ -13,7 +13,7 @@
 					<view class="lv">{{ memberLevel ? memberLevel.name : '' }}</view>
 					<view class="time" v-if="shopUserInfo.openType == 'PAY'">
 						<text>{{ memberLevel ? dayjs(memberLevel.endTime).format('YYYY-MM-DD') : '' }}到期</text>
-						<text style="margin-left: 8px;">{{ memberLevel ? memberLevel.memberName : '' }}</text>
+						<text style="margin-left: 8px;">{{ memberLevel ? memberLevel.memberCircleName : '' }}</text>
 					</view>
 					<view class="rule u-m-t-40 u-flex u-flex-between u-flex-y-center">
 						<text class="color-one">
@@ -235,6 +235,27 @@
 		const res = await vipApi.config({
 			shopId: shopId
 		});
+		
+		const res1 = await vipApi.detail({
+			shopId: shopId
+		});
+		if (res1) {
+			memberLevel.value = {
+				...res1.memberLevel,
+				endTime: res1.endTime,
+				memberName: res1.memberName,
+				experience: res1.experience,
+				nextExperienceValue: res1.nextExperienceValue,
+				memberCircleName:res1.memberCircleName,
+				memberCircleReward:res1.memberCircleReward,
+			};
+			const total = res1.experience * 1 + res1.nextExperienceValue * 1;
+			const percent = ((res1.experience * 1) / total) * 100;
+			if (total <= 0 || res1.experience * 1 <= 0) {
+				expProgress.value = 100;
+			}
+			expProgress.value = percent;
+		}
 		if (res) {
 			res.memberLevel.cycleRewardCouponList = res.memberLevel.cycleRewardCouponList || []
 			res.memberLevel = res.memberLevel || {}
@@ -254,7 +275,7 @@
 				return true
 			}).map((v) => {
 				if (v.name == '赠送成长值' && res.memberLevel) {
-					v.desc = `赠送${res.memberLevel.experienceValue}成长值`
+					v.desc = `赠送${memberLevel.value.memberCircleReward}成长值`
 				}
 				if (v.name == '优惠券') {
 					if (res.memberLevel.cycleRewardCouponList.length) {
@@ -270,10 +291,10 @@
 				return v;
 			});
 			tiaojian_menus = tiaojian_menus.filter(v => {
-				if (!state.isCostRewardPoints && v.name == '消费送积分') {
+				if (!res.memberLevel.isCostRewardPoints && v.name == '消费送积分') {
 					return false
 				}
-				if (!state.isCycleReward && v.name == '周期福利') {
+				if (!res.memberLevel.isCycleReward && v.name == '周期福利') {
 					return false
 				}
 				if (!res.memberLevel.cycleRewardCouponList || res.memberLevel.cycleRewardCouponList.length <=
@@ -301,24 +322,6 @@
 				menus.value = tiaojian_menus;
 			}
 		}
-		const res1 = await vipApi.detail({
-			shopId: shopId
-		});
-		if (res1) {
-			memberLevel.value = {
-				...res1.memberLevel,
-				endTime: res1.endTime,
-				memberName: res1.memberName,
-				experience: res1.experience,
-				nextExperienceValue: res1.nextExperienceValue
-			};
-			const total = res1.experience * 1 + res1.nextExperienceValue * 1;
-			const percent = ((res1.experience * 1) / total) * 100;
-			if (total <= 0 || res1.experience * 1 <= 0) {
-				expProgress.value = 100;
-			}
-			expProgress.value = percent;
-		}
 	}
 
 	const nextName = computed(() => {
diff --git a/utils/address.js b/utils/address.js
new file mode 100644
index 0000000..6fa599f
--- /dev/null
+++ b/utils/address.js
@@ -0,0 +1,13 @@
+// 计算距离   
+export const getDistance = (la1, lo1, la2, lo2) => { // 当前的纬度，当前的经度，接口拿到的纬度，接口拿到的经度
+    let La1 = la1 * Math.PI / 180.0;
+    let La2 = la2 * Math.PI / 180.0;
+    let La3 = La1 - La2;
+    let Lb3 = lo1 * Math.PI / 180.0 - lo2 * Math.PI / 180.0;
+    let distance = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(La3 / 2), 2) + Math.cos(La1) * Math.cos(La2) *
+      Math.pow(Math.sin(Lb3 / 2), 2)));
+    distance = distance * 6378.137;
+    distance = Math.round(distance * 10000) / 10000;
+    return distance;
+  }
+ 
\ No newline at end of file
diff --git a/utils/goods copy.ts b/utils/goods copy.ts
new file mode 100644
index 0000000..47713c4
--- /dev/null
+++ b/utils/goods copy.ts	
@@ -0,0 +1,1710 @@
+import { BigNumber } from "bignumber.js";
+
+// 配置BigNumber精度
+BigNumber.set({
+  DECIMAL_PLACES: 2,
+  ROUNDING_MODE: BigNumber.ROUND_DOWN, // 向下取整，符合业务需求
+});
+
+/**
+ * 购物车订单价格计算公共库
+ * 功能：覆盖订单全链路费用计算（商品价格、优惠券、积分、餐位费等），支持策略扩展
+ * 小数处理：使用bignumber.js确保精度，统一舍去小数点后两位（如 10.129 → 10.12，15.998 → 15.99）
+ * 扩展设计：优惠券/营销活动采用策略模式，新增类型仅需扩展策略，无需修改核心逻辑
+ * 关键规则：
+ * - 所有优惠券均支持指定门槛商品（后端foods字段：空字符串=全部商品，ID字符串=指定商品ID）
+ * - 与限时折扣/会员价同享规则：开启则门槛计算含对应折扣，关闭则用原价/非会员价
+ * 字段说明：
+ * - BaseCartItem.id：购物车项ID（唯一标识购物车中的条目）
+ * - BaseCartItem.product_id：商品ID（唯一标识商品，用于优惠券/活动匹配）
+ * - BaseCartItem.skuData.id：SKU ID（唯一标识商品规格）
+ */
+
+// ============================ 1. 基础类型定义（核心修正：明确ID含义） ============================
+/** 商品类型枚举 */
+export enum GoodsType {
+  NORMAL = "normal", // 普通商品
+  WEIGHT = "weight", // 称重商品
+  GIFT = "gift", // 赠菜（继承普通商品逻辑，标记用）
+  EMPTY = "", // 空字符串类型（后端未返回时默认归类为普通商品）
+  PACKAGE = "package", // 打包商品（如套餐/预打包商品，按普通商品逻辑处理，可扩展特殊规则）
+}
+
+/** 优惠券计算结果类型（新增细分字段） */
+interface CouponResult {
+  deductionAmount: number; // 抵扣金额
+  excludedProductIds: string[]; // 不适用商品ID列表（注意：是商品ID，非购物车ID）
+  usedCoupon: Coupon | undefined; // 实际使用的优惠券
+  productCouponDeduction: number; // 新增：商品优惠券抵扣（兑换券等）
+  fullCouponDeduction: number; // 新增：满减优惠券抵扣
+}
+
+/** 兑换券计算结果类型（新增细分字段） */
+interface ExchangeCalculationResult {
+  deductionAmount: number;
+  excludedProductIds: string[]; // 不适用商品ID列表（商品ID）
+  productCouponDeduction: number; // 新增：兑换券属于商品券，同步记录
+}
+
+/** 优惠券类型枚举 */
+export enum CouponType {
+  FULL_REDUCTION = "full_reduction", // 满减券
+  DISCOUNT = "discount", // 折扣券
+  SECOND_HALF = "second_half", // 第二件半价券
+  BUY_ONE_GET_ONE = "buy_one_get_one", // 买一送一券
+  EXCHANGE = "exchange", // 商品兑换券
+}
+
+/** 后端返回的优惠券原始字段类型 */
+export interface BackendCoupon {
+  id?: number; // 自增主键（int64）
+  shopId?: number; // 店铺ID（int64）
+  syncId?: number; // 同步Id（int64）
+  type?: number; // 优惠券类型：1-满减券，2-商品兑换券，3-折扣券，4-第二件半价券，5-消费送券，6-买一送一券，7-固定价格券，8-免配送费券
+  name?: string; // 券名称
+  useShopType?: string; // 可用门店类型：only-仅本店；all-所有门店，custom-指定门店
+  useShops?: string; // 可用门店（逗号分隔字符串，如"1,2,3"）
+  useType?: string; // 可使用类型：dine堂食/pickup自取/deliv配送/express快递
+  validType?: string; // 有效期类型：fixed（固定时间），custom（自定义时间）
+  validDays?: number; // 有效期(天)
+  validStartTime?: string; // 有效期开始时间（如"2024-01-01 00:00:00"）
+  validEndTime?: string; // 有效期结束时间
+  daysToTakeEffect?: number; // 隔天生效
+  useDays?: string; // 可用周期（如"周一,周二"）
+  useTimeType?: string; // 可用时间段类型：all-全时段，custom-指定时段
+  useStartTime?: string; // 可用开始时间（每日）
+  useEndTime?: string; // 可用结束时间（每日）
+  getType?: string; // 发放设置：不可自行领取/no，可领取/yes
+  getMode?: string; // 用户领取方式
+  giveNum?: number; // 总发放数量，-10086为不限量
+  getUserType?: string; // 可领取用户：全部/all，新用户一次/new，仅会员/vip
+  getLimit?: number; // 每人领取限量，-10086为不限量
+  useLimit?: number; // 每人每日使用限量，-10086为不限量
+  discountShare?: number; // 与限时折扣同享：0-否，1-是
+  vipPriceShare?: number; // 与会员价同享：0-否，1-是
+  ruleDetails?: string; // 附加规则说明
+  status?: number; // 状态：0-禁用，1-启用
+  useNum?: number; // 已使用数量
+  leftNum?: number; // 剩余数量
+  foods?: string; // 指定门槛商品（逗号分隔字符串，如"101,102"，此处为商品ID）
+  fullAmount?: number; // 使用门槛：满多少金额（元）
+  discountAmount?: number; // 使用门槛：减多少金额（元）
+  discountRate?: number; // 折扣%（如90=9折）
+  maxDiscountAmount?: number; // 可抵扣最大金额（元）
+  useRule?: string; // 使用规则：price_asc-价格低到高，price_desc-高到低
+  discountNum?: number; // 抵扣数量
+  otherCouponShare?: number; // 与其它优惠共享：0-否，1-是
+  createTime?: string; // 创建时间
+  updateTime?: string; // 更新时间
+}
+
+/** 营销活动类型枚举 */
+export enum ActivityType {
+  TIME_LIMIT_DISCOUNT = "time_limit_discount", // 限时折扣
+}
+
+/** 基础购物车商品项（核心修正：新增product_id，明确各ID含义） */
+export interface BaseCartItem {
+  id: string | number; // 购物车ID（唯一标识购物车中的条目，如购物车项主键）
+  product_id: string | number; // 商品ID（唯一标识商品，用于优惠券/活动匹配，必选）
+  salePrice: number; // 商品原价（元）
+  number: number; // 商品数量
+  product_type: GoodsType; // 商品类型
+  is_temporary?: boolean; // 是否临时菜（默认false）
+  is_gift?: boolean; // 是否赠菜（默认false）
+  returnNum?: number; // 退货数量（历史订单用，默认0）
+  memberPrice?: number; // 商品会员价（元，优先级：商品会员价 > 会员折扣）
+  discountSaleAmount?: number; // 商家改价后单价（元，优先级最高）
+  packFee?: number; // 单份打包费（元，默认0）
+  packNumber?: number; // 堂食打包数量（默认0）
+  activityInfo?: {
+    // 商品参与的营销活动（如限时折扣）
+    type: ActivityType;
+    discountRate: number; // 折扣率（如0.8=8折）
+    vipPriceShare: boolean; // 是否与会员优惠同享（默认false）
+  };
+  skuData?: {
+    // SKU扩展数据（可选）
+    id: string | number; // SKU ID（唯一标识商品规格，如颜色/尺寸）
+    memberPrice?: number; // SKU会员价
+    salePrice?: number; // SKU原价
+  };
+}
+
+/** 基础优惠券接口（所有券类型继承，包含统一门槛商品字段） */
+export interface BaseCoupon {
+  id: string | number; // 优惠券ID
+  type: CouponType; // 工具库字符串枚举（由后端couponType转换）
+  name: string; // 对应后端title
+  available: boolean; // 基于BackendCoupon字段计算的可用性
+  useShopType?: string; // only-仅本店；all-所有门店，custom-指定门店
+  useShops: string[]; // 可用门店ID列表
+  discountShare: boolean; // 与限时折扣同享：0-否，1-是（后端字段转换为布尔值）
+  vipPriceShare: boolean; // 与会员价同享：0-否，1-是（后端字段转换为布尔值）
+  useType?: string[]; // 可使用类型：dine堂食/pickup自取/deliv配送/express快递
+  isValid: boolean; // 是否在有效期内
+  discountAmount?: number; // 减免金额 (满减券有)
+  fullAmount?: number; // 使用门槛：满多少金额
+  maxDiscountAmount?: number; // 可抵扣最大金额 元
+  applicableProductIds: string[]; // 门槛商品ID列表（空数组=全部商品，非空=指定商品ID）
+}
+
+/** 满减券（适配后端字段） */
+export interface FullReductionCoupon extends BaseCoupon {
+  type: CouponType.FULL_REDUCTION;
+  fullAmount: number; // 对应后端fullAmount（满减门槛）
+  discountAmount: number; // 对应后端discountAmount（减免金额）
+  maxDiscountAmount?: number; // 对应后端maxDiscountAmount（最大减免）
+}
+
+/** 折扣券（适配后端字段） */
+export interface DiscountCoupon extends BaseCoupon {
+  type: CouponType.DISCOUNT;
+  discountRate: number; // 后端discountRate（%）转小数（如90→0.9）
+  maxDiscountAmount: number; // 对应后端maxDiscountAmount（最大减免）
+}
+
+/** 第二件半价券（适配后端字段） */
+export interface SecondHalfPriceCoupon extends BaseCoupon {
+  type: CouponType.SECOND_HALF;
+  maxUseCountPerOrder?: number; // 对应后端useLimit（-10086=不限）
+}
+
+/** 买一送一券（适配后端字段） */
+export interface BuyOneGetOneCoupon extends BaseCoupon {
+  type: CouponType.BUY_ONE_GET_ONE;
+  maxUseCountPerOrder?: number; // 对应后端useLimit（-10086=不限）
+}
+
+/** 商品兑换券（适配后端字段） */
+export interface ExchangeCoupon extends BaseCoupon {
+  type: CouponType.EXCHANGE;
+  deductCount: number; // 对应后端discountNum（抵扣数量）
+  sortRule: "low_price_first" | "high_price_first"; // 后端useRule转换
+}
+
+/** 所有优惠券类型联合 */
+export type Coupon =
+  | FullReductionCoupon
+  | DiscountCoupon
+  | SecondHalfPriceCoupon
+  | BuyOneGetOneCoupon
+  | ExchangeCoupon;
+
+/** 营销活动配置（如限时折扣，applicableProductIds为商品ID列表） */
+export interface ActivityConfig {
+  type: ActivityType;
+  applicableProductIds?: string[]; // 适用商品ID列表（与BaseCartItem.product_id匹配）
+  discountRate: number; // 折扣率（如0.8=8折）
+  vipPriceShare: boolean; // 是否与会员优惠同享
+}
+
+/** 积分抵扣规则 */
+export interface PointDeductionRule {
+  pointsPerYuan: number; // X积分=1元（如100=100积分抵1元）
+  maxDeductionAmount?: number; // 最大抵扣金额（元，默认不限）
+}
+
+/** 餐位费配置 */
+export interface SeatFeeConfig {
+  pricePerPerson: number; // 每人餐位费（元）
+  personCount: number; // 用餐人数（默认1）
+  isEnabled: boolean; // 是否启用餐位费（默认false）
+}
+/** 商家减免类型枚举 */
+export enum MerchantReductionType {
+  FIXED_AMOUNT = "fixed_amount", // 固定金额减免（如直接减 10 元）
+  DISCOUNT_RATE = "discount_rate", // 比例折扣减免（如打 9 折，即减免 10%）
+}
+
+/** 商家减免配置（新增，替代原单一金额字段） */
+export interface MerchantReductionConfig {
+  type: MerchantReductionType; // 减免类型（二选一）
+  fixedAmount?: number; // 固定减免金额（元，仅 FIXED_AMOUNT 生效，≥0）
+  discountRate?: number; // 折扣率（%，仅 DISCOUNT_RATE 生效，0-100，如 90 代表 9 折）
+}
+/**商家霸王餐配置 */
+export interface FreeDineConfig {
+  enable: boolean; //是否开启
+  rechargeThreshold: number; //订单满多少元可以使用
+  rechargeTimes: number; //充值多少倍免单
+  withCoupon: boolean; //与优惠券同享
+  withPoints: boolean; //与积分同享
+  useType?: string[]; //使用类型 dine-in店内 takeout 自取 post快递，takeaway外卖
+  useShopType?: string; //all 全部 part部分
+  shopIdList?: number[]; //可用门店id
+}
+
+//限时折扣配置
+export interface TimeLimitDiscountConfig {
+  /**
+   * 折扣优先级 limit-time/vip-price
+   */
+  discountPriority: string;
+  /**
+   * 折扣% 范围1-99
+   */
+  discountRate: number;
+  /**
+   * 参与商品
+   */
+  foods: string;
+  /**
+   * 参与商品 1全部 2部分
+   */
+  foodType: number;
+  /**
+   * 自增主键
+   */
+  id: number;
+  /**
+   * 店铺ID
+   */
+  shopId: number;
+  /**
+   * 可使用类型：堂食 dine-in  外带 take-out 外卖 take-away 配送 post
+   */
+  useType: string;
+  [property: string]: any;
+}
+
+//用户信息
+interface ShopUserInfo {
+  isVip: number | null; //是否会员
+  discount: number | null; //用户折扣
+  isMemberPrice: number | null; //会员折扣与会员价是否同时使用
+}
+/** 订单额外费用配置 */
+export interface OrderExtraConfig {
+  // merchantReduction: number;        // 商家减免金额（元，默认0）
+  // 替换原单一金额字段，支持两种减免形式
+  merchantReduction: MerchantReductionConfig;
+  additionalFee: number; // 附加费（元，如余额充值、券包，默认0）
+  pointDeductionRule: PointDeductionRule; // 积分抵扣规则
+  seatFeeConfig: SeatFeeConfig; // 餐位费配置
+  currentStoreId: string; // 当前门店ID（用于验证优惠券适用门店）
+  userPoints: number; // 用户当前积分（用于积分抵扣）
+  isMember: boolean; // 用户是否会员（用于会员优惠）
+  memberDiscountRate?: number; // 会员折扣率（如0.95=95折，无会员价时用）
+  newUserDiscount?: number; // 新用户减免金额（元，默认0）
+  fullReductionActivities: FullReductionActivity[]; // 当前店铺的满减活动列表（后端返回结构）
+  currentDinnerType: "dine-in" | "take-out" | "take-away" | "post"; // 当前就餐类型（匹配useType）
+  isFreeDine?: boolean; //是否霸王餐
+  freeDineConfig?: FreeDineConfig;
+  limitTimeDiscount?: TimeLimitDiscountConfig; //限时折扣
+  shopUserInfo: ShopUserInfo; // 用户信息
+}
+
+/** 订单费用汇总（修改：补充商家减免类型和明细） */
+export interface OrderCostSummary {
+  // 商品总件数
+  goodsTotal: number;
+  totalDiscountAmount: number;
+  goodsRealAmount: number; // 商品真实原价总和
+  goodsOriginalAmount: number; // 商品原价总和
+  goodsDiscountAmount: number; // 商品折扣金额
+  couponDeductionAmount: number; // 优惠券总抵扣
+  productCouponDeduction: number; // 商品优惠券抵扣
+  fullCouponDeduction: number; // 满减优惠券抵扣
+  pointDeductionAmount: number; // 积分抵扣金额
+  seatFee: number; // 餐位费
+  packFee: number; // 打包费
+  scoreMaxMoney: number; // 积分最大可抵扣金额
+  // 新增：商家减免明细
+  merchantReduction: {
+    type: MerchantReductionType; // 实际使用的减免类型
+    originalConfig: MerchantReductionConfig; // 原始配置（便于前端展示）
+    actualAmount: number; // 实际减免金额（计算后的值，≥0）
+  };
+  additionalFee: number; // 附加费
+  finalPayAmount: number; // 最终实付金额
+  couponUsed?: Coupon; // 实际使用的优惠券
+  pointUsed: number; // 实际使用的积分
+  newUserDiscount: number; // 新用户减免金额（元，默认0）
+  dinnerType?: "dine-in" | "take-out"; // 就餐类型（堂食/自取/配送/快递）
+  config: OrderExtraConfig; // 订单额外费用配置
+  //满减活动
+  fullReduction: {
+    usedFullReductionActivityFullAmount: number; // 计算出的满减活动的门槛金额
+    usedActivity?: FullReductionActivity; // 实际使用的满减活动
+    usedThreshold?: FullReductionThreshold; // 实际使用的满减阈值（多门槛中选最优）
+    actualAmount: number; // 满减实际减免金额（元）
+  };
+  vipDiscountAmount: number; //会员折扣减免金额
+  // 订单原支付金额
+  orderOriginFinalPayAmount: number; //订单原金额（包含打包费+餐位费）
+}
+
+/** 满减活动阈值（单条满减规则：满X减Y）- 对应 MkDiscountThresholdInsertGroupDefaultGroup */
+export interface FullReductionThreshold {
+  activityId?: number; // 关联满减活动ID
+  fullAmount?: number; // 满多少金额（元，必填）
+  discountAmount?: number; // 减多少金额（元，必填）
+}
+
+/** 满减活动主表 - 对应 Request 接口（后端真实字段） */
+export interface FullReductionActivity {
+  id?: number; // 自增主键（后端字段：id）
+  shopId?: number; // 店铺ID（后端字段：shopId）
+  status?: number; // 活动状态：1=未开始，2=进行中，3=已结束（后端字段：status）
+  sort?: number; // 排序值（越大优先级越高，后端字段：sort）
+  createTime?: string; // 创建时间（后端字段：createTime，格式如"2025-10-14 13:56:07"）
+  updateTime?: string; // 最新修改时间（后端字段：updateTime，用于优先级排序）
+  validStartTime?: string; // 有效期开始时间（后端字段：validStartTime，格式如"2025-10-14"）
+  validEndTime?: string; // 有效期结束时间（后端字段：validEndTime，格式如"2025-12-14"）
+  useType?: string; // 可使用类型（后端字段：useType，如"dine,pickup,deliv,express"）
+  useDays?: string; // 可用周期（后端字段：useDays，如"周一,周二,周三,周四,周五,周六,周日"）
+  useTimeType?: string; // 可用时间段类型（后端字段：useTimeType，all=全时段，custom=指定时段）
+  useStartTime?: string; // 每日可用开始时间（后端字段：useStartTime，如"09:00:00"，仅custom时有效）
+  useEndTime?: string; // 每日可用结束时间（后端字段：useEndTime，如"22:00:00"，仅custom时有效）
+  couponShare?: number; // 与优惠券同享：0=否，1=是（后端字段：couponShare）
+  discountShare?: number; // 与限时折扣同享：0=否，1=是（后端字段：discountShare）
+  vipPriceShare?: number; // 与会员价同享：0=否，1=是（后端字段：vipPriceShare）
+  pointsShare?: number; // 与积分抵扣同享：0=否，1=是（后端字段：pointsShare）
+  thresholds?: FullReductionThreshold[]; // 满减阈值列表（多门槛，后端字段：thresholds）
+  isDel?: boolean; // 是否删除：0=否，1=是（后端字段：isDel，默认false）
+}
+
+// 辅助枚举：星期映射（用于useDays校验）
+const WEEKDAY_MAP = {
+  周一: 1,
+  周二: 2,
+  周三: 3,
+  周四: 4,
+  周五: 5,
+  周六: 6,
+  周日: 0, // JS中getDay()返回0=周日
+};
+
+/**
+ * 辅助：校验当前时间是否在活动的「每日可用时段」内
+ * @param activity 满减活动
+ * @param currentTime 当前时间
+ * @returns 是否在时段内
+ */
+function isInDailyTimeRange(
+  activity: FullReductionActivity,
+  currentTime: Date
+): boolean {
+  // 全时段无需校验
+  if (activity.useTimeType === "all") return true;
+  // 无时段配置则不通过
+  if (!activity.useStartTime || !activity.useEndTime) return false;
+
+  const [startHour, startMinute] = activity.useStartTime.split(":").map(Number);
+  const [endHour, endMinute] = activity.useEndTime.split(":").map(Number);
+  const currentHour = currentTime.getHours();
+  const currentMinute = currentTime.getMinutes();
+
+  // 转换为分钟数比较
+  const startTotalMin = startHour * 60 + startMinute;
+  const endTotalMin = endHour * 60 + endMinute;
+  const currentTotalMin = currentHour * 60 + currentMinute;
+
+  // 处理跨天场景（如23:00-02:00）
+  if (startTotalMin <= endTotalMin) {
+    return currentTotalMin >= startTotalMin && currentTotalMin <= endTotalMin;
+  } else {
+    return currentTotalMin >= startTotalMin || currentTotalMin <= endTotalMin;
+  }
+}
+
+/**
+ * 辅助：校验当前时间是否在活动的「可用周期」内（如周一至周日）
+ * @param activity 满减活动
+ * @param currentTime 当前时间
+ * @returns 是否在周期内
+ */
+function isInWeeklyCycle(
+  activity: FullReductionActivity,
+  currentTime: Date
+): boolean {
+  // 无周期配置则不通过
+  if (!activity.useDays) return false;
+  const currentWeekday = currentTime.getDay(); // 0=周日，1=周一...6=周六
+  const allowedWeekdays = activity.useDays
+    .split(",")
+    .map((day) => WEEKDAY_MAP[day as keyof typeof WEEKDAY_MAP]);
+  return allowedWeekdays.includes(currentWeekday);
+}
+
+/**
+ * 辅助：校验当前就餐类型是否在活动的「可用类型」内（如堂食/自取）
+ * @param activity 满减活动
+ * @param currentDinnerType 当前就餐类型
+ * @returns 是否匹配
+ */
+function isDinnerTypeMatch(
+  activity: FullReductionActivity,
+  currentDinnerType: string
+): boolean {
+  if (!activity.useType) return false;
+  const allowedTypes = activity.useType.split(",");
+  //满减活动的就餐类型和当前券类型字段值不一样，暂时返回true
+  return true;
+}
+
+//判断商品是否可以使用限时折扣
+export function returnCanUseLimitTimeDiscount(
+  goods: BaseCartItem,
+  limitTimeDiscount: TimeLimitDiscountConfig | null | undefined,
+  useVipPrice: boolean,
+  idKey = "product_id"
+) {
+  if (!limitTimeDiscount || !limitTimeDiscount.id) {
+    return false;
+  }
+  const canUseFoods = (limitTimeDiscount.foods || "").split(",");
+  const goodsCanUse =
+    limitTimeDiscount.foodType == 1 || canUseFoods.includes("" + goods[idKey]);
+  if (!goodsCanUse) {
+    return false;
+  }
+  if (limitTimeDiscount.discountPriority == "limit-time") {
+    return true;
+  }
+  if (limitTimeDiscount.discountPriority == "vip-price") {
+    if (!useVipPrice) {
+      return true;
+    }
+    if (useVipPrice && goods.hasOwnProperty("memberPrice")) {
+      if (goods.memberPrice && goods.memberPrice * 1 <= 0) {
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+function returnMemberPrice(useVipPrice: boolean, goods: BaseCartItem) {
+  if (useVipPrice) {
+    return goods.memberPrice || goods.salePrice;
+  } else {
+    return goods.salePrice;
+  }
+}
+
+/**
+ * 返回商品限时折扣价格
+ */
+function returnLimitPrice(
+  goods: BaseCartItem,
+  limitTimeDiscount: TimeLimitDiscountConfig | null | undefined,
+  useVipPrice
+) {
+  if (!limitTimeDiscount) {
+    return 0;
+  }
+  const discountRate = new BigNumber(limitTimeDiscount.discountRate).dividedBy(
+    100
+  );
+
+  const canuseLimit = returnCanUseLimitTimeDiscount(
+    goods,
+    limitTimeDiscount,
+    useVipPrice
+  );
+  if (canuseLimit) {
+    //可以使用限时折扣
+    if (limitTimeDiscount.discountPriority == "limit-time") {
+      //限时价优先
+      const result = BigNumber(goods.salePrice)
+        .times(discountRate)
+        .decimalPlaces(2, BigNumber.ROUND_UP)
+        .toNumber();
+      return result;
+    }
+    if (limitTimeDiscount.discountPriority == "vip-price") {
+      //会员价优先
+      if (useVipPrice && goods.memberPrice && goods.memberPrice * 1 > 0) {
+        //使用会员价
+        return returnMemberPrice(useVipPrice, goods);
+      } else {
+        //不使用会员价
+        const result = BigNumber(goods.salePrice)
+          .times(discountRate)
+          .decimalPlaces(2, BigNumber.ROUND_UP)
+          .toNumber();
+        return result;
+      }
+    }
+  } else {
+    //不可以使用限时折扣
+    //会员价优先
+    if (useVipPrice) {
+      //使用会员价
+      return returnMemberPrice(useVipPrice, goods);
+    } else {
+      return goods.salePrice;
+    }
+  }
+}
+
+/**
+ * 计算商品计算门槛时的金额
+ */
+
+export function returnCalcPrice(
+  goods: BaseCartItem,
+  fullReductionActivitie: FullReductionActivity | undefined,
+  limitTimeDiscount: TimeLimitDiscountConfig | null | undefined,
+  useVipPrice: boolean,
+  idKey = "product_id"
+) {
+  if (goods.discountSaleAmount && goods.discountSaleAmount * 1 > 0) {
+    return goods.salePrice;
+  }
+  //限时折扣和满减活动都有
+  if (fullReductionActivitie && limitTimeDiscount) {
+    if (
+      fullReductionActivitie.discountShare == 1 &&
+      fullReductionActivitie.vipPriceShare == 1
+    ) {
+      //与限时折扣同享，与会员价不同享
+      return returnLimitPrice(goods, limitTimeDiscount, useVipPrice);
+    }
+    if (
+      fullReductionActivitie.discountShare != 1 &&
+      fullReductionActivitie.vipPriceShare == 1
+    ) {
+      //与限时折扣不同享，与会员价同享
+      return returnMemberPrice(useVipPrice, goods);
+    }
+    if (fullReductionActivitie.vipPriceShare != 1) {
+      //与会员价不同享
+      return goods.salePrice;
+    }
+    return goods.salePrice;
+  }
+  //只有满减活动
+  if (fullReductionActivitie) {
+    if (fullReductionActivitie.vipPriceShare == 1) {
+      return returnMemberPrice(useVipPrice, goods);
+    } else {
+      return goods.salePrice;
+    }
+  }
+  //只有限时折扣
+  if (limitTimeDiscount) {
+    return returnLimitPrice(goods, limitTimeDiscount, useVipPrice);
+  }
+
+  if (useVipPrice) {
+    return returnMemberPrice(useVipPrice, goods);
+  }
+  return goods.salePrice;
+}
+
+/**
+ * 计算满减活动门槛
+ */
+export function calcFullReductionActivityFullAmount(
+  goodsList: BaseCartItem[],
+  fullReductionActivitie: FullReductionActivity | undefined,
+  limitTimeDiscount: TimeLimitDiscountConfig | null | undefined,
+  useVipPrice: boolean,
+  seatFee: number,
+  packFee: number
+): number {
+  if (!fullReductionActivitie) {
+    return 0;
+  }
+  let amount = 0;
+  for (let goods of goodsList) {
+    const availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
+    if (goods.is_temporary || goods.is_gift || availableNum <= 0) {
+      //临时菜，赠菜，数量<=0的商品不计算
+      continue;
+    }
+    const calcPrice = returnCalcPrice(
+      goods,
+      fullReductionActivitie,
+      limitTimeDiscount,
+      useVipPrice,
+      "product_id"
+    );
+    if (calcPrice !== undefined) {
+      amount += calcPrice * availableNum;
+    }
+  }
+  return amount + seatFee + packFee;
+  console.log("amount", amount);
+}
+
+/**
+ * 筛选最优满减活动（对齐后端逻辑：状态→时间→周期→时段→就餐类型→排序→修改时间）
+ * @param activities 后端返回的满减活动列表
+ * @param currentShopId 当前店铺ID
+ * @param currentDinnerType 当前就餐类型（dine/pickup等）
+ * @param currentTime 当前时间（默认当前时间）
+ * @returns 最优满减活动（无符合条件则返回undefined）
+ */
+export function filterOptimalFullReductionActivity(
+  activities: FullReductionActivity[],
+  currentShopId: number,
+  currentDinnerType: string,
+  currentTime: Date = new Date()
+): FullReductionActivity | undefined {
+  if (!activities || !activities.length) return undefined;
+  // 第一步：基础筛选（未删除+当前店铺+活动进行中+就餐类型匹配）
+  const baseEligible = activities.filter((activity) => {
+    return (
+      activity.isDel !== true && // 未删除
+      // activity.shopId === currentShopId && // 当前店铺
+      // activity.status === 2 && // 状态=2（进行中）
+      isDinnerTypeMatch(activity, currentDinnerType) && // 就餐类型匹配
+      activity.thresholds?.length // 至少有一个满减阈值
+    );
+  });
+  console.log("baseEligible", baseEligible);
+
+  if (!baseEligible.length) return undefined;
+
+  // 第二步：时间筛选（有效期内+周期内+时段内）
+  const timeEligible = baseEligible.filter((activity) => {
+    // 1. 校验有效期（validStartTime ~ validEndTime）
+    if (activity.useTimeType == "all") {
+      return true;
+    }
+    if (!activity.validStartTime || !activity.validEndTime) return false;
+    const startDate = new Date(activity.validStartTime);
+    const endDate = new Date(activity.validEndTime);
+    // 处理有效期结束日期的23:59:59
+    endDate.setHours(23, 59, 59, 999);
+    if (currentTime < startDate || currentTime > endDate) return false;
+
+    // 2. 校验可用周期（如周一至周日）
+    if (!isInWeeklyCycle(activity, currentTime)) return false;
+
+    // 3. 校验每日可用时段（如09:00-22:00）
+    if (!isInDailyTimeRange(activity, currentTime)) return false;
+
+    return true;
+  });
+
+  if (!timeEligible.length) return undefined;
+
+  // 第三步：按优先级排序（需求规则）
+  return timeEligible.sort((a, b) => {
+    // 1. 先比排序值：排序值大的优先
+    if ((a.sort || 0) !== (b.sort || 0)) {
+      return (b.sort || 0) - (a.sort || 0);
+    }
+    // 2. 再比修改时间：最新修改的优先（时间戳降序）
+    const aUpdateTime = a.updateTime ? new Date(a.updateTime).getTime() : 0;
+    const bUpdateTime = b.updateTime ? new Date(b.updateTime).getTime() : 0;
+    return bUpdateTime - aUpdateTime;
+  })[0]; // 取最优活动
+}
+/**
+ * 折扣率格式化：后端discountRate（%）→ 工具库小数（如90→0.9）
+ */
+export function formatDiscountRate(backendDiscountRate?: number): number {
+  if (!backendDiscountRate || backendDiscountRate <= 0) return 1; // 默认无折扣（1=100%）
+  // 后端若为百分比（如90=9折），除以100；若已为小数（如0.9）直接返回
+  return backendDiscountRate >= 1
+    ? backendDiscountRate / 100
+    : backendDiscountRate;
+}
+
+/**
+ * 统一小数处理：舍去小数点后两位以后的数字（解决浮点数精度偏差）
+ * 如 10.129 → 10.12，1.01 → 1.01，1.0100000001 → 1.01
+ * @param num 待处理数字
+ * @returns 处理后保留两位小数的数字
+ */
+export function truncateToTwoDecimals(num: number | string): number {
+  return new BigNumber(num).decimalPlaces(2, BigNumber.ROUND_DOWN).toNumber();
+}
+
+/**
+ * 判断商品是否为临时菜（临时菜不参与优惠券门槛和折扣计算）
+ * @param goods 商品项
+ * @returns 是否临时菜
+ */
+export function isTemporaryGoods(goods: BaseCartItem): boolean {
+  return !!goods.is_temporary;
+}
+
+/**
+ * 判断商品是否为赠菜（赠菜不计入优惠券活动，但计打包费）
+ * @param goods 商品项
+ * @returns 是否赠菜
+ */
+export function isGiftGoods(goods: BaseCartItem): boolean {
+  return !!goods.is_gift;
+}
+/**
+ * 判断可用类型是否可用
+ */
+export function useTypeCanUse(useType: string[]) {
+  const arr = ["all", "dine-in", "take-out", "take-away", "post"];
+  return useType.some((item) => arr.includes(item));
+}
+
+/**
+ * 计算单个商品的会员价（优先级：SKU会员价 > 商品会员价 > 会员折扣率）
+ * @param goods 商品项
+ * @param isMember 是否会员
+ * @param memberDiscountRate 会员折扣率（如0.95=95折）
+ * @returns 会员价（元）
+ */
+export function calcMemberPrice(
+  goods: BaseCartItem,
+  isMember: boolean,
+  memberDiscountRate?: number
+): number {
+  if (!isMember) return truncateToTwoDecimals(goods.salePrice);
+
+  // 优先级：SKU会员价 > 商品会员价 > 商品原价（无会员价时用会员折扣）
+  const basePrice =
+    goods.skuData?.memberPrice ?? goods.memberPrice ?? goods.salePrice;
+
+  // 仅当无SKU会员价、无商品会员价时，才应用会员折扣率
+  if (memberDiscountRate && !goods.skuData?.memberPrice && !goods.memberPrice) {
+    return truncateToTwoDecimals(
+      new BigNumber(basePrice).multipliedBy(memberDiscountRate).toNumber()
+    );
+  }
+
+  return truncateToTwoDecimals(basePrice);
+}
+
+/**
+ * 过滤可参与优惠券计算的商品（排除临时菜、赠菜、已用兑换券的商品）
+ * @param goodsList 商品列表
+ * @param excludedProductIds 需排除的商品ID列表（商品ID，非购物车ID）
+ * @returns 可参与优惠券计算的商品列表
+ */
+export function filterCouponEligibleGoods(
+  goodsList: BaseCartItem[],
+  excludedProductIds: string[] = []
+): BaseCartItem[] {
+  return goodsList.filter(
+    (goods) =>
+      !isTemporaryGoods(goods) &&
+      !isGiftGoods(goods) &&
+      !excludedProductIds.includes(String(goods.product_id)) // 核心修正：用商品ID排除
+  );
+}
+
+/**
+ * 统一筛选门槛商品的工具函数（所有券类型复用，按商品ID匹配）
+ * @param baseEligibleGoods 基础合格商品（已排除临时菜/赠菜/已抵扣商品）
+ * @param applicableProductIds 优惠券指定的门槛商品ID数组
+ * @returns 最终参与优惠券计算的商品列表
+ */
+export function filterThresholdGoods(
+  baseEligibleGoods: BaseCartItem[],
+  applicableProductIds: string[]
+): BaseCartItem[] {
+  // 空数组=全部基础合格商品；非空=仅商品ID匹配的商品（转字符串兼容类型）
+  return applicableProductIds.length === 0
+    ? baseEligibleGoods
+    : baseEligibleGoods.filter((goods) =>
+        applicableProductIds.includes(String(goods.product_id))
+      ); // 核心修正：用商品ID匹配
+}
+
+/**
+ * 商品排序（用于商品兑换券：按价格/数量/加入顺序排序，按商品ID分组去重）
+ * @param goodsList 商品列表
+ * @param sortRule 排序规则（low_price_first/high_price_first）
+ * @param cartOrder 商品加入购物车的顺序（key=购物车ID，value=加入时间戳）
+ * @returns 排序后的商品列表
+ */
+export function sortGoodsForCoupon(
+  goodsList: BaseCartItem[],
+  sortRule: "low_price_first" | "high_price_first",
+  cartOrder: Record<string, number> = {}
+): BaseCartItem[] {
+  return [...goodsList].sort((a, b) => {
+    // 1. 按商品单价排序（优先级最高）
+    const priceA = a.skuData?.salePrice ?? a.salePrice;
+    const priceB = b.skuData?.salePrice ?? b.salePrice;
+    if (priceA !== priceB) {
+      return sortRule === "low_price_first" ? priceA - priceB : priceB - priceA;
+    }
+
+    // 2. 同价格按商品数量排序（降序，多的优先）
+    if (a.number !== b.number) {
+      return b.number - a.number;
+    }
+
+    // 3. 同价格同数量按加入购物车顺序（早的优先，用购物车ID匹配）
+    const orderA = cartOrder[String(a.id)] ?? Infinity;
+    const orderB = cartOrder[String(b.id)] ?? Infinity;
+    return orderA - orderB;
+  });
+}
+
+/**
+ * 计算优惠券门槛金额（根据同享规则，按商品ID匹配限时折扣）
+ * @param eligibleGoods 可参与优惠券的商品列表（已过滤临时菜/赠菜）
+ * @param coupon 优惠券（含discountShare/vipPriceShare配置）
+ * @param config 订单配置（会员信息）
+ * @param activities 全局营销活动（限时折扣，applicableProductIds为商品ID）
+ * @returns 满足优惠券门槛的金额基数
+ */
+export function calcCouponThresholdAmount(
+  eligibleGoods: BaseCartItem[],
+  coupon: BaseCoupon,
+  config: Pick<OrderExtraConfig, "isMember" | "memberDiscountRate">,
+  activities: ActivityConfig[] = []
+): number {
+  let total = new BigNumber(0);
+
+  for (const goods of eligibleGoods) {
+    const availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
+    if (availableNum <= 0) continue;
+
+    // 1. 基础金额：默认用商品原价（SKU原价优先）
+    const basePrice = new BigNumber(
+      goods.skuData?.salePrice ?? goods.salePrice
+    );
+    let itemAmount = basePrice.multipliedBy(availableNum);
+
+    // 2. 处理「与会员价/会员折扣同享」规则：若开启，用会员价计算
+    if (coupon.vipPriceShare) {
+      const memberPrice = new BigNumber(
+        calcMemberPrice(goods, config.isMember, config.memberDiscountRate)
+      );
+      itemAmount = memberPrice.multipliedBy(availableNum);
+    }
+
+    // 3. 处理「与限时折扣同享」规则：若开启，叠加限时折扣（按商品ID匹配活动）
+    if (coupon.discountShare) {
+      const activity =
+        goods.activityInfo ??
+        activities.find(
+          (act) =>
+            act.type === ActivityType.TIME_LIMIT_DISCOUNT &&
+            (act.applicableProductIds || []).includes(String(goods.product_id)) // 核心修正：用商品ID匹配活动
+        );
+
+      if (activity) {
+        itemAmount = itemAmount.multipliedBy(activity.discountRate); // 叠加限时折扣
+      }
+    }
+
+    total = total.plus(itemAmount);
+  }
+
+  return truncateToTwoDecimals(total.toNumber());
+}
+
+// ============================ 3. 商品核心价格计算（核心修正：按商品ID匹配营销活动） ============================
+/**
+ * 计算单个商品的实际单价（整合商家改价、会员优惠、营销活动折扣，按商品ID匹配活动）
+ * @param goods 商品项
+ * @param config 订单额外配置（含会员、活动信息）
+ * @returns 单个商品实际单价（元）
+ */
+export function calcSingleGoodsRealPrice(
+  goods: BaseCartItem,
+  config: Pick<
+    OrderExtraConfig,
+    "isMember" | "memberDiscountRate" | "limitTimeDiscount"
+  >
+): number {
+  const { isMember, memberDiscountRate, limitTimeDiscount: activity } = config;
+  console.log("activity", activity);
+
+  //如果是增菜价格为0
+  if (goods.is_gift) {
+    return 0;
+  }
+
+  // 1. 优先级1：商家改价（改价后单价>0才生效）
+  if (goods.discountSaleAmount && goods.discountSaleAmount > 0) {
+    return truncateToTwoDecimals(goods.discountSaleAmount);
+  }
+
+  // 2. 优先级2：会员价（含会员折扣率，SKU会员价优先）
+  const memberPrice = new BigNumber(
+    calcMemberPrice(goods, isMember, memberDiscountRate)
+  );
+
+  // 3. 优先级3：营销活动折扣（如限时折扣，需按商品ID匹配活动）
+  let isActivityApplicable = false;
+  if (activity) {
+    if (activity.foodType == 1) {
+      isActivityApplicable = true;
+    } else {
+      const canUseGoods = activity.foods?.split(",") || [];
+      if (canUseGoods.find((v) => v == String(goods.product_id))) {
+        isActivityApplicable = true;
+      }
+    }
+  }
+  if (!activity || !isActivityApplicable) {
+    return memberPrice.toNumber();
+  }
+  console.log("isMember", isMember);
+  //限时折扣优先或者会员价优先但是不是会员或者未开启会员价格时限时折扣优先
+  if (
+    activity.discountPriority == "limit-time" ||
+    (activity.discountPriority == "vip-price" && !isMember) ||
+    (activity.discountPriority == "vip-price" && isMember && !goods.memberPrice)
+  ) {
+    //限时折扣优先
+    return truncateToTwoDecimals(
+      new BigNumber(goods.salePrice)
+        .times(activity.discountRate / 100)
+        .decimalPlaces(2, BigNumber.ROUND_UP)
+        .toNumber()
+    );
+  }
+  if (activity.discountPriority == "vip-price" && isMember) {
+    return memberPrice.toNumber();
+  }
+
+  // 处理活动与会员的同享/不同享逻辑
+  if (activity.vipPriceShare) {
+    // 同享：会员价基础上叠加工活动折扣
+    return truncateToTwoDecimals(
+      memberPrice.multipliedBy(activity.discountRate).toNumber()
+    );
+  } else {
+    // 不同享：取会员价和活动价的最小值（活动价用SKU原价计算）
+    const basePriceForActivity = new BigNumber(
+      goods.skuData?.salePrice ?? goods.salePrice
+    );
+    const activityPrice = basePriceForActivity.multipliedBy(
+      activity.discountRate
+    );
+
+    return truncateToTwoDecimals(
+      memberPrice.isLessThanOrEqualTo(activityPrice)
+        ? memberPrice.toNumber()
+        : activityPrice.toNumber()
+    );
+  }
+}
+
+/**
+ * 计算商品原价总和（所有商品：原价*数量，含临时菜、赠菜，用SKU原价优先）
+ * @param goodsList 商品列表
+ * @returns 商品原价总和（元）
+ */
+export function calcGoodsOriginalAmount(goodsList: BaseCartItem[]): number {
+  let total = new BigNumber(0);
+
+  for (const goods of goodsList) {
+    const availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
+    let basePrice = new BigNumber(0);
+    if (goods.is_temporary) {
+      basePrice = new BigNumber(goods?.discountSaleAmount ?? 0);
+    } else if (goods.is_gift) {
+      basePrice = new BigNumber(0);
+    } else {
+      basePrice = new BigNumber(goods.skuData?.salePrice ?? goods.salePrice); // SKU原价优先
+    }
+
+    total = total.plus(basePrice.multipliedBy(availableNum));
+  }
+
+  return truncateToTwoDecimals(total.toNumber());
+}
+
+/**
+ * 计算商品实际总价（所有商品：实际单价*数量，含临时菜、赠菜，按商品ID匹配活动）
+ * @param goodsList 商品列表
+ * @param config 订单额外配置（含会员、活动信息）
+ * @param activities 全局营销活动列表（如限时折扣，applicableProductIds为商品ID）
+ * @returns 商品实际总价（元）
+ */
+export function calcGoodsRealAmount(
+  goodsList: BaseCartItem[],
+  config: Pick<
+    OrderExtraConfig,
+    "isMember" | "memberDiscountRate" | "limitTimeDiscount"
+  >
+): number {
+  let total = new BigNumber(0);
+
+  for (const goods of goodsList) {
+    const availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
+    if (availableNum <= 0) continue;
+    console.log("goods", goods);
+    const realPrice = new BigNumber(calcSingleGoodsRealPrice(goods, config));
+    total = total.plus(realPrice.multipliedBy(availableNum));
+  }
+
+  return truncateToTwoDecimals(total.toNumber());
+}
+
+/**
+ * 计算商品折扣总金额（商品原价总和 - 商品实际总价）
+ * @param goodsOriginalAmount 商品原价总和
+ * @param goodsRealAmount 商品实际总价
+ * @returns 商品折扣总金额（元，≥0）
+ */
+export function calcGoodsDiscountAmount(
+  goodsOriginalAmount: number,
+  goodsRealAmount: number
+): number {
+  const original = new BigNumber(goodsOriginalAmount);
+  const real = new BigNumber(goodsRealAmount);
+  const discount = original.minus(real);
+
+  return truncateToTwoDecimals(Math.max(0, discount.toNumber()));
+}
+/**
+ * 从满减活动的多门槛中，选择最优阈值（满金额最小且减免金额最大）
+ * @param thresholds 满减阈值列表（多门槛）
+ * @param baseAmount 满减计算基数（新客立减后的金额）
+ * @param goodsOriginalAmount 商品原价总和（discountShare=0时用）
+ * @param goodsRealAmount 商品折扣后总和（discountShare=1时用）
+ * @param discountShare 与限时折扣同享：0=否，1=是
+ * @returns 最优阈值（无符合条件则返回undefined）
+ */
+export function selectOptimalThreshold(
+  thresholds: FullReductionThreshold[] = [],
+  baseAmount: number,
+  goodsOriginalAmount: number,
+  goodsRealAmount: number,
+  discountShare: number = 0
+): FullReductionThreshold | undefined {
+  if (!thresholds.length) return undefined;
+
+  // 第一步：确定满减门槛基数（根据discountShare规则）
+  const thresholdBase = baseAmount;
+
+  // 第二步：筛选「满金额≤基数」且「减免金额>0」的有效阈值
+  const validThresholds = thresholds.filter((threshold) => {
+    const fullAmount = new BigNumber(threshold.fullAmount || 0);
+    const discountAmount = new BigNumber(threshold.discountAmount || 0);
+    console.log("fullAmount", fullAmount);
+    console.log("discountAmount", discountAmount);
+
+    return (
+      fullAmount.isLessThanOrEqualTo(thresholdBase) &&
+      discountAmount.isGreaterThan(0)
+    );
+  });
+  console.log("validThresholds", validThresholds);
+
+  if (!validThresholds.length) return undefined;
+
+  // 找到抵扣金额最大的门槛项
+  const maxDiscountThreshold = validThresholds.reduce(
+    (maxItem, currentItem) => {
+      // 处理空值，默认抵扣金额为0
+      const maxDiscount = new BigNumber(maxItem?.discountAmount || 0);
+      const currentDiscount = new BigNumber(currentItem?.discountAmount || 0);
+
+      // 比较当前项和已存最大项的抵扣金额，保留更大的
+      return currentDiscount.gt(maxDiscount) ? currentItem : maxItem;
+    },
+    validThresholds[0] || null
+  ); // 初始值为数组第一项（若数组为空则返回null）
+  console.log("maxDiscountThreshold", maxDiscountThreshold);
+  return maxDiscountThreshold;
+}
+
+/**
+ * 计算满减实际减免金额（适配多门槛、同享规则）
+ * @param optimalActivity 最优满减活动
+ * @param optimalThreshold 最优满减阈值
+ * @param baseAmount 计算基数（新客立减后的金额）
+ * @returns 实际减免金额（元，未达门槛则0）
+ */
+export function calcFullReductionAmount(
+  baseAmount: number,
+  optimalActivity?: FullReductionActivity,
+  optimalThreshold?: FullReductionThreshold
+): number {
+  if (!optimalActivity || !optimalThreshold) return 0;
+
+  const baseAmountBn = new BigNumber(baseAmount);
+  const discountAmountBn = new BigNumber(optimalThreshold.discountAmount || 0);
+
+  // 1. 基数必须为正（避免减免后为负）
+  if (baseAmountBn.isLessThanOrEqualTo(0)) return 0;
+
+  // 2. 减免金额不能超过基数（避免减成负数）
+  const maxReducible = baseAmountBn;
+  const actualReduction = discountAmountBn.isLessThanOrEqualTo(maxReducible)
+    ? discountAmountBn
+    : maxReducible;
+
+  return truncateToTwoDecimals(actualReduction.toNumber());
+}
+
+// ------------------------------ 策略辅助函数 ------------------------------
+/**
+ * 根据优惠券useShops列表判断门店是否匹配（适配BaseCoupon的useShops字段）
+ */
+function isStoreMatchByList(
+  useShops: string[],
+  currentStoreId: string
+): boolean {
+  // 适用门店为空数组 → 无限制（所有门店适用）
+  if (useShops.length === 0) return true;
+  // 匹配当前门店ID（字符串比较，避免类型问题）
+  return useShops.includes(currentStoreId);
+}
+
+/**
+ * 计算优惠券抵扣金额（处理互斥逻辑，选择最优优惠券，按商品ID排除，新增细分统计）
+ * @param backendCoupons 后端优惠券列表
+ * @param goodsList 商品列表
+ * @param config 订单配置（含就餐类型）
+ * @returns 最优优惠券的抵扣结果（含商品券/满减券细分）
+ */
+export function calcCouponDeduction(
+  backendCoupons: BackendCoupon[],
+  goodsList: BaseCartItem[],
+  config: Pick<
+    OrderExtraConfig,
+    "currentStoreId" | "isMember" | "memberDiscountRate"
+  > & {
+    activities: ActivityConfig[];
+    cartOrder: Record<string, number>;
+    dinnerType: "dine-in" | "take-out";
+    currentTime?: Date;
+  }
+): {
+  deductionAmount: number;
+  productCouponDeduction: number; // 新增：商品优惠券抵扣（兑换券/折扣券/买一送一等）
+  fullCouponDeduction: number; // 新增：满减优惠券抵扣
+  usedCoupon?: Coupon;
+  excludedProductIds: string[]; // 排除的商品ID列表（商品ID）
+} {
+  const goodsCoupon = backendCoupons.filter((v) => v.type == 2);
+  const discountCoupon = backendCoupons.filter((v) => v.type != 2);
+
+  // 3. 计算非兑换券最优抵扣（传递已抵扣商品ID，避免重复，统计细分字段）
+  let nonExchangeResult: CouponResult = {
+    deductionAmount: discountCoupon.reduce((prve, cur): number => {
+      return prve + (cur.discountAmount || 0);
+    }, 0),
+    excludedProductIds: [],
+    usedCoupon: undefined,
+    productCouponDeduction: 0,
+    fullCouponDeduction: 0,
+  };
+
+  // 4. 计算兑换券抵扣（排除非兑换券已抵扣的商品ID，统计商品券细分）
+  let exchangeResult: ExchangeCalculationResult = {
+    deductionAmount: goodsCoupon.reduce((prve, cur): number => {
+      return prve + (cur.discountAmount || 0);
+    }, 0),
+    excludedProductIds: [],
+    productCouponDeduction: 0,
+  };
+
+  // 5. 汇总结果：兑换券与非兑换券不可同时使用，取抵扣金额大的
+  const exchangeBn = new BigNumber(exchangeResult.deductionAmount);
+  const nonExchangeBn = new BigNumber(nonExchangeResult.deductionAmount);
+  const isExchangeBetter = exchangeBn.isGreaterThan(nonExchangeBn);
+
+  return {
+    deductionAmount: exchangeBn.plus(nonExchangeBn).toNumber(),
+    productCouponDeduction: exchangeResult.deductionAmount,
+    fullCouponDeduction: nonExchangeResult.deductionAmount, // 兑换券与满减券互斥，满减券抵扣置0
+    usedCoupon: isExchangeBetter ? undefined : nonExchangeResult.usedCoupon,
+    excludedProductIds: isExchangeBetter
+      ? exchangeResult.excludedProductIds
+      : nonExchangeResult.excludedProductIds,
+  };
+}
+
+// ============================ 5. 其他费用计算（无ID依赖，逻辑不变） ============================
+/**
+ * 计算总打包费（赠菜也计算，称重商品打包数量≤1）
+ * @param goodsList 商品列表
+ * @param dinnerType 就餐类型（堂食dine-in/外卖take-out）
+ * @returns 总打包费（元）
+ */
+export function calcTotalPackFee(
+  goodsList: BaseCartItem[],
+  dinnerType: "dine-in" | "take-out"
+): number {
+  // if (dinnerType !== "take-out") return 0;
+  let total = new BigNumber(0);
+
+  for (const goods of goodsList) {
+    const packNumber = goods.packNumber ? goods.packNumber * 1 : 0;
+    let availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
+
+    if (availableNum === 0) continue;
+
+    // 计算单个商品打包数量（外卖全打包，堂食按配置，称重商品≤1）
+    let packNum = Math.min(availableNum, packNumber);
+    if (dinnerType === "take-out") {
+      packNum = availableNum;
+    }
+    if (goods.product_type === GoodsType.WEIGHT) {
+      packNum = Math.min(packNum, 1);
+    }
+
+    total = total.plus(new BigNumber(goods.packFee || 0).multipliedBy(packNum));
+  }
+
+  return truncateToTwoDecimals(total.toNumber());
+}
+
+/**
+ * 计算餐位费（按人数，不参与营销活动）
+ * @param config 餐位费配置
+ * @returns 餐位费（元，未启用则0）
+ */
+export function calcSeatFee(config: SeatFeeConfig): number {
+  if (!config.isEnabled || config.personCount == 0) return 0;
+  const personCount = Math.max(1, config.personCount); // 至少1人
+  return truncateToTwoDecimals(
+    new BigNumber(config.pricePerPerson).multipliedBy(personCount).toNumber()
+  );
+}
+
+/**
+ * 计算积分抵扣金额（按X积分=1元，不超过最大抵扣和用户积分）
+ * @param userPoints 用户当前积分
+ * @param rule 积分抵扣规则
+ * @param maxDeductionLimit 最大抵扣上限（通常为订单金额，避免超扣）
+ * @returns 积分抵扣金额 + 实际使用积分
+ */
+export function calcPointDeduction(
+  userPoints: number,
+  rule: PointDeductionRule,
+  maxDeductionLimit: number
+): {
+  deductionAmount: number;
+  usedPoints: number;
+} {
+  console.log("calcPointDeduction", userPoints, rule, maxDeductionLimit);
+  if (rule.pointsPerYuan <= 0 || userPoints <= 0) {
+    return { deductionAmount: 0, usedPoints: 0 };
+  }
+
+  const userPointsBn = new BigNumber(userPoints);
+  const pointsPerYuanBn = new BigNumber(rule.pointsPerYuan);
+  const maxLimitBn = new BigNumber(maxDeductionLimit);
+
+  // 最大可抵扣金额（积分可抵金额 vs 规则最大 vs 订单上限）
+  const maxDeductByPoints = userPointsBn.dividedBy(pointsPerYuanBn);
+  const maxDeductAmount = maxDeductByPoints.isLessThan(
+    rule.maxDeductionAmount ?? Infinity
+  )
+    ? maxDeductByPoints
+    : new BigNumber(rule.maxDeductionAmount || Infinity).isLessThan(maxLimitBn)
+    ? maxDeductByPoints
+    : maxLimitBn;
+
+  // 实际使用积分 = 抵扣金额 * 积分兑换比例
+  const usedPoints = maxDeductAmount.multipliedBy(pointsPerYuanBn);
+
+  return {
+    deductionAmount: truncateToTwoDecimals(maxDeductAmount.toNumber()),
+    usedPoints: truncateToTwoDecimals(
+      Math.min(usedPoints.toNumber(), userPoints)
+    ), // 避免积分超扣
+  };
+}
+
+function calcVipDiscountAmount(
+  goodsRealAmount: number,
+  shopUserInfo: ShopUserInfo
+): number {
+  if (!shopUserInfo.isVip || shopUserInfo.discount === 0) return 0;
+  if (shopUserInfo.isVip == 1 && shopUserInfo.isMemberPrice != 1) {
+    return 0;
+  }
+  console.log("goodsRealAmount", goodsRealAmount);
+  console.log("discount", (100 - (shopUserInfo.discount || 0)) / 100);
+  return truncateToTwoDecimals(
+    new BigNumber(goodsRealAmount)
+      .times((100 - (shopUserInfo.discount || 0)) / 100)
+      .decimalPlaces(2, BigNumber.ROUND_UP)
+      .toNumber()
+  );
+}
+
+// ============================ 6. 订单总费用汇总与实付金额计算（核心入口，补充细分字段） ============================
+/**
+ * 计算订单所有费用子项并汇总（核心入口函数）
+ * @param goodsList 购物车商品列表
+ * @param dinnerType 就餐类型
+ * @param backendCoupons 后端优惠券列表
+ * @param activities 全局营销活动列表
+ * @param config 订单额外配置（会员、积分、餐位费等）
+ * @param cartOrder 商品加入购物车顺序（key=购物车ID，value=时间戳）
+ * @param currentTime 当前时间（用于优惠券有效期判断）
+ * @returns 订单费用汇总（含所有子项和实付金额，新增商品券/满减券细分）
+ */
+export function calculateOrderCostSummary(
+  goodsList: BaseCartItem[],
+  dinnerType: "dine-in" | "take-out", // 前端就餐类型
+  backendCoupons: BackendCoupon[] = [],
+  activities: ActivityConfig[] = [],
+  config: OrderExtraConfig, // 含后端满减活动、currentDinnerType
+  cartOrder: Record<string, number> = {},
+  currentTime: Date = new Date()
+): OrderCostSummary {
+  //是否使用霸王餐，霸王餐配置
+  const {
+    isFreeDine,
+    freeDineConfig,
+    limitTimeDiscount,
+    fullReductionActivities,
+    shopUserInfo,
+  } = config;
+  console.log("shopUserInfo", shopUserInfo);
+
+  // ------------------------------ 1. 基础费用计算 ------------------------------
+  const goodsOriginalAmount = calcGoodsOriginalAmount(goodsList); // 商品原价总和
+  const goodsRealAmount = calcGoodsRealAmount(
+    // 商品折扣后总和
+    goodsList,
+    {
+      isMember: config.isMember,
+      memberDiscountRate: config.memberDiscountRate,
+      limitTimeDiscount: config.limitTimeDiscount,
+    }
+  );
+  const goodsDiscountAmount = calcGoodsDiscountAmount(
+    goodsOriginalAmount,
+    goodsRealAmount
+  ); // 商品折扣金额
+
+  const newUserDiscount = config.newUserDiscount || 0; // 新客立减
+
+  //  其他费用计算（原有逻辑不变） ------------------------------
+  const packFee = calcTotalPackFee(goodsList, dinnerType); // 打包费
+  let seatFee = calcSeatFee(config.seatFeeConfig); // 餐位费
+  seatFee = dinnerType === "dine-in" ? seatFee : 0; // 外卖不收餐位费
+  const additionalFee = Math.max(0, config.additionalFee); // 附加费
+
+  // ------------------------------ 2. 满减活动计算（核心步骤） ------------------------------
+  let usedFullReductionActivity: FullReductionActivity | undefined;
+  let usedFullReductionThreshold: FullReductionThreshold | undefined;
+  let fullReductionAmount = 0;
+  let usedFullReductionActivityFullAmount = calcFullReductionActivityFullAmount(
+    goodsList,
+    usedFullReductionActivity,
+    config.limitTimeDiscount,
+    config.isMember,
+    seatFee,
+    packFee
+  );
+
+  // 2.1 筛选最优满减活动（后端活动列表、当前店铺、就餐类型、时间）
+  usedFullReductionActivity = filterOptimalFullReductionActivity(
+    config.fullReductionActivities,
+    Number(config.currentStoreId), // 转换为数字（后端shopId是number）
+    config.currentDinnerType, // 后端useType匹配的就餐类型（如"dine"）
+    currentTime
+  );
+
+  // 2.2 计算满减基数（先扣新客立减）
+  let baseAfterNewUserDiscount = new BigNumber(
+    limitTimeDiscount &&
+    limitTimeDiscount.id &&
+    usedFullReductionActivity &&
+    !usedFullReductionActivity.discountShare
+      ? goodsRealAmount
+      : goodsRealAmount
+  )
+    .minus(newUserDiscount)
+    .plus(packFee)
+    .plus(seatFee)
+    .plus(additionalFee)
+    .toNumber();
+  baseAfterNewUserDiscount =
+    baseAfterNewUserDiscount > 0 ? baseAfterNewUserDiscount : 0;
+
+  // 2.3 选择最优满减阈值（多门槛场景）
+  if (usedFullReductionActivity) {
+    //计算当前满减活动的门槛金额
+    usedFullReductionActivityFullAmount = calcFullReductionActivityFullAmount(
+      goodsList,
+      usedFullReductionActivity,
+      config.limitTimeDiscount,
+      config.isMember,
+      seatFee,
+      packFee
+    );
+
+    usedFullReductionThreshold = selectOptimalThreshold(
+      usedFullReductionActivity.thresholds,
+      usedFullReductionActivityFullAmount,
+      goodsOriginalAmount,
+      goodsRealAmount,
+      usedFullReductionActivity.discountShare || 0 // 与限时折扣同享规则
+    );
+
+    // 2.4 计算满减实际减免金额
+    fullReductionAmount = calcFullReductionAmount(
+      baseAfterNewUserDiscount,
+      usedFullReductionActivity,
+      usedFullReductionThreshold
+    );
+  }
+
+  // ------------------------------ 3. 优惠券抵扣（适配满减同享规则） ------------------------------
+  let couponDeductionAmount = 0;
+  let productCouponDeduction = 0;
+  let fullCouponDeduction = 0;
+  let usedCoupon: Coupon | undefined;
+  let excludedProductIds: string[] = [];
+
+  const couponResult = calcCouponDeduction(
+    // 原有优惠券计算函数
+    backendCoupons,
+    goodsList,
+    {
+      currentStoreId: config.currentStoreId,
+      isMember: config.isMember,
+      memberDiscountRate: config.memberDiscountRate,
+      activities,
+      cartOrder,
+      dinnerType,
+      currentTime,
+    }
+  );
+  console.log("couponResult", couponResult);
+  couponDeductionAmount = couponResult.deductionAmount;
+  productCouponDeduction = couponResult.productCouponDeduction;
+  fullCouponDeduction = couponResult.fullCouponDeduction;
+  usedCoupon = couponResult.usedCoupon;
+  excludedProductIds = couponResult.excludedProductIds;
+
+  // 若满减与优惠券同享（couponShare=1），才计算优惠券；否则优惠券抵扣为0
+  if (
+    usedFullReductionThreshold &&
+    (!usedFullReductionActivity || !usedFullReductionActivity.couponShare)
+  ) {
+    couponDeductionAmount = 0;
+    productCouponDeduction = 0;
+    fullCouponDeduction = 0;
+    usedCoupon = undefined;
+    excludedProductIds = [];
+  }
+
+  // ------------------------------ 4. 积分抵扣（适配满减同享规则） ------------------------------
+  let pointDeductionAmount = 0;
+  let usedPoints = 0;
+
+  // 计算积分抵扣基数（商品折扣后 - 新客立减 - 满减 - 优惠券 + 餐位费 + 打包费 + 附加费）
+  let maxPointDeductionLimit = new BigNumber(goodsRealAmount)
+    .minus(newUserDiscount)
+    .minus(fullReductionAmount)
+    .minus(couponDeductionAmount)
+    .plus(seatFee)
+    .plus(packFee)
+    .plus(additionalFee)
+    .toNumber();
+  maxPointDeductionLimit =
+    maxPointDeductionLimit > 0 ? maxPointDeductionLimit : 0;
+
+  const pointResult = calcPointDeduction(
+    config.userPoints,
+    config.pointDeductionRule,
+    maxPointDeductionLimit
+  );
+
+  pointDeductionAmount = pointResult.deductionAmount;
+  usedPoints = pointResult.usedPoints;
+  // 若满减与积分不同享（pointsShare=1）积分抵扣为0
+  if (
+    usedFullReductionThreshold &&
+    (!usedFullReductionActivity || !usedFullReductionActivity.pointsShare)
+  ) {
+    pointDeductionAmount = 0;
+    usedPoints = 0;
+  }
+
+  //使用霸王餐
+  if (isFreeDine && freeDineConfig && freeDineConfig.enable) {
+    fullReductionAmount = 0;
+    //不与优惠券同享
+    if (!freeDineConfig.withCoupon) {
+      couponDeductionAmount = 0;
+      productCouponDeduction = 0;
+      fullCouponDeduction = 0;
+      usedCoupon = undefined;
+      excludedProductIds = [];
+    }
+    //不与积分同享
+    if (!freeDineConfig.withPoints) {
+      pointDeductionAmount = 0;
+      usedPoints = 0;
+    }
+  }
+
+  // 商家减免计算（原有逻辑不变）
+  const merchantReductionConfig = config.merchantReduction;
+  let merchantReductionActualAmount = 0;
+  const maxMerchantReductionLimit = new BigNumber(goodsRealAmount)
+    .minus(newUserDiscount)
+    .minus(fullReductionAmount)
+    .minus(couponDeductionAmount)
+    .minus(pointDeductionAmount)
+    .plus(seatFee)
+    .plus(packFee)
+    .isGreaterThan(0)
+    ? new BigNumber(goodsRealAmount)
+        .minus(newUserDiscount)
+        .minus(fullReductionAmount)
+        .minus(couponDeductionAmount)
+        .minus(pointDeductionAmount)
+        .plus(seatFee)
+        .plus(packFee)
+        .toNumber()
+    : 0;
+
+  switch (merchantReductionConfig.type) {
+    case MerchantReductionType.FIXED_AMOUNT:
+      merchantReductionActualAmount = Math.min(
+        merchantReductionConfig.fixedAmount || 0,
+        maxMerchantReductionLimit
+      );
+      break;
+    case MerchantReductionType.DISCOUNT_RATE:
+      const validRate =
+        Math.max(0, Math.min(100, merchantReductionConfig.discountRate || 0)) /
+        100;
+      merchantReductionActualAmount =
+        maxMerchantReductionLimit * (1 - validRate);
+      break;
+  }
+  merchantReductionActualAmount = Math.max(
+    0,
+    truncateToTwoDecimals(merchantReductionActualAmount)
+  );
+
+  // 会员折扣减免
+  const vipDiscountAmount = calcVipDiscountAmount(
+    new BigNumber(goodsRealAmount)
+      .minus(couponDeductionAmount)
+      .plus(packFee)
+      .plus(seatFee)
+      .minus(newUserDiscount)
+      .minus(fullReductionAmount)
+      .toNumber(),
+    shopUserInfo
+  ); // 会员折扣减免金额
+  // ------------------------------ 6. 最终实付金额计算 ------------------------------
+  const finalPayAmountBn = new BigNumber(goodsRealAmount)
+    .minus(newUserDiscount)
+    .minus(vipDiscountAmount)
+    .minus(fullReductionAmount)
+    .minus(couponDeductionAmount)
+    .minus(pointDeductionAmount)
+    .minus(merchantReductionActualAmount)
+    .plus(seatFee)
+    .plus(packFee)
+    .plus(additionalFee);
+  let finalPayAmount = Math.max(
+    0,
+    truncateToTwoDecimals(finalPayAmountBn.toNumber())
+  );
+  // ------------------------------ 使用霸王餐计算 ------------------------------
+  let orderOriginFinalPayAmount = finalPayAmount;
+  if (isFreeDine && freeDineConfig && freeDineConfig.enable) {
+    finalPayAmount = BigNumber(finalPayAmount)
+      .times(freeDineConfig.rechargeTimes)
+      .toNumber();
+  }
+
+  // ------------------------------ 7. 总优惠金额计算 ------------------------------
+  const totalDiscountAmount = truncateToTwoDecimals(
+    new BigNumber(goodsDiscountAmount)
+      .plus(newUserDiscount)
+      .plus(fullReductionAmount)
+      .plus(couponDeductionAmount)
+      .plus(pointDeductionAmount)
+      .plus(merchantReductionActualAmount)
+      .plus(vipDiscountAmount)
+      .toNumber()
+  );
+  //积分可抵扣最大金额 最终支付金额+积分抵扣-商家减免
+  const scoreMaxMoney = new BigNumber(finalPayAmount)
+    .plus(pointDeductionAmount)
+    .minus(merchantReductionActualAmount)
+    .toNumber();
+
+  // ------------------------------ 8. 返回完整结果 ------------------------------
+  return {
+    goodsTotal: goodsList.reduce(
+      (sum, g) => sum + Math.max(0, g.number - (g.returnNum || 0)),
+      0
+    ),
+    goodsRealAmount,
+    goodsOriginalAmount,
+    goodsDiscountAmount,
+    couponDeductionAmount,
+    productCouponDeduction,
+    fullCouponDeduction,
+    pointDeductionAmount,
+    seatFee,
+    packFee,
+    totalDiscountAmount,
+    //最终支付原金额
+    orderOriginFinalPayAmount,
+    //积分最大可抵扣金额
+    scoreMaxMoney,
+    // 满减活动明细（后端字段）
+    fullReduction: {
+      usedFullReductionActivityFullAmount: usedFullReductionActivityFullAmount,
+      usedActivity: usedFullReductionActivity,
+      usedThreshold: usedFullReductionThreshold,
+      actualAmount: truncateToTwoDecimals(fullReductionAmount),
+    },
+    vipDiscountAmount: vipDiscountAmount, //会员折扣减免金额
+    merchantReduction: {
+      type: merchantReductionConfig.type,
+      originalConfig: merchantReductionConfig,
+      actualAmount: merchantReductionActualAmount,
+    },
+    additionalFee,
+    finalPayAmount,
+    couponUsed: usedCoupon,
+    pointUsed: usedPoints,
+    newUserDiscount,
+    dinnerType,
+    config,
+  };
+}
+
+export function isWeightGoods(goods: BaseCartItem): boolean {
+  return goods.product_type === GoodsType.WEIGHT;
+}
+
+// ============================ 7. 对外暴露工具库 ============================
+export const OrderPriceCalculator = {
+  // 基础工具
+  truncateToTwoDecimals,
+  isTemporaryGoods,
+  isGiftGoods,
+  formatDiscountRate,
+  filterThresholdGoods,
+  isWeightGoods,
+  // 商品价格计算
+  calcSingleGoodsRealPrice,
+  calcGoodsOriginalAmount,
+  calcGoodsRealAmount,
+  calcGoodsDiscountAmount,
+  //满减活动工具
+  filterOptimalFullReductionActivity,
+  // 优惠券计算
+  calcCouponDeduction,
+  // 其他费用计算
+  calcTotalPackFee,
+  calcSeatFee,
+  calcPointDeduction,
+  // 核心入口
+  calculateOrderCostSummary,
+  // 枚举导出
+  Enums: {
+    GoodsType,
+    CouponType,
+    ActivityType,
+    WEEKDAY_MAP,
+  },
+};
+
+export default OrderPriceCalculator;
diff --git a/utils/goods-utils - 副本.js b/utils/goods-utils - 副本.js
index db21553..0012e45 100644
--- a/utils/goods-utils - 副本.js	
+++ b/utils/goods-utils - 副本.js	
@@ -1,27 +1,55 @@
-import {
-	BigNumber
-} from "bignumber.js";
+import { BigNumber } from "bignumber.js";
 import _ from "lodash";
 
-
-
 /**
  * 返回商品单价
  * @param goods 商品
  * @param user 用户信息
- * @param {Object} shopInfo
+ * @param {Object} shopInfo 店铺信息
+ * @param {boolean} limitTimeDiscount - 限时折扣
  */
-export function returnGoodsPrice(goods, user, shopInfo) {
-	if (goods.discount_sale_amount * 1 > 0) {
-		return goods.discount_sale_amount;
-	}
-	if(shopInfo&&!shopInfo.isMemberPrice){
-		return goods.salePrice;
-	}
-	if (user.isVip && goods.memberPrice * 1 <= goods.salePrice * 1 && goods.memberPrice * 1 > 0) {
-		return goods.memberPrice;
-	}
-	return goods.salePrice;
+export function returnGoodsPrice(goods, user, shopInfo, limitTimeDiscount) {
+  if (!goods) {
+    return 0;
+  }
+  // 商家改价
+  if (goods.discount_sale_amount * 1 > 0) {
+    return goods.discount_sale_amount;
+  }
+  // 限时折扣
+  if (limitTimeDiscount && limitTimeDiscount.id) {
+    if (
+      limitTimeDiscount.foodType == 1 &&
+      limitTimeDiscount.discountPriority == "limit-time"
+    ) {
+      return new BigNumber(goods.salePrice)
+        .times(limitTimeDiscount.discountRate / 100)
+        .decimalPlaces(2, BigNumber.ROUND_UP)
+        .toNumber();
+    }
+    const canUseFoods = limitTimeDiscount.foods.split(",");
+    if (
+      limitTimeDiscount.foodType == 2 &&
+      limitTimeDiscount.discountPriority == "limit-time" &&
+      canUseFoods.includes(`${goods.productId}`)
+    ) {
+      return new BigNumber(goods.salePrice)
+        .times(limitTimeDiscount.discountRate / 100)
+        .decimalPlaces(2, BigNumber.ROUND_UP)
+        .toNumber();
+    }
+  }
+  if (shopInfo && !shopInfo.isMemberPrice) {
+    return goods.salePrice;
+  }
+  if (
+    user.isVip &&
+    goods.memberPrice * 1 <= goods.salePrice * 1 &&
+    goods.memberPrice * 1 > 0
+  ) {
+    return goods.memberPrice;
+  }
+  return goods.salePrice;
 }
 
 /**
@@ -29,15 +57,15 @@ export function returnGoodsPrice(goods, user, shopInfo) {
  * @param arr 商品列表
  */
 export function returnGoodsGroupMap(arr) {
-	let map = {};
-	arr.forEach((v) => {
-		const key = v.productId + "_" + v.skuId;
-		if (!map[key]) {
-			map[key] = [];
-		}
-		map[key].push(v);
-	});
-	return map;
+  let map = {};
+  arr.forEach((v) => {
+    const key = v.productId + "_" + v.skuId;
+    if (!map[key]) {
+      map[key] = [];
+    }
+    map[key].push(v);
+  });
+  return map;
 }
 
 /**
@@ -45,17 +73,17 @@ export function returnGoodsGroupMap(arr) {
  * @param coupon
  */
 export function returnCoupType(coupon) {
-	const couponTypes = {
-		1: "满减券",
-		2: "商品券",
-		3: "折扣券",
-		4: "第二件半价券",
-		5: "消费送券",
-		6: "买一送一券",
-		7: "固定价格券",
-		8: "免配送费券",
-	};
-	return couponTypes[coupon.type] || "未知类型";
+  const couponTypes = {
+    1: "满减券",
+    2: "商品券",
+    3: "折扣券",
+    4: "第二件半价券",
+    5: "消费送券",
+    6: "买一送一券",
+    7: "固定价格券",
+    8: "免配送费券",
+  };
+  return couponTypes[coupon.type] || "未知类型";
 }
 
 /**
@@ -65,22 +93,37 @@ export function returnCoupType(coupon) {
  * @param user 用户信息
  */
 export function returnCanDikouGoodsArr(canDikouGoodsArr, selCoupon, user) {
-	const goodsCouponGoods = selCoupon
-		.filter((v) => v.type == 2)
-		.reduce((prve, cur) => {
-			prve.push(...cur.discount.hasDiscountGoodsArr);
-			return prve;
-		}, []);
-	const arr = _.cloneDeep(canDikouGoodsArr)
-		.map((v) => {
-			const findCart = goodsCouponGoods.find((carts) => carts.id == v.id);
-			if (findCart) {
-				v.num -= findCart.num;
-			}
-			return v;
-		})
-		.filter((v) => v.num > 0);
-	return arr;
+  const types = [2, 4, 6];
+  // 收集已抵扣商品并关联对应的优惠券类型
+  const goodsCouponGoods = selCoupon
+    .filter((v) => types.includes(v.type))
+    .reduce((prev, cur) => {
+      // 给每个抵扣商品添加所属优惠券类型
+      const goodsWithType = cur.discount.hasDiscountGoodsArr.map((goods) => ({
+        ...goods,
+        couponType: cur.type, // 记录该商品是被哪种类型的优惠券抵扣的
+      }));
+      prev.push(...goodsWithType);
+      return prev;
+    }, []);
+  const arr = _.cloneDeep(canDikouGoodsArr)
+    .map((v) => {
+      const findCart = goodsCouponGoods.find((carts) => carts.id == v.id);
+      if (findCart) {
+        // 根据优惠券类型判断扣减数量
+        if ([4, 6].includes(findCart.couponType)) {
+          // 类型4（第二件半价）或6（买一送一），数量减2
+          v.num -= 2;
+        } else {
+          // 其他类型（如类型2商品券），按原逻辑扣减对应数量
+          v.num -= findCart.num;
+        }
+      }
+      return v;
+    })
+    .filter((v) => v.num > 0); // 过滤掉数量<=0的商品
+
+  return arr;
 }
 
 /**
@@ -97,139 +140,208 @@ export function returnCanDikouGoodsArr(canDikouGoodsArr, selCoupon, user) {
  * @param {Object} args.user - 用户信息对象
  * @param {Object} args.selCoupon - 已经选择的优惠券信息对象
  * @param {Object} args.shopInfo
+ * @param {boolean} args.limitTimeDiscount - 限时折扣
  * @returns {Object} - { canUse: boolean, reason: string } 可用状态及不可用原因
  */
 export function returnCouponCanUse(args) {
-	let {
-		canDikouGoodsArr,
-		coupon,
-		goodsOrderPrice,
-		user,
-		selCoupon,
-		shopInfo
-	} = args;
+  let {
+    canDikouGoodsArr,
+    coupon,
+    goodsOrderPrice,
+    user,
+    selCoupon,
+    shopInfo,
+    isMemberPrice,
+    limitTimeDiscount,
+  } = args;
+  // 优惠券未启用
+  if (!coupon.use) {
+    return {
+      canUse: false,
+      reason: coupon.noUseRestrictions || "不在可用时间段内",
+    };
+  }
+  if(limitTimeDiscount&&limitTimeDiscount.id&&!coupon.discountShare){
+    return {
+      canUse: false,
+      reason: coupon.noUseRestrictions || "不可与限时折扣同享",
+    };
+  }
 
-	// 优惠券未启用
-	if (!coupon.use) {
-		return {
-			canUse: false,
-			reason: "优惠券未启用"
-		};
-	}
+  // 计算门槛金额
+  let fullAmount = goodsOrderPrice;
+  canDikouGoodsArr = returnCanDikouGoodsArr(
+    canDikouGoodsArr,
+    selCoupon,
+    user,
+    shopInfo,
+    limitTimeDiscount
+  );
+  //优惠券指定门槛商品列表
+  let canCalcGoodsArr = [...canDikouGoodsArr];
+  //部分商品参与门槛计算
+  if (coupon.thresholdFoods.length) {
+    canCalcGoodsArr = canDikouGoodsArr.filter((v) => {
+      return coupon.thresholdFoods.find((food) => food.id == v.productId);
+    });
+    fullAmount = canCalcGoodsArr.reduce((pre, cur) => {
+      return (
+        pre + returnGoodsPrice(cur, user, shopInfo, limitTimeDiscount) * cur.num
+      );
+    }, 0);
+  }
 
-	canDikouGoodsArr = returnCanDikouGoodsArr(canDikouGoodsArr, selCoupon, user,shopInfo);
-	// 计算门槛金额
-	let fullAmount = goodsOrderPrice;
-	// 是否抵扣全部商品
-	const isDikouAll = coupon.useFoods.length === 0;
-	let canCalcGoodsArr = [];
-	// 订单里参与门槛计算的商品
-	if (!isDikouAll) {
-		canCalcGoodsArr = canDikouGoodsArr.filter((v) => {
-			return coupon.useFoods.find((food) => food.id == v.productId);
-		});
-		fullAmount = canCalcGoodsArr.reduce((pre, cur) => {
-			return pre + returnGoodsPrice(cur, user,shopInfo) * cur.num;
-		}, 0);
-	}
+  // 是否全部商品可用
+  const isDikouAll = coupon.useFoods.length === 0;
+  // 订单可用商品列表
+  let canUseGoodsArr = [];
+  if (!isDikouAll) {
+    canUseGoodsArr = canDikouGoodsArr.filter((v) => {
+      return coupon.useFoods.find((food) => food.id == v.productId);
+    });
+  }
+  if (user.isVip && !coupon.vipPriceShare) {
+    return {
+      canUse: false,
+      reason: "非会员可用",
+    };
+  }
+  if (selCoupon.length > 0 && !selCoupon[0].otherCouponShare) {
+    return {
+      canUse: false,
+      reason: "当前选中的券不可与其他券同享",
+    };
+  }
+  if (selCoupon.length > 0 && !coupon.otherCouponShare) {
+    return {
+      canUse: false,
+      reason: "当前选中的券不可与其他券同享",
+    };
+  }
+  // 满减券和折扣券计算门槛金额是否满足
+  if ([1, 3].includes(coupon.type)) {
+    if (canCalcGoodsArr.length <= 0) {
+      return {
+        canUse: false,
+        reason: "没有可参与计算门槛的商品",
+      };
+    }
+    // 不满足门槛金额
+    if (fullAmount < coupon.fullAmount) {
+      return {
+        canUse: false,
+        reason: `满${coupon.fullAmount}元可用，当前可参与金额${fullAmount}元`,
+      };
+    }
+  }
+  // 商品兑换券，第二件半价和买一送一判断是否有可用商品
+  if ([2, 4, 5].includes(coupon.type)) {
+    if (coupon.type == 2 && fullAmount < coupon.fullAmount) {
+      return {
+        canUse: false,
+        reason: `满${coupon.fullAmount}元可用，当前可参与金额${fullAmount}元`,
+      };
+    }
 
-	// 没有符合条件的商品
-	if (!isDikouAll && canCalcGoodsArr.length === 0) {
-		return {
-			canUse: false,
-			reason: "没有符合条件的商品"
-		};
-	}
+    // 没有符合条件的商品
+    if (isDikouAll && canDikouGoodsArr.length === 0) {
+      return {
+        canUse: false,
+        reason: "没有符合条件的商品",
+      };
+    }
+    if (!isDikouAll && canUseGoodsArr.length === 0) {
+      return {
+        canUse: false,
+        reason: "没有符合条件的商品",
+      };
+    }
+  }
+  //商品兑换券是否达到门槛金额
+  if (coupon.type == 2 && goodsOrderPrice < coupon.fullAmount) {
+    return {
+      canUse: false,
+      reason: `满${coupon.fullAmount}元可用，当前可参与金额${fullAmount}元`,
+    };
+  }
 
-	// 不满足门槛金额
-	if (fullAmount < coupon.fullAmount) {
-		return {
-			canUse: false,
-			reason: `满${coupon.fullAmount}元可用，当前可参与金额${fullAmount}元`
-		};
-	}
+  // 买一送一券特殊验证
+  if (coupon.type === 6) {
+    let canUse = false;
+    if (isDikouAll) {
+      canUse = canDikouGoodsArr.some((v) => v.num >= 2);
+    } else if (canUseGoodsArr.length > 0) {
+      canUse = canUseGoodsArr.some((v) => v.num >= 2);
+    }
 
-	// 商品券特殊验证
-	if (coupon.type === 2) {
-		if (!(isDikouAll || canCalcGoodsArr.length > 0)) {
-			return {
-				canUse: false,
-				reason: "没有符合条件的商品可抵扣"
-			};
-		}
-	}
+    if (!canUse) {
+      return {
+        canUse: false,
+        reason: "需要购买至少2件相同的商品才能使用",
+      };
+    }
+  }
 
-	// 买一送一券特殊验证
-	if (coupon.type === 6) {
-		let canUse = false;
-		if (isDikouAll) {
-			canUse = canDikouGoodsArr.some((v) => v.num >= 2);
-		} else if (canCalcGoodsArr.length > 0) {
-			canUse = canCalcGoodsArr.some((v) => v.num >= 2);
-		}
+  // 第二件半价券特殊验证
+  if (coupon.type === 4) {
+    let canUse = false;
+    if (isDikouAll) {
+      canUse = canDikouGoodsArr.some((v) => v.num >= 2);
+    } else if (canUseGoodsArr.length > 0) {
+      canUse = canUseGoodsArr.some((v) => v.num >= 2);
+    }
+    if (!canUse) {
+      return {
+        canUse: false,
+        reason: "需要购买至少2件相同的商品才能使用",
+      };
+    }
+  }
 
-		if (!canUse) {
-			return {
-				canUse: false,
-				reason: "需要购买至少2件相同的商品才能使用"
-			};
-		}
-	}
-
-	// 第二件半价券特殊验证
-	if (coupon.type === 4) {
-		let canUse = false;
-		if (isDikouAll) {
-			canUse = canDikouGoodsArr.some((v) => v.num >= 2);
-		} else if (canCalcGoodsArr.length > 0) {
-			canUse = canCalcGoodsArr.some((v) => v.num >= 2);
-		}
-
-		if (!canUse) {
-			return {
-				canUse: false,
-				reason: "需要购买至少2件相同的商品才能使用"
-			};
-		}
-	}
-
-	// 所有条件都满足
-	return {
-		canUse: true,
-		reason: ""
-	};
+  // 所有条件都满足
+  return {
+    canUse: true,
+    reason: "",
+  };
 }
 
-
 /**
  * 计算抵扣商品金额
  * @param discountGoodsArr 可抵扣商品列表
  * @param discountNum 抵扣数量
  * @param user 用户信息
- * @param {Object} shopInfo 店铺信息 
+ * @param {Object} shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-export function calcDiscountGoodsArrPrice(discountGoodsArr, discountNum, user,shopInfo) {
-	let hasCountNum = 0;
-	let discountPrice = 0;
-	let hasDiscountGoodsArr = [];
-	for (let i = 0; i < discountGoodsArr.length; i++) {
-		if (hasCountNum >= discountNum) {
-			break;
-		}
-		const goods = discountGoodsArr[i];
-		const shengyuNum = discountNum - hasCountNum;
-		const num = Math.min(goods.num, shengyuNum);
-		discountPrice += returnGoodsPrice(goods, user,shopInfo) * num;
-		hasCountNum += num;
-		hasDiscountGoodsArr.push({
-			...goods,
-			num
-		});
-	}
-	return {
-		discountPrice,
-		hasDiscountGoodsArr
-	};
+export function calcDiscountGoodsArrPrice(
+  discountGoodsArr,
+  discountNum,
+  user,
+  shopInfo,limitTimeDiscount
+) {
+  let hasCountNum = 0;
+  let discountPrice = 0;
+  let hasDiscountGoodsArr = [];
+  for (let i = 0; i < discountGoodsArr.length; i++) {
+    if (hasCountNum >= discountNum) {
+      break;
+    }
+    const goods = discountGoodsArr[i];
+    const shengyuNum = discountNum - hasCountNum;
+    const num = Math.min(goods.num, shengyuNum);
+    discountPrice += returnGoodsPrice(goods, user, shopInfo,limitTimeDiscount) * num;
+
+    hasCountNum += num;
+    hasDiscountGoodsArr.push({
+      ...goods,
+      num,
+    });
+  }
+
+  return {
+    discountPrice,
+    hasDiscountGoodsArr,
+  };
 }
 
 /**
@@ -239,23 +351,51 @@ export function calcDiscountGoodsArrPrice(discountGoodsArr, discountNum, user,sh
  * @param user 用户信息
  * @param goodsOrderPrice   商品订单金额
  * @param selCoupon 已选择的优惠券列表
+ * @param shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-export function returnCouponDiscount(arr, coupon, user, goodsOrderPrice, selCoupon) {
-	console.log('arr', arr);
-	const canDikouGoodsArr = returnCanDikouGoodsArr(arr, selCoupon, user);
-	console.log('canDikouGoodsArr', canDikouGoodsArr);
-	if (coupon.type == 2) {
-		return returnCouponProductDiscount(canDikouGoodsArr, coupon, user, goodsOrderPrice);
-	}
-	if (coupon.type == 6) {
-		return returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user, goodsOrderPrice);
-	}
-	if (coupon.type == 4) {
-		return returnSecoendDiscount(canDikouGoodsArr, coupon, user, goodsOrderPrice);
-	}
-	if (coupon.type == 3) {
-		return returnCouponZhekouDiscount(canDikouGoodsArr, coupon, user, goodsOrderPrice, selCoupon);
-	}
+export function returnCouponDiscount(
+  arr,
+  coupon,
+  user,
+  goodsOrderPrice,
+  selCoupon,
+  shopInfo,limitTimeDiscount
+) {
+  arr = returnCanDikouGoods(arr, user, shopInfo);
+  const canDikouGoodsArr = returnCanDikouGoodsArr(arr, selCoupon, user);
+  if (coupon.type == 2) {
+    return returnCouponProductDiscount(
+      canDikouGoodsArr,
+      coupon,
+      user,
+      shopInfo,
+      limitTimeDiscount
+    );
+  }
+  if (coupon.type == 6) {
+    const result = returnCouponBuyOneGiveOneDiscount(
+      canDikouGoodsArr,
+      coupon,
+      user,
+      shopInfo,
+      limitTimeDiscount
+    );
+    return result;
+  }
+  if (coupon.type == 4) {
+    return returnSecoendDiscount(canDikouGoodsArr, coupon, user, shopInfo,limitTimeDiscount);
+  }
+  if (coupon.type == 3) {
+    return returnCouponZhekouDiscount(
+      canDikouGoodsArr,
+      coupon,
+      user,
+      goodsOrderPrice,
+      selCoupon,
+      limitTimeDiscount
+    );
+  }
 }
 
 /**
@@ -265,41 +405,53 @@ export function returnCouponDiscount(arr, coupon, user, goodsOrderPrice, selCoup
  * @param user 用户信息
  * @param goodsOrderPrice   商品订单金额
  * @param selCoupon 已选择的优惠券列表
+ * @param limitTimeDiscount 限时折扣
  *
  */
 export function returnCouponZhekouDiscount(
-	canDikouGoodsArr,
-	coupon,
-	user,
-	goodsOrderPrice,
-	selCoupon
+  canDikouGoodsArr,
+  coupon,
+  user,
+  goodsOrderPrice,
+  selCoupon,limitTimeDiscount
 ) {
-	const {
-		discountRate,
-		maxDiscountAmount
-	} = coupon;
+  const { discountRate, maxDiscountAmount } = coupon;
 
-	const goodsCouponDiscount = selCoupon
-		.filter((v) => v.type == 2)
-		.reduce((prve, cur) => {
-			return prve + cur.discount.discountPrice;
-		}, 0);
-	goodsOrderPrice -= goodsCouponDiscount;
-	// 使用bignumber处理高精度计算
-	// 1. 计算折扣率（百分比转小数）：discountRate / 100
-	const discountRatio = new BigNumber(discountRate).dividedBy(100);
-	// 2. 计算优惠比例：1 - 折扣率（例如：8折的优惠比例是 1 - 0.8 = 0.2）
-	const discountAmountRatio = new BigNumber(1).minus(discountRatio);
-	// 3. 计算折扣金额：商品订单金额 × 优惠比例
-	let discountPrice = new BigNumber(goodsOrderPrice).times(discountAmountRatio).toNumber();
-	if (maxDiscountAmount != 0) {
-		discountPrice = discountPrice >= maxDiscountAmount ? maxDiscountAmount : discountPrice;
-	}
+  // 计算商品优惠券折扣总和，使用BigNumber避免精度问题
+  const goodsCouponDiscount = selCoupon
+    .filter((v) => v.type == 2)
+    .reduce((prve, cur) => {
+      return new BigNumber(prve).plus(
+        new BigNumber(cur.discount.discountPrice)
+      );
+    }, new BigNumber(0));
 
-	return {
-		discountPrice, // 折扣抵扣金额（即优惠的金额）
-		hasDiscountGoodsArr: [],
-	};
+  // 将商品订单价格转换为BigNumber并减去优惠券折扣
+  const adjustedGoodsOrderPrice = new BigNumber(goodsOrderPrice).minus(
+    goodsCouponDiscount
+  );
+
+  // 计算优惠比例：(100 - 折扣率) / 100
+  const discountAmountRatio = new BigNumber(100)
+    .minus(discountRate)
+    .dividedBy(100);
+
+  // 计算折扣金额：调整后的商品订单金额 × 优惠比例
+  let discountPrice = adjustedGoodsOrderPrice
+    .times(discountAmountRatio)
+    .decimalPlaces(2, BigNumber.ROUND_FLOOR)
+    .toNumber();
+
+  // 应用最大折扣金额限制
+  if (maxDiscountAmount !== 0) {
+    discountPrice =
+      discountPrice >= maxDiscountAmount ? maxDiscountAmount : discountPrice;
+  }
+
+  return {
+    discountPrice, // 折扣抵扣金额（即优惠的金额）
+    hasDiscountGoodsArr: [],
+  };
 }
 
 /**
@@ -307,39 +459,45 @@ export function returnCouponZhekouDiscount(
  * @param canDikouGoodsArr 可抵扣商品列表
  * @param coupon 优惠券
  * @param user 用户信息
+ * @param shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-export function returnCouponProductDiscount(canDikouGoodsArr, coupon, user) {
-	const {
-		useFoods,
-		discountNum,
-		useRule
-	} = coupon;
-	//抵扣商品数组
-	let discountGoodsArr = [];
-	//抵扣全部商品
-	if (useFoods.length === 0) {
-		if (useRule == "price_asc") {
-			discountGoodsArr = canDikouGoodsArr
-				.slice(canDikouGoodsArr.length - discountNum, canDikouGoodsArr.length)
-				.reverse();
-		} else {
-			discountGoodsArr = canDikouGoodsArr.slice(0, discountNum);
-		}
-	} else {
-		//抵扣选中商品
-		const discountSelGoodsArr = canDikouGoodsArr.filter((v) =>
-			useFoods.find((food) => food.id == v.productId)
-		);
-		if (useRule == "price_asc") {
-			discountGoodsArr = discountSelGoodsArr
-				.slice(discountSelGoodsArr.length - discountNum, discountSelGoodsArr.length)
-				.reverse();
-		} else {
-			discountGoodsArr = discountSelGoodsArr.slice(0, discountNum);
-		}
-	}
-	const result = calcDiscountGoodsArrPrice(discountGoodsArr, discountNum, user);
-	return result;
+export function returnCouponProductDiscount(
+  canDikouGoodsArr,
+  coupon,
+  user,
+  shopInfo,
+  limitTimeDiscount
+) {
+  const { useFoods, discountNum, useRule } = coupon;
+  //抵扣商品数组
+  let discountGoodsArr = [];
+  //抵扣全部商品
+  if (useFoods.length === 0) {
+    if (useRule == "price_asc") {
+      discountGoodsArr = canDikouGoodsArr.slice(discountNum * -1).reverse();
+    } else {
+      discountGoodsArr = canDikouGoodsArr.slice(0, discountNum);
+    }
+  } else {
+    //抵扣选中商品
+    const discountSelGoodsArr = canDikouGoodsArr.filter((v) =>
+      useFoods.find((food) => food.id == v.productId)
+    );
+    if (useRule == "price_asc") {
+      discountGoodsArr = discountSelGoodsArr.slice(discountNum * -1).reverse();
+    } else {
+      discountGoodsArr = discountSelGoodsArr.slice(0, discountNum);
+    }
+  }
+  const result = calcDiscountGoodsArrPrice(
+    discountGoodsArr,
+    discountNum,
+    user,
+    shopInfo,
+    limitTimeDiscount
+  );
+  return result;
 }
 
 // 返回买一送一券抵扣详情
@@ -348,38 +506,47 @@ export function returnCouponProductDiscount(canDikouGoodsArr, coupon, user) {
  * @param coupon 优惠券
  * @param user 用户信息
  * @param shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-function returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user,shopInfo) {
-	const {
-		useFoods,
-		useRule
-	} = coupon;
-	//抵扣商品
-	let discountGoods = undefined;
-	//符合买一送一条件的商品
-	const canUseGoods = canDikouGoodsArr.filter((v) => v.num >= 2);
-	//抵扣全部商品
-	if (useFoods.length === 0) {
-		if (useRule == "price_asc") {
-			discountGoods = canUseGoods[canUseGoods.length - 1];
-		} else {
-			discountGoods = canUseGoods.slice(0, 1);
-		}
-	} else {
-		//符合抵扣条件的商品
-		const canUseGoods1 = canUseGoods.filter((v) => useFoods.find((food) => food.id == v.productId));
-		if (useRule == "price_asc") {
-			discountGoods = canUseGoods1[canUseGoods1.length - 1];
-		} else {
-			discountGoods = canUseGoods1.slice(0, 1);
-		}
-	}
-	const discountPrice = returnGoodsPrice(discountGoods, user,shopInfo);
-	const hasDiscountGoodsArr = [discountGoods];
-	return {
-		discountPrice,
-		hasDiscountGoodsArr
-	};
+function returnCouponBuyOneGiveOneDiscount(
+  canDikouGoodsArr,
+  coupon,
+  user,
+  shopInfo,limitTimeDiscount
+) {
+  const { useFoods, useRule } = coupon;
+  //抵扣商品
+  let discountGoods = undefined;
+  //符合买一送一条件的商品
+  const canUseGoods = canDikouGoodsArr.filter((v) => v.num >= 2);
+  //抵扣全部商品
+  if (useFoods.length === 0) {
+    if (useRule == "price_asc") {
+      discountGoods = canUseGoods[canUseGoods.length - 1];
+    } else {
+      discountGoods = canUseGoods[0];
+    }
+  } else {
+    //符合抵扣条件的商品
+    const canUseGoods1 = canUseGoods.filter((v) =>
+      useFoods.find((food) => food.id == v.productId)
+    );
+    if (useRule == "price_asc") {
+      discountGoods = canUseGoods1[canUseGoods1.length - 1];
+    } else {
+      discountGoods = canUseGoods1[0];
+    }
+  }
+  let discountPrice = 0;
+  let hasDiscountGoodsArr = [];
+  if (discountGoods) {
+    discountPrice = returnGoodsPrice(discountGoods, user, shopInfo,limitTimeDiscount);
+    hasDiscountGoodsArr = [discountGoods];
+  }
+  return {
+    discountPrice: discountPrice <= 0 ? 0 : discountPrice,
+    hasDiscountGoodsArr,
+  };
 }
 
 /**
@@ -388,39 +555,46 @@ function returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user,shopIn
  * @param coupon 优惠券
  * @param user 用户信息
  * @param shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-function returnSecoendDiscount(canDikouGoodsArr, coupon, user,shopInfo) {
-	const {
-		useFoods,
-		useRule
-	} = coupon;
-	//抵扣商品
-	let discountGoods = undefined;
-	//符合买一送一条件的商品
-	const canUseGoods = canDikouGoodsArr.filter((v) => v.num >= 2);
-	//抵扣全部商品
-	if (useFoods.length === 0) {
-		if (useRule == "price_asc") {
-			discountGoods = canUseGoods[canUseGoods.length - 1];
-		} else {
-			discountGoods = canUseGoods.slice(0, 1);
-		}
-	} else {
-		//符合抵扣条件的商品
-		const canUseGoods1 = canUseGoods.filter((v) => useFoods.find((food) => food.id == v.productId));
-		if (useRule == "price_asc") {
-			discountGoods = canUseGoods1[canUseGoods1.length - 1];
-		} else {
-			discountGoods = canUseGoods1.slice(0, 1);
-		}
-	}
-	const discountPrice = returnGoodsPrice(discountGoods, user,shopInfo);
-	const hasDiscountGoodsArr = [discountGoods];
-	//返回半价价格
-	return {
-		discountPrice: new BigNumber(discountPrice).dividedBy(2).toNumber(),
-		hasDiscountGoodsArr,
-	};
+function returnSecoendDiscount(canDikouGoodsArr, coupon, user, shopInfo,limitTimeDiscount) {
+  const { useFoods, useRule } = coupon;
+  //抵扣商品
+  let discountGoods = undefined;
+  //符合条件的商品
+  const canUseGoods = canDikouGoodsArr.filter((v) => v.num >= 2);
+  //抵扣全部商品
+  if (useFoods.length === 0) {
+    if (useRule == "price_asc") {
+      discountGoods = canUseGoods[canUseGoods.length - 1];
+    } else {
+      discountGoods = canUseGoods[0];
+    }
+  } else {
+    //符合抵扣条件的商品
+    const canUseGoods1 = canUseGoods.filter((v) =>
+      useFoods.find((food) => food.id == v.productId)
+    );
+    if (useRule == "price_asc") {
+      discountGoods = canUseGoods1[canUseGoods1.length - 1];
+    } else {
+      discountGoods = canUseGoods1[0];
+    }
+  }
+  let discountPrice = 0;
+  let hasDiscountGoodsArr = [];
+  if (discountGoods) {
+    discountPrice = returnGoodsPrice(discountGoods, user, shopInfo,limitTimeDiscount);
+    hasDiscountGoodsArr = [discountGoods];
+  }
+  //返回半价价格
+  return {
+    discountPrice:
+      discountPrice <= 0
+        ? 0
+        : new BigNumber(discountPrice).dividedBy(2).toNumber(),
+    hasDiscountGoodsArr,
+  };
 }
 
 /**
@@ -428,17 +602,21 @@ function returnSecoendDiscount(canDikouGoodsArr, coupon, user,shopInfo) {
  * @param arr 商品列表
  * @param user 用户信息
  * @param shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-export function returnCanDikouGoods(arr, user, shopInfo) {
-	const result = arr
-		.filter((v) => {
-			return v.is_temporary != 1 && v.is_gift != 1;
-		})
-		.filter((v) => {
-			return v.num > 0;
-		})
-		.sort((a, b) => {
-			return returnGoodsPrice(b, use, shopInfo) - returnGoodsPrice(a, user, shopInfo);
-		});
-	return result;
-}
\ No newline at end of file
+export function returnCanDikouGoods(arr, user, shopInfo,limitTimeDiscount) {
+  const result = arr
+    .filter((v) => {
+      return v.is_temporary != 1 && v.is_gift != 1;
+    })
+    .filter((v) => {
+      return v.num > 0;
+    })
+    .sort((a, b) => {
+      return (
+        returnGoodsPrice(b, user, shopInfo,limitTimeDiscount) -
+        returnGoodsPrice(a, user, shopInfo,limitTimeDiscount)
+      );
+    });
+  return result;
+}
diff --git a/utils/goods-utils.js b/utils/goods-utils.js
index cb454ab..37a8114 100644
--- a/utils/goods-utils.js
+++ b/utils/goods-utils.js
@@ -5,19 +5,45 @@ import _ from "lodash";
  * 返回商品单价
  * @param goods 商品
  * @param user 用户信息
- * @param {Object} shopInfo
+ * @param {Object} shopInfo 店铺信息
+ * @param {boolean} limitTimeDiscount - 限时折扣
  */
-export function returnGoodsPrice(goods, user, shopInfo) {
+export function returnGoodsPrice(goods, user, shopInfo, limitTimeDiscount) {
   if (!goods) {
     return 0;
   }
+  //是否可以使用会员价
+  const canUseVipPrice =
+    user && user.isVip && user.isMemberPrice && goods.memberPrice * 1 > 0 && shopInfo && shopInfo.isMemberPrice;
+  // 商家改价
   if (goods.discount_sale_amount * 1 > 0) {
-    return goods.discount_sale_amount;
-  }
-  if (shopInfo && !shopInfo.isMemberPrice) {
     return goods.salePrice;
   }
-  if (user.isVip && goods.memberPrice * 1 <= goods.salePrice * 1 && goods.memberPrice * 1 > 0) {
+  // 限时折扣
+  if (limitTimeDiscount && limitTimeDiscount.id) {
+    const canUseFoods = limitTimeDiscount.foods.split(",");
+    const canUseLimit =
+      limitTimeDiscount.foodType == 1 ||
+      canUseFoods.includes(`${goods.productId}`);
+    if (canUseLimit && limitTimeDiscount.discountPriority == "limit-time") {
+      return new BigNumber(goods.salePrice)
+        .times(limitTimeDiscount.discountRate / 100)
+        .decimalPlaces(2, BigNumber.ROUND_UP)
+        .toNumber();
+    }
+
+    if (canUseLimit && limitTimeDiscount.discountPriority == "vip-price") {
+      if (canUseVipPrice) {
+        return goods.memberPrice;
+      } else {
+        return new BigNumber(goods.salePrice)
+          .times(limitTimeDiscount.discountRate / 100)
+          .decimalPlaces(2, BigNumber.ROUND_UP)
+          .toNumber();
+      }
+    }
+  }
+  if (canUseVipPrice) {
     return goods.memberPrice;
   }
   return goods.salePrice;
@@ -63,18 +89,23 @@ export function returnCoupType(coupon) {
  * @param selCoupon 已选择的优惠券列表
  * @param user 用户信息
  */
-export function returnCanDikouGoodsArr(canDikouGoodsArr, selCoupon, user) {
+export function returnCanDikouGoodsArr(args) {
+  const { canDikouGoodsArr, selCoupon, user, shopInfo, limitTimeDiscount } =
+    args;
   const types = [2, 4, 6];
   // 收集已抵扣商品并关联对应的优惠券类型
   const goodsCouponGoods = selCoupon
     .filter((v) => types.includes(v.type))
     .reduce((prev, cur) => {
       // 给每个抵扣商品添加所属优惠券类型
-      const goodsWithType = cur.discount.hasDiscountGoodsArr.map((goods) => ({
-        ...goods,
-        couponType: cur.type, // 记录该商品是被哪种类型的优惠券抵扣的
-      }));
-      prev.push(...goodsWithType);
+      if(cur&&cur.discount){
+        const goodsWithType = cur.discount.hasDiscountGoodsArr.map((goods) => ({
+          ...goods,
+          couponType: cur.type, // 记录该商品是被哪种类型的优惠券抵扣的
+        }));
+        prev.push(...goodsWithType);
+      }
+  
       return prev;
     }, []);
   const arr = _.cloneDeep(canDikouGoodsArr)
@@ -92,11 +123,60 @@ export function returnCanDikouGoodsArr(canDikouGoodsArr, selCoupon, user) {
       }
       return v;
     })
-    .filter((v) => v.num > 0); // 过滤掉数量<=0的商品
+    .filter((v) => {
+      const canUseNum = v.num - (v.returnNum || 0);
+      if (canUseNum <= 0 || v.is_temporary == 1 || v.is_gift == 1) {
+        return false;
+      }
+
+      return true;
+    }); // 过滤掉数量<=0的商品,赠菜，临时菜
 
   return arr;
 }
 
+/**
+ * 返回商品是否享用了会员价/会员折扣
+ * @param {*} goods
+ */
+function returnGoodsIsUseVipPrice(shopInfo, user, goods) {
+  if (goods.is_time_discount) {
+    return false;
+  }
+  if (shopInfo.isMemberPrice != 1 || user.isVip != 1) {
+    return false;
+  }
+  if (shopInfo.isMemberPrice == 1 && user.isVip == 1) {
+    if (goods.memberPrice <= 0) {
+      return false;
+    }
+    return true;
+  }
+}
+
+/**
+ * 返回可以计算抵扣金额的商品列表
+ */
+function returnCanCalcGoodsList(canCalcGoodsArr, coupon, shopInfo, user) {
+  return canCalcGoodsArr.filter((goods) => {
+    console.log("goods");
+    console.log(goods);
+    if (
+      !coupon.discountShare &&
+      (goods.is_time_discount || goods.isTimeDiscount)
+    ) {
+      return false;
+    }
+    if (
+      !coupon.vipPriceShare &&
+      returnGoodsIsUseVipPrice(shopInfo, user, goods)
+    ) {
+      return false;
+    }
+    return true;
+  });
+}
+
 /**
  * 判断优惠券是否可使用，并返回不可用原因
  *
@@ -111,10 +191,20 @@ export function returnCanDikouGoodsArr(canDikouGoodsArr, selCoupon, user) {
  * @param {Object} args.user - 用户信息对象
  * @param {Object} args.selCoupon - 已经选择的优惠券信息对象
  * @param {Object} args.shopInfo
+ * @param {boolean} args.limitTimeDiscount - 限时折扣
  * @returns {Object} - { canUse: boolean, reason: string } 可用状态及不可用原因
  */
 export function returnCouponCanUse(args) {
-  let { canDikouGoodsArr, coupon, goodsOrderPrice, user, selCoupon, shopInfo } = args;
+  let {
+    canDikouGoodsArr,
+    coupon,
+    goodsOrderPrice,
+    user,
+    selCoupon,
+    shopInfo,
+    isMemberPrice,
+    limitTimeDiscount,
+  } = args;
   // 优惠券未启用
   if (!coupon.use) {
     return {
@@ -122,10 +212,27 @@ export function returnCouponCanUse(args) {
       reason: coupon.noUseRestrictions || "不在可用时间段内",
     };
   }
+  if (
+    limitTimeDiscount &&
+    limitTimeDiscount.id &&
+    limitTimeDiscount.foodType == 1 &&
+    !coupon.discountShare
+  ) {
+    return {
+      canUse: false,
+      reason: coupon.noUseRestrictions || "不可与限时折扣同享",
+    };
+  }
 
   // 计算门槛金额
   let fullAmount = goodsOrderPrice;
-  canDikouGoodsArr = returnCanDikouGoodsArr(canDikouGoodsArr, selCoupon, user, shopInfo);
+  canDikouGoodsArr = returnCanDikouGoodsArr({
+    canDikouGoodsArr,
+    selCoupon,
+    user,
+    shopInfo,
+    limitTimeDiscount,
+  });
   //优惠券指定门槛商品列表
   let canCalcGoodsArr = [...canDikouGoodsArr];
   //部分商品参与门槛计算
@@ -133,10 +240,20 @@ export function returnCouponCanUse(args) {
     canCalcGoodsArr = canDikouGoodsArr.filter((v) => {
       return coupon.thresholdFoods.find((food) => food.id == v.productId);
     });
-    fullAmount = canCalcGoodsArr.reduce((pre, cur) => {
-      return pre + returnGoodsPrice(cur, user, shopInfo) * cur.num;
-    }, 0);
   }
+  canCalcGoodsArr = returnCanCalcGoodsList(
+    canCalcGoodsArr,
+    coupon,
+    shopInfo,
+    user
+  );
+  console.log("canCalcGoodsArr");
+  console.log(canCalcGoodsArr);
+  fullAmount = canCalcGoodsArr.reduce((pre, cur) => {
+    return (
+      pre + returnGoodsPrice(cur, user, shopInfo, limitTimeDiscount) * cur.num
+    );
+  }, 0);
 
   // 是否全部商品可用
   const isDikouAll = coupon.useFoods.length === 0;
@@ -147,12 +264,12 @@ export function returnCouponCanUse(args) {
       return coupon.useFoods.find((food) => food.id == v.productId);
     });
   }
-  if (user.isVip && !coupon.vipPriceShare) {
-    return {
-      canUse: false,
-      reason: "非会员可用",
-    };
-  }
+  // if (user.isVip && !coupon.vipPriceShare) {
+  //   return {
+  //     canUse: false,
+  //     reason: "非会员可用",
+  //   };
+  // }
   if (selCoupon.length > 0 && !selCoupon[0].otherCouponShare) {
     return {
       canUse: false,
@@ -181,17 +298,8 @@ export function returnCouponCanUse(args) {
       };
     }
   }
-
   // 商品兑换券，第二件半价和买一送一判断是否有可用商品
   if ([2, 4, 5].includes(coupon.type)) {
-    console.log("商品兑换券", fullAmount, coupon.fullAmount);
-    if (coupon.type == 2 && fullAmount < coupon.fullAmount) {
-      console.log("商品兑换券", coupon);
-      return {
-        canUse: false,
-        reason: `满${coupon.fullAmount}元可用，当前可参与金额${fullAmount}元`,
-      };
-    }
     // 没有符合条件的商品
     if (isDikouAll && canDikouGoodsArr.length === 0) {
       return {
@@ -205,6 +313,20 @@ export function returnCouponCanUse(args) {
         reason: "没有符合条件的商品",
       };
     }
+    if (coupon.type == 2) {
+      if (canCalcGoodsArr.length <= 0) {
+        return {
+          canUse: false,
+          reason: "没有符合计算门槛条件的商品",
+        };
+      }
+      if (fullAmount < coupon.fullAmount) {
+        return {
+          canUse: false,
+          reason: `满${coupon.fullAmount}元可用，当前可参与金额${fullAmount}元`,
+        };
+      }
+    }
   }
   //商品兑换券是否达到门槛金额
   if (coupon.type == 2 && goodsOrderPrice < coupon.fullAmount) {
@@ -219,8 +341,8 @@ export function returnCouponCanUse(args) {
     let canUse = false;
     if (isDikouAll) {
       canUse = canDikouGoodsArr.some((v) => v.num >= 2);
-    } else if (canCalcGoodsArr.length > 0) {
-      canUse = canCalcGoodsArr.some((v) => v.num >= 2);
+    } else if (canUseGoodsArr.length > 0) {
+      canUse = canUseGoodsArr.some((v) => v.num >= 2);
     }
 
     if (!canUse) {
@@ -236,10 +358,9 @@ export function returnCouponCanUse(args) {
     let canUse = false;
     if (isDikouAll) {
       canUse = canDikouGoodsArr.some((v) => v.num >= 2);
-    } else if (canCalcGoodsArr.length > 0) {
-      canUse = canCalcGoodsArr.some((v) => v.num >= 2);
+    } else if (canUseGoodsArr.length > 0) {
+      canUse = canUseGoodsArr.some((v) => v.num >= 2);
     }
-
     if (!canUse) {
       return {
         canUse: false,
@@ -261,11 +382,19 @@ export function returnCouponCanUse(args) {
  * @param discountNum 抵扣数量
  * @param user 用户信息
  * @param {Object} shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-export function calcDiscountGoodsArrPrice(discountGoodsArr, discountNum, user, shopInfo) {
+export function calcDiscountGoodsArrPrice(
+  discountGoodsArr,
+  discountNum,
+  user,
+  shopInfo,
+  limitTimeDiscount
+) {
   let hasCountNum = 0;
   let discountPrice = 0;
   let hasDiscountGoodsArr = [];
+
   for (let i = 0; i < discountGoodsArr.length; i++) {
     if (hasCountNum >= discountNum) {
       break;
@@ -273,7 +402,14 @@ export function calcDiscountGoodsArrPrice(discountGoodsArr, discountNum, user, s
     const goods = discountGoodsArr[i];
     const shengyuNum = discountNum - hasCountNum;
     const num = Math.min(goods.num, shengyuNum);
-    discountPrice += returnGoodsPrice(goods, user, shopInfo) * num;
+    const realPrice = returnGoodsPrice(
+      goods,
+      user,
+      shopInfo,
+      limitTimeDiscount
+    );
+
+    discountPrice += realPrice * num;
 
     hasCountNum += num;
     hasDiscountGoodsArr.push({
@@ -296,21 +432,62 @@ export function calcDiscountGoodsArrPrice(discountGoodsArr, discountNum, user, s
  * @param goodsOrderPrice   商品订单金额
  * @param selCoupon 已选择的优惠券列表
  * @param shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-export function returnCouponDiscount(arr, coupon, user, goodsOrderPrice, selCoupon, shopInfo) {
-  const canDikouGoodsArr = returnCanDikouGoodsArr(arr, selCoupon, user);
+export function returnCouponDiscount(
+  arr,
+  coupon,
+  user,
+  goodsOrderPrice,
+  selCoupon,
+  shopInfo,
+  limitTimeDiscount
+) {
+  arr = returnCanDikouGoods(arr, user, shopInfo,limitTimeDiscount);
+  const canDikouGoodsArr = returnCanDikouGoodsArr({
+    canDikouGoodsArr: arr,
+    selCoupon,
+    user,
+    shopInfo,
+    limitTimeDiscount,
+  });
   if (coupon.type == 2) {
-    return returnCouponProductDiscount(canDikouGoodsArr, coupon, user, shopInfo);
+    return returnCouponProductDiscount(
+      canDikouGoodsArr,
+      coupon,
+      user,
+      shopInfo,
+      limitTimeDiscount
+    );
   }
   if (coupon.type == 6) {
-    const result = returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user, shopInfo);
+    const result = returnCouponBuyOneGiveOneDiscount(
+      canDikouGoodsArr,
+      coupon,
+      user,
+      shopInfo,
+      limitTimeDiscount
+    );
     return result;
   }
   if (coupon.type == 4) {
-    return returnSecoendDiscount(canDikouGoodsArr, coupon, user, shopInfo);
+    return returnSecoendDiscount(
+      canDikouGoodsArr,
+      coupon,
+      user,
+      shopInfo,
+      limitTimeDiscount
+    );
   }
   if (coupon.type == 3) {
-    return returnCouponZhekouDiscount(canDikouGoodsArr, coupon, user, goodsOrderPrice, selCoupon);
+    return returnCouponZhekouDiscount(
+      canDikouGoodsArr,
+      coupon,
+      user,
+      goodsOrderPrice,
+      selCoupon,
+      limitTimeDiscount
+    );
   }
 }
 
@@ -321,6 +498,7 @@ export function returnCouponDiscount(arr, coupon, user, goodsOrderPrice, selCoup
  * @param user 用户信息
  * @param goodsOrderPrice   商品订单金额
  * @param selCoupon 已选择的优惠券列表
+ * @param limitTimeDiscount 限时折扣
  *
  */
 export function returnCouponZhekouDiscount(
@@ -328,7 +506,8 @@ export function returnCouponZhekouDiscount(
   coupon,
   user,
   goodsOrderPrice,
-  selCoupon
+  selCoupon,
+  limitTimeDiscount
 ) {
   const { discountRate, maxDiscountAmount } = coupon;
 
@@ -336,14 +515,20 @@ export function returnCouponZhekouDiscount(
   const goodsCouponDiscount = selCoupon
     .filter((v) => v.type == 2)
     .reduce((prve, cur) => {
-      return new BigNumber(prve).plus(new BigNumber(cur.discount.discountPrice));
+      return new BigNumber(prve).plus(
+        new BigNumber(cur.discount.discountPrice)
+      );
     }, new BigNumber(0));
 
   // 将商品订单价格转换为BigNumber并减去优惠券折扣
-  const adjustedGoodsOrderPrice = new BigNumber(goodsOrderPrice).minus(goodsCouponDiscount);
+  const adjustedGoodsOrderPrice = new BigNumber(goodsOrderPrice).minus(
+    goodsCouponDiscount
+  );
 
   // 计算优惠比例：(100 - 折扣率) / 100
-  const discountAmountRatio = new BigNumber(100).minus(discountRate).dividedBy(100);
+  const discountAmountRatio = new BigNumber(100)
+    .minus(discountRate)
+    .dividedBy(100);
 
   // 计算折扣金额：调整后的商品订单金额 × 优惠比例
   let discountPrice = adjustedGoodsOrderPrice
@@ -353,7 +538,8 @@ export function returnCouponZhekouDiscount(
 
   // 应用最大折扣金额限制
   if (maxDiscountAmount !== 0) {
-    discountPrice = discountPrice >= maxDiscountAmount ? maxDiscountAmount : discountPrice;
+    discountPrice =
+      discountPrice >= maxDiscountAmount ? maxDiscountAmount : discountPrice;
   }
 
   return {
@@ -368,11 +554,20 @@ export function returnCouponZhekouDiscount(
  * @param coupon 优惠券
  * @param user 用户信息
  * @param shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-export function returnCouponProductDiscount(canDikouGoodsArr, coupon, user, shopInfo) {
+export function returnCouponProductDiscount(
+  canDikouGoodsArr,
+  coupon,
+  user,
+  shopInfo,
+  limitTimeDiscount
+) {
   const { useFoods, discountNum, useRule } = coupon;
+  
   //抵扣商品数组
   let discountGoodsArr = [];
+
   //抵扣全部商品
   if (useFoods.length === 0) {
     if (useRule == "price_asc") {
@@ -391,7 +586,15 @@ export function returnCouponProductDiscount(canDikouGoodsArr, coupon, user, shop
       discountGoodsArr = discountSelGoodsArr.slice(0, discountNum);
     }
   }
-  const result = calcDiscountGoodsArrPrice(discountGoodsArr, discountNum, user, shopInfo);
+ 
+
+  const result = calcDiscountGoodsArrPrice(
+    discountGoodsArr,
+    discountNum,
+    user,
+    shopInfo,
+    limitTimeDiscount
+  );
   return result;
 }
 
@@ -401,8 +604,15 @@ export function returnCouponProductDiscount(canDikouGoodsArr, coupon, user, shop
  * @param coupon 优惠券
  * @param user 用户信息
  * @param shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-function returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user, shopInfo) {
+function returnCouponBuyOneGiveOneDiscount(
+  canDikouGoodsArr,
+  coupon,
+  user,
+  shopInfo,
+  limitTimeDiscount
+) {
   const { useFoods, useRule } = coupon;
   //抵扣商品
   let discountGoods = undefined;
@@ -417,7 +627,9 @@ function returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user, shopI
     }
   } else {
     //符合抵扣条件的商品
-    const canUseGoods1 = canUseGoods.filter((v) => useFoods.find((food) => food.id == v.productId));
+    const canUseGoods1 = canUseGoods.filter((v) =>
+      useFoods.find((food) => food.id == v.productId)
+    );
     if (useRule == "price_asc") {
       discountGoods = canUseGoods1[canUseGoods1.length - 1];
     } else {
@@ -426,9 +638,13 @@ function returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user, shopI
   }
   let discountPrice = 0;
   let hasDiscountGoodsArr = [];
-  console.log("returnCouponBuyOneGiveOneDiscount:discountGoods", discountGoods);
   if (discountGoods) {
-    discountPrice = returnGoodsPrice(discountGoods, user, shopInfo);
+    discountPrice = returnGoodsPrice(
+      discountGoods,
+      user,
+      shopInfo,
+      limitTimeDiscount
+    );
     hasDiscountGoodsArr = [discountGoods];
   }
   return {
@@ -443,8 +659,15 @@ function returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user, shopI
  * @param coupon 优惠券
  * @param user 用户信息
  * @param shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-function returnSecoendDiscount(canDikouGoodsArr, coupon, user, shopInfo) {
+function returnSecoendDiscount(
+  canDikouGoodsArr,
+  coupon,
+  user,
+  shopInfo,
+  limitTimeDiscount
+) {
   const { useFoods, useRule } = coupon;
   //抵扣商品
   let discountGoods = undefined;
@@ -459,7 +682,9 @@ function returnSecoendDiscount(canDikouGoodsArr, coupon, user, shopInfo) {
     }
   } else {
     //符合抵扣条件的商品
-    const canUseGoods1 = canUseGoods.filter((v) => useFoods.find((food) => food.id == v.productId));
+    const canUseGoods1 = canUseGoods.filter((v) =>
+      useFoods.find((food) => food.id == v.productId)
+    );
     if (useRule == "price_asc") {
       discountGoods = canUseGoods1[canUseGoods1.length - 1];
     } else {
@@ -469,12 +694,20 @@ function returnSecoendDiscount(canDikouGoodsArr, coupon, user, shopInfo) {
   let discountPrice = 0;
   let hasDiscountGoodsArr = [];
   if (discountGoods) {
-    discountPrice = returnGoodsPrice(discountGoods, user, shopInfo);
+    discountPrice = returnGoodsPrice(
+      discountGoods,
+      user,
+      shopInfo,
+      limitTimeDiscount
+    );
     hasDiscountGoodsArr = [discountGoods];
   }
   //返回半价价格
   return {
-    discountPrice: discountPrice <= 0 ? 0 : new BigNumber(discountPrice).dividedBy(2).toNumber(),
+    discountPrice:
+      discountPrice <= 0
+        ? 0
+        : new BigNumber(discountPrice).dividedBy(2).toNumber(),
     hasDiscountGoodsArr,
   };
 }
@@ -484,8 +717,9 @@ function returnSecoendDiscount(canDikouGoodsArr, coupon, user, shopInfo) {
  * @param arr 商品列表
  * @param user 用户信息
  * @param shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-export function returnCanDikouGoods(arr, user, shopInfo) {
+export function returnCanDikouGoods(arr, user, shopInfo, limitTimeDiscount) {
   const result = arr
     .filter((v) => {
       return v.is_temporary != 1 && v.is_gift != 1;
@@ -494,7 +728,10 @@ export function returnCanDikouGoods(arr, user, shopInfo) {
       return v.num > 0;
     })
     .sort((a, b) => {
-      return returnGoodsPrice(b, user, shopInfo) - returnGoodsPrice(a, user, shopInfo);
+      return (
+        returnGoodsPrice(b, user, shopInfo, limitTimeDiscount) -
+        returnGoodsPrice(a, user, shopInfo, limitTimeDiscount)
+      );
     });
   return result;
 }
diff --git a/utils/goods.ts b/utils/goods.ts
new file mode 100644
index 0000000..e693399
--- /dev/null
+++ b/utils/goods.ts
@@ -0,0 +1,1709 @@
+import { BigNumber } from "bignumber.js";
+
+// 配置BigNumber精度
+BigNumber.set({
+  DECIMAL_PLACES: 2,
+  ROUNDING_MODE: BigNumber.ROUND_DOWN, // 向下取整，符合业务需求
+});
+
+/**
+ * 购物车订单价格计算公共库
+ * 功能：覆盖订单全链路费用计算（商品价格、优惠券、积分、餐位费等），支持策略扩展
+ * 小数处理：使用bignumber.js确保精度，统一舍去小数点后两位（如 10.129 → 10.12，15.998 → 15.99）
+ * 扩展设计：优惠券/营销活动采用策略模式，新增类型仅需扩展策略，无需修改核心逻辑
+ * 关键规则：
+ * - 所有优惠券均支持指定门槛商品（后端foods字段：空字符串=全部商品，ID字符串=指定商品ID）
+ * - 与限时折扣/会员价同享规则：开启则门槛计算含对应折扣，关闭则用原价/非会员价
+ * 字段说明：
+ * - BaseCartItem.id：购物车项ID（唯一标识购物车中的条目）
+ * - BaseCartItem.product_id：商品ID（唯一标识商品，用于优惠券/活动匹配）
+ * - BaseCartItem.skuData.id：SKU ID（唯一标识商品规格）
+ */
+
+// ============================ 1. 基础类型定义（核心修正：明确ID含义） ============================
+/** 商品类型枚举 */
+export enum GoodsType {
+  NORMAL = "normal", // 普通商品
+  WEIGHT = "weight", // 称重商品
+  GIFT = "gift", // 赠菜（继承普通商品逻辑，标记用）
+  EMPTY = "", // 空字符串类型（后端未返回时默认归类为普通商品）
+  PACKAGE = "package", // 打包商品（如套餐/预打包商品，按普通商品逻辑处理，可扩展特殊规则）
+}
+
+/** 优惠券计算结果类型（新增细分字段） */
+interface CouponResult {
+  deductionAmount: number; // 抵扣金额
+  excludedProductIds: string[]; // 不适用商品ID列表（注意：是商品ID，非购物车ID）
+  usedCoupon: Coupon | undefined; // 实际使用的优惠券
+  productCouponDeduction: number; // 新增：商品优惠券抵扣（兑换券等）
+  fullCouponDeduction: number; // 新增：满减优惠券抵扣
+}
+
+/** 兑换券计算结果类型（新增细分字段） */
+interface ExchangeCalculationResult {
+  deductionAmount: number;
+  excludedProductIds: string[]; // 不适用商品ID列表（商品ID）
+  productCouponDeduction: number; // 新增：兑换券属于商品券，同步记录
+}
+
+/** 优惠券类型枚举 */
+export enum CouponType {
+  FULL_REDUCTION = "full_reduction", // 满减券
+  DISCOUNT = "discount", // 折扣券
+  SECOND_HALF = "second_half", // 第二件半价券
+  BUY_ONE_GET_ONE = "buy_one_get_one", // 买一送一券
+  EXCHANGE = "exchange", // 商品兑换券
+}
+
+/** 后端返回的优惠券原始字段类型 */
+export interface BackendCoupon {
+  id?: number; // 自增主键（int64）
+  shopId?: number; // 店铺ID（int64）
+  syncId?: number; // 同步Id（int64）
+  type?: number; // 优惠券类型：1-满减券，2-商品兑换券，3-折扣券，4-第二件半价券，5-消费送券，6-买一送一券，7-固定价格券，8-免配送费券
+  name?: string; // 券名称
+  useShopType?: string; // 可用门店类型：only-仅本店；all-所有门店，custom-指定门店
+  useShops?: string; // 可用门店（逗号分隔字符串，如"1,2,3"）
+  useType?: string; // 可使用类型：dine堂食/pickup自取/deliv配送/express快递
+  validType?: string; // 有效期类型：fixed（固定时间），custom（自定义时间）
+  validDays?: number; // 有效期(天)
+  validStartTime?: string; // 有效期开始时间（如"2024-01-01 00:00:00"）
+  validEndTime?: string; // 有效期结束时间
+  daysToTakeEffect?: number; // 隔天生效
+  useDays?: string; // 可用周期（如"周一,周二"）
+  useTimeType?: string; // 可用时间段类型：all-全时段，custom-指定时段
+  useStartTime?: string; // 可用开始时间（每日）
+  useEndTime?: string; // 可用结束时间（每日）
+  getType?: string; // 发放设置：不可自行领取/no，可领取/yes
+  getMode?: string; // 用户领取方式
+  giveNum?: number; // 总发放数量，-10086为不限量
+  getUserType?: string; // 可领取用户：全部/all，新用户一次/new，仅会员/vip
+  getLimit?: number; // 每人领取限量，-10086为不限量
+  useLimit?: number; // 每人每日使用限量，-10086为不限量
+  discountShare?: number; // 与限时折扣同享：0-否，1-是
+  vipPriceShare?: number; // 与会员价同享：0-否，1-是
+  ruleDetails?: string; // 附加规则说明
+  status?: number; // 状态：0-禁用，1-启用
+  useNum?: number; // 已使用数量
+  leftNum?: number; // 剩余数量
+  foods?: string; // 指定门槛商品（逗号分隔字符串，如"101,102"，此处为商品ID）
+  fullAmount?: number; // 使用门槛：满多少金额（元）
+  discountAmount?: number; // 使用门槛：减多少金额（元）
+  discountRate?: number; // 折扣%（如90=9折）
+  maxDiscountAmount?: number; // 可抵扣最大金额（元）
+  useRule?: string; // 使用规则：price_asc-价格低到高，price_desc-高到低
+  discountNum?: number; // 抵扣数量
+  otherCouponShare?: number; // 与其它优惠共享：0-否，1-是
+  createTime?: string; // 创建时间
+  updateTime?: string; // 更新时间
+}
+
+/** 营销活动类型枚举 */
+export enum ActivityType {
+  TIME_LIMIT_DISCOUNT = "time_limit_discount", // 限时折扣
+}
+
+/** 基础购物车商品项（核心修正：新增product_id，明确各ID含义） */
+export interface BaseCartItem {
+  id: string | number; // 购物车ID（唯一标识购物车中的条目，如购物车项主键）
+  product_id: string | number; // 商品ID（唯一标识商品，用于优惠券/活动匹配，必选）
+  salePrice: number; // 商品原价（元）
+  number: number; // 商品数量
+  product_type: GoodsType; // 商品类型
+  is_temporary?: boolean; // 是否临时菜（默认false）
+  is_gift?: boolean; // 是否赠菜（默认false）
+  returnNum?: number; // 退货数量（历史订单用，默认0）
+  memberPrice?: number; // 商品会员价（元，优先级：商品会员价 > 会员折扣）
+  discountSaleAmount?: number; // 商家改价后单价（元，优先级最高）
+  packFee?: number; // 单份打包费（元，默认0）
+  packNumber?: number; // 堂食打包数量（默认0）
+  activityInfo?: {
+    // 商品参与的营销活动（如限时折扣）
+    type: ActivityType;
+    discountRate: number; // 折扣率（如0.8=8折）
+    vipPriceShare: boolean; // 是否与会员优惠同享（默认false）
+  };
+  skuData?: {
+    // SKU扩展数据（可选）
+    id: string | number; // SKU ID（唯一标识商品规格，如颜色/尺寸）
+    memberPrice?: number; // SKU会员价
+    salePrice?: number; // SKU原价
+  };
+}
+
+/** 基础优惠券接口（所有券类型继承，包含统一门槛商品字段） */
+export interface BaseCoupon {
+  id: string | number; // 优惠券ID
+  type: CouponType; // 工具库字符串枚举（由后端couponType转换）
+  name: string; // 对应后端title
+  available: boolean; // 基于BackendCoupon字段计算的可用性
+  useShopType?: string; // only-仅本店；all-所有门店，custom-指定门店
+  useShops: string[]; // 可用门店ID列表
+  discountShare: boolean; // 与限时折扣同享：0-否，1-是（后端字段转换为布尔值）
+  vipPriceShare: boolean; // 与会员价同享：0-否，1-是（后端字段转换为布尔值）
+  useType?: string[]; // 可使用类型：dine堂食/pickup自取/deliv配送/express快递
+  isValid: boolean; // 是否在有效期内
+  discountAmount?: number; // 减免金额 (满减券有)
+  fullAmount?: number; // 使用门槛：满多少金额
+  maxDiscountAmount?: number; // 可抵扣最大金额 元
+  applicableProductIds: string[]; // 门槛商品ID列表（空数组=全部商品，非空=指定商品ID）
+}
+
+/** 满减券（适配后端字段） */
+export interface FullReductionCoupon extends BaseCoupon {
+  type: CouponType.FULL_REDUCTION;
+  fullAmount: number; // 对应后端fullAmount（满减门槛）
+  discountAmount: number; // 对应后端discountAmount（减免金额）
+  maxDiscountAmount?: number; // 对应后端maxDiscountAmount（最大减免）
+}
+
+/** 折扣券（适配后端字段） */
+export interface DiscountCoupon extends BaseCoupon {
+  type: CouponType.DISCOUNT;
+  discountRate: number; // 后端discountRate（%）转小数（如90→0.9）
+  maxDiscountAmount: number; // 对应后端maxDiscountAmount（最大减免）
+}
+
+/** 第二件半价券（适配后端字段） */
+export interface SecondHalfPriceCoupon extends BaseCoupon {
+  type: CouponType.SECOND_HALF;
+  maxUseCountPerOrder?: number; // 对应后端useLimit（-10086=不限）
+}
+
+/** 买一送一券（适配后端字段） */
+export interface BuyOneGetOneCoupon extends BaseCoupon {
+  type: CouponType.BUY_ONE_GET_ONE;
+  maxUseCountPerOrder?: number; // 对应后端useLimit（-10086=不限）
+}
+
+/** 商品兑换券（适配后端字段） */
+export interface ExchangeCoupon extends BaseCoupon {
+  type: CouponType.EXCHANGE;
+  deductCount: number; // 对应后端discountNum（抵扣数量）
+  sortRule: "low_price_first" | "high_price_first"; // 后端useRule转换
+}
+
+/** 所有优惠券类型联合 */
+export type Coupon =
+  | FullReductionCoupon
+  | DiscountCoupon
+  | SecondHalfPriceCoupon
+  | BuyOneGetOneCoupon
+  | ExchangeCoupon;
+
+/** 营销活动配置（如限时折扣，applicableProductIds为商品ID列表） */
+export interface ActivityConfig {
+  type: ActivityType;
+  applicableProductIds?: string[]; // 适用商品ID列表（与BaseCartItem.product_id匹配）
+  discountRate: number; // 折扣率（如0.8=8折）
+  vipPriceShare: boolean; // 是否与会员优惠同享
+}
+
+/** 积分抵扣规则 */
+export interface PointDeductionRule {
+  pointsPerYuan: number; // X积分=1元（如100=100积分抵1元）
+  maxDeductionAmount?: number; // 最大抵扣金额（元，默认不限）
+}
+
+/** 餐位费配置 */
+export interface SeatFeeConfig {
+  pricePerPerson: number; // 每人餐位费（元）
+  personCount: number; // 用餐人数（默认1）
+  isEnabled: boolean; // 是否启用餐位费（默认false）
+}
+/** 商家减免类型枚举 */
+export enum MerchantReductionType {
+  FIXED_AMOUNT = "fixed_amount", // 固定金额减免（如直接减 10 元）
+  DISCOUNT_RATE = "discount_rate", // 比例折扣减免（如打 9 折，即减免 10%）
+}
+
+/** 商家减免配置（新增，替代原单一金额字段） */
+export interface MerchantReductionConfig {
+  type: MerchantReductionType; // 减免类型（二选一）
+  fixedAmount?: number; // 固定减免金额（元，仅 FIXED_AMOUNT 生效，≥0）
+  discountRate?: number; // 折扣率（%，仅 DISCOUNT_RATE 生效，0-100，如 90 代表 9 折）
+}
+/**商家霸王餐配置 */
+export interface FreeDineConfig {
+  enable: boolean; //是否开启
+  rechargeThreshold: number; //订单满多少元可以使用
+  rechargeTimes: number; //充值多少倍免单
+  withCoupon: boolean; //与优惠券同享
+  withPoints: boolean; //与积分同享
+  useType?: string[]; //使用类型 dine-in店内 takeout 自取 post快递，takeaway外卖
+  useShopType?: string; //all 全部 part部分
+  shopIdList?: number[]; //可用门店id
+}
+
+//限时折扣配置
+export interface TimeLimitDiscountConfig {
+  /**
+   * 折扣优先级 limit-time/vip-price
+   */
+  discountPriority: string;
+  /**
+   * 折扣% 范围1-99
+   */
+  discountRate: number;
+  /**
+   * 参与商品
+   */
+  foods: string;
+  /**
+   * 参与商品 1全部 2部分
+   */
+  foodType: number;
+  /**
+   * 自增主键
+   */
+  id: number;
+  /**
+   * 店铺ID
+   */
+  shopId: number;
+  /**
+   * 可使用类型：堂食 dine-in  外带 take-out 外卖 take-away 配送 post
+   */
+  useType: string;
+  [property: string]: any;
+}
+
+//用户信息
+interface ShopUserInfo {
+  isVip: number | null; //是否会员
+  discount: number | null; //用户折扣
+  isMemberPrice: number | null; //会员折扣与会员价是否同时使用
+}
+/** 订单额外费用配置 */
+export interface OrderExtraConfig {
+  // merchantReduction: number;        // 商家减免金额（元，默认0）
+  // 替换原单一金额字段，支持两种减免形式
+  merchantReduction: MerchantReductionConfig;
+  additionalFee: number; // 附加费（元，如余额充值、券包，默认0）
+  pointDeductionRule: PointDeductionRule; // 积分抵扣规则
+  seatFeeConfig: SeatFeeConfig; // 餐位费配置
+  currentStoreId: string; // 当前门店ID（用于验证优惠券适用门店）
+  userPoints: number; // 用户当前积分（用于积分抵扣）
+  isMember: boolean; // 用户是否会员（用于会员优惠）
+  memberDiscountRate?: number; // 会员折扣率（如0.95=95折，无会员价时用）
+  newUserDiscount?: number; // 新用户减免金额（元，默认0）
+  fullReductionActivities: FullReductionActivity[]; // 当前店铺的满减活动列表（后端返回结构）
+  currentDinnerType: "dine-in" | "take-out" | "take-away" | "post"; // 当前就餐类型（匹配useType）
+  isFreeDine?: boolean; //是否霸王餐
+  freeDineConfig?: FreeDineConfig;
+  limitTimeDiscount?: TimeLimitDiscountConfig; //限时折扣
+  shopUserInfo: ShopUserInfo; // 用户信息
+}
+
+/** 订单费用汇总（修改：补充商家减免类型和明细） */
+export interface OrderCostSummary {
+  // 商品总件数
+  goodsTotal: number;
+  totalDiscountAmount: number;
+  goodsRealAmount: number; // 商品真实原价总和
+  goodsOriginalAmount: number; // 商品原价总和
+  goodsDiscountAmount: number; // 商品折扣金额
+  couponDeductionAmount: number; // 优惠券总抵扣
+  productCouponDeduction: number; // 商品优惠券抵扣
+  fullCouponDeduction: number; // 满减优惠券抵扣
+  pointDeductionAmount: number; // 积分抵扣金额
+  seatFee: number; // 餐位费
+  packFee: number; // 打包费
+  scoreMaxMoney: number; // 积分最大可抵扣金额
+  // 新增：商家减免明细
+  merchantReduction: {
+    type: MerchantReductionType; // 实际使用的减免类型
+    originalConfig: MerchantReductionConfig; // 原始配置（便于前端展示）
+    actualAmount: number; // 实际减免金额（计算后的值，≥0）
+  };
+  additionalFee: number; // 附加费
+  finalPayAmount: number; // 最终实付金额
+  couponUsed?: Coupon; // 实际使用的优惠券
+  pointUsed: number; // 实际使用的积分
+  newUserDiscount: number; // 新用户减免金额（元，默认0）
+  dinnerType?: "dine-in" | "take-out"; // 就餐类型（堂食/自取/配送/快递）
+  config: OrderExtraConfig; // 订单额外费用配置
+  //满减活动
+  fullReduction: {
+    usedFullReductionActivityFullAmount: number; // 计算出的满减活动的门槛金额
+    usedActivity?: FullReductionActivity; // 实际使用的满减活动
+    usedThreshold?: FullReductionThreshold; // 实际使用的满减阈值（多门槛中选最优）
+    actualAmount: number; // 满减实际减免金额（元）
+  };
+  vipDiscountAmount: number; //会员折扣减免金额
+  // 订单原支付金额
+  orderOriginFinalPayAmount: number; //订单原金额（包含打包费+餐位费）
+}
+
+/** 满减活动阈值（单条满减规则：满X减Y）- 对应 MkDiscountThresholdInsertGroupDefaultGroup */
+export interface FullReductionThreshold {
+  activityId?: number; // 关联满减活动ID
+  fullAmount?: number; // 满多少金额（元，必填）
+  discountAmount?: number; // 减多少金额（元，必填）
+}
+
+/** 满减活动主表 - 对应 Request 接口（后端真实字段） */
+export interface FullReductionActivity {
+  id?: number; // 自增主键（后端字段：id）
+  shopId?: number; // 店铺ID（后端字段：shopId）
+  status?: number; // 活动状态：1=未开始，2=进行中，3=已结束（后端字段：status）
+  sort?: number; // 排序值（越大优先级越高，后端字段：sort）
+  createTime?: string; // 创建时间（后端字段：createTime，格式如"2025-10-14 13:56:07"）
+  updateTime?: string; // 最新修改时间（后端字段：updateTime，用于优先级排序）
+  validStartTime?: string; // 有效期开始时间（后端字段：validStartTime，格式如"2025-10-14"）
+  validEndTime?: string; // 有效期结束时间（后端字段：validEndTime，格式如"2025-12-14"）
+  useType?: string; // 可使用类型（后端字段：useType，如"dine,pickup,deliv,express"）
+  useDays?: string; // 可用周期（后端字段：useDays，如"周一,周二,周三,周四,周五,周六,周日"）
+  useTimeType?: string; // 可用时间段类型（后端字段：useTimeType，all=全时段，custom=指定时段）
+  useStartTime?: string; // 每日可用开始时间（后端字段：useStartTime，如"09:00:00"，仅custom时有效）
+  useEndTime?: string; // 每日可用结束时间（后端字段：useEndTime，如"22:00:00"，仅custom时有效）
+  couponShare?: number; // 与优惠券同享：0=否，1=是（后端字段：couponShare）
+  discountShare?: number; // 与限时折扣同享：0=否，1=是（后端字段：discountShare）
+  vipPriceShare?: number; // 与会员价同享：0=否，1=是（后端字段：vipPriceShare）
+  pointsShare?: number; // 与积分抵扣同享：0=否，1=是（后端字段：pointsShare）
+  thresholds?: FullReductionThreshold[]; // 满减阈值列表（多门槛，后端字段：thresholds）
+  isDel?: boolean; // 是否删除：0=否，1=是（后端字段：isDel，默认false）
+}
+
+// 辅助枚举：星期映射（用于useDays校验）
+const WEEKDAY_MAP = {
+  周一: 1,
+  周二: 2,
+  周三: 3,
+  周四: 4,
+  周五: 5,
+  周六: 6,
+  周日: 0, // JS中getDay()返回0=周日
+};
+
+/**
+ * 辅助：校验当前时间是否在活动的「每日可用时段」内
+ * @param activity 满减活动
+ * @param currentTime 当前时间
+ * @returns 是否在时段内
+ */
+function isInDailyTimeRange(
+  activity: FullReductionActivity,
+  currentTime: Date
+): boolean {
+  // 全时段无需校验
+  if (activity.useTimeType === "all") return true;
+  // 无时段配置则不通过
+  if (!activity.useStartTime || !activity.useEndTime) return false;
+
+  const [startHour, startMinute] = activity.useStartTime.split(":").map(Number);
+  const [endHour, endMinute] = activity.useEndTime.split(":").map(Number);
+  const currentHour = currentTime.getHours();
+  const currentMinute = currentTime.getMinutes();
+
+  // 转换为分钟数比较
+  const startTotalMin = startHour * 60 + startMinute;
+  const endTotalMin = endHour * 60 + endMinute;
+  const currentTotalMin = currentHour * 60 + currentMinute;
+
+  // 处理跨天场景（如23:00-02:00）
+  if (startTotalMin <= endTotalMin) {
+    return currentTotalMin >= startTotalMin && currentTotalMin <= endTotalMin;
+  } else {
+    return currentTotalMin >= startTotalMin || currentTotalMin <= endTotalMin;
+  }
+}
+
+/**
+ * 辅助：校验当前时间是否在活动的「可用周期」内（如周一至周日）
+ * @param activity 满减活动
+ * @param currentTime 当前时间
+ * @returns 是否在周期内
+ */
+function isInWeeklyCycle(
+  activity: FullReductionActivity,
+  currentTime: Date
+): boolean {
+  // 无周期配置则不通过
+  if (!activity.useDays) return false;
+  const currentWeekday = currentTime.getDay(); // 0=周日，1=周一...6=周六
+  const allowedWeekdays = activity.useDays
+    .split(",")
+    .map((day) => WEEKDAY_MAP[day as keyof typeof WEEKDAY_MAP]);
+  return allowedWeekdays.includes(currentWeekday);
+}
+
+/**
+ * 辅助：校验当前就餐类型是否在活动的「可用类型」内（如堂食/自取）
+ * @param activity 满减活动
+ * @param currentDinnerType 当前就餐类型
+ * @returns 是否匹配
+ */
+function isDinnerTypeMatch(
+  activity: FullReductionActivity,
+  currentDinnerType: string
+): boolean {
+  if (!activity.useType) return false;
+  const allowedTypes = activity.useType.split(",");
+  //满减活动的就餐类型和当前券类型字段值不一样，暂时返回true
+  return true;
+}
+
+//判断商品是否可以使用限时折扣
+export function returnCanUseLimitTimeDiscount(
+  goods: BaseCartItem,
+  limitTimeDiscount: TimeLimitDiscountConfig | null | undefined,
+  useVipPrice: boolean,
+  idKey = "product_id"
+) {
+  if (!limitTimeDiscount || !limitTimeDiscount.id) {
+    return false;
+  }
+  const canUseFoods = (limitTimeDiscount.foods || "").split(",");
+  const goodsCanUse =
+    limitTimeDiscount.foodType == 1 || canUseFoods.includes("" + goods[idKey as keyof BaseCartItem]);
+  if (!goodsCanUse) {
+    return false;
+  }
+  if (limitTimeDiscount.discountPriority == "limit-time") {
+    return true;
+  }
+  if (limitTimeDiscount.discountPriority == "vip-price") {
+    if (!useVipPrice) {
+      return true;
+    }
+    if (useVipPrice && goods.hasOwnProperty("memberPrice")) {
+      if (goods.memberPrice && goods.memberPrice * 1 <= 0) {
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+function returnMemberPrice(useVipPrice: boolean, goods: BaseCartItem) {
+  if (useVipPrice) {
+    return goods.memberPrice || goods.salePrice;
+  } else {
+    return goods.salePrice;
+  }
+}
+
+/**
+ * 返回商品限时折扣价格
+ */
+function returnLimitPrice(
+  goods: BaseCartItem,
+  limitTimeDiscount: TimeLimitDiscountConfig | null | undefined,
+  useVipPrice: boolean
+) {
+  if (!limitTimeDiscount) {
+    return 0;
+  }
+  const discountRate = new BigNumber(limitTimeDiscount.discountRate).dividedBy(
+    100
+  );
+
+  const canuseLimit = returnCanUseLimitTimeDiscount(
+    goods,
+    limitTimeDiscount,
+    useVipPrice
+  );
+  if (canuseLimit) {
+    //可以使用限时折扣
+    if (limitTimeDiscount.discountPriority == "limit-time") {
+      //限时价优先
+      const result = BigNumber(goods.salePrice)
+        .times(discountRate)
+        .decimalPlaces(2, BigNumber.ROUND_UP)
+        .toNumber();
+      return result;
+    }
+    if (limitTimeDiscount.discountPriority == "vip-price") {
+      //会员价优先
+      if (useVipPrice && goods.memberPrice && goods.memberPrice * 1 > 0) {
+        //使用会员价
+        return returnMemberPrice(useVipPrice, goods);
+      } else {
+        //不使用会员价
+        const result = BigNumber(goods.salePrice)
+          .times(discountRate)
+          .decimalPlaces(2, BigNumber.ROUND_UP)
+          .toNumber();
+        return result;
+      }
+    }
+  } else {
+    //不可以使用限时折扣
+    //会员价优先
+    if (useVipPrice) {
+      //使用会员价
+      return returnMemberPrice(useVipPrice, goods);
+    } else {
+      return goods.salePrice;
+    }
+  }
+}
+
+/**
+ * 计算商品计算门槛时的金额
+ */
+
+export function returnCalcPrice(
+  goods: BaseCartItem,
+  fullReductionActivitie: FullReductionActivity | undefined,
+  limitTimeDiscount: TimeLimitDiscountConfig | null | undefined,
+  useVipPrice: boolean,
+  idKey = "product_id"
+) {
+  if (goods.discountSaleAmount && goods.discountSaleAmount * 1 > 0) {
+    return goods.salePrice;
+  }
+  //限时折扣和满减活动都有
+  if (fullReductionActivitie && limitTimeDiscount) {
+    if (
+      fullReductionActivitie.discountShare == 1 &&
+      fullReductionActivitie.vipPriceShare == 1
+    ) {
+      //与限时折扣同享，与会员价不同享
+      return returnLimitPrice(goods, limitTimeDiscount, useVipPrice);
+    }
+    if (
+      fullReductionActivitie.discountShare != 1 &&
+      fullReductionActivitie.vipPriceShare == 1
+    ) {
+      //与限时折扣不同享，与会员价同享
+      return returnMemberPrice(useVipPrice, goods);
+    }
+    if (fullReductionActivitie.vipPriceShare != 1) {
+      //与会员价不同享
+      return goods.salePrice;
+    }
+    return goods.salePrice;
+  }
+  //只有满减活动
+  if (fullReductionActivitie) {
+    if (fullReductionActivitie.vipPriceShare == 1) {
+      return returnMemberPrice(useVipPrice, goods);
+    } else {
+      return goods.salePrice;
+    }
+  }
+  //只有限时折扣
+  if (limitTimeDiscount) {
+    return returnLimitPrice(goods, limitTimeDiscount, useVipPrice);
+  }
+
+  if (useVipPrice) {
+    return returnMemberPrice(useVipPrice, goods);
+  }
+  return goods.salePrice;
+}
+
+/**
+ * 计算满减活动门槛
+ */
+export function calcFullReductionActivityFullAmount(
+  goodsList: BaseCartItem[],
+  fullReductionActivitie: FullReductionActivity | undefined,
+  limitTimeDiscount: TimeLimitDiscountConfig | null | undefined,
+  useVipPrice: boolean,
+  seatFee: number,
+  packFee: number
+): number {
+  if (!fullReductionActivitie) {
+    return 0;
+  }
+  let amount = 0;
+  for (let goods of goodsList) {
+    const availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
+    if (goods.is_temporary || goods.is_gift || availableNum <= 0) {
+      //临时菜，赠菜，数量<=0的商品不计算
+      continue;
+    }
+    const calcPrice = returnCalcPrice(
+      goods,
+      fullReductionActivitie,
+      limitTimeDiscount,
+      useVipPrice,
+      "product_id"
+    );
+    if (calcPrice !== undefined) {
+      amount += calcPrice * availableNum;
+    }
+  }
+  return amount + seatFee + packFee;
+  console.log("amount", amount);
+}
+
+/**
+ * 筛选最优满减活动（对齐后端逻辑：状态→时间→周期→时段→就餐类型→排序→修改时间）
+ * @param activities 后端返回的满减活动列表
+ * @param currentShopId 当前店铺ID
+ * @param currentDinnerType 当前就餐类型（dine/pickup等）
+ * @param currentTime 当前时间（默认当前时间）
+ * @returns 最优满减活动（无符合条件则返回undefined）
+ */
+export function filterOptimalFullReductionActivity(
+  activities: FullReductionActivity[],
+  currentShopId: number,
+  currentDinnerType: string,
+  currentTime: Date = new Date()
+): FullReductionActivity | undefined {
+  if (!activities || !activities.length) return undefined;
+  // 第一步：基础筛选（未删除+当前店铺+活动进行中+就餐类型匹配）
+  const baseEligible = activities.filter((activity) => {
+    return (
+      activity.isDel !== true && // 未删除
+      // activity.shopId === currentShopId && // 当前店铺
+      // activity.status === 2 && // 状态=2（进行中）
+      isDinnerTypeMatch(activity, currentDinnerType) && // 就餐类型匹配
+      activity.thresholds?.length // 至少有一个满减阈值
+    );
+  });
+  console.log("baseEligible", baseEligible);
+
+  if (!baseEligible.length) return undefined;
+
+  // 第二步：时间筛选（有效期内+周期内+时段内）
+  const timeEligible = baseEligible.filter((activity) => {
+    // 1. 校验有效期（validStartTime ~ validEndTime）
+    if (activity.useTimeType == "all") {
+      return true;
+    }
+    if (!activity.validStartTime || !activity.validEndTime) return false;
+    const startDate = new Date(activity.validStartTime);
+    const endDate = new Date(activity.validEndTime);
+    // 处理有效期结束日期的23:59:59
+    endDate.setHours(23, 59, 59, 999);
+    if (currentTime < startDate || currentTime > endDate) return false;
+
+    // 2. 校验可用周期（如周一至周日）
+    if (!isInWeeklyCycle(activity, currentTime)) return false;
+
+    // 3. 校验每日可用时段（如09:00-22:00）
+    if (!isInDailyTimeRange(activity, currentTime)) return false;
+
+    return true;
+  });
+
+  if (!timeEligible.length) return undefined;
+
+  // 第三步：按优先级排序（需求规则）
+  return timeEligible.sort((a, b) => {
+    // 1. 先比排序值：排序值大的优先
+    if ((a.sort || 0) !== (b.sort || 0)) {
+      return (b.sort || 0) - (a.sort || 0);
+    }
+    // 2. 再比修改时间：最新修改的优先（时间戳降序）
+    const aUpdateTime = a.updateTime ? new Date(a.updateTime).getTime() : 0;
+    const bUpdateTime = b.updateTime ? new Date(b.updateTime).getTime() : 0;
+    return bUpdateTime - aUpdateTime;
+  })[0]; // 取最优活动
+}
+/**
+ * 折扣率格式化：后端discountRate（%）→ 工具库小数（如90→0.9）
+ */
+export function formatDiscountRate(backendDiscountRate?: number): number {
+  if (!backendDiscountRate || backendDiscountRate <= 0) return 1; // 默认无折扣（1=100%）
+  // 后端若为百分比（如90=9折），除以100；若已为小数（如0.9）直接返回
+  return backendDiscountRate >= 1
+    ? backendDiscountRate / 100
+    : backendDiscountRate;
+}
+
+/**
+ * 统一小数处理：舍去小数点后两位以后的数字（解决浮点数精度偏差）
+ * 如 10.129 → 10.12，1.01 → 1.01，1.0100000001 → 1.01
+ * @param num 待处理数字
+ * @returns 处理后保留两位小数的数字
+ */
+export function truncateToTwoDecimals(num: number | string): number {
+  return new BigNumber(num).decimalPlaces(2, BigNumber.ROUND_DOWN).toNumber();
+}
+
+/**
+ * 判断商品是否为临时菜（临时菜不参与优惠券门槛和折扣计算）
+ * @param goods 商品项
+ * @returns 是否临时菜
+ */
+export function isTemporaryGoods(goods: BaseCartItem): boolean {
+  return !!goods.is_temporary;
+}
+
+/**
+ * 判断商品是否为赠菜（赠菜不计入优惠券活动，但计打包费）
+ * @param goods 商品项
+ * @returns 是否赠菜
+ */
+export function isGiftGoods(goods: BaseCartItem): boolean {
+  return !!goods.is_gift;
+}
+/**
+ * 判断可用类型是否可用
+ */
+export function useTypeCanUse(useType: string[]) {
+  const arr = ["all", "dine-in", "take-out", "take-away", "post"];
+  return useType.some((item) => arr.includes(item));
+}
+
+/**
+ * 计算单个商品的会员价（优先级：SKU会员价 > 商品会员价 > 会员折扣率）
+ * @param goods 商品项
+ * @param isMember 是否会员
+ * @param memberDiscountRate 会员折扣率（如0.95=95折）
+ * @returns 会员价（元）
+ */
+export function calcMemberPrice(
+  goods: BaseCartItem,
+  isMember: boolean,
+  memberDiscountRate?: number
+): number {
+  if (!isMember) return truncateToTwoDecimals(goods.salePrice);
+
+  // 优先级：SKU会员价 > 商品会员价 > 商品原价（无会员价时用会员折扣）
+  const basePrice = goods.memberPrice || goods.salePrice;
+  // 仅当无SKU会员价、无商品会员价时，才应用会员折扣率
+  if (memberDiscountRate && !goods.skuData?.memberPrice && !goods.memberPrice) {
+    return truncateToTwoDecimals(
+      new BigNumber(basePrice).multipliedBy(memberDiscountRate).toNumber()
+    );
+  }
+
+  return truncateToTwoDecimals(basePrice);
+}
+
+/**
+ * 过滤可参与优惠券计算的商品（排除临时菜、赠菜、已用兑换券的商品）
+ * @param goodsList 商品列表
+ * @param excludedProductIds 需排除的商品ID列表（商品ID，非购物车ID）
+ * @returns 可参与优惠券计算的商品列表
+ */
+export function filterCouponEligibleGoods(
+  goodsList: BaseCartItem[],
+  excludedProductIds: string[] = []
+): BaseCartItem[] {
+  return goodsList.filter(
+    (goods) =>
+      !isTemporaryGoods(goods) &&
+      !isGiftGoods(goods) &&
+      !excludedProductIds.includes(String(goods.product_id)) // 核心修正：用商品ID排除
+  );
+}
+
+/**
+ * 统一筛选门槛商品的工具函数（所有券类型复用，按商品ID匹配）
+ * @param baseEligibleGoods 基础合格商品（已排除临时菜/赠菜/已抵扣商品）
+ * @param applicableProductIds 优惠券指定的门槛商品ID数组
+ * @returns 最终参与优惠券计算的商品列表
+ */
+export function filterThresholdGoods(
+  baseEligibleGoods: BaseCartItem[],
+  applicableProductIds: string[]
+): BaseCartItem[] {
+  // 空数组=全部基础合格商品；非空=仅商品ID匹配的商品（转字符串兼容类型）
+  return applicableProductIds.length === 0
+    ? baseEligibleGoods
+    : baseEligibleGoods.filter((goods) =>
+        applicableProductIds.includes(String(goods.product_id))
+      ); // 核心修正：用商品ID匹配
+}
+
+/**
+ * 商品排序（用于商品兑换券：按价格/数量/加入顺序排序，按商品ID分组去重）
+ * @param goodsList 商品列表
+ * @param sortRule 排序规则（low_price_first/high_price_first）
+ * @param cartOrder 商品加入购物车的顺序（key=购物车ID，value=加入时间戳）
+ * @returns 排序后的商品列表
+ */
+export function sortGoodsForCoupon(
+  goodsList: BaseCartItem[],
+  sortRule: "low_price_first" | "high_price_first",
+  cartOrder: Record<string, number> = {}
+): BaseCartItem[] {
+  return [...goodsList].sort((a, b) => {
+    // 1. 按商品单价排序（优先级最高）
+    const priceA = a.skuData?.salePrice ?? a.salePrice;
+    const priceB = b.skuData?.salePrice ?? b.salePrice;
+    if (priceA !== priceB) {
+      return sortRule === "low_price_first" ? priceA - priceB : priceB - priceA;
+    }
+
+    // 2. 同价格按商品数量排序（降序，多的优先）
+    if (a.number !== b.number) {
+      return b.number - a.number;
+    }
+
+    // 3. 同价格同数量按加入购物车顺序（早的优先，用购物车ID匹配）
+    const orderA = cartOrder[String(a.id)] ?? Infinity;
+    const orderB = cartOrder[String(b.id)] ?? Infinity;
+    return orderA - orderB;
+  });
+}
+
+/**
+ * 计算优惠券门槛金额（根据同享规则，按商品ID匹配限时折扣）
+ * @param eligibleGoods 可参与优惠券的商品列表（已过滤临时菜/赠菜）
+ * @param coupon 优惠券（含discountShare/vipPriceShare配置）
+ * @param config 订单配置（会员信息）
+ * @param activities 全局营销活动（限时折扣，applicableProductIds为商品ID）
+ * @returns 满足优惠券门槛的金额基数
+ */
+export function calcCouponThresholdAmount(
+  eligibleGoods: BaseCartItem[],
+  coupon: BaseCoupon,
+  config: Pick<OrderExtraConfig, "isMember" | "memberDiscountRate">,
+  activities: ActivityConfig[] = []
+): number {
+  let total = new BigNumber(0);
+
+  for (const goods of eligibleGoods) {
+    const availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
+    if (availableNum <= 0) continue;
+
+    // 1. 基础金额：默认用商品原价（SKU原价优先）
+    const basePrice = new BigNumber(
+      goods.skuData?.salePrice ?? goods.salePrice
+    );
+    let itemAmount = basePrice.multipliedBy(availableNum);
+
+    // 2. 处理「与会员价/会员折扣同享」规则：若开启，用会员价计算
+    if (coupon.vipPriceShare) {
+      const memberPrice = new BigNumber(
+        calcMemberPrice(goods, config.isMember, config.memberDiscountRate)
+      );
+      itemAmount = memberPrice.multipliedBy(availableNum);
+    }
+
+    // 3. 处理「与限时折扣同享」规则：若开启，叠加限时折扣（按商品ID匹配活动）
+    if (coupon.discountShare) {
+      const activity =
+        goods.activityInfo ??
+        activities.find(
+          (act) =>
+            act.type === ActivityType.TIME_LIMIT_DISCOUNT &&
+            (act.applicableProductIds || []).includes(String(goods.product_id)) // 核心修正：用商品ID匹配活动
+        );
+
+      if (activity) {
+        itemAmount = itemAmount.multipliedBy(activity.discountRate); // 叠加限时折扣
+      }
+    }
+
+    total = total.plus(itemAmount);
+  }
+
+  return truncateToTwoDecimals(total.toNumber());
+}
+
+// ============================ 3. 商品核心价格计算（核心修正：按商品ID匹配营销活动） ============================
+/**
+ * 计算单个商品的实际单价（整合商家改价、会员优惠、营销活动折扣，按商品ID匹配活动）
+ * @param goods 商品项
+ * @param config 订单额外配置（含会员、活动信息）
+ * @returns 单个商品实际单价（元）
+ */
+export function calcSingleGoodsRealPrice(
+  goods: BaseCartItem,
+  config: Pick<
+    OrderExtraConfig,
+    "isMember" | "memberDiscountRate" | "limitTimeDiscount"
+  >
+): number {
+  const { isMember, memberDiscountRate, limitTimeDiscount: activity } = config;
+  console.log("activity", activity);
+
+  //如果是增菜价格为0
+  if (goods.is_gift) {
+    return 0;
+  }
+
+  // 1. 优先级1：商家改价（改价后单价>0才生效）
+  if (goods.discountSaleAmount && goods.discountSaleAmount > 0) {
+    return truncateToTwoDecimals(goods.discountSaleAmount);
+  }
+
+  // 2. 优先级2：会员价（含会员折扣率，SKU会员价优先）
+  const memberPrice = new BigNumber(
+    calcMemberPrice(goods, isMember, memberDiscountRate)
+  );
+
+  // 3. 优先级3：营销活动折扣（如限时折扣，需按商品ID匹配活动）
+  let isActivityApplicable = false;
+  if (activity) {
+    if (activity.foodType == 1) {
+      isActivityApplicable = true;
+    } else {
+      const canUseGoods = activity.foods?.split(",") || [];
+      if (canUseGoods.find((v) => v == String(goods.product_id))) {
+        isActivityApplicable = true;
+      }
+    }
+  }
+  if (!activity || !isActivityApplicable) {
+    return memberPrice.toNumber();
+  }
+  console.log("isMember", isMember);
+  //限时折扣优先或者会员价优先但是不是会员或者未开启会员价格时限时折扣优先
+  if (
+    activity.discountPriority == "limit-time" ||
+    (activity.discountPriority == "vip-price" && !isMember) ||
+    (activity.discountPriority == "vip-price" && isMember && !goods.memberPrice)
+  ) {
+    //限时折扣优先
+    return truncateToTwoDecimals(
+      new BigNumber(goods.salePrice)
+        .times(activity.discountRate / 100)
+        .decimalPlaces(2, BigNumber.ROUND_UP)
+        .toNumber()
+    );
+  }
+  if (activity.discountPriority == "vip-price" && isMember) {
+    return memberPrice.toNumber();
+  }
+
+  // 处理活动与会员的同享/不同享逻辑
+  if (activity.vipPriceShare) {
+    // 同享：会员价基础上叠加工活动折扣
+    return truncateToTwoDecimals(
+      memberPrice.multipliedBy(activity.discountRate).toNumber()
+    );
+  } else {
+    // 不同享：取会员价和活动价的最小值（活动价用SKU原价计算）
+    const basePriceForActivity = new BigNumber(
+      goods.skuData?.salePrice ?? goods.salePrice
+    );
+    const activityPrice = basePriceForActivity.multipliedBy(
+      activity.discountRate
+    );
+
+    return truncateToTwoDecimals(
+      memberPrice.isLessThanOrEqualTo(activityPrice)
+        ? memberPrice.toNumber()
+        : activityPrice.toNumber()
+    );
+  }
+}
+
+/**
+ * 计算商品原价总和（所有商品：原价*数量，含临时菜、赠菜，用SKU原价优先）
+ * @param goodsList 商品列表
+ * @returns 商品原价总和（元）
+ */
+export function calcGoodsOriginalAmount(goodsList: BaseCartItem[]): number {
+  let total = new BigNumber(0);
+
+  for (const goods of goodsList) {
+    const availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
+    let basePrice = new BigNumber(0);
+    if (goods.is_temporary) {
+      basePrice = new BigNumber(goods?.discountSaleAmount ?? 0);
+    } else if (goods.is_gift) {
+      basePrice = new BigNumber(0);
+    } else {
+      basePrice = new BigNumber(goods.skuData?.salePrice ?? goods.salePrice); // SKU原价优先
+    }
+
+    total = total.plus(basePrice.multipliedBy(availableNum));
+  }
+
+  return truncateToTwoDecimals(total.toNumber());
+}
+
+/**
+ * 计算商品实际总价（所有商品：实际单价*数量，含临时菜、赠菜，按商品ID匹配活动）
+ * @param goodsList 商品列表
+ * @param config 订单额外配置（含会员、活动信息）
+ * @param activities 全局营销活动列表（如限时折扣，applicableProductIds为商品ID）
+ * @returns 商品实际总价（元）
+ */
+export function calcGoodsRealAmount(
+  goodsList: BaseCartItem[],
+  config: Pick<
+    OrderExtraConfig,
+    "isMember" | "memberDiscountRate" | "limitTimeDiscount"
+  >
+): number {
+  let total = new BigNumber(0);
+
+  for (const goods of goodsList) {
+    const availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
+    if (availableNum <= 0) continue;
+    console.log("goods", goods);
+    const realPrice = new BigNumber(calcSingleGoodsRealPrice(goods, config));
+    total = total.plus(realPrice.multipliedBy(availableNum));
+  }
+
+  return truncateToTwoDecimals(total.toNumber());
+}
+
+/**
+ * 计算商品折扣总金额（商品原价总和 - 商品实际总价）
+ * @param goodsOriginalAmount 商品原价总和
+ * @param goodsRealAmount 商品实际总价
+ * @returns 商品折扣总金额（元，≥0）
+ */
+export function calcGoodsDiscountAmount(
+  goodsOriginalAmount: number,
+  goodsRealAmount: number
+): number {
+  const original = new BigNumber(goodsOriginalAmount);
+  const real = new BigNumber(goodsRealAmount);
+  const discount = original.minus(real);
+
+  return truncateToTwoDecimals(Math.max(0, discount.toNumber()));
+}
+/**
+ * 从满减活动的多门槛中，选择最优阈值（满金额最小且减免金额最大）
+ * @param thresholds 满减阈值列表（多门槛）
+ * @param baseAmount 满减计算基数（新客立减后的金额）
+ * @param goodsOriginalAmount 商品原价总和（discountShare=0时用）
+ * @param goodsRealAmount 商品折扣后总和（discountShare=1时用）
+ * @param discountShare 与限时折扣同享：0=否，1=是
+ * @returns 最优阈值（无符合条件则返回undefined）
+ */
+export function selectOptimalThreshold(
+  thresholds: FullReductionThreshold[] = [],
+  baseAmount: number,
+  goodsOriginalAmount: number,
+  goodsRealAmount: number,
+  discountShare: number = 0
+): FullReductionThreshold | undefined {
+  if (!thresholds.length) return undefined;
+
+  // 第一步：确定满减门槛基数（根据discountShare规则）
+  const thresholdBase = baseAmount;
+
+  // 第二步：筛选「满金额≤基数」且「减免金额>0」的有效阈值
+  const validThresholds = thresholds.filter((threshold) => {
+    const fullAmount = new BigNumber(threshold.fullAmount || 0);
+    const discountAmount = new BigNumber(threshold.discountAmount || 0);
+    console.log("fullAmount", fullAmount);
+    console.log("discountAmount", discountAmount);
+
+    return (
+      fullAmount.isLessThanOrEqualTo(thresholdBase) &&
+      discountAmount.isGreaterThan(0)
+    );
+  });
+  console.log("validThresholds", validThresholds);
+
+  if (!validThresholds.length) return undefined;
+
+  // 找到抵扣金额最大的门槛项
+  const maxDiscountThreshold = validThresholds.reduce(
+    (maxItem, currentItem) => {
+      // 处理空值，默认抵扣金额为0
+      const maxDiscount = new BigNumber(maxItem?.discountAmount || 0);
+      const currentDiscount = new BigNumber(currentItem?.discountAmount || 0);
+
+      // 比较当前项和已存最大项的抵扣金额，保留更大的
+      return currentDiscount.gt(maxDiscount) ? currentItem : maxItem;
+    },
+    validThresholds[0] || null
+  ); // 初始值为数组第一项（若数组为空则返回null）
+  console.log("maxDiscountThreshold", maxDiscountThreshold);
+  return maxDiscountThreshold;
+}
+
+/**
+ * 计算满减实际减免金额（适配多门槛、同享规则）
+ * @param optimalActivity 最优满减活动
+ * @param optimalThreshold 最优满减阈值
+ * @param baseAmount 计算基数（新客立减后的金额）
+ * @returns 实际减免金额（元，未达门槛则0）
+ */
+export function calcFullReductionAmount(
+  baseAmount: number,
+  optimalActivity?: FullReductionActivity,
+  optimalThreshold?: FullReductionThreshold
+): number {
+  if (!optimalActivity || !optimalThreshold) return 0;
+
+  const baseAmountBn = new BigNumber(baseAmount);
+  const discountAmountBn = new BigNumber(optimalThreshold.discountAmount || 0);
+
+  // 1. 基数必须为正（避免减免后为负）
+  if (baseAmountBn.isLessThanOrEqualTo(0)) return 0;
+
+  // 2. 减免金额不能超过基数（避免减成负数）
+  const maxReducible = baseAmountBn;
+  const actualReduction = discountAmountBn.isLessThanOrEqualTo(maxReducible)
+    ? discountAmountBn
+    : maxReducible;
+
+  return truncateToTwoDecimals(actualReduction.toNumber());
+}
+
+// ------------------------------ 策略辅助函数 ------------------------------
+/**
+ * 根据优惠券useShops列表判断门店是否匹配（适配BaseCoupon的useShops字段）
+ */
+function isStoreMatchByList(
+  useShops: string[],
+  currentStoreId: string
+): boolean {
+  // 适用门店为空数组 → 无限制（所有门店适用）
+  if (useShops.length === 0) return true;
+  // 匹配当前门店ID（字符串比较，避免类型问题）
+  return useShops.includes(currentStoreId);
+}
+
+/**
+ * 计算优惠券抵扣金额（处理互斥逻辑，选择最优优惠券，按商品ID排除，新增细分统计）
+ * @param backendCoupons 后端优惠券列表
+ * @param goodsList 商品列表
+ * @param config 订单配置（含就餐类型）
+ * @returns 最优优惠券的抵扣结果（含商品券/满减券细分）
+ */
+export function calcCouponDeduction(
+  backendCoupons: BackendCoupon[],
+  goodsList: BaseCartItem[],
+  config: Pick<
+    OrderExtraConfig,
+    "currentStoreId" | "isMember" | "memberDiscountRate"
+  > & {
+    activities: ActivityConfig[];
+    cartOrder: Record<string, number>;
+    dinnerType: "dine-in" | "take-out";
+    currentTime?: Date;
+  }
+): {
+  deductionAmount: number;
+  productCouponDeduction: number; // 新增：商品优惠券抵扣（兑换券/折扣券/买一送一等）
+  fullCouponDeduction: number; // 新增：满减优惠券抵扣
+  usedCoupon?: Coupon;
+  excludedProductIds: string[]; // 排除的商品ID列表（商品ID）
+} {
+  const goodsCoupon = backendCoupons.filter((v) => v.type == 2);
+  const discountCoupon = backendCoupons.filter((v) => v.type != 2);
+
+  // 3. 计算非兑换券最优抵扣（传递已抵扣商品ID，避免重复，统计细分字段）
+  let nonExchangeResult: CouponResult = {
+    deductionAmount: discountCoupon.reduce((prve, cur): number => {
+      return prve + (cur.discountAmount || 0);
+    }, 0),
+    excludedProductIds: [],
+    usedCoupon: undefined,
+    productCouponDeduction: 0,
+    fullCouponDeduction: 0,
+  };
+
+  // 4. 计算兑换券抵扣（排除非兑换券已抵扣的商品ID，统计商品券细分）
+  let exchangeResult: ExchangeCalculationResult = {
+    deductionAmount: goodsCoupon.reduce((prve, cur): number => {
+      return prve + (cur.discountAmount || 0);
+    }, 0),
+    excludedProductIds: [],
+    productCouponDeduction: 0,
+  };
+
+  // 5. 汇总结果：兑换券与非兑换券不可同时使用，取抵扣金额大的
+  const exchangeBn = new BigNumber(exchangeResult.deductionAmount);
+  const nonExchangeBn = new BigNumber(nonExchangeResult.deductionAmount);
+  const isExchangeBetter = exchangeBn.isGreaterThan(nonExchangeBn);
+
+  return {
+    deductionAmount: exchangeBn.plus(nonExchangeBn).toNumber(),
+    productCouponDeduction: exchangeResult.deductionAmount,
+    fullCouponDeduction: nonExchangeResult.deductionAmount, // 兑换券与满减券互斥，满减券抵扣置0
+    usedCoupon: isExchangeBetter ? undefined : nonExchangeResult.usedCoupon,
+    excludedProductIds: isExchangeBetter
+      ? exchangeResult.excludedProductIds
+      : nonExchangeResult.excludedProductIds,
+  };
+}
+
+// ============================ 5. 其他费用计算（无ID依赖，逻辑不变） ============================
+/**
+ * 计算总打包费（赠菜也计算，称重商品打包数量≤1）
+ * @param goodsList 商品列表
+ * @param dinnerType 就餐类型（堂食dine-in/外卖take-out）
+ * @returns 总打包费（元）
+ */
+export function calcTotalPackFee(
+  goodsList: BaseCartItem[],
+  dinnerType: "dine-in" | "take-out"
+): number {
+  // if (dinnerType !== "take-out") return 0;
+  let total = new BigNumber(0);
+
+  for (const goods of goodsList) {
+    const packNumber = goods.packNumber ? goods.packNumber * 1 : 0;
+    let availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
+
+    if (availableNum === 0) continue;
+
+    // 计算单个商品打包数量（外卖全打包，堂食按配置，称重商品≤1）
+    let packNum = Math.min(availableNum, packNumber);
+    if (dinnerType === "take-out") {
+      packNum = availableNum;
+    }
+    if (goods.product_type === GoodsType.WEIGHT) {
+      packNum = Math.min(packNum, 1);
+    }
+
+    total = total.plus(new BigNumber(goods.packFee || 0).multipliedBy(packNum));
+  }
+
+  return truncateToTwoDecimals(total.toNumber());
+}
+
+/**
+ * 计算餐位费（按人数，不参与营销活动）
+ * @param config 餐位费配置
+ * @returns 餐位费（元，未启用则0）
+ */
+export function calcSeatFee(config: SeatFeeConfig): number {
+  if (!config.isEnabled || config.personCount == 0) return 0;
+  const personCount = Math.max(1, config.personCount); // 至少1人
+  return truncateToTwoDecimals(
+    new BigNumber(config.pricePerPerson).multipliedBy(personCount).toNumber()
+  );
+}
+
+/**
+ * 计算积分抵扣金额（按X积分=1元，不超过最大抵扣和用户积分）
+ * @param userPoints 用户当前积分
+ * @param rule 积分抵扣规则
+ * @param maxDeductionLimit 最大抵扣上限（通常为订单金额，避免超扣）
+ * @returns 积分抵扣金额 + 实际使用积分
+ */
+export function calcPointDeduction(
+  userPoints: number,
+  rule: PointDeductionRule,
+  maxDeductionLimit: number
+): {
+  deductionAmount: number;
+  usedPoints: number;
+} {
+  console.log("calcPointDeduction", userPoints, rule, maxDeductionLimit);
+  if (rule.pointsPerYuan <= 0 || userPoints <= 0) {
+    return { deductionAmount: 0, usedPoints: 0 };
+  }
+
+  const userPointsBn = new BigNumber(userPoints);
+  const pointsPerYuanBn = new BigNumber(rule.pointsPerYuan);
+  const maxLimitBn = new BigNumber(maxDeductionLimit);
+
+  // 最大可抵扣金额（积分可抵金额 vs 规则最大 vs 订单上限）
+  const maxDeductByPoints = userPointsBn.dividedBy(pointsPerYuanBn);
+  const maxDeductAmount = maxDeductByPoints.isLessThan(
+    rule.maxDeductionAmount ?? Infinity
+  )
+    ? maxDeductByPoints
+    : new BigNumber(rule.maxDeductionAmount || Infinity).isLessThan(maxLimitBn)
+    ? maxDeductByPoints
+    : maxLimitBn;
+
+  // 实际使用积分 = 抵扣金额 * 积分兑换比例
+  const usedPoints = maxDeductAmount.multipliedBy(pointsPerYuanBn);
+
+  return {
+    deductionAmount: truncateToTwoDecimals(maxDeductAmount.toNumber()),
+    usedPoints: truncateToTwoDecimals(
+      Math.min(usedPoints.toNumber(), userPoints)
+    ), // 避免积分超扣
+  };
+}
+
+function calcVipDiscountAmount(
+  goodsRealAmount: number,
+  shopUserInfo: ShopUserInfo
+): number {
+  if (!shopUserInfo.isVip || shopUserInfo.discount === 0) return 0;
+  if (shopUserInfo.isVip == 1 && shopUserInfo.isMemberPrice != 1) {
+    return 0;
+  }
+  console.log("goodsRealAmount", goodsRealAmount);
+  console.log("discount", (100 - (shopUserInfo.discount || 0)) / 100);
+  return truncateToTwoDecimals(
+    new BigNumber(goodsRealAmount)
+      .times((100 - (shopUserInfo.discount || 0)) / 100)
+      .decimalPlaces(2, BigNumber.ROUND_DOWN)
+      .toNumber()
+  );
+}
+
+// ============================ 6. 订单总费用汇总与实付金额计算（核心入口，补充细分字段） ============================
+/**
+ * 计算订单所有费用子项并汇总（核心入口函数）
+ * @param goodsList 购物车商品列表
+ * @param dinnerType 就餐类型
+ * @param backendCoupons 后端优惠券列表
+ * @param activities 全局营销活动列表
+ * @param config 订单额外配置（会员、积分、餐位费等）
+ * @param cartOrder 商品加入购物车顺序（key=购物车ID，value=时间戳）
+ * @param currentTime 当前时间（用于优惠券有效期判断）
+ * @returns 订单费用汇总（含所有子项和实付金额，新增商品券/满减券细分）
+ */
+export function calculateOrderCostSummary(
+  goodsList: BaseCartItem[],
+  dinnerType: "dine-in" | "take-out", // 前端就餐类型
+  backendCoupons: BackendCoupon[] = [],
+  activities: ActivityConfig[] = [],
+  config: OrderExtraConfig, // 含后端满减活动、currentDinnerType
+  cartOrder: Record<string, number> = {},
+  currentTime: Date = new Date()
+): OrderCostSummary {
+  //是否使用霸王餐，霸王餐配置
+  const {
+    isFreeDine,
+    freeDineConfig,
+    limitTimeDiscount,
+    fullReductionActivities,
+    shopUserInfo,
+  } = config;
+  console.log("shopUserInfo", shopUserInfo);
+
+  // ------------------------------ 1. 基础费用计算 ------------------------------
+  const goodsOriginalAmount = calcGoodsOriginalAmount(goodsList); // 商品原价总和
+  const goodsRealAmount = calcGoodsRealAmount(
+    // 商品折扣后总和
+    goodsList,
+    {
+      isMember: config.isMember,
+      memberDiscountRate: config.memberDiscountRate,
+      limitTimeDiscount: config.limitTimeDiscount,
+    }
+  );
+  const goodsDiscountAmount = calcGoodsDiscountAmount(
+    goodsOriginalAmount,
+    goodsRealAmount
+  ); // 商品折扣金额
+
+  const newUserDiscount = config.newUserDiscount || 0; // 新客立减
+
+  //  其他费用计算（原有逻辑不变） ------------------------------
+  const packFee = calcTotalPackFee(goodsList, dinnerType); // 打包费
+  let seatFee = calcSeatFee(config.seatFeeConfig); // 餐位费
+  seatFee = dinnerType === "dine-in" ? seatFee : 0; // 外卖不收餐位费
+  const additionalFee = Math.max(0, config.additionalFee); // 附加费
+
+  // ------------------------------ 2. 满减活动计算（核心步骤） ------------------------------
+  let usedFullReductionActivity: FullReductionActivity | undefined;
+  let usedFullReductionThreshold: FullReductionThreshold | undefined;
+  let fullReductionAmount = 0;
+  let usedFullReductionActivityFullAmount = calcFullReductionActivityFullAmount(
+    goodsList,
+    usedFullReductionActivity,
+    config.limitTimeDiscount,
+    config.isMember,
+    seatFee,
+    packFee
+  );
+
+  // 2.1 筛选最优满减活动（后端活动列表、当前店铺、就餐类型、时间）
+  usedFullReductionActivity = filterOptimalFullReductionActivity(
+    config.fullReductionActivities,
+    Number(config.currentStoreId), // 转换为数字（后端shopId是number）
+    config.currentDinnerType, // 后端useType匹配的就餐类型（如"dine"）
+    currentTime
+  );
+
+  // 2.2 计算满减基数（先扣新客立减）
+  let baseAfterNewUserDiscount = new BigNumber(
+    limitTimeDiscount &&
+    limitTimeDiscount.id &&
+    usedFullReductionActivity &&
+    !usedFullReductionActivity.discountShare
+      ? goodsRealAmount
+      : goodsRealAmount
+  )
+    .minus(newUserDiscount)
+    .plus(packFee)
+    .plus(seatFee)
+    .plus(additionalFee)
+    .toNumber();
+  baseAfterNewUserDiscount =
+    baseAfterNewUserDiscount > 0 ? baseAfterNewUserDiscount : 0;
+
+  // 2.3 选择最优满减阈值（多门槛场景）
+  if (usedFullReductionActivity) {
+    //计算当前满减活动的门槛金额
+    usedFullReductionActivityFullAmount = calcFullReductionActivityFullAmount(
+      goodsList,
+      usedFullReductionActivity,
+      config.limitTimeDiscount,
+      config.isMember,
+      seatFee,
+      packFee
+    );
+
+    usedFullReductionThreshold = selectOptimalThreshold(
+      usedFullReductionActivity.thresholds,
+      usedFullReductionActivityFullAmount,
+      goodsOriginalAmount,
+      goodsRealAmount,
+      usedFullReductionActivity.discountShare || 0 // 与限时折扣同享规则
+    );
+
+    // 2.4 计算满减实际减免金额
+    fullReductionAmount = calcFullReductionAmount(
+      baseAfterNewUserDiscount,
+      usedFullReductionActivity,
+      usedFullReductionThreshold
+    );
+  }
+
+  // ------------------------------ 3. 优惠券抵扣（适配满减同享规则） ------------------------------
+  let couponDeductionAmount = 0;
+  let productCouponDeduction = 0;
+  let fullCouponDeduction = 0;
+  let usedCoupon: Coupon | undefined;
+  let excludedProductIds: string[] = [];
+
+  const couponResult = calcCouponDeduction(
+    // 原有优惠券计算函数
+    backendCoupons,
+    goodsList,
+    {
+      currentStoreId: config.currentStoreId,
+      isMember: config.isMember,
+      memberDiscountRate: config.memberDiscountRate,
+      activities,
+      cartOrder,
+      dinnerType,
+      currentTime,
+    }
+  );
+  console.log("couponResult", couponResult);
+  couponDeductionAmount = couponResult.deductionAmount;
+  productCouponDeduction = couponResult.productCouponDeduction;
+  fullCouponDeduction = couponResult.fullCouponDeduction;
+  usedCoupon = couponResult.usedCoupon;
+  excludedProductIds = couponResult.excludedProductIds;
+
+  // 若满减与优惠券同享（couponShare=1），才计算优惠券；否则优惠券抵扣为0
+  if (
+    usedFullReductionThreshold &&
+    (!usedFullReductionActivity || !usedFullReductionActivity.couponShare)
+  ) {
+    couponDeductionAmount = 0;
+    productCouponDeduction = 0;
+    fullCouponDeduction = 0;
+    usedCoupon = undefined;
+    excludedProductIds = [];
+  }
+
+  // ------------------------------ 4. 积分抵扣（适配满减同享规则） ------------------------------
+  let pointDeductionAmount = 0;
+  let usedPoints = 0;
+
+  // 计算积分抵扣基数（商品折扣后 - 新客立减 - 满减 - 优惠券 + 餐位费 + 打包费 + 附加费）
+  let maxPointDeductionLimit = new BigNumber(goodsRealAmount)
+    .minus(newUserDiscount)
+    .minus(fullReductionAmount)
+    .minus(couponDeductionAmount)
+    .plus(seatFee)
+    .plus(packFee)
+    .plus(additionalFee)
+    .toNumber();
+  maxPointDeductionLimit =
+    maxPointDeductionLimit > 0 ? maxPointDeductionLimit : 0;
+
+  const pointResult = calcPointDeduction(
+    config.userPoints,
+    config.pointDeductionRule,
+    maxPointDeductionLimit
+  );
+
+  pointDeductionAmount = pointResult.deductionAmount;
+  usedPoints = pointResult.usedPoints;
+  // 若满减与积分不同享（pointsShare=1）积分抵扣为0
+  if (
+    usedFullReductionThreshold &&
+    (!usedFullReductionActivity || !usedFullReductionActivity.pointsShare)
+  ) {
+    pointDeductionAmount = 0;
+    usedPoints = 0;
+  }
+
+  //使用霸王餐
+  if (isFreeDine && freeDineConfig && freeDineConfig.enable) {
+    fullReductionAmount = 0;
+    //不与优惠券同享
+    if (!freeDineConfig.withCoupon) {
+      couponDeductionAmount = 0;
+      productCouponDeduction = 0;
+      fullCouponDeduction = 0;
+      usedCoupon = undefined;
+      excludedProductIds = [];
+    }
+    //不与积分同享
+    if (!freeDineConfig.withPoints) {
+      pointDeductionAmount = 0;
+      usedPoints = 0;
+    }
+  }
+
+  // 商家减免计算（原有逻辑不变）
+  const merchantReductionConfig = config.merchantReduction;
+  let merchantReductionActualAmount = 0;
+  const maxMerchantReductionLimit = new BigNumber(goodsRealAmount)
+    .minus(newUserDiscount)
+    .minus(fullReductionAmount)
+    .minus(couponDeductionAmount)
+    .minus(pointDeductionAmount)
+    .plus(seatFee)
+    .plus(packFee)
+    .isGreaterThan(0)
+    ? new BigNumber(goodsRealAmount)
+        .minus(newUserDiscount)
+        .minus(fullReductionAmount)
+        .minus(couponDeductionAmount)
+        .minus(pointDeductionAmount)
+        .plus(seatFee)
+        .plus(packFee)
+        .toNumber()
+    : 0;
+
+  switch (merchantReductionConfig.type) {
+    case MerchantReductionType.FIXED_AMOUNT:
+      merchantReductionActualAmount = Math.min(
+        merchantReductionConfig.fixedAmount || 0,
+        maxMerchantReductionLimit
+      );
+      break;
+    case MerchantReductionType.DISCOUNT_RATE:
+      const validRate =
+        Math.max(0, Math.min(100, merchantReductionConfig.discountRate || 0)) /
+        100;
+      merchantReductionActualAmount =
+        maxMerchantReductionLimit * (1 - validRate);
+      break;
+  }
+  merchantReductionActualAmount = Math.max(
+    0,
+    truncateToTwoDecimals(merchantReductionActualAmount)
+  );
+
+  // 会员折扣减免
+  const vipDiscountAmount = calcVipDiscountAmount(
+    new BigNumber(goodsRealAmount)
+      .minus(couponDeductionAmount)
+      .plus(packFee)
+      .plus(seatFee)
+      .minus(newUserDiscount)
+      .minus(fullReductionAmount)
+      .toNumber(),
+    shopUserInfo
+  ); 
+  console.log("vipDiscountAmount", vipDiscountAmount);
+  // ------------------------------ 6. 最终实付金额计算 ------------------------------
+  const finalPayAmountBn = new BigNumber(goodsRealAmount)
+    .minus(newUserDiscount)
+    .minus(vipDiscountAmount)
+    .minus(fullReductionAmount)
+    .minus(couponDeductionAmount)
+    .minus(pointDeductionAmount)
+    .minus(merchantReductionActualAmount)
+    .plus(seatFee)
+    .plus(packFee)
+    .plus(additionalFee);
+  let finalPayAmount = Math.max(
+    0,
+    truncateToTwoDecimals(finalPayAmountBn.toNumber())
+  );
+  // ------------------------------ 使用霸王餐计算 ------------------------------
+  let orderOriginFinalPayAmount = finalPayAmount;
+  if (isFreeDine && freeDineConfig && freeDineConfig.enable) {
+    finalPayAmount = BigNumber(finalPayAmount)
+      .times(freeDineConfig.rechargeTimes)
+      .toNumber();
+  }
+
+  // ------------------------------ 7. 总优惠金额计算 ------------------------------
+  const totalDiscountAmount = truncateToTwoDecimals(
+    new BigNumber(goodsDiscountAmount)
+      .plus(newUserDiscount)
+      .plus(fullReductionAmount)
+      .plus(couponDeductionAmount)
+      .plus(pointDeductionAmount)
+      .plus(merchantReductionActualAmount)
+      .plus(vipDiscountAmount)
+      .toNumber()
+  );
+  //积分可抵扣最大金额 最终支付金额+积分抵扣-商家减免
+  const scoreMaxMoney = new BigNumber(finalPayAmount)
+    .plus(pointDeductionAmount)
+    .minus(merchantReductionActualAmount)
+    .toNumber();
+
+  // ------------------------------ 8. 返回完整结果 ------------------------------
+  return {
+    goodsTotal: goodsList.reduce(
+      (sum, g) => sum + Math.max(0, g.number - (g.returnNum || 0)),
+      0
+    ),
+    goodsRealAmount,
+    goodsOriginalAmount,
+    goodsDiscountAmount,
+    couponDeductionAmount,
+    productCouponDeduction,
+    fullCouponDeduction,
+    pointDeductionAmount,
+    seatFee,
+    packFee,
+    totalDiscountAmount,
+    //最终支付原金额
+    orderOriginFinalPayAmount,
+    //积分最大可抵扣金额
+    scoreMaxMoney,
+    // 满减活动明细（后端字段）
+    fullReduction: {
+      usedFullReductionActivityFullAmount: usedFullReductionActivityFullAmount,
+      usedActivity: usedFullReductionActivity,
+      usedThreshold: usedFullReductionThreshold,
+      actualAmount: truncateToTwoDecimals(fullReductionAmount),
+    },
+    vipDiscountAmount: vipDiscountAmount, //会员折扣减免金额
+    merchantReduction: {
+      type: merchantReductionConfig.type,
+      originalConfig: merchantReductionConfig,
+      actualAmount: merchantReductionActualAmount,
+    },
+    additionalFee,
+    finalPayAmount,
+    couponUsed: usedCoupon,
+    pointUsed: usedPoints,
+    newUserDiscount,
+    dinnerType,
+    config,
+  };
+}
+
+export function isWeightGoods(goods: BaseCartItem): boolean {
+  return goods.product_type === GoodsType.WEIGHT;
+}
+
+// ============================ 7. 对外暴露工具库 ============================
+export const OrderPriceCalculator = {
+  // 基础工具
+  truncateToTwoDecimals,
+  isTemporaryGoods,
+  isGiftGoods,
+  formatDiscountRate,
+  filterThresholdGoods,
+  isWeightGoods,
+  // 商品价格计算
+  calcSingleGoodsRealPrice,
+  calcGoodsOriginalAmount,
+  calcGoodsRealAmount,
+  calcGoodsDiscountAmount,
+  //满减活动工具
+  filterOptimalFullReductionActivity,
+  // 优惠券计算
+  calcCouponDeduction,
+  // 其他费用计算
+  calcTotalPackFee,
+  calcSeatFee,
+  calcPointDeduction,
+  // 核心入口
+  calculateOrderCostSummary,
+  // 枚举导出
+  Enums: {
+    GoodsType,
+    CouponType,
+    ActivityType,
+    WEEKDAY_MAP,
+  },
+};
+
+export default OrderPriceCalculator;
diff --git a/utils/order-utils.js b/utils/order-utils.js
new file mode 100644
index 0000000..97477af
--- /dev/null
+++ b/utils/order-utils.js
@@ -0,0 +1,170 @@
+import BigNumber from "bignumber.js";
+
+//判断商品是否可以使用限时折扣
+export function canUseLimitTimeDiscount(
+  goods,
+  limitTimeDiscountRes,
+  shopInfo,
+  shopUserInfo,
+  idKey = "id"
+) {
+  shopInfo = shopInfo || {};
+  shopUserInfo = shopUserInfo || {};
+  if (!limitTimeDiscountRes || !limitTimeDiscountRes.id) {
+    return false;
+  }
+
+  const canUseFoods = (limitTimeDiscountRes.foods || "").split(",");
+
+  const goodsCanUse =
+    limitTimeDiscountRes.foodType == 1 ||
+    canUseFoods.includes(`${goods[idKey]}`);
+  if (!goodsCanUse) {
+    return false;
+  }
+  if (limitTimeDiscountRes.discountPriority == "limit-time") {
+    return true;
+  }
+  if (limitTimeDiscountRes.discountPriority == "vip-price") {
+    if (shopUserInfo.isVip != 1 || shopUserInfo.isMemberPrice != 1) {
+      return true;
+    }
+
+    if (
+      shopUserInfo.isVip == 1 &&
+      shopUserInfo.isMemberPrice == 1 &&
+      goods.memberPrice * 1 <= 0
+    ) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+/**
+ * 返回商品显示价格
+ * @params {*} args 参数对象
+ * @params {*} args.goods 商品对象
+ * @params {*} args.shopInfo 店铺信息
+ * @params {*} args.limitTimeDiscountRes 限时折扣信息
+ * @params {*} args.shopUserInfo 店铺用户信息
+ * @returns
+ */
+export function returnPrice(args) {
+  let {
+    goods,
+    shopInfo,
+    limitTimeDiscountRes,
+    shopUserInfo,
+    idKey = "product_id",
+  } = args;
+  limitTimeDiscountRes=limitTimeDiscountRes||{foods:'',foodType:2}
+  const canUseFoods = (limitTimeDiscountRes.foods || "").split(",");
+  const includesGoods =
+    limitTimeDiscountRes.foodType == 1 ||
+    canUseFoods.includes("" + goods[idKey]);
+  shopInfo = shopInfo || {};
+  shopUserInfo = shopUserInfo || {};
+  if (shopUserInfo.isMemberPrice == 1 && shopUserInfo.isVip == 1 && shopInfo.isMemberPrice==1) {
+    const memberPrice = goods.memberPrice || goods.salePrice;
+
+    //是会员而且启用会员价
+    if (limitTimeDiscountRes) {
+      //使用限时折扣
+      //限时折扣优先
+      if (limitTimeDiscountRes.discountPriority == "limit-time") {
+        if (includesGoods) {
+          return returnLimitPrice({
+            price: goods.salePrice,
+            limitTimeDiscountRes,
+          });
+        } else {
+          return memberPrice;
+        }
+      }
+      if (
+        limitTimeDiscountRes.discountPriority == "vip-price" &&
+        includesGoods
+      ) {
+        if (goods.memberPrice * 1 > 0) {
+          //会员优先
+          return memberPrice;
+        } else {
+          const price = returnLimitPrice({
+            price: goods.salePrice,
+            limitTimeDiscountRes,
+            goods: goods,
+          });
+
+          return price;
+        }
+      } else {
+        return memberPrice;
+      }
+    } else {
+      //是会员没有限时折扣
+      return memberPrice;
+    }
+  } else {
+    // console.log('不是会员或者没有启用会员价',goods,limitTimeDiscountRes);
+    //不是会员或者没有启用会员价
+    if (limitTimeDiscountRes && limitTimeDiscountRes.id && includesGoods) {
+      const price = returnLimitPrice({
+        price: goods.salePrice,
+        limitTimeDiscountRes,
+        goods: goods,
+      });
+
+      return price;
+    } else {
+      return goods.salePrice;
+    }
+  }
+}
+
+/**
+ * 返回限时折扣价格
+ * @params {*} args 参数对象
+ * @params {*} args.limitTimeDiscountRes 限时折扣信息
+ * @params {*} args.price 商品价格
+ * @param  {*} args.goods 商品对象
+ * @returns
+ */
+export function returnLimitPrice(args) {
+  const { limitTimeDiscountRes, price, goods } = args;
+  const discountRate = new BigNumber(
+    limitTimeDiscountRes.discountRate
+  ).dividedBy(100);
+
+  const result = BigNumber(price)
+    .times(discountRate)
+    .decimalPlaces(2, BigNumber.ROUND_UP)
+    .toNumber();
+  return result;
+}
+
+/**
+ * 判断是否返回会员价
+ * @param {*} args 参数对象
+ * @param {*} args.shopInfo 店铺信息
+ * @param {*} args.shopUserInfo 店铺用户信息
+ * @returns
+ */
+export function canReturnMemberPrice(args) {
+  const { shopInfo, shopUserInfo } = args;
+  if (shopUserInfo.isMemberPrice == 1 && shopUserInfo.isVip == 1) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+/**
+ * 返回会员价格
+ * @param {*} goods
+ * @returns
+ */
+export function returnMemberPrice(goods) {
+  return goods.memberPrice || goods.salePrice;
+}
diff --git a/utils/pay.js b/utils/pay.js
index 43b4c8c..9bee02a 100644
--- a/utils/pay.js
+++ b/utils/pay.js
@@ -1,57 +1,57 @@
 export const pay = (res) => {
-	return new Promise((resolve, reject) => {
-		uni.showLoading({
-			title: '支付中...',
-			mask: true
-		})
-		uni.requestPayment({
-			// #ifdef MP-WEIXIN
-			provider: 'wxpay', //支付类型-固定值
-			partnerid: res.appId, // 微信支付商户号
-			timeStamp: res.timeStamp, // 时间戳（单位：秒）
-			nonceStr: res.nonceStr, // 随机字符串
-			package: res.package, // 固定值
-			signType: res.signType, //固定值
-			paySign: res.paySign, //签名
-			// #endif
-			// #ifdef MP-ALIPAY
-			provider: 'alipay', //支付类型-固定值
-			orderInfo: res.tradeNo, // 微信支付商户号
-			// #endif
-			success: (res) => {
-				console.log('pay');
-				console.log(res);
-				uni.hideLoading()
-				// #ifdef MP-WEIXIN
-				uni.showToast({
-					title: "支付成功",
-					icon:'none'
-				})
-				console.log('支付成功')
-				resolve(res)
-				// #endif
-				// #ifdef MP-ALIPAY
-				if (res.resultCode == '9000') {
-					uni.showToast({
-						title: "支付成功",
-						icon:'none'
-					})
-					resolve(res)
-				} else {
-					uni.showToast({
-						title: "支付失败",
-						icon:'none'
-					})
-				}
-				// #endif
-			},
-			fail: (res) => {
-				setTimeout(() => {
-					uni.hideLoading()
-				}, 1000)
-				reject(false)
-			},
-			
-		});
-	})
-}
\ No newline at end of file
+  return new Promise((resolve, reject) => {
+    uni.showLoading({
+      title: "支付中...",
+      mask: true,
+    });
+    uni.requestPayment({
+      // #ifdef MP-WEIXIN
+      provider: "wxpay", //支付类型-固定值
+      partnerid: res.appId, // 微信支付商户号
+      timeStamp: res.timeStamp, // 时间戳（单位：秒）
+      nonceStr: res.nonceStr, // 随机字符串
+      package: res.package, // 固定值
+      signType: res.signType, //固定值
+      paySign: res.paySign, //签名
+      // #endif
+      // #ifdef MP-ALIPAY
+      provider: "alipay", //支付类型-固定值
+      orderInfo: res.tradeNo, // 微信支付商户号
+      // #endif
+      success: (res) => {
+        console.log("pay");
+        console.log(res);
+        uni.hideLoading();
+        // #ifdef MP-WEIXIN
+        uni.showToast({
+          title: "支付成功",
+          icon: "none",
+        });
+        console.log("支付成功");
+        resolve(true);
+        // #endif
+        // #ifdef MP-ALIPAY
+        if (res.resultCode == "9000") {
+          uni.showToast({
+            title: "支付成功",
+            icon: "none",
+          });
+          resolve(true);
+        } else {
+          uni.showToast({
+            title: "支付失败",
+            icon: "none",
+          });
+          reject(false);
+        }
+        // #endif
+      },
+      fail: (res) => {
+        setTimeout(() => {
+          uni.hideLoading();
+        }, 1000);
+        reject(false);
+      },
+    });
+  });
+};
diff --git a/utils/uniapp.js b/utils/uniapp.js
index 4803be2..cce0492 100644
--- a/utils/uniapp.js
+++ b/utils/uniapp.js
@@ -1,5 +1,5 @@
 export const  back=()=>{
-	console.log('back');
+	console.log('调用返回方法back');
 	try {
 		const arr= getCurrentPages()
 		if(arr.length>=2){
diff --git a/utils/util.js b/utils/util.js
new file mode 100644
index 0000000..9ba2245
--- /dev/null
+++ b/utils/util.js
@@ -0,0 +1,143 @@
+/**
+ * 手机号脱敏：隐藏中间4位（11位手机号通用）
+ * @param {string} phone - 原始手机号（可带非数字字符，如138-1234-5678）
+ * @returns {string} 脱敏后手机号
+ */
+export function desensitizePhone(phone) {
+    // 1. 提取纯数字（过滤非数字字符）
+    const purePhone = (phone || "").replace(/[^\d]/g, "");
+  
+    // 2. 边界判断：非11位手机号返回原字符串（或自定义提示）
+    if (purePhone.length !== 11) {
+      console.warn("手机号格式不正确，需11位纯数字");
+      return phone; // 或返回 ''、'手机号格式错误' 等
+    }
+  
+    // 3. 脱敏：前3位 + **** + 后4位
+    return purePhone.replace(/(\d{3})(\d{4})(\d{4})/, "$1****$3");
+  }
+
+  /**
+ * 姓名合法性校验
+ * @param {string} name - 待校验的姓名
+ * @returns {Object} 校验结果：{ valid: boolean, msg: string }
+ */
+export function validateName(name) {
+  // 1. 空值校验
+  if (!name || name.trim() === '') {
+    return { valid: false, msg: '姓名不能为空' };
+  }
+  const pureName = name.trim();
+
+  // 2. 长度校验（2-6位，含少数民族中间点）
+  if (pureName.length < 2 || pureName.length > 6) {
+    return { valid: false, msg: '姓名长度应为2-6位' };
+  }
+
+  // 3. 正则校验：仅允许中文、少数民族中间点（·），且中间点不能在开头/结尾
+  // 中文范围：[\u4e00-\u9fa5]，中间点：[\u00b7]（Unicode 标准中间点，非小数点）
+  const nameReg = /^[\u4e00-\u9fa5]+([\u00b7][\u4e00-\u9fa5]+)*$/;
+  if (!nameReg.test(pureName)) {
+    return { 
+      valid: false, 
+      msg: '姓名仅支持中文和少数民族中间点（·），且不能包含数字、字母或特殊符号' 
+    };
+  }
+
+  // 4. 额外限制：中间点不能连续（如“李··四”）
+  if (/[\u00b7]{2,}/.test(pureName)) {
+    return { valid: false, msg: '姓名中的中间点（·）不能连续' };
+  }
+
+  // 校验通过
+  return { valid: true, msg: '姓名格式合法' };
+}
+
+/**
+ * 身份证号码合法性校验（支持18位/15位）
+ * @param {string} idCard - 待校验的身份证号
+ * @returns {Object} 校验结果：{ valid: boolean, msg: string, info?: Object }
+ * info 可选返回：{ birthDate: string, gender: string }（出生日期、性别）
+ */
+export function validateIdCard(idCard) {
+  // 1. 空值校验
+  if (!idCard || idCard.trim() === '') {
+    return { valid: false, msg: '身份证号码不能为空' };
+  }
+  const pureIdCard = idCard.trim().toUpperCase(); // 统一转为大写（处理X）
+
+  // 2. 格式校验（18位或15位）
+  const id18Reg = /^[1-9]\d{5}(19|20)\d{2}((0[1-9])|(1[0-2]))((0[1-9])|([12]\d)|(3[01]))\d{3}([0-9]|X)$/;
+  const id15Reg = /^[1-9]\d{5}\d{2}((0[1-9])|(1[0-2]))((0[1-9])|([12]\d)|(3[01]))\d{3}$/;
+  
+  if (!id18Reg.test(pureIdCard) && !id15Reg.test(pureIdCard)) {
+    return { 
+      valid: false, 
+      msg: '身份证号码格式错误（需18位，最后一位可含X；或15位纯数字）' 
+    };
+  }
+
+  // 3. 提取出生日期并校验合法性
+  let birthDateStr, birthDate;
+  if (pureIdCard.length === 18) {
+    // 18位：第7-14位为出生日期（YYYYMMDD）
+    birthDateStr = pureIdCard.slice(6, 14);
+    birthDate = new Date(`${birthDateStr.slice(0,4)}-${birthDateStr.slice(4,6)}-${birthDateStr.slice(6,8)}`);
+  } else {
+    // 15位：第7-12位为出生日期（YYMMDD），补全为YYYYMMDD（19xx或20xx，默认19xx）
+    const year = `19${pureIdCard.slice(6, 8)}`;
+    const month = pureIdCard.slice(8, 10);
+    const day = pureIdCard.slice(10, 12);
+    birthDateStr = `${year}${month}${day}`;
+    birthDate = new Date(`${year}-${month}-${day}`);
+  }
+
+  // 校验出生日期有效性（如20230230 → 日期对象会是Invalid Date）
+  if (
+    isNaN(birthDate.getTime()) || 
+    birthDateStr.slice(0,4) !== birthDate.getFullYear().toString() ||
+    birthDateStr.slice(4,6) !== (birthDate.getMonth() + 1).toString().padStart(2, '0') ||
+    birthDateStr.slice(6,8) !== birthDate.getDate().toString().padStart(2, '0')
+  ) {
+    return { valid: false, msg: '身份证中的出生日期无效' };
+  }
+
+  // 4. 18位身份证额外校验：校验码合法性（加权算法）
+  if (pureIdCard.length === 18) {
+    // 加权因子
+    const weightFactors = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2];
+    // 校验码对应值（0-10 → 10对应X）
+    const checkCodeMap = ['1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2'];
+    // 计算前17位与加权因子的乘积和
+    let sum = 0;
+    for (let i = 0; i < 17; i++) {
+      sum += parseInt(pureIdCard[i]) * weightFactors[i];
+    }
+    // 计算预期校验码
+    const expectedCheckCode = checkCodeMap[sum % 11];
+    // 对比实际校验码（最后一位）
+    if (pureIdCard[17] !== expectedCheckCode) {
+      return { valid: false, msg: '身份证校验码错误，可能是无效身份证' };
+    }
+  }
+
+  // 5. 可选：提取性别（18位第17位，15位第15位；奇数=男，偶数=女）
+  let gender = '';
+  if (pureIdCard.length === 18) {
+    const genderCode = parseInt(pureIdCard[16]);
+    gender = genderCode % 2 === 1 ? '男' : '女';
+  } else {
+    const genderCode = parseInt(pureIdCard[14]);
+    gender = genderCode % 2 === 1 ? '男' : '女';
+  }
+
+  // 校验通过，返回额外信息（出生日期、性别）
+  return {
+    valid: true,
+    msg: '身份证号码合法',
+    info: {
+      birthDate: `${birthDate.getFullYear()}-${(birthDate.getMonth() + 1).toString().padStart(2, '0')}-${birthDate.getDate().toString().padStart(2, '0')}`,
+      gender: gender
+    }
+  };
+}
\ No newline at end of file