From 20e5ed1895e1150a231e9205d86d19397cbbe286 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 27 Apr 2024 18:02:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |   1 +
 api/good.js                                   |   5 +
 components/addressPopup.vue                   | 133 +++
 components/modal.vue                          |  69 ++
 .../{viewPopup/index.vue => viewPopup.vue}    |   0
 dict/cancelDict.js                            |  33 +
 manifest.json                                 |   2 +-
 pages.json                                    |  16 +
 pages/cart/cart.vue                           |  11 +-
 pages/index/index.vue                         |  82 +-
 pages/login/login.vue                         |  66 +-
 pages/my/my.vue                               |  16 +-
 pagesOrder/addressEdit/addressEdit.vue        | 100 ++
 pagesOrder/addressList/addressList.vue        | 148 +++
 pagesOrder/detail/detail.vue                  | 320 ++++---
 pagesOrder/order/order.vue                    |  20 +-
 unpackage/dist/dev/mp-weixin/app.js           |   2 +
 unpackage/dist/dev/mp-weixin/app.json         |   4 +-
 unpackage/dist/dev/mp-weixin/common/assets.js |   4 +-
 unpackage/dist/dev/mp-weixin/common/vendor.js |   7 +
 .../dev/mp-weixin/components/addressPopup.js  |  88 ++
 .../mp-weixin/components/addressPopup.json    |   9 +
 .../mp-weixin/components/addressPopup.wxml    |   1 +
 .../mp-weixin/components/addressPopup.wxss    |  83 ++
 .../dist/dev/mp-weixin/components/modal.js    |  72 ++
 .../dist/dev/mp-weixin/components/modal.json  |   7 +
 .../dist/dev/mp-weixin/components/modal.wxml  |   1 +
 .../dist/dev/mp-weixin/components/modal.wxss  |  43 +
 .../{viewPopup/index.js => viewPopup.js}      |   8 +-
 .../dev/mp-weixin/components/viewPopup.json   |   6 +
 .../dev/mp-weixin/components/viewPopup.wxml   |   1 +
 .../{viewPopup/index.wxss => viewPopup.wxss}  |  10 +-
 .../mp-weixin/components/viewPopup/index.json |   6 -
 .../mp-weixin/components/viewPopup/index.wxml |   1 -
 .../dist/dev/mp-weixin/dict/cancelDict.js     |  32 +
 .../dist/dev/mp-weixin/pages/cart/cart.js     |  22 +-
 .../dist/dev/mp-weixin/pages/cart/cart.wxml   |   2 +-
 .../dist/dev/mp-weixin/pages/index/index.js   | 111 ++-
 .../dist/dev/mp-weixin/pages/index/index.json |   2 +-
 .../dist/dev/mp-weixin/pages/index/index.wxml |   2 +-
 .../dist/dev/mp-weixin/pages/index/index.wxss |   3 +
 .../dist/dev/mp-weixin/pages/login/login.js   |  31 +-
 .../dist/dev/mp-weixin/pages/login/login.json |   5 +-
 .../dist/dev/mp-weixin/pages/login/login.wxml |   2 +-
 .../dist/dev/mp-weixin/pages/login/login.wxss |  67 ++
 unpackage/dist/dev/mp-weixin/pages/my/my.js   |  20 +-
 unpackage/dist/dev/mp-weixin/pages/my/my.wxml |   2 +-
 unpackage/dist/dev/mp-weixin/pages/my/my.wxss |   2 +-
 .../pagesOrder/addressEdit/addressEdit.js     | 116 +++
 .../pagesOrder/addressEdit/addressEdit.json   |  11 +
 .../pagesOrder/addressEdit/addressEdit.wxml   |   1 +
 .../pagesOrder/addressEdit/addressEdit.wxss   |  55 ++
 .../pagesOrder/addressList/addressList.js     |  69 ++
 .../pagesOrder/addressList/addressList.json   |   9 +
 .../pagesOrder/addressList/addressList.wxml   |   1 +
 .../pagesOrder/addressList/addressList.wxss   | 104 ++
 .../dev/mp-weixin/pagesOrder/detail/detail.js |  63 +-
 .../mp-weixin/pagesOrder/detail/detail.json   |   5 +-
 .../mp-weixin/pagesOrder/detail/detail.wxml   |   2 +-
 .../mp-weixin/pagesOrder/detail/detail.wxss   |  18 +-
 .../dev/mp-weixin/pagesOrder/order/order.js   |  25 +-
 .../dev/mp-weixin/pagesOrder/order/order.wxml |   2 +-
 .../dist/dev/mp-weixin/project.config.json    |   2 +-
 .../dev/mp-weixin/project.private.config.json |   2 +-
 .../uview-plus/components/u--form/u--form.js  | 158 ++++
 .../components/u--form/u--form.json           |   6 +
 .../components/u--form/u--form.wxml           |   1 +
 .../components/u--form/u--form.wxss           |   0
 .../components/u--input/u--input.js           | 157 +++
 .../components/u--input/u--input.json         |   6 +
 .../components/u--input/u--input.wxml         |   1 +
 .../components/u--input/u--input.wxss         |   0
 .../uview-plus/components/u-copy/u-copy.js    |  66 ++
 .../uview-plus/components/u-copy/u-copy.json  |   4 +
 .../uview-plus/components/u-copy/u-copy.wxml  |   1 +
 .../uview-plus/components/u-copy/u-copy.wxss  |   0
 .../components/u-form-item/props.js           |  56 ++
 .../components/u-form-item/u-form-item.js     | 214 +++++
 .../components/u-form-item/u-form-item.json   |   7 +
 .../components/u-form-item/u-form-item.wxml   |   1 +
 .../components/u-form-item/u-form-item.wxss   | 106 +++
 .../uview-plus/components/u-form/props.js     |  48 +
 .../uview-plus/components/u-form/u-form.js    | 269 ++++++
 .../uview-plus/components/u-form/u-form.json  |   4 +
 .../uview-plus/components/u-form/u-form.wxml  |   1 +
 .../uview-plus/components/u-form/u-form.wxss  |   0
 .../uview-plus/components/u-input/props.js    | 189 ++++
 .../uview-plus/components/u-input/u-input.js  | 311 ++++++
 .../components/u-input/u-input.json           |   6 +
 .../components/u-input/u-input.wxml           |   1 +
 .../components/u-input/u-input.wxss           |  97 ++
 .../components/u-loading-page/props.js        |  52 +
 .../u-loading-page/u-loading-page.js          | 153 +++
 .../u-loading-page/u-loading-page.json        |   7 +
 .../u-loading-page/u-loading-page.wxml        |   1 +
 .../u-loading-page/u-loading-page.wxss        |  68 ++
 .../uview-plus/components/u-switch/props.js   |  57 ++
 .../components/u-switch/u-switch.js           | 196 ++++
 .../components/u-switch/u-switch.json         |   6 +
 .../components/u-switch/u-switch.wxml         |   1 +
 .../components/u-switch/u-switch.wxss         |  82 ++
 .../uview-plus/components/u-tag/props.js      |  91 ++
 .../uview-plus/components/u-tag/u-tag.js      | 223 +++++
 .../uview-plus/components/u-tag/u-tag.json    |   7 +
 .../uview-plus/components/u-tag/u-tag.wxml    |   1 +
 .../uview-plus/components/u-tag/u-tag.wxss    | 201 ++++
 .../uview-plus/libs/function/index.js         |   4 +
 .../uview-plus/libs/util/async-validator.js   | 893 ++++++++++++++++++
 108 files changed, 5639 insertions(+), 277 deletions(-)
 create mode 100644 api/good.js
 create mode 100644 components/addressPopup.vue
 create mode 100644 components/modal.vue
 rename components/{viewPopup/index.vue => viewPopup.vue} (100%)
 create mode 100644 dict/cancelDict.js
 create mode 100644 pagesOrder/addressEdit/addressEdit.vue
 create mode 100644 pagesOrder/addressList/addressList.vue
 create mode 100644 unpackage/dist/dev/mp-weixin/components/addressPopup.js
 create mode 100644 unpackage/dist/dev/mp-weixin/components/addressPopup.json
 create mode 100644 unpackage/dist/dev/mp-weixin/components/addressPopup.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/components/addressPopup.wxss
 create mode 100644 unpackage/dist/dev/mp-weixin/components/modal.js
 create mode 100644 unpackage/dist/dev/mp-weixin/components/modal.json
 create mode 100644 unpackage/dist/dev/mp-weixin/components/modal.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/components/modal.wxss
 rename unpackage/dist/dev/mp-weixin/components/{viewPopup/index.js => viewPopup.js} (83%)
 create mode 100644 unpackage/dist/dev/mp-weixin/components/viewPopup.json
 create mode 100644 unpackage/dist/dev/mp-weixin/components/viewPopup.wxml
 rename unpackage/dist/dev/mp-weixin/components/{viewPopup/index.wxss => viewPopup.wxss} (88%)
 delete mode 100644 unpackage/dist/dev/mp-weixin/components/viewPopup/index.json
 delete mode 100644 unpackage/dist/dev/mp-weixin/components/viewPopup/index.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/dict/cancelDict.js
 create mode 100644 unpackage/dist/dev/mp-weixin/pagesOrder/addressEdit/addressEdit.js
 create mode 100644 unpackage/dist/dev/mp-weixin/pagesOrder/addressEdit/addressEdit.json
 create mode 100644 unpackage/dist/dev/mp-weixin/pagesOrder/addressEdit/addressEdit.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/pagesOrder/addressEdit/addressEdit.wxss
 create mode 100644 unpackage/dist/dev/mp-weixin/pagesOrder/addressList/addressList.js
 create mode 100644 unpackage/dist/dev/mp-weixin/pagesOrder/addressList/addressList.json
 create mode 100644 unpackage/dist/dev/mp-weixin/pagesOrder/addressList/addressList.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/pagesOrder/addressList/addressList.wxss
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--form/u--form.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--form/u--form.json
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--form/u--form.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--form/u--form.wxss
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--input/u--input.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--input/u--input.json
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--input/u--input.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--input/u--input.wxss
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-copy/u-copy.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-copy/u-copy.json
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-copy/u-copy.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-copy/u-copy.wxss
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form-item/props.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form-item/u-form-item.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form-item/u-form-item.json
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form-item/u-form-item.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form-item/u-form-item.wxss
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form/props.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form/u-form.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form/u-form.json
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form/u-form.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form/u-form.wxss
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/props.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.json
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.wxss
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-page/props.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-page/u-loading-page.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-page/u-loading-page.json
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-page/u-loading-page.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-page/u-loading-page.wxss
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-switch/props.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-switch/u-switch.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-switch/u-switch.json
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-switch/u-switch.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-switch/u-switch.wxss
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tag/props.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tag/u-tag.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tag/u-tag.json
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tag/u-tag.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tag/u-tag.wxss
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/libs/util/async-validator.js

diff --git a/App.vue b/App.vue
index 301b258..ad6a2b1 100644
--- a/App.vue
+++ b/App.vue
@@ -20,4 +20,5 @@
     font-size: 26rpx;
     background-color: #eee;
   }
+  
 </style>
diff --git a/api/good.js b/api/good.js
new file mode 100644
index 0000000..504e0fb
--- /dev/null
+++ b/api/good.js
@@ -0,0 +1,5 @@
+import request from '@/utils/request';
+
+export const goodListApi = (data)=>{
+  return request.get('/good/list', data);
+}
\ No newline at end of file
diff --git a/components/addressPopup.vue b/components/addressPopup.vue
new file mode 100644
index 0000000..8e231f7
--- /dev/null
+++ b/components/addressPopup.vue
@@ -0,0 +1,133 @@
+<template>
+  <up-popup :show="show" closeable round="10" @close="close">
+    <view class="address-popup">
+      <view class="head-title">收货地址</view>
+      <view class="list-admin">
+        <view>常用地址</view>
+        <view class="admin-btn">
+          <view class="btn" @click="navTo('/pagesOrder/addressList/addressList')"><up-icon name="edit-pen" color="#20B128"></up-icon>管理</view>
+          <view class="btn" @click="navTo('/pagesOrder/addressEdit/addressEdit')"><up-icon name="plus" color="#20B128"></up-icon>新增</view>
+        </view>
+      </view>
+      <scroll-view style="height: 600rpx;padding-bottom: 20rpx;" scroll-y>
+        <view class="row" v-for="(item,index) in 10" :key="index" @click="addressType=index">
+          <view class="content">
+            <view class="top">
+              <view class="name">小李</view>
+              <view class="phone">151****9999</view>
+              <u-tag style="pointer-events: none;" text="默认" type="success" plain size="mini"></u-tag>
+            </view>
+            <view class="bottom u-line-2">四川泸州市龙马潭区莲花池街道商业街1号</view>
+          </view>
+          <image v-if="addressType==index" src="@/static/icon/check.png"></image>
+          <image v-else src="@/static/icon/n-check.png"></image>
+        </view>
+      </scroll-view>
+      <up-button color="#20B128" shape="circle" @click="submitAddress">确认</up-button>
+    </view>
+  </up-popup>
+</template>
+
+<script setup>
+  import { ref } from "vue"
+
+  const addressType = ref(-1)
+
+  const props = defineProps({
+    show: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const emit = defineEmits(['close', 'change']);
+  const close = () => {
+    emit('close');
+  }
+
+  const submitAddress = () => {
+    emit('change', addressType.value);
+  }
+  
+  const navTo = (url)=>{
+    uni.navigateTo({
+      url: url
+    })
+  }
+</script>
+
+<style scoped lang="scss">
+  .address-popup {
+    padding: 30rpx;
+
+    .head-title {
+      font-weight: bold;
+      text-align: center;
+      margin-bottom: 20rpx;
+    }
+
+    .list-admin {
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 20rpx;
+
+      .admin-btn {
+        display: flex;
+        color: #20B128;
+
+        .btn {
+          margin-left: 20rpx;
+          display: flex;
+          align-items: center;
+          
+          &:active {
+            color: rgba(#20B128, 0.8);
+            transition: background-color 0.5s;
+            animation: disappear 0.5s 0.5s forwards;
+          }
+        }
+      }
+    }
+
+    .row {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding-bottom: 20rpx;
+      border-bottom: 1rpx solid #eee;
+      margin-bottom: 20rpx;
+
+      &:last-child {
+        border-bottom: none;
+        margin-bottom: 0;
+      }
+
+      .content {
+        .top {
+          display: flex;
+
+          view {
+            margin-right: 20rpx;
+          }
+        }
+
+        .bottom {}
+      }
+
+      image {
+        width: 40rpx;
+        height: 40rpx;
+        flex-shrink: 0;
+      }
+    }
+  }
+
+  @keyframes disappear {
+    to {
+      opacity: 0;
+      /* 渐隐 */
+      transform: scale(0);
+      /* 缩小 */
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/components/modal.vue b/components/modal.vue
new file mode 100644
index 0000000..231c7d3
--- /dev/null
+++ b/components/modal.vue
@@ -0,0 +1,69 @@
+<template>
+  <up-popup :show="show" round="10" @close="close" mode="center">
+    <view class="modal-popup">
+      <view class="head-title">{{title}}</view>
+      <view class="content">{{content}}</view>
+      <view class="btn-box">
+        <view style="width: 230rpx;"><up-button @click="close" plain color="#999">{{cancleText}}</up-button></view>
+        <view style="width: 230rpx;"><up-button @click="change" color="#20B128">{{confirmText}}</up-button></view>
+      </view>
+    </view>
+  </up-popup>
+</template>
+
+<script setup>
+
+  const props = defineProps({
+    show: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      default: '确认操作吗'
+    },
+    content: {
+      type: String,
+      default: '确认后继续下一步操作'
+    },
+    confirmText: {
+      type: String,
+      default: '确认'
+    },
+    cancleText: {
+      type: String,
+      default: '取消'
+    },
+  })
+
+  const emit = defineEmits(['close', 'change']);
+  const close = () => {
+    emit('close');
+  }
+  
+  const change = ()=>{
+    emit('change');
+  }
+
+</script>
+
+<style scoped lang="scss">
+  .modal-popup{
+    width: 500rpx;
+    padding: 40rpx;
+    .head-title{
+      font-size: 32rpx;
+      text-align: center;
+    }
+    .content{
+      font-size: 26rpx;
+      color: #999;
+      text-align: center;
+      padding: 40rpx 0;
+    }
+    .btn-box{
+      display: flex;
+      justify-content: space-between;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/components/viewPopup/index.vue b/components/viewPopup.vue
similarity index 100%
rename from components/viewPopup/index.vue
rename to components/viewPopup.vue
diff --git a/dict/cancelDict.js b/dict/cancelDict.js
new file mode 100644
index 0000000..2c73e19
--- /dev/null
+++ b/dict/cancelDict.js
@@ -0,0 +1,33 @@
+
+const list = [
+  {
+    name: '不想要了/临时有事',
+    value: 1,
+  },
+  {
+    name: '点错了/点多了/点少了',
+    value: 2,
+  },
+  {
+    name: '地址/电话填错了',
+    value: 3,
+  },
+  {
+    name: '送达时间选错了',
+    value: 4,
+  },
+  {
+    name: '支付遇到问题',
+    value: 5,
+  },
+  {
+    name: '其他平台更便宜',
+    value: 6,
+  },
+  {
+    name: '其他原因',
+    value: 7,
+  },
+]
+
+export default list;
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 349ef7c..b2f8ebc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "",
+        "appid" : "wxce2948c50d808b66",
         "setting" : {
             "urlCheck" : false
         },
diff --git a/pages.json b/pages.json
index ab1e849..e6635e4 100644
--- a/pages.json
+++ b/pages.json
@@ -60,6 +60,22 @@
             "navigationBarTitleText" : "",
             "enablePullDownRefresh" : false
           }
+        },
+        {
+          "path" : "addressList/addressList",
+          "style" : 
+          {
+            "navigationBarTitleText" : "地址管理",
+            "enablePullDownRefresh" : false
+          }
+        },
+        {
+          "path" : "addressEdit/addressEdit",
+          "style" : 
+          {
+            "navigationBarTitleText" : "",
+            "enablePullDownRefresh" : false
+          }
         }
       ]
     }
diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
index 0af3bd4..a508620 100644
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@@ -90,7 +90,7 @@
           <image v-else src="@/static/icon/check.png"></image>
           <text style="font-size: 24rpx;">全选</text>
         </view>
-        <view v-if="false" class="btn-box">
+        <view v-if="true" class="btn-box">
           <view class="all-price">
             <view style="width: 80rpx;">合计:</view>
             <view class="price">
@@ -99,10 +99,10 @@
               <text style="font-size: 24rpx;">.30</text>
             </view>
           </view>
-          <up-button color="#20b128" shape="circle" disabled>去结算<text>(2)</text></up-button>
+          <up-button color="#20b128" shape="circle" :disabled="false" @click="settleAccounts">去结算<text>(2)</text></up-button>
         </view>
         <view v-else class="btn-box">
-          <view style="width: 100px;margin-right: 20rpx;"><up-button size="small" plain color="#989898" shape="circle">移入收藏夹</up-button></view>
+          <!-- <view style="width: 100px;margin-right: 20rpx;"><up-button size="small" plain color="#989898" shape="circle">移入收藏夹</up-button></view> -->
           <view style="width: 80px;"><up-button size="small" plain color="#989898" shape="circle">删除</up-button></view>
         </view>
       </view>
@@ -127,6 +127,11 @@
     swiperCurrent.value = current;
     tabsActive.value = current;
   }
+  
+  // 结算
+  const settleAccounts = ()=>{
+    
+  }
 </script>
 
 <style lang="scss">
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5562529..ba8c990 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,7 +3,7 @@
     <up-navbar placeholder style="z-index: 10080;">
       <!-- #ifdef MP-WEIXIN -->
       <template #left>
-        <view style="width: 540rpx;"><up-search placeholder="请输入商品" v-model="keyword" :showAction="false"></up-search>
+        <view style="width: 500rpx;"><up-search placeholder="请输入商品" @search="searchKeyword" v-model="keyword" :showAction="false"></up-search>
         </view>
       </template>
       <!-- #endif -->
@@ -12,7 +12,7 @@
         <view></view>
       </template>
       <template #center>
-        <view style="width: 700rpx;"><up-search placeholder="请输入商品" v-model="keyword" :showAction="false"></up-search>
+        <view style="width: 700rpx;"><up-search placeholder="请输入商品" @search="searchKeyword" v-model="keyword" :showAction="false"></up-search>
         </view>
       </template>
       <!-- #endif -->
@@ -20,7 +20,7 @@
     <view style="position: relative;overflow: hidden;">
       <scroll-view class="head-view" scroll-x>
         <view class="list">
-          <view class="item" :class="{'item-active': topActive==index}" v-for="(item, index) in 10" :key="index">
+          <view class="item" :class="{'item-active': topActive==index}" v-for="(item, index) in 10" :key="index" @click="changeOne(item, index)">
             <image class="c-img" src="https://cdn.uviewui.com/uview/album/1.jpg"></image>
             <view class="c-text u-line-1">惠农生活{{item}}</view>
           </view>
@@ -37,9 +37,9 @@
     <viewPopup nav v-if="show===1" @close="show=0">
       <view class="cateOne">
         <view class="head-title">全部分类</view>
-        <scroll-view scroll-y style="height: 60vh;">
+        <scroll-view scroll-y style="height: 600rpx;">
           <view class="list">
-            <view class="item" :class="{'item-active': topActive==index}" v-for="(item, index) in 55" :key="index">
+            <view class="item" :class="{'item-active': topActive==index}" v-for="(item, index) in 10" :key="index" @click="changeOne(item, index)">
               <image class="c-img" src="https://cdn.uviewui.com/uview/album/1.jpg"></image>
               <view class="c-text u-line-1">惠农生活{{item}}</view>
             </view>
@@ -50,7 +50,7 @@
     <view class="scroll-box">
       <scroll-view class="left" scroll-y>
         <view class="item u-line-1" :class="{'item-active': leftActive==index}" v-for="(item, index) in 20"
-          :key="index">惠农生活{{item}}</view>
+          :key="index" @click="changeTwo(item, index)">惠农生活{{item}}</view>
         <view style="width: 100%;height: 200rpx;"></view>
       </scroll-view>
       <view class="right">
@@ -58,7 +58,7 @@
           <scroll-view style="height: 90rpx;" scroll-x>
             <view class="classify-list">
               <view class="classify-list-item u-line-1" :class="{'item-active': rightActive==index}"
-                v-for="(item, index) in 6" :key="index">
+                v-for="(item, index) in 6" :key="index" @click="changeThree(item, index)">
                 牛肉
               </view>
               <view style="width: 70rpx;flex-shrink: 0;"></view>
@@ -68,9 +68,10 @@
             <up-icon name="arrow-down"></up-icon>
           </view>
           <view class="order-by">
-            <view class="item">综合</view>
-            <view class="item">价格</view>
-            <view class="item">销量</view>
+            <view class="item" :class="{'order-active': where.order==''}" @click="changeOrder('')">综合</view>
+            <view class="item" :class="{'order-active': where.order=='desc'||where.order=='asc'}" 
+              @click="changeOrder(where.order=='asc'?'desc':'asc')">价格</view>
+            <view class="item" :class="{'order-active': where.order=='sales'}" @click="changeOrder('sales')">销量</view>
           </view>
         </view>
         <viewPopup v-if="show===2" @close="show=0">
@@ -78,7 +79,7 @@
             <scroll-view scroll-y style="height: 230rpx;">
               <view class="classify-list">
                 <view class="classify-list-item u-line-1" :class="{'item-active': rightActive==index}"
-                  v-for="(item, index) in 6" :key="index">
+                  v-for="(item, index) in 6" :key="index" @click="changeThree(item, index)">
                   牛肉
                 </view>
               </view>
@@ -107,18 +108,68 @@
         </scroll-view>
       </view>
     </view>
+    
   </view>
 </template>
 
 <script setup>
+  import { onLoad } from "@dcloudio/uni-app"
   import { ref } from "vue"
-  import viewPopup from "@/components/viewPopup/index.vue"
+  import viewPopup from "@/components/viewPopup.vue"
+
+
+  const show = ref(0);
 
   const topActive = ref(0);
+  const changeOne = (item, index)=>{
+    console.log('选择', item, index);
+    topActive.value = index;
+    show.value = 0;
+  }
+  
   const leftActive = ref(2);
+  const changeTwo = (item, index)=>{
+    console.log('选择', item, index);
+    leftActive.value = index;
+    show.value = 0;
+  }
+  
   const rightActive = ref(1);
-  const show = ref(0);
-  const keyword = ref('')
+  const changeThree = (item, index)=>{
+    console.log('选择', item, index);
+    rightActive.value = index;
+    show.value = 0;
+  }
+  
+  const keyword = ref('');
+  
+  const searchKeyword = ()=>{
+    console.log('搜索', keyword.value);
+    where.value = keyword.value;
+  }
+  
+  const changeOrder = (order)=>{
+    console.log('排序', order);
+    where.value.order = order;
+  }
+  
+  const where = ref({
+    page: 1,
+    pageSize: 15,
+    keyword: '',
+    order: ''
+  })
+  const loading = ref(true);
+  const getGoodList = ()=>{
+    loading.value = true;
+    setTimeout(()=>{
+      loading.value = false;
+    },3000)
+  }
+  
+  onLoad(()=>{
+    getGoodList();
+  })
 </script>
 
 <style lang="scss">
@@ -373,6 +424,9 @@
           .item {
             padding-right: 20rpx;
           }
+          .order-active{
+            color: #20b128;
+          }
         }
       }
 
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 07bba25..2016e86 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,6 +1,24 @@
 <template>
 	<view>
-		
+		<view class="login-box">
+      <image class="logo" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/35adb202404271727457954.png"></image>
+      <view class="tips">欢迎登录里海商户采购平台</view>
+      <block v-if="true">
+        <view class="btn">
+          <up-button color="#20B128" size="large"><up-icon name="weixin-fill" color="#fff" size="28"></up-icon>微信登录</up-button>
+        </view>
+        <view class="btn">
+          <up-button color="#ECFFEE" size="large"><text style="color: #20B128;">使用短信验证登录</text></up-button>
+        </view>
+      </block>
+      <view class="agreement">
+        <image v-if="true" src="@/static/icon/n-check.png"></image>
+        <image v-else src="@/static/icon/check.png"></image>
+        <view>
+          我已同意<text>《用户协议》</text>与<text>《隐私政策》</text>
+        </view>
+      </view>
+    </view>
 	</view>
 </template>
 
@@ -10,8 +28,54 @@ import useUserStore from "@/store/user.js"
 const userStore = useUserStore(); //使用pinia进行状态管理
 
 
+
 </script>
 
 <style lang="scss">
+page{
+  background-color: #fff;
+}
+.login-box{
+  width: 700rpx;
+  height: 88vh;
+  margin: 0 auto;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding-top: 10vh;
+  position: relative;
   
+  .logo{
+    height: 152rpx;
+    width: 152rpx;
+  }
+  
+  .tips{
+    color: #444444;
+    font-size: 28rpx;
+    margin: 30rpx 0;
+  }
+  
+  .btn{
+    width: 600rpx;
+    margin-top: 40rpx;
+    font-size: 32rpx !important;
+  }
+  
+  .agreement{
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    color: #444;
+    image{
+      width: 40rpx;
+      height: 40rpx;
+      margin-right: 10rpx;
+    }
+  }
+}
 </style>
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 295779c..98c041a 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -9,7 +9,7 @@
       <image class="bg" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp"
         mode="widthFix"></image>
       <view class="u-card">
-        <up-avatar src="https://shop.lihaink.cn/static/images/f1.png" size="80"></up-avatar>
+        <up-avatar src="" size="80"></up-avatar>
         <view class="content">
           <view class="u-phone">151****6699</view>
           <view class="u-id">ID: 6655</view>
@@ -21,18 +21,18 @@
       <view class="order-info">
         <view class="info-head">我的订单</view>
         <view class="info-list">
-          <view class="list-item">
+          <view class="list-item" @click="navTo(1)">
             <image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f335a202404261401535608.png"></image>
             <view class="">待付款</view>
           </view>
-          <view class="list-item">
+          <view class="list-item" @click="navTo(2)">
             <image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/45241202404261403353935.png"></image>
             <view class="">待收货</view>
           </view>
-          <view class="list-item">
+          <!-- <view class="list-item">
             <image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/96915202404261403582769.png"></image>
             <view class="">售后/退款</view>
-          </view>
+          </view> -->
           <view class="list-item" @click="navTo()">
             <image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/abdcd202404261406199643.png"></image>
             <view class="">全部订单</view>
@@ -43,7 +43,7 @@
 
     <view class="card">
       <up-cell-group>
-        <up-cell title="我的地址" :isLink="true"></up-cell>
+        <up-cell title="我的地址" :isLink="true" url="/pagesOrder/addressList/addressList"></up-cell>
       </up-cell-group>
     </view>
 
@@ -51,7 +51,7 @@
       <up-cell-group>
         <up-cell title="意见反馈" :isLink="true"></up-cell>
         <up-cell title="关于我们" :isLink="true"></up-cell>
-        <up-cell title="设置" :isLink="true"></up-cell>
+        <up-cell title="设置" :isLink="true" url="/pages/login/login"></up-cell>
       </up-cell-group>
     </view>
   </view>
@@ -128,7 +128,7 @@
       left: 0;
       z-index: 3;
       background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/a8863202404261349533191.png');
-      background-size: 28% 100%;
+      background-size: 38% 100%;
       background-position: right;
       background-repeat: no-repeat;
       
diff --git a/pagesOrder/addressEdit/addressEdit.vue b/pagesOrder/addressEdit/addressEdit.vue
new file mode 100644
index 0000000..4c6ec42
--- /dev/null
+++ b/pagesOrder/addressEdit/addressEdit.vue
@@ -0,0 +1,100 @@
+<template>
+  <view class="">
+    <view class="card">
+      <up-form labelPosition="left" :model="formData" :rules="rules" ref="uForm" labelWidth="100">
+        <up-form-item label="收货人" prop="name" borderBottom>
+          <up-input v-model="formData.name" disabledColor="#ffffff" border="none" placeholder="请填写收货人姓名"></up-input>
+        </up-form-item>
+        <up-form-item label="联系电话" prop="phone" borderBottom>
+          <up-input v-model="formData.phone" disabledColor="#ffffff" type="number" placeholder="请填写联系电话"
+            border="none"></up-input>
+        </up-form-item>
+        <up-form-item label="详细地址" prop="address" borderBottom>
+          <up-input v-model="formData.address" disabledColor="#ffffff" placeholder="请填写详细地址" border="none"></up-input>
+        </up-form-item>
+      </up-form>
+    </view>
+    <view class="card">
+      <view class="is-default">
+        <view>设置为默认地址</view>
+        <up-switch v-model="formData.isDefault" activeColor="#20B128"></up-switch>
+      </view>
+    </view>
+    <view class="bottom-fixed">
+      <up-button color="#20B128" shape="circle" @click="submit">保存</up-button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import { onLoad } from "@dcloudio/uni-app"
+  import { ref } from "vue"
+
+  const mode = ref('add');
+
+  const formData = ref({
+    name: '',
+    phone: '',
+    address: '',
+    isDefault: false
+  })
+  const rules = ref({
+    name: [{ required: true, message: '请输入姓名', trigger: ['blur'] }],
+    phone: [{ required: true, message: '请输入手机号', trigger: ['blur'] }],
+    address: [{ required: true, message: '请输入地址', trigger: ['blur'] }]
+  })
+  const uForm = ref(null);
+  const submit = () => {
+    uForm.value.validate().then(() => {
+      console.log('验证通过');
+    }).catch(() => {
+      console.log('验证失败');
+    })
+  }
+
+  onLoad((options) => {
+    if (options.mode == 'edit') {
+      mode.value = 'edit';
+      uni.setNavigationBarTitle({
+        title: '编辑地址'
+      })
+    } else uni.setNavigationBarTitle({
+      title: '新增地址'
+    })
+  })
+</script>
+
+<style lang="scss">
+  .card {
+    margin: 20rpx;
+    background-color: #fff;
+    border-radius: 14rpx;
+    padding: 0 30rpx;
+
+    .is-default {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 20rpx 0;
+    }
+  }
+
+  .bottom-fixed {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    height: 120rpx;
+    height: calc(constant(safe-area-inset-bottom) + 120rpx);
+    /* 适用于iOS设备 */
+    height: calc(env(safe-area-inset-bottom) + 120rpx);
+    /* 适用于Android设备 */
+    width: 100%;
+    box-sizing: border-box;
+    background-color: #fff;
+    padding: 20rpx;
+    padding-bottom: calc(constant(safe-area-inset-bottom) + 20rpx);
+    /* 适用于iOS设备 */
+    padding-bottom: calc(env(safe-area-inset-bottom) + 20rpx);
+    /* 适用于Android设备 */
+  }
+</style>
\ No newline at end of file
diff --git a/pagesOrder/addressList/addressList.vue b/pagesOrder/addressList/addressList.vue
new file mode 100644
index 0000000..acdd9eb
--- /dev/null
+++ b/pagesOrder/addressList/addressList.vue
@@ -0,0 +1,148 @@
+<template>
+  <view class="list">
+    <view class="address-card" v-for="(item, index) in 3" :key="index">
+      <view class="address-info">
+        <view class="top">
+          <view class="name">收货人：小李</view>
+          <view class="phone">14566666666</view>
+        </view>
+        <view class="bottom">
+          四川泸州市龙马潭区莲花池街道商业街1号
+        </view>
+      </view>
+      <view class="btn-box">
+        <view class="left">
+          <image v-if="false" src="@/static/icon/check.png"></image>
+          <image v-else src="@/static/icon/n-check.png"></image>
+          <view>设为默认</view>
+        </view>
+        <view class="right">
+          <view class="btn" @click="showDelete(item)">
+            <up-icon name="trash"></up-icon>
+            删除
+          </view>
+          <view class="btn" @click="navTo('/pagesOrder/addressEdit/addressEdit?mode=edit')">
+            <up-icon name="edit-pen"></up-icon>
+            编辑
+          </view>
+        </view>
+      </view>
+    </view>
+    <view style="width: 100%;height: 150rpx;"></view>
+    <view class="bottom-fixed">
+      <up-button color="#20B128" shape="circle" @click="navTo('/pagesOrder/addressEdit/addressEdit')">新增地址</up-button>
+    </view>
+    <modal :show="show" title="确认删除吗" content="删除后不可恢复" @close="show=false" @change="deleteAddress"></modal>
+  </view>
+</template>
+
+<script setup>
+import { ref } from "vue"
+import modal from "@/components/modal.vue";
+
+const navTo = (url)=>{
+  uni.navigateTo({
+    url: url
+  })
+}
+
+const show = ref(false);
+const deleteInfo = ref({});
+const showDelete = (item)=>{
+  deleteInfo.value = item;
+  show.value = true;
+}
+
+const deleteAddress = ()=>{
+  console.log(deleteInfo.value);
+  show.value = false;
+}
+
+</script>
+
+<style lang="scss">
+  .address-card {
+    margin: 20rpx;
+    background-color: #fff;
+    border-radius: 14rpx;
+    box-sizing: border-box;
+    padding: 20rpx;
+    color: #444;
+
+    .address-info {
+      padding-bottom: 20rpx;
+      border-bottom: 1rpx solid #eee;
+      margin-bottom: 20rpx;
+
+      .top {
+        display: flex;
+        justify-content: space-between;
+        font-size: 28rpx;
+
+        .name {
+          color: #000;
+        }
+      }
+
+      .bottom {
+        font-size: 26rpx;
+        margin-top: 10rpx;
+      }
+    }
+
+    .btn-box {
+      display: flex;
+      justify-content: space-between;
+      font-size: 26rpx;
+      
+      .left{
+        display: flex;
+        align-items: center;
+        image{
+          width: 40rpx;
+          height: 40rpx;
+          margin-right: 6rpx;
+        }
+      }
+
+      .right {
+        display: flex;
+        color: #7a7a7a;
+        align-items: center;
+
+        .btn {
+          display: flex;
+          margin-left: 20rpx;
+          
+          &:active {
+            color: rgba(#7a7a7a, 0.8);
+            transition: background-color 0.5s;
+            animation: disappear 0.5s 0.5s forwards;
+          }
+        }
+      }
+    }
+  }
+  .bottom-fixed{
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    height: 120rpx;
+    height: calc(constant(safe-area-inset-bottom) + 120rpx); /* 适用于iOS设备 */
+    height: calc(env(safe-area-inset-bottom) + 120rpx); /* 适用于Android设备 */
+    width: 100%;
+    box-sizing: border-box;
+    background-color: #fff;
+    padding: 20rpx;
+    padding-bottom: calc(constant(safe-area-inset-bottom) + 20rpx); /* 适用于iOS设备 */
+    padding-bottom: calc(env(safe-area-inset-bottom) + 20rpx); /* 适用于Android设备 */
+  }
+  @keyframes disappear {
+    to {
+      opacity: 0;
+      /* 渐隐 */
+      transform: scale(0);
+      /* 缩小 */
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue
index 739736f..fd1d4a3 100644
--- a/pagesOrder/detail/detail.vue
+++ b/pagesOrder/detail/detail.vue
@@ -15,7 +15,8 @@
         </view>
       </view>
       <view class="address-btn">
-        <view style="width: 80px;"><up-button size="small" shape="circle" color="#f6f6f6" :customStyle="{color:'#666666'}">修改</up-button></view>
+        <view style="width: 80px;"><up-button @click="showAddress = true" size="small" shape="circle" color="#f6f6f6"
+            :customStyle="{color:'#666666'}">修改</up-button></view>
       </view>
     </view>
     <view class="m-card m-good">
@@ -54,7 +55,9 @@
       <view class="head-title">订单信息</view>
       <view class="row">
         <view>订单编号</view>
-        <view>wxo13546486484784555 | 复制</view>
+        <up-copy content="wxo13546486484784555">
+          <text>wxo13546486484784555 | 复制</text>
+        </up-copy>
       </view>
       <view class="row">
         <view>下单时间</view>
@@ -66,169 +69,222 @@
       </view>
     </view>
     <view style="width: 100%;height: 200rpx;"></view>
-    
+
     <view class="btn-box">
       <view style="color: #777777;" @click="showCancel=true">取消订单</view>
       <view style="width: 450rpx;">
         <up-button color="#20B128" shape="circle">立即支付 ¥50.00</up-button>
       </view>
     </view>
-    
+
     <up-popup :show="showCancel" closeable round="10" @close="showCancel=false">
-      <view class="cancle-popup">
+      <view class="cancel-popup">
         <view class="head-title">订单取消</view>
-        <view>
-          <view>不想要了</view>
-          <!-- <image></image> -->
+        <view class="row" v-for="(item,index) in cancelDict" :key="item.value" @click="cancelType=item.value">
+          <view>{{item.name}}</view>
+          <image v-if="cancelType==item.value" src="@/static/icon/check.png"></image>
+          <image v-else src="@/static/icon/n-check.png"></image>
         </view>
+        <up-button color="#20B128" shape="circle" @click="submitCancel">提交</up-button>
       </view>
     </up-popup>
+    <addressPopup :show="showAddress" @close="showAddress = false" @change="changeAddress"></addressPopup>
+    <modal :show="false" content="您还没有添加收货地址，请点击添加"></modal>
   </view>
 </template>
 
 <script setup>
-import { onLoad } from "@dcloudio/uni-app";
-import { ref } from "vue";
+  import { onLoad } from "@dcloudio/uni-app";
+  import { ref } from "vue";
+  import cancelDict from "@/dict/cancelDict.js";
+  import addressPopup from "@/components/addressPopup.vue";
+  import modal from "@/components/modal.vue";
 
-const showCancel = ref(false)
+  const showCancel = ref(false);
+  const showAddress = ref(false);
 
-onLoad((option)=>{
-  uni.setNavigationBarTitle({
-    title: option.type==1 ? '等待付款' : '订单详情'
+  const cancelType = ref(-1); //  取消取消类型
+
+  const submitCancel = () => {
+    showCancel.value = false;
+    console.log(cancelType.value);
+    uni.showToast({
+      title: '取消成功',
+      icon: 'none'
+    })
+  }
+
+  const changeAddress = (e) => {
+    showAddress.value = false;
+    console.log(e);
+  }
+
+  onLoad((option) => {
+    uni.setNavigationBarTitle({
+      title: option.type == 1 ? '等待付款' : '订单详情'
+    })
   })
-})
 </script>
 
 <style lang="scss">
-.count_down{
-  padding: 20rpx 0;
-  text-align: center;
-  color: #444444;
-  text{
-    color: #F55726;
-    padding: 0 10rpx;
+  .count_down {
+    padding: 20rpx 0;
+    text-align: center;
+    color: #444444;
+
+    text {
+      color: #F55726;
+      padding: 0 10rpx;
+    }
   }
-}
-.m-card{
-  width: 710rpx;
-  margin: 0 auto;
-  background-color: #fff;
-  border-radius: 14rpx;
-  box-sizing: border-box;
-  padding: 20rpx;
-  color: #333333;
-}
-.m-address{
-  margin-bottom: 20rpx;
-  display: flex;
-  justify-content: space-between;
-  color: #999999;
-  
-  .address-info{
-    width: 510rpx;
-    .top{
-      display: flex;
-      font-size: 28rpx;
-      .t-name{
-        color: #444;
-        margin: 0 10rpx;
+
+  .m-card {
+    width: 710rpx;
+    margin: 0 auto;
+    background-color: #fff;
+    border-radius: 14rpx;
+    box-sizing: border-box;
+    padding: 20rpx;
+    color: #333333;
+  }
+
+  .m-address {
+    margin-bottom: 20rpx;
+    display: flex;
+    justify-content: space-between;
+    color: #999999;
+
+    .address-info {
+      width: 510rpx;
+
+      .top {
+        display: flex;
+        font-size: 28rpx;
+
+        .t-name {
+          color: #444;
+          margin: 0 10rpx;
+        }
+      }
+
+      .bottom {
+        font-size: 24rpx;
       }
     }
-    .bottom{
-      font-size: 24rpx;
-    }
   }
-}
 
-.m-good{
-  display: flex;
-  justify-content: space-between;
-  margin-bottom: 20rpx;
-  .image{
-    width: 160rpx;
-    height: 160rpx;
-    margin-right: 20rpx;
-  }
-  .body-content{
-    width: 490rpx;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    color: #989898;
-    
-    .title{
-      display: flex;
-      justify-content: space-between;
-      font-size: 28rpx;
-      color: #444;
-    }
-    .tips{
-      display: flex;
-      justify-content: space-between;
-      font-size: 24rpx;
-      margin-top: 10rpx;
-    }
-    .time{
-      background-color: #F6F6F6;
-      padding: 5rpx 10rpx;
-      font-size: 26rpx;
-      color: #444;
-      border-radius: 10rpx;
-    }
-  }
-}
-
-.good-info{
-  margin-bottom: 20rpx;
-  .head-title{
-    margin-bottom: 18rpx;
-    color: #000;
-    font-weight: bold;
-  }
-  .row{
+  .m-good {
     display: flex;
     justify-content: space-between;
-    margin-bottom: 18rpx;
-    
-    .red{
+    margin-bottom: 20rpx;
+
+    .image {
+      width: 160rpx;
+      height: 160rpx;
+      margin-right: 20rpx;
+    }
+
+    .body-content {
+      width: 490rpx;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      color: #989898;
+
+      .title {
+        display: flex;
+        justify-content: space-between;
+        font-size: 28rpx;
+        color: #444;
+      }
+
+      .tips {
+        display: flex;
+        justify-content: space-between;
+        font-size: 24rpx;
+        margin-top: 10rpx;
+      }
+
+      .time {
+        background-color: #F6F6F6;
+        padding: 5rpx 10rpx;
+        font-size: 26rpx;
+        color: #444;
+        border-radius: 10rpx;
+      }
+    }
+  }
+
+  .good-info {
+    margin-bottom: 20rpx;
+
+    .head-title {
+      margin-bottom: 18rpx;
+      color: #000;
+      font-weight: bold;
+    }
+
+    .row {
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 18rpx;
+
+      .red {
+        color: #F55726;
+      }
+    }
+
+    .row-need {
+      display: flex;
+      justify-content: flex-end;
       color: #F55726;
     }
+
+    text {
+      font-size: 22rpx;
+    }
   }
-  .row-need{
+
+  .btn-box {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    height: 120rpx;
+    height: calc(constant(safe-area-inset-bottom) + 120rpx);
+    /* 适用于iOS设备 */
+    height: calc(env(safe-area-inset-bottom) + 120rpx);
+    /* 适用于Android设备 */
+    width: 100%;
+    box-sizing: border-box;
+    background-color: #fff;
+    padding: 20rpx;
+    padding-bottom: calc(constant(safe-area-inset-bottom) + 20rpx);
+    /* 适用于iOS设备 */
+    padding-bottom: calc(env(safe-area-inset-bottom) + 20rpx);
+    /* 适用于Android设备 */
     display: flex;
-    justify-content: flex-end;
-    color: #F55726;
+    justify-content: space-between;
+    align-items: center;
   }
-  text{
-    font-size: 22rpx;
-  }
-}
 
-.btn-box{
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  height: 120rpx;
-  height: calc(constant(safe-area-inset-bottom) + 120rpx); /* 适用于iOS设备 */
-  height: calc(env(safe-area-inset-bottom) + 120rpx); /* 适用于Android设备 */
-  width: 100%;
-  box-sizing: border-box;
-  background-color: #fff;
-  padding: 20rpx;
-  padding-bottom: calc(constant(safe-area-inset-bottom) + 20rpx); /* 适用于iOS设备 */
-  padding-bottom: calc(env(safe-area-inset-bottom) + 20rpx); /* 适用于Android设备 */
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
+  .cancel-popup {
+    padding: 30rpx;
 
-.cancle-popup{
-  height: 500rpx;
-  .head-title{
-    font-weight: bold;
-    text-align: center;
-    height: 80rpx;
-    line-height: 80rpx;
+    .head-title {
+      font-weight: bold;
+      text-align: center;
+      margin-bottom: 20rpx;
+    }
+
+    .row {
+      display: flex;
+      justify-content: space-between;
+      padding-bottom: 20rpx;
+
+      image {
+        width: 40rpx;
+        height: 40rpx;
+      }
+    }
   }
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pagesOrder/order/order.vue b/pagesOrder/order/order.vue
index 0ced034..c88b8d7 100644
--- a/pagesOrder/order/order.vue
+++ b/pagesOrder/order/order.vue
@@ -1,6 +1,5 @@
 <template>
   <view>
-
     <up-sticky bgColor="#fff">
       <view style="padding: 10rpx 20rpx 0 20rpx;">
         <up-search shape="round" :actionStyle="{color: '#20b128'}" ></up-search>
@@ -58,7 +57,7 @@
         </scroll-view>
       </swiper-item>
       <!-- 退款/售后 -->
-      <swiper-item class="swiper-item">
+      <!-- <swiper-item class="swiper-item">
         <scroll-view scroll-y style="height: 100%;width: 100%;">
           <view class="page-box">
             <view v-if="true" class="list">
@@ -72,30 +71,27 @@
             <view style="width: 100%;height: 200rpx;"></view>
           </view>
         </scroll-view>
-      </swiper-item>
+      </swiper-item> -->
     </swiper>
 
   </view>
 </template>
 
 <script setup>
+  import { onLoad } from "@dcloudio/uni-app"
   import { ref } from 'vue';
   import good from "./component/good.vue";
 
-  // 创建响应式数据  
-  const list = ref(['购物车', '常买', '收藏']);
   const tabsActive = ref(0)
-  // 定义方法  
   const changeTab = ({index}) => {
     tabsActive.value = index;
     swiperCurrent.value = index;
   }
-
   const tablist = ref([
     { name: '全部' },
     { name: '待付款' },
     { name: '待收货' },
-    { name: '退款/售后' },
+    // { name: '退款/售后' },
   ]);
 
   const swiperCurrent = ref(0);
@@ -103,6 +99,14 @@
     swiperCurrent.value = current;
     tabsActive.value = current;
   }
+  
+  onLoad((options)=>{
+    if(options.type){
+      tabsActive.value = +options.type;
+      swiperCurrent.value = +options.type;
+    }
+  })
+  
 </script>
 
 <style lang="scss">
diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js
index 1e7dedb..d5b49f8 100644
--- a/unpackage/dist/dev/mp-weixin/app.js
+++ b/unpackage/dist/dev/mp-weixin/app.js
@@ -124,6 +124,8 @@ if (!Math) {
   "./pages/my/my.js";
   "./pagesOrder/order/order.js";
   "./pagesOrder/detail/detail.js";
+  "./pagesOrder/addressList/addressList.js";
+  "./pagesOrder/addressEdit/addressEdit.js";
 }
 const _sfc_main = {
   onLaunch: function() {
diff --git a/unpackage/dist/dev/mp-weixin/app.json b/unpackage/dist/dev/mp-weixin/app.json
index 0131482..d73ee19 100644
--- a/unpackage/dist/dev/mp-weixin/app.json
+++ b/unpackage/dist/dev/mp-weixin/app.json
@@ -10,7 +10,9 @@
       "root": "pagesOrder",
       "pages": [
         "order/order",
-        "detail/detail"
+        "detail/detail",
+        "addressList/addressList",
+        "addressEdit/addressEdit"
       ]
     }
   ],
diff --git a/unpackage/dist/dev/mp-weixin/common/assets.js b/unpackage/dist/dev/mp-weixin/common/assets.js
index 55c844f..00b973b 100644
--- a/unpackage/dist/dev/mp-weixin/common/assets.js
+++ b/unpackage/dist/dev/mp-weixin/common/assets.js
@@ -1,5 +1,5 @@
 "use strict";
-const _imports_0 = "/static/icon/n-check.png";
-const _imports_1 = "/static/icon/check.png";
+const _imports_1 = "/static/icon/n-check.png";
+const _imports_0 = "/static/icon/check.png";
 exports._imports_0 = _imports_0;
 exports._imports_1 = _imports_1;
diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js
index 648da31..1f30bdd 100644
--- a/unpackage/dist/dev/mp-weixin/common/vendor.js
+++ b/unpackage/dist/dev/mp-weixin/common/vendor.js
@@ -6079,6 +6079,10 @@ function stringify(styles) {
   }
   return ret;
 }
+function setRef(ref2, id, opts = {}) {
+  const { $templateRefs } = getCurrentInstance();
+  $templateRefs.push({ i: id, r: ref2, k: opts.k, f: opts.f });
+}
 const o = (value, key) => vOn(value, key);
 const f = (source, renderItem) => vFor(source, renderItem);
 const s = (value) => stringifyStyle(value);
@@ -6086,6 +6090,7 @@ const e = (target, ...sources) => extend(target, ...sources);
 const n = (value) => normalizeClass(value);
 const t = (val) => toDisplayString(val);
 const p = (props) => renderProps(props);
+const sr = (ref2, id, opts) => setRef(ref2, id, opts);
 function createApp$1(rootComponent, rootProps = null) {
   rootComponent && (rootComponent.mpType = "app");
   return createVueApp(rootComponent, rootProps).use(plugin);
@@ -7708,4 +7713,6 @@ exports.p = p;
 exports.ref = ref;
 exports.resolveComponent = resolveComponent;
 exports.s = s;
+exports.sr = sr;
 exports.t = t;
+exports.unref = unref;
diff --git a/unpackage/dist/dev/mp-weixin/components/addressPopup.js b/unpackage/dist/dev/mp-weixin/components/addressPopup.js
new file mode 100644
index 0000000..24b55aa
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/components/addressPopup.js
@@ -0,0 +1,88 @@
+"use strict";
+const common_vendor = require("../common/vendor.js");
+const common_assets = require("../common/assets.js");
+if (!Array) {
+  const _easycom_up_icon2 = common_vendor.resolveComponent("up-icon");
+  const _easycom_u_tag2 = common_vendor.resolveComponent("u-tag");
+  const _easycom_up_button2 = common_vendor.resolveComponent("up-button");
+  const _easycom_up_popup2 = common_vendor.resolveComponent("up-popup");
+  (_easycom_up_icon2 + _easycom_u_tag2 + _easycom_up_button2 + _easycom_up_popup2)();
+}
+const _easycom_up_icon = () => "../uni_modules/uview-plus/components/u-icon/u-icon.js";
+const _easycom_u_tag = () => "../uni_modules/uview-plus/components/u-tag/u-tag.js";
+const _easycom_up_button = () => "../uni_modules/uview-plus/components/u-button/u-button.js";
+const _easycom_up_popup = () => "../uni_modules/uview-plus/components/u-popup/u-popup.js";
+if (!Math) {
+  (_easycom_up_icon + _easycom_u_tag + _easycom_up_button + _easycom_up_popup)();
+}
+const _sfc_main = {
+  __name: "addressPopup",
+  props: {
+    show: {
+      type: Boolean,
+      default: false
+    }
+  },
+  emits: ["close", "change"],
+  setup(__props, { emit: __emit }) {
+    const addressType = common_vendor.ref(-1);
+    const emit = __emit;
+    const close = () => {
+      emit("close");
+    };
+    const submitAddress = () => {
+      emit("change", addressType.value);
+    };
+    const navTo = (url) => {
+      common_vendor.index.navigateTo({
+        url
+      });
+    };
+    return (_ctx, _cache) => {
+      return {
+        a: common_vendor.p({
+          name: "edit-pen",
+          color: "#20B128"
+        }),
+        b: common_vendor.o(($event) => navTo("/pagesOrder/addressList/addressList")),
+        c: common_vendor.p({
+          name: "plus",
+          color: "#20B128"
+        }),
+        d: common_vendor.o(($event) => navTo("/pagesOrder/addressEdit/addressEdit")),
+        e: common_vendor.f(10, (item, index, i0) => {
+          return common_vendor.e({
+            a: "dc6b9753-3-" + i0 + ",dc6b9753-0",
+            b: addressType.value == index
+          }, addressType.value == index ? {
+            c: common_assets._imports_0
+          } : {
+            d: common_assets._imports_1
+          }, {
+            e: index,
+            f: common_vendor.o(($event) => addressType.value = index, index)
+          });
+        }),
+        f: common_vendor.p({
+          text: "默认",
+          type: "success",
+          plain: true,
+          size: "mini"
+        }),
+        g: common_vendor.o(submitAddress),
+        h: common_vendor.p({
+          color: "#20B128",
+          shape: "circle"
+        }),
+        i: common_vendor.o(close),
+        j: common_vendor.p({
+          show: __props.show,
+          closeable: true,
+          round: "10"
+        })
+      };
+    };
+  }
+};
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-dc6b9753"], ["__file", "D:/里海数字乡村/purchase-let/components/addressPopup.vue"]]);
+wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/components/addressPopup.json b/unpackage/dist/dev/mp-weixin/components/addressPopup.json
new file mode 100644
index 0000000..03507ce
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/components/addressPopup.json
@@ -0,0 +1,9 @@
+{
+  "component": true,
+  "usingComponents": {
+    "up-icon": "../uni_modules/uview-plus/components/u-icon/u-icon",
+    "u-tag": "../uni_modules/uview-plus/components/u-tag/u-tag",
+    "up-button": "../uni_modules/uview-plus/components/u-button/u-button",
+    "up-popup": "../uni_modules/uview-plus/components/u-popup/u-popup"
+  }
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/components/addressPopup.wxml b/unpackage/dist/dev/mp-weixin/components/addressPopup.wxml
new file mode 100644
index 0000000..de0c9c9
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/components/addressPopup.wxml
@@ -0,0 +1 @@
+<up-popup wx:if="{{j}}" class="data-v-dc6b9753" u-s="{{['d']}}" bindclose="{{i}}" u-i="dc6b9753-0" bind:__l="__l" u-p="{{j}}"><view class="address-popup data-v-dc6b9753"><view class="head-title data-v-dc6b9753">收货地址</view><view class="list-admin data-v-dc6b9753"><view class="data-v-dc6b9753">常用地址</view><view class="admin-btn data-v-dc6b9753"><view class="btn data-v-dc6b9753" bindtap="{{b}}"><up-icon wx:if="{{a}}" class="data-v-dc6b9753" u-i="dc6b9753-1,dc6b9753-0" bind:__l="__l" u-p="{{a}}"></up-icon>管理</view><view class="btn data-v-dc6b9753" bindtap="{{d}}"><up-icon wx:if="{{c}}" class="data-v-dc6b9753" u-i="dc6b9753-2,dc6b9753-0" bind:__l="__l" u-p="{{c}}"></up-icon>新增</view></view></view><scroll-view class="data-v-dc6b9753" style="height:600rpx;padding-bottom:20rpx" scroll-y><view wx:for="{{e}}" wx:for-item="item" wx:key="e" class="row data-v-dc6b9753" bindtap="{{item.f}}"><view class="content data-v-dc6b9753"><view class="top data-v-dc6b9753"><view class="name data-v-dc6b9753">小李</view><view class="phone data-v-dc6b9753">151****9999</view><u-tag wx:if="{{f}}" class="data-v-dc6b9753" style="pointer-events:none" u-i="{{item.a}}" bind:__l="__l" u-p="{{f}}"></u-tag></view><view class="bottom u-line-2 data-v-dc6b9753">四川泸州市龙马潭区莲花池街道商业街1号</view></view><image wx:if="{{item.b}}" class="data-v-dc6b9753" src="{{item.c}}"></image><image wx:else class="data-v-dc6b9753" src="{{item.d}}"></image></view></scroll-view><up-button wx:if="{{h}}" class="data-v-dc6b9753" u-s="{{['d']}}" bindclick="{{g}}" u-i="dc6b9753-4,dc6b9753-0" bind:__l="__l" u-p="{{h}}">确认</up-button></view></up-popup>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/components/addressPopup.wxss b/unpackage/dist/dev/mp-weixin/components/addressPopup.wxss
new file mode 100644
index 0000000..a3ab217
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/components/addressPopup.wxss
@@ -0,0 +1,83 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.address-popup.data-v-dc6b9753 {
+  padding: 30rpx;
+}
+.address-popup .head-title.data-v-dc6b9753 {
+  font-weight: bold;
+  text-align: center;
+  margin-bottom: 20rpx;
+}
+.address-popup .list-admin.data-v-dc6b9753 {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 20rpx;
+}
+.address-popup .list-admin .admin-btn.data-v-dc6b9753 {
+  display: flex;
+  color: #20B128;
+}
+.address-popup .list-admin .admin-btn .btn.data-v-dc6b9753 {
+  margin-left: 20rpx;
+  display: flex;
+  align-items: center;
+}
+.address-popup .list-admin .admin-btn .btn.data-v-dc6b9753:active {
+  color: rgba(32, 177, 40, 0.8);
+  transition: background-color 0.5s;
+  animation: disappear-dc6b9753 0.5s 0.5s forwards;
+}
+.address-popup .row.data-v-dc6b9753 {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding-bottom: 20rpx;
+  border-bottom: 1rpx solid #eee;
+  margin-bottom: 20rpx;
+}
+.address-popup .row.data-v-dc6b9753:last-child {
+  border-bottom: none;
+  margin-bottom: 0;
+}
+.address-popup .row .content .top.data-v-dc6b9753 {
+  display: flex;
+}
+.address-popup .row .content .top view.data-v-dc6b9753 {
+  margin-right: 20rpx;
+}
+.address-popup .row image.data-v-dc6b9753 {
+  width: 40rpx;
+  height: 40rpx;
+  flex-shrink: 0;
+}
+@keyframes disappear-dc6b9753 {
+to {
+    opacity: 0;
+    /* 渐隐 */
+    transform: scale(0);
+    /* 缩小 */
+}
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/components/modal.js b/unpackage/dist/dev/mp-weixin/components/modal.js
new file mode 100644
index 0000000..c0b768d
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/components/modal.js
@@ -0,0 +1,72 @@
+"use strict";
+const common_vendor = require("../common/vendor.js");
+if (!Array) {
+  const _easycom_up_button2 = common_vendor.resolveComponent("up-button");
+  const _easycom_up_popup2 = common_vendor.resolveComponent("up-popup");
+  (_easycom_up_button2 + _easycom_up_popup2)();
+}
+const _easycom_up_button = () => "../uni_modules/uview-plus/components/u-button/u-button.js";
+const _easycom_up_popup = () => "../uni_modules/uview-plus/components/u-popup/u-popup.js";
+if (!Math) {
+  (_easycom_up_button + _easycom_up_popup)();
+}
+const _sfc_main = {
+  __name: "modal",
+  props: {
+    show: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      default: "确认操作吗"
+    },
+    content: {
+      type: String,
+      default: "确认后继续下一步操作"
+    },
+    confirmText: {
+      type: String,
+      default: "确认"
+    },
+    cancleText: {
+      type: String,
+      default: "取消"
+    }
+  },
+  emits: ["close", "change"],
+  setup(__props, { emit: __emit }) {
+    const emit = __emit;
+    const close = () => {
+      emit("close");
+    };
+    const change = () => {
+      emit("change");
+    };
+    return (_ctx, _cache) => {
+      return {
+        a: common_vendor.t(__props.title),
+        b: common_vendor.t(__props.content),
+        c: common_vendor.t(__props.cancleText),
+        d: common_vendor.o(close),
+        e: common_vendor.p({
+          plain: true,
+          color: "#999"
+        }),
+        f: common_vendor.t(__props.confirmText),
+        g: common_vendor.o(change),
+        h: common_vendor.p({
+          color: "#20B128"
+        }),
+        i: common_vendor.o(close),
+        j: common_vendor.p({
+          show: __props.show,
+          round: "10",
+          mode: "center"
+        })
+      };
+    };
+  }
+};
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-b2596e17"], ["__file", "D:/里海数字乡村/purchase-let/components/modal.vue"]]);
+wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/components/modal.json b/unpackage/dist/dev/mp-weixin/components/modal.json
new file mode 100644
index 0000000..35ba1ad
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/components/modal.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "up-button": "../uni_modules/uview-plus/components/u-button/u-button",
+    "up-popup": "../uni_modules/uview-plus/components/u-popup/u-popup"
+  }
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/components/modal.wxml b/unpackage/dist/dev/mp-weixin/components/modal.wxml
new file mode 100644
index 0000000..e68e1ce
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/components/modal.wxml
@@ -0,0 +1 @@
+<up-popup wx:if="{{j}}" class="data-v-b2596e17" u-s="{{['d']}}" bindclose="{{i}}" u-i="b2596e17-0" bind:__l="__l" u-p="{{j}}"><view class="modal-popup data-v-b2596e17"><view class="head-title data-v-b2596e17">{{a}}</view><view class="content data-v-b2596e17">{{b}}</view><view class="btn-box data-v-b2596e17"><view class="data-v-b2596e17" style="width:230rpx"><up-button wx:if="{{e}}" class="data-v-b2596e17" u-s="{{['d']}}" bindclick="{{d}}" u-i="b2596e17-1,b2596e17-0" bind:__l="__l" u-p="{{e}}">{{c}}</up-button></view><view class="data-v-b2596e17" style="width:230rpx"><up-button wx:if="{{h}}" class="data-v-b2596e17" u-s="{{['d']}}" bindclick="{{g}}" u-i="b2596e17-2,b2596e17-0" bind:__l="__l" u-p="{{h}}">{{f}}</up-button></view></view></view></up-popup>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/components/modal.wxss b/unpackage/dist/dev/mp-weixin/components/modal.wxss
new file mode 100644
index 0000000..6f3a2de
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/components/modal.wxss
@@ -0,0 +1,43 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.modal-popup.data-v-b2596e17 {
+  width: 500rpx;
+  padding: 40rpx;
+}
+.modal-popup .head-title.data-v-b2596e17 {
+  font-size: 32rpx;
+  text-align: center;
+}
+.modal-popup .content.data-v-b2596e17 {
+  font-size: 26rpx;
+  color: #999;
+  text-align: center;
+  padding: 40rpx 0;
+}
+.modal-popup .btn-box.data-v-b2596e17 {
+  display: flex;
+  justify-content: space-between;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/components/viewPopup/index.js b/unpackage/dist/dev/mp-weixin/components/viewPopup.js
similarity index 83%
rename from unpackage/dist/dev/mp-weixin/components/viewPopup/index.js
rename to unpackage/dist/dev/mp-weixin/components/viewPopup.js
index d48e1ca..eb25b32 100644
--- a/unpackage/dist/dev/mp-weixin/components/viewPopup/index.js
+++ b/unpackage/dist/dev/mp-weixin/components/viewPopup.js
@@ -1,15 +1,15 @@
 "use strict";
-const common_vendor = require("../../common/vendor.js");
+const common_vendor = require("../common/vendor.js");
 if (!Array) {
   const _easycom_up_icon2 = common_vendor.resolveComponent("up-icon");
   _easycom_up_icon2();
 }
-const _easycom_up_icon = () => "../../uni_modules/uview-plus/components/u-icon/u-icon.js";
+const _easycom_up_icon = () => "../uni_modules/uview-plus/components/u-icon/u-icon.js";
 if (!Math) {
   _easycom_up_icon();
 }
 const _sfc_main = {
-  __name: "index",
+  __name: "viewPopup",
   props: {
     nav: {
       type: Boolean,
@@ -54,5 +54,5 @@ const _sfc_main = {
     };
   }
 };
-const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-db7dc4ea"], ["__file", "D:/里海数字乡村/purchase-let/components/viewPopup/index.vue"]]);
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-9faf4b3c"], ["__file", "D:/里海数字乡村/purchase-let/components/viewPopup.vue"]]);
 wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/components/viewPopup.json b/unpackage/dist/dev/mp-weixin/components/viewPopup.json
new file mode 100644
index 0000000..31cd973
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/components/viewPopup.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "up-icon": "../uni_modules/uview-plus/components/u-icon/u-icon"
+  }
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/components/viewPopup.wxml b/unpackage/dist/dev/mp-weixin/components/viewPopup.wxml
new file mode 100644
index 0000000..e4a301e
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/components/viewPopup.wxml
@@ -0,0 +1 @@
+<view class="view-popup data-v-9faf4b3c"><view wx:if="{{a}}" class="data-v-9faf4b3c" style="{{'width:100%' + ';' + ('height:' + b)}}"></view><view class="center data-v-9faf4b3c"><slot></slot><view class="up data-v-9faf4b3c" bindtap="{{d}}"><text class="data-v-9faf4b3c">点击收起</text><up-icon wx:if="{{c}}" class="data-v-9faf4b3c" u-i="9faf4b3c-0" bind:__l="__l" u-p="{{c}}"></up-icon></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/components/viewPopup/index.wxss b/unpackage/dist/dev/mp-weixin/components/viewPopup.wxss
similarity index 88%
rename from unpackage/dist/dev/mp-weixin/components/viewPopup/index.wxss
rename to unpackage/dist/dev/mp-weixin/components/viewPopup.wxss
index 39c6f53..6d211c7 100644
--- a/unpackage/dist/dev/mp-weixin/components/viewPopup/index.wxss
+++ b/unpackage/dist/dev/mp-weixin/components/viewPopup.wxss
@@ -23,7 +23,7 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
-.view-popup.data-v-db7dc4ea {
+.view-popup.data-v-9faf4b3c {
   height: 100vh;
   width: 100%;
   background-color: rgba(0, 0, 0, 0.3);
@@ -32,10 +32,10 @@
   left: 0;
   z-index: 10;
 }
-.view-popup .center.data-v-db7dc4ea {
-  animation: slideDown-db7dc4ea 0.3s forwards;
+.view-popup .center.data-v-9faf4b3c {
+  animation: slideDown-9faf4b3c 0.3s forwards;
 }
-.view-popup .up.data-v-db7dc4ea {
+.view-popup .up.data-v-9faf4b3c {
   width: 100%;
   height: 80rpx;
   background-color: #fff;
@@ -46,7 +46,7 @@
   align-items: center;
   font-size: 24rpx;
 }
-@keyframes slideDown-db7dc4ea {
+@keyframes slideDown-9faf4b3c {
 from {
     transform: translateY(-100%);
     /* 初始状态：向上偏移100% */
diff --git a/unpackage/dist/dev/mp-weixin/components/viewPopup/index.json b/unpackage/dist/dev/mp-weixin/components/viewPopup/index.json
deleted file mode 100644
index 12b0b18..0000000
--- a/unpackage/dist/dev/mp-weixin/components/viewPopup/index.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "up-icon": "../../uni_modules/uview-plus/components/u-icon/u-icon"
-  }
-}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/components/viewPopup/index.wxml b/unpackage/dist/dev/mp-weixin/components/viewPopup/index.wxml
deleted file mode 100644
index f7fd0eb..0000000
--- a/unpackage/dist/dev/mp-weixin/components/viewPopup/index.wxml
+++ /dev/null
@@ -1 +0,0 @@
-<view class="view-popup data-v-db7dc4ea"><view wx:if="{{a}}" class="data-v-db7dc4ea" style="{{'width:100%' + ';' + ('height:' + b)}}"></view><view class="center data-v-db7dc4ea"><slot></slot><view class="up data-v-db7dc4ea" bindtap="{{d}}"><text class="data-v-db7dc4ea">点击收起</text><up-icon wx:if="{{c}}" class="data-v-db7dc4ea" u-i="db7dc4ea-0" bind:__l="__l" u-p="{{c}}"></up-icon></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/dict/cancelDict.js b/unpackage/dist/dev/mp-weixin/dict/cancelDict.js
new file mode 100644
index 0000000..eca354e
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/dict/cancelDict.js
@@ -0,0 +1,32 @@
+"use strict";
+const list = [
+  {
+    name: "不想要了/临时有事",
+    value: 1
+  },
+  {
+    name: "点错了/点多了/点少了",
+    value: 2
+  },
+  {
+    name: "地址/电话填错了",
+    value: 3
+  },
+  {
+    name: "送达时间选错了",
+    value: 4
+  },
+  {
+    name: "支付遇到问题",
+    value: 5
+  },
+  {
+    name: "其他平台更便宜",
+    value: 6
+  },
+  {
+    name: "其他原因",
+    value: 7
+  }
+];
+exports.list = list;
diff --git a/unpackage/dist/dev/mp-weixin/pages/cart/cart.js b/unpackage/dist/dev/mp-weixin/pages/cart/cart.js
index c1c14cd..cbfd297 100644
--- a/unpackage/dist/dev/mp-weixin/pages/cart/cart.js
+++ b/unpackage/dist/dev/mp-weixin/pages/cart/cart.js
@@ -31,6 +31,8 @@ const _sfc_main = {
       swiperCurrent.value = current;
       tabsActive.value = current;
     };
+    const settleAccounts = () => {
+    };
     return (_ctx, _cache) => {
       return common_vendor.e({
         a: common_vendor.f(list.value, (item, index, i0) => {
@@ -49,9 +51,9 @@ const _sfc_main = {
           return common_vendor.e({
             a: index % 3 == 0
           }, index % 3 == 0 ? {
-            b: common_assets._imports_0
+            b: common_assets._imports_1
           } : {
-            c: common_assets._imports_1
+            c: common_assets._imports_0
           }, {
             d: "da603134-1-" + i0,
             e: "da603134-2-" + i0,
@@ -86,19 +88,13 @@ const _sfc_main = {
         k: swiperCurrent.value,
         l: common_vendor.o(animationfinish)
       }, {
-        n: common_assets._imports_1
+        n: common_assets._imports_0
       }, {
+        o: common_vendor.o(settleAccounts),
         p: common_vendor.p({
-          size: "small",
-          plain: true,
-          color: "#989898",
-          shape: "circle"
-        }),
-        q: common_vendor.p({
-          size: "small",
-          plain: true,
-          color: "#989898",
-          shape: "circle"
+          color: "#20b128",
+          shape: "circle",
+          disabled: false
         })
       }, {
         r: common_vendor.p({
diff --git a/unpackage/dist/dev/mp-weixin/pages/cart/cart.wxml b/unpackage/dist/dev/mp-weixin/pages/cart/cart.wxml
index 3eddb5a..c3bd9fa 100644
--- a/unpackage/dist/dev/mp-weixin/pages/cart/cart.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/cart/cart.wxml
@@ -1 +1 @@
-<view><up-navbar wx:if="{{b}}" u-s="{{['left']}}" u-i="da603134-0" bind:__l="__l" u-p="{{b}}"><view style="display:flex" slot="left"><view wx:for="{{a}}" wx:for-item="item" wx:key="c" class="{{['tabs', item.b && 'tabs-active']}}" bindtap="{{item.d}}">{{item.a}}</view></view></up-navbar><swiper class="swiper-box" current="{{k}}" bindanimationfinish="{{l}}"><swiper-item class="swiper-item"><scroll-view scroll-y style="height:100%;width:100%"><view class="page-box1"><view class="total"><view>共计<text style="color:#20B128">3</text>件</view><view wx:if="{{true}}">管理</view><view wx:else>完成</view></view><view wx:if="{{true}}" class="list" style="margin-top:80rpx"><view wx:for="{{c}}" wx:for-item="item" wx:key="f" class="shop-item"><view class="shop-check"><image wx:if="{{item.a}}" src="{{item.b}}"></image><image wx:else src="{{item.c}}"></image></view><image class="shop-img" src="https://cdn.uviewui.com/uview/album/1.jpg"></image><view class="shop-content"><view class="title"><view class="name u-line-2">好吃的瓜果</view><view class="tip u-line-1">香味辛辣|葱香味浓|调味增香香味辛辣|葱香味浓|调味增香</view></view><view class="price-btn"><view class="price">￥12.00</view><view class="btn"><u--icon wx:if="{{d}}" u-i="{{item.d}}" bind:__l="__l" u-p="{{d}}"></u--icon><view class="num">{{e}}</view><u--icon wx:if="{{f}}" u-i="{{item.e}}" bind:__l="__l" u-p="{{f}}"></u--icon></view></view></view></view></view><view wx:else style="margin-top:100rpx"><up-empty wx:if="{{g}}" u-i="da603134-3" bind:__l="__l" u-p="{{g}}"></up-empty></view><view style="width:100%;height:200rpx"></view></view></scroll-view></swiper-item><swiper-item class="swiper-item"><scroll-view scroll-y style="height:100%;width:100%"><view class="page-box1"><view wx:if="{{true}}" class="list"><view wx:for="{{h}}" wx:for-item="item" wx:key="b" class="shop-item"><image class="shop-img" src="https://cdn.uviewui.com/uview/album/1.jpg"></image><view class="shop-content" style="width:490rpx"><view class="title"><view class="name u-line-2">好吃的瓜果</view><view class="tip u-line-1">香味辛辣|葱香味浓|调味增香香味辛辣|葱香味浓|调味增香</view></view><view class="price-btn"><view class="price">￥12.00</view><view class="btn"><up-button wx:if="{{i}}" u-s="{{['d']}}" u-i="{{item.a}}" bind:__l="__l" u-p="{{i}}">加入购物车</up-button></view></view></view></view></view><view wx:else style="margin-top:100rpx"><up-empty wx:if="{{j}}" u-i="da603134-5" bind:__l="__l" u-p="{{j}}"></up-empty></view><view style="width:100%;height:200rpx"></view></view></scroll-view></swiper-item></swiper><up-transition wx:if="{{r}}" u-s="{{['d']}}" u-i="da603134-6" bind:__l="__l" u-p="{{r}}"><view class="cart-btn"><view class="cart-check"><image wx:if="{{false}}" src="{{m}}"></image><image wx:else src="{{n}}"></image><text style="font-size:24rpx">全选</text></view><view wx:if="{{false}}" class="btn-box"><view class="all-price"><view style="width:80rpx">合计:</view><view class="price"><text style="font-size:24rpx">¥</text><text style="font-size:34rpx">20</text><text style="font-size:24rpx">.30</text></view></view><up-button wx:if="{{o}}" u-s="{{['d']}}" u-i="da603134-7,da603134-6" bind:__l="__l" u-p="{{o}}">去结算<text>(2)</text></up-button></view><view wx:else class="btn-box"><view style="width:100px;margin-right:20rpx"><up-button wx:if="{{p}}" u-s="{{['d']}}" u-i="da603134-8,da603134-6" bind:__l="__l" u-p="{{p}}">移入收藏夹</up-button></view><view style="width:80px"><up-button wx:if="{{q}}" u-s="{{['d']}}" u-i="da603134-9,da603134-6" bind:__l="__l" u-p="{{q}}">删除</up-button></view></view></view></up-transition></view>
\ No newline at end of file
+<view><up-navbar wx:if="{{b}}" u-s="{{['left']}}" u-i="da603134-0" bind:__l="__l" u-p="{{b}}"><view style="display:flex" slot="left"><view wx:for="{{a}}" wx:for-item="item" wx:key="c" class="{{['tabs', item.b && 'tabs-active']}}" bindtap="{{item.d}}">{{item.a}}</view></view></up-navbar><swiper class="swiper-box" current="{{k}}" bindanimationfinish="{{l}}"><swiper-item class="swiper-item"><scroll-view scroll-y style="height:100%;width:100%"><view class="page-box1"><view class="total"><view>共计<text style="color:#20B128">3</text>件</view><view wx:if="{{true}}">管理</view><view wx:else>完成</view></view><view wx:if="{{true}}" class="list" style="margin-top:80rpx"><view wx:for="{{c}}" wx:for-item="item" wx:key="f" class="shop-item"><view class="shop-check"><image wx:if="{{item.a}}" src="{{item.b}}"></image><image wx:else src="{{item.c}}"></image></view><image class="shop-img" src="https://cdn.uviewui.com/uview/album/1.jpg"></image><view class="shop-content"><view class="title"><view class="name u-line-2">好吃的瓜果</view><view class="tip u-line-1">香味辛辣|葱香味浓|调味增香香味辛辣|葱香味浓|调味增香</view></view><view class="price-btn"><view class="price">￥12.00</view><view class="btn"><u--icon wx:if="{{d}}" u-i="{{item.d}}" bind:__l="__l" u-p="{{d}}"></u--icon><view class="num">{{e}}</view><u--icon wx:if="{{f}}" u-i="{{item.e}}" bind:__l="__l" u-p="{{f}}"></u--icon></view></view></view></view></view><view wx:else style="margin-top:100rpx"><up-empty wx:if="{{g}}" u-i="da603134-3" bind:__l="__l" u-p="{{g}}"></up-empty></view><view style="width:100%;height:200rpx"></view></view></scroll-view></swiper-item><swiper-item class="swiper-item"><scroll-view scroll-y style="height:100%;width:100%"><view class="page-box1"><view wx:if="{{true}}" class="list"><view wx:for="{{h}}" wx:for-item="item" wx:key="b" class="shop-item"><image class="shop-img" src="https://cdn.uviewui.com/uview/album/1.jpg"></image><view class="shop-content" style="width:490rpx"><view class="title"><view class="name u-line-2">好吃的瓜果</view><view class="tip u-line-1">香味辛辣|葱香味浓|调味增香香味辛辣|葱香味浓|调味增香</view></view><view class="price-btn"><view class="price">￥12.00</view><view class="btn"><up-button wx:if="{{i}}" u-s="{{['d']}}" u-i="{{item.a}}" bind:__l="__l" u-p="{{i}}">加入购物车</up-button></view></view></view></view></view><view wx:else style="margin-top:100rpx"><up-empty wx:if="{{j}}" u-i="da603134-5" bind:__l="__l" u-p="{{j}}"></up-empty></view><view style="width:100%;height:200rpx"></view></view></scroll-view></swiper-item></swiper><up-transition wx:if="{{r}}" u-s="{{['d']}}" u-i="da603134-6" bind:__l="__l" u-p="{{r}}"><view class="cart-btn"><view class="cart-check"><image wx:if="{{false}}" src="{{m}}"></image><image wx:else src="{{n}}"></image><text style="font-size:24rpx">全选</text></view><view wx:if="{{true}}" class="btn-box"><view class="all-price"><view style="width:80rpx">合计:</view><view class="price"><text style="font-size:24rpx">¥</text><text style="font-size:34rpx">20</text><text style="font-size:24rpx">.30</text></view></view><up-button wx:if="{{p}}" u-s="{{['d']}}" bindclick="{{o}}" u-i="da603134-7,da603134-6" bind:__l="__l" u-p="{{p}}">去结算<text>(2)</text></up-button></view><view wx:else class="btn-box"><view style="width:80px"><up-button wx:if="{{q}}" u-s="{{['d']}}" u-i="da603134-8,da603134-6" bind:__l="__l" u-p="{{q}}">删除</up-button></view></view></view></up-transition></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.js b/unpackage/dist/dev/mp-weixin/pages/index/index.js
index dc3be81..0251d78 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.js
@@ -14,79 +14,130 @@ const _easycom_u__icon = () => "../../uni_modules/uview-plus/components/u-icon/u
 if (!Math) {
   (_easycom_up_search + _easycom_up_navbar + _easycom_up_icon + viewPopup + _easycom_u__icon)();
 }
-const viewPopup = () => "../../components/viewPopup/index.js";
+const viewPopup = () => "../../components/viewPopup.js";
 const _sfc_main = {
   __name: "index",
   setup(__props) {
-    const topActive = common_vendor.ref(0);
-    const leftActive = common_vendor.ref(2);
-    const rightActive = common_vendor.ref(1);
     const show = common_vendor.ref(0);
+    const topActive = common_vendor.ref(0);
+    const changeOne = (item, index) => {
+      console.log("选择", item, index);
+      topActive.value = index;
+      show.value = 0;
+    };
+    const leftActive = common_vendor.ref(2);
+    const changeTwo = (item, index) => {
+      console.log("选择", item, index);
+      leftActive.value = index;
+      show.value = 0;
+    };
+    const rightActive = common_vendor.ref(1);
+    const changeThree = (item, index) => {
+      console.log("选择", item, index);
+      rightActive.value = index;
+      show.value = 0;
+    };
     const keyword = common_vendor.ref("");
+    const searchKeyword = () => {
+      console.log("搜索", keyword.value);
+      where.value = keyword.value;
+    };
+    const changeOrder = (order) => {
+      console.log("排序", order);
+      where.value.order = order;
+    };
+    const where = common_vendor.ref({
+      page: 1,
+      pageSize: 15,
+      keyword: "",
+      order: ""
+    });
+    const loading = common_vendor.ref(true);
+    const getGoodList = () => {
+      loading.value = true;
+      setTimeout(() => {
+        loading.value = false;
+      }, 3e3);
+    };
+    common_vendor.onLoad(() => {
+      getGoodList();
+    });
     return (_ctx, _cache) => {
       return common_vendor.e({
-        a: common_vendor.o(($event) => keyword.value = $event),
-        b: common_vendor.p({
+        a: common_vendor.o(searchKeyword),
+        b: common_vendor.o(($event) => keyword.value = $event),
+        c: common_vendor.p({
           placeholder: "请输入商品",
           showAction: false,
           modelValue: keyword.value
         }),
-        c: common_vendor.p({
+        d: common_vendor.p({
           placeholder: true
         }),
-        d: common_vendor.f(10, (item, index, i0) => {
+        e: common_vendor.f(10, (item, index, i0) => {
           return {
             a: common_vendor.t(item),
             b: topActive.value == index ? 1 : "",
-            c: index
+            c: index,
+            d: common_vendor.o(($event) => changeOne(item, index), index)
           };
         }),
-        e: common_vendor.p({
+        f: common_vendor.p({
           name: "list"
         }),
-        f: common_vendor.o(($event) => show.value = 1),
-        g: show.value === 1
+        g: common_vendor.o(($event) => show.value = 1),
+        h: show.value === 1
       }, show.value === 1 ? {
-        h: common_vendor.f(55, (item, index, i0) => {
+        i: common_vendor.f(10, (item, index, i0) => {
           return {
             a: common_vendor.t(item),
             b: topActive.value == index ? 1 : "",
-            c: index
+            c: index,
+            d: common_vendor.o(($event) => changeOne(item, index), index)
           };
         }),
-        i: common_vendor.o(($event) => show.value = 0),
-        j: common_vendor.p({
+        j: common_vendor.o(($event) => show.value = 0),
+        k: common_vendor.p({
           nav: true
         })
       } : {}, {
-        k: common_vendor.f(20, (item, index, i0) => {
+        l: common_vendor.f(20, (item, index, i0) => {
           return {
             a: common_vendor.t(item),
             b: leftActive.value == index ? 1 : "",
-            c: index
+            c: index,
+            d: common_vendor.o(($event) => changeTwo(item, index), index)
           };
         }),
-        l: common_vendor.f(6, (item, index, i0) => {
+        m: common_vendor.f(6, (item, index, i0) => {
           return {
             a: rightActive.value == index ? 1 : "",
-            b: index
+            b: index,
+            c: common_vendor.o(($event) => changeThree(item, index), index)
           };
         }),
-        m: common_vendor.p({
+        n: common_vendor.p({
           name: "arrow-down"
         }),
-        n: common_vendor.o(($event) => show.value = 2),
-        o: show.value === 2
+        o: common_vendor.o(($event) => show.value = 2),
+        p: where.value.order == "" ? 1 : "",
+        q: common_vendor.o(($event) => changeOrder("")),
+        r: where.value.order == "desc" || where.value.order == "asc" ? 1 : "",
+        s: common_vendor.o(($event) => changeOrder(where.value.order == "asc" ? "desc" : "asc")),
+        t: where.value.order == "sales" ? 1 : "",
+        v: common_vendor.o(($event) => changeOrder("sales")),
+        w: show.value === 2
       }, show.value === 2 ? {
-        p: common_vendor.f(6, (item, index, i0) => {
+        x: common_vendor.f(6, (item, index, i0) => {
           return {
             a: rightActive.value == index ? 1 : "",
-            b: index
+            b: index,
+            c: common_vendor.o(($event) => changeThree(item, index), index)
           };
         }),
-        q: common_vendor.o(($event) => show.value = 0)
+        y: common_vendor.o(($event) => show.value = 0)
       } : {}, {
-        r: common_vendor.f(20, (item, index, i0) => {
+        z: common_vendor.f(20, (item, index, i0) => {
           return {
             a: common_vendor.t(item),
             b: "1ba6254c-6-" + i0,
@@ -94,13 +145,13 @@ const _sfc_main = {
             d: index
           };
         }),
-        s: common_vendor.p({
+        A: common_vendor.p({
           name: "minus-circle-fill",
           size: "20",
           color: "#20b128"
         }),
-        t: common_vendor.t(1),
-        v: common_vendor.p({
+        B: common_vendor.t(1),
+        C: common_vendor.p({
           name: "plus-circle-fill",
           size: "20",
           color: "#20b128"
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.json b/unpackage/dist/dev/mp-weixin/pages/index/index.json
index a9a3b6c..7d00401 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.json
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.json
@@ -7,6 +7,6 @@
     "up-navbar": "../../uni_modules/uview-plus/components/u-navbar/u-navbar",
     "up-icon": "../../uni_modules/uview-plus/components/u-icon/u-icon",
     "u--icon": "../../uni_modules/uview-plus/components/u-icon/u-icon",
-    "view-popup": "../../components/viewPopup/index"
+    "view-popup": "../../components/viewPopup"
   }
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.wxml b/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
index 2170d04..4953722 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
@@ -1 +1 @@
-<view class="content"><up-navbar wx:if="{{c}}" u-s="{{['left']}}" style="z-index:10080" u-i="1ba6254c-0" bind:__l="__l" u-p="{{c}}"><view style="width:540rpx" slot="left"><up-search wx:if="{{b}}" u-i="1ba6254c-1,1ba6254c-0" bind:__l="__l" bindupdateModelValue="{{a}}" u-p="{{b}}"></up-search></view></up-navbar><view style="position:relative;overflow:hidden"><scroll-view class="head-view" scroll-x><view class="list"><view wx:for="{{d}}" wx:for-item="item" wx:key="c" class="{{['item', item.b && 'item-active']}}"><image class="c-img" src="https://cdn.uviewui.com/uview/album/1.jpg"></image><view class="c-text u-line-1">惠农生活{{item.a}}</view></view><view class="item" style="width:80rpx;height:20rpx"></view></view></scroll-view><view class="r-btn" bindtap="{{f}}"><view>全</view><view>部</view><up-icon wx:if="{{e}}" u-i="1ba6254c-2" bind:__l="__l" u-p="{{e}}"></up-icon></view></view><view-popup wx:if="{{g}}" u-s="{{['d']}}" bindclose="{{i}}" u-i="1ba6254c-3" bind:__l="__l" u-p="{{j}}"><view class="cateOne"><view class="head-title">全部分类</view><scroll-view scroll-y style="height:60vh"><view class="list"><view wx:for="{{h}}" wx:for-item="item" wx:key="c" class="{{['item', item.b && 'item-active']}}"><image class="c-img" src="https://cdn.uviewui.com/uview/album/1.jpg"></image><view class="c-text u-line-1">惠农生活{{item.a}}</view></view></view></scroll-view></view></view-popup><view class="scroll-box"><scroll-view class="left" scroll-y><view wx:for="{{k}}" wx:for-item="item" wx:key="c" class="{{['item', 'u-line-1', item.b && 'item-active']}}">惠农生活{{item.a}}</view><view style="width:100%;height:200rpx"></view></scroll-view><view class="right"><view class="classify"><scroll-view style="height:90rpx" scroll-x><view class="classify-list"><view wx:for="{{l}}" wx:for-item="item" wx:key="b" class="{{['classify-list-item', 'u-line-1', item.a && 'item-active']}}"> 牛肉 </view><view style="width:70rpx;flex-shrink:0"></view></view></scroll-view><view class="done" bindtap="{{n}}"><up-icon wx:if="{{m}}" u-i="1ba6254c-4" bind:__l="__l" u-p="{{m}}"></up-icon></view><view class="order-by"><view class="item">综合</view><view class="item">价格</view><view class="item">销量</view></view></view><view-popup wx:if="{{o}}" u-s="{{['d']}}" bindclose="{{q}}" u-i="1ba6254c-5" bind:__l="__l"><view class="cateOne"><scroll-view scroll-y style="height:230rpx"><view class="classify-list"><view wx:for="{{p}}" wx:for-item="item" wx:key="b" class="{{['classify-list-item', 'u-line-1', item.a && 'item-active']}}"> 牛肉 </view></view></scroll-view></view></view-popup><scroll-view class="list" scroll-y><view wx:for="{{r}}" wx:for-item="item" wx:key="d" class="shop-item"><image class="shop-img" src="https://cdn.uviewui.com/uview/album/1.jpg"></image><view class="shop-content"><view class="title"><view class="name u-line-2">好吃的瓜果{{item.a}}</view><view class="tip u-line-1">香味辛辣|葱香味浓|调味增香香味辛辣|葱香味浓|调味增香</view></view><view class="price-btn"><view class="price">￥12.00</view><view class="btn"><u--icon wx:if="{{s}}" u-i="{{item.b}}" bind:__l="__l" u-p="{{s}}"></u--icon><view class="num">{{t}}</view><u--icon wx:if="{{v}}" u-i="{{item.c}}" bind:__l="__l" u-p="{{v}}"></u--icon></view></view></view></view><view style="width:100%;height:200rpx"></view></scroll-view></view></view></view>
\ No newline at end of file
+<view class="content"><up-navbar wx:if="{{d}}" u-s="{{['left']}}" style="z-index:10080" u-i="1ba6254c-0" bind:__l="__l" u-p="{{d}}"><view style="width:500rpx" slot="left"><up-search wx:if="{{c}}" bindsearch="{{a}}" u-i="1ba6254c-1,1ba6254c-0" bind:__l="__l" bindupdateModelValue="{{b}}" u-p="{{c}}"></up-search></view></up-navbar><view style="position:relative;overflow:hidden"><scroll-view class="head-view" scroll-x><view class="list"><view wx:for="{{e}}" wx:for-item="item" wx:key="c" class="{{['item', item.b && 'item-active']}}" bindtap="{{item.d}}"><image class="c-img" src="https://cdn.uviewui.com/uview/album/1.jpg"></image><view class="c-text u-line-1">惠农生活{{item.a}}</view></view><view class="item" style="width:80rpx;height:20rpx"></view></view></scroll-view><view class="r-btn" bindtap="{{g}}"><view>全</view><view>部</view><up-icon wx:if="{{f}}" u-i="1ba6254c-2" bind:__l="__l" u-p="{{f}}"></up-icon></view></view><view-popup wx:if="{{h}}" u-s="{{['d']}}" bindclose="{{j}}" u-i="1ba6254c-3" bind:__l="__l" u-p="{{k}}"><view class="cateOne"><view class="head-title">全部分类</view><scroll-view scroll-y style="height:600rpx"><view class="list"><view wx:for="{{i}}" wx:for-item="item" wx:key="c" class="{{['item', item.b && 'item-active']}}" bindtap="{{item.d}}"><image class="c-img" src="https://cdn.uviewui.com/uview/album/1.jpg"></image><view class="c-text u-line-1">惠农生活{{item.a}}</view></view></view></scroll-view></view></view-popup><view class="scroll-box"><scroll-view class="left" scroll-y><view wx:for="{{l}}" wx:for-item="item" wx:key="c" class="{{['item', 'u-line-1', item.b && 'item-active']}}" bindtap="{{item.d}}">惠农生活{{item.a}}</view><view style="width:100%;height:200rpx"></view></scroll-view><view class="right"><view class="classify"><scroll-view style="height:90rpx" scroll-x><view class="classify-list"><view wx:for="{{m}}" wx:for-item="item" wx:key="b" class="{{['classify-list-item', 'u-line-1', item.a && 'item-active']}}" bindtap="{{item.c}}"> 牛肉 </view><view style="width:70rpx;flex-shrink:0"></view></view></scroll-view><view class="done" bindtap="{{o}}"><up-icon wx:if="{{n}}" u-i="1ba6254c-4" bind:__l="__l" u-p="{{n}}"></up-icon></view><view class="order-by"><view class="{{['item', p && 'order-active']}}" bindtap="{{q}}">综合</view><view class="{{['item', r && 'order-active']}}" bindtap="{{s}}">价格</view><view class="{{['item', t && 'order-active']}}" bindtap="{{v}}">销量</view></view></view><view-popup wx:if="{{w}}" u-s="{{['d']}}" bindclose="{{y}}" u-i="1ba6254c-5" bind:__l="__l"><view class="cateOne"><scroll-view scroll-y style="height:230rpx"><view class="classify-list"><view wx:for="{{x}}" wx:for-item="item" wx:key="b" class="{{['classify-list-item', 'u-line-1', item.a && 'item-active']}}" bindtap="{{item.c}}"> 牛肉 </view></view></scroll-view></view></view-popup><scroll-view class="list" scroll-y><view wx:for="{{z}}" wx:for-item="item" wx:key="d" class="shop-item"><image class="shop-img" src="https://cdn.uviewui.com/uview/album/1.jpg"></image><view class="shop-content"><view class="title"><view class="name u-line-2">好吃的瓜果{{item.a}}</view><view class="tip u-line-1">香味辛辣|葱香味浓|调味增香香味辛辣|葱香味浓|调味增香</view></view><view class="price-btn"><view class="price">￥12.00</view><view class="btn"><u--icon wx:if="{{A}}" u-i="{{item.b}}" bind:__l="__l" u-p="{{A}}"></u--icon><view class="num">{{B}}</view><u--icon wx:if="{{C}}" u-i="{{item.c}}" bind:__l="__l" u-p="{{C}}"></u--icon></view></view></view></view><view style="width:100%;height:200rpx"></view></scroll-view></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.wxss b/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
index d951fe5..21e2f54 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
@@ -235,6 +235,9 @@
 .scroll-box .right .classify .order-by .item {
   padding-right: 20rpx;
 }
+.scroll-box .right .classify .order-by .order-active {
+  color: #20b128;
+}
 .scroll-box .right .list {
   height: calc(100vh - var(--window-top) - var(--window-bottom) - 180rpx - 150rpx);
 }
diff --git a/unpackage/dist/dev/mp-weixin/pages/login/login.js b/unpackage/dist/dev/mp-weixin/pages/login/login.js
index 83b3486..cdd7640 100644
--- a/unpackage/dist/dev/mp-weixin/pages/login/login.js
+++ b/unpackage/dist/dev/mp-weixin/pages/login/login.js
@@ -1,12 +1,39 @@
 "use strict";
-const store_user = require("../../store/user.js");
 const common_vendor = require("../../common/vendor.js");
+const common_assets = require("../../common/assets.js");
+const store_user = require("../../store/user.js");
+if (!Array) {
+  const _easycom_up_icon2 = common_vendor.resolveComponent("up-icon");
+  const _easycom_up_button2 = common_vendor.resolveComponent("up-button");
+  (_easycom_up_icon2 + _easycom_up_button2)();
+}
+const _easycom_up_icon = () => "../../uni_modules/uview-plus/components/u-icon/u-icon.js";
+const _easycom_up_button = () => "../../uni_modules/uview-plus/components/u-button/u-button.js";
+if (!Math) {
+  (_easycom_up_icon + _easycom_up_button)();
+}
 const _sfc_main = {
   __name: "login",
   setup(__props) {
     store_user.useUserStore();
     return (_ctx, _cache) => {
-      return {};
+      return common_vendor.e({
+        a: common_vendor.p({
+          name: "weixin-fill",
+          color: "#fff",
+          size: "28"
+        }),
+        b: common_vendor.p({
+          color: "#20B128",
+          size: "large"
+        }),
+        c: common_vendor.p({
+          color: "#ECFFEE",
+          size: "large"
+        })
+      }, {
+        d: common_assets._imports_1
+      });
     };
   }
 };
diff --git a/unpackage/dist/dev/mp-weixin/pages/login/login.json b/unpackage/dist/dev/mp-weixin/pages/login/login.json
index b3e7122..69d8c79 100644
--- a/unpackage/dist/dev/mp-weixin/pages/login/login.json
+++ b/unpackage/dist/dev/mp-weixin/pages/login/login.json
@@ -1,5 +1,8 @@
 {
   "navigationBarTitleText": "登录",
   "enablePullDownRefresh": false,
-  "usingComponents": {}
+  "usingComponents": {
+    "up-icon": "../../uni_modules/uview-plus/components/u-icon/u-icon",
+    "up-button": "../../uni_modules/uview-plus/components/u-button/u-button"
+  }
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/login/login.wxml b/unpackage/dist/dev/mp-weixin/pages/login/login.wxml
index 8dcff42..123eb03 100644
--- a/unpackage/dist/dev/mp-weixin/pages/login/login.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/login/login.wxml
@@ -1 +1 @@
-<view></view>
\ No newline at end of file
+<view><view class="login-box"><image class="logo" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/35adb202404271727457954.png"></image><view class="tips">欢迎登录里海商户采购平台</view><block wx:if="{{true}}"><view class="btn"><up-button wx:if="{{b}}" u-s="{{['d']}}" u-i="23c3038c-0" bind:__l="__l" u-p="{{b}}"><up-icon wx:if="{{a}}" u-i="23c3038c-1,23c3038c-0" bind:__l="__l" u-p="{{a}}"></up-icon>微信登录</up-button></view><view class="btn"><up-button wx:if="{{c}}" u-s="{{['d']}}" u-i="23c3038c-2" bind:__l="__l" u-p="{{c}}"><text style="color:#20B128">使用短信验证登录</text></up-button></view></block><view class="agreement"><image wx:if="{{true}}" src="{{d}}"></image><image wx:else src="{{e}}"></image><view> 我已同意<text>《用户协议》</text>与<text>《隐私政策》</text></view></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/login/login.wxss b/unpackage/dist/dev/mp-weixin/pages/login/login.wxss
index e69de29..7794be8 100644
--- a/unpackage/dist/dev/mp-weixin/pages/login/login.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/login/login.wxss
@@ -0,0 +1,67 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+page {
+  background-color: #fff;
+}
+.login-box {
+  width: 700rpx;
+  height: 88vh;
+  margin: 0 auto;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding-top: 10vh;
+  position: relative;
+}
+.login-box .logo {
+  height: 152rpx;
+  width: 152rpx;
+}
+.login-box .tips {
+  color: #444444;
+  font-size: 28rpx;
+  margin: 30rpx 0;
+}
+.login-box .btn {
+  width: 600rpx;
+  margin-top: 40rpx;
+  font-size: 32rpx !important;
+}
+.login-box .agreement {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  color: #444;
+}
+.login-box .agreement image {
+  width: 40rpx;
+  height: 40rpx;
+  margin-right: 10rpx;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/my/my.js b/unpackage/dist/dev/mp-weixin/pages/my/my.js
index 75f5332..8bf9b15 100644
--- a/unpackage/dist/dev/mp-weixin/pages/my/my.js
+++ b/unpackage/dist/dev/mp-weixin/pages/my/my.js
@@ -29,25 +29,29 @@ const _sfc_main = {
           bgColor: "rgba(0,0,0,0)"
         }),
         b: common_vendor.p({
-          src: "https://shop.lihaink.cn/static/images/f1.png",
+          src: "",
           size: "80"
         }),
-        c: common_vendor.o(($event) => navTo()),
-        d: common_vendor.p({
+        c: common_vendor.o(($event) => navTo(1)),
+        d: common_vendor.o(($event) => navTo(2)),
+        e: common_vendor.o(($event) => navTo()),
+        f: common_vendor.p({
           title: "我的地址",
-          isLink: true
+          isLink: true,
+          url: "/pagesOrder/addressList/addressList"
         }),
-        e: common_vendor.p({
+        g: common_vendor.p({
           title: "意见反馈",
           isLink: true
         }),
-        f: common_vendor.p({
+        h: common_vendor.p({
           title: "关于我们",
           isLink: true
         }),
-        g: common_vendor.p({
+        i: common_vendor.p({
           title: "设置",
-          isLink: true
+          isLink: true,
+          url: "/pages/login/login"
         })
       };
     };
diff --git a/unpackage/dist/dev/mp-weixin/pages/my/my.wxml b/unpackage/dist/dev/mp-weixin/pages/my/my.wxml
index 2efad21..3f66cfb 100644
--- a/unpackage/dist/dev/mp-weixin/pages/my/my.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/my/my.wxml
@@ -1 +1 @@
-<view><up-navbar wx:if="{{a}}" u-s="{{['left']}}" u-i="39cfeb26-0" bind:__l="__l" u-p="{{a}}"><view slot="left"></view></up-navbar><view class="user-info"><image class="bg" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp" mode="widthFix"></image><view class="u-card"><up-avatar wx:if="{{b}}" u-i="39cfeb26-1" bind:__l="__l" u-p="{{b}}"></up-avatar><view class="content"><view class="u-phone">151****6699</view><view class="u-id">ID: 6655</view></view></view></view><view class="order-info-box"><view class="order-info"><view class="info-head">我的订单</view><view class="info-list"><view class="list-item"><image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f335a202404261401535608.png"></image><view class="">待付款</view></view><view class="list-item"><image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/45241202404261403353935.png"></image><view class="">待收货</view></view><view class="list-item"><image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/96915202404261403582769.png"></image><view class="">售后/退款</view></view><view class="list-item" bindtap="{{c}}"><image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/abdcd202404261406199643.png"></image><view class="">全部订单</view></view></view></view></view><view class="card"><up-cell-group u-s="{{['d']}}" u-i="39cfeb26-2" bind:__l="__l"><up-cell wx:if="{{d}}" u-i="39cfeb26-3,39cfeb26-2" bind:__l="__l" u-p="{{d}}"></up-cell></up-cell-group></view><view class="card"><up-cell-group u-s="{{['d']}}" u-i="39cfeb26-4" bind:__l="__l"><up-cell wx:if="{{e}}" u-i="39cfeb26-5,39cfeb26-4" bind:__l="__l" u-p="{{e}}"></up-cell><up-cell wx:if="{{f}}" u-i="39cfeb26-6,39cfeb26-4" bind:__l="__l" u-p="{{f}}"></up-cell><up-cell wx:if="{{g}}" u-i="39cfeb26-7,39cfeb26-4" bind:__l="__l" u-p="{{g}}"></up-cell></up-cell-group></view></view>
\ No newline at end of file
+<view><up-navbar wx:if="{{a}}" u-s="{{['left']}}" u-i="39cfeb26-0" bind:__l="__l" u-p="{{a}}"><view slot="left"></view></up-navbar><view class="user-info"><image class="bg" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp" mode="widthFix"></image><view class="u-card"><up-avatar wx:if="{{b}}" u-i="39cfeb26-1" bind:__l="__l" u-p="{{b}}"></up-avatar><view class="content"><view class="u-phone">151****6699</view><view class="u-id">ID: 6655</view></view></view></view><view class="order-info-box"><view class="order-info"><view class="info-head">我的订单</view><view class="info-list"><view class="list-item" bindtap="{{c}}"><image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f335a202404261401535608.png"></image><view class="">待付款</view></view><view class="list-item" bindtap="{{d}}"><image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/45241202404261403353935.png"></image><view class="">待收货</view></view><view class="list-item" bindtap="{{e}}"><image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/abdcd202404261406199643.png"></image><view class="">全部订单</view></view></view></view></view><view class="card"><up-cell-group u-s="{{['d']}}" u-i="39cfeb26-2" bind:__l="__l"><up-cell wx:if="{{f}}" u-i="39cfeb26-3,39cfeb26-2" bind:__l="__l" u-p="{{f}}"></up-cell></up-cell-group></view><view class="card"><up-cell-group u-s="{{['d']}}" u-i="39cfeb26-4" bind:__l="__l"><up-cell wx:if="{{g}}" u-i="39cfeb26-5,39cfeb26-4" bind:__l="__l" u-p="{{g}}"></up-cell><up-cell wx:if="{{h}}" u-i="39cfeb26-6,39cfeb26-4" bind:__l="__l" u-p="{{h}}"></up-cell><up-cell wx:if="{{i}}" u-i="39cfeb26-7,39cfeb26-4" bind:__l="__l" u-p="{{i}}"></up-cell></up-cell-group></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/my/my.wxss b/unpackage/dist/dev/mp-weixin/pages/my/my.wxss
index 3fb80dc..1371ad2 100644
--- a/unpackage/dist/dev/mp-weixin/pages/my/my.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/my/my.wxss
@@ -74,7 +74,7 @@
   left: 0;
   z-index: 3;
   background-image: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/def/a8863202404261349533191.png");
-  background-size: 28% 100%;
+  background-size: 38% 100%;
   background-position: right;
   background-repeat: no-repeat;
 }
diff --git a/unpackage/dist/dev/mp-weixin/pagesOrder/addressEdit/addressEdit.js b/unpackage/dist/dev/mp-weixin/pagesOrder/addressEdit/addressEdit.js
new file mode 100644
index 0000000..0ee288f
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pagesOrder/addressEdit/addressEdit.js
@@ -0,0 +1,116 @@
+"use strict";
+const common_vendor = require("../../common/vendor.js");
+if (!Array) {
+  const _easycom_up_input2 = common_vendor.resolveComponent("up-input");
+  const _easycom_up_form_item2 = common_vendor.resolveComponent("up-form-item");
+  const _easycom_up_form2 = common_vendor.resolveComponent("up-form");
+  const _easycom_up_switch2 = common_vendor.resolveComponent("up-switch");
+  const _easycom_up_button2 = common_vendor.resolveComponent("up-button");
+  (_easycom_up_input2 + _easycom_up_form_item2 + _easycom_up_form2 + _easycom_up_switch2 + _easycom_up_button2)();
+}
+const _easycom_up_input = () => "../../uni_modules/uview-plus/components/u-input/u-input.js";
+const _easycom_up_form_item = () => "../../uni_modules/uview-plus/components/u-form-item/u-form-item.js";
+const _easycom_up_form = () => "../../uni_modules/uview-plus/components/u-form/u-form.js";
+const _easycom_up_switch = () => "../../uni_modules/uview-plus/components/u-switch/u-switch.js";
+const _easycom_up_button = () => "../../uni_modules/uview-plus/components/u-button/u-button.js";
+if (!Math) {
+  (_easycom_up_input + _easycom_up_form_item + _easycom_up_form + _easycom_up_switch + _easycom_up_button)();
+}
+const _sfc_main = {
+  __name: "addressEdit",
+  setup(__props) {
+    const mode = common_vendor.ref("add");
+    const formData = common_vendor.ref({
+      name: "",
+      phone: "",
+      address: "",
+      isDefault: false
+    });
+    const rules = common_vendor.ref({
+      name: [{ required: true, message: "请输入姓名", trigger: ["blur"] }],
+      phone: [{ required: true, message: "请输入手机号", trigger: ["blur"] }],
+      address: [{ required: true, message: "请输入地址", trigger: ["blur"] }]
+    });
+    const uForm = common_vendor.ref(null);
+    const submit = () => {
+      uForm.value.validate().then(() => {
+        console.log("验证通过");
+      }).catch(() => {
+        console.log("验证失败");
+      });
+    };
+    common_vendor.onLoad((options) => {
+      if (options.mode == "edit") {
+        mode.value = "edit";
+        common_vendor.index.setNavigationBarTitle({
+          title: "编辑地址"
+        });
+      } else
+        common_vendor.index.setNavigationBarTitle({
+          title: "新增地址"
+        });
+    });
+    return (_ctx, _cache) => {
+      return {
+        a: common_vendor.o(($event) => formData.value.name = $event),
+        b: common_vendor.p({
+          disabledColor: "#ffffff",
+          border: "none",
+          placeholder: "请填写收货人姓名",
+          modelValue: formData.value.name
+        }),
+        c: common_vendor.p({
+          label: "收货人",
+          prop: "name",
+          borderBottom: true
+        }),
+        d: common_vendor.o(($event) => formData.value.phone = $event),
+        e: common_vendor.p({
+          disabledColor: "#ffffff",
+          type: "number",
+          placeholder: "请填写联系电话",
+          border: "none",
+          modelValue: formData.value.phone
+        }),
+        f: common_vendor.p({
+          label: "联系电话",
+          prop: "phone",
+          borderBottom: true
+        }),
+        g: common_vendor.o(($event) => formData.value.address = $event),
+        h: common_vendor.p({
+          disabledColor: "#ffffff",
+          placeholder: "请填写详细地址",
+          border: "none",
+          modelValue: formData.value.address
+        }),
+        i: common_vendor.p({
+          label: "详细地址",
+          prop: "address",
+          borderBottom: true
+        }),
+        j: common_vendor.sr(uForm, "663ade36-0", {
+          "k": "uForm"
+        }),
+        k: common_vendor.p({
+          labelPosition: "left",
+          model: formData.value,
+          rules: rules.value,
+          labelWidth: "100"
+        }),
+        l: common_vendor.o(($event) => formData.value.isDefault = $event),
+        m: common_vendor.p({
+          activeColor: "#20B128",
+          modelValue: formData.value.isDefault
+        }),
+        n: common_vendor.o(submit),
+        o: common_vendor.p({
+          color: "#20B128",
+          shape: "circle"
+        })
+      };
+    };
+  }
+};
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__file", "D:/里海数字乡村/purchase-let/pagesOrder/addressEdit/addressEdit.vue"]]);
+wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pagesOrder/addressEdit/addressEdit.json b/unpackage/dist/dev/mp-weixin/pagesOrder/addressEdit/addressEdit.json
new file mode 100644
index 0000000..9f6106c
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pagesOrder/addressEdit/addressEdit.json
@@ -0,0 +1,11 @@
+{
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "up-input": "../../uni_modules/uview-plus/components/u-input/u-input",
+    "up-form-item": "../../uni_modules/uview-plus/components/u-form-item/u-form-item",
+    "up-form": "../../uni_modules/uview-plus/components/u-form/u-form",
+    "up-switch": "../../uni_modules/uview-plus/components/u-switch/u-switch",
+    "up-button": "../../uni_modules/uview-plus/components/u-button/u-button"
+  }
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesOrder/addressEdit/addressEdit.wxml b/unpackage/dist/dev/mp-weixin/pagesOrder/addressEdit/addressEdit.wxml
new file mode 100644
index 0000000..919973a
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pagesOrder/addressEdit/addressEdit.wxml
@@ -0,0 +1 @@
+<view class=""><view class="card"><up-form wx:if="{{k}}" class="r" u-s="{{['d']}}" u-r="uForm" u-i="663ade36-0" bind:__l="__l" u-p="{{k}}"><up-form-item wx:if="{{c}}" u-s="{{['d']}}" u-i="663ade36-1,663ade36-0" bind:__l="__l" u-p="{{c}}"><up-input wx:if="{{b}}" u-i="663ade36-2,663ade36-1" bind:__l="__l" bindupdateModelValue="{{a}}" u-p="{{b}}"></up-input></up-form-item><up-form-item wx:if="{{f}}" u-s="{{['d']}}" u-i="663ade36-3,663ade36-0" bind:__l="__l" u-p="{{f}}"><up-input wx:if="{{e}}" u-i="663ade36-4,663ade36-3" bind:__l="__l" bindupdateModelValue="{{d}}" u-p="{{e}}"></up-input></up-form-item><up-form-item wx:if="{{i}}" u-s="{{['d']}}" u-i="663ade36-5,663ade36-0" bind:__l="__l" u-p="{{i}}"><up-input wx:if="{{h}}" u-i="663ade36-6,663ade36-5" bind:__l="__l" bindupdateModelValue="{{g}}" u-p="{{h}}"></up-input></up-form-item></up-form></view><view class="card"><view class="is-default"><view>设置为默认地址</view><up-switch wx:if="{{m}}" u-i="663ade36-7" bind:__l="__l" bindupdateModelValue="{{l}}" u-p="{{m}}"></up-switch></view></view><view class="bottom-fixed"><up-button wx:if="{{o}}" u-s="{{['d']}}" bindclick="{{n}}" u-i="663ade36-8" bind:__l="__l" u-p="{{o}}">保存</up-button></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesOrder/addressEdit/addressEdit.wxss b/unpackage/dist/dev/mp-weixin/pagesOrder/addressEdit/addressEdit.wxss
new file mode 100644
index 0000000..9efc4c7
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pagesOrder/addressEdit/addressEdit.wxss
@@ -0,0 +1,55 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.card {
+  margin: 20rpx;
+  background-color: #fff;
+  border-radius: 14rpx;
+  padding: 0 30rpx;
+}
+.card .is-default {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 20rpx 0;
+}
+.bottom-fixed {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  height: 120rpx;
+  height: calc(constant(safe-area-inset-bottom) + 120rpx);
+  /* 适用于iOS设备 */
+  height: calc(env(safe-area-inset-bottom) + 120rpx);
+  /* 适用于Android设备 */
+  width: 100%;
+  box-sizing: border-box;
+  background-color: #fff;
+  padding: 20rpx;
+  padding-bottom: calc(constant(safe-area-inset-bottom) + 20rpx);
+  /* 适用于iOS设备 */
+  padding-bottom: calc(env(safe-area-inset-bottom) + 20rpx);
+  /* 适用于Android设备 */
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesOrder/addressList/addressList.js b/unpackage/dist/dev/mp-weixin/pagesOrder/addressList/addressList.js
new file mode 100644
index 0000000..e582b6d
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pagesOrder/addressList/addressList.js
@@ -0,0 +1,69 @@
+"use strict";
+const common_vendor = require("../../common/vendor.js");
+const common_assets = require("../../common/assets.js");
+if (!Array) {
+  const _easycom_up_icon2 = common_vendor.resolveComponent("up-icon");
+  const _easycom_up_button2 = common_vendor.resolveComponent("up-button");
+  (_easycom_up_icon2 + _easycom_up_button2)();
+}
+const _easycom_up_icon = () => "../../uni_modules/uview-plus/components/u-icon/u-icon.js";
+const _easycom_up_button = () => "../../uni_modules/uview-plus/components/u-button/u-button.js";
+if (!Math) {
+  (_easycom_up_icon + _easycom_up_button + modal)();
+}
+const modal = () => "../../components/modal.js";
+const _sfc_main = {
+  __name: "addressList",
+  setup(__props) {
+    const navTo = (url) => {
+      common_vendor.index.navigateTo({
+        url
+      });
+    };
+    const show = common_vendor.ref(false);
+    const deleteInfo = common_vendor.ref({});
+    const showDelete = (item) => {
+      deleteInfo.value = item;
+      show.value = true;
+    };
+    const deleteAddress = () => {
+      console.log(deleteInfo.value);
+      show.value = false;
+    };
+    return (_ctx, _cache) => {
+      return {
+        a: common_vendor.f(3, (item, index, i0) => {
+          return common_vendor.e({
+            b: common_assets._imports_1
+          }, {
+            c: "5e66515e-0-" + i0,
+            d: common_vendor.o(($event) => showDelete(item), index),
+            e: "5e66515e-1-" + i0,
+            f: common_vendor.o(($event) => navTo("/pagesOrder/addressEdit/addressEdit?mode=edit"), index),
+            g: index
+          });
+        }),
+        b: common_vendor.p({
+          name: "trash"
+        }),
+        c: common_vendor.p({
+          name: "edit-pen"
+        }),
+        d: common_vendor.o(($event) => navTo("/pagesOrder/addressEdit/addressEdit")),
+        e: common_vendor.p({
+          color: "#20B128",
+          shape: "circle"
+        }),
+        f: common_vendor.o(($event) => show.value = false),
+        g: common_vendor.o(deleteAddress),
+        h: common_vendor.p({
+          show: show.value,
+          title: "确认删除吗",
+          content: "删除后不可恢复"
+        })
+      };
+    };
+  }
+};
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__file", "D:/里海数字乡村/purchase-let/pagesOrder/addressList/addressList.vue"]]);
+wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pagesOrder/addressList/addressList.json b/unpackage/dist/dev/mp-weixin/pagesOrder/addressList/addressList.json
new file mode 100644
index 0000000..c01beda
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pagesOrder/addressList/addressList.json
@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "地址管理",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "up-icon": "../../uni_modules/uview-plus/components/u-icon/u-icon",
+    "up-button": "../../uni_modules/uview-plus/components/u-button/u-button",
+    "modal": "../../components/modal"
+  }
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesOrder/addressList/addressList.wxml b/unpackage/dist/dev/mp-weixin/pagesOrder/addressList/addressList.wxml
new file mode 100644
index 0000000..e13c265
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pagesOrder/addressList/addressList.wxml
@@ -0,0 +1 @@
+<view class="list"><view wx:for="{{a}}" wx:for-item="item" wx:key="g" class="address-card"><view class="address-info"><view class="top"><view class="name">收货人：小李</view><view class="phone">14566666666</view></view><view class="bottom"> 四川泸州市龙马潭区莲花池街道商业街1号 </view></view><view class="btn-box"><view class="left"><image wx:if="{{false}}" src="{{item.a}}"></image><image wx:else src="{{item.b}}"></image><view>设为默认</view></view><view class="right"><view class="btn" bindtap="{{item.d}}"><up-icon wx:if="{{b}}" u-i="{{item.c}}" bind:__l="__l" u-p="{{b}}"></up-icon> 删除 </view><view class="btn" bindtap="{{item.f}}"><up-icon wx:if="{{c}}" u-i="{{item.e}}" bind:__l="__l" u-p="{{c}}"></up-icon> 编辑 </view></view></view></view><view style="width:100%;height:150rpx"></view><view class="bottom-fixed"><up-button wx:if="{{e}}" u-s="{{['d']}}" bindclick="{{d}}" u-i="5e66515e-2" bind:__l="__l" u-p="{{e}}">新增地址</up-button></view><modal wx:if="{{h}}" bindclose="{{f}}" bindchange="{{g}}" u-i="5e66515e-3" bind:__l="__l" u-p="{{h}}"></modal></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesOrder/addressList/addressList.wxss b/unpackage/dist/dev/mp-weixin/pagesOrder/addressList/addressList.wxss
new file mode 100644
index 0000000..641fbf1
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pagesOrder/addressList/addressList.wxss
@@ -0,0 +1,104 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.address-card {
+  margin: 20rpx;
+  background-color: #fff;
+  border-radius: 14rpx;
+  box-sizing: border-box;
+  padding: 20rpx;
+  color: #444;
+}
+.address-card .address-info {
+  padding-bottom: 20rpx;
+  border-bottom: 1rpx solid #eee;
+  margin-bottom: 20rpx;
+}
+.address-card .address-info .top {
+  display: flex;
+  justify-content: space-between;
+  font-size: 28rpx;
+}
+.address-card .address-info .top .name {
+  color: #000;
+}
+.address-card .address-info .bottom {
+  font-size: 26rpx;
+  margin-top: 10rpx;
+}
+.address-card .btn-box {
+  display: flex;
+  justify-content: space-between;
+  font-size: 26rpx;
+}
+.address-card .btn-box .left {
+  display: flex;
+  align-items: center;
+}
+.address-card .btn-box .left image {
+  width: 40rpx;
+  height: 40rpx;
+  margin-right: 6rpx;
+}
+.address-card .btn-box .right {
+  display: flex;
+  color: #7a7a7a;
+  align-items: center;
+}
+.address-card .btn-box .right .btn {
+  display: flex;
+  margin-left: 20rpx;
+}
+.address-card .btn-box .right .btn:active {
+  color: rgba(122, 122, 122, 0.8);
+  transition: background-color 0.5s;
+  animation: disappear 0.5s 0.5s forwards;
+}
+.bottom-fixed {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  height: 120rpx;
+  height: calc(constant(safe-area-inset-bottom) + 120rpx);
+  /* 适用于iOS设备 */
+  height: calc(env(safe-area-inset-bottom) + 120rpx);
+  /* 适用于Android设备 */
+  width: 100%;
+  box-sizing: border-box;
+  background-color: #fff;
+  padding: 20rpx;
+  padding-bottom: calc(constant(safe-area-inset-bottom) + 20rpx);
+  /* 适用于iOS设备 */
+  padding-bottom: calc(env(safe-area-inset-bottom) + 20rpx);
+  /* 适用于Android设备 */
+}
+@keyframes disappear {
+to {
+    opacity: 0;
+    /* 渐隐 */
+    transform: scale(0);
+    /* 缩小 */
+}
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesOrder/detail/detail.js b/unpackage/dist/dev/mp-weixin/pagesOrder/detail/detail.js
index cb960e7..c0d1f6f 100644
--- a/unpackage/dist/dev/mp-weixin/pagesOrder/detail/detail.js
+++ b/unpackage/dist/dev/mp-weixin/pagesOrder/detail/detail.js
@@ -1,21 +1,41 @@
 "use strict";
 const common_vendor = require("../../common/vendor.js");
+const common_assets = require("../../common/assets.js");
+const dict_cancelDict = require("../../dict/cancelDict.js");
 if (!Array) {
   const _easycom_up_icon2 = common_vendor.resolveComponent("up-icon");
   const _easycom_up_button2 = common_vendor.resolveComponent("up-button");
+  const _easycom_up_copy2 = common_vendor.resolveComponent("up-copy");
   const _easycom_up_popup2 = common_vendor.resolveComponent("up-popup");
-  (_easycom_up_icon2 + _easycom_up_button2 + _easycom_up_popup2)();
+  (_easycom_up_icon2 + _easycom_up_button2 + _easycom_up_copy2 + _easycom_up_popup2)();
 }
 const _easycom_up_icon = () => "../../uni_modules/uview-plus/components/u-icon/u-icon.js";
 const _easycom_up_button = () => "../../uni_modules/uview-plus/components/u-button/u-button.js";
+const _easycom_up_copy = () => "../../uni_modules/uview-plus/components/u-copy/u-copy.js";
 const _easycom_up_popup = () => "../../uni_modules/uview-plus/components/u-popup/u-popup.js";
 if (!Math) {
-  (_easycom_up_icon + _easycom_up_button + _easycom_up_popup)();
+  (_easycom_up_icon + _easycom_up_button + _easycom_up_copy + _easycom_up_popup + addressPopup + modal)();
 }
+const addressPopup = () => "../../components/addressPopup.js";
+const modal = () => "../../components/modal.js";
 const _sfc_main = {
   __name: "detail",
   setup(__props) {
     const showCancel = common_vendor.ref(false);
+    const showAddress = common_vendor.ref(false);
+    const cancelType = common_vendor.ref(-1);
+    const submitCancel = () => {
+      showCancel.value = false;
+      console.log(cancelType.value);
+      common_vendor.index.showToast({
+        title: "取消成功",
+        icon: "none"
+      });
+    };
+    const changeAddress = (e) => {
+      showAddress.value = false;
+      console.log(e);
+    };
     common_vendor.onLoad((option) => {
       common_vendor.index.setNavigationBarTitle({
         title: option.type == 1 ? "等待付款" : "订单详情"
@@ -26,7 +46,8 @@ const _sfc_main = {
         a: common_vendor.p({
           name: "map"
         }),
-        b: common_vendor.p({
+        b: common_vendor.o(($event) => showAddress.value = true),
+        c: common_vendor.p({
           size: "small",
           shape: "circle",
           color: "#f6f6f6",
@@ -34,16 +55,46 @@ const _sfc_main = {
             color: "#666666"
           }
         }),
-        c: common_vendor.o(($event) => showCancel.value = true),
         d: common_vendor.p({
+          content: "wxo13546486484784555"
+        }),
+        e: common_vendor.o(($event) => showCancel.value = true),
+        f: common_vendor.p({
           color: "#20B128",
           shape: "circle"
         }),
-        e: common_vendor.o(($event) => showCancel.value = false),
-        f: common_vendor.p({
+        g: common_vendor.f(common_vendor.unref(dict_cancelDict.list), (item, index, i0) => {
+          return common_vendor.e({
+            a: common_vendor.t(item.name),
+            b: cancelType.value == item.value
+          }, cancelType.value == item.value ? {
+            c: common_assets._imports_0
+          } : {
+            d: common_assets._imports_1
+          }, {
+            e: item.value,
+            f: common_vendor.o(($event) => cancelType.value = item.value, item.value)
+          });
+        }),
+        h: common_vendor.o(submitCancel),
+        i: common_vendor.p({
+          color: "#20B128",
+          shape: "circle"
+        }),
+        j: common_vendor.o(($event) => showCancel.value = false),
+        k: common_vendor.p({
           show: showCancel.value,
           closeable: true,
           round: "10"
+        }),
+        l: common_vendor.o(($event) => showAddress.value = false),
+        m: common_vendor.o(changeAddress),
+        n: common_vendor.p({
+          show: showAddress.value
+        }),
+        o: common_vendor.p({
+          show: false,
+          content: "您还没有添加收货地址，请点击添加"
         })
       };
     };
diff --git a/unpackage/dist/dev/mp-weixin/pagesOrder/detail/detail.json b/unpackage/dist/dev/mp-weixin/pagesOrder/detail/detail.json
index 8cfd920..cb0624c 100644
--- a/unpackage/dist/dev/mp-weixin/pagesOrder/detail/detail.json
+++ b/unpackage/dist/dev/mp-weixin/pagesOrder/detail/detail.json
@@ -4,6 +4,9 @@
   "usingComponents": {
     "up-icon": "../../uni_modules/uview-plus/components/u-icon/u-icon",
     "up-button": "../../uni_modules/uview-plus/components/u-button/u-button",
-    "up-popup": "../../uni_modules/uview-plus/components/u-popup/u-popup"
+    "up-copy": "../../uni_modules/uview-plus/components/u-copy/u-copy",
+    "up-popup": "../../uni_modules/uview-plus/components/u-popup/u-popup",
+    "address-popup": "../../components/addressPopup",
+    "modal": "../../components/modal"
   }
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesOrder/detail/detail.wxml b/unpackage/dist/dev/mp-weixin/pagesOrder/detail/detail.wxml
index bce32fc..5c1d42f 100644
--- a/unpackage/dist/dev/mp-weixin/pagesOrder/detail/detail.wxml
+++ b/unpackage/dist/dev/mp-weixin/pagesOrder/detail/detail.wxml
@@ -1 +1 @@
-<view class=""><view class="count_down"> 还剩<text>00:28:36</text>订单自动取消 </view><view class="m-card m-address"><view class="address-info"><view class="top"><up-icon wx:if="{{a}}" u-i="666b5ad0-0" bind:__l="__l" u-p="{{a}}"></up-icon><view class="t-name">小王</view><view>155****9999</view></view><view class="bottom u-line-2"> 四川泸州市龙马潭区莲花池街道商业街1号 </view></view><view class="address-btn"><view style="width:80px"><up-button wx:if="{{b}}" u-s="{{['d']}}" u-i="666b5ad0-1" bind:__l="__l" u-p="{{b}}">修改</up-button></view></view></view><view class="m-card m-good"><image class="image" src="/static/logo.png"></image><view class="body-content"><view><view class="title"><view>黄牛肉20kg</view><view>¥10.00</view></view><view class="tips"><view>我不吃牛肉</view><view>x5</view></view></view><view class="time"> 预计48小时发货 </view></view></view><view class="m-card good-info"><view class="row"><view>商品总价 <text>共计5件商品</text></view><view><text>¥</text>50<text>.00</text></view></view><view class="row"><view>运费</view><view><text>¥</text>0<text>.00</text></view></view><view class="row-need"><view style="margin-right:10rpx">需付款</view><view><text>¥</text>50<text>.00</text></view></view></view><view class="m-card good-info"><view class="head-title">订单信息</view><view class="row"><view>订单编号</view><view>wxo13546486484784555 | 复制</view></view><view class="row"><view>下单时间</view><view>2024-04-25 15:00:00</view></view><view class="row" style="margin-bottom:0"><view>支付状态</view><view class="red">待支付</view></view></view><view style="width:100%;height:200rpx"></view><view class="btn-box"><view style="color:#777777" bindtap="{{c}}">取消订单</view><view style="width:450rpx"><up-button wx:if="{{d}}" u-s="{{['d']}}" u-i="666b5ad0-2" bind:__l="__l" u-p="{{d}}">立即支付 ¥50.00</up-button></view></view><up-popup wx:if="{{f}}" u-s="{{['d']}}" bindclose="{{e}}" u-i="666b5ad0-3" bind:__l="__l" u-p="{{f}}"><view class="cancle-popup"><view class="head-title">订单取消</view><view><view>不想要了</view></view></view></up-popup></view>
\ No newline at end of file
+<view class=""><view class="count_down"> 还剩<text>00:28:36</text>订单自动取消 </view><view class="m-card m-address"><view class="address-info"><view class="top"><up-icon wx:if="{{a}}" u-i="666b5ad0-0" bind:__l="__l" u-p="{{a}}"></up-icon><view class="t-name">小王</view><view>155****9999</view></view><view class="bottom u-line-2"> 四川泸州市龙马潭区莲花池街道商业街1号 </view></view><view class="address-btn"><view style="width:80px"><up-button wx:if="{{c}}" u-s="{{['d']}}" bindclick="{{b}}" u-i="666b5ad0-1" bind:__l="__l" u-p="{{c}}">修改</up-button></view></view></view><view class="m-card m-good"><image class="image" src="/static/logo.png"></image><view class="body-content"><view><view class="title"><view>黄牛肉20kg</view><view>¥10.00</view></view><view class="tips"><view>我不吃牛肉</view><view>x5</view></view></view><view class="time"> 预计48小时发货 </view></view></view><view class="m-card good-info"><view class="row"><view>商品总价 <text>共计5件商品</text></view><view><text>¥</text>50<text>.00</text></view></view><view class="row"><view>运费</view><view><text>¥</text>0<text>.00</text></view></view><view class="row-need"><view style="margin-right:10rpx">需付款</view><view><text>¥</text>50<text>.00</text></view></view></view><view class="m-card good-info"><view class="head-title">订单信息</view><view class="row"><view>订单编号</view><up-copy wx:if="{{d}}" u-s="{{['d']}}" u-i="666b5ad0-2" bind:__l="__l" u-p="{{d}}"><text>wxo13546486484784555 | 复制</text></up-copy></view><view class="row"><view>下单时间</view><view>2024-04-25 15:00:00</view></view><view class="row" style="margin-bottom:0"><view>支付状态</view><view class="red">待支付</view></view></view><view style="width:100%;height:200rpx"></view><view class="btn-box"><view style="color:#777777" bindtap="{{e}}">取消订单</view><view style="width:450rpx"><up-button wx:if="{{f}}" u-s="{{['d']}}" u-i="666b5ad0-3" bind:__l="__l" u-p="{{f}}">立即支付 ¥50.00</up-button></view></view><up-popup wx:if="{{k}}" u-s="{{['d']}}" bindclose="{{j}}" u-i="666b5ad0-4" bind:__l="__l" u-p="{{k}}"><view class="cancel-popup"><view class="head-title">订单取消</view><view wx:for="{{g}}" wx:for-item="item" wx:key="e" class="row" bindtap="{{item.f}}"><view>{{item.a}}</view><image wx:if="{{item.b}}" src="{{item.c}}"></image><image wx:else src="{{item.d}}"></image></view><up-button wx:if="{{i}}" u-s="{{['d']}}" bindclick="{{h}}" u-i="666b5ad0-5,666b5ad0-4" bind:__l="__l" u-p="{{i}}">提交</up-button></view></up-popup><address-popup wx:if="{{n}}" bindclose="{{l}}" bindchange="{{m}}" u-i="666b5ad0-6" bind:__l="__l" u-p="{{n}}"></address-popup><modal wx:if="{{o}}" u-i="666b5ad0-7" bind:__l="__l" u-p="{{o}}"></modal></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesOrder/detail/detail.wxss b/unpackage/dist/dev/mp-weixin/pagesOrder/detail/detail.wxss
index c867bd0..b3a431a 100644
--- a/unpackage/dist/dev/mp-weixin/pagesOrder/detail/detail.wxss
+++ b/unpackage/dist/dev/mp-weixin/pagesOrder/detail/detail.wxss
@@ -142,12 +142,20 @@
   justify-content: space-between;
   align-items: center;
 }
-.cancle-popup {
-  height: 500rpx;
+.cancel-popup {
+  padding: 30rpx;
 }
-.cancle-popup .head-title {
+.cancel-popup .head-title {
   font-weight: bold;
   text-align: center;
-  height: 80rpx;
-  line-height: 80rpx;
+  margin-bottom: 20rpx;
+}
+.cancel-popup .row {
+  display: flex;
+  justify-content: space-between;
+  padding-bottom: 20rpx;
+}
+.cancel-popup .row image {
+  width: 40rpx;
+  height: 40rpx;
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pagesOrder/order/order.js b/unpackage/dist/dev/mp-weixin/pagesOrder/order/order.js
index 62f522e..cc42183 100644
--- a/unpackage/dist/dev/mp-weixin/pagesOrder/order/order.js
+++ b/unpackage/dist/dev/mp-weixin/pagesOrder/order/order.js
@@ -18,7 +18,6 @@ const good = () => "./component/good.js";
 const _sfc_main = {
   __name: "order",
   setup(__props) {
-    common_vendor.ref(["购物车", "常买", "收藏"]);
     const tabsActive = common_vendor.ref(0);
     const changeTab = ({ index }) => {
       tabsActive.value = index;
@@ -27,14 +26,20 @@ const _sfc_main = {
     const tablist = common_vendor.ref([
       { name: "全部" },
       { name: "待付款" },
-      { name: "待收货" },
-      { name: "退款/售后" }
+      { name: "待收货" }
+      // { name: '退款/售后' },
     ]);
     const swiperCurrent = common_vendor.ref(0);
     const animationfinish = ({ detail: { current } }) => {
       swiperCurrent.value = current;
       tabsActive.value = current;
     };
+    common_vendor.onLoad((options) => {
+      if (options.type) {
+        tabsActive.value = +options.type;
+        swiperCurrent.value = +options.type;
+      }
+    });
     return (_ctx, _cache) => {
       return common_vendor.e({
         a: common_vendor.p({
@@ -88,18 +93,8 @@ const _sfc_main = {
           type: 2
         })
       }, {
-        n: common_vendor.f(10, (item, index, i0) => {
-          return {
-            a: index,
-            b: "aea1ad54-9-" + i0
-          };
-        }),
-        o: common_vendor.p({
-          type: 3
-        })
-      }, {
-        q: swiperCurrent.value,
-        r: common_vendor.o(animationfinish)
+        n: swiperCurrent.value,
+        o: common_vendor.o(animationfinish)
       });
     };
   }
diff --git a/unpackage/dist/dev/mp-weixin/pagesOrder/order/order.wxml b/unpackage/dist/dev/mp-weixin/pagesOrder/order/order.wxml
index ab459a3..a75043b 100644
--- a/unpackage/dist/dev/mp-weixin/pagesOrder/order/order.wxml
+++ b/unpackage/dist/dev/mp-weixin/pagesOrder/order/order.wxml
@@ -1 +1 @@
-<view><up-sticky wx:if="{{d}}" u-s="{{['d']}}" u-i="aea1ad54-0" bind:__l="__l" u-p="{{d}}"><view style="padding:10rpx 20rpx 0 20rpx"><up-search wx:if="{{a}}" u-i="aea1ad54-1,aea1ad54-0" bind:__l="__l" u-p="{{a}}"></up-search></view><up-tabs wx:if="{{c}}" bindchange="{{b}}" u-i="aea1ad54-2,aea1ad54-0" bind:__l="__l" u-p="{{c}}"></up-tabs></up-sticky><swiper class="swiper-box" current="{{q}}" bindanimationfinish="{{r}}"><swiper-item class="swiper-item"><scroll-view scroll-y style="height:100%;width:100%"><view class="page-box"><view wx:if="{{true}}" class="list"><good wx:for="{{e}}" wx:for-item="item" wx:key="a" u-i="{{item.b}}" bind:__l="__l" u-p="{{f}}"></good></view><view wx:else style="padding-top:100rpx"><up-empty wx:if="{{g}}" u-i="aea1ad54-4" bind:__l="__l" u-p="{{g}}"></up-empty></view><view style="width:100%;height:200rpx"></view></view></scroll-view></swiper-item><swiper-item class="swiper-item"><scroll-view scroll-y style="height:100%;width:100%"><view class="page-box"><view wx:if="{{true}}" class="list"><good wx:for="{{h}}" wx:for-item="item" wx:key="a" u-i="{{item.b}}" bind:__l="__l" u-p="{{i}}"></good></view><view wx:else style="padding-top:100rpx"><up-empty wx:if="{{j}}" u-i="aea1ad54-6" bind:__l="__l" u-p="{{j}}"></up-empty></view><view style="width:100%;height:200rpx"></view></view></scroll-view></swiper-item><swiper-item class="swiper-item"><scroll-view scroll-y style="height:100%;width:100%"><view class="page-box"><view wx:if="{{true}}" class="list"><good wx:for="{{k}}" wx:for-item="item" wx:key="a" u-i="{{item.b}}" bind:__l="__l" u-p="{{l}}"></good></view><view wx:else style="padding-top:100rpx"><up-empty wx:if="{{m}}" u-i="aea1ad54-8" bind:__l="__l" u-p="{{m}}"></up-empty></view><view style="width:100%;height:200rpx"></view></view></scroll-view></swiper-item><swiper-item class="swiper-item"><scroll-view scroll-y style="height:100%;width:100%"><view class="page-box"><view wx:if="{{true}}" class="list"><good wx:for="{{n}}" wx:for-item="item" wx:key="a" u-i="{{item.b}}" bind:__l="__l" u-p="{{o}}"></good></view><view wx:else style="padding-top:100rpx"><up-empty wx:if="{{p}}" u-i="aea1ad54-10" bind:__l="__l" u-p="{{p}}"></up-empty></view><view style="width:100%;height:200rpx"></view></view></scroll-view></swiper-item></swiper></view>
\ No newline at end of file
+<view><up-sticky wx:if="{{d}}" u-s="{{['d']}}" u-i="aea1ad54-0" bind:__l="__l" u-p="{{d}}"><view style="padding:10rpx 20rpx 0 20rpx"><up-search wx:if="{{a}}" u-i="aea1ad54-1,aea1ad54-0" bind:__l="__l" u-p="{{a}}"></up-search></view><up-tabs wx:if="{{c}}" bindchange="{{b}}" u-i="aea1ad54-2,aea1ad54-0" bind:__l="__l" u-p="{{c}}"></up-tabs></up-sticky><swiper class="swiper-box" current="{{n}}" bindanimationfinish="{{o}}"><swiper-item class="swiper-item"><scroll-view scroll-y style="height:100%;width:100%"><view class="page-box"><view wx:if="{{true}}" class="list"><good wx:for="{{e}}" wx:for-item="item" wx:key="a" u-i="{{item.b}}" bind:__l="__l" u-p="{{f}}"></good></view><view wx:else style="padding-top:100rpx"><up-empty wx:if="{{g}}" u-i="aea1ad54-4" bind:__l="__l" u-p="{{g}}"></up-empty></view><view style="width:100%;height:200rpx"></view></view></scroll-view></swiper-item><swiper-item class="swiper-item"><scroll-view scroll-y style="height:100%;width:100%"><view class="page-box"><view wx:if="{{true}}" class="list"><good wx:for="{{h}}" wx:for-item="item" wx:key="a" u-i="{{item.b}}" bind:__l="__l" u-p="{{i}}"></good></view><view wx:else style="padding-top:100rpx"><up-empty wx:if="{{j}}" u-i="aea1ad54-6" bind:__l="__l" u-p="{{j}}"></up-empty></view><view style="width:100%;height:200rpx"></view></view></scroll-view></swiper-item><swiper-item class="swiper-item"><scroll-view scroll-y style="height:100%;width:100%"><view class="page-box"><view wx:if="{{true}}" class="list"><good wx:for="{{k}}" wx:for-item="item" wx:key="a" u-i="{{item.b}}" bind:__l="__l" u-p="{{l}}"></good></view><view wx:else style="padding-top:100rpx"><up-empty wx:if="{{m}}" u-i="aea1ad54-8" bind:__l="__l" u-p="{{m}}"></up-empty></view><view style="width:100%;height:200rpx"></view></view></scroll-view></swiper-item></swiper></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/project.config.json b/unpackage/dist/dev/mp-weixin/project.config.json
index 1f6bb9d..5292c2f 100644
--- a/unpackage/dist/dev/mp-weixin/project.config.json
+++ b/unpackage/dist/dev/mp-weixin/project.config.json
@@ -21,7 +21,7 @@
   },
   "compileType": "miniprogram",
   "libVersion": "3.3.4",
-  "appid": "touristappid",
+  "appid": "wxce2948c50d808b66",
   "projectname": "purchase-let",
   "condition": {
     "search": {
diff --git a/unpackage/dist/dev/mp-weixin/project.private.config.json b/unpackage/dist/dev/mp-weixin/project.private.config.json
index b7da0a2..eb18609 100644
--- a/unpackage/dist/dev/mp-weixin/project.private.config.json
+++ b/unpackage/dist/dev/mp-weixin/project.private.config.json
@@ -9,7 +9,7 @@
       "list": [
         {
           "name": "",
-          "pathName": "pagesOrder/detail/detail",
+          "pathName": "pages/login/login",
           "query": "",
           "launchMode": "default",
           "scene": null
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--form/u--form.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--form/u--form.js
new file mode 100644
index 0000000..5e496e7
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--form/u--form.js
@@ -0,0 +1,158 @@
+"use strict";
+const uni_modules_uviewPlus_components_uForm_props = require("../u-form/props.js");
+const uni_modules_uviewPlus_libs_mixin_mpMixin = require("../../libs/mixin/mpMixin.js");
+const uni_modules_uviewPlus_libs_mixin_mixin = require("../../libs/mixin/mixin.js");
+const common_vendor = require("../../../../common/vendor.js");
+require("../../libs/config/props.js");
+require("../../libs/config/config.js");
+require("../../libs/config/props/actionSheet.js");
+require("../../libs/config/props/album.js");
+require("../../libs/config/props/alert.js");
+require("../../libs/config/props/avatar.js");
+require("../../libs/config/props/avatarGroup.js");
+require("../../libs/config/props/backtop.js");
+require("../../libs/config/props/badge.js");
+require("../../libs/config/props/button.js");
+require("../../libs/config/props/calendar.js");
+require("../../libs/config/props/carKeyboard.js");
+require("../../libs/config/props/cell.js");
+require("../../libs/config/props/cellGroup.js");
+require("../../libs/config/props/checkbox.js");
+require("../../libs/config/props/checkboxGroup.js");
+require("../../libs/config/props/circleProgress.js");
+require("../../libs/config/props/code.js");
+require("../../libs/config/props/codeInput.js");
+require("../../libs/config/props/col.js");
+require("../../libs/config/props/collapse.js");
+require("../../libs/config/props/collapseItem.js");
+require("../../libs/config/props/columnNotice.js");
+require("../../libs/config/props/countDown.js");
+require("../../libs/config/props/countTo.js");
+require("../../libs/config/props/datetimePicker.js");
+require("../../libs/config/props/divider.js");
+require("../../libs/config/props/empty.js");
+require("../../libs/config/props/form.js");
+require("../../libs/config/props/formItem.js");
+require("../../libs/config/props/gap.js");
+require("../../libs/config/props/grid.js");
+require("../../libs/config/props/gridItem.js");
+require("../../libs/config/props/icon.js");
+require("../../libs/config/props/image.js");
+require("../../libs/config/props/indexAnchor.js");
+require("../../libs/config/props/indexList.js");
+require("../../libs/config/props/input.js");
+require("../../libs/config/props/keyboard.js");
+require("../../libs/config/props/line.js");
+require("../../libs/config/props/lineProgress.js");
+require("../../libs/config/props/link.js");
+require("../../libs/config/props/list.js");
+require("../../libs/config/props/listItem.js");
+require("../../libs/config/props/loadingIcon.js");
+require("../../libs/config/props/loadingPage.js");
+require("../../libs/config/props/loadmore.js");
+require("../../libs/config/props/modal.js");
+require("../../libs/config/props/navbar.js");
+require("../../libs/config/color.js");
+require("../../libs/config/props/noNetwork.js");
+require("../../libs/config/props/noticeBar.js");
+require("../../libs/config/props/notify.js");
+require("../../libs/config/props/numberBox.js");
+require("../../libs/config/props/numberKeyboard.js");
+require("../../libs/config/props/overlay.js");
+require("../../libs/config/props/parse.js");
+require("../../libs/config/props/picker.js");
+require("../../libs/config/props/popup.js");
+require("../../libs/config/props/radio.js");
+require("../../libs/config/props/radioGroup.js");
+require("../../libs/config/props/rate.js");
+require("../../libs/config/props/readMore.js");
+require("../../libs/config/props/row.js");
+require("../../libs/config/props/rowNotice.js");
+require("../../libs/config/props/scrollList.js");
+require("../../libs/config/props/search.js");
+require("../../libs/config/props/section.js");
+require("../../libs/config/props/skeleton.js");
+require("../../libs/config/props/slider.js");
+require("../../libs/config/props/statusBar.js");
+require("../../libs/config/props/steps.js");
+require("../../libs/config/props/stepsItem.js");
+require("../../libs/config/props/sticky.js");
+require("../../libs/config/props/subsection.js");
+require("../../libs/config/props/swipeAction.js");
+require("../../libs/config/props/swipeActionItem.js");
+require("../../libs/config/props/swiper.js");
+require("../../libs/config/props/swipterIndicator.js");
+require("../../libs/config/props/switch.js");
+require("../../libs/config/props/tabbar.js");
+require("../../libs/config/props/tabbarItem.js");
+require("../../libs/config/props/tabs.js");
+require("../../libs/config/props/tag.js");
+require("../../libs/config/props/text.js");
+require("../../libs/config/props/textarea.js");
+require("../../libs/config/props/toast.js");
+require("../../libs/config/props/toolbar.js");
+require("../../libs/config/props/tooltip.js");
+require("../../libs/config/props/transition.js");
+require("../../libs/config/props/upload.js");
+require("../../libs/function/index.js");
+require("../../libs/function/test.js");
+require("../../libs/function/digit.js");
+require("../../libs/util/route.js");
+const uvForm = () => "../u-form/u-form.js";
+const _sfc_main = {
+  name: "u-form",
+  mixins: [uni_modules_uviewPlus_libs_mixin_mpMixin.mpMixin, uni_modules_uviewPlus_components_uForm_props.props, uni_modules_uviewPlus_libs_mixin_mixin.mixin],
+  components: {
+    uvForm
+  },
+  created() {
+    this.children = [];
+  },
+  methods: {
+    // 手动设置校验的规则，如果规则中有函数的话，微信小程序中会过滤掉，所以只能手动调用设置规则
+    setRules(rules) {
+      this.$refs.uForm.setRules(rules);
+    },
+    validate() {
+      this.setMpData();
+      return this.$refs.uForm.validate();
+    },
+    validateField(value, callback) {
+      this.setMpData();
+      return this.$refs.uForm.validateField(value, callback);
+    },
+    resetFields() {
+      this.setMpData();
+      return this.$refs.uForm.resetFields();
+    },
+    clearValidate(props) {
+      this.setMpData();
+      return this.$refs.uForm.clearValidate(props);
+    },
+    setMpData() {
+      this.$refs.uForm.children = this.children;
+    }
+  }
+};
+if (!Array) {
+  const _component_uvForm = common_vendor.resolveComponent("uvForm");
+  _component_uvForm();
+}
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return {
+    a: common_vendor.sr("uForm", "3baec837-0"),
+    b: common_vendor.p({
+      model: _ctx.model,
+      rules: _ctx.rules,
+      errorType: _ctx.errorType,
+      borderBottom: _ctx.borderBottom,
+      labelPosition: _ctx.labelPosition,
+      labelWidth: _ctx.labelWidth,
+      labelAlign: _ctx.labelAlign,
+      labelStyle: _ctx.labelStyle,
+      customStyle: _ctx.customStyle
+    })
+  };
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/里海数字乡村/purchase-let/uni_modules/uview-plus/components/u--form/u--form.vue"]]);
+wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--form/u--form.json b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--form/u--form.json
new file mode 100644
index 0000000..16d4eeb
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--form/u--form.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "uv-form": "../u-form/u-form"
+  }
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--form/u--form.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--form/u--form.wxml
new file mode 100644
index 0000000..523430a
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--form/u--form.wxml
@@ -0,0 +1 @@
+<uv-form wx:if="{{b}}" class="r" u-s="{{['d']}}" u-r="uForm" u-i="3baec837-0" bind:__l="__l" u-p="{{b}}"><slot/></uv-form>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--form/u--form.wxss b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--form/u--form.wxss
new file mode 100644
index 0000000..e69de29
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--input/u--input.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--input/u--input.js
new file mode 100644
index 0000000..31cbd7e
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--input/u--input.js
@@ -0,0 +1,157 @@
+"use strict";
+const uni_modules_uviewPlus_components_uInput_props = require("../u-input/props.js");
+const uni_modules_uviewPlus_libs_mixin_mpMixin = require("../../libs/mixin/mpMixin.js");
+const uni_modules_uviewPlus_libs_mixin_mixin = require("../../libs/mixin/mixin.js");
+const common_vendor = require("../../../../common/vendor.js");
+require("../../libs/config/props.js");
+require("../../libs/config/config.js");
+require("../../libs/config/props/actionSheet.js");
+require("../../libs/config/props/album.js");
+require("../../libs/config/props/alert.js");
+require("../../libs/config/props/avatar.js");
+require("../../libs/config/props/avatarGroup.js");
+require("../../libs/config/props/backtop.js");
+require("../../libs/config/props/badge.js");
+require("../../libs/config/props/button.js");
+require("../../libs/config/props/calendar.js");
+require("../../libs/config/props/carKeyboard.js");
+require("../../libs/config/props/cell.js");
+require("../../libs/config/props/cellGroup.js");
+require("../../libs/config/props/checkbox.js");
+require("../../libs/config/props/checkboxGroup.js");
+require("../../libs/config/props/circleProgress.js");
+require("../../libs/config/props/code.js");
+require("../../libs/config/props/codeInput.js");
+require("../../libs/config/props/col.js");
+require("../../libs/config/props/collapse.js");
+require("../../libs/config/props/collapseItem.js");
+require("../../libs/config/props/columnNotice.js");
+require("../../libs/config/props/countDown.js");
+require("../../libs/config/props/countTo.js");
+require("../../libs/config/props/datetimePicker.js");
+require("../../libs/config/props/divider.js");
+require("../../libs/config/props/empty.js");
+require("../../libs/config/props/form.js");
+require("../../libs/config/props/formItem.js");
+require("../../libs/config/props/gap.js");
+require("../../libs/config/props/grid.js");
+require("../../libs/config/props/gridItem.js");
+require("../../libs/config/props/icon.js");
+require("../../libs/config/props/image.js");
+require("../../libs/config/props/indexAnchor.js");
+require("../../libs/config/props/indexList.js");
+require("../../libs/config/props/input.js");
+require("../../libs/config/props/keyboard.js");
+require("../../libs/config/props/line.js");
+require("../../libs/config/props/lineProgress.js");
+require("../../libs/config/props/link.js");
+require("../../libs/config/props/list.js");
+require("../../libs/config/props/listItem.js");
+require("../../libs/config/props/loadingIcon.js");
+require("../../libs/config/props/loadingPage.js");
+require("../../libs/config/props/loadmore.js");
+require("../../libs/config/props/modal.js");
+require("../../libs/config/props/navbar.js");
+require("../../libs/config/color.js");
+require("../../libs/config/props/noNetwork.js");
+require("../../libs/config/props/noticeBar.js");
+require("../../libs/config/props/notify.js");
+require("../../libs/config/props/numberBox.js");
+require("../../libs/config/props/numberKeyboard.js");
+require("../../libs/config/props/overlay.js");
+require("../../libs/config/props/parse.js");
+require("../../libs/config/props/picker.js");
+require("../../libs/config/props/popup.js");
+require("../../libs/config/props/radio.js");
+require("../../libs/config/props/radioGroup.js");
+require("../../libs/config/props/rate.js");
+require("../../libs/config/props/readMore.js");
+require("../../libs/config/props/row.js");
+require("../../libs/config/props/rowNotice.js");
+require("../../libs/config/props/scrollList.js");
+require("../../libs/config/props/search.js");
+require("../../libs/config/props/section.js");
+require("../../libs/config/props/skeleton.js");
+require("../../libs/config/props/slider.js");
+require("../../libs/config/props/statusBar.js");
+require("../../libs/config/props/steps.js");
+require("../../libs/config/props/stepsItem.js");
+require("../../libs/config/props/sticky.js");
+require("../../libs/config/props/subsection.js");
+require("../../libs/config/props/swipeAction.js");
+require("../../libs/config/props/swipeActionItem.js");
+require("../../libs/config/props/swiper.js");
+require("../../libs/config/props/swipterIndicator.js");
+require("../../libs/config/props/switch.js");
+require("../../libs/config/props/tabbar.js");
+require("../../libs/config/props/tabbarItem.js");
+require("../../libs/config/props/tabs.js");
+require("../../libs/config/props/tag.js");
+require("../../libs/config/props/text.js");
+require("../../libs/config/props/textarea.js");
+require("../../libs/config/props/toast.js");
+require("../../libs/config/props/toolbar.js");
+require("../../libs/config/props/tooltip.js");
+require("../../libs/config/props/transition.js");
+require("../../libs/config/props/upload.js");
+require("../../libs/function/index.js");
+require("../../libs/function/test.js");
+require("../../libs/function/digit.js");
+require("../../libs/util/route.js");
+const uvInput = () => "../u-input/u-input.js";
+const _sfc_main = {
+  name: "u--input",
+  mixins: [uni_modules_uviewPlus_libs_mixin_mpMixin.mpMixin, uni_modules_uviewPlus_components_uInput_props.props, uni_modules_uviewPlus_libs_mixin_mixin.mixin],
+  components: {
+    uvInput
+  }
+};
+if (!Array) {
+  const _component_uvInput = common_vendor.resolveComponent("uvInput");
+  _component_uvInput();
+}
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return {
+    a: common_vendor.o((e) => _ctx.$emit("update:modelValue", e)),
+    b: common_vendor.p({
+      modelValue: _ctx.modelValue,
+      type: _ctx.type,
+      fixed: _ctx.fixed,
+      disabled: _ctx.disabled,
+      disabledColor: _ctx.disabledColor,
+      clearable: _ctx.clearable,
+      password: _ctx.password,
+      maxlength: _ctx.maxlength,
+      placeholder: _ctx.placeholder,
+      placeholderClass: _ctx.placeholderClass,
+      placeholderStyle: _ctx.placeholderStyle,
+      showWordLimit: _ctx.showWordLimit,
+      confirmType: _ctx.confirmType,
+      confirmHold: _ctx.confirmHold,
+      holdKeyboard: _ctx.holdKeyboard,
+      focus: _ctx.focus,
+      autoBlur: _ctx.autoBlur,
+      disableDefaultPadding: _ctx.disableDefaultPadding,
+      cursor: _ctx.cursor,
+      cursorSpacing: _ctx.cursorSpacing,
+      selectionStart: _ctx.selectionStart,
+      selectionEnd: _ctx.selectionEnd,
+      adjustPosition: _ctx.adjustPosition,
+      inputAlign: _ctx.inputAlign,
+      fontSize: _ctx.fontSize,
+      color: _ctx.color,
+      prefixIcon: _ctx.prefixIcon,
+      suffixIcon: _ctx.suffixIcon,
+      suffixIconStyle: _ctx.suffixIconStyle,
+      prefixIconStyle: _ctx.prefixIconStyle,
+      border: _ctx.border,
+      readonly: _ctx.readonly,
+      shape: _ctx.shape,
+      customStyle: _ctx.customStyle,
+      formatter: _ctx.formatter,
+      ignoreCompositionEvent: _ctx.ignoreCompositionEvent
+    })
+  };
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/里海数字乡村/purchase-let/uni_modules/uview-plus/components/u--input/u--input.vue"]]);
+wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--input/u--input.json b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--input/u--input.json
new file mode 100644
index 0000000..1c24806
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--input/u--input.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "uv-input": "../u-input/u-input"
+  }
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--input/u--input.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--input/u--input.wxml
new file mode 100644
index 0000000..4eb72a7
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--input/u--input.wxml
@@ -0,0 +1 @@
+<uv-input wx:if="{{b}}" u-s="{{['d']}}" bindupdateModelValue="{{a}}" u-i="fe1fac3a-0" bind:__l="__l" u-p="{{b}}"><slot name="prefix"></slot><slot name="suffix"></slot></uv-input>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--input/u--input.wxss b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u--input/u--input.wxss
new file mode 100644
index 0000000..e69de29
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-copy/u-copy.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-copy/u-copy.js
new file mode 100644
index 0000000..5f1d09f
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-copy/u-copy.js
@@ -0,0 +1,66 @@
+"use strict";
+const common_vendor = require("../../../../common/vendor.js");
+const _sfc_main = {
+  name: "xy-copy",
+  props: {
+    content: {
+      type: String,
+      default: ""
+    },
+    alertStyle: {
+      type: String,
+      default: "toast"
+    },
+    notice: {
+      type: String,
+      default: "复制成功"
+    }
+  },
+  emits: ["success"],
+  methods: {
+    handleClick() {
+      let content = this.content;
+      if (!content) {
+        common_vendor.index.showToast({
+          title: "暂无",
+          icon: "none",
+          duration: 2e3
+        });
+        return false;
+      }
+      content = typeof content === "string" ? content : content.toString();
+      let that = this;
+      common_vendor.index.setClipboardData({
+        data: content,
+        success: function() {
+          if (that.alertStyle == "modal") {
+            common_vendor.index.showModal({
+              title: "提示",
+              content: that.notice
+            });
+          } else {
+            common_vendor.index.showToast({
+              title: that.notice,
+              icon: "none"
+            });
+          }
+          that.$emit("success");
+        },
+        fail: function() {
+          common_vendor.index.showToast({
+            title: "复制失败",
+            icon: "none",
+            duration: 3e3
+          });
+        }
+      });
+    }
+  }
+};
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return {
+    a: common_vendor.o((...args) => $options.handleClick && $options.handleClick(...args))
+  };
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/里海数字乡村/purchase-let/uni_modules/uview-plus/components/u-copy/u-copy.vue"]]);
+wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-copy/u-copy.json b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-copy/u-copy.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-copy/u-copy.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-copy/u-copy.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-copy/u-copy.wxml
new file mode 100644
index 0000000..4c5aa19
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-copy/u-copy.wxml
@@ -0,0 +1 @@
+<view bindtap="{{a}}"><block wx:if="{{$slots.d}}"><slot></slot></block><block wx:else>复制</block></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-copy/u-copy.wxss b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-copy/u-copy.wxss
new file mode 100644
index 0000000..e69de29
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form-item/props.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form-item/props.js
new file mode 100644
index 0000000..d70dfd9
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form-item/props.js
@@ -0,0 +1,56 @@
+"use strict";
+const uni_modules_uviewPlus_libs_config_props = require("../../libs/config/props.js");
+const props = {
+  props: {
+    // input的label提示语
+    label: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.formItem.label
+    },
+    // 绑定的值
+    prop: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.formItem.prop
+    },
+    // 绑定的规则
+    rule: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.formItem.rule
+    },
+    // 是否显示表单域的下划线边框
+    borderBottom: {
+      type: [String, Boolean],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.formItem.borderBottom
+    },
+    // label的位置，left-左边，top-上边
+    labelPosition: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.formItem.labelPosition
+    },
+    // label的宽度，单位px
+    labelWidth: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.formItem.labelWidth
+    },
+    // 右侧图标
+    rightIcon: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.formItem.rightIcon
+    },
+    // 左侧图标
+    leftIcon: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.formItem.leftIcon
+    },
+    // 是否显示左边的必填星号，只作显示用，具体校验必填的逻辑，请在rules中配置
+    required: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.formItem.required
+    },
+    leftIconStyle: {
+      type: [String, Object],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.formItem.leftIconStyle
+    }
+  }
+};
+exports.props = props;
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form-item/u-form-item.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form-item/u-form-item.js
new file mode 100644
index 0000000..adc91ef
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form-item/u-form-item.js
@@ -0,0 +1,214 @@
+"use strict";
+const uni_modules_uviewPlus_components_uFormItem_props = require("./props.js");
+const uni_modules_uviewPlus_libs_mixin_mpMixin = require("../../libs/mixin/mpMixin.js");
+const uni_modules_uviewPlus_libs_mixin_mixin = require("../../libs/mixin/mixin.js");
+const uni_modules_uviewPlus_libs_config_props = require("../../libs/config/props.js");
+const uni_modules_uviewPlus_libs_config_color = require("../../libs/config/color.js");
+const uni_modules_uviewPlus_libs_function_index = require("../../libs/function/index.js");
+const common_vendor = require("../../../../common/vendor.js");
+require("../../libs/function/test.js");
+require("../../libs/util/route.js");
+require("../../libs/config/config.js");
+require("../../libs/config/props/actionSheet.js");
+require("../../libs/config/props/album.js");
+require("../../libs/config/props/alert.js");
+require("../../libs/config/props/avatar.js");
+require("../../libs/config/props/avatarGroup.js");
+require("../../libs/config/props/backtop.js");
+require("../../libs/config/props/badge.js");
+require("../../libs/config/props/button.js");
+require("../../libs/config/props/calendar.js");
+require("../../libs/config/props/carKeyboard.js");
+require("../../libs/config/props/cell.js");
+require("../../libs/config/props/cellGroup.js");
+require("../../libs/config/props/checkbox.js");
+require("../../libs/config/props/checkboxGroup.js");
+require("../../libs/config/props/circleProgress.js");
+require("../../libs/config/props/code.js");
+require("../../libs/config/props/codeInput.js");
+require("../../libs/config/props/col.js");
+require("../../libs/config/props/collapse.js");
+require("../../libs/config/props/collapseItem.js");
+require("../../libs/config/props/columnNotice.js");
+require("../../libs/config/props/countDown.js");
+require("../../libs/config/props/countTo.js");
+require("../../libs/config/props/datetimePicker.js");
+require("../../libs/config/props/divider.js");
+require("../../libs/config/props/empty.js");
+require("../../libs/config/props/form.js");
+require("../../libs/config/props/formItem.js");
+require("../../libs/config/props/gap.js");
+require("../../libs/config/props/grid.js");
+require("../../libs/config/props/gridItem.js");
+require("../../libs/config/props/icon.js");
+require("../../libs/config/props/image.js");
+require("../../libs/config/props/indexAnchor.js");
+require("../../libs/config/props/indexList.js");
+require("../../libs/config/props/input.js");
+require("../../libs/config/props/keyboard.js");
+require("../../libs/config/props/line.js");
+require("../../libs/config/props/lineProgress.js");
+require("../../libs/config/props/link.js");
+require("../../libs/config/props/list.js");
+require("../../libs/config/props/listItem.js");
+require("../../libs/config/props/loadingIcon.js");
+require("../../libs/config/props/loadingPage.js");
+require("../../libs/config/props/loadmore.js");
+require("../../libs/config/props/modal.js");
+require("../../libs/config/props/navbar.js");
+require("../../libs/config/props/noNetwork.js");
+require("../../libs/config/props/noticeBar.js");
+require("../../libs/config/props/notify.js");
+require("../../libs/config/props/numberBox.js");
+require("../../libs/config/props/numberKeyboard.js");
+require("../../libs/config/props/overlay.js");
+require("../../libs/config/props/parse.js");
+require("../../libs/config/props/picker.js");
+require("../../libs/config/props/popup.js");
+require("../../libs/config/props/radio.js");
+require("../../libs/config/props/radioGroup.js");
+require("../../libs/config/props/rate.js");
+require("../../libs/config/props/readMore.js");
+require("../../libs/config/props/row.js");
+require("../../libs/config/props/rowNotice.js");
+require("../../libs/config/props/scrollList.js");
+require("../../libs/config/props/search.js");
+require("../../libs/config/props/section.js");
+require("../../libs/config/props/skeleton.js");
+require("../../libs/config/props/slider.js");
+require("../../libs/config/props/statusBar.js");
+require("../../libs/config/props/steps.js");
+require("../../libs/config/props/stepsItem.js");
+require("../../libs/config/props/sticky.js");
+require("../../libs/config/props/subsection.js");
+require("../../libs/config/props/swipeAction.js");
+require("../../libs/config/props/swipeActionItem.js");
+require("../../libs/config/props/swiper.js");
+require("../../libs/config/props/swipterIndicator.js");
+require("../../libs/config/props/switch.js");
+require("../../libs/config/props/tabbar.js");
+require("../../libs/config/props/tabbarItem.js");
+require("../../libs/config/props/tabs.js");
+require("../../libs/config/props/tag.js");
+require("../../libs/config/props/text.js");
+require("../../libs/config/props/textarea.js");
+require("../../libs/config/props/toast.js");
+require("../../libs/config/props/toolbar.js");
+require("../../libs/config/props/tooltip.js");
+require("../../libs/config/props/transition.js");
+require("../../libs/config/props/upload.js");
+require("../../libs/function/digit.js");
+const _sfc_main = {
+  name: "u-form-item",
+  mixins: [uni_modules_uviewPlus_libs_mixin_mpMixin.mpMixin, uni_modules_uviewPlus_libs_mixin_mixin.mixin, uni_modules_uviewPlus_components_uFormItem_props.props],
+  data() {
+    return {
+      // 错误提示语
+      message: "",
+      parentData: {
+        // 提示文本的位置
+        labelPosition: "left",
+        // 提示文本对齐方式
+        labelAlign: "left",
+        // 提示文本的样式
+        labelStyle: {},
+        // 提示文本的宽度
+        labelWidth: 45,
+        // 错误提示方式
+        errorType: "message"
+      },
+      color: uni_modules_uviewPlus_libs_config_color.color
+    };
+  },
+  // 组件创建完成时，将当前实例保存到u-form中
+  computed: {
+    propsLine() {
+      return uni_modules_uviewPlus_libs_config_props.defProps.line;
+    }
+  },
+  mounted() {
+    this.init();
+  },
+  emits: ["click"],
+  methods: {
+    addStyle: uni_modules_uviewPlus_libs_function_index.addStyle,
+    addUnit: uni_modules_uviewPlus_libs_function_index.addUnit,
+    init() {
+      this.updateParentData();
+      if (!this.parent) {
+        uni_modules_uviewPlus_libs_function_index.error("u-form-item需要结合u-form组件使用");
+      }
+    },
+    // 获取父组件的参数
+    updateParentData() {
+      this.getParentData("u-form");
+    },
+    // 移除u-form-item的校验结果
+    clearValidate() {
+      this.message = null;
+    },
+    // 清空当前的组件的校验结果，并重置为初始值
+    resetField() {
+      const value = uni_modules_uviewPlus_libs_function_index.getProperty(this.parent.originalModel, this.prop);
+      uni_modules_uviewPlus_libs_function_index.setProperty(this.parent.model, this.prop, value);
+      this.message = null;
+    },
+    // 点击组件
+    clickHandler() {
+      this.$emit("click");
+    }
+  }
+};
+if (!Array) {
+  const _easycom_u_icon2 = common_vendor.resolveComponent("u-icon");
+  const _easycom_u_line2 = common_vendor.resolveComponent("u-line");
+  (_easycom_u_icon2 + _easycom_u_line2)();
+}
+const _easycom_u_icon = () => "../u-icon/u-icon.js";
+const _easycom_u_line = () => "../u-line/u-line.js";
+if (!Math) {
+  (_easycom_u_icon + _easycom_u_line)();
+}
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return common_vendor.e({
+    a: _ctx.required || _ctx.leftIcon || _ctx.label
+  }, _ctx.required || _ctx.leftIcon || _ctx.label ? common_vendor.e({
+    b: _ctx.required
+  }, _ctx.required ? {} : {}, {
+    c: _ctx.leftIcon
+  }, _ctx.leftIcon ? {
+    d: common_vendor.p({
+      name: _ctx.leftIcon,
+      ["custom-style"]: _ctx.leftIconStyle
+    })
+  } : {}, {
+    e: common_vendor.t(_ctx.label),
+    f: common_vendor.s($data.parentData.labelStyle),
+    g: common_vendor.s({
+      justifyContent: $data.parentData.labelAlign === "left" ? "flex-start" : $data.parentData.labelAlign === "center" ? "center" : "flex-end"
+    }),
+    h: $options.addUnit(_ctx.labelWidth || $data.parentData.labelWidth),
+    i: $data.parentData.labelPosition === "left" ? 0 : "5px"
+  }) : {}, {
+    j: _ctx.$slots.right
+  }, _ctx.$slots.right ? {} : {}, {
+    k: common_vendor.o((...args) => $options.clickHandler && $options.clickHandler(...args)),
+    l: common_vendor.s($options.addStyle(_ctx.customStyle)),
+    m: common_vendor.s({
+      flexDirection: (_ctx.labelPosition || $data.parentData.labelPosition) === "left" ? "row" : "column"
+    }),
+    n: !!$data.message && $data.parentData.errorType === "message"
+  }, !!$data.message && $data.parentData.errorType === "message" ? {
+    o: common_vendor.t($data.message),
+    p: $options.addUnit($data.parentData.labelPosition === "top" ? 0 : _ctx.labelWidth || $data.parentData.labelWidth)
+  } : {}, {
+    q: _ctx.borderBottom
+  }, _ctx.borderBottom ? {
+    r: common_vendor.p({
+      color: $data.message && $data.parentData.errorType === "border-bottom" ? $data.color.error : $options.propsLine.color,
+      customStyle: `margin-top: ${$data.message && $data.parentData.errorType === "message" ? "5px" : 0}`
+    })
+  } : {});
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-42bac3de"], ["__file", "D:/里海数字乡村/purchase-let/uni_modules/uview-plus/components/u-form-item/u-form-item.vue"]]);
+wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form-item/u-form-item.json b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form-item/u-form-item.json
new file mode 100644
index 0000000..9dd4979
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form-item/u-form-item.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "u-icon": "../u-icon/u-icon",
+    "u-line": "../u-line/u-line"
+  }
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form-item/u-form-item.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form-item/u-form-item.wxml
new file mode 100644
index 0000000..9db35c7
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form-item/u-form-item.wxml
@@ -0,0 +1 @@
+<view class="u-form-item data-v-42bac3de"><view class="u-form-item__body data-v-42bac3de" bindtap="{{k}}" style="{{l + ';' + m}}"><block wx:if="{{$slots.label}}"><slot name="label"></slot></block><block wx:else><view wx:if="{{a}}" class="u-form-item__body__left data-v-42bac3de" style="{{'width:' + h + ';' + ('margin-bottom:' + i)}}"><view class="u-form-item__body__left__content data-v-42bac3de"><text wx:if="{{b}}" class="u-form-item__body__left__content__required data-v-42bac3de">*</text><view wx:if="{{c}}" class="u-form-item__body__left__content__icon data-v-42bac3de"><u-icon wx:if="{{d}}" class="data-v-42bac3de" u-i="42bac3de-0" bind:__l="__l" u-p="{{d}}"></u-icon></view><text class="u-form-item__body__left__content__label data-v-42bac3de" style="{{f + ';' + g}}">{{e}}</text></view></view></block><view class="u-form-item__body__right data-v-42bac3de"><view class="u-form-item__body__right__content data-v-42bac3de"><view class="u-form-item__body__right__content__slot data-v-42bac3de"><slot/></view><view wx:if="{{j}}" class="item__body__right__content__icon data-v-42bac3de"><slot name="right"/></view></view></view></view><block wx:if="{{$slots.error}}"><slot name="error"></slot></block><block wx:else><text wx:if="{{n}}" class="u-form-item__body__right__message data-v-42bac3de" style="{{'margin-left:' + p}}">{{o}}</text></block><u-line wx:if="{{q}}" class="data-v-42bac3de" u-i="42bac3de-1" bind:__l="__l" u-p="{{r}}"></u-line></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form-item/u-form-item.wxss b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form-item/u-form-item.wxss
new file mode 100644
index 0000000..e1b5b27
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form-item/u-form-item.wxss
@@ -0,0 +1,106 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.u-empty.data-v-42bac3de,
+.u-empty__wrap.data-v-42bac3de,
+.u-tabs.data-v-42bac3de,
+.u-tabs__wrapper.data-v-42bac3de,
+.u-tabs__wrapper__scroll-view-wrapper.data-v-42bac3de,
+.u-tabs__wrapper__scroll-view.data-v-42bac3de,
+.u-tabs__wrapper__nav.data-v-42bac3de,
+.u-tabs__wrapper__nav__line.data-v-42bac3de {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-form-item.data-v-42bac3de {
+  display: flex;
+  flex-direction: column;
+  font-size: 14px;
+  color: #303133;
+}
+.u-form-item__body.data-v-42bac3de {
+  display: flex;
+  flex-direction: row;
+  padding: 10px 0;
+}
+.u-form-item__body__left.data-v-42bac3de {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+.u-form-item__body__left__content.data-v-42bac3de {
+  position: relative;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  padding-right: 10rpx;
+  flex: 1;
+}
+.u-form-item__body__left__content__icon.data-v-42bac3de {
+  margin-right: 8rpx;
+}
+.u-form-item__body__left__content__required.data-v-42bac3de {
+  position: absolute;
+  left: -9px;
+  color: #f56c6c;
+  line-height: 20px;
+  font-size: 20px;
+  top: 3px;
+}
+.u-form-item__body__left__content__label.data-v-42bac3de {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  flex: 1;
+  color: #303133;
+  font-size: 15px;
+}
+.u-form-item__body__right.data-v-42bac3de {
+  flex: 1;
+}
+.u-form-item__body__right__content.data-v-42bac3de {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  flex: 1;
+}
+.u-form-item__body__right__content__slot.data-v-42bac3de {
+  flex: 1;
+}
+.u-form-item__body__right__content__icon.data-v-42bac3de {
+  margin-left: 10rpx;
+  color: #c0c4cc;
+  font-size: 30rpx;
+}
+.u-form-item__body__right__message.data-v-42bac3de {
+  font-size: 12px;
+  line-height: 12px;
+  color: #f56c6c;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form/props.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form/props.js
new file mode 100644
index 0000000..057ce77
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form/props.js
@@ -0,0 +1,48 @@
+"use strict";
+const uni_modules_uviewPlus_libs_config_props = require("../../libs/config/props.js");
+const props = {
+  props: {
+    // 当前form的需要验证字段的集合
+    model: {
+      type: Object,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.form.model
+    },
+    // 验证规则
+    rules: {
+      type: [Object, Function, Array],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.form.rules
+    },
+    // 有错误时的提示方式，message-提示信息，toast-进行toast提示
+    // border-bottom-下边框呈现红色，none-无提示
+    errorType: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.form.errorType
+    },
+    // 是否显示表单域的下划线边框
+    borderBottom: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.form.borderBottom
+    },
+    // label的位置，left-左边，top-上边
+    labelPosition: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.form.labelPosition
+    },
+    // label的宽度，单位px
+    labelWidth: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.form.labelWidth
+    },
+    // lable字体的对齐方式
+    labelAlign: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.form.labelAlign
+    },
+    // lable的样式，对象形式
+    labelStyle: {
+      type: Object,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.form.labelStyle
+    }
+  }
+};
+exports.props = props;
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form/u-form.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form/u-form.js
new file mode 100644
index 0000000..3824e09
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form/u-form.js
@@ -0,0 +1,269 @@
+"use strict";
+const uni_modules_uviewPlus_components_uForm_props = require("./props.js");
+const uni_modules_uviewPlus_libs_mixin_mpMixin = require("../../libs/mixin/mpMixin.js");
+const uni_modules_uviewPlus_libs_mixin_mixin = require("../../libs/mixin/mixin.js");
+const uni_modules_uviewPlus_libs_util_asyncValidator = require("../../libs/util/async-validator.js");
+const uni_modules_uviewPlus_libs_function_index = require("../../libs/function/index.js");
+const uni_modules_uviewPlus_libs_function_test = require("../../libs/function/test.js");
+const common_vendor = require("../../../../common/vendor.js");
+require("../../libs/config/props.js");
+require("../../libs/config/config.js");
+require("../../libs/config/props/actionSheet.js");
+require("../../libs/config/props/album.js");
+require("../../libs/config/props/alert.js");
+require("../../libs/config/props/avatar.js");
+require("../../libs/config/props/avatarGroup.js");
+require("../../libs/config/props/backtop.js");
+require("../../libs/config/props/badge.js");
+require("../../libs/config/props/button.js");
+require("../../libs/config/props/calendar.js");
+require("../../libs/config/props/carKeyboard.js");
+require("../../libs/config/props/cell.js");
+require("../../libs/config/props/cellGroup.js");
+require("../../libs/config/props/checkbox.js");
+require("../../libs/config/props/checkboxGroup.js");
+require("../../libs/config/props/circleProgress.js");
+require("../../libs/config/props/code.js");
+require("../../libs/config/props/codeInput.js");
+require("../../libs/config/props/col.js");
+require("../../libs/config/props/collapse.js");
+require("../../libs/config/props/collapseItem.js");
+require("../../libs/config/props/columnNotice.js");
+require("../../libs/config/props/countDown.js");
+require("../../libs/config/props/countTo.js");
+require("../../libs/config/props/datetimePicker.js");
+require("../../libs/config/props/divider.js");
+require("../../libs/config/props/empty.js");
+require("../../libs/config/props/form.js");
+require("../../libs/config/props/formItem.js");
+require("../../libs/config/props/gap.js");
+require("../../libs/config/props/grid.js");
+require("../../libs/config/props/gridItem.js");
+require("../../libs/config/props/icon.js");
+require("../../libs/config/props/image.js");
+require("../../libs/config/props/indexAnchor.js");
+require("../../libs/config/props/indexList.js");
+require("../../libs/config/props/input.js");
+require("../../libs/config/props/keyboard.js");
+require("../../libs/config/props/line.js");
+require("../../libs/config/props/lineProgress.js");
+require("../../libs/config/props/link.js");
+require("../../libs/config/props/list.js");
+require("../../libs/config/props/listItem.js");
+require("../../libs/config/props/loadingIcon.js");
+require("../../libs/config/props/loadingPage.js");
+require("../../libs/config/props/loadmore.js");
+require("../../libs/config/props/modal.js");
+require("../../libs/config/props/navbar.js");
+require("../../libs/config/color.js");
+require("../../libs/config/props/noNetwork.js");
+require("../../libs/config/props/noticeBar.js");
+require("../../libs/config/props/notify.js");
+require("../../libs/config/props/numberBox.js");
+require("../../libs/config/props/numberKeyboard.js");
+require("../../libs/config/props/overlay.js");
+require("../../libs/config/props/parse.js");
+require("../../libs/config/props/picker.js");
+require("../../libs/config/props/popup.js");
+require("../../libs/config/props/radio.js");
+require("../../libs/config/props/radioGroup.js");
+require("../../libs/config/props/rate.js");
+require("../../libs/config/props/readMore.js");
+require("../../libs/config/props/row.js");
+require("../../libs/config/props/rowNotice.js");
+require("../../libs/config/props/scrollList.js");
+require("../../libs/config/props/search.js");
+require("../../libs/config/props/section.js");
+require("../../libs/config/props/skeleton.js");
+require("../../libs/config/props/slider.js");
+require("../../libs/config/props/statusBar.js");
+require("../../libs/config/props/steps.js");
+require("../../libs/config/props/stepsItem.js");
+require("../../libs/config/props/sticky.js");
+require("../../libs/config/props/subsection.js");
+require("../../libs/config/props/swipeAction.js");
+require("../../libs/config/props/swipeActionItem.js");
+require("../../libs/config/props/swiper.js");
+require("../../libs/config/props/swipterIndicator.js");
+require("../../libs/config/props/switch.js");
+require("../../libs/config/props/tabbar.js");
+require("../../libs/config/props/tabbarItem.js");
+require("../../libs/config/props/tabs.js");
+require("../../libs/config/props/tag.js");
+require("../../libs/config/props/text.js");
+require("../../libs/config/props/textarea.js");
+require("../../libs/config/props/toast.js");
+require("../../libs/config/props/toolbar.js");
+require("../../libs/config/props/tooltip.js");
+require("../../libs/config/props/transition.js");
+require("../../libs/config/props/upload.js");
+require("../../libs/util/route.js");
+require("../../libs/function/digit.js");
+uni_modules_uviewPlus_libs_util_asyncValidator.Schema.warning = function() {
+};
+const _sfc_main = {
+  name: "u-form",
+  mixins: [uni_modules_uviewPlus_libs_mixin_mpMixin.mpMixin, uni_modules_uviewPlus_libs_mixin_mixin.mixin, uni_modules_uviewPlus_components_uForm_props.props],
+  provide() {
+    return {
+      uForm: this
+    };
+  },
+  data() {
+    return {
+      formRules: {},
+      // 规则校验器
+      validator: {},
+      // 原始的model快照，用于resetFields方法重置表单时使用
+      originalModel: null
+    };
+  },
+  watch: {
+    // 监听规则的变化
+    rules: {
+      immediate: true,
+      handler(n) {
+        this.setRules(n);
+      }
+    },
+    // 监听属性的变化，通知子组件u-form-item重新获取信息
+    propsChange(n) {
+      var _a;
+      if ((_a = this.children) == null ? void 0 : _a.length) {
+        this.children.map((child) => {
+          typeof child.updateParentData == "function" && child.updateParentData();
+        });
+      }
+    },
+    // 监听model的初始值作为重置表单的快照
+    model: {
+      immediate: true,
+      handler(n) {
+        if (!this.originalModel) {
+          this.originalModel = uni_modules_uviewPlus_libs_function_index.deepClone(n);
+        }
+      }
+    }
+  },
+  computed: {
+    propsChange() {
+      return [
+        this.errorType,
+        this.borderBottom,
+        this.labelPosition,
+        this.labelWidth,
+        this.labelAlign,
+        this.labelStyle
+      ];
+    }
+  },
+  created() {
+    this.children = [];
+  },
+  methods: {
+    // 手动设置校验的规则，如果规则中有函数的话，微信小程序中会过滤掉，所以只能手动调用设置规则
+    setRules(rules) {
+      if (Object.keys(rules).length === 0)
+        return;
+      if (Object.keys(this.model).length === 0) {
+        uni_modules_uviewPlus_libs_function_index.error("设置rules，model必须设置！如果已经设置，请刷新页面。");
+        return;
+      }
+      this.formRules = rules;
+      this.validator = new uni_modules_uviewPlus_libs_util_asyncValidator.Schema(rules);
+    },
+    // 清空所有u-form-item组件的内容，本质上是调用了u-form-item组件中的resetField()方法
+    resetFields() {
+      this.resetModel();
+    },
+    // 重置model为初始值的快照
+    resetModel(obj) {
+      this.children.map((child) => {
+        const prop = child == null ? void 0 : child.prop;
+        const value = uni_modules_uviewPlus_libs_function_index.getProperty(this.originalModel, prop);
+        uni_modules_uviewPlus_libs_function_index.setProperty(this.model, prop, value);
+      });
+    },
+    // 清空校验结果
+    clearValidate(props) {
+      props = [].concat(props);
+      this.children.map((child) => {
+        if (props[0] === void 0 || props.includes(child.prop)) {
+          child.message = null;
+        }
+      });
+    },
+    // 对部分表单字段进行校验
+    async validateField(value, callback, event = null) {
+      this.$nextTick(() => {
+        const errorsRes = [];
+        value = [].concat(value);
+        this.children.map((child) => {
+          const childErrors = [];
+          if (value.includes(child.prop)) {
+            const propertyVal = uni_modules_uviewPlus_libs_function_index.getProperty(
+              this.model,
+              child.prop
+            );
+            const propertyChain = child.prop.split(".");
+            const propertyName = propertyChain[propertyChain.length - 1];
+            const rule = this.formRules[child.rule || child.prop];
+            if (!rule)
+              return;
+            const rules = [].concat(rule);
+            for (let i = 0; i < rules.length; i++) {
+              const ruleItem = rules[i];
+              const trigger = [].concat(ruleItem == null ? void 0 : ruleItem.trigger);
+              if (event && !trigger.includes(event))
+                continue;
+              const validator = new uni_modules_uviewPlus_libs_util_asyncValidator.Schema({
+                [propertyName]: ruleItem
+              });
+              validator.validate(
+                {
+                  [propertyName]: propertyVal
+                },
+                (errors, fields) => {
+                  var _a;
+                  if (uni_modules_uviewPlus_libs_function_test.test.array(errors)) {
+                    errorsRes.push(...errors);
+                    childErrors.push(...errors);
+                  }
+                  child.message = ((_a = childErrors[0]) == null ? void 0 : _a.message) ? childErrors[0].message : null;
+                }
+              );
+            }
+          }
+        });
+        typeof callback === "function" && callback(errorsRes);
+      });
+    },
+    // 校验全部数据
+    validate(callback) {
+      if (Object.keys(this.formRules).length === 0) {
+        uni_modules_uviewPlus_libs_function_index.error("未设置rules，请看文档说明！如果已经设置，请刷新页面。");
+        return;
+      }
+      return new Promise((resolve, reject) => {
+        this.$nextTick(() => {
+          const formItemProps = this.children.map(
+            (item) => item.prop
+          );
+          this.validateField(formItemProps, (errors) => {
+            if (errors.length) {
+              this.errorType === "toast" && uni_modules_uviewPlus_libs_function_index.toast(errors[0].message);
+              reject(errors);
+            } else {
+              resolve(true);
+            }
+          });
+        });
+      });
+    }
+  }
+};
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return {};
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/里海数字乡村/purchase-let/uni_modules/uview-plus/components/u-form/u-form.vue"]]);
+wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form/u-form.json b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form/u-form.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form/u-form.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form/u-form.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form/u-form.wxml
new file mode 100644
index 0000000..292cef5
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form/u-form.wxml
@@ -0,0 +1 @@
+<view class="u-form"><slot/></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form/u-form.wxss b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-form/u-form.wxss
new file mode 100644
index 0000000..e69de29
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/props.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/props.js
new file mode 100644
index 0000000..6a9388f
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/props.js
@@ -0,0 +1,189 @@
+"use strict";
+const uni_modules_uviewPlus_libs_config_props = require("../../libs/config/props.js");
+const props = {
+  props: {
+    // 绑定的值
+    modelValue: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.value
+    },
+    // number-数字输入键盘，app-vue下可以输入浮点数，app-nvue和小程序平台下只能输入整数
+    // idcard-身份证输入键盘，微信、支付宝、百度、QQ小程序
+    // digit-带小数点的数字键盘，App的nvue页面、微信、支付宝、百度、头条、QQ小程序
+    // text-文本输入键盘
+    type: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.type
+    },
+    // 如果 textarea 是在一个 position:fixed 的区域，需要显示指定属性 fixed 为 true，
+    // 兼容性：微信小程序、百度小程序、字节跳动小程序、QQ小程序
+    fixed: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.fixed
+    },
+    // 是否禁用输入框
+    disabled: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.disabled
+    },
+    // 禁用状态时的背景色
+    disabledColor: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.disabledColor
+    },
+    // 是否显示清除控件
+    clearable: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.clearable
+    },
+    // 是否密码类型
+    password: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.password
+    },
+    // 最大输入长度，设置为 -1 的时候不限制最大长度
+    maxlength: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.maxlength
+    },
+    // 	输入框为空时的占位符
+    placeholder: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.placeholder
+    },
+    // 指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写/deep/
+    placeholderClass: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.placeholderClass
+    },
+    // 指定placeholder的样式
+    placeholderStyle: {
+      type: [String, Object],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.placeholderStyle
+    },
+    // 是否显示输入字数统计，只在 type ="text"或type ="textarea"时有效
+    showWordLimit: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.showWordLimit
+    },
+    // 设置右下角按钮的文字，有效值：send|search|next|go|done，兼容性详见uni-app文档
+    // https://uniapp.dcloud.io/component/input
+    // https://uniapp.dcloud.io/component/textarea
+    confirmType: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.confirmType
+    },
+    // 点击键盘右下角按钮时是否保持键盘不收起，H5无效
+    confirmHold: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.confirmHold
+    },
+    // focus时，点击页面的时候不收起键盘，微信小程序有效
+    holdKeyboard: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.holdKeyboard
+    },
+    // 自动获取焦点
+    // 在 H5 平台能否聚焦以及软键盘是否跟随弹出，取决于当前浏览器本身的实现。nvue 页面不支持，需使用组件的 focus()、blur() 方法控制焦点
+    focus: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.focus
+    },
+    // 键盘收起时，是否自动失去焦点，目前仅App3.0.0+有效
+    autoBlur: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.autoBlur
+    },
+    // 是否去掉 iOS 下的默认内边距，仅微信小程序，且type=textarea时有效
+    disableDefaultPadding: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.disableDefaultPadding
+    },
+    // 指定focus时光标的位置
+    cursor: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.cursor
+    },
+    // 输入框聚焦时底部与键盘的距离
+    cursorSpacing: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.cursorSpacing
+    },
+    // 光标起始位置，自动聚集时有效，需与selection-end搭配使用
+    selectionStart: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.selectionStart
+    },
+    // 光标结束位置，自动聚集时有效，需与selection-start搭配使用
+    selectionEnd: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.selectionEnd
+    },
+    // 键盘弹起时，是否自动上推页面
+    adjustPosition: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.adjustPosition
+    },
+    // 输入框内容对齐方式，可选值为：left|center|right
+    inputAlign: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.inputAlign
+    },
+    // 输入框字体的大小
+    fontSize: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.fontSize
+    },
+    // 输入框字体颜色
+    color: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.color
+    },
+    // 输入框前置图标
+    prefixIcon: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.prefixIcon
+    },
+    // 前置图标样式，对象或字符串
+    prefixIconStyle: {
+      type: [String, Object],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.prefixIconStyle
+    },
+    // 输入框后置图标
+    suffixIcon: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.suffixIcon
+    },
+    // 后置图标样式，对象或字符串
+    suffixIconStyle: {
+      type: [String, Object],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.suffixIconStyle
+    },
+    // 边框类型，surround-四周边框，bottom-底部边框，none-无边框
+    border: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.border
+    },
+    // 是否只读，与disabled不同之处在于disabled会置灰组件，而readonly则不会
+    readonly: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.readonly
+    },
+    // 输入框形状，circle-圆形，square-方形
+    shape: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.shape
+    },
+    // 用于处理或者过滤输入框内容的方法
+    formatter: {
+      type: [Function, null],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.formatter
+    },
+    // 是否忽略组件内对文本合成系统事件的处理
+    ignoreCompositionEvent: {
+      type: Boolean,
+      default: true
+    }
+  }
+};
+exports.props = props;
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.js
new file mode 100644
index 0000000..987da4c
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.js
@@ -0,0 +1,311 @@
+"use strict";
+const uni_modules_uviewPlus_components_uInput_props = require("./props.js");
+const uni_modules_uviewPlus_libs_mixin_mpMixin = require("../../libs/mixin/mpMixin.js");
+const uni_modules_uviewPlus_libs_mixin_mixin = require("../../libs/mixin/mixin.js");
+const uni_modules_uviewPlus_libs_function_index = require("../../libs/function/index.js");
+const common_vendor = require("../../../../common/vendor.js");
+require("../../libs/config/props.js");
+require("../../libs/config/config.js");
+require("../../libs/config/props/actionSheet.js");
+require("../../libs/config/props/album.js");
+require("../../libs/config/props/alert.js");
+require("../../libs/config/props/avatar.js");
+require("../../libs/config/props/avatarGroup.js");
+require("../../libs/config/props/backtop.js");
+require("../../libs/config/props/badge.js");
+require("../../libs/config/props/button.js");
+require("../../libs/config/props/calendar.js");
+require("../../libs/config/props/carKeyboard.js");
+require("../../libs/config/props/cell.js");
+require("../../libs/config/props/cellGroup.js");
+require("../../libs/config/props/checkbox.js");
+require("../../libs/config/props/checkboxGroup.js");
+require("../../libs/config/props/circleProgress.js");
+require("../../libs/config/props/code.js");
+require("../../libs/config/props/codeInput.js");
+require("../../libs/config/props/col.js");
+require("../../libs/config/props/collapse.js");
+require("../../libs/config/props/collapseItem.js");
+require("../../libs/config/props/columnNotice.js");
+require("../../libs/config/props/countDown.js");
+require("../../libs/config/props/countTo.js");
+require("../../libs/config/props/datetimePicker.js");
+require("../../libs/config/props/divider.js");
+require("../../libs/config/props/empty.js");
+require("../../libs/config/props/form.js");
+require("../../libs/config/props/formItem.js");
+require("../../libs/config/props/gap.js");
+require("../../libs/config/props/grid.js");
+require("../../libs/config/props/gridItem.js");
+require("../../libs/config/props/icon.js");
+require("../../libs/config/props/image.js");
+require("../../libs/config/props/indexAnchor.js");
+require("../../libs/config/props/indexList.js");
+require("../../libs/config/props/input.js");
+require("../../libs/config/props/keyboard.js");
+require("../../libs/config/props/line.js");
+require("../../libs/config/props/lineProgress.js");
+require("../../libs/config/props/link.js");
+require("../../libs/config/props/list.js");
+require("../../libs/config/props/listItem.js");
+require("../../libs/config/props/loadingIcon.js");
+require("../../libs/config/props/loadingPage.js");
+require("../../libs/config/props/loadmore.js");
+require("../../libs/config/props/modal.js");
+require("../../libs/config/props/navbar.js");
+require("../../libs/config/color.js");
+require("../../libs/config/props/noNetwork.js");
+require("../../libs/config/props/noticeBar.js");
+require("../../libs/config/props/notify.js");
+require("../../libs/config/props/numberBox.js");
+require("../../libs/config/props/numberKeyboard.js");
+require("../../libs/config/props/overlay.js");
+require("../../libs/config/props/parse.js");
+require("../../libs/config/props/picker.js");
+require("../../libs/config/props/popup.js");
+require("../../libs/config/props/radio.js");
+require("../../libs/config/props/radioGroup.js");
+require("../../libs/config/props/rate.js");
+require("../../libs/config/props/readMore.js");
+require("../../libs/config/props/row.js");
+require("../../libs/config/props/rowNotice.js");
+require("../../libs/config/props/scrollList.js");
+require("../../libs/config/props/search.js");
+require("../../libs/config/props/section.js");
+require("../../libs/config/props/skeleton.js");
+require("../../libs/config/props/slider.js");
+require("../../libs/config/props/statusBar.js");
+require("../../libs/config/props/steps.js");
+require("../../libs/config/props/stepsItem.js");
+require("../../libs/config/props/sticky.js");
+require("../../libs/config/props/subsection.js");
+require("../../libs/config/props/swipeAction.js");
+require("../../libs/config/props/swipeActionItem.js");
+require("../../libs/config/props/swiper.js");
+require("../../libs/config/props/swipterIndicator.js");
+require("../../libs/config/props/switch.js");
+require("../../libs/config/props/tabbar.js");
+require("../../libs/config/props/tabbarItem.js");
+require("../../libs/config/props/tabs.js");
+require("../../libs/config/props/tag.js");
+require("../../libs/config/props/text.js");
+require("../../libs/config/props/textarea.js");
+require("../../libs/config/props/toast.js");
+require("../../libs/config/props/toolbar.js");
+require("../../libs/config/props/tooltip.js");
+require("../../libs/config/props/transition.js");
+require("../../libs/config/props/upload.js");
+require("../../libs/function/test.js");
+require("../../libs/util/route.js");
+require("../../libs/function/digit.js");
+const _sfc_main = {
+  name: "u-input",
+  mixins: [uni_modules_uviewPlus_libs_mixin_mpMixin.mpMixin, uni_modules_uviewPlus_libs_mixin_mixin.mixin, uni_modules_uviewPlus_components_uInput_props.props],
+  data() {
+    return {
+      // 清除操作
+      clearInput: false,
+      // 输入框的值
+      innerValue: "",
+      // 是否处于获得焦点状态
+      focused: false,
+      // value是否第一次变化，在watch中，由于加入immediate属性，会在第一次触发，此时不应该认为value发生了变化
+      firstChange: true,
+      // value绑定值的变化是由内部还是外部引起的
+      changeFromInner: false,
+      // 过滤处理方法
+      innerFormatter: (value) => value
+    };
+  },
+  watch: {
+    modelValue: {
+      immediate: true,
+      handler(newVal, oldVal) {
+        this.innerValue = newVal;
+        this.firstChange = false;
+        this.changeFromInner = false;
+      }
+    }
+  },
+  computed: {
+    // 是否显示清除控件
+    isShowClear() {
+      const { clearable, readonly, focused, innerValue } = this;
+      return !!clearable && !readonly && !!focused && innerValue !== "";
+    },
+    // 组件的类名
+    inputClass() {
+      let classes = [], { border, disabled, shape } = this;
+      border === "surround" && (classes = classes.concat(["u-border", "u-input--radius"]));
+      classes.push(`u-input--${shape}`);
+      border === "bottom" && (classes = classes.concat([
+        "u-border-bottom",
+        "u-input--no-radius"
+      ]));
+      return classes.join(" ");
+    },
+    // 组件的样式
+    wrapperStyle() {
+      const style = {};
+      if (this.disabled) {
+        style.backgroundColor = this.disabledColor;
+      }
+      if (this.border === "none") {
+        style.padding = "0";
+      } else {
+        style.paddingTop = "6px";
+        style.paddingBottom = "6px";
+        style.paddingLeft = "9px";
+        style.paddingRight = "9px";
+      }
+      return uni_modules_uviewPlus_libs_function_index.deepMerge(style, uni_modules_uviewPlus_libs_function_index.addStyle(this.customStyle));
+    },
+    // 输入框的样式
+    inputStyle() {
+      const style = {
+        color: this.color,
+        fontSize: uni_modules_uviewPlus_libs_function_index.addUnit(this.fontSize),
+        textAlign: this.inputAlign
+      };
+      return style;
+    }
+  },
+  emits: ["update:modelValue", "focus", "blur", "change", "confirm", "clear", "keyboardheightchange"],
+  methods: {
+    // 在微信小程序中，不支持将函数当做props参数，故只能通过ref形式调用
+    setFormatter(e) {
+      this.innerFormatter = e;
+    },
+    // 当键盘输入时，触发input事件
+    onInput(e) {
+      let { value = "" } = e.detail || {};
+      const formatter = this.formatter || this.innerFormatter;
+      const formatValue = formatter(value);
+      this.innerValue = value;
+      this.$nextTick(() => {
+        this.innerValue = formatValue;
+        this.valueChange();
+      });
+    },
+    // 输入框失去焦点时触发
+    onBlur(event) {
+      this.$emit("blur", event.detail.value);
+      uni_modules_uviewPlus_libs_function_index.sleep(150).then(() => {
+        this.focused = false;
+      });
+      uni_modules_uviewPlus_libs_function_index.formValidate(this, "blur");
+    },
+    // 输入框聚焦时触发
+    onFocus(event) {
+      this.focused = true;
+      this.$emit("focus");
+    },
+    // 点击完成按钮时触发
+    onConfirm(event) {
+      this.$emit("confirm", this.innerValue);
+    },
+    // 键盘高度发生变化的时候触发此事件
+    // 兼容性：微信小程序2.7.0+、App 3.1.0+
+    onkeyboardheightchange(event) {
+      this.$emit("keyboardheightchange", event);
+    },
+    // 内容发生变化，进行处理
+    valueChange() {
+      if (this.clearInput) {
+        this.innerValue = "";
+        this.clearInput = false;
+      }
+      const value = this.innerValue;
+      this.$nextTick(() => {
+        this.$emit("update:modelValue", value);
+        this.changeFromInner = true;
+        this.$emit("change", value);
+        uni_modules_uviewPlus_libs_function_index.formValidate(this, "change");
+      });
+    },
+    // 点击清除控件
+    onClear() {
+      this.clearInput = true;
+      this.innerValue = "";
+      this.$nextTick(() => {
+        this.valueChange();
+        this.$emit("clear");
+      });
+    },
+    /**
+     * 在安卓nvue上，事件无法冒泡
+     * 在某些时间，我们希望监听u-from-item的点击事件，此时会导致点击u-form-item内的u-input后
+     * 无法触发u-form-item的点击事件，这里通过手动调用u-form-item的方法进行触发
+     */
+    clickHandler() {
+    }
+  }
+};
+if (!Array) {
+  const _easycom_u_icon2 = common_vendor.resolveComponent("u-icon");
+  _easycom_u_icon2();
+}
+const _easycom_u_icon = () => "../u-icon/u-icon.js";
+if (!Math) {
+  _easycom_u_icon();
+}
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return common_vendor.e({
+    a: _ctx.prefixIcon || _ctx.$slots.prefix
+  }, _ctx.prefixIcon || _ctx.$slots.prefix ? {
+    b: common_vendor.p({
+      name: _ctx.prefixIcon,
+      size: "18",
+      customStyle: _ctx.prefixIconStyle
+    })
+  } : {}, {
+    c: common_vendor.s($options.inputStyle),
+    d: _ctx.type,
+    e: _ctx.focus,
+    f: _ctx.cursor,
+    g: $data.innerValue,
+    h: _ctx.autoBlur,
+    i: _ctx.disabled || _ctx.readonly,
+    j: _ctx.maxlength,
+    k: _ctx.placeholder,
+    l: _ctx.placeholderStyle,
+    m: _ctx.placeholderClass,
+    n: _ctx.confirmType,
+    o: _ctx.confirmHold,
+    p: _ctx.holdKeyboard,
+    q: _ctx.cursorSpacing,
+    r: _ctx.adjustPosition,
+    s: _ctx.selectionEnd,
+    t: _ctx.selectionStart,
+    v: _ctx.password || _ctx.type === "password" || false,
+    w: _ctx.ignoreCompositionEvent,
+    x: common_vendor.o((...args) => $options.onInput && $options.onInput(...args)),
+    y: common_vendor.o((...args) => $options.onBlur && $options.onBlur(...args)),
+    z: common_vendor.o((...args) => $options.onFocus && $options.onFocus(...args)),
+    A: common_vendor.o((...args) => $options.onConfirm && $options.onConfirm(...args)),
+    B: common_vendor.o((...args) => $options.onkeyboardheightchange && $options.onkeyboardheightchange(...args)),
+    C: common_vendor.o((...args) => $options.clickHandler && $options.clickHandler(...args)),
+    D: $options.isShowClear
+  }, $options.isShowClear ? {
+    E: common_vendor.p({
+      name: "close",
+      size: "11",
+      color: "#ffffff",
+      customStyle: "line-height: 12px"
+    }),
+    F: common_vendor.o((...args) => $options.onClear && $options.onClear(...args))
+  } : {}, {
+    G: _ctx.suffixIcon || _ctx.$slots.suffix
+  }, _ctx.suffixIcon || _ctx.$slots.suffix ? {
+    H: common_vendor.p({
+      name: _ctx.suffixIcon,
+      size: "18",
+      customStyle: _ctx.suffixIconStyle
+    })
+  } : {}, {
+    I: common_vendor.n($options.inputClass),
+    J: common_vendor.s($options.wrapperStyle)
+  });
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-df79975b"], ["__file", "D:/里海数字乡村/purchase-let/uni_modules/uview-plus/components/u-input/u-input.vue"]]);
+wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.json b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.json
new file mode 100644
index 0000000..fcde44c
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "u-icon": "../u-icon/u-icon"
+  }
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.wxml
new file mode 100644
index 0000000..b0ab4eb
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.wxml
@@ -0,0 +1 @@
+<view class="{{['u-input', 'data-v-df79975b', I]}}" style="{{J}}"><view class="u-input__content data-v-df79975b"><view wx:if="{{a}}" class="u-input__content__prefix-icon data-v-df79975b"><block wx:if="{{$slots.prefix}}"><slot name="prefix"></slot></block><block wx:else><u-icon wx:if="{{b}}" class="data-v-df79975b" u-i="df79975b-0" bind:__l="__l" u-p="{{b}}"></u-icon></block></view><view class="u-input__content__field-wrapper data-v-df79975b" bindtap="{{C}}"><block wx:if="{{r0}}"><input class="u-input__content__field-wrapper__field data-v-df79975b" style="{{c}}" type="{{d}}" focus="{{e}}" cursor="{{f}}" value="{{g}}" auto-blur="{{h}}" disabled="{{i}}" maxlength="{{j}}" placeholder="{{k}}" placeholder-style="{{l}}" placeholder-class="{{m}}" confirm-type="{{n}}" confirm-hold="{{o}}" hold-keyboard="{{p}}" cursor-spacing="{{q}}" adjust-position="{{r}}" selection-end="{{s}}" selection-start="{{t}}" password="{{v}}" ignoreCompositionEvent="{{w}}" bindinput="{{x}}" bindblur="{{y}}" bindfocus="{{z}}" bindconfirm="{{A}}" bindkeyboardheightchange="{{B}}"/></block></view><view wx:if="{{D}}" class="u-input__content__clear data-v-df79975b" bindtap="{{F}}"><u-icon wx:if="{{E}}" class="data-v-df79975b" u-i="df79975b-1" bind:__l="__l" u-p="{{E}}"></u-icon></view><view wx:if="{{G}}" class="u-input__content__subfix-icon data-v-df79975b"><block wx:if="{{$slots.suffix}}"><slot name="suffix"></slot></block><block wx:else><u-icon wx:if="{{H}}" class="data-v-df79975b" u-i="df79975b-2" bind:__l="__l" u-p="{{H}}"></u-icon></block></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.wxss b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.wxss
new file mode 100644
index 0000000..e1afeb7
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.wxss
@@ -0,0 +1,97 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.u-empty.data-v-df79975b,
+.u-empty__wrap.data-v-df79975b,
+.u-tabs.data-v-df79975b,
+.u-tabs__wrapper.data-v-df79975b,
+.u-tabs__wrapper__scroll-view-wrapper.data-v-df79975b,
+.u-tabs__wrapper__scroll-view.data-v-df79975b,
+.u-tabs__wrapper__nav.data-v-df79975b,
+.u-tabs__wrapper__nav__line.data-v-df79975b {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-input.data-v-df79975b {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  flex: 1;
+}
+.u-input--radius.data-v-df79975b, .u-input--square.data-v-df79975b {
+  border-radius: 4px;
+}
+.u-input--no-radius.data-v-df79975b {
+  border-radius: 0;
+}
+.u-input--circle.data-v-df79975b {
+  border-radius: 100px;
+}
+.u-input__content.data-v-df79975b {
+  flex: 1;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+}
+.u-input__content__field-wrapper.data-v-df79975b {
+  position: relative;
+  display: flex;
+  flex-direction: row;
+  margin: 0;
+  flex: 1;
+}
+.u-input__content__field-wrapper__field.data-v-df79975b {
+  line-height: 26px;
+  text-align: left;
+  color: #303133;
+  height: 24px;
+  font-size: 15px;
+  flex: 1;
+}
+.u-input__content__clear.data-v-df79975b {
+  width: 20px;
+  height: 20px;
+  border-radius: 100px;
+  background-color: #c6c7cb;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  transform: scale(0.82);
+  margin-left: 4px;
+}
+.u-input__content__subfix-icon.data-v-df79975b {
+  margin-left: 4px;
+}
+.u-input__content__prefix-icon.data-v-df79975b {
+  margin-right: 4px;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-page/props.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-page/props.js
new file mode 100644
index 0000000..f799943
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-page/props.js
@@ -0,0 +1,52 @@
+"use strict";
+const uni_modules_uviewPlus_libs_config_props = require("../../libs/config/props.js");
+const props = {
+  props: {
+    // 提示内容
+    loadingText: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadingPage.loadingText
+    },
+    // 文字上方用于替换loading动画的图片
+    image: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadingPage.image
+    },
+    // 加载动画的模式，circle-圆形，spinner-花朵形，semicircle-半圆形
+    loadingMode: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadingPage.loadingMode
+    },
+    // 是否加载中
+    loading: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadingPage.loading
+    },
+    // 背景色
+    bgColor: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadingPage.bgColor
+    },
+    // 文字颜色
+    color: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadingPage.color
+    },
+    // 文字大小
+    fontSize: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadingPage.fontSize
+    },
+    // 图标大小
+    iconSize: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadingPage.fontSize
+    },
+    // 加载中图标的颜色，只能rgb或者十六进制颜色值
+    loadingColor: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadingPage.loadingColor
+    }
+  }
+};
+exports.props = props;
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-page/u-loading-page.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-page/u-loading-page.js
new file mode 100644
index 0000000..4929075
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-page/u-loading-page.js
@@ -0,0 +1,153 @@
+"use strict";
+const uni_modules_uviewPlus_components_uLoadingPage_props = require("./props.js");
+const uni_modules_uviewPlus_libs_mixin_mpMixin = require("../../libs/mixin/mpMixin.js");
+const uni_modules_uviewPlus_libs_mixin_mixin = require("../../libs/mixin/mixin.js");
+const uni_modules_uviewPlus_libs_function_index = require("../../libs/function/index.js");
+const common_vendor = require("../../../../common/vendor.js");
+require("../../libs/config/props.js");
+require("../../libs/config/config.js");
+require("../../libs/config/props/actionSheet.js");
+require("../../libs/config/props/album.js");
+require("../../libs/config/props/alert.js");
+require("../../libs/config/props/avatar.js");
+require("../../libs/config/props/avatarGroup.js");
+require("../../libs/config/props/backtop.js");
+require("../../libs/config/props/badge.js");
+require("../../libs/config/props/button.js");
+require("../../libs/config/props/calendar.js");
+require("../../libs/config/props/carKeyboard.js");
+require("../../libs/config/props/cell.js");
+require("../../libs/config/props/cellGroup.js");
+require("../../libs/config/props/checkbox.js");
+require("../../libs/config/props/checkboxGroup.js");
+require("../../libs/config/props/circleProgress.js");
+require("../../libs/config/props/code.js");
+require("../../libs/config/props/codeInput.js");
+require("../../libs/config/props/col.js");
+require("../../libs/config/props/collapse.js");
+require("../../libs/config/props/collapseItem.js");
+require("../../libs/config/props/columnNotice.js");
+require("../../libs/config/props/countDown.js");
+require("../../libs/config/props/countTo.js");
+require("../../libs/config/props/datetimePicker.js");
+require("../../libs/config/props/divider.js");
+require("../../libs/config/props/empty.js");
+require("../../libs/config/props/form.js");
+require("../../libs/config/props/formItem.js");
+require("../../libs/config/props/gap.js");
+require("../../libs/config/props/grid.js");
+require("../../libs/config/props/gridItem.js");
+require("../../libs/config/props/icon.js");
+require("../../libs/config/props/image.js");
+require("../../libs/config/props/indexAnchor.js");
+require("../../libs/config/props/indexList.js");
+require("../../libs/config/props/input.js");
+require("../../libs/config/props/keyboard.js");
+require("../../libs/config/props/line.js");
+require("../../libs/config/props/lineProgress.js");
+require("../../libs/config/props/link.js");
+require("../../libs/config/props/list.js");
+require("../../libs/config/props/listItem.js");
+require("../../libs/config/props/loadingIcon.js");
+require("../../libs/config/props/loadingPage.js");
+require("../../libs/config/props/loadmore.js");
+require("../../libs/config/props/modal.js");
+require("../../libs/config/props/navbar.js");
+require("../../libs/config/color.js");
+require("../../libs/config/props/noNetwork.js");
+require("../../libs/config/props/noticeBar.js");
+require("../../libs/config/props/notify.js");
+require("../../libs/config/props/numberBox.js");
+require("../../libs/config/props/numberKeyboard.js");
+require("../../libs/config/props/overlay.js");
+require("../../libs/config/props/parse.js");
+require("../../libs/config/props/picker.js");
+require("../../libs/config/props/popup.js");
+require("../../libs/config/props/radio.js");
+require("../../libs/config/props/radioGroup.js");
+require("../../libs/config/props/rate.js");
+require("../../libs/config/props/readMore.js");
+require("../../libs/config/props/row.js");
+require("../../libs/config/props/rowNotice.js");
+require("../../libs/config/props/scrollList.js");
+require("../../libs/config/props/search.js");
+require("../../libs/config/props/section.js");
+require("../../libs/config/props/skeleton.js");
+require("../../libs/config/props/slider.js");
+require("../../libs/config/props/statusBar.js");
+require("../../libs/config/props/steps.js");
+require("../../libs/config/props/stepsItem.js");
+require("../../libs/config/props/sticky.js");
+require("../../libs/config/props/subsection.js");
+require("../../libs/config/props/swipeAction.js");
+require("../../libs/config/props/swipeActionItem.js");
+require("../../libs/config/props/swiper.js");
+require("../../libs/config/props/swipterIndicator.js");
+require("../../libs/config/props/switch.js");
+require("../../libs/config/props/tabbar.js");
+require("../../libs/config/props/tabbarItem.js");
+require("../../libs/config/props/tabs.js");
+require("../../libs/config/props/tag.js");
+require("../../libs/config/props/text.js");
+require("../../libs/config/props/textarea.js");
+require("../../libs/config/props/toast.js");
+require("../../libs/config/props/toolbar.js");
+require("../../libs/config/props/tooltip.js");
+require("../../libs/config/props/transition.js");
+require("../../libs/config/props/upload.js");
+require("../../libs/function/test.js");
+require("../../libs/util/route.js");
+require("../../libs/function/digit.js");
+const _sfc_main = {
+  name: "u-loading-page",
+  mixins: [uni_modules_uviewPlus_libs_mixin_mpMixin.mpMixin, uni_modules_uviewPlus_libs_mixin_mixin.mixin, uni_modules_uviewPlus_components_uLoadingPage_props.props],
+  data() {
+    return {};
+  },
+  methods: {
+    addUnit: uni_modules_uviewPlus_libs_function_index.addUnit
+  }
+};
+if (!Array) {
+  const _easycom_u_loading_icon2 = common_vendor.resolveComponent("u-loading-icon");
+  const _easycom_u_transition2 = common_vendor.resolveComponent("u-transition");
+  (_easycom_u_loading_icon2 + _easycom_u_transition2)();
+}
+const _easycom_u_loading_icon = () => "../u-loading-icon/u-loading-icon.js";
+const _easycom_u_transition = () => "../u-transition/u-transition.js";
+if (!Math) {
+  (_easycom_u_loading_icon + _easycom_u_transition)();
+}
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return common_vendor.e({
+    a: _ctx.image
+  }, _ctx.image ? {
+    b: _ctx.image,
+    c: $options.addUnit(_ctx.iconSize),
+    d: $options.addUnit(_ctx.iconSize)
+  } : {
+    e: common_vendor.p({
+      mode: _ctx.loadingMode,
+      size: $options.addUnit(_ctx.iconSize),
+      color: _ctx.loadingColor
+    })
+  }, {
+    f: common_vendor.t(_ctx.loadingText),
+    g: $options.addUnit(_ctx.fontSize),
+    h: _ctx.color,
+    i: common_vendor.p({
+      show: _ctx.loading,
+      ["custom-style"]: {
+        position: "fixed",
+        top: 0,
+        left: 0,
+        right: 0,
+        bottom: 0,
+        backgroundColor: _ctx.bgColor,
+        display: "flex"
+      }
+    })
+  });
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-9c9e88a3"], ["__file", "D:/里海数字乡村/purchase-let/uni_modules/uview-plus/components/u-loading-page/u-loading-page.vue"]]);
+wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-page/u-loading-page.json b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-page/u-loading-page.json
new file mode 100644
index 0000000..f64c021
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-page/u-loading-page.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "u-loading-icon": "../u-loading-icon/u-loading-icon",
+    "u-transition": "../u-transition/u-transition"
+  }
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-page/u-loading-page.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-page/u-loading-page.wxml
new file mode 100644
index 0000000..0ae6b31
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-page/u-loading-page.wxml
@@ -0,0 +1 @@
+<u-transition wx:if="{{i}}" class="data-v-9c9e88a3" u-s="{{['d']}}" u-i="9c9e88a3-0" bind:__l="__l" u-p="{{i}}"><view class="u-loading-page data-v-9c9e88a3"><view class="u-loading-page__warpper data-v-9c9e88a3"><view class="u-loading-page__warpper__loading-icon data-v-9c9e88a3"><image wx:if="{{a}}" src="{{b}}" class="u-loading-page__warpper__loading-icon__img data-v-9c9e88a3" mode="widthFit" style="{{'width:' + c + ';' + ('height:' + d)}}"></image><u-loading-icon wx:else class="data-v-9c9e88a3" u-i="9c9e88a3-1,9c9e88a3-0" bind:__l="__l" u-p="{{e||''}}"></u-loading-icon></view><block wx:if="{{$slots.d}}"><slot></slot></block><block wx:else><text class="u-loading-page__warpper__text data-v-9c9e88a3" style="{{'font-size:' + g + ';' + ('color:' + h)}}">{{f}}</text></block></view></view></u-transition>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-page/u-loading-page.wxss b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-page/u-loading-page.wxss
new file mode 100644
index 0000000..eec1192
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-page/u-loading-page.wxss
@@ -0,0 +1,68 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.u-empty.data-v-9c9e88a3,
+.u-empty__wrap.data-v-9c9e88a3,
+.u-tabs.data-v-9c9e88a3,
+.u-tabs__wrapper.data-v-9c9e88a3,
+.u-tabs__wrapper__scroll-view-wrapper.data-v-9c9e88a3,
+.u-tabs__wrapper__scroll-view.data-v-9c9e88a3,
+.u-tabs__wrapper__nav.data-v-9c9e88a3,
+.u-tabs__wrapper__nav__line.data-v-9c9e88a3 {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-loading-page.data-v-9c9e88a3 {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  align-items: center;
+  justify-content: center;
+}
+.u-loading-page__warpper.data-v-9c9e88a3 {
+  margin-top: -150px;
+  justify-content: center;
+  align-items: center;
+  color: #c8c8c8;
+  font-size: 19px;
+  display: flex;
+  flex-direction: column;
+}
+.u-loading-page__warpper__loading-icon.data-v-9c9e88a3 {
+  margin-bottom: 10px;
+}
+.u-loading-page__warpper__loading-icon__img.data-v-9c9e88a3 {
+  width: 40px;
+  height: 40px;
+}
+.u-loading-page__warpper__text.data-v-9c9e88a3 {
+  font-size: 19px;
+  color: #c8c8c8;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-switch/props.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-switch/props.js
new file mode 100644
index 0000000..2c8193f
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-switch/props.js
@@ -0,0 +1,57 @@
+"use strict";
+const uni_modules_uviewPlus_libs_config_props = require("../../libs/config/props.js");
+const props = {
+  props: {
+    // 是否为加载中状态
+    loading: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.switch.loading
+    },
+    // 是否为禁用装填
+    disabled: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.switch.disabled
+    },
+    // 开关尺寸，单位px
+    size: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.switch.size
+    },
+    // 打开时的背景颜色
+    activeColor: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.switch.activeColor
+    },
+    // 关闭时的背景颜色
+    inactiveColor: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.switch.inactiveColor
+    },
+    // 通过v-model双向绑定的值
+    modelValue: {
+      type: [Boolean, String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.switch.value
+    },
+    // switch打开时的值
+    activeValue: {
+      type: [String, Number, Boolean],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.switch.activeValue
+    },
+    // switch关闭时的值
+    inactiveValue: {
+      type: [String, Number, Boolean],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.switch.inactiveValue
+    },
+    // 是否开启异步变更，开启后需要手动控制输入值
+    asyncChange: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.switch.asyncChange
+    },
+    // 圆点与外边框的距离
+    space: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.switch.space
+    }
+  }
+};
+exports.props = props;
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-switch/u-switch.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-switch/u-switch.js
new file mode 100644
index 0000000..f363095
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-switch/u-switch.js
@@ -0,0 +1,196 @@
+"use strict";
+const uni_modules_uviewPlus_components_uSwitch_props = require("./props.js");
+const uni_modules_uviewPlus_libs_mixin_mpMixin = require("../../libs/mixin/mpMixin.js");
+const uni_modules_uviewPlus_libs_mixin_mixin = require("../../libs/mixin/mixin.js");
+const uni_modules_uviewPlus_libs_function_index = require("../../libs/function/index.js");
+const common_vendor = require("../../../../common/vendor.js");
+require("../../libs/config/props.js");
+require("../../libs/config/config.js");
+require("../../libs/config/props/actionSheet.js");
+require("../../libs/config/props/album.js");
+require("../../libs/config/props/alert.js");
+require("../../libs/config/props/avatar.js");
+require("../../libs/config/props/avatarGroup.js");
+require("../../libs/config/props/backtop.js");
+require("../../libs/config/props/badge.js");
+require("../../libs/config/props/button.js");
+require("../../libs/config/props/calendar.js");
+require("../../libs/config/props/carKeyboard.js");
+require("../../libs/config/props/cell.js");
+require("../../libs/config/props/cellGroup.js");
+require("../../libs/config/props/checkbox.js");
+require("../../libs/config/props/checkboxGroup.js");
+require("../../libs/config/props/circleProgress.js");
+require("../../libs/config/props/code.js");
+require("../../libs/config/props/codeInput.js");
+require("../../libs/config/props/col.js");
+require("../../libs/config/props/collapse.js");
+require("../../libs/config/props/collapseItem.js");
+require("../../libs/config/props/columnNotice.js");
+require("../../libs/config/props/countDown.js");
+require("../../libs/config/props/countTo.js");
+require("../../libs/config/props/datetimePicker.js");
+require("../../libs/config/props/divider.js");
+require("../../libs/config/props/empty.js");
+require("../../libs/config/props/form.js");
+require("../../libs/config/props/formItem.js");
+require("../../libs/config/props/gap.js");
+require("../../libs/config/props/grid.js");
+require("../../libs/config/props/gridItem.js");
+require("../../libs/config/props/icon.js");
+require("../../libs/config/props/image.js");
+require("../../libs/config/props/indexAnchor.js");
+require("../../libs/config/props/indexList.js");
+require("../../libs/config/props/input.js");
+require("../../libs/config/props/keyboard.js");
+require("../../libs/config/props/line.js");
+require("../../libs/config/props/lineProgress.js");
+require("../../libs/config/props/link.js");
+require("../../libs/config/props/list.js");
+require("../../libs/config/props/listItem.js");
+require("../../libs/config/props/loadingIcon.js");
+require("../../libs/config/props/loadingPage.js");
+require("../../libs/config/props/loadmore.js");
+require("../../libs/config/props/modal.js");
+require("../../libs/config/props/navbar.js");
+require("../../libs/config/color.js");
+require("../../libs/config/props/noNetwork.js");
+require("../../libs/config/props/noticeBar.js");
+require("../../libs/config/props/notify.js");
+require("../../libs/config/props/numberBox.js");
+require("../../libs/config/props/numberKeyboard.js");
+require("../../libs/config/props/overlay.js");
+require("../../libs/config/props/parse.js");
+require("../../libs/config/props/picker.js");
+require("../../libs/config/props/popup.js");
+require("../../libs/config/props/radio.js");
+require("../../libs/config/props/radioGroup.js");
+require("../../libs/config/props/rate.js");
+require("../../libs/config/props/readMore.js");
+require("../../libs/config/props/row.js");
+require("../../libs/config/props/rowNotice.js");
+require("../../libs/config/props/scrollList.js");
+require("../../libs/config/props/search.js");
+require("../../libs/config/props/section.js");
+require("../../libs/config/props/skeleton.js");
+require("../../libs/config/props/slider.js");
+require("../../libs/config/props/statusBar.js");
+require("../../libs/config/props/steps.js");
+require("../../libs/config/props/stepsItem.js");
+require("../../libs/config/props/sticky.js");
+require("../../libs/config/props/subsection.js");
+require("../../libs/config/props/swipeAction.js");
+require("../../libs/config/props/swipeActionItem.js");
+require("../../libs/config/props/swiper.js");
+require("../../libs/config/props/swipterIndicator.js");
+require("../../libs/config/props/switch.js");
+require("../../libs/config/props/tabbar.js");
+require("../../libs/config/props/tabbarItem.js");
+require("../../libs/config/props/tabs.js");
+require("../../libs/config/props/tag.js");
+require("../../libs/config/props/text.js");
+require("../../libs/config/props/textarea.js");
+require("../../libs/config/props/toast.js");
+require("../../libs/config/props/toolbar.js");
+require("../../libs/config/props/tooltip.js");
+require("../../libs/config/props/transition.js");
+require("../../libs/config/props/upload.js");
+require("../../libs/function/test.js");
+require("../../libs/util/route.js");
+require("../../libs/function/digit.js");
+const _sfc_main = {
+  name: "u-switch",
+  mixins: [uni_modules_uviewPlus_libs_mixin_mpMixin.mpMixin, uni_modules_uviewPlus_libs_mixin_mixin.mixin, uni_modules_uviewPlus_components_uSwitch_props.props],
+  watch: {
+    modelValue: {
+      immediate: true,
+      handler(n) {
+        if (n !== this.inactiveValue && n !== this.activeValue) {
+          uni_modules_uviewPlus_libs_function_index.error("v-model绑定的值必须为inactiveValue、activeValue二者之一");
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      bgColor: "#ffffff"
+    };
+  },
+  computed: {
+    isActive() {
+      return this.modelValue === this.activeValue;
+    },
+    switchStyle() {
+      let style = {};
+      style.width = uni_modules_uviewPlus_libs_function_index.addUnit(this.size * 2 + 2);
+      style.height = uni_modules_uviewPlus_libs_function_index.addUnit(Number(this.size) + 2);
+      if (this.customInactiveColor) {
+        style.borderColor = "rgba(0, 0, 0, 0)";
+      }
+      style.backgroundColor = this.isActive ? this.activeColor : this.inactiveColor;
+      return style;
+    },
+    nodeStyle() {
+      let style = {};
+      style.width = uni_modules_uviewPlus_libs_function_index.addUnit(this.size - this.space);
+      style.height = uni_modules_uviewPlus_libs_function_index.addUnit(this.size - this.space);
+      const translateX = this.isActive ? uni_modules_uviewPlus_libs_function_index.addUnit(this.space) : uni_modules_uviewPlus_libs_function_index.addUnit(this.size);
+      style.transform = `translateX(-${translateX})`;
+      return style;
+    },
+    bgStyle() {
+      let style = {};
+      style.width = uni_modules_uviewPlus_libs_function_index.addUnit(Number(this.size) * 2 - this.size / 2);
+      style.height = uni_modules_uviewPlus_libs_function_index.addUnit(this.size);
+      style.backgroundColor = this.inactiveColor;
+      style.transform = `scale(${this.isActive ? 0 : 1})`;
+      return style;
+    },
+    customInactiveColor() {
+      return this.inactiveColor !== "#fff" && this.inactiveColor !== "#ffffff";
+    }
+  },
+  emits: ["update:modelValue", "change"],
+  methods: {
+    addStyle: uni_modules_uviewPlus_libs_function_index.addStyle,
+    clickHandler() {
+      if (!this.disabled && !this.loading) {
+        const oldValue = this.isActive ? this.inactiveValue : this.activeValue;
+        if (!this.asyncChange) {
+          this.$emit("update:modelValue", oldValue);
+        }
+        this.$nextTick(() => {
+          this.$emit("change", oldValue);
+        });
+      }
+    }
+  }
+};
+if (!Array) {
+  const _easycom_u_loading_icon2 = common_vendor.resolveComponent("u-loading-icon");
+  _easycom_u_loading_icon2();
+}
+const _easycom_u_loading_icon = () => "../u-loading-icon/u-loading-icon.js";
+if (!Math) {
+  _easycom_u_loading_icon();
+}
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return {
+    a: common_vendor.s($options.bgStyle),
+    b: common_vendor.p({
+      show: _ctx.loading,
+      mode: "circle",
+      timingFunction: "linear",
+      color: _ctx.modelValue ? _ctx.activeColor : "#AAABAD",
+      size: _ctx.size * 0.6
+    }),
+    c: common_vendor.n(_ctx.modelValue && "u-switch__node--on"),
+    d: common_vendor.s($options.nodeStyle),
+    e: common_vendor.n(_ctx.disabled && "u-switch--disabled"),
+    f: common_vendor.s($options.switchStyle),
+    g: common_vendor.s($options.addStyle(_ctx.customStyle)),
+    h: common_vendor.o((...args) => $options.clickHandler && $options.clickHandler(...args))
+  };
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-6ab257b3"], ["__file", "D:/里海数字乡村/purchase-let/uni_modules/uview-plus/components/u-switch/u-switch.vue"]]);
+wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-switch/u-switch.json b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-switch/u-switch.json
new file mode 100644
index 0000000..82a4c4f
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-switch/u-switch.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "u-loading-icon": "../u-loading-icon/u-loading-icon"
+  }
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-switch/u-switch.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-switch/u-switch.wxml
new file mode 100644
index 0000000..216b4b3
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-switch/u-switch.wxml
@@ -0,0 +1 @@
+<view class="{{['u-switch', 'cursor-pointer', 'data-v-6ab257b3', e]}}" style="{{f + ';' + g}}" bindtap="{{h}}"><view class="u-switch__bg data-v-6ab257b3" style="{{a}}"></view><view class="{{['u-switch__node', 'data-v-6ab257b3', c]}}" style="{{d}}" ref="u-switch__node"><u-loading-icon wx:if="{{b}}" class="data-v-6ab257b3" u-i="6ab257b3-0" bind:__l="__l" u-p="{{b}}"/></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-switch/u-switch.wxss b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-switch/u-switch.wxss
new file mode 100644
index 0000000..cf425b0
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-switch/u-switch.wxss
@@ -0,0 +1,82 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.u-empty.data-v-6ab257b3,
+.u-empty__wrap.data-v-6ab257b3,
+.u-tabs.data-v-6ab257b3,
+.u-tabs__wrapper.data-v-6ab257b3,
+.u-tabs__wrapper__scroll-view-wrapper.data-v-6ab257b3,
+.u-tabs__wrapper__scroll-view.data-v-6ab257b3,
+.u-tabs__wrapper__nav.data-v-6ab257b3,
+.u-tabs__wrapper__nav__line.data-v-6ab257b3 {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-switch.data-v-6ab257b3 {
+  display: flex;
+  flex-direction: row;
+  box-sizing: border-box;
+  position: relative;
+  background-color: #fff;
+  border-width: 1px;
+  border-radius: 100px;
+  transition: background-color 0.4s;
+  border-color: rgba(0, 0, 0, 0.12);
+  border-style: solid;
+  justify-content: flex-end;
+  align-items: center;
+  overflow: hidden;
+}
+.u-switch__node.data-v-6ab257b3 {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  border-radius: 100px;
+  background-color: #fff;
+  border-radius: 100px;
+  box-shadow: 1px 1px 1px 0 rgba(0, 0, 0, 0.25);
+  transition-property: transform;
+  transition-duration: 0.4s;
+  transition-timing-function: cubic-bezier(0.3, 1.05, 0.4, 1.05);
+}
+.u-switch__bg.data-v-6ab257b3 {
+  position: absolute;
+  border-radius: 100px;
+  background-color: #FFFFFF;
+  transition-property: transform;
+  transition-duration: 0.4s;
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  transition-timing-function: ease;
+}
+.u-switch--disabled.data-v-6ab257b3 {
+  opacity: 0.6;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tag/props.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tag/props.js
new file mode 100644
index 0000000..75b7b51
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tag/props.js
@@ -0,0 +1,91 @@
+"use strict";
+const uni_modules_uviewPlus_libs_config_props = require("../../libs/config/props.js");
+const props = {
+  props: {
+    // 标签类型info、primary、success、warning、error
+    type: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tag.type
+    },
+    // 不可用
+    disabled: {
+      type: [Boolean, String],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tag.disabled
+    },
+    // 标签的大小，large，medium，mini
+    size: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tag.size
+    },
+    // tag的形状，circle（两边半圆形）, square（方形，带圆角）
+    shape: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tag.shape
+    },
+    // 标签文字
+    text: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tag.text
+    },
+    // 背景颜色，默认为空字符串，即不处理
+    bgColor: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tag.bgColor
+    },
+    // 标签字体颜色，默认为空字符串，即不处理
+    color: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tag.color
+    },
+    // 标签的边框颜色
+    borderColor: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tag.borderColor
+    },
+    // 关闭按钮图标的颜色
+    closeColor: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tag.closeColor
+    },
+    // 点击时返回的索引值，用于区分例遍的数组哪个元素被点击了
+    name: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tag.name
+    },
+    // // 模式选择，dark|light|plain
+    // mode: {
+    // 	type: String,
+    // 	default: 'light'
+    // },
+    // 镂空时是否填充背景色
+    plainFill: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tag.plainFill
+    },
+    // 是否镂空
+    plain: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tag.plain
+    },
+    // 是否可关闭
+    closable: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tag.closable
+    },
+    // 是否显示
+    show: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tag.show
+    },
+    // 内置图标，或绝对路径的图片
+    icon: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tag.icon
+    },
+    iconColor: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tag.iconColor
+    }
+  }
+};
+exports.props = props;
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tag/u-tag.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tag/u-tag.js
new file mode 100644
index 0000000..8fbf469
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tag/u-tag.js
@@ -0,0 +1,223 @@
+"use strict";
+const uni_modules_uviewPlus_components_uTag_props = require("./props.js");
+const uni_modules_uviewPlus_libs_mixin_mpMixin = require("../../libs/mixin/mpMixin.js");
+const uni_modules_uviewPlus_libs_mixin_mixin = require("../../libs/mixin/mixin.js");
+const uni_modules_uviewPlus_libs_function_test = require("../../libs/function/test.js");
+const common_vendor = require("../../../../common/vendor.js");
+require("../../libs/config/props.js");
+require("../../libs/config/config.js");
+require("../../libs/config/props/actionSheet.js");
+require("../../libs/config/props/album.js");
+require("../../libs/config/props/alert.js");
+require("../../libs/config/props/avatar.js");
+require("../../libs/config/props/avatarGroup.js");
+require("../../libs/config/props/backtop.js");
+require("../../libs/config/props/badge.js");
+require("../../libs/config/props/button.js");
+require("../../libs/config/props/calendar.js");
+require("../../libs/config/props/carKeyboard.js");
+require("../../libs/config/props/cell.js");
+require("../../libs/config/props/cellGroup.js");
+require("../../libs/config/props/checkbox.js");
+require("../../libs/config/props/checkboxGroup.js");
+require("../../libs/config/props/circleProgress.js");
+require("../../libs/config/props/code.js");
+require("../../libs/config/props/codeInput.js");
+require("../../libs/config/props/col.js");
+require("../../libs/config/props/collapse.js");
+require("../../libs/config/props/collapseItem.js");
+require("../../libs/config/props/columnNotice.js");
+require("../../libs/config/props/countDown.js");
+require("../../libs/config/props/countTo.js");
+require("../../libs/config/props/datetimePicker.js");
+require("../../libs/config/props/divider.js");
+require("../../libs/config/props/empty.js");
+require("../../libs/config/props/form.js");
+require("../../libs/config/props/formItem.js");
+require("../../libs/config/props/gap.js");
+require("../../libs/config/props/grid.js");
+require("../../libs/config/props/gridItem.js");
+require("../../libs/config/props/icon.js");
+require("../../libs/config/props/image.js");
+require("../../libs/config/props/indexAnchor.js");
+require("../../libs/config/props/indexList.js");
+require("../../libs/config/props/input.js");
+require("../../libs/config/props/keyboard.js");
+require("../../libs/config/props/line.js");
+require("../../libs/config/props/lineProgress.js");
+require("../../libs/config/props/link.js");
+require("../../libs/config/props/list.js");
+require("../../libs/config/props/listItem.js");
+require("../../libs/config/props/loadingIcon.js");
+require("../../libs/config/props/loadingPage.js");
+require("../../libs/config/props/loadmore.js");
+require("../../libs/config/props/modal.js");
+require("../../libs/config/props/navbar.js");
+require("../../libs/config/color.js");
+require("../../libs/config/props/noNetwork.js");
+require("../../libs/config/props/noticeBar.js");
+require("../../libs/config/props/notify.js");
+require("../../libs/config/props/numberBox.js");
+require("../../libs/config/props/numberKeyboard.js");
+require("../../libs/config/props/overlay.js");
+require("../../libs/config/props/parse.js");
+require("../../libs/config/props/picker.js");
+require("../../libs/config/props/popup.js");
+require("../../libs/config/props/radio.js");
+require("../../libs/config/props/radioGroup.js");
+require("../../libs/config/props/rate.js");
+require("../../libs/config/props/readMore.js");
+require("../../libs/config/props/row.js");
+require("../../libs/config/props/rowNotice.js");
+require("../../libs/config/props/scrollList.js");
+require("../../libs/config/props/search.js");
+require("../../libs/config/props/section.js");
+require("../../libs/config/props/skeleton.js");
+require("../../libs/config/props/slider.js");
+require("../../libs/config/props/statusBar.js");
+require("../../libs/config/props/steps.js");
+require("../../libs/config/props/stepsItem.js");
+require("../../libs/config/props/sticky.js");
+require("../../libs/config/props/subsection.js");
+require("../../libs/config/props/swipeAction.js");
+require("../../libs/config/props/swipeActionItem.js");
+require("../../libs/config/props/swiper.js");
+require("../../libs/config/props/swipterIndicator.js");
+require("../../libs/config/props/switch.js");
+require("../../libs/config/props/tabbar.js");
+require("../../libs/config/props/tabbarItem.js");
+require("../../libs/config/props/tabs.js");
+require("../../libs/config/props/tag.js");
+require("../../libs/config/props/text.js");
+require("../../libs/config/props/textarea.js");
+require("../../libs/config/props/toast.js");
+require("../../libs/config/props/toolbar.js");
+require("../../libs/config/props/tooltip.js");
+require("../../libs/config/props/transition.js");
+require("../../libs/config/props/upload.js");
+require("../../libs/function/index.js");
+require("../../libs/function/digit.js");
+require("../../libs/util/route.js");
+const _sfc_main = {
+  name: "u-tag",
+  mixins: [uni_modules_uviewPlus_libs_mixin_mpMixin.mpMixin, uni_modules_uviewPlus_libs_mixin_mixin.mixin, uni_modules_uviewPlus_components_uTag_props.props],
+  data() {
+    return {};
+  },
+  computed: {
+    style() {
+      const style = {};
+      if (this.bgColor) {
+        style.backgroundColor = this.bgColor;
+      }
+      if (this.color) {
+        style.color = this.color;
+      }
+      if (this.borderColor) {
+        style.borderColor = this.borderColor;
+      }
+      return style;
+    },
+    // nvue下，文本颜色无法继承父元素
+    textColor() {
+      const style = {};
+      if (this.color) {
+        style.color = this.color;
+      }
+      return style;
+    },
+    imgStyle() {
+      const width = this.size === "large" ? "17px" : this.size === "medium" ? "15px" : "13px";
+      return {
+        width,
+        height: width
+      };
+    },
+    // 文本的样式
+    closeSize() {
+      const size = this.size === "large" ? 15 : this.size === "medium" ? 13 : 12;
+      return size;
+    },
+    // 图标大小
+    iconSize() {
+      const size = this.size === "large" ? 21 : this.size === "medium" ? 19 : 16;
+      return size;
+    },
+    // 图标颜色
+    elIconColor() {
+      return this.iconColor ? this.iconColor : this.plain ? this.type : "#ffffff";
+    }
+  },
+  emits: ["click", "close"],
+  methods: {
+    testImage: uni_modules_uviewPlus_libs_function_test.test.image,
+    // 点击关闭按钮
+    closeHandler() {
+      this.$emit("close", this.name);
+    },
+    // 点击标签
+    clickHandler() {
+      this.$emit("click", this.name);
+    }
+  }
+};
+if (!Array) {
+  const _easycom_u_icon2 = common_vendor.resolveComponent("u-icon");
+  const _easycom_u_transition2 = common_vendor.resolveComponent("u-transition");
+  (_easycom_u_icon2 + _easycom_u_transition2)();
+}
+const _easycom_u_icon = () => "../u-icon/u-icon.js";
+const _easycom_u_transition = () => "../u-transition/u-transition.js";
+if (!Math) {
+  (_easycom_u_icon + _easycom_u_transition)();
+}
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return common_vendor.e({
+    a: _ctx.icon
+  }, _ctx.icon ? common_vendor.e({
+    b: $options.testImage(_ctx.icon)
+  }, $options.testImage(_ctx.icon) ? {
+    c: _ctx.icon,
+    d: common_vendor.s($options.imgStyle)
+  } : {
+    e: common_vendor.p({
+      color: $options.elIconColor,
+      name: _ctx.icon,
+      size: $options.iconSize
+    })
+  }) : {}, {
+    f: common_vendor.t(_ctx.text),
+    g: common_vendor.s($options.textColor),
+    h: common_vendor.n(`u-tag__text--${_ctx.type}`),
+    i: common_vendor.n(_ctx.plain && `u-tag__text--${_ctx.type}--plain`),
+    j: common_vendor.n(`u-tag__text--${_ctx.size}`),
+    k: common_vendor.n(`u-tag--${_ctx.shape}`),
+    l: common_vendor.n(!_ctx.plain && `u-tag--${_ctx.type}`),
+    m: common_vendor.n(_ctx.plain && `u-tag--${_ctx.type}--plain`),
+    n: common_vendor.n(`u-tag--${_ctx.size}`),
+    o: common_vendor.n(_ctx.plain && _ctx.plainFill && `u-tag--${_ctx.type}--plain--fill`),
+    p: common_vendor.o((...args) => $options.clickHandler && $options.clickHandler(...args)),
+    q: common_vendor.s({
+      marginRight: _ctx.closable ? "10px" : 0,
+      marginTop: _ctx.closable ? "10px" : 0
+    }),
+    r: common_vendor.s($options.style),
+    s: _ctx.closable
+  }, _ctx.closable ? {
+    t: common_vendor.p({
+      name: "close",
+      size: $options.closeSize,
+      color: "#ffffff"
+    }),
+    v: common_vendor.n(`u-tag__close--${_ctx.size}`),
+    w: common_vendor.o((...args) => $options.closeHandler && $options.closeHandler(...args)),
+    x: _ctx.closeColor
+  } : {}, {
+    y: common_vendor.p({
+      mode: "fade",
+      show: _ctx.show
+    })
+  });
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-2fd891bb"], ["__file", "D:/里海数字乡村/purchase-let/uni_modules/uview-plus/components/u-tag/u-tag.vue"]]);
+wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tag/u-tag.json b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tag/u-tag.json
new file mode 100644
index 0000000..8a7924b
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tag/u-tag.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "u-icon": "../u-icon/u-icon",
+    "u-transition": "../u-transition/u-transition"
+  }
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tag/u-tag.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tag/u-tag.wxml
new file mode 100644
index 0000000..92aac89
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tag/u-tag.wxml
@@ -0,0 +1 @@
+<u-transition wx:if="{{y}}" class="data-v-2fd891bb" u-s="{{['d']}}" style="display:inline-flex" u-i="2fd891bb-0" bind:__l="__l" u-p="{{y}}"><view class="u-tag-wrapper cursor-pointer data-v-2fd891bb"><view class="{{['u-tag', 'data-v-2fd891bb', k, l, m, n, o]}}" catchtap="{{p}}" style="{{q + ';' + r}}"><block wx:if="{{$slots.icon}}"><slot name="icon"></slot></block><block wx:else><view wx:if="{{a}}" class="u-tag__icon data-v-2fd891bb"><image wx:if="{{b}}" class="data-v-2fd891bb" src="{{c}}" style="{{d}}"></image><u-icon wx:else class="data-v-2fd891bb" u-i="2fd891bb-1,2fd891bb-0" bind:__l="__l" u-p="{{e||''}}"></u-icon></view></block><text style="{{g}}" class="{{['u-tag__text', 'data-v-2fd891bb', h, i, j]}}">{{f}}</text></view><view wx:if="{{s}}" class="{{['u-tag__close', 'data-v-2fd891bb', v]}}" catchtap="{{w}}" style="{{'background-color:' + x}}"><u-icon wx:if="{{t}}" class="data-v-2fd891bb" u-i="2fd891bb-2,2fd891bb-0" bind:__l="__l" u-p="{{t}}"></u-icon></view></view></u-transition>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tag/u-tag.wxss b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tag/u-tag.wxss
new file mode 100644
index 0000000..15e910c
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tag/u-tag.wxss
@@ -0,0 +1,201 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.u-empty.data-v-2fd891bb,
+.u-empty__wrap.data-v-2fd891bb,
+.u-tabs.data-v-2fd891bb,
+.u-tabs__wrapper.data-v-2fd891bb,
+.u-tabs__wrapper__scroll-view-wrapper.data-v-2fd891bb,
+.u-tabs__wrapper__scroll-view.data-v-2fd891bb,
+.u-tabs__wrapper__nav.data-v-2fd891bb,
+.u-tabs__wrapper__nav__line.data-v-2fd891bb {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-tag-wrapper.data-v-2fd891bb {
+  position: relative;
+}
+.u-tag.data-v-2fd891bb {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  border-style: solid;
+}
+.u-tag--circle.data-v-2fd891bb {
+  border-radius: 100px;
+}
+.u-tag--square.data-v-2fd891bb {
+  border-radius: 3px;
+}
+.u-tag__icon.data-v-2fd891bb {
+  margin-right: 4px;
+}
+.u-tag__text--mini.data-v-2fd891bb {
+  font-size: 12px;
+  line-height: 12px;
+}
+.u-tag__text--medium.data-v-2fd891bb {
+  font-size: 13px;
+  line-height: 13px;
+}
+.u-tag__text--large.data-v-2fd891bb {
+  font-size: 15px;
+  line-height: 15px;
+}
+.u-tag--mini.data-v-2fd891bb {
+  height: 22px;
+  line-height: 22px;
+  padding: 0 5px;
+}
+.u-tag--medium.data-v-2fd891bb {
+  height: 26px;
+  line-height: 22px;
+  padding: 0 10px;
+}
+.u-tag--large.data-v-2fd891bb {
+  height: 32px;
+  line-height: 32px;
+  padding: 0 15px;
+}
+.u-tag--primary.data-v-2fd891bb {
+  background-color: #3c9cff;
+  border-width: 1px;
+  border-color: #3c9cff;
+}
+.u-tag--primary--plain.data-v-2fd891bb {
+  border-width: 1px;
+  border-color: #3c9cff;
+}
+.u-tag--primary--plain--fill.data-v-2fd891bb {
+  background-color: #ecf5ff;
+}
+.u-tag__text--primary.data-v-2fd891bb {
+  color: #FFFFFF;
+}
+.u-tag__text--primary--plain.data-v-2fd891bb {
+  color: #3c9cff;
+}
+.u-tag--error.data-v-2fd891bb {
+  background-color: #f56c6c;
+  border-width: 1px;
+  border-color: #f56c6c;
+}
+.u-tag--error--plain.data-v-2fd891bb {
+  border-width: 1px;
+  border-color: #f56c6c;
+}
+.u-tag--error--plain--fill.data-v-2fd891bb {
+  background-color: #fef0f0;
+}
+.u-tag__text--error.data-v-2fd891bb {
+  color: #FFFFFF;
+}
+.u-tag__text--error--plain.data-v-2fd891bb {
+  color: #f56c6c;
+}
+.u-tag--warning.data-v-2fd891bb {
+  background-color: #f9ae3d;
+  border-width: 1px;
+  border-color: #f9ae3d;
+}
+.u-tag--warning--plain.data-v-2fd891bb {
+  border-width: 1px;
+  border-color: #f9ae3d;
+}
+.u-tag--warning--plain--fill.data-v-2fd891bb {
+  background-color: #fdf6ec;
+}
+.u-tag__text--warning.data-v-2fd891bb {
+  color: #FFFFFF;
+}
+.u-tag__text--warning--plain.data-v-2fd891bb {
+  color: #f9ae3d;
+}
+.u-tag--success.data-v-2fd891bb {
+  background-color: #5ac725;
+  border-width: 1px;
+  border-color: #5ac725;
+}
+.u-tag--success--plain.data-v-2fd891bb {
+  border-width: 1px;
+  border-color: #5ac725;
+}
+.u-tag--success--plain--fill.data-v-2fd891bb {
+  background-color: #f5fff0;
+}
+.u-tag__text--success.data-v-2fd891bb {
+  color: #FFFFFF;
+}
+.u-tag__text--success--plain.data-v-2fd891bb {
+  color: #5ac725;
+}
+.u-tag--info.data-v-2fd891bb {
+  background-color: #909399;
+  border-width: 1px;
+  border-color: #909399;
+}
+.u-tag--info--plain.data-v-2fd891bb {
+  border-width: 1px;
+  border-color: #909399;
+}
+.u-tag--info--plain--fill.data-v-2fd891bb {
+  background-color: #f4f4f5;
+}
+.u-tag__text--info.data-v-2fd891bb {
+  color: #FFFFFF;
+}
+.u-tag__text--info--plain.data-v-2fd891bb {
+  color: #909399;
+}
+.u-tag__close.data-v-2fd891bb {
+  position: absolute;
+  z-index: 999;
+  top: 10px;
+  right: 10px;
+  border-radius: 100px;
+  background-color: #C6C7CB;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  transform: scale(0.6) translate(80%, -80%);
+}
+.u-tag__close--mini.data-v-2fd891bb {
+  width: 18px;
+  height: 18px;
+}
+.u-tag__close--medium.data-v-2fd891bb {
+  width: 22px;
+  height: 22px;
+}
+.u-tag__close--large.data-v-2fd891bb {
+  width: 25px;
+  height: 25px;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/libs/function/index.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/libs/function/index.js
index 35e85cb..c709892 100644
--- a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/libs/function/index.js
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/libs/function/index.js
@@ -492,8 +492,11 @@ const index = {
 exports.$parent = $parent;
 exports.addStyle = addStyle;
 exports.addUnit = addUnit;
+exports.deepClone = deepClone;
 exports.deepMerge = deepMerge;
 exports.error = error;
+exports.formValidate = formValidate;
+exports.getProperty = getProperty;
 exports.getPx = getPx;
 exports.guid = guid;
 exports.index = index;
@@ -502,6 +505,7 @@ exports.page = page;
 exports.priceFormat = priceFormat;
 exports.queryParams = queryParams;
 exports.random = random;
+exports.setProperty = setProperty;
 exports.sleep = sleep;
 exports.sys = sys;
 exports.timeFormat = timeFormat;
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/libs/util/async-validator.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/libs/util/async-validator.js
new file mode 100644
index 0000000..350a6fa
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/libs/util/async-validator.js
@@ -0,0 +1,893 @@
+"use strict";
+const formatRegExp = /%[sdj%]/g;
+let warning = function warning2() {
+};
+if (typeof process !== "undefined" && process.env && true && typeof window !== "undefined" && typeof document !== "undefined") {
+  warning = function warning3(type2, errors) {
+    if (typeof console !== "undefined" && console.warn) {
+      if (errors.every((e) => typeof e === "string")) {
+        console.warn(type2, errors);
+      }
+    }
+  };
+}
+function convertFieldsError(errors) {
+  if (!errors || !errors.length)
+    return null;
+  const fields = {};
+  errors.forEach((error) => {
+    const { field } = error;
+    fields[field] = fields[field] || [];
+    fields[field].push(error);
+  });
+  return fields;
+}
+function format() {
+  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+    args[_key] = arguments[_key];
+  }
+  let i = 1;
+  const f = args[0];
+  const len = args.length;
+  if (typeof f === "function") {
+    return f.apply(null, args.slice(1));
+  }
+  if (typeof f === "string") {
+    let str = String(f).replace(formatRegExp, (x) => {
+      if (x === "%%") {
+        return "%";
+      }
+      if (i >= len) {
+        return x;
+      }
+      switch (x) {
+        case "%s":
+          return String(args[i++]);
+        case "%d":
+          return Number(args[i++]);
+        case "%j":
+          try {
+            return JSON.stringify(args[i++]);
+          } catch (_) {
+            return "[Circular]";
+          }
+          break;
+        default:
+          return x;
+      }
+    });
+    for (let arg = args[i]; i < len; arg = args[++i]) {
+      str += ` ${arg}`;
+    }
+    return str;
+  }
+  return f;
+}
+function isNativeStringType(type2) {
+  return type2 === "string" || type2 === "url" || type2 === "hex" || type2 === "email" || type2 === "pattern";
+}
+function isEmptyValue(value, type2) {
+  if (value === void 0 || value === null) {
+    return true;
+  }
+  if (type2 === "array" && Array.isArray(value) && !value.length) {
+    return true;
+  }
+  if (isNativeStringType(type2) && typeof value === "string" && !value) {
+    return true;
+  }
+  return false;
+}
+function asyncParallelArray(arr, func, callback) {
+  const results = [];
+  let total = 0;
+  const arrLength = arr.length;
+  function count(errors) {
+    results.push.apply(results, errors);
+    total++;
+    if (total === arrLength) {
+      callback(results);
+    }
+  }
+  arr.forEach((a) => {
+    func(a, count);
+  });
+}
+function asyncSerialArray(arr, func, callback) {
+  let index = 0;
+  const arrLength = arr.length;
+  function next(errors) {
+    if (errors && errors.length) {
+      callback(errors);
+      return;
+    }
+    const original = index;
+    index += 1;
+    if (original < arrLength) {
+      func(arr[original], next);
+    } else {
+      callback([]);
+    }
+  }
+  next([]);
+}
+function flattenObjArr(objArr) {
+  const ret = [];
+  Object.keys(objArr).forEach((k) => {
+    ret.push.apply(ret, objArr[k]);
+  });
+  return ret;
+}
+function asyncMap(objArr, option, func, callback) {
+  if (option.first) {
+    const _pending = new Promise((resolve, reject) => {
+      const next = function next2(errors) {
+        callback(errors);
+        return errors.length ? reject({
+          errors,
+          fields: convertFieldsError(errors)
+        }) : resolve();
+      };
+      const flattenArr = flattenObjArr(objArr);
+      asyncSerialArray(flattenArr, func, next);
+    });
+    _pending.catch((e) => e);
+    return _pending;
+  }
+  let firstFields = option.firstFields || [];
+  if (firstFields === true) {
+    firstFields = Object.keys(objArr);
+  }
+  const objArrKeys = Object.keys(objArr);
+  const objArrLength = objArrKeys.length;
+  let total = 0;
+  const results = [];
+  const pending = new Promise((resolve, reject) => {
+    const next = function next2(errors) {
+      results.push.apply(results, errors);
+      total++;
+      if (total === objArrLength) {
+        callback(results);
+        return results.length ? reject({
+          errors: results,
+          fields: convertFieldsError(results)
+        }) : resolve();
+      }
+    };
+    if (!objArrKeys.length) {
+      callback(results);
+      resolve();
+    }
+    objArrKeys.forEach((key) => {
+      const arr = objArr[key];
+      if (firstFields.indexOf(key) !== -1) {
+        asyncSerialArray(arr, func, next);
+      } else {
+        asyncParallelArray(arr, func, next);
+      }
+    });
+  });
+  pending.catch((e) => e);
+  return pending;
+}
+function complementError(rule) {
+  return function(oe) {
+    if (oe && oe.message) {
+      oe.field = oe.field || rule.fullField;
+      return oe;
+    }
+    return {
+      message: typeof oe === "function" ? oe() : oe,
+      field: oe.field || rule.fullField
+    };
+  };
+}
+function deepMerge(target, source) {
+  if (source) {
+    for (const s in source) {
+      if (source.hasOwnProperty(s)) {
+        const value = source[s];
+        if (typeof value === "object" && typeof target[s] === "object") {
+          target[s] = { ...target[s], ...value };
+        } else {
+          target[s] = value;
+        }
+      }
+    }
+  }
+  return target;
+}
+function required(rule, value, source, errors, options, type2) {
+  if (rule.required && (!source.hasOwnProperty(rule.field) || isEmptyValue(value, type2 || rule.type))) {
+    errors.push(format(options.messages.required, rule.fullField));
+  }
+}
+function whitespace(rule, value, source, errors, options) {
+  if (/^\s+$/.test(value) || value === "") {
+    errors.push(format(options.messages.whitespace, rule.fullField));
+  }
+}
+const pattern = {
+  // http://emailregex.com/
+  email: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
+  url: new RegExp(
+    "^(?!mailto:)(?:(?:http|https|ftp)://|//)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$",
+    "i"
+  ),
+  hex: /^#?([a-f0-9]{6}|[a-f0-9]{3})$/i
+};
+var types = {
+  integer: function integer(value) {
+    return /^(-)?\d+$/.test(value);
+  },
+  float: function float(value) {
+    return /^(-)?\d+(\.\d+)?$/.test(value);
+  },
+  array: function array(value) {
+    return Array.isArray(value);
+  },
+  regexp: function regexp(value) {
+    if (value instanceof RegExp) {
+      return true;
+    }
+    try {
+      return !!new RegExp(value);
+    } catch (e) {
+      return false;
+    }
+  },
+  date: function date(value) {
+    return typeof value.getTime === "function" && typeof value.getMonth === "function" && typeof value.getYear === "function";
+  },
+  number: function number(value) {
+    if (isNaN(value)) {
+      return false;
+    }
+    return typeof +value === "number";
+  },
+  object: function object(value) {
+    return typeof value === "object" && !types.array(value);
+  },
+  method: function method(value) {
+    return typeof value === "function";
+  },
+  email: function email(value) {
+    return typeof value === "string" && !!value.match(pattern.email) && value.length < 255;
+  },
+  url: function url(value) {
+    return typeof value === "string" && !!value.match(pattern.url);
+  },
+  hex: function hex(value) {
+    return typeof value === "string" && !!value.match(pattern.hex);
+  }
+};
+function type(rule, value, source, errors, options) {
+  if (rule.required && value === void 0) {
+    required(rule, value, source, errors, options);
+    return;
+  }
+  const custom = ["integer", "float", "array", "regexp", "object", "method", "email", "number", "date", "url", "hex"];
+  const ruleType = rule.type;
+  if (custom.indexOf(ruleType) > -1) {
+    if (!types[ruleType](value)) {
+      errors.push(format(options.messages.types[ruleType], rule.fullField, rule.type));
+    }
+  } else if (ruleType && typeof value !== rule.type) {
+    errors.push(format(options.messages.types[ruleType], rule.fullField, rule.type));
+  }
+}
+function range(rule, value, source, errors, options) {
+  const len = typeof rule.len === "number";
+  const min = typeof rule.min === "number";
+  const max = typeof rule.max === "number";
+  const spRegexp = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g;
+  let val = value;
+  let key = null;
+  const num = typeof value === "number";
+  const str = typeof value === "string";
+  const arr = Array.isArray(value);
+  if (num) {
+    key = "number";
+  } else if (str) {
+    key = "string";
+  } else if (arr) {
+    key = "array";
+  }
+  if (!key) {
+    return false;
+  }
+  if (arr) {
+    val = value.length;
+  }
+  if (str) {
+    val = value.replace(spRegexp, "_").length;
+  }
+  if (len) {
+    if (val !== rule.len) {
+      errors.push(format(options.messages[key].len, rule.fullField, rule.len));
+    }
+  } else if (min && !max && val < rule.min) {
+    errors.push(format(options.messages[key].min, rule.fullField, rule.min));
+  } else if (max && !min && val > rule.max) {
+    errors.push(format(options.messages[key].max, rule.fullField, rule.max));
+  } else if (min && max && (val < rule.min || val > rule.max)) {
+    errors.push(format(options.messages[key].range, rule.fullField, rule.min, rule.max));
+  }
+}
+const ENUM = "enum";
+function enumerable(rule, value, source, errors, options) {
+  rule[ENUM] = Array.isArray(rule[ENUM]) ? rule[ENUM] : [];
+  if (rule[ENUM].indexOf(value) === -1) {
+    errors.push(format(options.messages[ENUM], rule.fullField, rule[ENUM].join(", ")));
+  }
+}
+function pattern$1(rule, value, source, errors, options) {
+  if (rule.pattern) {
+    if (rule.pattern instanceof RegExp) {
+      rule.pattern.lastIndex = 0;
+      if (!rule.pattern.test(value)) {
+        errors.push(format(options.messages.pattern.mismatch, rule.fullField, value, rule.pattern));
+      }
+    } else if (typeof rule.pattern === "string") {
+      const _pattern = new RegExp(rule.pattern);
+      if (!_pattern.test(value)) {
+        errors.push(format(options.messages.pattern.mismatch, rule.fullField, value, rule.pattern));
+      }
+    }
+  }
+}
+const rules = {
+  required,
+  whitespace,
+  type,
+  range,
+  enum: enumerable,
+  pattern: pattern$1
+};
+function string(rule, value, callback, source, options) {
+  const errors = [];
+  const validate2 = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+  if (validate2) {
+    if (isEmptyValue(value, "string") && !rule.required) {
+      return callback();
+    }
+    rules.required(rule, value, source, errors, options, "string");
+    if (!isEmptyValue(value, "string")) {
+      rules.type(rule, value, source, errors, options);
+      rules.range(rule, value, source, errors, options);
+      rules.pattern(rule, value, source, errors, options);
+      if (rule.whitespace === true) {
+        rules.whitespace(rule, value, source, errors, options);
+      }
+    }
+  }
+  callback(errors);
+}
+function method2(rule, value, callback, source, options) {
+  const errors = [];
+  const validate2 = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+  if (validate2) {
+    if (isEmptyValue(value) && !rule.required) {
+      return callback();
+    }
+    rules.required(rule, value, source, errors, options);
+    if (value !== void 0) {
+      rules.type(rule, value, source, errors, options);
+    }
+  }
+  callback(errors);
+}
+function number2(rule, value, callback, source, options) {
+  const errors = [];
+  const validate2 = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+  if (validate2) {
+    if (value === "") {
+      value = void 0;
+    }
+    if (isEmptyValue(value) && !rule.required) {
+      return callback();
+    }
+    rules.required(rule, value, source, errors, options);
+    if (value !== void 0) {
+      rules.type(rule, value, source, errors, options);
+      rules.range(rule, value, source, errors, options);
+    }
+  }
+  callback(errors);
+}
+function _boolean(rule, value, callback, source, options) {
+  const errors = [];
+  const validate2 = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+  if (validate2) {
+    if (isEmptyValue(value) && !rule.required) {
+      return callback();
+    }
+    rules.required(rule, value, source, errors, options);
+    if (value !== void 0) {
+      rules.type(rule, value, source, errors, options);
+    }
+  }
+  callback(errors);
+}
+function regexp2(rule, value, callback, source, options) {
+  const errors = [];
+  const validate2 = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+  if (validate2) {
+    if (isEmptyValue(value) && !rule.required) {
+      return callback();
+    }
+    rules.required(rule, value, source, errors, options);
+    if (!isEmptyValue(value)) {
+      rules.type(rule, value, source, errors, options);
+    }
+  }
+  callback(errors);
+}
+function integer2(rule, value, callback, source, options) {
+  const errors = [];
+  const validate2 = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+  if (validate2) {
+    if (isEmptyValue(value) && !rule.required) {
+      return callback();
+    }
+    rules.required(rule, value, source, errors, options);
+    if (value !== void 0) {
+      rules.type(rule, value, source, errors, options);
+      rules.range(rule, value, source, errors, options);
+    }
+  }
+  callback(errors);
+}
+function floatFn(rule, value, callback, source, options) {
+  const errors = [];
+  const validate2 = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+  if (validate2) {
+    if (isEmptyValue(value) && !rule.required) {
+      return callback();
+    }
+    rules.required(rule, value, source, errors, options);
+    if (value !== void 0) {
+      rules.type(rule, value, source, errors, options);
+      rules.range(rule, value, source, errors, options);
+    }
+  }
+  callback(errors);
+}
+function array2(rule, value, callback, source, options) {
+  const errors = [];
+  const validate2 = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+  if (validate2) {
+    if (isEmptyValue(value, "array") && !rule.required) {
+      return callback();
+    }
+    rules.required(rule, value, source, errors, options, "array");
+    if (!isEmptyValue(value, "array")) {
+      rules.type(rule, value, source, errors, options);
+      rules.range(rule, value, source, errors, options);
+    }
+  }
+  callback(errors);
+}
+function object2(rule, value, callback, source, options) {
+  const errors = [];
+  const validate2 = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+  if (validate2) {
+    if (isEmptyValue(value) && !rule.required) {
+      return callback();
+    }
+    rules.required(rule, value, source, errors, options);
+    if (value !== void 0) {
+      rules.type(rule, value, source, errors, options);
+    }
+  }
+  callback(errors);
+}
+const ENUM$1 = "enum";
+function enumerable$1(rule, value, callback, source, options) {
+  const errors = [];
+  const validate2 = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+  if (validate2) {
+    if (isEmptyValue(value) && !rule.required) {
+      return callback();
+    }
+    rules.required(rule, value, source, errors, options);
+    if (value !== void 0) {
+      rules[ENUM$1](rule, value, source, errors, options);
+    }
+  }
+  callback(errors);
+}
+function pattern$2(rule, value, callback, source, options) {
+  const errors = [];
+  const validate2 = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+  if (validate2) {
+    if (isEmptyValue(value, "string") && !rule.required) {
+      return callback();
+    }
+    rules.required(rule, value, source, errors, options);
+    if (!isEmptyValue(value, "string")) {
+      rules.pattern(rule, value, source, errors, options);
+    }
+  }
+  callback(errors);
+}
+function date2(rule, value, callback, source, options) {
+  const errors = [];
+  const validate2 = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+  if (validate2) {
+    if (isEmptyValue(value) && !rule.required) {
+      return callback();
+    }
+    rules.required(rule, value, source, errors, options);
+    if (!isEmptyValue(value)) {
+      let dateObject;
+      if (typeof value === "number") {
+        dateObject = new Date(value);
+      } else {
+        dateObject = value;
+      }
+      rules.type(rule, dateObject, source, errors, options);
+      if (dateObject) {
+        rules.range(rule, dateObject.getTime(), source, errors, options);
+      }
+    }
+  }
+  callback(errors);
+}
+function required$1(rule, value, callback, source, options) {
+  const errors = [];
+  const type2 = Array.isArray(value) ? "array" : typeof value;
+  rules.required(rule, value, source, errors, options, type2);
+  callback(errors);
+}
+function type$1(rule, value, callback, source, options) {
+  const ruleType = rule.type;
+  const errors = [];
+  const validate2 = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+  if (validate2) {
+    if (isEmptyValue(value, ruleType) && !rule.required) {
+      return callback();
+    }
+    rules.required(rule, value, source, errors, options, ruleType);
+    if (!isEmptyValue(value, ruleType)) {
+      rules.type(rule, value, source, errors, options);
+    }
+  }
+  callback(errors);
+}
+function any(rule, value, callback, source, options) {
+  const errors = [];
+  const validate2 = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+  if (validate2) {
+    if (isEmptyValue(value) && !rule.required) {
+      return callback();
+    }
+    rules.required(rule, value, source, errors, options);
+  }
+  callback(errors);
+}
+const validators = {
+  string,
+  method: method2,
+  number: number2,
+  boolean: _boolean,
+  regexp: regexp2,
+  integer: integer2,
+  float: floatFn,
+  array: array2,
+  object: object2,
+  enum: enumerable$1,
+  pattern: pattern$2,
+  date: date2,
+  url: type$1,
+  hex: type$1,
+  email: type$1,
+  required: required$1,
+  any
+};
+function newMessages() {
+  return {
+    default: "Validation error on field %s",
+    required: "%s is required",
+    enum: "%s must be one of %s",
+    whitespace: "%s cannot be empty",
+    date: {
+      format: "%s date %s is invalid for format %s",
+      parse: "%s date could not be parsed, %s is invalid ",
+      invalid: "%s date %s is invalid"
+    },
+    types: {
+      string: "%s is not a %s",
+      method: "%s is not a %s (function)",
+      array: "%s is not an %s",
+      object: "%s is not an %s",
+      number: "%s is not a %s",
+      date: "%s is not a %s",
+      boolean: "%s is not a %s",
+      integer: "%s is not an %s",
+      float: "%s is not a %s",
+      regexp: "%s is not a valid %s",
+      email: "%s is not a valid %s",
+      url: "%s is not a valid %s",
+      hex: "%s is not a valid %s"
+    },
+    string: {
+      len: "%s must be exactly %s characters",
+      min: "%s must be at least %s characters",
+      max: "%s cannot be longer than %s characters",
+      range: "%s must be between %s and %s characters"
+    },
+    number: {
+      len: "%s must equal %s",
+      min: "%s cannot be less than %s",
+      max: "%s cannot be greater than %s",
+      range: "%s must be between %s and %s"
+    },
+    array: {
+      len: "%s must be exactly %s in length",
+      min: "%s cannot be less than %s in length",
+      max: "%s cannot be greater than %s in length",
+      range: "%s must be between %s and %s in length"
+    },
+    pattern: {
+      mismatch: "%s value %s does not match pattern %s"
+    },
+    clone: function clone() {
+      const cloned = JSON.parse(JSON.stringify(this));
+      cloned.clone = this.clone;
+      return cloned;
+    }
+  };
+}
+const messages = newMessages();
+function Schema(descriptor) {
+  this.rules = null;
+  this._messages = messages;
+  this.define(descriptor);
+}
+Schema.prototype = {
+  messages: function messages2(_messages) {
+    if (_messages) {
+      this._messages = deepMerge(newMessages(), _messages);
+    }
+    return this._messages;
+  },
+  define: function define(rules2) {
+    if (!rules2) {
+      throw new Error("Cannot configure a schema with no rules");
+    }
+    if (typeof rules2 !== "object" || Array.isArray(rules2)) {
+      throw new Error("Rules must be an object");
+    }
+    this.rules = {};
+    let z;
+    let item;
+    for (z in rules2) {
+      if (rules2.hasOwnProperty(z)) {
+        item = rules2[z];
+        this.rules[z] = Array.isArray(item) ? item : [item];
+      }
+    }
+  },
+  validate: function validate(source_, o, oc) {
+    const _this = this;
+    if (o === void 0) {
+      o = {};
+    }
+    if (oc === void 0) {
+      oc = function oc2() {
+      };
+    }
+    let source = source_;
+    let options = o;
+    let callback = oc;
+    if (typeof options === "function") {
+      callback = options;
+      options = {};
+    }
+    if (!this.rules || Object.keys(this.rules).length === 0) {
+      if (callback) {
+        callback();
+      }
+      return Promise.resolve();
+    }
+    function complete(results) {
+      let i;
+      let errors = [];
+      let fields = {};
+      function add(e) {
+        if (Array.isArray(e)) {
+          let _errors;
+          errors = (_errors = errors).concat.apply(_errors, e);
+        } else {
+          errors.push(e);
+        }
+      }
+      for (i = 0; i < results.length; i++) {
+        add(results[i]);
+      }
+      if (!errors.length) {
+        errors = null;
+        fields = null;
+      } else {
+        fields = convertFieldsError(errors);
+      }
+      callback(errors, fields);
+    }
+    if (options.messages) {
+      let messages$1 = this.messages();
+      if (messages$1 === messages) {
+        messages$1 = newMessages();
+      }
+      deepMerge(messages$1, options.messages);
+      options.messages = messages$1;
+    } else {
+      options.messages = this.messages();
+    }
+    let arr;
+    let value;
+    const series = {};
+    const keys = options.keys || Object.keys(this.rules);
+    keys.forEach((z) => {
+      arr = _this.rules[z];
+      value = source[z];
+      arr.forEach((r) => {
+        let rule = r;
+        if (typeof rule.transform === "function") {
+          if (source === source_) {
+            source = { ...source };
+          }
+          value = source[z] = rule.transform(value);
+        }
+        if (typeof rule === "function") {
+          rule = {
+            validator: rule
+          };
+        } else {
+          rule = { ...rule };
+        }
+        rule.validator = _this.getValidationMethod(rule);
+        rule.field = z;
+        rule.fullField = rule.fullField || z;
+        rule.type = _this.getType(rule);
+        if (!rule.validator) {
+          return;
+        }
+        series[z] = series[z] || [];
+        series[z].push({
+          rule,
+          value,
+          source,
+          field: z
+        });
+      });
+    });
+    const errorFields = {};
+    return asyncMap(series, options, (data, doIt) => {
+      const { rule } = data;
+      let deep = (rule.type === "object" || rule.type === "array") && (typeof rule.fields === "object" || typeof rule.defaultField === "object");
+      deep = deep && (rule.required || !rule.required && data.value);
+      rule.field = data.field;
+      function addFullfield(key, schema) {
+        return { ...schema, fullField: `${rule.fullField}.${key}` };
+      }
+      function cb(e) {
+        if (e === void 0) {
+          e = [];
+        }
+        let errors = e;
+        if (!Array.isArray(errors)) {
+          errors = [errors];
+        }
+        if (!options.suppressWarning && errors.length) {
+          Schema.warning("async-validator:", errors);
+        }
+        if (errors.length && rule.message) {
+          errors = [].concat(rule.message);
+        }
+        errors = errors.map(complementError(rule));
+        if (options.first && errors.length) {
+          errorFields[rule.field] = 1;
+          return doIt(errors);
+        }
+        if (!deep) {
+          doIt(errors);
+        } else {
+          if (rule.required && !data.value) {
+            if (rule.message) {
+              errors = [].concat(rule.message).map(complementError(rule));
+            } else if (options.error) {
+              errors = [options.error(rule, format(options.messages.required, rule.field))];
+            } else {
+              errors = [];
+            }
+            return doIt(errors);
+          }
+          let fieldsSchema = {};
+          if (rule.defaultField) {
+            for (const k in data.value) {
+              if (data.value.hasOwnProperty(k)) {
+                fieldsSchema[k] = rule.defaultField;
+              }
+            }
+          }
+          fieldsSchema = { ...fieldsSchema, ...data.rule.fields };
+          for (const f in fieldsSchema) {
+            if (fieldsSchema.hasOwnProperty(f)) {
+              const fieldSchema = Array.isArray(fieldsSchema[f]) ? fieldsSchema[f] : [fieldsSchema[f]];
+              fieldsSchema[f] = fieldSchema.map(addFullfield.bind(null, f));
+            }
+          }
+          const schema = new Schema(fieldsSchema);
+          schema.messages(options.messages);
+          if (data.rule.options) {
+            data.rule.options.messages = options.messages;
+            data.rule.options.error = options.error;
+          }
+          schema.validate(data.value, data.rule.options || options, (errs) => {
+            const finalErrors = [];
+            if (errors && errors.length) {
+              finalErrors.push.apply(finalErrors, errors);
+            }
+            if (errs && errs.length) {
+              finalErrors.push.apply(finalErrors, errs);
+            }
+            doIt(finalErrors.length ? finalErrors : null);
+          });
+        }
+      }
+      let res;
+      if (rule.asyncValidator) {
+        res = rule.asyncValidator(rule, data.value, cb, data.source, options);
+      } else if (rule.validator) {
+        res = rule.validator(rule, data.value, cb, data.source, options);
+        if (res === true) {
+          cb();
+        } else if (res === false) {
+          cb(rule.message || `${rule.field} fails`);
+        } else if (res instanceof Array) {
+          cb(res);
+        } else if (res instanceof Error) {
+          cb(res.message);
+        }
+      }
+      if (res && res.then) {
+        res.then(() => cb(), (e) => cb(e));
+      }
+    }, (results) => {
+      complete(results);
+    });
+  },
+  getType: function getType(rule) {
+    if (rule.type === void 0 && rule.pattern instanceof RegExp) {
+      rule.type = "pattern";
+    }
+    if (typeof rule.validator !== "function" && rule.type && !validators.hasOwnProperty(rule.type)) {
+      throw new Error(format("Unknown rule type %s", rule.type));
+    }
+    return rule.type || "string";
+  },
+  getValidationMethod: function getValidationMethod(rule) {
+    if (typeof rule.validator === "function") {
+      return rule.validator;
+    }
+    const keys = Object.keys(rule);
+    const messageIndex = keys.indexOf("message");
+    if (messageIndex !== -1) {
+      keys.splice(messageIndex, 1);
+    }
+    if (keys.length === 1 && keys[0] === "required") {
+      return validators.required;
+    }
+    return validators[this.getType(rule)] || false;
+  }
+};
+Schema.register = function register(type2, validator) {
+  if (typeof validator !== "function") {
+    throw new Error("Cannot register a validator by type, validator is not a function");
+  }
+  validators[type2] = validator;
+};
+Schema.warning = warning;
+Schema.messages = messages;
+exports.Schema = Schema;