commit c3c9db315120ab86dd68a1efd3b29df664ad04d0
Author: jackyu66git <jackyu666@icloud.com>
Date:   Mon Mar 23 11:52:05 2026 +0800

    Initial commit

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..dfe0770
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..66f785b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,24 @@
+.DS_Store
+node_modules
+unpackage
+/dist
+
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
new file mode 100644
index 0000000..81f13f4
--- /dev/null
+++ b/.hbuilderx/launch.json
@@ -0,0 +1,16 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
+    ]
+}
diff --git a/App.vue b/App.vue
new file mode 100644
index 0000000..9e4ff62
--- /dev/null
+++ b/App.vue
@@ -0,0 +1,74 @@
+
+ <script>
+ 
+	export default {
+		onLaunch: function() {
+			console.log('App Launch')
+			uni.showShareMenu({
+			      withShareTicket: true, // 设置为 true，表示在分享时返回 shareTicket
+			      menus: ['shareAppMessage', 'shareTimeline'] // 指定要显示的分享菜单项
+			    })
+      // pingfang   pingfang-medium
+			uni.loadFontFace({
+				global:true,
+			  family: 'SourceHanSans',
+			  source: 'url("https://miniapp.yuxingu.com.cn/yxg-mp/SourceHanSansCN-Regular.otf")',
+			  success(res) {
+				  console.log('加载SourceHanSans字体成功')
+				}  
+			})
+
+			uni.loadFontFace({
+				global:true,
+			  family: 'GenYoMinJP',
+			  source: 'url("https://miniapp.yuxingu.com.cn/yxg-mp/GenYoMinJP-Regular-7.ttf")',
+			  success(res) {
+				  console.log('加载GenYoMinJP字体成功')
+				}  
+			})
+
+      uni.loadFontFace({
+        global:true,
+        family: 'SourceHanSansBold',
+        source: 'url("https://miniapp.yuxingu.com.cn/yxg-mp/SourceHanSansCN-Bold.otf")',
+        success(res) {
+          console.log('加载SourceHanSansBold字体成功')
+        }
+      })
+		},
+		onShow: function() {
+			console.log('App Show')
+		},
+		onHide: function() {
+			console.log('App Hide')
+		}
+	}
+</script>
+
+<style>
+	/*每个页面公共css */
+	body{
+		font-family: 'SourceHanSans';
+		box-sizing: border-box;
+	}
+  image {
+    image-rendering: -webkit-optimize-contrast;
+    image-rendering: crisp-edges;
+  }
+	page-common{
+		display: flex;
+		justify-content: center;
+	}
+	all-center{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	
+	::-webkit-scrollbar {
+	  display: none;
+	  width: 0;
+	  height: 0;
+	  color: transparent;
+	}
+</style>
diff --git a/common/css/common_style.scss b/common/css/common_style.scss
new file mode 100644
index 0000000..1f71098
--- /dev/null
+++ b/common/css/common_style.scss
@@ -0,0 +1,9 @@
+
+// @font-face {
+//     font-family: 'pingfang';
+//     src: url('https://rp.cdarvr.com/rpadmin/PINGFANG%20REGULAR.TTF') format('truetype');
+// }
+// @font-face {
+//     font-family: 'pingfang';
+//     src: url('https://rp.cdarvr.com/rpadmin/PINGFANG%20HEAVY.TTF') format('truetype');
+// }
diff --git a/common/sysConsts.js b/common/sysConsts.js
new file mode 100644
index 0000000..8920063
--- /dev/null
+++ b/common/sysConsts.js
@@ -0,0 +1,11 @@
+var sysConsts = {
+	loginPath: `/pages/login/login`,
+	indexPath: `/pages/index/index`,
+	// loginPhonePath: `/pages/login-phone`,
+	// bookDetailPath: `/pages/book/book-detail`,
+	h5LoginUrl:"",
+	baseUrl:"",
+	smsDurtion: 60,
+}
+
+export {sysConsts}
\ No newline at end of file
diff --git a/components/ShareMixin.ts b/components/ShareMixin.ts
new file mode 100644
index 0000000..6685a79
--- /dev/null
+++ b/components/ShareMixin.ts
@@ -0,0 +1,25 @@
+
+export default {
+  data() {
+    return {
+      shareTitle: '我在愈心谷等你哦~',
+      sharePath: '/pages/index/index'
+    };
+  },
+  methods: {
+    onShareAppMessage() {
+      return {
+        title: this.shareTitle,
+        path: this.sharePath,
+		imageUrl: '../static/main/banner.png'
+      };
+    },
+    onShareTimeline() {
+      return {
+        title: '快来体验一下吧~',
+        query: 'id=1',
+		imageUrl: '../static/main/banner.png'
+      };
+    }
+  }
+};
\ No newline at end of file
diff --git a/components/my-nav.vue b/components/my-nav.vue
new file mode 100644
index 0000000..9844852
--- /dev/null
+++ b/components/my-nav.vue
@@ -0,0 +1,162 @@
+<template>
+  <view>
+    <view class="nav-box" :style="{'height':height+'px', 'background': bgColor,
+   'position': flex==true?'fixed':'','width': '100%','z-index':100}">
+<!--    自定义导航栏  -->
+      <view class="status_bar" :style="{'height':statusBarHeight+'px'}">
+<!--   uni-ui这里是状态栏 -->
+      </view>
+<!--      胶囊位置信息   -->
+      <view class="nav-main flex " :class="{'levelcenter':isJcenter}" :style="{height: navBarHeight+'px'}">
+        <view class="nav-main-back" @click="back" v-if="backIcon" style="display: flex;align-items: center;">
+
+          <image v-if="iconChange" class="nav-main-back-img"  mode="heightFix" src="../static/back/back-black.png" />
+		  
+		   <image v-else class="nav-main-back-img"   src="../static/back/n-back-mini.png"/>
+        </view>
+		
+		<view  v-if="isJcenter" style="display: flex; justify-content: center;align-items: center;justify-self: center;align-self: center">		
+		<!-- <image class="nav-main-back-img"  mode="heightFix" src="../static/n-main/yxg-icon.png" /> -->
+		
+        <text class="nav-main-title u-text-center" :style="
+		{'color':titleColor,'fontFamily':'GenYoMinJP','marginLeft':'10rpx'}">
+			{{ title }}
+		</text>
+		</view>
+		<text v-else class="nav-main-title u-text-center" :style="
+		{'color':titleColor}">
+			{{ title }}
+		</text>
+      </view>
+    </view>
+    <view v-if="flex" :style="{'height':height+'px','background-attachment': 'fixed','background':bgColor }">
+    </view>
+  </view>
+
+</template>
+
+<script>
+// import UIcon from "../uview-ui/components/u-icon/u-icon";
+export default {
+  // components: {myNav},
+  props: {
+    bgColor: {type: String, default: "none"},
+	titleColor: {type: String, default: "rgba(97, 77, 73, 1)"},
+    backIcon: {type: Boolean, default: true},
+    backHome: {type: Boolean, default: false},
+    flex: {type: Boolean, default: false},
+    title: {type: String, default: "我的"},
+	delta:{type:Number,default: 1},
+	tabBarPath:{type:String,default: ""},
+	iconChange:{type: Boolean, default: false},
+	isJcenter:{type: Boolean, default: false}
+  },
+  data() {
+    return {
+      //总高度
+      height: 0,
+      //胶囊位置信息
+      menuButtonRect: {},
+      //状态栏的高度
+      statusBarHeight: 0,
+      //导航栏的高度
+      navBarHeight: 0
+    }
+  },
+  created() {
+    // this.height = wx.getStorageSync('navBarHeight')
+    this.getHeight();
+  },
+  methods: {
+    //获取屏幕导航栏高度
+    getHeight() {
+      if (uni.canIUse('getMenuButtonBoundingClientRect')) {
+        let sysInfo = uni.getSystemInfoSync(); //状态栏的高度
+        this.statusBarHeight = sysInfo.statusBarHeight;
+        // 胶囊位置信息
+        let rect = uni.getMenuButtonBoundingClientRect();
+				
+        this.menuButtonRect = JSON.parse(JSON.stringify(rect));
+        // 导航栏高度
+        let navBarHeight = (rect.top - sysInfo.statusBarHeight) * 2 + rect.height;
+        this.navBarHeight = navBarHeight;
+        // 自定义导航栏的高度
+        this.height = sysInfo.statusBarHeight + navBarHeight;
+		
+      } else {
+        uni.showToast({
+          title: '您的微信版本过低，界面可能会显示不正常',
+          icon: 'none',
+          duration: 4000
+        });
+      }
+    },
+    //返回
+    back() {
+      if (this.backHome) {
+        uni.reLaunch({
+          url: '/pages/index/index'
+        })
+        return
+      }
+	  if (this.tabBarPath){
+		  uni.reLaunch({
+		  	url: this.tabBarPath
+		  });
+	  }else{
+		  uni.navigateBack({
+		    delta: this.delta
+		  })
+	  }
+
+    },
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+
+.levelcenter{
+	justify-content: center;
+}
+.status_bar {
+  // height: var(&#45;&#45;status-bar-height);
+  width: 100%;
+  // background:#ff0;
+  
+}
+.flex { display: flex;align-items: center; }
+.nav-main {
+  width: 100%;
+  .nav-main-back {
+    position: absolute;
+    color: #eef5fd;
+    height: 40px;
+    width: 50px;
+  }
+  .nav-main-back-img {
+    margin-left: 40rpx;
+    height: 32rpx;
+	  width: 18rpx;
+  }
+
+  .nav-main-title {
+    color: #eef5fd;
+    font-size: 38rpx;
+    margin: auto;
+    position: relative;
+	letter-spacing: 0rpx;
+	font-weight: 500;
+	font-variation-settings: "opsz" auto;
+  }
+  .u-text-center {
+    text-align: center;
+  }
+  .nav-box{
+    width: 100%;
+    z-index: 999;
+  }
+}
+
+</style>
diff --git a/components/show-pop/show-pop.vue b/components/show-pop/show-pop.vue
new file mode 100644
index 0000000..6dc800b
--- /dev/null
+++ b/components/show-pop/show-pop.vue
@@ -0,0 +1,82 @@
+<template>
+	<view>
+		<uni-popup ref="protocolSlot" type="bottom" :animation="true" :safe-area="false" @maskClick="closePop" >
+			<view style="width: 750rpx;background: #fff;box-sizing: border-box;
+					flex-direction: column;display: flex;align-items: center;border-radius: 32rpx 32rpx 0px 0px;">
+					<!-- padding: 0 40rpx 62rpx 40rpx; -->
+				<image  src="/static/n-zx/show-protocol-top.png" style="width: 750rpx;height: 120rpx;"></image>	
+				<view style="height: 40vh;overflow-y: auto;display: flex;flex-direction: column;padding: 44rpx 40rpx 64rpx  40rpx;">
+					<text style="color: #3D3D3D;font-size: 40rpx;font-weight: bold;line-height: normal;align-self: center;">{{procotol.title}}</text>
+					<rich-text :nodes="procotol.context" style="margin-top: 40rpx;"></rich-text>
+				</view>
+				<view class="btn" @click="closePop">
+					<text class="btn-text">知道了</text>
+				</view>
+				
+
+			</view>
+
+			
+		</uni-popup>	
+	</view>
+</template>
+
+<script>
+import {
+  urls
+} from '@/util/apiUrl.js'
+import dohttp from '@/util/requestConfig.js'
+	export default {
+		name:"show-pop",
+		props: {
+		  code: {type: String, default: ""},
+		},
+		data() {
+			return {
+        procotol: {}
+			};
+		},
+		mounted() {
+			this.$refs.protocolSlot.open("bottom")
+      this.getProcotol()
+		},
+    methods:{
+      getProcotol(){
+        dohttp.post(urls.getByCode + "?code="+this.code).then((result) => {
+         this.procotol = result
+        })
+      },
+      closePop(){
+        this.$emit("closeProcotolPop")
+      }
+    }
+	}
+</script>
+
+<style scoped>
+	.btn{
+		
+		width: 550rpx;
+		height: 96rpx;
+		border-radius: 2002rpx;
+		opacity: 1;
+		
+		/* 自动布局 */
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		padding: 8rpx 40rpx;
+		
+		background: linear-gradient(180deg, #E84B2A 0%, #FF846A 100%);margin-bottom: 40rpx;margin-top: 40rpx;
+	}
+	.btn-text{
+		
+		
+		font-family: SourceHanSansBold;
+		font-size: 36rpx;
+		letter-spacing: 0px;
+		color: #FFFFFF;
+	}
+
+</style>
\ No newline at end of file
diff --git a/components/show-remind/show-remind.vue b/components/show-remind/show-remind.vue
new file mode 100644
index 0000000..74d41a4
--- /dev/null
+++ b/components/show-remind/show-remind.vue
@@ -0,0 +1,24 @@
+<template>
+	<view style="">
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"show-remind",
+		props:{
+			 msg: {type: String, default: ""},
+			 showType:{type:Number,default:0}
+		}
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style>
+			
+</style>
\ No newline at end of file
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..c3ff205
--- /dev/null
+++ b/index.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title></title>
+    <!--preload-links-->
+    <!--app-context-->
+  </head>
+  <body>
+    <div id="app"><!--app-html--></div>
+    <script type="module" src="/main.js"></script>
+  </body>
+</html>
diff --git a/main.js b/main.js
new file mode 100644
index 0000000..b56177e
--- /dev/null
+++ b/main.js
@@ -0,0 +1,27 @@
+import App from './App'
+
+// #ifndef VUE3
+import Vue from 'vue'
+import './uni.promisify.adaptor'
+import ShareMixin from './components/ShareMixin.js'; // 导入 Mixin
+ 
+// 全局注册 Mixin
+Vue.mixin(ShareMixin);
+
+Vue.config.productionTip = false
+App.mpType = 'app'
+const app = new Vue({
+  ...App
+})
+app.$mount()
+// #endif
+
+// #ifdef VUE3
+import { createSSRApp } from 'vue'
+export function createApp() {
+  const app = createSSRApp(App)
+  return {
+    app
+  }
+}
+// #endif
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
new file mode 100644
index 0000000..dda9a5a
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,73 @@
+{
+    "name" : "yuxingu-miniprogram",
+    "appid" : "__UNI__E47533F",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {},
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {}
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx6782dd88e655f1a7",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true,
+        "lazyCodeLoading" : "requiredComponents"
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "3"
+}
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..cbda978
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,786 @@
+{
+  "name": "yuxingu-miniprogram",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "unplugin-auto-import": "^19.1.1"
+      },
+      "devDependencies": {
+        "sass": "^1.85.1",
+        "sass-loader": "^16.0.5"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
+    },
+    "node_modules/@parcel/watcher": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher/-/watcher-2.5.1.tgz",
+      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^1.0.3",
+        "is-glob": "^4.0.3",
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher-android-arm64": "2.5.1",
+        "@parcel/watcher-darwin-arm64": "2.5.1",
+        "@parcel/watcher-darwin-x64": "2.5.1",
+        "@parcel/watcher-freebsd-x64": "2.5.1",
+        "@parcel/watcher-linux-arm-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm-musl": "2.5.1",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm64-musl": "2.5.1",
+        "@parcel/watcher-linux-x64-glibc": "2.5.1",
+        "@parcel/watcher-linux-x64-musl": "2.5.1",
+        "@parcel/watcher-win32-arm64": "2.5.1",
+        "@parcel/watcher-win32-ia32": "2.5.1",
+        "@parcel/watcher-win32-x64": "2.5.1"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
+      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
+      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
+      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
+      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
+      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
+      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
+      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
+      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-glibc": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
+      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-musl": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
+      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
+      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
+      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
+      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
+    },
+    "node_modules/acorn": {
+      "version": "8.14.0",
+      "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-4.0.3.tgz",
+      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+      "dev": true,
+      "dependencies": {
+        "readdirp": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/confbox": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmmirror.com/confbox/-/confbox-0.1.8.tgz",
+      "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w=="
+    },
+    "node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/estree-walker": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+      "dependencies": {
+        "@types/estree": "^1.0.0"
+      }
+    },
+    "node_modules/fdir": {
+      "version": "6.4.3",
+      "resolved": "https://registry.npmmirror.com/fdir/-/fdir-6.4.3.tgz",
+      "integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==",
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/immutable": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmmirror.com/immutable/-/immutable-5.0.3.tgz",
+      "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==",
+      "dev": true
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-9.0.1.tgz",
+      "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ=="
+    },
+    "node_modules/local-pkg": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/local-pkg/-/local-pkg-1.0.0.tgz",
+      "integrity": "sha512-bbgPw/wmroJsil/GgL4qjDzs5YLTBMQ99weRsok1XCDccQeehbHA/I1oRvk2NPtr7KGZgT/Y5tPRnAtMqeG2Kg==",
+      "dependencies": {
+        "mlly": "^1.7.3",
+        "pkg-types": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/magic-string": {
+      "version": "0.30.17",
+      "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.17.tgz",
+      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.0"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/micromatch/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/mlly": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmmirror.com/mlly/-/mlly-1.7.4.tgz",
+      "integrity": "sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==",
+      "dependencies": {
+        "acorn": "^8.14.0",
+        "pathe": "^2.0.1",
+        "pkg-types": "^1.3.0",
+        "ufo": "^1.5.4"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmmirror.com/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
+    },
+    "node_modules/node-addon-api": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmmirror.com/node-addon-api/-/node-addon-api-7.1.1.tgz",
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/pathe": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmmirror.com/pathe/-/pathe-2.0.3.tgz",
+      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w=="
+    },
+    "node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pkg-types": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmmirror.com/pkg-types/-/pkg-types-1.3.1.tgz",
+      "integrity": "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==",
+      "dependencies": {
+        "confbox": "^0.1.8",
+        "mlly": "^1.7.4",
+        "pathe": "^2.0.1"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-4.1.2.tgz",
+      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 14.18.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/sass": {
+      "version": "1.85.1",
+      "resolved": "https://registry.npmmirror.com/sass/-/sass-1.85.1.tgz",
+      "integrity": "sha512-Uk8WpxM5v+0cMR0XjX9KfRIacmSG86RH4DCCZjLU2rFh5tyutt9siAXJ7G+YfxQ99Q6wrRMbMlVl6KqUms71ag==",
+      "dev": true,
+      "dependencies": {
+        "chokidar": "^4.0.0",
+        "immutable": "^5.0.2",
+        "source-map-js": ">=0.6.2 <2.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher": "^2.4.1"
+      }
+    },
+    "node_modules/sass-loader": {
+      "version": "16.0.5",
+      "resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-16.0.5.tgz",
+      "integrity": "sha512-oL+CMBXrj6BZ/zOq4os+UECPL+bWqt6OAC6DWS8Ln8GZRcMDjlJ4JC3FBDuHJdYaFWIdKNIBYmtZtK2MaMkNIw==",
+      "dev": true,
+      "dependencies": {
+        "neo-async": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 18.12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "@rspack/core": "0.x || 1.x",
+        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
+        "sass": "^1.3.0",
+        "sass-embedded": "*",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "node-sass": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/scule": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/scule/-/scule-1.3.0.tgz",
+      "integrity": "sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g=="
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-literal": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/strip-literal/-/strip-literal-3.0.0.tgz",
+      "integrity": "sha512-TcccoMhJOM3OebGhSBEmp3UZ2SfDMZUEBdRA/9ynfLi8yYajyWX3JiXArcJt4Umh4vISpspkQIY8ZZoCqjbviA==",
+      "dependencies": {
+        "js-tokens": "^9.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/tinyglobby": {
+      "version": "0.2.12",
+      "resolved": "https://registry.npmmirror.com/tinyglobby/-/tinyglobby-0.2.12.tgz",
+      "integrity": "sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==",
+      "dependencies": {
+        "fdir": "^6.4.3",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/SuperchupuDev"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/ufo": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmmirror.com/ufo/-/ufo-1.5.4.tgz",
+      "integrity": "sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ=="
+    },
+    "node_modules/unimport": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmmirror.com/unimport/-/unimport-4.1.2.tgz",
+      "integrity": "sha512-oVUL7PSlyVV3QRhsdcyYEMaDX8HJyS/CnUonEJTYA3//bWO+o/4gG8F7auGWWWkrrxBQBYOO8DKe+C53ktpRXw==",
+      "dependencies": {
+        "acorn": "^8.14.0",
+        "escape-string-regexp": "^5.0.0",
+        "estree-walker": "^3.0.3",
+        "local-pkg": "^1.0.0",
+        "magic-string": "^0.30.17",
+        "mlly": "^1.7.4",
+        "pathe": "^2.0.3",
+        "picomatch": "^4.0.2",
+        "pkg-types": "^1.3.1",
+        "scule": "^1.3.0",
+        "strip-literal": "^3.0.0",
+        "tinyglobby": "^0.2.11",
+        "unplugin": "^2.2.0",
+        "unplugin-utils": "^0.2.4"
+      },
+      "engines": {
+        "node": ">=18.12.0"
+      }
+    },
+    "node_modules/unplugin": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmmirror.com/unplugin/-/unplugin-2.2.0.tgz",
+      "integrity": "sha512-m1ekpSwuOT5hxkJeZGRxO7gXbXT3gF26NjQ7GdVHoLoF8/nopLcd/QfPigpCy7i51oFHiRJg/CyHhj4vs2+KGw==",
+      "dependencies": {
+        "acorn": "^8.14.0",
+        "webpack-virtual-modules": "^0.6.2"
+      },
+      "engines": {
+        "node": ">=18.12.0"
+      }
+    },
+    "node_modules/unplugin-auto-import": {
+      "version": "19.1.1",
+      "resolved": "https://registry.npmmirror.com/unplugin-auto-import/-/unplugin-auto-import-19.1.1.tgz",
+      "integrity": "sha512-sCGZZrSR1Bc8RfN8Q0RUDxXtC20rdAt7UB4lDyq8MNtKVHiXXh+5af6Nz4JRp9Q+7HjnbgQfQox0TkEymjdUAQ==",
+      "dependencies": {
+        "local-pkg": "^1.0.0",
+        "magic-string": "^0.30.17",
+        "picomatch": "^4.0.2",
+        "unimport": "^4.1.2",
+        "unplugin": "^2.2.0",
+        "unplugin-utils": "^0.2.4"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@nuxt/kit": "^3.2.2",
+        "@vueuse/core": "*"
+      },
+      "peerDependenciesMeta": {
+        "@nuxt/kit": {
+          "optional": true
+        },
+        "@vueuse/core": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/unplugin-utils": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmmirror.com/unplugin-utils/-/unplugin-utils-0.2.4.tgz",
+      "integrity": "sha512-8U/MtpkPkkk3Atewj1+RcKIjb5WBimZ/WSLhhR3w6SsIj8XJuKTacSP8g+2JhfSGw0Cb125Y+2zA/IzJZDVbhA==",
+      "dependencies": {
+        "pathe": "^2.0.2",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=18.12.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sxzz"
+      }
+    },
+    "node_modules/webpack-virtual-modules": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmmirror.com/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz",
+      "integrity": "sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ=="
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..a7ed115
--- /dev/null
+++ b/package.json
@@ -0,0 +1,9 @@
+{
+  "dependencies": {
+    "unplugin-auto-import": "^19.1.1"
+  },
+  "devDependencies": {
+    "sass": "^1.85.1",
+    "sass-loader": "^16.0.5"
+  }
+}
diff --git a/pages.json b/pages.json
new file mode 100644
index 0000000..d69824b
--- /dev/null
+++ b/pages.json
@@ -0,0 +1,208 @@
+{
+	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "愈心谷"
+			}
+		},
+		{
+			"path": "pages/healing/healing-list",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/healing-detail/healing-detail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/healing/active-list",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/healing-detail/active-detail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/test-list/test-list",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/test-detail/test-detail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/show-question/show-question",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/test-result/test-result",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/my-test/my-test",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/login-pop/login-pop",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/pay-demo/pay-demo",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/consult/consult",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/consult-detail/consult-detail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/appoint/appoint",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/my-focus/my-focus",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/order/order",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/order-detail/order-detail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/personal-center/personal-center",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/edit-userinfo/edit-userinfo",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/customer-service/customer-service",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path" : "pages/feedback/feedback",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		},
+		{
+			"path" : "pages/consult-appointment/consult-appointment",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		},
+		{
+			"path" : "pages/show-image/show-image",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		},
+		{
+			"path" : "pages/show-banner/show-banner",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		},
+		{
+			"path" : "pages/webview-page/webview-page",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		}
+	],
+	"globalStyle": {
+		// "navigationBarTextStyle": "black",
+		// "navigationBarTitleText": "uni-app",
+		// "navigationBarBackgroundColor": "#F8F8F8",
+		// "backgroundColor": "#F8F8F8",
+		"navigationStyle": "custom"
+
+	},
+	"uniIdRouter": {},
+	"tabBar": {
+		"backgroundColor": "none",
+		"borderStyle": "white",
+		"selectedColor": "#EA4E2D",
+		"fontSize": "24px",
+		"iconWidth": "16px",
+		"list": [{
+				"iconPath": "./static/n-menu/sy-n.png",
+				"selectedIconPath": "./static/n-menu/sy-c.png",
+				"pagePath": "pages/index/index",
+				"text": "首页"
+			},
+			{
+				"iconPath": "./static/n-menu/zx-n.png",
+				"selectedIconPath": "./static/n-menu/zx-c.png",
+				"pagePath": "pages/consult/consult",
+				"text": "心理咨询"
+			},
+			{
+				"iconPath": "./static/n-menu/hdbm-n.png",
+				"selectedIconPath": "./static/n-menu/hdbm-c.png",
+				"pagePath": "pages/test-list/test-list",
+				"text": "心理测评"
+			},
+			{
+				"iconPath": "./static/n-menu/wd-n.png",
+				"selectedIconPath": "./static/n-menu/wd-c.png",
+				"pagePath": "pages/personal-center/personal-center",
+				"text": "我的"
+
+			}
+
+		]
+	}
+}
\ No newline at end of file
diff --git a/pages/appoint/appoint.vue b/pages/appoint/appoint.vue
new file mode 100644
index 0000000..7d20480
--- /dev/null
+++ b/pages/appoint/appoint.vue
@@ -0,0 +1,937 @@
+<template>
+
+	<view class="content" :style="{height:bgHeight}">
+		<myNav title="立即预约" bgColor="#fff" titleColor="#614D49" :backIcon="true" :backHome="false" :flex="true"></myNav>
+
+
+		<view style=" display: flex; flex-direction: column; align-items: center;overflow-y: auto;"
+			v-if="psychicShowDetail">
+
+			<view class="card" style="margin-top: 40rpx;">
+				<view class="psychic-top"></view>
+				<view class="psychic-card">
+					<view style="display: flex;justify-content: space-between;width: 100%;">
+						<view style="display: flex;align-items:last baseline;">
+							<image v-if="psychicShowDetail.avatar" :src="psychicShowDetail.avatar"
+								style="width: 120rpx;height: 120rpx;border-radius: 10rpx;">
+							</image>
+							<text class="psychic-name">{{psychicShowDetail.name}}</text>
+						</view>
+						<view>
+							<text class="psychic-price">¥{{advancedFormat(psychicShowDetail.price)}}</text>
+							<text class="psychic-unit"
+								v-if="appointmentTime">/{{calculateTimeDifference(appointmentTime.startTime,appointmentTime.endTime)}}分钟</text>
+						</view>
+					</view>
+					<view class="line"></view>
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-text">咨询时段</text>
+						<view @click="showChoiceDateTimePop">
+							<text class="psychic-detail-show-text"
+								v-if="appointmentDate&&appointmentTime">{{appointmentDate.scheduleDate}}({{appointmentDate.weekStr}}){{appointmentTime.startTime.substring(0,5)}}-{{appointmentTime.endTime.substring(0,5)}}</text>
+							<image src="/static/n-zx/right-icon.png" class="right-icon" >
+							</image>
+						</view>
+					</view>
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-text">咨询方式</text>
+						<view style="display: flex; align-items: center;">
+							<view v-if="psychicOrder.consultationMethod == 'video' && showVideo" style="width: 124rpx;height: 48rpx;border-radius: 80rpx;
+							box-sizing: border-box;border: 1px solid #F97559;display: flex;justify-content: center;align-items: center;"
+								@click="choiceConsultationMethod('video')">
+								<image src="/static/n-zx/video.png" style="width: 25.6rpx;height: 19.2rpx;"></image>
+								<text style="font-size: 24rpx;color: #F97559;margin-left: 8rpx;">视频</text>
+							</view>
+							<view v-if="psychicOrder.consultationMethod == 'video'&& showFaceToFace" style="width: 124rpx;height: 48rpx;border-radius: 80rpx;margin-left: 20rpx;
+							box-sizing: border-box;border: 1px solid #909099;display: flex;justify-content: center;align-items: center;"
+								@click="choiceConsultationMethod('face_to_face')">
+								<image src="/static/n-zx/face-to-face.png" style="width: 26rpx;height: 28.66rpx;">
+								</image>
+								<text style="font-size: 24rpx;color: #909099;margin-left: 8rpx;">面对面</text>
+							</view>
+
+
+							<view v-if="psychicOrder.consultationMethod == 'face_to_face'&& showVideo" style="width: 124rpx;height: 48rpx;border-radius: 80rpx;
+							box-sizing: border-box;border: 1px solid #909099;display: flex;justify-content: center;align-items: center;"
+								@click="choiceConsultationMethod('video')">
+								<image src="/static/n-zx/video-camera.png" style="width: 26rpx;height: 28.66rpx;">
+								</image>
+								<text style="font-size: 24rpx;color: #909099;margin-left: 8rpx;">视频</text>
+							</view>
+							<view v-if="psychicOrder.consultationMethod == 'face_to_face'&& showFaceToFace" style="width: 124rpx;height: 48rpx;border-radius: 80rpx;margin-left: 20rpx;
+							box-sizing: border-box;border: 1px solid #F97559;display: flex;justify-content: center;align-items: center;"
+								@click="choiceConsultationMethod('face_to_face')">
+								<image src="/static/n-zx/face-to-face-c.png" style="width: 26rpx;height: 28.66rpx;">
+								</image>
+								<text style="font-size: 24rpx;color: #F97559;margin-left: 8rpx;">面对面</text>
+							</view>
+						</view>
+					</view>
+					<view class="psychic-detail-row"  v-if="psychicOrder.consultationMethod == 'face_to_face'">
+						<text class="psychic-detail-text">面询地址</text>
+						<view style="width: 70%;text-align: right;">
+							<text class="psychic-detail-show-text">{{psychicShowDetail.address}}(下单后展示详细)</text>
+						</view>
+					</view>
+
+				</view>
+			</view>
+
+			<view class="card" style="margin-top: 20rpx;box-sizing: border-box;" v-if="!showDetailFlag">
+				<view style="padding-left: 40rpx;padding-right: 40rpx;width: 100%;box-sizing: border-box;">
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-text">预约人信息</text>
+						<view>
+							<text class="psychic-detail-show-text"
+								v-if="psychicShowDetail.appointmentInfoAppRespVO&&psychicShowDetail.appointmentInfoAppRespVO.phone">{{psychicShowDetail.appointmentInfoAppRespVO.phone}}</text>
+									
+							<text class="psychic-detail-show-text" @click="changeDetailFlag" v-else>去填写</text>
+							<image  v-if="!psychicShowDetail.appointmentInfoAppRespVO||!psychicShowDetail.appointmentInfoAppRespVO.phone"  src="/static/n-zx/right-icon.png" class="right-icon" style="margin-left: 10rpx;"
+								@click="changeDetailFlag" >
+							</image>
+						</view>
+					</view>
+				</view>
+				<view class="expand-bottom">
+					<view @click="changeDetailFlag"
+						style="display: flex;justify-content: center;flex-direction: column;align-items: center;justify-content: center;">
+						<text class="expand-text">展开更多</text>
+						<image src="/static/n-zx/down-icon.png" style="width: 16rpx;height: 11.82rpx;"></image>
+					</view>
+				</view>
+			</view>
+			<view class="card" style="margin-top: 20rpx;box-sizing: border-box;" v-if="showDetailFlag">
+				<view
+					style="padding-left: 40rpx;padding-right: 40rpx;width: 100%;box-sizing: border-box;padding-bottom: 40rpx;">
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-text">预约人信息</text>
+						<view>
+							<text class="psychic-detail-show-text" style="color: #909099;">必填，信息将严格保密，请放心如实填写</text>
+						</view>
+					</view>
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-title-text">预约人称呼</text>
+						<view style="text-align: right;">
+							<input type="text" class="input-text" v-model="psychicOrder.appointmentName" :maxlength="10"
+								placeholder="请输入预约人称呼" />
+						</view>
+					</view>
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-title-text">出生年月</text>
+
+						<view style="display: flex;justify-content: flex-end; align-items: center;">
+							<picker mode="date" value="date" fields="month" @change="bindDateChange">
+								<view class="input-text">{{psychicOrder.birthday}}</view>
+							</picker>
+							<image src="/static/n-zx/right-icon.png" class="right-icon" style="margin-left: 20rpx;">
+							</image>
+						</view>
+					</view>
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-title-text">联系方式</text>
+						<view style="text-align: right;">
+							<input class="input-text" type="number" :maxlength="11" v-model="psychicOrder.phone"
+								placeholder="请输入预约人联系电话" />
+						</view>
+					</view>
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-title-text">性别</text>
+						<view style="display: flex;align-items: center;" v-if="psychicOrder.sex == 1">
+							<view style="margin-right: 44.44rpx;display: flex;align-items: center;">
+								<image src="/static/n-zx/choice.png" style="width: 40rpx;height: 40rpx;"></image>
+								<text class="input-text" style="margin-left:10rpx ;">男</text>
+							</view>
+							<view style="display: flex;align-items: center;" @click="choiceSex(2)">
+								<image src="/static/n-zx/nochoice.png" style="width: 31rpx;height: 31rpx;"></image>
+								<text class="input-text" style="margin-left:10rpx ;">女</text>
+							</view>
+						</view>
+
+						<view style="display: flex;align-items: center;" v-if="psychicOrder.sex == 2">
+							<view style="margin-right: 44.44rpx;display: flex;align-items: center;"
+								@click="choiceSex(1)">
+								<image src="/static/n-zx/nochoice.png" style="width: 31rpx;height: 31rpx;"></image>
+								<text class="input-text" style="margin-left:10rpx ;">男</text>
+							</view>
+							<view style="display: flex;align-items: center;">
+								<image src="/static/n-zx/choice.png" style="width: 40rpx;height: 40rpx;"></image>
+								<text class="input-text" style="margin-left:10rpx ;">女</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="card" style="margin-top: 20rpx;box-sizing: border-box;" v-if="showDetailFlag">
+				<view
+					style="padding-left: 40rpx;padding-right: 40rpx;width: 100%;box-sizing: border-box;padding-bottom: 40rpx;">
+					<view class="psychic-detail-row" style="justify-content: flex-start;">
+						<text class="psychic-detail-text">紧急联系人</text>
+						<view style="margin-left: 20rpx;">
+							<text class="psychic-detail-show-text" style="color: #909099;">必填</text>
+						</view>
+					</view>
+
+					<view class="psychic-detail-row" style="justify-content: flex-start;margin-top: 20rpx;">
+
+						<view>
+							<text class="psychic-detail-show-text"
+								style="color: #909099;">我们承诺对您的信息严格保密，仅在紧急情况时联系您，全力保障您的生命安全与生活福祉</text>
+						</view>
+					</view>
+
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-title-text">联系方式</text>
+						<view style="text-align: right;">
+							<input class="input-text" v-model="psychicOrder.emergencyContactPhone" type="number"
+								:maxlength="11" placeholder="请输入紧急联系人电话" />
+						</view>
+					</view>
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-title-text">与你的关系</text>
+						<view style="display: flex;align-items: center;flex: 1;justify-content: flex-end;">
+							<!-- <input class="input-text" type="number" :maxlength="10" placeholder="请输入预约人联系电话" />
+							<image src="/static/n-zx/right-icon.png" class="right-icon" style="margin-left: 20rpx;">
+							</image> -->
+							<uni-data-select style="width: 80%;outline: none;border: none;text-align: right"
+							      v-model="psychicOrder.emergencyContactType"
+							      :localdata="range"
+							      @change="changeEmergencyContactType"
+								  :clear="false"
+								  placeholder="请选择"
+							    >
+								</uni-data-select>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="card" style="margin-top: 20rpx;box-sizing: border-box;">
+				<view
+					style="padding-left: 40rpx;padding-right: 40rpx;width: 100%;box-sizing: border-box;padding-bottom: 40rpx;">
+					<view class="psychic-detail-row" style="justify-content: flex-start;">
+						<text class="psychic-detail-text">支付方式</text>
+					</view>
+					<view class="psychic-detail-row" style="margin-top: 20rpx;align-items: center;">
+						<view style="display: flex;align-items: center;">
+							<image src="/static/n-zx/wx-pay-icon.png" style="width:88rpx;height: 88rpx;"></image>
+							<text class="input-text">微信支付</text>
+						</view>
+						<image src="/static/n-zx/choice-pay-icon.png" style="width: 48rpx;height: 48rpx;"></image>
+					</view>
+				</view>
+			</view>
+
+			<view style="width: 670rpx;display: flex;align-items: center; margin-top: 22rpx">
+				<image v-if="!agreeFlag" src="/static/n-zx/nochoice.png" style="width: 26rpx;height:26rpx;" @click="agree"></image>
+        <image v-else src="/static/n-zx/choice.png" style="width: 40rpx;height: 40rpx;"  @click="agree"></image>
+ <!-- @click="expandPopSlot" -->
+        <view 
+					style="white-space: nowrap; text-overflow: ellipsis;overflow: hidden;width: 630rpx;margin-left: 10rpx;">
+					<text class="psychic-detail-title-text1"> 同意</text>
+					<text class="psychic-detail-title-text1" style="color:#F37155 ;">
+						<text  @click="toShowProtocol('informed_consent')">《知情同意书》</text>、<text  @click="toShowProtocol('psychological_counseling')">《心理咨询服务协议》</text></text>
+					<text class="psychic-detail-title-text1">与</text>
+					<text class="psychic-detail-title-text1" style="color:#F37155 ;"  @click="toShowProtocol('exclusive_assistant')">《专属助理服务须知》</text>
+					<text class="psychic-detail-title-text1">，点击“同意"开始接受服务。</text>
+				</view>
+			</view>
+			<view class="bottom-btn"  @click="toPay">
+				<text class="btn-text">立即预约¥{{advancedFormat(psychicShowDetail.price)}}</text>
+			</view>
+		</view>
+	</view>
+	<uni-popup ref="timeSlot" type="bottom" :animation="true" :safe-area="false">
+		<view style="width: 750rpx;height: 940rpx;padding: 40rpx 40rpx 64rpx 40rpx;background: #fff;box-sizing: border-box;
+		flex-direction: column;display: flex;align-items: center;border-radius: 10rpx 10rpx 0px 0px;">
+			<text style="color: #614D49;font-size: 40rpx;font-family: SourceHanSansBold; ">选择咨询时段</text>
+			<text style="color: #9B918C;font-size: 24rpx;font-family: SourceHanSans;margin-top: 8rpx; ">（北京时间）</text>
+			<view style="display: flex; justify-content: space-between;width: 100%;margin-top: 40rpx;">
+				<text
+					style="color: #614D49;font-size: 28rpx;font-family: SourceHanSansBold;">共{{choiceSlotNum}}个时段可选择</text>
+				<text style="color: #9B918C;font-size: 28rpx;font-family: SourceHanSans;">已为你隐藏不可约时段</text>
+			</view>
+			<view style="display: flex;width: 100%;flex-direction: column;overflow-y: auto;">
+				<view style="display: flex;width: 100%;align-items: flex-start"
+					v-for="(item,index) in appointmentDateDetailList" :key="index">
+					<view class="date-card" :style="{'color':choiceDateIndex == index?'#F37155':'#9B918C'}">
+						<text style="font-size: 10rpx;font-family: SourceHanSansBold;">{{item.weekStr}}</text>
+						<text
+							style="font-size: 20rpx;font-family: SourceHanSans;">{{item.scheduleDate.slice(-5)}}</text>
+					</view>
+					<view style="display: flex;flex-wrap: wrap;width: 550rpx;">
+						<view class="time-card" :style="{'color':choiceTimeIndex == index1&&choiceDateIndex == index?'#fff':'#9B918C',
+						'background':choiceTimeIndex == index1&&choiceDateIndex == index?'#F37155':'#fff'
+						,'border':choiceTimeIndex == index1&&choiceDateIndex == index?'none':'1px solid #909099'}"
+							v-for="(ele,index1) in item.slotVOList" :key="index1"
+							@click="choiceDate(ele,index1,item,index)">
+							<text
+								style="font-size: 20rpx;font-family: SourceHanSans;width: 50rpx;height: 28rpx;">{{ele.startTime.substring(0,5)}}</text>
+							<text
+								style="font-size: 20rpx;font-family: SourceHanSans;;width: 8rpx;height: 28rpx;">-</text>
+							<text
+								style="font-size: 20rpx;font-family: SourceHanSans;width: 50rpx;height: 28rpx;">{{ele.endTime.substring(0,5)}}</text>
+						</view>
+					</view>
+				</view>
+
+			</view>
+			<view class="bottom-btn" style="margin-bottom: 64rpx;" @click="sureTime">
+				<text class="btn-text">确认时段</text>
+			</view>
+		</view>
+	</uni-popup>
+	<uni-popup ref="popSlot" type="center" :animation="true" :safe-area="false">
+		<view
+			style="width: 590rpx;height: 768rpx;border-radius: 10rpx;background-color: #fff;display: flex;flex-direction: column;align-items: center;">
+			<image src="/static/n-zx/header.png" style="width: 590rpx;height: 536.3rpx;margin-top: -282rpx;"></image>
+			<view style="width: 464rpx;margin-top: 80rpx;">
+				<text style="font-size: 28rpx;font-family: SourceHanSansBold">
+          请阅读<text style="color:#EA4E2D;" @click="toShowProtocol('informed_consent')">《知情同意书》</text>、
+          <text style="color:#EA4E2D;" @click="toShowProtocol('psychological_counseling')">《心理咨询服务协议》</text>与
+          <text style="color:#EA4E2D;"  @click="toShowProtocol('exclusive_assistant')">《专属助理服务须知》</text>，点击“同意"开始接受服务。
+				</text>
+			</view>
+			<view style="width: 430rpx;height: 96rpx;border-radius: 2002rpx;background: linear-gradient(180deg, #E84B2A 0%, #FF846A 100%);
+						display: flex;justify-content: center;align-items: center;margin-top: 70rpx;"  @click="sureAgree">
+				<text style="font-size: 36rpx;font-family: SourceHanSansBold;color: #fff;" >同意并支付</text>
+			</view>
+			<text style="font-size: 36rpx;color: #606271;font-family: SourceHanSansBold;margin-top: 40rpx;" @click="notAgree">取消</text>
+		</view>
+	</uni-popup>
+  <ShowPop  v-if="showPopFlag" :code="showPopCode" @closeProcotolPop="closeProcotolPop"></ShowPop>
+
+</template>
+
+<script setup>
+	import {
+		ref
+	} from 'vue'
+	import myNav from '@/components/my-nav.vue'
+	import {
+		urls
+	} from '@/util/apiUrl.js'
+	import dohttp from '@/util/requestConfig.js'
+  import ShowPop from "@/components/show-pop/show-pop.vue";
+
+	const psychicShowDetail = ref()
+
+	const showDetailFlag = ref(false)
+	const timeSlot = ref()
+	const popSlot = ref()
+  const showPopFlag= ref(false)
+  const showPopCode= ref("")
+
+
+  const toShowProtocol = (code) => {
+    showPopFlag.value = true
+    showPopCode.value = code
+  }
+const closeProcotolPop=()=>{
+    showPopFlag.value = false
+    showPopCode.value = ""
+  }
+	onLoad((option) => {
+		if (option && option.id) {
+			psychicOrder.value.doctorId = option.id
+			getDetail(option.id)
+			getDateDetailList()
+		} else {
+			uni.showModal({
+				title: '数据异常',
+				content: '页面数据发生异常，即将返回主页',
+				showCancel: false,
+				success: function(res) {
+					if (res.confirm) {
+						uni.reLaunch({
+							url: "/pages/index/index"
+						})
+					}
+				}
+			})
+		}
+		if (option && option.choiceDayFlag == 2) {
+			setTimeout(() => {
+				showChoiceDateTimePop()
+			}, 500)
+		}
+	})
+
+  const agreeFlag=ref(false)
+  const agree=()=>{
+    agreeFlag.value = !agreeFlag.value
+  }
+
+	const changeEmergencyContactType=(e)=>{
+		 psychicOrder.value.emergencyContactType = e
+	}
+	const showChoiceDateTimePop = () => {
+		timeSlot.value.open("bottom")
+
+	}
+	const choiceDateIndex = ref()
+	const choiceTimeIndex = ref()
+	const appointmentDate = ref()
+	const appointmentTime = ref()
+	const choiceDate = (ele, index1, item, index) => {
+		choiceDateIndex.value = index
+		choiceTimeIndex.value = index1
+		appointmentDate.value = item
+		appointmentTime.value = ele
+		psychicOrder.value.slotId = ele.slotId
+		
+		if (ele.consultationMethod){
+			showVideo.value = ele.consultationMethod.indexOf('video') >= 0
+			showFaceToFace.value = ele.consultationMethod.indexOf(
+				'face_to_face') >= 0
+		}
+	}
+
+	// 将时间字符串转换为总分钟数
+	const timeToMinutes = (timeStr) => {
+		const [hours, minutes] = timeStr.split(':').map(Number);
+		return hours * 60 + minutes;
+	}
+
+	// 计算时间差（处理跨天情况）
+	const calculateTimeDifference = (startTime, endTime) => {
+		const startMinutes = timeToMinutes(startTime);
+		const endMinutes = timeToMinutes(endTime);
+		let diff = endMinutes - startMinutes;
+		// 如果跨天（结束时间早于开始时间），补上24小时
+		if (diff < 0) diff += 24 * 60;
+		return diff;
+	}
+
+	
+	const onShareAppMessage = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    path: '/pages/index/index', // 分享的路径
+	  };
+	};
+	 
+	const onShareTimeline = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    query: 'id=12', // 分享路径的参数
+	  };
+	};
+
+	const appointmentDateDetailList = ref([])
+	const choiceSlotNum = ref(0)
+	const getDateDetailList = () => {
+		let queryData = {
+			doctorId: psychicOrder.value.doctorId
+		}
+		dohttp.post(urls.dateDetailList, queryData).then((result) => {
+			console.log("resultresult", result)
+			if (result && result.length > 0) {
+				appointmentDateDetailList.value = result.reverse()
+
+				appointmentDateDetailList.value.forEach(ele => {
+					choiceSlotNum.value += ele.slotVOList.length
+
+				})
+			} else {
+				uni.showModal({
+					title: '数据异常',
+					content: '该咨询师暂无排班信息，请选择其他咨询师',
+					showCancel: false,
+					success: function(res) {
+						if (res.confirm) {
+							uni.reLaunch({
+								url: "/pages/consult/consult"
+							})
+						}
+					}
+				})
+			}
+		})
+
+
+	}
+	const showVideo = ref(false)
+	const showFaceToFace = ref(false)
+
+	const getDetail = (id) => {
+		dohttp.get(urls.getShowInfo + "?id=" + id).then((result) => {
+			if (result) {
+				psychicShowDetail.value = result
+        psychicOrder.value.totalAmount = psychicShowDetail.value.price
+				if (psychicShowDetail.value.consultationMethod) {
+					showVideo.value = psychicShowDetail.value.consultationMethod.indexOf('video') >= 0
+					showFaceToFace.value = psychicShowDetail.value.consultationMethod.indexOf(
+						'face_to_face') >= 0
+					// psychicShowDetail.value.consultationMethodList = psychicShowDetail.value.consultationMethod
+					// 	.split(",")
+					if (psychicShowDetail.value.consultationMethod.indexOf('video') >= 0) {
+						psychicOrder.value.consultationMethod = 'video' //默认 咨询方式为未视频
+					} else {
+						psychicOrder.value.consultationMethod = 'face_to_face' //默认 咨询方式为未视频
+					}
+				}
+
+				if (psychicShowDetail.value.appointmentInfoAppRespVO) {
+					psychicOrder.value.appointmentName = psychicShowDetail.value.appointmentInfoAppRespVO
+						.appointmentName
+					if (psychicShowDetail.value.appointmentInfoAppRespVO.birthday) {
+						psychicOrder.value.birthday = psychicShowDetail.value.appointmentInfoAppRespVO.birthday.slice(0, 7)
+					}
+					psychicOrder.value.phone = psychicShowDetail.value.appointmentInfoAppRespVO.phone
+					if (psychicShowDetail.value.appointmentInfoAppRespVO.sex) {
+						psychicOrder.value.sex = psychicShowDetail.value.appointmentInfoAppRespVO.sex
+					}
+					if (psychicShowDetail.value.appointmentInfoAppRespVO.emergencyContactType) {
+						psychicOrder.value.emergencyContactType = Number(psychicShowDetail.value
+							.appointmentInfoAppRespVO
+							.emergencyContactType)
+					}
+					if (psychicShowDetail.value.appointmentInfoAppRespVO.emergencyContactPhone) {
+						psychicOrder.value.emergencyContactPhone = psychicShowDetail.value
+							.appointmentInfoAppRespVO
+							.emergencyContactPhone
+					}
+
+				}
+
+			}
+		})
+	}
+	const choiceSex = (sex) => {
+		psychicOrder.value.sex = sex
+
+	}
+	const advancedFormat = (num) => {
+		const divided = Number(num) / 100;
+		// 转换为字符串处理科学计数法（如1e-7）
+		const str = divided.toLocaleString('en-US', {
+			maximumFractionDigits: 2,
+			useGrouping: false
+		});
+		return str.replace(/(\.\d*?[1-9])0+$/, '$1').replace(/\.$/, '');
+	}
+	const bindDateChange = (event) => {
+		psychicOrder.value.birthday = event.detail.value
+	}
+
+	const bgHeight = ref("100vh")
+	const changeDetailFlag = () => {
+		showDetailFlag.value = true
+		bgHeight.value = "fit-content"
+	}
+
+
+	const sureTime = () => {
+		if (!appointmentDate.value || !appointmentTime.value) {
+			uni.showToast({
+				title: '未选择咨询时段',
+				icon: 'error',
+				duration: 2000
+			});
+			return
+		}
+		timeSlot.value.close()
+	}
+	const psychicOrder = ref({
+		slotId: null,
+		doctorId: null,
+		appointmentName: null,
+		birthday: "1990-01",
+		phone: null,
+		sex: 1,
+		emergencyContactInfo: null,
+		consultationMethod: null,
+		emergencyContactPhone: "",
+		emergencyContactType: 1,
+    totalAmount: 0,
+	})
+	const range = ref([{
+			value: 1,
+			text: "朋友"
+		},
+		{
+			value: 2,
+			text: "子女"
+		},
+		{
+			value: 3,
+			text: "夫妻"
+		},
+		{
+			value: 4,
+			text: "父母"
+		},
+	])
+	const choiceConsultationMethod = (consultationMethod) => {
+		psychicOrder.value.consultationMethod = consultationMethod
+	}
+	const provider = ref("")
+	const createOrder = () => {
+    psychicOrder.value.emergencyContactInfo = JSON.stringify({
+      phone: psychicOrder.value.emergencyContactPhone,
+      type: psychicOrder.value.emergencyContactType
+    })
+
+    const deepCopy = JSON.parse(JSON.stringify(psychicOrder.value));
+    deepCopy.birthday =deepCopy.birthday+"-01"
+    return dohttp.post(urls.createZxOrder,deepCopy)
+	}
+
+  const sureAgree=()=>{
+    agreeFlag.value = true
+    popSlot.value.close()
+    toPay()
+  }
+  const notAgree=()=>{
+    popSlot.value.close()
+  }
+
+
+  const validatePhone = (phone)=> {
+    const regex = /^1[3-9]\d{9}$/;
+    return regex.test(phone);
+  }
+
+  const validData=()=>{
+
+    if(!psychicOrder.value.slotId){
+      uni.showModal({
+        title: '提示',
+        content: '请选择预约时段',
+        showCancel: false,
+      })
+      return false
+    }
+    if(!psychicOrder.value.appointmentName){
+      uni.showModal({
+        title: '提示',
+        content: '请填写预约人称呼',
+        showCancel: false,
+      })
+      return false
+    }
+    if(!psychicOrder.value.phone){
+      uni.showModal({
+        title: '提示',
+        content: '请填写预约人联系方式',
+        showCancel: false,
+      })
+      return false
+    }
+
+    if (!psychicOrder.value.birthday){
+      uni.showModal({
+        title: '提示',
+        content: '请选择预约人出生年月',
+        showCancel: false,
+      })
+      return false
+    }
+    if (!psychicOrder.value.sex){
+      uni.showModal({
+        title: '提示',
+        content: '请选择预约人性别',
+        showCancel: false,
+      })
+      return false
+    }
+    if (!psychicOrder.value.emergencyContactPhone){
+      uni.showModal({
+        title: '提示',
+        content: '请填写紧急联系人电话',
+        showCancel: false,
+      })
+      return false
+    }
+    if (!psychicOrder.value.emergencyContactType){
+      uni.showModal({
+        title: '提示',
+        content: '请选择紧急联系人与你的关系',
+        showCancel: false,
+      })
+      return false
+    }
+
+    if(!validatePhone(psychicOrder.value.phone)){
+      uni.showModal({
+        title: '提示',
+        content: '请填写正确的预约人手机号码',
+        showCancel: false,
+      })
+      return false
+    }
+    if(!validatePhone(psychicOrder.value.emergencyContactPhone)){
+      uni.showModal({
+        title: '提示',
+        content: '请填写正确的紧急联系人手机号码',
+        showCancel: false,
+      })
+      return false
+    }
+    return true
+  }
+
+  const expandPopSlot=()=>{
+    popSlot.value.open("center")
+
+  }
+	const toPay = async () => {
+
+    if(!validData()){
+      return
+    }
+    if(!agreeFlag.value){
+      popSlot.value.open("center")
+      return
+    }
+
+		const result = await createOrder()
+		console.log("toPay------------", result)
+		uni.requestPayment({
+			provider: 'wxpay',
+			timeStamp: result.timeStamp,
+			nonceStr: result.nonceStr,
+			package: result.packageStr,
+			signType: result.signType,
+			paySign: result.paySign,
+			success: function(res) {
+        dohttp.navigateTo("/pages/order/order?backHome="+1)
+
+      },
+			fail: function(err) {
+        dohttp.navigateTo("/pages/order/order")
+			}
+		})
+
+
+	}
+</script>
+
+<style scoped>
+	.content {
+		width: 100vw;
+		background-color: #F9F6F5;
+		font-family: 'SourceHanSans';
+	}
+
+	.psychic-top {
+		border-radius: 10rpx 10rpx 0rpx 0rpx;
+		opacity: 1;
+		/* 自动布局 */
+		width: 670rpx;
+		height: 60rpx;
+		background: linear-gradient(180deg, #FFE7D9 0%, rgba(255, 255, 255, 0) 98%);
+	}
+
+	.card {
+		width: 670rpx;
+		background-color: #ffffff;
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+		align-items: flex-start;
+		border-radius: 10rpx;
+	}
+
+	.psychic-card {
+		padding-left: 40rpx;
+		padding-right: 40rpx;
+		padding-bottom: 54rpx;
+		border-radius: 10rpx;
+		margin-top: -20rpx;
+		width: 670rpx;
+		box-sizing: border-box;
+	}
+
+	.psychic-name {
+		font-family: SourceHanSansBold;
+		font-size: 40rpx;
+		line-height: normal;
+		text-align: center;
+		letter-spacing: 0rpx;
+		font-variation-settings: "opsz" auto;
+		color: #614D49;
+		margin-left: 20rpx;
+	}
+
+	.psychic-price {
+		/* 标题/标题二加粗 */
+		font-family: SourceHanSans;
+		font-weight: 700;
+		font-size: 36rpx;
+		font-variation-settings: "opsz" auto;
+		color: #EA4E2D;
+	}
+
+	.psychic-unit {
+		/* 标题/标题二加粗 */
+		font-family: SourceHanSans;
+		font-weight: 700;
+		font-size: 20rpx;
+		font-variation-settings: "opsz" auto;
+		color: #EA4E2D;
+
+	}
+
+	.psychic-detail-text {
+		font-family: SourceHanSansBold;
+		font-size: 28rpx;
+		line-height: normal;
+		text-align: center;
+		letter-spacing: 0px;
+
+		font-variation-settings: "opsz" auto;
+		/* 背景色/浅色背景2 */
+		color: #614D49;
+	}
+
+	.psychic-detail-title-text {
+		font-family: SourceHanSans;
+		font-size: 28rpx;
+		font-weight: normal;
+		line-height: normal;
+		text-align: center;
+		letter-spacing: 0px;
+
+		font-variation-settings: "opsz" auto;
+		/* 背景色/浅色背景2 */
+		color: #614D49;
+	}
+	.psychic-detail-title-text1 {
+		font-family: SourceHanSans;
+		font-size: 24rpx;
+		font-weight: normal;
+		line-height: normal;
+		text-align: center;
+		letter-spacing: 0px;
+	
+		font-variation-settings: "opsz" auto;
+		/* 背景色/浅色背景2 */
+		color: #614D49;
+	}
+	.psychic-detail-show-text {
+		font-family: SourceHanSans;
+		font-size: 24rpx;
+		font-weight: normal;
+		line-height: normal;
+		text-align: center;
+		letter-spacing: 0px;
+		font-variation-settings: "opsz" auto;
+		/* 背景色/浅色背景2 */
+		color: #909099;
+	}
+
+	.line {
+		margin-top: 41rpx;
+		width: 100%;
+		border: 1rpx dashed #DFD6D3;
+
+
+	}
+
+	.psychic-detail-row {
+		display: flex;
+		justify-content: space-between;
+		width: 100%;
+		margin-top: 39rpx;
+	}
+
+	.right-icon {
+		width: 15rpx;
+		height: 25rpx;
+		margin-left: 20rpx;
+	}
+
+	.expand-text {
+		font-family: SourceHanSansBold;
+		font-size: 24rpx;
+		line-height: normal;
+		letter-spacing: 0px;
+
+		font-variation-settings: "opsz" auto;
+		color: #EA4E2D;
+	}
+
+	.expand-bottom {
+		width: 670rpx;
+		margin-top: 40rpx;
+		display: flex;
+		justify-content: center;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		height: 62rpx;
+		border-radius: 0px 0px 10rpx 10rpx;
+		background: linear-gradient(180deg, #FFFFFF 10%, #FFF3EF 80%);
+	}
+
+	.input-text {
+
+		font-family: SourceHanSans;
+		font-size: 28rpx;
+		font-weight: normal;
+		line-height: normal;
+		text-align: right;
+		letter-spacing: 0px;
+
+		font-variation-settings: "opsz" auto;
+		/* 正文色/正文辅助4 */
+		color: #606271;
+	}
+
+	.bottom-btn {
+
+		width: 550rpx;
+		height: 96rpx;
+		border-radius: 2002rpx;
+		/* 自动布局 */
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		padding: 8rpx 40rpx;
+
+		background: linear-gradient(180deg, #FF9079 0%, #F37155 100%);
+		margin-bottom: 82rpx;
+		margin-top: 68rpx;
+	}
+
+	.btn-text {
+		font-family: SourceHanSansBold;
+		font-size: 36rpx;
+		line-height: normal;
+		letter-spacing: 0rpx;
+
+		/* 正文色/正文色 */
+		color: #FFFFFF;
+	}
+
+	.time-card {
+		width: 116rpx;
+		height: 108rpx;
+		border-radius: 10rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+		margin-left: 40rpx;
+		border: 1rpx solid #909099;
+		box-sizing: border-box;
+		margin-top: 40rpx;
+		color: #606271;
+	}
+
+	.date-card {
+		width: 116rpx;
+		height: 108rpx;
+		border-radius: 10rpx;
+		background-color: #F7F4F3;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+		margin-top: 40rpx;
+		color: #606271;
+
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/consult-appointment/consult-appointment.vue b/pages/consult-appointment/consult-appointment.vue
new file mode 100644
index 0000000..5aba6d3
--- /dev/null
+++ b/pages/consult-appointment/consult-appointment.vue
@@ -0,0 +1,53 @@
+<template>
+	<view class="content">
+		<myNav title="协议内容" bgColor="#fff" titleColor="#614D49" :backIcon="true" :backHome="false" :flex="false">
+		</myNav>
+		<view style="width: 100%;height: 100%;display: flex;flex-direction: column;align-items: center;overflow-y: auto;padding-bottom: 40rpx;">
+			<view style="margin: 40rpx;display: flex;width: 670rpx;flex-direction: column;align-items: center;background-color: #fff;box-sizing: border-box;
+			border-radius: 10rpx;padding: 40rpx;">
+				<text class="title">{{procotol.title}}</text>
+				<rich-text style="margin-top: 40rpx;" :nodes="procotol.context"></rich-text>
+			</view>
+		</view>	
+	</view>
+</template>
+
+<script setup>
+	import myNav from '@/components/my-nav.vue'
+	import {
+		urls
+	} from '@/util/apiUrl.js'
+	import dohttp from '@/util/requestConfig.js'
+	
+	onLoad((option) => {
+		getProcotol()
+	})
+	const procotol=ref()
+	const getProcotol = () => {
+		dohttp.post(urls.getByCode + "?code=consultation_appointment_agreement").then((result) => {
+			procotol.value = result
+		})
+	}
+</script>
+
+<style scoped>
+	.content {
+		width: 100vw;
+		height: 100vh;
+		background-color: #f9f8f8;
+		display: flex;
+		flex-direction: column;
+		font-family: SourceHanSans;
+		background-image: url('https://miniapp.yuxingu.com.cn/yxg-mp/pic/bg-all.png');
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+    font-family: SourceHanSans;
+	}
+	.title{
+		
+		font-size: 36rpx;
+    font-family: SourceHanSansBold;
+		
+	}
+</style>
\ No newline at end of file
diff --git a/pages/consult-detail/consult-detail.vue b/pages/consult-detail/consult-detail.vue
new file mode 100644
index 0000000..7e96a58
--- /dev/null
+++ b/pages/consult-detail/consult-detail.vue
@@ -0,0 +1,855 @@
+<template>
+  <view class="content">
+    <!-- <myNav title="" bgColor="nonoe" titleColor="#000" :backIcon="true" :backHome="false" :flex="false"></myNav> -->
+    <view class="back-btn" :style="{'height':backBtnHeight+'px','width':backBtnHeight+'px'}" @click="toBack">
+      <image src="/static/back/n-back-mini.png" mode="widthFix" :style="{'width':backBtnImgWidth+'px'}"></image>
+    </view>
+    <view style="display: flex;flex-direction: column;justify-content: center;">
+
+      <image :src="showDetail.coverUrl" style="width: 750rpx;height:600rpx;"></image>
+
+      <view style="position: relative;display: flex;justify-content: center;height: 402rpx;">
+        <view class="header-detail">
+          <view class="header-detail-top">
+          </view>
+          <view class="header-detail-show">
+            <view style="display: flex;justify-content: space-between;align-items: first baseline;">
+              <view>
+                <text class="name-class">{{ showDetail.name }}</text>
+                <!-- <text class="school-class">{{ showDetail.education }}</text> -->
+              </view>
+              <view>
+                <text class="momey-text">¥{{ advancedFormat(showDetail.price) }}</text>
+                <text class="unit-text">/次</text>
+              </view>
+            </view>
+            <view style="display: flex;flex-wrap: wrap;margin-top: 15rpx;">
+
+              <view class="tag" :key="index" v-for="(item,index) in showDetail.tagList">
+                <text class="tag-text">{{ item }}</text>
+              </view>
+            </view>
+			<view style="margin-left: 5rpx;margin-top: 15rpx;">
+				<text class="showjj">{{showDetail.introduction}}</text>
+			</view>
+          </view>
+          <view style="position: absolute; bottom: 20rpx; left: 0; right: 0;">
+            <view style="display: flex;justify-content: space-evenly;align-items: center;">
+              <view style="display: flex;flex-direction: column;">
+                <view>
+                  <text class="service-time-text-big">{{ showDetail.workExperience }}+</text>
+                  <text class="service-time-text-mini">小时</text>
+                </view>
+                <view
+                    style="margin-top: 10rpx;display: flex;justify-content: center;align-items: center;">
+                  <image src="/static/n-zx/l-icon.png" style="width: 25rpx;height: 36rpx;"></image>
+                  <text class="service-text" style="margin-left: 6rpx;">咨询经验</text>
+                </view>
+              </view>
+              <view style="height: 92rpx;width:  2rpx;background: #DFD6D3;">
+              </view>
+              <view style="display: flex;flex-direction: column;">
+                <view>
+                  <text
+                      class="service-time-text-big">{{ preciseYearDiff(showDetail.workStartTime) }}+</text>
+                  <text class="service-time-text-mini">年</text>
+                </view>
+                <view
+                    style="margin-top: 10rpx;display: flex;justify-content: center;align-items: center;">
+                  <image src="/static/n-zx/r-icon.png" style="width: 25rpx;height: 36rpx;"></image>
+                  <text class="service-text" style="margin-left: 6rpx;">从业年限</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <!-- 简介 可约时间  预约须知 -->
+      <view id="section1" style="display: flex;align-items: center;margin-top: 20rpx;flex-direction: column;">
+        <view
+            style="background-color:#FFFFFF;border-radius: 10rpx;width: 670rpx;display:flex;flex-direction: column;">
+          <view style="display: flex;align-items: center;justify-content: space-around;margin-top: 29rpx;">
+            <view v-for="(item,index) in types" :key="index"
+                  style="display: flex;flex-direction: column;justify-content: center;align-items: center;"
+                  @click="choice(item)">
+              <text :class="{ 'choice-text': choiceTypeCode==item.code,
+						 'no-choice-text': choiceTypeCode!=item.code }">{{ item.name }}
+              </text>
+              <view :class="{'choice-icon':choiceTypeCode==item.code}"></view>
+            </view>
+          </view>
+          <view style="padding: 28rpx;">
+            <rich-text :nodes="showDetail.resume"></rich-text>
+          </view>
+        </view>
+
+        <view id="section2" style="width: 670rpx;border-radius: 10rpx;background-color: #FFFFFF;display: flex;flex-direction: column;
+				margin-top: 20rpx;padding-top: 28rpx;padding-bottom: 40rpx;">
+          <view style="display: flex;padding-left: 40rpx;align-items: baseline;">
+            <text class="reservation-title-text-large">可预约时间</text>
+            <text class="reservation-title-text-mini" style="margin-left: 10rpx;">(北京时间)</text>
+          </view>
+          <text class="reservation-title-text-mini"
+                style="padding-left: 40rpx;padding-right: 40rpx;">如果暂时无法确定具体的咨询时间，可以在预约成功后，再与咨询师协商。
+          </text>
+
+          <view style="background: #F37155;width: 100%;height: 64rpx;border-top-right-radius:10rpx ;
+						border-top-left-radius:10rpx ;margin-top: 20rpx;display: flex;align-items: center;">
+            <text class="reservation-time-month" style="margin-left:54rpx ;">
+              {{ yearMonth }}
+            </text>
+          </view>
+          <view
+              style="padding-left: 10rpx;padding-right: 10rpx;display:flex;flex-direction: column;align-items: center;">
+            <view class="row">
+              <view class="row-unit">
+                <text class="reservation-time-week">日</text>
+              </view>
+              <view class="row-unit">
+                <text class="reservation-time-week">一</text>
+              </view>
+              <view class="row-unit">
+                <text class="reservation-time-week">二</text>
+              </view>
+              <view class="row-unit">
+                <text class="reservation-time-week">三</text>
+              </view>
+              <view class="row-unit">
+                <text class="reservation-time-week">四</text>
+              </view>
+              <view class="row-unit">
+                <text class="reservation-time-week">五</text>
+              </view>
+              <view class="row-unit">
+                <text class="reservation-time-week">六</text>
+              </view>
+            </view>
+            <view class="line"></view>
+            <view style="display: flex;flex-wrap: wrap;width: 630rpx;">
+              <view style="height: 104rpx;width: 90rpx;" :key="idx" v-for="(item,idx) in allDates">
+                <view class="day-unit" v-if="item.dateStr"
+                      :style="{'backgroundColor': idx == choiceIdx?'#F37155':'transparent' }"
+                      @click="choiceDay(idx,item)">
+                  <text class="reservation-time-day"
+                        :style="{'color': idx == choiceIdx?'#FFFFFF':'#000' }">{{ item.nextMonth? item.nextMonth:item.day }}
+                  </text>
+                  <text class="reservation-time-day-text" v-if="item.remainNum"
+                        :style="{'color': idx == choiceIdx?'#FFFFFF':'#F37155' }">
+                    剩{{ item.remainNum }}
+                  </text>
+                  <text class="reservation-time-day-text" v-else
+                        :style="{'color': idx == choiceIdx?'#FFFFFF':'#9B918C' }">-
+                  </text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+
+        <view id="section3"
+              style="width: 670rpx;border-radius: 10rpx;background-color: #FFFFFF;display: flex;flex-direction: column;box-sizing: border-box;
+							align-items: center;justify-content: center;
+						margin-top: 20rpx;padding-top: 20rpx;padding-bottom: 14rpx;padding-left: 34rpx;padding-right: 34rpx;margin-bottom: 196rpx;">
+          <text class="reservation-notice-text">预约须知</text>
+          <rich-text :nodes="procotol.context" style="margin-top: 34rpx;"></rich-text>
+        </view>
+      </view>
+    </view>
+    <view
+        style="width: 750rpx;position: fixed;height:176rpx ;background-color: #FFFFFF;display: flex;align-items: center;bottom: 0;left: 0;">
+      <view style="margin-left: 50rpx;width: 100rpx;display: flex;flex-direction: column;align-items: center;"
+            @click="focusDoctor">
+        <image v-if="!showDetail.focus" src="/static/n-zx/gz.png" style="width: 43.4rpx;height: 40.02rpx;">
+        </image>
+        <image v-if="showDetail.focus" src="/static/n-menu/wd-c.png" style="width: 46rpx;height: 48rpx;">
+        </image>
+        <text v-if="!showDetail.focus" class="operate-text" style="margin-top: 6rpx;">关注</text>
+        <text v-if="showDetail.focus" class="operate-text" style="margin-top: 6rpx;">取消关注</text>
+
+      </view>
+      <view
+          style="width: 50rpx;display: flex;flex-direction: column;align-items: center;margin-left: 84rpx;">
+        <button plain class="contact-btn" open-type="contact">
+          <image src="/static/n-zx/kf.png" style="width: 40rpx;height: 40rpx;"></image>
+
+        </button>
+        <text class="operate-text" style="margin-top: 6rpx;">客服</text>
+      </view>
+      <view style="margin-left: 100rpx;width: 250rpx;height: 86rpx;border-radius: 2002rpx;
+			background: linear-gradient(180deg, #E84B2A 0%, #FF846A 100%);display: flex; flex-direction: column;
+			justify-content: center; align-items: center; padding: 8rpx 40rpx;" @click="toAppoint">
+        <text class="button-text">立即预约</text>
+      </view>
+    </view>
+
+
+  </view>
+
+
+</template>
+
+<script setup>
+import {
+  ref
+} from 'vue'
+import myNav from '@/components/my-nav.vue'
+import {
+  urls
+} from '@/util/apiUrl.js'
+import dohttp from '@/util/requestConfig.js'
+
+const choiceTypeCode = ref("code1")
+const choiceIdx = ref()
+const backBtnHeight = ref()
+const backBtnImgWidth = ref()
+const types = ref([{
+  code: "code1",
+  name: '个人简介'
+},
+  {
+    code: "code2",
+    name: '可约时间'
+  },
+  {
+    code: "code3",
+    name: '预约须知'
+  },
+
+])
+const doctorId = ref()
+const choiceDayFlag = ref(1)
+
+const procotol=ref()
+const getProcotol = () => {
+		dohttp.post(urls.getByCode + "?code=psychological_show_appointment_agreement").then((result) => {
+			procotol.value = result
+		})
+	}
+const choiceDay = (idx, item) => {
+  choiceIdx.value = idx
+  if (item.remainNum) {
+    choiceDayFlag.value = 2
+  } else {
+    choiceDayFlag.value = 1
+  }
+}
+	
+	const onShareAppMessage = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    path: '/pages/index/index', // 分享的路径
+	  };
+	};
+	 
+	const onShareTimeline = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    query: 'id=21', // 分享路径的参数
+	  };
+	};
+const choice = (item) => {
+  let sectionId = null
+  if (item.code == 'code1') {
+    sectionId = "#section1"
+  }
+  if (item.code == 'code2') {
+    sectionId = "#section2"
+  }
+  if (item.code == 'code3') {
+    sectionId = "#section3"
+  }
+
+  choiceTypeCode.value = item.code
+  if (sectionId) {
+    uni.pageScrollTo({
+      selector: sectionId, // 目标元素选择器
+      duration: 300, // 滚动动画时长
+      success: () => {
+        console.log('滚动成功')
+      }
+    })
+  }
+
+}
+
+const toBack = () => {
+
+  uni.navigateBack({
+    delta: 1
+  })
+
+}
+
+onMounted(() => {
+  const systemInfo = uni.getSystemInfoSync()
+  // 胶囊位置信息
+  let rect = uni.getMenuButtonBoundingClientRect();
+  let navBarHeight = (rect.top - systemInfo.statusBarHeight) * 2 + rect.height;
+  backBtnHeight.value = navBarHeight
+  backBtnImgWidth.value = navBarHeight * 0.3
+  getProcotol()
+})
+const todayWeekdayIndex = ref(0)
+onLoad((option) => {
+  const currentDate = new Date();
+  todayWeekdayIndex.value = currentDate.getDay()
+
+  // 必须根据今天星期几先插入相关数据  构建数据 让日历对齐
+  for (var i = 0; i < todayWeekdayIndex.value; i++) {
+    allDates.value.push({
+      dateStr: "",
+      day: ""
+    })
+  }
+  getYearAndMonth()
+  getOneMonth()
+
+  if (option && option.id) {
+    doctorId.value = option.id
+    getDetail(option.id)
+    getAppointDate()
+  } else {
+    uni.showModal({
+      title: '数据异常',
+      content: '页面数据发生异常，即将返回主页',
+      showCancel: false,
+      success: function (res) {
+        if (res.confirm) {
+          uni.reLaunch({
+            url: "/pages/index/index"
+          })
+        }
+      }
+    })
+  }
+
+})
+
+
+const getDateRange = (start, end) => {
+  const dates = [];
+  let current = new Date(start);
+  while (current <= end) {
+    let dateStr = formatDate(new Date(current))
+    dates.push(dateStr);
+    current.setDate(current.getDate() + 1);
+  }
+
+  return dates;
+}
+const formatDate = (date) => {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const day = String(date.getDate()).padStart(2, '0');
+  
+  let obj = {
+    dateStr: `${year}-${month}-${day}`,
+    day: `${day}`
+  }
+  if(day=="01"&&currentMonth.value!=month){
+  	  obj.nextMonth = Number(month)+"月";
+  }
+
+  return obj;
+}
+const allDates = ref([])
+const getOneMonth = () => {
+  const startDate = new Date();
+  const endDate = new Date(startDate);
+  endDate.setMonth(startDate.getMonth() + 1);
+  allDates.value.push(...getDateRange(startDate, endDate));
+  allDates.value.length = allDates.value.length - todayWeekdayIndex.value
+
+}
+const havingTime = ref(true)
+const getAppointDate = () => {
+  let queryData = {
+    doctorId: doctorId.value
+  }
+  dohttp.post(urls.appointTotalList, queryData).then((result) => {
+    if (result&&result.length>0) {
+      const map = new Map(result.map(item => [item.scheduleDate, item]));
+      allDates.value.forEach(ele => {
+        if (ele.dateStr && map.get(ele.dateStr)) {
+			    ele.remainNum = map.get(ele.dateStr).remainNum
+        }
+      })
+    }else{
+      havingTime.value = false
+    }
+  })
+}
+const yearMonth = ref()
+const currentMonth=ref("")
+const getYearAndMonth = () => {
+  // 创建Date对象
+  const currentDate = new Date();
+
+  // 获取年份（四位数）
+  const year = currentDate.getFullYear(); // 例如2025[1,2,3](@ref)
+
+  // 获取月份（0-11），需+1并补零
+  const month = String(currentDate.getMonth() + 1).padStart(2, '0'); // 例如04[1,4,7](@ref)
+
+  // 拼接为“YYYY-MM”格式
+  yearMonth.value = `${year}年${month}月`;
+  currentMonth.value = month
+}
+
+const showDetail = ref({})
+
+const getDetail = (id) => {
+  dohttp.get(urls.getDoctorInfo + "?id=" + id).then((result) => {
+    if (result) {
+      if (result.tags) {
+        let tags = result.tags.split(",")
+        result.tagList = tags
+      }
+
+      showDetail.value = result
+    } else {
+
+      uni.showModal({
+        title: '数据异常',
+        content: '未获取到该咨询师信息，请选择其他咨询师',
+        showCancel: false,
+        success: function (res) {
+          if (res.confirm) {
+            uni.reLaunch({
+              url: "/pages/consult/consult"
+            })
+          }
+        }
+      })
+    }
+  })
+}
+
+
+const advancedFormat = (num) => {
+  const divided = Number(num) / 100;
+  // 转换为字符串处理科学计数法（如1e-7）
+  const str = divided.toLocaleString('en-US', {
+    maximumFractionDigits: 2,
+    useGrouping: false
+  });
+  return str.replace(/(\.\d*?[1-9])0+$/, '$1').replace(/\.$/, '');
+}
+
+const preciseYearDiff = (dateStr) => {
+  const target = new Date(dateStr);
+  const now = new Date();
+
+  // 计算完整年数
+  let years = now.getFullYear() - target.getFullYear();
+
+  // 检查月份和日期是否已超过
+  const monthDiff = now.getMonth() - target.getMonth();
+  if (monthDiff < 0 || (monthDiff === 0 && now.getDate() < target.getDate())) {
+    years--;
+  }
+
+  // 极端情况处理：闰年2月29日
+  if (target.getMonth() === 1 && target.getDate() === 29) {
+    const isLeapYear = (year) => (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
+    if (!isLeapYear(now.getFullYear()) && now.getMonth() === 1 && now.getDate() === 28) {
+      years++; // 闰日未到但当年非闰年时特殊处理
+    }
+  }
+
+  return years;
+}
+const focusDoctor = () => {
+  if (!showDetail.value.focus) {
+    dohttp.post(urls.focus + "?id=" + doctorId.value).then((result) => {
+      getDetail(doctorId.value)
+    })
+  } else {
+    dohttp.post(urls.cancelFocus + "?id=" + doctorId.value).then((result) => {
+      getDetail(doctorId.value)
+    })
+  }
+}
+
+
+const toAppoint = () => {
+  if(!havingTime.value){
+    uni.showModal({
+      title: '暂无排班',
+      content: '该咨询师暂无排班信息，请选择其他咨询师',
+      showCancel: false,
+      success: function (res) {
+        if (res.confirm) {
+          uni.reLaunch({
+            url: "/pages/consult/consult"
+          })
+        }
+      }
+    })
+    return
+  }
+
+  dohttp.navigateTo("/pages/appoint/appoint?id=" + doctorId.value + "&choiceDayFlag=" + choiceDayFlag.value)
+}
+</script>
+
+<style scoped>
+.content {
+  width: 100vw;
+  height: fit-content;
+  background-color: #F9F6F5;
+  display: flex;
+  flex-direction: column;
+  font-family: SourceHanSans;
+  box-sizing: border-box;
+}
+
+.header-detail {
+
+  width: 670rpx;
+  min-height: 378rpx;
+  border-radius: 10rpx;
+  opacity: 1;
+  /* 自动布局 */
+  display: flex;
+  flex-direction: column;
+  background: #FFFFFF;
+  margin-top: -26rpx;
+}
+
+.header-detail-top {
+  height: 60rpx;
+  border-radius: 10rpx 10rpx 0px 0px;
+  background: linear-gradient(180deg, #FFE7D9 0%, rgba(255, 255, 255, 0) 98%);
+}
+
+.header-detail-show {
+  display: flex;
+  flex-direction: column;
+  padding-left: 40rpx;
+  padding-right: 40rpx;
+  padding-bottom: 26rpx;
+  margin-top: -26rpx;
+}
+
+.name-class {
+  font-family: SourceHanSansBold;
+  font-size: 40rpx;
+  line-height: normal;
+  text-align: center;
+  letter-spacing: 0px;
+
+  font-variation-settings: "opsz" auto;
+  color: #614D49;
+}
+
+.school-class {
+  font-family: SourceHanSans;
+  font-size: 24rpx;
+  font-weight: normal;
+  line-height: normal;
+  letter-spacing: 0px;
+
+  font-variation-settings: "opsz" auto;
+  /* 正文色/正文辅助4 */
+  color: #9B918C;
+  margin-left: 18rpx;
+}
+
+.momey-text {
+  color: #F37155;
+  /* 标题/标题二加粗 */
+  font-family: SourceHanSansBold;
+  font-size: 38rpx;
+  font-weight: 700;
+  font-variation-settings: "opsz" auto;
+}
+
+.unit-text {
+  /* 正文/正文文本小号加粗 */
+  font-family: SourceHanSans;
+  font-weight: 700;
+  font-size: 22rpx;
+  font-variation-settings: "opsz" auto;
+  color: #F37155;
+}
+
+.tag {
+
+  border-radius: 80rpx;
+  opacity: 1;
+
+  /* 自动布局 */
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  padding: 4rpx 14rpx;
+
+  background: linear-gradient(270deg, #FFF0E7 0%, #FFCEC4 97%);
+  margin-left: 5rpx;
+}
+
+.tag-text {
+  /* 正文/正文文本超小 */
+  /* 样式描述：辅助信息 */
+  font-family: SourceHanSans;
+  font-size: 16rpx;
+  font-weight: normal;
+  line-height: normal;
+  text-align: center;
+  letter-spacing: 0px;
+
+  /* 背景色/浅色背景2 */
+  color: #303044;
+}
+
+.service-time-text-big {
+  color: #303044;
+  font-family: SourceHanSansBold;
+  font-size: 40rpx;
+  font-variation-settings: "opsz" auto;
+}
+
+.service-time-text-mini {
+  color: #303044;
+  font-family: SourceHanSansBold;
+  font-size: 22rpx;
+  font-variation-settings: "opsz" auto;
+}
+
+.service-text {
+  font-family: SourceHanSans;
+  font-size: 24rpx;
+  font-weight: normal;
+  line-height: normal;
+  text-align: center;
+  letter-spacing: 0px;
+
+  font-variation-settings: "opsz" auto;
+  /* 背景色/浅色背景2 */
+  color: #303044;
+}
+
+
+.no-choice-text {
+  /* 按钮/按钮文本中号 */
+  font-family: SourceHanSans;
+  font-size: 28rpx;
+  font-weight: normal;
+  line-height: normal;
+  letter-spacing: 0px;
+
+  font-variation-settings: "opsz" auto;
+  /* 背景色/浅色背景2 */
+  color: #9B918C;
+}
+
+.choice-text {
+  /* 样式描述：常规大按钮 */
+  font-family: SourceHanSansBold;
+  font-size: 28rpx;
+  line-height: normal;
+  letter-spacing: 0px;
+  /* 背景色/深色大背景 */
+  color: #614D49;
+  z-index: 0;
+}
+
+.choice-icon {
+  width: 60%;
+  height: 10rpx;
+  border-radius: 424rpx;
+  background: #F37155;
+}
+
+.reservation-title-text-large {
+  font-family: SourceHanSansBold;
+  font-size: 36rpx;
+  line-height: normal;
+  text-align: center;
+  letter-spacing: 0px;
+
+  font-variation-settings: "opsz" auto;
+  /* 背景色/浅色背景2 */
+  color: #614D49;
+}
+
+.reservation-title-text-mini {
+  font-family: SourceHanSans;
+  font-size: 20rpx;
+  font-weight: normal;
+  line-height: normal;
+  letter-spacing: 0px;
+
+  font-variation-settings: "opsz" auto;
+  /* 正文色/正文辅助4 */
+  color: #9B918C;
+}
+
+
+.reservation-time-month {
+  font-family: SourceHanSansBold;
+  font-size: 28rpx;
+  line-height: normal;
+  text-align: center;
+  letter-spacing: 0px;
+
+  font-variation-settings: "opsz" auto;
+  color: #FFFFFF;
+}
+
+.reservation-time-week {
+
+  font-family: SourceHanSans;
+  font-size: 30rpx;
+  font-weight: normal;
+  line-height: 36rpx;
+  letter-spacing: 0px;
+
+  color: #000000;
+}
+
+.line {
+  width: 670rpx;
+  height: 0px;
+  opacity: 1;
+  border: 2rpx solid #EDEDED;
+
+}
+
+.row-unit {
+  width: 90rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.row {
+  width: 630rpx;
+  display: flex;
+  height: 76rpx;
+
+}
+
+.reservation-time-day {
+  font-family: SourceHanSans;
+  font-size: 30rpx;
+  font-weight: normal;
+  line-height: 36rpx;
+  letter-spacing: 0px;
+
+  color: #000000;
+}
+
+.reservation-time-day-text {
+  font-family: SourceHanSans;
+  font-size: 20rpx;
+  font-weight: normal;
+  line-height: normal;
+  letter-spacing: 0px;
+
+  font-variation-settings: "opsz" auto;
+  /* 正文色/正文色辅助3 */
+  color: #9B918C;
+}
+
+.reservation-time-today {
+  font-family: SourceHanSans;
+  font-size: 30rpx;
+  font-weight: normal;
+  line-height: 36rpx;
+  letter-spacing: 0rpx;
+  /* 今天 */
+  color: #186BF9
+}
+
+.day-unit {
+  border-radius: 10rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+}
+
+.reservation-notice-text {
+  font-family: SourceHanSansBold;
+  font-size: 28rpx;
+  line-height: normal;
+  text-align: center;
+  letter-spacing: 0px;
+
+  font-variation-settings: "opsz" auto;
+  color: #614D49;
+}
+
+.operate-text {
+
+  font-family: SourceHanSans;
+  font-size: 24rpx;
+  font-weight: 500;
+  line-height: 36rpx;
+  letter-spacing: 0rpx;
+
+  /* 正文色/正文色辅助3 */
+  color: #9B918C;
+}
+
+.button-text {
+  font-family: SourceHanSansBold;
+  font-size: 36rpx;
+  line-height: normal;
+  letter-spacing: 0px;
+
+  /* 正文色/正文色 */
+  color: #FFFFFF;
+}
+
+.back-btn {
+  width: 750rpx;
+  position: absolute;
+  background-color: rgba(255, 255, 255, 0.3);
+  display: flex;
+  align-items: center;
+  top: 0;
+  left: 0;
+  margin-top: 54px;
+  width: 40px;
+  border-radius: 50%;
+  margin-left: 24rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+}
+
+.contact-btn {
+  border: none;
+  outline: none;
+  width: 40rpx;
+  height: 40rpx;
+  padding: 0rpx;
+  margin: 0rpx;
+  background-color: transparent;
+  display: flex;
+  align-items: center;
+  background-color: #fff;
+}
+
+.showjj{
+	
+	font-family: SourceHanSans;
+	font-size: 24rpx;
+	font-weight: normal;
+	line-height: normal;
+	letter-spacing: 0px;
+	font-variation-settings: "opsz" auto;
+	color: #9B918C;
+		display: -webkit-box; /* 使用 flex 布局 */
+	  -webkit-box-orient: vertical; /* 垂直排列 */
+	  -webkit-line-clamp: 3; /* 限制显示行数 */
+	  overflow: hidden; /* 超出部分隐藏 */
+	  text-overflow: ellipsis; /* 超出部分显示省略号 */
+}
+</style>
\ No newline at end of file
diff --git a/pages/consult/consult.vue b/pages/consult/consult.vue
new file mode 100644
index 0000000..0c83156
--- /dev/null
+++ b/pages/consult/consult.vue
@@ -0,0 +1,351 @@
+<template>
+	<view class="content">
+		<image src="/static/n-main/overlap-bg.png" style="width: 750rpx;height: 660rpx;position: absolute;z-index: 1;">
+		</image>
+		<view
+			style="display: flex;justify-content: center;flex-direction: column;position: absolute;z-index: 2;width: 750rpx;">
+			<myNav title="心理咨询" bgColor="nonoe" titleColor="#614D49" :backIcon="false" :backHome="false" :flex="false">
+			</myNav>
+
+			<scroll-view  v-if="list.length>0" :scroll-y="enableScroll" @scrolltolower="scrolltolower" class="scroll-style"
+				:style="{ height: `${showHight}rpx` }">
+				<view id="contentContainer"
+					style="display: flex;flex-direction: column;align-items: center;margin-top: 10rpx;">
+					<view class="show-card" v-for="(item,index) in list" :key="index"   @click="toDetail(item)">
+						<view style="position: relative;156rpx;height: 204rpx;">
+							<image :src="item.avatar" style="width: 156rpx;height: 204rpx;border-radius: 10rpx;"></image>
+						</view>
+						<view style="position: relative; display: flex;flex-direction: column;margin-left: 20rpx;width: 452rpx;
+						justify-content: space-between">
+							<view style="display: flex;flex-direction: column; gap: 4rpx;">
+								<text class="show-name">
+									{{item.name}}
+								</text>
+								<view style="display: flex;height: 28rpx;" v-if="item.tags&&item.tags.length==1">
+									<view class="tag">
+										<text class="tag-text">{{item.tags[0]}}</text>
+									</view>
+								</view>
+
+								<view style="display: flex;height: 28rpx;" v-if="item.tags&&item.tags.length==2">
+									<view class="tag">
+										<text class="tag-text">{{item.tags[0]}}</text>
+									</view>
+									<view class="tag" style="margin-left:20rpx;">
+										<text class="tag-text">{{item.tags[1]}}</text>
+									</view>
+								</view>
+
+								<view style="display: flex;height: 28rpx;" v-if="item.tags&&item.tags.length==3">
+									<view class="tag">
+										<text class="tag-text">{{item.tags[0]}}</text>
+									</view>
+									<view class="tag" style="margin-left:20rpx;">
+										<text class="tag-text">{{item.tags[1]}}</text>
+									</view>
+									<view class="tag" style="margin-left:20rpx;">
+										<text class="tag-text">{{item.tags[2]}}</text>
+									</view>
+								</view>
+
+								<view style="display: flex;height: 28rpx;" v-if="item.tags&&item.tags.length>=4">
+									<view class="tag">
+										<text class="tag-text">{{item.tags[0]}}</text>
+									</view>
+									<view class="tag" style="margin-left:20rpx;">
+										<text class="tag-text">{{item.tags[1]}}</text>
+									</view>
+									<view class="tag" style="margin-left:20rpx;">
+										<text class="tag-text">{{item.tags[2]}}</text>
+									</view>
+									<view class="tag" style="margin-left:20rpx;">
+										<text class="tag-text">{{item.tags[3]}}</text>
+									</view>
+								</view>
+								<text class="show-introduce" >
+									{{item.introduction}}
+								</text>
+								<!-- <text class="show-introduce">
+								擅长:婚姻家庭/情绪管理/个人成长从业15年·咨询经验3300+小小时
+							</text> -->
+							</view>
+							<view style="position: absolute; right: 10rpx; bottom: -10rpx; display: flex;justify-content: flex-end;align-items: baseline;">
+								<view>
+									<text class="momey-text">
+										¥ {{item.price/100}}
+									</text>
+									<text class="unit-text">
+										/次
+									</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+			<view v-else style="width: 750rpx;height: 60vh;display: flex;justify-content: center;align-items: center;">
+				
+				<text style="font-size: 30rpx;font-family: SourceHanSansBold;color: #EA4E2D">暂无咨询师数据</text>
+				
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref
+	} from 'vue'
+	import myNav from '@/components/my-nav.vue'
+	import {
+		urls
+	} from '@/util/apiUrl.js'
+	import dohttp from '@/util/requestConfig.js'
+	const choiceTypeCode = ref()
+
+	const types = ref([])
+
+	const choice = (item) => {
+		if (item) {
+			choiceTypeCode.value = item.code
+		} else {
+			choiceTypeCode.value = ""
+		}
+		param.value.businessScope = choiceTypeCode.value
+		param.value.pageNo = 1
+		list.value=[]
+		getPage()
+	}
+	onMounted(() => {
+		
+		getType()
+		getPage()
+
+		const systemInfo = uni.getSystemInfoSync()
+		showHight.value = (systemInfo.windowHeight * (750 / systemInfo.screenWidth)) - 180
+
+	})
+	const getType = () => {
+		dohttp.get(urls.businessScopeList).then((result) => {
+			types.value = result
+			
+			
+			let zxcode = uni.getStorageSync("zxcode")
+			if(zxcode){
+				choiceTypeCode.value = zxcode
+				uni.removeStorageSync("zxcode")
+			}
+			
+			
+		})
+	}
+
+	const param = ref({
+		businessScope: "",
+		pageNo: 1,
+		pageSize: 10
+	})
+	const totalNum = ref(0)
+	const list = ref([])
+	const getPage = () => {
+		dohttp.get(urls.doctorInfopage, param.value).then((result) => {
+			for (let i = 0; i < result.list.length; i++) {
+				if (result.list[i].consultationMethod) {
+					result.list[i].tags = result.list[i].tags.split(",")
+				}
+			}
+
+
+			list.value = result.list
+			totalNum.value = result.total
+			// 数据更新后检查高度
+			nextTick(() => {
+				checkContentHeight()
+			})
+		})
+	}
+	
+	const onShareAppMessage = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    path: '/pages/index/index', // 分享的路径
+	  };
+	};
+	 
+	const onShareTimeline = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    query: 'id=2', // 分享路径的参数
+	  };
+	};
+
+	const showHight = ref(0)
+	// 新增代码
+	import {
+		onMounted,
+		nextTick,
+		getCurrentInstance
+	} from 'vue'
+
+	const instance = getCurrentInstance()
+	const enableScroll = ref(false) // 新增动态滚动控制
+	// 新增高度检查方法
+	const checkContentHeight = () => {
+		const query = uni.createSelectorQuery().in(instance.proxy)
+		query.select('#contentContainer').boundingClientRect(rect => {
+			if (rect) {
+				// 转换为rpx比较
+				const contentHeightRpx = rect.height * (750 / uni.getSystemInfoSync().screenWidth)
+				enableScroll.value = contentHeightRpx > showHight.value
+				console.log('内容高度:', contentHeightRpx, '容器高度:', showHight.value)
+			}
+		}).exec()
+	}
+	
+	
+	const toDetail=(item)=>{
+		dohttp.navigateTo("/pages/consult-detail/consult-detail?id=" + item.id)	
+	}
+	
+	
+</script>
+
+<style scoped>
+	/* 新增关键样式 */
+	#contentContainer {
+		width: 100%;
+		min-height: 100%;
+		/* 确保内容容器撑开 */
+	}
+
+	.content {
+		width: 100vw;
+		height: 100vh;
+		background-image: url('https://miniapp.yuxingu.com.cn/yxg-mp/pic/test-list-bg.png');
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+		display: flex;
+		flex-direction: column;
+		position: relative;
+
+	}
+
+	.no-choice-text {
+		/* 按钮/按钮文本中号 */
+		font-family: SourceHanSans;
+		font-size: 32rpx;
+		font-weight: normal;
+		line-height: normal;
+		letter-spacing: 0px;
+
+		font-variation-settings: "opsz" auto;
+		/* 背景色/浅色背景2 */
+		color: #303044;
+	}
+
+	.choice-text {
+		/* 样式描述：常规大按钮 */
+		font-family: SourceHanSansBold;
+		font-size: 36rpx;
+		line-height: normal;
+		letter-spacing: 0px;
+		/* 背景色/深色大背景 */
+		color: #0F141B;
+		z-index: 0;
+	}
+
+	.choice-icon {
+		width: 80%;
+		height: 10rpx;
+		border-radius: 424rpx;
+		background: #EA4E2D;
+	}
+
+	.show-card {
+		margin-bottom: 20rpx;
+		width: 670rpx;
+		height: 244rpx;
+		border-radius: 10rpx;
+		background: #FFFFFF;
+		display: flex;
+		padding: 20rpx;
+		box-sizing: border-box;
+		justify-content: center;
+	}
+
+	.show-name {
+		/* 标题/标题三加粗 */
+		/* 样式描述：正文标题 */
+		font-family: SourceHanSansBold;
+		font-size: 28rpx;
+		line-height: normal;
+		letter-spacing: 0px;
+		font-variation-settings: "opsz" auto;
+		/* 背景色/浅色背景2 */
+		color: #614D49;
+	}
+
+	.show-introduce {
+		font-family: SourceHanSans;
+		font-size: 20rpx;
+		font-weight: normal;
+		line-height: normal;
+		letter-spacing: 0px;
+		font-variation-settings: "opsz" auto;
+		/* 正文色/正文辅助4 */
+		color: #9B918C;
+		display: -webkit-box; /* 使用 flex 布局 */
+	  -webkit-box-orient: vertical; /* 垂直排列 */
+	  -webkit-line-clamp: 3; /* 限制显示行数 */
+	  overflow: hidden; /* 超出部分隐藏 */
+	  text-overflow: ellipsis; /* 超出部分显示省略号 */
+	}
+
+
+	.tag {
+		border-radius: 60rpx;
+		opacity: 1;
+
+		/* 自动布局 */
+		display: flex;
+		padding: 2rpx 10rpx;
+		box-sizing: border-box;
+		border: 2rpx solid #EA8D7A;
+		justify-content: center;
+		align-items: center;
+
+	}
+
+	.tag-text {
+
+		/* 样式描述：辅助信息 */
+		font-family: SourceHanSans;
+		font-size: 16rpx;
+		font-weight: normal;
+		line-height: normal;
+		letter-spacing: 0rpx;
+		/* 正文色/正文色辅助3 */
+		color: #F37155;
+	}
+
+	.momey-text {
+		color: #F37155;
+		/* 标题/标题二加粗 */
+		font-family: SourceHanSansBold;
+		font-size: 36rpx;
+		font-variation-settings: "opsz" auto;
+	}
+
+	.unit-text {
+
+
+		/* 正文/正文文本小号加粗 */
+		font-family: SourceHanSans;
+		font-weight: 700;
+		font-size: 20rpx;
+		font-variation-settings: "opsz" auto;
+		color: #F37155;
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/customer-service/customer-service.vue b/pages/customer-service/customer-service.vue
new file mode 100644
index 0000000..93596f2
--- /dev/null
+++ b/pages/customer-service/customer-service.vue
@@ -0,0 +1,69 @@
+<template>
+	<view class="content">
+		<myNav title="联系客服" bgColor="#fff" titleColor="#614D49" :backIcon="true" :backHome="false" :flex="false"></myNav>
+		<view style="display: flex;flex-direction: column;align-items: center;width: 100%;height: 100%;">
+			<view style="margin-top: 176rpx;width: 590rpx;border-radius: 10px;height: 748rpx;display: flex;flex-direction: column;
+			background: linear-gradient(180deg, #ED5B3C -5%, rgba(242, 118, 91, 0.27) 53%, rgba(232, 86, 54, 0) 83%), #FFFFFF;
+			position: relative;">
+				<image src="/static/n-pc/show-word.png" style="width: 308rpx;height: 100rpx;margin-left: 40rpx;margin-top: 40rpx;"></image>
+				<text class="p-menu" style="font-family: SourceHanSans; color:  #FFFFFF; font-weight: 400; font-size: 28rpx; margin-left: 40rpx;margin-top: 10rpx;">合作联系：19308074417</text>
+				<image src="/static/n-pc/kt-icon.png" style="width: 368rpx;height: 500rpx;
+				position: absolute;top: -246.96rpx  ;right: -60rpx;"></image>
+				<view style="position: absolute;top: 198rpx;left: 40rpx;height: 510rpx;width: 510rpx;background: rgba(255, 226, 218, 0.7);border-radius: 10px;
+						display: flex;flex-direction: column; align-items: center;justify-content: center;">
+					<!-- <view style="width: 272rpx;height: 269.98rpx;background: #FFFFFF;">
+						
+					</view> -->
+					<image src="/static/n-pc/kf_code.png" style="width: 272rpx;height: 269.98rpx;background: #FFFFFF;" ></image>
+					<text class="p-menu" style="font-family: SourceHanSansBold;color: #614D49; font-size: 28rpx; margin-top: 20rpx;">扫码添加咨询顾问</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import myNav from '@/components/my-nav.vue'
+import {
+  urls
+} from '@/util/apiUrl.js'
+import dohttp from '@/util/requestConfig.js'
+
+
+
+	
+	const onShareAppMessage = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    path: '/pages/index/index', // 分享的路径
+	  };
+	};
+	 
+	const onShareTimeline = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    query: 'id=11', // 分享路径的参数
+	  };
+	};
+
+
+</script>
+
+<style scoped>
+.content {
+  width: 100vw;
+  height: 100vh;
+  background-color: #f9f8f8;
+  display: flex;
+  flex-direction: column;
+    font-family: SourceHanSans;
+  background-image: url('https://miniapp.yuxingu.com.cn/yxg-mp/pic/bg-all.png');
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+}
+
+
+
+
+</style>
diff --git a/pages/edit-userinfo/edit-userinfo.vue b/pages/edit-userinfo/edit-userinfo.vue
new file mode 100644
index 0000000..6b77222
--- /dev/null
+++ b/pages/edit-userinfo/edit-userinfo.vue
@@ -0,0 +1,178 @@
+<template>
+	<view class="content">
+		<myNav title="编辑资料" bgColor="#fff" titleColor="#614D49" :backIcon="true" :backHome="false" :flex="false"></myNav>
+		<view style="display: flex;flex-direction: column;align-items: center;padding: 40rpx;box-sizing: border-box;width: 100%;">
+			<view style="display: flex;justify-content: space-between;width: 100%;flex-direction: column;padding:58rpx 40rpx 80rpx 40rpx;
+					border-radius: 10rpx; box-sizing: border-box;background-color: #fff;">
+				<view style="display: flex;align-items: center;justify-content: space-between;">
+					<text class="p-title">头像</text>
+					<view style="display: flex;align-items: center;">
+						<button type="default" open-type="chooseAvatar"
+							style="width: 100%;background-color: #fff;text-align: right;border: none;margin-right: 0;padding-right: 10rpx;height: 95rpx;"
+							@chooseavatar="chooseavatar" plain>
+							<image v-if="showObj.avatarUrl" :src="showObj.avatarUrl" style="width: 80rpx;height: 80rpx;border-radius: 80rpx;"></image>
+							<image v-else src="/static/n-pc/head.png" style="width: 80rpx;height: 80rpx;"></image>
+						</button>
+						
+						<image src="/static/n-pc/p-left.png" style="width: 12rpx;height: 22rpx;margin-left: 22rpx;"></image>
+					</view>
+				</view>	
+				<view style="display: flex;align-items: center;justify-content: space-between;margin-top: 40rpx;">
+					<text class="p-title">昵称</text>
+					<view style="display: flex;align-items: center;">
+						<!-- <text class="p-name">微信用户</text> -->
+						<input type="nickname" style="width: 100%;background-color: #fff;text-align: right;border: none;padding-right: 10rpx;
+								font-family: 'SourceHanSans';font-size: 28rpx;color: rgba(0, 0, 0, 0.7);" v-model="showObj.nickName"
+							  placeholder-class="user-input-placeholder" @change="getNickname"></input>
+						<image src="/static/n-pc/p-left.png" style="width: 12rpx;height: 22rpx;margin-left: 22rpx;"></image>
+					</view>
+				</view>		
+					
+			</view>
+			<view style="display: flex;justify-content:center;width: 90%;flex-direction: column;height:96rpx;align-items: center;margin-top: 100rpx;
+					border-radius: 2002rpx; box-sizing: border-box;background:  linear-gradient(180deg, #E84B2A 0%, #FF846A 100%);" @click="saveUserinfo">
+					<text class="btn-text">保存</text>
+			</view>	
+		</view>
+				
+			
+	</view>
+</template>
+
+<script setup>
+import myNav from '@/components/my-nav.vue'
+import {
+  urls
+} from '@/util/apiUrl.js'
+import dohttp from '@/util/requestConfig.js'
+	const showObj=ref({
+		avatarUrl: null,
+		nickName: null
+	})
+	onLoad((option) => {
+		const userinfo = uni.getStorageSync('userinfo')
+		if(userinfo){
+			showObj.value.avatarUrl= userinfo.avatarUrl
+			showObj.value.nickName = userinfo.nickName
+			if(!showObj.value.nickName){
+				showObj.value.nickName = "微信用户"
+			}
+		}else{
+			getUserInfo()
+		}
+	})
+	const getUserInfo = () => {
+		dohttp.get(urls.getSelfInfo).then((result) => {
+			const userinfo = {
+				avatarUrl: result.avatarUrl,
+				nickName: result.nickName
+			}
+			uni.setStorageSync('userinfo', userinfo)
+			showObj.value.avatarUrl= result.avatarUrl
+			showObj.value.nickName = result.nickName
+			if(!showObj.value.nickName){
+				showObj.value.nickName = "微信用户"
+			}
+		})
+
+	}
+	
+	const chooseavatar = (result) => {
+		console.log("chooseavatarchooseavatar",result,dohttp.baseUrl + urls.upload)
+		if (result.detail.avatarUrl) {
+			uni.uploadFile({
+				url: dohttp.baseUrl + urls.upload,
+				filePath: result.detail.avatarUrl,
+				name: "file",
+				success: (res) => {
+					if (res.statusCode == 200) {
+						let data = JSON.parse(res.data)
+						showObj.value.avatarUrl = data.data
+					}
+				},
+			})
+		}
+	}
+	const getNickname = (event) => {
+		if (event.detail.value) {
+			showObj.value.nickName = event.detail.value
+		}
+	}
+	
+	const saveUserinfo = ()=>{
+		if (!showObj.value.avatarUrl) {
+			uni.showToast({
+				title: '请上传头像',
+				duration: 2000,
+				icon: "error"
+			});
+			return
+		}
+		if (!showObj.value.nickName) {
+			uni.showToast({
+				title: '请输入昵称',
+				duration: 2000,
+				icon: "error"
+			});
+			return
+		}
+		const params = {
+			nickName:showObj.value.nickName,
+			avatarUrl:showObj.value.avatarUrl
+		}
+		
+		uni.setStorageSync('userinfo', showObj.value)
+		
+		
+		dohttp.post(urls.updateUserInfo,params).then((result) => {
+      uni.showToast({
+        title: '更新成功',
+        duration: 2000,
+        icon: "success",
+		success: () => {
+		    setTimeout(() => {
+		      uni.navigateBack({
+		        delta: 1
+		      });
+		    }, 2000);
+		  }
+      });
+		})	
+		// uni.reLaunch({
+		// 	url:"/pages/index/index"
+		// })
+		
+		
+	}
+</script>
+
+<style scoped>
+.content {
+  width: 100vw;
+  height: 100vh;
+  background-color: #f9f8f8;
+  display: flex;
+  flex-direction: column;
+  font-family: SourceHanSans;
+  background-image: url('https://miniapp.yuxingu.com.cn/yxg-mp/pic/bg-all.png');
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+}
+
+.p-title{
+	font-size: 28rpx;
+	font-family: SourceHanSansBold;
+	color: #614D49;
+}
+
+.p-name{
+	font-size: 28rpx;
+	color: #9B918C;
+}
+.btn-text{
+	font-size: 36rpx;
+	font-family: SourceHanSansBold;
+	color: #FFFFFF;
+}
+</style>
diff --git a/pages/feedback/feedback.vue b/pages/feedback/feedback.vue
new file mode 100644
index 0000000..74d3c82
--- /dev/null
+++ b/pages/feedback/feedback.vue
@@ -0,0 +1,92 @@
+<template>
+	<view class="content">
+		<myNav title="意见反馈" bgColor="#fff" titleColor="#614D49" :backIcon="true" :backHome="false" :flex="false"
+			style="width: 100%;"></myNav>
+		<view style="margin-top: 40rpx;width: 670rpx;background-color: #fff;border-radius: 10rpx;padding: 20rpx;">
+			<textarea placeholder="请输入您的宝贵意见、优化建议等,可输入160字" :maxlength="160" style="width: 100%;height: 640rpx;"
+				v-model="text" />
+		</view>
+		<view @click="save" class="btn" style="margin-top: 80rpx">
+			<text class="btn-text">提交</text>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import myNav from '@/components/my-nav.vue'
+	import {
+		urls
+	} from '@/util/apiUrl.js'
+	import dohttp from '@/util/requestConfig.js'
+
+	const text = ref()
+
+	const save = async() => {
+		if (text.value) {
+			
+			const result = await getFlag()
+			if(result){
+				let params = {
+					contentText: text.value
+				}
+				dohttp.post(urls.userFeedback, params).then((result) => {
+					uni.showToast({
+						title: '提交成功',
+						duration: 1500
+					});
+				})
+			}else{
+				uni.showToast({
+					title: '提交太频繁啦,请稍后再试',
+					icon:'none',
+					duration: 1500
+				});
+			}
+			
+		}else{
+			uni.showToast({
+				title: '请输入意见反馈',
+				icon:'none',
+				duration: 1500
+			});
+		}
+
+	}
+	const getFlag = () => {
+		return dohttp.post(urls.feedbackFlag)
+	}
+</script>
+
+<style scoped>
+	.content {
+		width: 100vw;
+		height: 100vh;
+		background-color: #f9f8f8;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		font-family: SourceHanSans;
+		background-image: url('https://miniapp.yuxingu.com.cn/yxg-mp/pic/bg-all.png');
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+	}
+
+	.btn {
+		width: 550rpx;
+		height: 96rpx;
+		border-radius: 2002rpx;
+		/* 自动布局 */
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		background: linear-gradient(180deg, #E84B2A 0%, #FF846A 100%);
+	}
+
+	.btn-text {
+		font-size: 36rpx;
+		font-family: SourceHanSansBold;
+		color: #FFFFFF;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/healing-detail/active-detail.vue b/pages/healing-detail/active-detail.vue
new file mode 100644
index 0000000..35a1519
--- /dev/null
+++ b/pages/healing-detail/active-detail.vue
@@ -0,0 +1,68 @@
+<template>
+	<view class="content">
+		<myNav title="活动详情" bgColor="#fff" titleColor="#614D49" :backIcon="true" :backHome="false" :flex="false">
+		</myNav>
+		<view style="width: 100%;height: 100%;display: flex;flex-direction: column;align-items: center;overflow-y: auto;padding-bottom: 40rpx;">
+			<view style="margin: 40rpx;display: flex;width: 670rpx;flex-direction: column;align-items: center;background-color: #fff;box-sizing: border-box;
+			border-radius: 10rpx;padding: 40rpx;">
+				<text class="title">{{detail.title}}</text>
+				<rich-text style="margin-top: 40rpx; max-width: 630rpx; overflow-x: hidden;" :nodes="detail.content"></rich-text>
+			</view>
+		</view>	
+	</view>
+</template>
+
+<script setup>
+	import myNav from '@/components/my-nav.vue'
+	import {
+		urls
+	} from '@/util/apiUrl.js'
+	import dohttp from '@/util/requestConfig.js'
+	
+	const detail=ref()
+	onLoad((option) => {
+	
+		if (option && option.id) {
+			dohttp.get(urls.newDetailUrl + "?id=" + option.id).then((result) => {
+			detail.value = result
+			})
+		}
+	})
+	
+	const onShareAppMessage = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    path: '/pages/index/index', // 分享的路径
+	  };
+	};
+	 
+	const onShareTimeline = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    query: 'id=91', // 分享路径的参数
+	  };
+	};
+	
+</script>
+
+<style scoped>
+	.content {
+		width: 100vw;
+		height: 100vh;
+		background-color: #f9f8f8;
+		display: flex;
+		flex-direction: column;
+		font-family: SourceHanSans;
+		background-image: url('https://miniapp.yuxingu.com.cn/yxg-mp/pic/bg-all.png');
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+    font-family: SourceHanSans;
+	}
+	.title{
+		
+		font-size: 36rpx;
+    font-family: SourceHanSansBold;
+		
+	}
+</style>
\ No newline at end of file
diff --git a/pages/healing-detail/healing-detail.vue b/pages/healing-detail/healing-detail.vue
new file mode 100644
index 0000000..0c7c771
--- /dev/null
+++ b/pages/healing-detail/healing-detail.vue
@@ -0,0 +1,68 @@
+<template>
+	<view class="content">
+		<myNav title="疗愈详情" bgColor="#fff" titleColor="#614D49" :backIcon="true" :backHome="false" :flex="false">
+		</myNav>
+		<view style="width: 100%;height: 100%;display: flex;flex-direction: column;align-items: center;overflow-y: auto;padding-bottom: 40rpx;">
+			<view style="margin: 40rpx;display: flex;width: 670rpx;flex-direction: column;align-items: center;background-color: #fff;box-sizing: border-box;
+			border-radius: 10rpx;padding: 40rpx;">
+				<text class="title">{{detail.title}}</text>
+				<rich-text style="margin-top: 40rpx; max-width: 630rpx; overflow-x: hidden;" :nodes="detail.content"></rich-text>
+			</view>
+		</view>	
+	</view>
+</template>
+
+<script setup>
+	import myNav from '@/components/my-nav.vue'
+	import {
+		urls
+	} from '@/util/apiUrl.js'
+	import dohttp from '@/util/requestConfig.js'
+	
+	const detail =ref()
+	onLoad((option) => {
+	
+		if (option && option.id) {
+			dohttp.get(urls.newDetailUrl + "?id=" + option.id).then((result) => {
+				detail.value = result
+			})
+		}
+	})
+	
+	const onShareAppMessage = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    path: '/pages/index/index', // 分享的路径
+	  };
+	};
+	 
+	const onShareTimeline = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    query: 'id=101', // 分享路径的参数
+	  };
+	};
+	
+</script>
+
+<style scoped>
+	.content {
+		width: 100vw;
+		height: 100vh;
+		background-color: #f9f8f8;
+		display: flex;
+		flex-direction: column;
+		font-family: SourceHanSans;
+		background-image: url('https://miniapp.yuxingu.com.cn/yxg-mp/pic/bg-all.png');
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+    font-family: SourceHanSans;
+	}
+	.title{
+		
+		font-size: 36rpx;
+    font-family: SourceHanSansBold;
+		
+	}
+</style>
\ No newline at end of file
diff --git a/pages/healing/active-list.vue b/pages/healing/active-list.vue
new file mode 100644
index 0000000..ac39fd1
--- /dev/null
+++ b/pages/healing/active-list.vue
@@ -0,0 +1,204 @@
+<template>
+	<view class="content">
+		<view class="banner"></view>
+		<view class="page">
+			<myNav title="活动中心" bgColor="nonoe" titleColor="#614D49" :backIcon="true" :backHome="false" :flex="false">
+			</myNav>
+			<scroll-view :scroll-y="enableScroll" @scrolltolower="scrolltolower" class="scroll-style"
+				:style="{ height: `${showHight}rpx` }">
+				<view ref="contentRef" id="contentContainer" style="display:flex;align-items:center;flex-direction:column;margin-top: 40rpx">
+					
+					<view v-for="(item,index) in newActiveList" :key="index"
+						style="width: 670rpx;height: 300rpx;border-radius: 10rpx; background-color: #fff;margin-top: 20rpx;display: flex;flex-direction: column; align-items: flex-start;justify-content: flex-start;">
+						<view style="width: 670rpx;display: flex;flex-direction: column; align-items: flex-start;justify-content:center;" @click="toActiveDetail(item)">
+							
+							<image :src="item.showImage" style="width: 670rpx;height: 220rpx;border-top-left-radius: 10rpx;border-top-right-radius: 10rpx;"></image>
+							<text style="color: #614D49;
+							margin-left: 10rpx;
+							margin-top: 14rpx;
+								width: 650rpx;
+								display: -webkit-box;
+								  -webkit-box-orient: vertical;
+								  -webkit-line-clamp: 3;
+								  overflow: hidden;
+								  text-overflow: ellipsis;
+								  word-break: break-all;
+								font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+								font-size: 28rpx;
+								line-height: normal;
+								letter-spacing: 0px;">
+								{{item.title}}
+							</text>
+						</view>
+					</view>
+					<view v-if="newActiveList.length==0" style="margin-top: 50%;">
+						<text style="color: #614D49;
+						font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+						font-size: 28rpx;
+						line-height: normal;
+						letter-spacing: 0px;">
+								暂无活动内容
+							</text>
+					</view>
+				</view>
+
+			</scroll-view>
+
+
+
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import myNav from '@/components/my-nav.vue'
+	import {
+		urls
+	} from '@/util/apiUrl.js'
+	import dohttp from '@/util/requestConfig.js'
+
+	const newActiveList = ref([])
+
+
+	onMounted(() => {
+		getPsychicTest()
+	})
+	const getPsychicTest = () => {
+	const param = ref({
+		type: 2,
+		pageNo: 1,
+		pageSize: 10
+	})
+		dohttp.get(urls.newPageUrl, param.value).then((result) => {
+			newActiveList.value = result.list
+			// 确保图片加载完成
+			nextTick(() => {
+				setTimeout(() => {
+					checkContentHeight()
+					// 添加重试机制
+					if (!enableScroll.value) setTimeout(checkContentHeight, 500)
+				}, 300)
+			})
+		})
+	}
+
+
+	const toActiveDetail = (item) => {
+
+		dohttp.navigateTo("/pages/healing-detail/active-detail?id=" + item.id)
+
+	}
+
+	// 新增代码
+	import {
+		ref,
+		onMounted,
+		nextTick,
+		getCurrentInstance
+	} from 'vue'
+	const showHight = ref(0)
+	const instance = getCurrentInstance()
+	const enableScroll = ref(false) // 新增动态滚动控制
+	onLoad(() => {
+		const systemInfo = uni.getSystemInfoSync()
+		// 更精准的高度计算
+		showHight.value = (systemInfo.windowHeight * (750 / systemInfo.screenWidth)) - 200
+	})
+
+
+	// 新增高度检查方法
+	const checkContentHeight = () => {
+		const query = uni.createSelectorQuery().in(instance.proxy)
+		query.select('#contentContainer').boundingClientRect(rect => {
+			if (rect) {
+				const systemInfo = uni.getSystemInfoSync()
+
+				// 转换为rpx比较
+				// 计算容器实际像素高度
+				const containerHeightPx = (showHight.value * systemInfo.screenWidth) / 750
+				const threshold = 5 // 容错阈值
+
+				enableScroll.value = rect.height > (containerHeightPx + threshold)
+				console.log('[Layout Debug]', {
+					contentHeight: rect.height,
+					containerPx: containerHeightPx,
+					containerRpx: showHight.value,
+					shouldScroll: enableScroll.value
+				})
+			}
+		}).exec()
+	}
+	
+	const onShareAppMessage = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    path: '/pages/index/index', // 分享的路径
+	  };
+	};
+	 
+	const onShareTimeline = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    query: 'id=9', // 分享路径的参数
+	  };
+	};
+
+	// 初始加载检查
+	onMounted(() => {
+		nextTick(checkContentHeight)
+	})
+</script>
+
+<style scoped>
+	.content {
+		width: 100vw;
+		height: 100vh;
+		background-image: url('https://miniapp.yuxingu.com.cn/yxg-mp/pic/test-list-bg.png');
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+		display: flex;
+		flex-direction: column;
+		position: relative;
+	}
+
+	.page {
+		position: absolute;
+		width: 100vw;
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.banner {
+		background-image: url('https://miniapp.yuxingu.com.cn/yxg-mp/pic/botton.png');
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+		width: 750rpx;
+		height: 660rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		z-index: 0;
+	}
+
+	/* 修改 #contentContainer 样式 */
+	#contentContainer {
+		width: 100%;
+		min-height: 100%;
+		/* 新增关键属性 */
+		flex-shrink: 0;
+		/* 禁止收缩 */
+		overflow: visible;
+		/* 确保子元素不被裁剪 */
+	}
+
+	.scroll-style {
+		box-sizing: border-box;
+		padding: 0 !important;
+		/* 清除可能的内边距 */
+	}
+</style>
\ No newline at end of file
diff --git a/pages/healing/healing-list.vue b/pages/healing/healing-list.vue
new file mode 100644
index 0000000..328391b
--- /dev/null
+++ b/pages/healing/healing-list.vue
@@ -0,0 +1,201 @@
+<template>
+	<view class="content">
+		<view class="banner"></view>
+		<view class="page">
+			<myNav title="艺术疗愈" bgColor="nonoe" titleColor="#614D49" :backIcon="true" :backHome="false" :flex="false">
+			</myNav>
+			<scroll-view :scroll-y="enableScroll" @scrolltolower="scrolltolower" class="scroll-style"
+				:style="{ height: `${showHight}rpx` }">
+				<view ref="contentRef" id="contentContainer" style="display:flex;align-items:center; flex-direction:column;margin-top: 40rpx">
+					
+					<view v-for="(item,index) in newHealingList" :key="index"
+				style="width: 670rpx;height: 196rpx;background-color: #fff;margin-top: 14rpx;display: flex;flex-direction: column; align-items: center;justify-content: center;border-radius: 10rpx;">
+				<view style="width: 630rpx;display: flex;flex-direction: row; align-items: center;justify-content:space-between;" @click="toHealingDetail(item)">
+					<text style="color: #614D49;
+						width: 350rpx;
+						display: -webkit-box;
+						  -webkit-box-orient: vertical;
+						  -webkit-line-clamp: 3;
+						  overflow: hidden;
+						  text-overflow: ellipsis;
+						  word-break: break-all;
+						font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+						font-size: 28rpx;
+						line-height: normal;
+						letter-spacing: 0px;">
+						{{item.title}}
+					</text>
+					<image :src="item.showImage" style="width: 200rpx;height: 156rpx;border-radius: 10rpx;"></image>
+				</view>
+			</view>
+					<view v-if="newHealingList.length==0" style="">
+						<text style="color: #614D49;
+						font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+						font-size: 28rpx;
+						line-height: normal;
+						letter-spacing: 0px;">
+								暂无疗愈内容
+							</text>
+					</view>
+				</view>
+
+			</scroll-view>
+
+
+
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import myNav from '@/components/my-nav.vue'
+	import {
+		urls
+	} from '@/util/apiUrl.js'
+	import dohttp from '@/util/requestConfig.js'
+
+	const newHealingList = ref([])
+
+
+	onMounted(() => {
+		getPsychicTest()
+	})
+	const getPsychicTest = () => {
+	const param = ref({
+		type: 1,
+		pageNo: 1,
+		pageSize: 10
+	})
+		dohttp.get(urls.newPageUrl, param.value).then((result) => {
+			newHealingList.value = result.list
+			// 确保图片加载完成
+			nextTick(() => {
+				setTimeout(() => {
+					checkContentHeight()
+					// 添加重试机制
+					if (!enableScroll.value) setTimeout(checkContentHeight, 500)
+				}, 300)
+			})
+		})
+	}
+
+
+	const toHealingDetail = (item) => {
+
+		dohttp.navigateTo("/pages/healing-detail/healing-detail?id=" + item.id)
+
+	}
+
+	// 新增代码
+	import {
+		ref,
+		onMounted,
+		nextTick,
+		getCurrentInstance
+	} from 'vue'
+	const showHight = ref(0)
+	const instance = getCurrentInstance()
+	const enableScroll = ref(false) // 新增动态滚动控制
+	onLoad(() => {
+		const systemInfo = uni.getSystemInfoSync()
+		// 更精准的高度计算
+		showHight.value = (systemInfo.windowHeight * (750 / systemInfo.screenWidth)) - 200
+	})
+
+
+	// 新增高度检查方法
+	const checkContentHeight = () => {
+		const query = uni.createSelectorQuery().in(instance.proxy)
+		query.select('#contentContainer').boundingClientRect(rect => {
+			if (rect) {
+				const systemInfo = uni.getSystemInfoSync()
+
+				// 转换为rpx比较
+				// 计算容器实际像素高度
+				const containerHeightPx = (showHight.value * systemInfo.screenWidth) / 750
+				const threshold = 5 // 容错阈值
+
+				enableScroll.value = rect.height > (containerHeightPx + threshold)
+				console.log('[Layout Debug]', {
+					contentHeight: rect.height,
+					containerPx: containerHeightPx,
+					containerRpx: showHight.value,
+					shouldScroll: enableScroll.value
+				})
+			}
+		}).exec()
+	}
+	
+	const onShareAppMessage = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    path: '/pages/index/index', // 分享的路径
+	  };
+	};
+	 
+	const onShareTimeline = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    query: 'id=10', // 分享路径的参数
+	  };
+	};
+
+	// 初始加载检查
+	onMounted(() => {
+		nextTick(checkContentHeight)
+	})
+</script>
+
+<style scoped>
+	.content {
+		width: 100vw;
+		height: 100vh;
+		background-image: url('https://miniapp.yuxingu.com.cn/yxg-mp/pic/test-list-bg.png');
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+		display: flex;
+		flex-direction: column;
+		position: relative;
+	}
+
+	.page {
+		position: absolute;
+		width: 100vw;
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.banner {
+		background-image: url('https://miniapp.yuxingu.com.cn/yxg-mp/pic/botton.png');
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+		width: 750rpx;
+		height: 660rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		z-index: 0;
+	}
+
+	/* 修改 #contentContainer 样式 */
+	#contentContainer {
+		width: 100%;
+		min-height: 100%;
+		/* 新增关键属性 */
+		flex-shrink: 0;
+		/* 禁止收缩 */
+		overflow: visible;
+		/* 确保子元素不被裁剪 */
+	}
+
+	.scroll-style {
+		box-sizing: border-box;
+		padding: 0 !important;
+		/* 清除可能的内边距 */
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
new file mode 100644
index 0000000..aff8da5
--- /dev/null
+++ b/pages/index/index.vue
@@ -0,0 +1,789 @@
+<template>
+	<view class="content">
+
+		<view class="banner">
+			<view style="width: 750rpx;margin-top: 18px;"></view>
+			<myNav title="愈心谷" bgColor="nonoe" titleColor="#D1502B" :isJcenter="true" :backIcon="false" :backHome="false"
+				:flex="false"></myNav>
+
+			<view style="width: 670rpx;height: 296rpx;margin-top: 20px;">
+				<uni-swiper-dot :info="banners" mode="default" :current="current" :dots-styles="dotsStyles">
+					<swiper class="swiper" @change="change" next-margin="-90rpx" style="width: 670rpx;height: 296rpx;">
+						<swiper-item v-for="(item,index) in banners" :key="index">
+							<view class="swiper-item uni-bg-red" style="width: 670rpx;height: 256rpx;">
+								<image :src="item.bannerImage" mode="widthFix"
+									style="width: 670rpx;border-radius: 10rpx;"
+									@click="showBanner(item)">
+								</image>
+							</view>
+						</swiper-item>
+					</swiper>
+				</uni-swiper-dot>
+			</view>
+			<view
+				style="width: 670rpx;display: flex;justify-content: space-between;align-items: center;margin-top: 20rpx;">
+				<!-- 左边部分 -->
+				<view style="width: 324rpx;height: 168rpx;border-radius: 10rpx;
+				background: linear-gradient(180deg, #FFE6DF 2%, #FCF3EA 100%);
+				box-sizing: border-box;
+				display: flex;
+				" @click="toTestList">
+					<view style="display: flex;flex-direction: column;margin-top: 26rpx;">
+						<text style="margin-left: 26rpx;color: #614D49;
+						font-family: SourceHanSansBold;font-variation-settings: 'opsz' auto;
+						font-size: 30rpx;
+						line-height: normal;
+						letter-spacing: 0px;">
+							心理测评
+						</text>
+						<text style="margin-left: 26rpx;color: #B88973;
+												font-family: SourceHanSans;ont-variation-settings: 'opsz' auto;
+						font-size: 24rpx;
+						font-weight: normal;
+						line-height: normal;
+						letter-spacing: 0px;">
+							探寻自我
+						</text>
+					</view>
+					<image src="/static/n-main/left.png"
+						style="margin-top:50rpx;width: 90rpx;margin-left: 70rpx;height: 90rpx;"></image>
+				</view>
+				<!-- 右边部分 -->
+				<view style="width: 324rpx;height: 168rpx;border-radius: 10rpx;
+				background: linear-gradient(180deg, #FFE6DF 2%, #FCF3EA 100%);
+				box-sizing: border-box;
+				display: flex;
+				" @click="toZxList">
+					<view style="display: flex;flex-direction: column;margin-top: 26rpx;">
+						<text style="margin-left: 26rpx;color: #614D49;
+						font-family: SourceHanSansBold;font-variation-settings: 'opsz' auto;
+						font-size: 30rpx;
+						line-height: normal;
+						letter-spacing: 0px;">
+							心理咨询
+						</text>
+						<text style="margin-left: 26rpx;color: #B88973;
+												font-family: SourceHanSans;ont-variation-settings: 'opsz' auto;
+						font-size: 24rpx;
+						font-weight: normal;
+						line-height: normal;
+						letter-spacing: 0px;">
+							严选咨询师
+						</text>
+					</view>
+					<image src="/static/n-main/right.png"
+						style="margin-top:58rpx;width: 82rpx;margin-left: 70rpx;height: 82rpx;"></image>
+				</view>
+			</view>
+
+		</view>
+		
+		
+		
+		
+		<view
+			style="width: 750rpx;border-radius: 32rpx 32rpx 0rpx 0rpx;margin-top: 60rpx;
+		opacity: 1;<!-- background: linear-gradient(270deg, rgba(255, 255, 255, 0) 0%, #FFF4C7 100%); -->display: flex;flex-direction: column;">
+			<view style="display: flex;margin-top: 16rpx;margin-left: 40rpx; align-items: center;">
+				<text style="margin-left: 8rpx;color: #614D49;
+									font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+			font-size: 32rpx;
+			line-height: normal;
+			letter-spacing: 0px;">
+					艺术疗愈
+				</text>
+		
+				<view style="display: flex;margin-left: 442rpx;align-items: center;" @click="toHealingView">
+					<text style="color: #9B918C;
+										font-family: SourceHanSans;ont-variation-settings: 'opsz' auto;
+				font-size: 24rpx;
+				font-weight: normal;
+				line-height: normal;
+				letter-spacing: 0px;">
+						更多
+					</text>
+					<image src="/static/n-main/to-right.png" style="width: 12rpx;height: 20rpx; margin-left: 10rpx;"></image>
+				</view>
+			</view>
+		</view>
+		
+		<view style="width: 750rpx;display: flex;flex-direction: column;align-items: center;
+			display: flex; border-radius: 32rpx;">
+			<view style="width: 670rpx;margin-top: 6rpx;display: flex;align-items: center;justify-content: space-between;">
+			</view>
+			<view v-for="(item,index) in newHealingList" :key="index"
+				style="width: 750rpx;height: 196rpx;background-color: #fff;margin-top: 14rpx;display: flex;flex-direction: column; align-items: center;justify-content: center;">
+				<view style="width: 670rpx;display: flex;flex-direction: row; align-items: center;justify-content:space-between;" @click="toHealingDetail(item)">
+					<text style="color: #614D49;
+						width: 350rpx;
+						display: -webkit-box;
+						  -webkit-box-orient: vertical;
+						  -webkit-line-clamp: 3;
+						  overflow: hidden;
+						  text-overflow: ellipsis;
+						  word-break: break-all;
+						font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+						font-size: 28rpx;
+						line-height: normal;
+						letter-spacing: 0px;">
+						{{item.title}}
+					</text>
+					<image :src="item.showImage" style="width: 200rpx;height: 156rpx;border-radius: 10rpx;"></image>
+				</view>
+			</view>
+			<view v-if="newHealingList.length==0" >
+				<text style="color: #9B918C;
+				font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+				font-size: 28rpx;
+				line-height: normal;
+				letter-spacing: 0px;">暂无疗愈内容</text>
+			</view>
+		</view>
+		
+		<view
+			style="width: 750rpx;border-radius: 32rpx 32rpx 0rpx 0rpx;margin-top: 20rpx;
+		opacity: 1;<!-- background: linear-gradient(270deg, rgba(255, 255, 255, 0) 0%, #FFF4C7 100%); -->display: flex;flex-direction: column;">
+			<view style="display: flex;margin-top: 16rpx;margin-left: 40rpx; align-items: center;">
+				<text style="margin-left: 8rpx;color: #614D49;
+									font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+			font-size: 32rpx;
+			line-height: normal;
+			letter-spacing: 0px;">
+					活动中心
+				</text>
+		
+				<view style="display: flex;margin-left: 442rpx;align-items: center;" @click="toActiveView">
+					<text style="color: #9B918C;
+										font-family: SourceHanSans;ont-variation-settings: 'opsz' auto;
+				font-size: 24rpx;
+				font-weight: normal;
+				line-height: normal;
+				letter-spacing: 0px;">
+						更多
+					</text>
+					<image src="/static/n-main/to-right.png" style="width: 12rpx;height: 20rpx; margin-left: 10rpx;"></image>
+				</view>
+			</view>
+		</view>
+		
+		
+		<view style="width: 750rpx;display: flex;flex-direction: column;align-items: center;
+			display: flex;background-color: transparent;border-radius: 32rpx;">
+			<view style="width: 670rpx;margin-top: 10rpx;display: flex;align-items: center;justify-content: space-between;">
+			</view>
+			<view v-for="(item,index) in newActivityList" :key="index"
+				style="width: 670rpx; height: 300rpx;background-color: #fff;border-radius: 10rpx; margin-top: 14rpx;display: flex;flex-direction: column; align-items: flex-start;justify-content: flex-start;">
+				<image :src="item.showImage" style="width: 670rpx;height: 220rpx;border-top-right-radius: 10rpx;border-top-left-radius: 10rpx;" @click="toActiveDetail(item)"></image>
+				<view style="display: flex;flex-direction: column;margin-left: 20rpx;">
+					<text style="color: #614D49;
+					width: 670rpx;
+						display: -webkit-box;
+						  -webkit-box-orient: vertical;
+						  -webkit-line-clamp: 1;
+						  overflow: hidden;
+						  text-overflow: ellipsis;
+						  word-break: break-all;
+				font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+				margin-top: 20rpx;
+				font-size: 28rpx;
+				font-weight: 400;
+				line-height: normal;
+				letter-spacing: 0px;">
+						{{item.title}}
+					</text>
+				</view>
+			</view>
+			<view v-if="newActivityList.length==0" >
+				<text style="color: #9B918C;
+				font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+				font-size: 28rpx;
+				line-height: normal;
+				letter-spacing: 0px;">暂无活动内容</text>
+			</view>
+		</view>
+		
+		<view
+			style="width: 750rpx;border-radius: 32rpx 32rpx 0rpx 0rpx;margin-top: 20rpx;
+			opacity: 1;<!-- background: linear-gradient(270deg, rgba(255, 255, 255, 0) 0%, #FFF4C7 100%); -->display: flex;flex-direction: column;">
+			<view style="display: flex;margin-top: 16rpx;margin-left: 40rpx;align-items: center;">
+				<text style="margin-left: 8rpx;color: #614D49;
+										font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+				font-size: 32rpx;
+				line-height: normal;
+				letter-spacing: 0px;">
+					经典必测
+				</text>
+				<view style="display: flex;margin-left: 442rpx;align-items: center;" @click="toTestList">
+					<text style="color: #9B918C;
+										font-family: SourceHanSans;ont-variation-settings: 'opsz' auto;
+				font-size: 24rpx;
+				font-weight: normal;
+				line-height: normal;
+				letter-spacing: 0px;">
+						更多
+					</text>
+					<image src="/static/n-main/to-right.png" style="width: 12rpx;height: 20rpx; margin-left: 10rpx;"></image>
+				</view>
+			</view>
+		</view>
+		<view style="width: 670rpx;margin-left: 40rpx; display: flex;flex-direction: column;align-items: center;
+			display: flex;background-color: transparent;border-radius: 32rpx;">
+			<view style="width: 670rpx;margin-top: 6rpx;display: flex;align-items: center;justify-content: space-between;">
+			</view>
+			<!-- 个人测评 -->
+			<view v-for="(item,index) in testList" :key="index"
+				style="width: 650rpx;background-color: #fff;border-radius: 10rpx; padding: 20rpx; margin-top: 14rpx;display: flex;align-items: center;justify-content: space-between;">
+				<view style="display: flex;">
+					<image :src="item.testPic" style="width: 140rpx;height: 140rpx;border-radius: 10rpx;"></image>
+					<view style="display: flex;flex-direction: column;margin-left: 20rpx;">
+						<text style="color: #614D49;
+					font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+					font-size: 28rpx;
+					line-height: normal;
+					letter-spacing: 0px;">
+							{{item.testName}}
+						</text>
+						<view style="margin-top: 8rpx;display: flex;align-items: center;">
+							
+									<view style="width: fit-content;margin-left: 10rpx;
+								border-radius: 32rpx;
+								display: flex;
+								text-align: center;
+								justify-content: center;
+								padding-top: 4rpx;
+								padding-bottom: 4rpx;
+								padding-left: 10rpx;
+								padding-right: 10rpx;
+								border: 1px solid #EA8D7A;">
+										<text style="color: #F37155;
+							font-family: SourceHanSans;ont-variation-settings: 'opsz' auto;
+							font-size: 20rpx;
+							font-weight: normal;
+							letter-spacing: 0px;">
+											{{item.showNum}}人已测
+										</text>
+									</view>
+
+						</view>
+
+						<text style="color: #9B918C;margin-top: 26rpx;
+					font-family: SourceHanSans;ont-variation-settings: 'opsz' auto;
+					font-size: 20rpx;
+					font-weight: normal;
+					line-height: normal;
+					letter-spacing: 0px;">
+							{{item.subTitle}}
+						</text>
+
+					</view>
+				</view>
+				<view @click="goTest(item)" style="width:fit-content;
+					height: fit-content;
+					border-radius: 2002rpx;
+					opacity: 1;
+					display: flex;
+					padding: 8rpx 40rpx;justify-content: center;align-items: center;
+					background: linear-gradient(180deg, #E84B2A 0%, #FF846A 100%);">
+					<text style="color: #FFFFFF;
+					font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+					font-size: 28rpx;
+					line-height: normal;
+					letter-spacing: 0px;">
+						测评
+					</text>
+				</view>
+			</view>
+			<view v-if="testList.length==0" >
+				<text style="color: #9B918C;
+				font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+				font-size: 28rpx;
+				line-height: normal;
+				letter-spacing: 0px;">
+						暂无测评信息
+					</text>
+			</view>
+
+
+		</view>
+
+
+		<view
+			style="width: 750rpx;border-radius: 32rpx 32rpx 0rpx 0rpx;margin-top: 20rpx;
+		opacity: 1;<!-- background: linear-gradient(270deg, rgba(255, 255, 255, 0) 0%, #FFF4C7 100%); -->display: flex;flex-direction: column;">
+			<view style="display: flex;margin-top: 16rpx;margin-left: 40rpx; align-items: center;">
+				<text style="margin-left: 8rpx;color: #614D49;
+									font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+			font-size: 32rpx;
+			line-height: normal;
+			letter-spacing: 0px;">
+					咨询推荐
+				</text>
+
+				<view style="display: flex;margin-left: 442rpx;align-items: center;" @click="toZxList">
+					<text style="color: #9B918C;
+										font-family: SourceHanSans;ont-variation-settings: 'opsz' auto;
+				font-size: 24rpx;
+				font-weight: normal;
+				line-height: normal;
+				letter-spacing: 0px;">
+						更多
+					</text>
+					<image src="/static/n-main/to-right.png" style="width: 12rpx;height: 20rpx; margin-left: 10rpx;"></image>
+				</view>
+			</view>
+		</view>
+
+		
+		<view style="width: 750rpx;display: flex;flex-direction: column;align-items: center;
+			display: flex;background-color: transparent;
+			padding-bottom: 15rpx;border-radius: 10rpx;">
+			<view style="width: 670rpx;margin-top: 6rpx;display: flex;align-items: center;justify-content: space-between;">
+			</view>
+					<view class="show-card" v-for="(item,index) in consultList" :key="index"   @click="toDetail(item)">
+						<view style="position: relative;height: 204rpx;">
+							<image :src="item.avatar" style="width: 156rpx;height: 204rpx;border-radius: 10rpx;"></image>
+						</view>
+						<view style="position: relative; display: flex;flex-direction: column;margin-left: 20rpx;width: 452rpx;
+						justify-content: space-between">
+							<view style="display: flex;flex-direction: column; gap: 4rpx;">
+								<text class="show-name">
+									{{item.name}}
+								</text>
+								<view style="display: flex;height: 28rpx;" v-if="item.tags&&item.tags.length==1">
+									<view class="tag">
+										<text class="tag-text">{{item.tags[0]}}</text>
+									</view>
+								</view>
+
+								<view style="display: flex;height: 28rpx;" v-if="item.tags&&item.tags.length==2">
+									<view class="tag">
+										<text class="tag-text">{{item.tags[0]}}</text>
+									</view>
+									<view class="tag" style="margin-left:20rpx;">
+										<text class="tag-text">{{item.tags[1]}}</text>
+									</view>
+								</view>
+
+								<view style="display: flex;height: 28rpx;" v-if="item.tags&&item.tags.length==3">
+									<view class="tag">
+										<text class="tag-text">{{item.tags[0]}}</text>
+									</view>
+									<view class="tag" style="margin-left:20rpx;">
+										<text class="tag-text">{{item.tags[1]}}</text>
+									</view>
+									<view class="tag" style="margin-left:20rpx;">
+										<text class="tag-text">{{item.tags[2]}}</text>
+									</view>
+								</view>
+
+								<view style="display: flex;height: 28rpx;" v-if="item.tags&&item.tags.length>=4">
+									<view class="tag">
+										<text class="tag-text">{{item.tags[0]}}</text>
+									</view>
+									<view class="tag" style="margin-left:20rpx;">
+										<text class="tag-text">{{item.tags[1]}}</text>
+									</view>
+									<view class="tag" style="margin-left:20rpx;">
+										<text class="tag-text">{{item.tags[2]}}</text>
+									</view>
+									<view class="tag" style="margin-left:20rpx;">
+										<text class="tag-text">{{item.tags[3]}}</text>
+									</view>
+								</view>
+								<text class="show-introduce" >
+									{{item.introduction}}
+								</text>
+								<!-- <text class="show-introduce">
+								擅长:婚姻家庭/情绪管理/个人成长从业15年·咨询经验3300+小小时
+							</text> -->
+							</view>
+							<view style="position: absolute; right: 10rpx; bottom: -10rpx; display: flex;justify-content: flex-end;align-items: baseline;">
+								<view>
+									<text class="momey-text">
+										¥ {{item.price/100}}
+									</text>
+									<text class="unit-text">
+										/次
+									</text>
+								</view>
+							</view>
+						</view>
+					</view>
+			<view v-if="consultList.length==0" >
+				<text style="color: #9B918C;
+				font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+				font-size: 28rpx;
+				line-height: normal;
+				letter-spacing: 0px;">
+						暂无推荐信息
+					</text>
+			</view>
+				</view>
+		<web-view v-if="showWebView" :src="externalUrl"></web-view>
+	</view>
+</template>
+
+<script setup>
+	import myNav from '@/components/my-nav.vue'
+	import {
+		urls
+	} from '@/util/apiUrl.js'
+	import dohttp from '@/util/requestConfig.js'
+
+	const banners = ref([])
+	const testList = ref([])
+	const consultList = ref([])
+	const newHealingList = ref([])
+	const newActivityList = ref([])
+	const showWebView = ref(false)
+	const externalUrl = ref()
+	const dotsStyles = ref({
+		backgroundColor: 'rgba(96, 98, 113, 1)',
+		border: '1px rgba(96, 98, 113, 1) solid',
+		color: '#fff',
+		selectedBackgroundColor: 'rgba(231, 86, 55, 1)',
+		selectedBorder: '1px rgba(231, 86, 55, 1) solid'
+	})
+	const current = ref(0)
+	const change = (e) => {
+			current.value = e.detail.current
+		}
+		const showBanner = (item) => {
+			if (item.jumpType == 1) {
+				uni.navigateTo({
+					"url": "/pages/show-banner/show-banner?url=" + item.clickUrl,
+					"animationType": "pop-in"
+				})
+			} else {
+				uni.showModal({
+					title: '跳转异常',
+					content: '该banner跳转方式不正确，请稍后再试',
+					showCancel: false,
+					success: function(res) {
+						if (res.confirm) {
+
+						}
+					}
+				})
+			}
+
+
+		}
+
+	
+	const onShareAppMessage = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    path: '/pages/index/index', // 分享的路径
+	  };
+	};
+	 
+	const onShareTimeline = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    query: 'id=1', // 分享路径的参数
+	  };
+	};
+	onLoad(() => {
+
+
+	})
+	onMounted(() => {
+		getBanner()
+		getPsychicTest()
+		getConsult()
+		getNewsHealingPage()
+		getNewActivityPage()
+	})
+
+	const getNewsHealingPage = ()=> {
+	const param = ref({
+		type: 1,
+		pageNo: 1,
+		pageSize: 100,
+		showMain: 1
+	})
+		dohttp.get(urls.newPageUrl, param.value).then((result) => {
+			newHealingList.value = result.list
+		})
+	}
+
+	const getNewActivityPage = ()=> {
+	const param = ref({
+		type: 2,
+		pageNo: 1,
+		pageSize: 100,
+		showMain: 1
+	})
+		dohttp.get(urls.newPageUrl, param.value).then((result) => {
+			newActivityList.value = result.list
+		})
+	}
+	
+	const toTuTest=()=>{
+		
+		 const externalUrl = 'https://cps.jsbr.org.cn/login.html';
+		      uni.navigateTo({
+		        url: `/pages/webview-page/webview-page?url=${encodeURIComponent(externalUrl)}`
+		      });
+		
+		
+	}
+	
+	const toHealingDetail=(item)=>{
+		dohttp.navigateTo("/pages/healing-detail/healing-detail?id=" + item.id)
+	}
+	
+	const toActiveDetail=(item)=>{
+		dohttp.navigateTo("/pages/healing-detail/active-detail?id=" + item.id)
+	}
+	
+
+	const goTest = (item) => {
+
+		dohttp.navigateTo("/pages/test-detail/test-detail?id=" + item.id)
+
+	}
+	
+	const toDetail=(item)=>{
+		dohttp.navigateTo("/pages/consult-detail/consult-detail?id=" + item.id)	
+	}
+
+	const getConsult = ()=> {
+	const param = ref({
+		businessScope: "",
+		pageNo: 1,
+		pageSize: 100,
+		isTop: 1
+	})
+		dohttp.get(urls.doctorInfopage, param.value).then((result) => {
+			for (let i = 0; i < result.list.length; i++) {
+				if (result.list[i].consultationMethod) {
+					result.list[i].tags = result.list[i].tags.split(",")
+				}
+			}
+			consultList.value = result.list
+		})
+	}
+
+
+	const getBanner = () => {
+		dohttp.post(urls.getBanner).then((result) => {
+			banners.value = result
+		})
+
+	}
+
+	const getPsychicTest = () => {
+		dohttp.post(urls.getPsychicListTest +'?showMain=1').then((result) => {
+			console.log("getPsychicTestgetPsychicTestgetPsychicTest", result)
+			if (result) {
+				result.forEach((ele) => {
+					if (ele.totalNum && Number(ele.totalNum) >= 10000) {
+
+						ele.showNum = (Number(ele.totalNum) / 10000).toFixed(1) + "W"
+
+					} else {
+						ele.showNum = ele.totalNum
+					}
+				})
+			}
+			testList.value = result
+		})
+	}
+
+	const toTestList = () => {
+		uni.switchTab({
+			"url": "/pages/test-list/test-list",
+			"animationType": "pop-in"
+		})
+	}
+	
+	const toActiveView = ()=> {
+		uni.navigateTo({
+			"url": "/pages/healing/active-list",
+			"animationType": "pop-in"
+		})
+	}
+	
+	const toHealingView = ()=> {
+		uni.navigateTo({
+			"url": "/pages/healing/healing-list",
+			"animationType": "pop-in"
+		})
+	}
+	
+	const toZxList = (params) => {
+		if (params) {
+			uni.setStorageSync("zxcode", params)
+		}
+		uni.switchTab({
+			"url": "/pages/consult/consult",
+			"animationType": "pop-in"
+		})
+	}
+</script>
+
+<style scoped>
+	.content {
+
+		width: 100vw;
+		background-color: #F9F6F5;
+		display: flex;
+		flex-direction: column;
+		overflow-y: auto;
+	}
+
+	.banner {
+		background-image: url('https://miniapp.yuxingu.com.cn/yxg-mp/pic/botton.png');
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+		width: 750rpx;
+		height: 660rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+
+
+	.choce-view {
+		display: flex;
+		justify-content: center;
+		margin-top: 20rpx;
+
+	}
+
+	.choce-view-inner {
+		display: flex;
+		justify-content: center;
+		width: 696rpx;
+		justify-content: space-between;
+	}
+
+	.choice-inner-left {
+		width: 340rpx;
+		height: 190rpx;
+		background-image: url('https://miniapp.yuxingu.com.cn/yxg-mp/pic/main_left.png');
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+		display: flex;
+	}
+
+	.choice-inner-right {
+		width: 340rpx;
+		height: 190rpx;
+		background-image: url('https://miniapp.yuxingu.com.cn/yxg-mp/pic/main_right.png');
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+		display: flex;
+	}
+
+	.choice-inner-text {
+		font-family: SourceHanSansBold;
+		font-size: 44rpx;
+		margin-left: 28rpx;
+		margin-top: 35rpx;
+		letter-spacing: 2rpx;
+	}
+
+	.bottom-view {
+		display: flex;
+		justify-content: center;
+		width: 100%;
+		margin-top: 40rpx;
+
+	}
+	
+
+	.show-card {
+		margin-top: 14rpx;
+		width: 670rpx;
+		height: 244rpx;
+		border-radius: 10rpx;
+		background: #FFFFFF;
+		display: flex;
+		padding: 20rpx;
+		box-sizing: border-box;
+		justify-content: center;
+	}
+
+	.show-name {
+		/* 标题/标题三加粗 */
+		/* 样式描述：正文标题 */
+		font-family: SourceHanSansBold;
+		font-size: 28rpx;
+		line-height: normal;
+		letter-spacing: 0px;
+		font-variation-settings: "opsz" auto;
+		/* 背景色/浅色背景2 */
+		color: #614D49;
+	}
+
+	.show-introduce {
+		font-family: SourceHanSans;
+		font-size: 20rpx;
+		font-weight: normal;
+		line-height: normal;
+		letter-spacing: 0px;
+		font-variation-settings: "opsz" auto;
+		/* 正文色/正文辅助4 */
+		color: #9B918C;
+		display: -webkit-box; /* 使用 flex 布局 */
+	  -webkit-box-orient: vertical; /* 垂直排列 */
+	  -webkit-line-clamp: 3; /* 限制显示行数 */
+	  overflow: hidden; /* 超出部分隐藏 */
+	  text-overflow: ellipsis; /* 超出部分显示省略号 */
+	}
+
+
+	.momey-text {
+		color: #F37155;
+		/* 标题/标题二加粗 */
+		font-family: SourceHanSansBold;
+		font-size: 36rpx;
+		font-variation-settings: "opsz" auto;
+	}
+
+	.unit-text {
+
+
+		/* 正文/正文文本小号加粗 */
+		font-family: SourceHanSans;
+		font-weight: 700;
+		font-size: 20rpx;
+		font-variation-settings: "opsz" auto;
+		color: #F37155;
+
+	}
+
+
+	.tag {
+		border-radius: 60rpx;
+		opacity: 1;
+
+		/* 自动布局 */
+		display: flex;
+		padding: 2rpx 10rpx;
+		box-sizing: border-box;
+		border: 2rpx solid #EA8D7A;
+		justify-content: center;
+		align-items: center;
+
+	}
+
+	.tag-text {
+
+		/* 样式描述：辅助信息 */
+		font-family: SourceHanSans;
+		font-size: 16rpx;
+		font-weight: normal;
+		line-height: normal;
+		letter-spacing: 0rpx;
+		/* 正文色/正文色辅助3 */
+		color: #F37155;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/login-pop/login-pop.vue b/pages/login-pop/login-pop.vue
new file mode 100644
index 0000000..d9e30ec
--- /dev/null
+++ b/pages/login-pop/login-pop.vue
@@ -0,0 +1,285 @@
+<template>
+	<view class="content">
+		<!-- <myNav title="愈心谷" bgColor="nonoe" titleColor="#000" :isJcenter="true" :backIcon="false" :backHome="false"
+				:flex="false"></myNav> -->
+		<image src="/static/n-login/login-title.png"
+			style="margin-top: 256rpx;width:528rpx;height: 110rpx;position: absolute;"></image>
+
+		<view style="width: 550rpx; height: 96rpx;
+				border-radius: 1001rpx; opacity: 1;
+				display: flex; margin-top: auto;
+				justify-content: center; align-items: center;
+				padding: 8rpx 40rpx;
+				background: linear-gradient(180deg, #FF9079 0%, #F37155 100%);
+				;position: absolute;bottom: 120rpx;" @click="loginBtn">
+			<text style="color: #FFFFFF;
+					font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+					font-size: 36rpx;
+					line-height: normal;
+					letter-spacing: 0px;">
+				登录
+			</text>
+		</view>
+		<text style="color: #98301B;
+				font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+				position: absolute;bottom: 60rpx;
+				font-size: 28rpx;
+				line-height: normal;
+				letter-spacing: 0px;">
+			专业的心理健康服务平台
+		</text>
+		<uni-popup ref="loginPop" type="bottom" :animation="true" :safe-area="false">
+			<view style="display: flex; justify-content: center;
+		  background-color: #fcfcfc;height: 475rpx;border-radius: 20rpx;">
+				<view style="width: 696rpx;display: flex;justify-content: space-evenly;align-items: center;
+				flex-direction: column;letter-spacing: 2rpx;">
+					<view style="display: flex;flex-direction: column;justify-content: center;align-items: center;">
+						<text style="font-family: SourceHanSansBold;font-size: 35rpx;">
+							手机号快捷登录
+						</text>
+						<view style="margin-top: 20rpx;display: flex;flex-direction: row;justify-content: flex-start;align-items: flex-start;">
+							<view @click="onAgree">
+							<view v-if="agree" class="no-choice">
+								<view class="choice-selected"></view>
+							</view>
+							<view v-else class="no-choice"></view>
+							</view>
+						<text style="font-size: 22rpx;color: #76808b;line-height: 40rpx;margin-left: 20rpx;">
+							在你使用愈心谷心理服务咨询之前，请仔细阅读
+							<text style="color: #007aff;" @click="toShowPop">《愈心谷咨询小程序隐私保护指引》</text>
+						</text>
+						</view>
+					</view>
+					<button v-if="agree" open-type="getPhoneNumber"
+						style="width: 90%;border-radius: 40rpx;background-color: #007aff;"
+						@getphonenumber="getphonenumber" type="primary">授权登录</button>
+					<button v-else style="width: 90%;border-radius: 40rpx;background-color: #007aff;"
+						@click="onLogin" type="primary">授权登录</button>
+					<text style="font-size: 30rpx;color: #76808b;" @click="noLogin">
+						暂不登录
+					</text>
+				</view>
+
+			</view>
+		</uni-popup>
+	</view>
+	<ShowPop  v-if="showPopFlag" :code="showPopCode" @closeProcotolPop="closeProcotolPop"></ShowPop>
+	
+</template>
+
+<script setup>
+	import {
+		ref
+	} from 'vue'
+	import myNav from '@/components/my-nav.vue'
+	import {
+		urls
+	} from '@/util/apiUrl.js'
+	import dohttp from '@/util/requestConfig.js'
+	import ShowPop from "@/components/show-pop/show-pop.vue";
+	
+	const showPopFlag = ref(false)
+	const agree = ref(false)
+	const showPopCode = ref("")
+	const loginPop = ref()
+	const type = ref()
+	const path = ref()
+	onLoad((option) => {
+		type.value = option.type
+		path.value = option.path
+	})
+	const onAgree = ()=> {
+		agree.value = !agree.value
+	}
+	const toShowPop=()=>{
+		
+		showPopFlag.value = true
+		showPopCode.value = "privacy_protection_agreement"
+	}
+	const closeProcotolPop = ()=>{
+		showPopFlag.value = false
+	}
+	onMounted(() => {
+		setTimeout(() => {
+			loginPop.value.open("bottom")
+		}, 500)
+	})
+
+	const loginBtn = (async() => {
+		loginPop.value.open("bottom")
+		// let code = await getCode();
+		// toLogin(code, null, null)
+		
+		
+	})
+	const userInfo = ref({
+		token: '',
+	})
+	
+	const onLogin = ()=> {
+		if (!agree.value){
+			uni.showModal({
+			  title: '提示',
+			  content: '请阅读并同意《愈心谷咨询小程序隐私保护指引》',
+			  showCancel: false,
+			  success: function (res) {
+			  }
+			})
+		}
+	}
+
+	const getphonenumber = async (params) => {
+		if (params.detail.errMsg == "getPhoneNumber:ok") {
+			const {
+				encryptedData,
+				iv
+			} = params.detail;
+			let code = await getCode();
+			toLogin(code, encryptedData, iv)
+		} else {
+
+		}
+
+	}
+
+	const noLogin = () => {
+		if (type.value == 1 || type.value == 3) {
+			uni.reLaunch({
+				url: "/pages/index/index"
+			})
+		} else {
+			uni.navigateBack({
+				delta: 1
+			})
+		}
+	}
+
+	const toLogin = (code, encryptedData, iv) => {
+		const params = {
+			grantType: "mini_app",
+			account: code,
+		}
+
+
+		let others = {
+			encryptedData: encryptedData,
+			iv: iv,
+			code: code
+		}
+		params.others = JSON.stringify(others)
+		dohttp.post(urls.loginUrl, params).then((result) => {
+			userInfo.value.token = result.accessToken
+			uni.setStorageSync('token', result.accessToken)
+			loginPop.value.close()
+
+			getUserInfo()
+		})
+	}
+	const getUserInfo = () => {
+		dohttp.get(urls.getSelfInfo).then((result) => {
+			const userinfo = {
+				id: result.id,
+				avatarUrl: result.avatarUrl,
+				nickName: result.nickName
+			}
+			
+			uni.setStorageSync('userinfo', userinfo)
+			if (type.value == 1) {
+				uni.reLaunch({
+					url: "/pages/index/index"
+				})
+			} else if (type.value == 3) {
+				uni.reLaunch({
+					url: path.value
+				})
+			} else {
+				uni.navigateBack({
+					delta: 1
+				})
+			}
+		})
+
+	}
+
+	
+	const onShareAppMessage = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    path: '/pages/index/index', // 分享的路径
+	  };
+	};
+	 
+	const onShareTimeline = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    query: 'id=8', // 分享路径的参数
+	  };
+	};
+
+	const getCode = async () => {
+		return new Promise((success, fail) => {
+			uni.login({
+				provider: 'weixin',
+				success: function(loginRes) {
+					console.log(loginRes)
+					success(loginRes.code)
+				},
+				fail: function(errInfo) {
+					fail(errInfo)
+					uni.showToast({
+						title: `微信授权登录失败，请重试`,
+						icon: 'none'
+					})
+					uni.reLaunch({
+						url: "/pages/index/index"
+					})
+				}
+			});
+		})
+	}
+</script>
+
+<style scoped>
+	.content {
+		width: 100vw;
+		height: 100vh;
+		background-image: url('data:image/png;base64,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');
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	/* 颜色覆盖层 */
+	.content::before {
+		content: '';
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		background: linear-gradient(180deg, #FFF7F5 7%, rgba(255, 247, 245, 0.92) 21%, rgba(240, 235, 234, 0.6266) 37%,
+				rgba(216, 216, 216, 0) 51%);
+	}
+	
+	
+	.no-choice {
+		width: 40rpx;
+		height: 40rpx;
+		box-sizing: border-box;
+		border: 1px solid #606271;
+		border-radius: 50%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	
+	.choice-selected {
+		width: 28rpx;
+		height: 28rpx;
+		border-radius: 50%;
+		background: #EA4E2D;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/my-focus/my-focus.vue b/pages/my-focus/my-focus.vue
new file mode 100644
index 0000000..d7ce9b6
--- /dev/null
+++ b/pages/my-focus/my-focus.vue
@@ -0,0 +1,169 @@
+<template>
+	<view class="content">
+		<myNav title="我关注的咨询师" bgColor="#fff" titleColor="#614D49" :backIcon="true" :backHome="false" :flex="false">
+		</myNav>
+		<view style="margin: 40rpx;display: flex;flex-direction: column;align-items: center;overflow-y: auto;" v-if="focusList.length>0">
+			<view style="width: 100%;padding: 40rpx;box-sizing: border-box;background-color: #fff;
+			display: flex;flex-direction: column;border-radius: 10rpx;margin-top: auto;"  >
+				<text style="font-size: 28rpx;color: #9B918C;">已关注（{{focusList.length}}）</text>
+
+				<view  v-for="(item,index) in focusList" :key="index" >
+					<view style="margin-top: 40rpx;display: flex; justify-content: space-between;">
+						<image src="/static/n-main/child.png"
+							style="width: 100rpx;height: 100rpx;border-radius: 10rpx;">
+						</image>
+						<view style="display: flex;flex-direction: column; width: 294rpx;">
+							<view style="display: flex;align-items: baseline;justify-content: flex-start;">
+								<text style="font-size: 28rpx;font-family: SourceHanSansBold;color: #614D49;">{{item.name}}</text>
+								<text style="font-size: 20rpx;;color: #614D49;margin-left: 20rpx;">{{item.showServiceNum}}+咨询*从业{{item.workNum}}+</text>
+							</view>
+							<view style="display: flex;">
+								<text class="text-ellipsis"
+									style="font-size: 20rpx;;color: #9B918C;line-height: normal;letter-spacing: 0px;">{{item.introduction}}</text>
+							</view>
+						</view>
+						<view style="display: flex;flex-direction: column;align-items: center;">
+							<view style="width: 136rpx;height: 56rpx;border-radius: 2002rpx;display: flex;justify-content: center;align-items: center;
+						 background: linear-gradient(180deg, #FF9079 0%, #F37155 100%);" @click="toConsult(item)">
+								<text class="btn-text">预约</text>
+							</view>
+							<view>
+								<text class="rmb-text">¥{{advancedFormat(item.price)}}</text><text class="rmb-text-mini">/次</text>
+							</view>
+						</view>
+					</view>
+					<view class="line" v-if="index<focusList.length-1"></view>
+				</view>
+			</view>
+		</view>
+    <view style="display:flex;align-items:center;flex-direction:column;width: 100%;height: 100%;
+                display: flex;align-items: center;justify-content: center"
+          v-if="focusList.length==0">
+      <text style="font-size: 30rpx;font-family: SourceHanSansBold;color: #EA4E2D">暂无关注信息</text>
+    </view>
+	</view>
+</template>
+
+<script setup>
+	import myNav from '@/components/my-nav.vue'
+	import {
+		urls
+	} from '@/util/apiUrl.js'
+	import dohttp from '@/util/requestConfig.js'
+
+
+	onLoad((option) => {
+		if (option.num && option.num > 0) {
+			toFocusRead()
+		}
+		focusAll()
+	})
+	const toFocusRead = () => {
+
+		dohttp.post(urls.focusToRead).then((result) => {})
+
+	}
+
+	const focusList = ref([])
+	const focusAll = () => {
+
+		dohttp.post(urls.focusAll).then((result) => {
+			focusList.value = result
+		})
+	}
+	
+	const advancedFormat = (num) => {
+	  const divided = Number(num) / 100;
+	  // 转换为字符串处理科学计数法（如1e-7）
+	  const str = divided.toLocaleString('en-US', {
+	    maximumFractionDigits: 2,
+	    useGrouping: false
+	  });
+	  return str.replace(/(\.\d*?[1-9])0+$/, '$1').replace(/\.$/, '');
+	}
+	const toConsult = (item)=>{
+		dohttp.navigateTo("/pages/consult-detail/consult-detail?id=" + item.id)
+	}
+	
+	const onShareAppMessage = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    path: '/pages/index/index', // 分享的路径
+	  };
+	};
+	 
+	const onShareTimeline = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    query: 'id=7', // 分享路径的参数
+	  };
+	};
+</script>
+
+<style scoped>
+	.content {
+		width: 100vw;
+		height: 100vh;
+		background-color: #F9F6F5;
+		display: flex;
+		flex-direction: column;
+		font-family: SourceHanSans;
+	}
+
+	.btn-text {
+
+		/* 按钮/按钮文本中号加粗 */
+		font-family: SourceHanSansBold;
+		font-size: 28rpx;
+		line-height: normal;
+		letter-spacing: 0px;
+
+		font-variation-settings: "opsz" auto;
+		/* 正文色/正文色 */
+		color: #FFFFFF;
+
+	}
+
+	.rmb-text {
+		font-family: SourceHanSans;
+		font-size: 24rpx;
+		font-weight: 700;
+		line-height: normal;
+		letter-spacing: 0px;
+
+		color: #F37155;
+	}
+
+	.rmb-text-mini {
+		font-family: SourceHanSans;
+		font-size: 16rpx;
+		font-weight: normal;
+		line-height: normal;
+		letter-spacing: 0px;
+
+		color: #F37155;
+
+	}
+
+	.text-ellipsis {
+		overflow: hidden;
+		/* 溢出内容隐藏 */
+		text-overflow: ellipsis;
+		/* 显示省略号 */
+		display: -webkit-box;
+		/* 使用WebKit弹性盒子模型 */
+		-webkit-line-clamp: 2;
+		/* 限制显示行数（此处为2行） */
+		-webkit-box-orient: vertical;
+		/* 文本垂直排列 */
+	}
+
+	.line {
+		width: 100%;
+		height: 2rpx;
+		border-radius: 36rpx;
+		background: #DFD6D3;
+		margin-top: 30rpx;
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/my-test/my-test.vue b/pages/my-test/my-test.vue
new file mode 100644
index 0000000..de9539f
--- /dev/null
+++ b/pages/my-test/my-test.vue
@@ -0,0 +1,235 @@
+<template>
+	<view class="content">
+		<view class="banner"></view>
+		<view class="page">
+			<myNav title="我的测评" bgColor="nonoe" titleColor="#614D49" :backIcon="true" :backHome="false" :flex="false">
+			</myNav>
+			<scroll-view :scroll-y="enableScroll" v-if="testList.length>0"   @scrolltolower="scrolltolower" class="scroll-style"  :style="{ height: `${showHight}rpx` }"
+				>
+				<view ref="contentRef"  id="contentContainer"
+					style="display: flex;align-items: center;flex-direction: column;margin-top: 30rpx">
+
+					<view v-for="(item,index) in testList" :key="index"
+						style="width: 670rpx;margin-top: 20rpx;display: flex;height:  180rpx;
+				align-items: center;justify-content: space-between;background:#FFFFFF;border-radius: 10rpx;padding-left: 20rpx;padding-right: 20rpx;">
+						<view style="display: flex;">
+							<image :src="item.testPic" style="width: 140rpx;height: 140rpx;border-radius: 10rpx;">
+							</image>
+							<view style="display: flex;flex-direction: column;margin-left: 20rpx;">
+								<text style="color: #303044;
+					font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+					font-size: 28rpx;
+					line-height: normal;
+					letter-spacing: 0px;">
+									{{item.testName}}
+								</text>
+								<view style="margin-top: 2rpx;display: flex;align-items: center;">
+
+
+									<rich-text style="color: #606271;
+							font-family: SourceHanSans;ont-variation-settings: 'opsz' auto;
+							font-size: 20rpx;
+							font-weight: normal;
+							line-height: normal;
+							letter-spacing: 0px;" class="test-desc" :nodes="item.subTitle"></rich-text>
+								</view>
+
+								<text style="color: #EA4E2D;margin-top: 26rpx;
+					font-family: SourceHanSans;ont-variation-settings: 'opsz' auto;
+					font-size: 20rpx;
+					font-weight: normal;
+					line-height: normal;
+					letter-spacing: 0px;">
+									测试于{{ item.startTime }}
+								</text>
+
+							</view>
+						</view>
+						<view style="width:fit-content;
+					height: fit-content;
+					border-radius: 2002rpx;
+					opacity: 1;
+					display: flex;
+					padding: 8rpx 40rpx;justify-content: center;align-items: center;
+					background: linear-gradient(180deg, #E84B2A 0%, #FF846A 100%);" @click="toTestResult(item)">
+							<text style="color: #FFFFFF;
+					font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+					font-size: 28rpx;
+					line-height: normal;
+					letter-spacing: 0px;">
+								查看
+							</text>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+
+      
+      <view v-if="testList.length==0" style="margin-top: 50%; width: 100%; text-align: center;">
+						<text style="color: #614D49;
+						font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+						font-size: 28rpx;
+						line-height: normal;
+						letter-spacing: 0px;">暂无测评信息</text>
+      </view>
+
+
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import myNav from '@/components/my-nav.vue'
+	import {
+		urls
+	} from '@/util/apiUrl.js'
+	import dohttp from '@/util/requestConfig.js'
+
+
+	const testList = ref([])
+
+	const params = ref({
+		pageNo: 1,
+		pageSize: 20
+	})
+	onMounted(() => {
+		testList.value = []
+		getMyTest()
+	})
+	const getMyTest = () => {
+		dohttp.post(urls.myTest, params.value).then((result) => {
+			if (result.list) {
+				testList.value.push(...result.list)
+				// 数据更新后检查高度
+				      nextTick(() => {
+				        checkContentHeight()
+				      })
+			}
+		})
+	}
+
+
+	const toTestResult = (item) => {
+
+		uni.navigateTo({
+			url: "/pages/test-result/test-result?resultId=" + item.testResultId,
+			animationType: "pop-in"
+		})
+
+	}
+	const scrolltolower = () => {
+
+		params.value.pageNo += 1
+		getMyTest()
+
+	}
+	const showHight = ref(0)
+	onLoad(() => {
+		const systemInfo = uni.getSystemInfoSync()
+		  // 更精准的高度计算
+		  showHight.value = (systemInfo.windowHeight * (750 / systemInfo.screenWidth)) - 200
+	})
+	
+	// 新增代码
+	import { ref, onMounted, nextTick, getCurrentInstance } from 'vue'
+	
+	const instance = getCurrentInstance()
+	const enableScroll = ref(false) // 新增动态滚动控制
+	// 新增高度检查方法
+	const checkContentHeight = () => {
+	  const query = uni.createSelectorQuery().in(instance.proxy)
+	  query.select('#contentContainer').boundingClientRect(rect => {
+	    if (rect) {
+	      // 转换为rpx比较
+	      const contentHeightRpx = rect.height * (750 / uni.getSystemInfoSync().screenWidth)
+	      enableScroll.value = contentHeightRpx > showHight.value
+	      console.log('内容高度:', contentHeightRpx, '容器高度:', showHight.value)
+	    }
+	  }).exec()
+	}
+	
+	// 初始加载检查
+	onMounted(() => {
+	  nextTick(checkContentHeight)
+	})
+	
+	
+	const onShareAppMessage = () => {
+	  return {
+	    title: '快来体验一下吧~',
+	    path: '/pages/index/index', // 分享的路径
+	  };
+	};
+	 
+	const onShareTimeline = () => {
+	  return {
+	    title: '快来体验一下吧~',
+	    query: 'id=6', // 分享路径的参数
+	  };
+	};
+</script>
+
+<style scoped>
+	.content {
+		width: 100vw;
+		height: 100vh;
+		background-image: url('https://miniapp.yuxingu.com.cn/yxg-mp/pic/test-list-bg.png');
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+		display: flex;
+		flex-direction: column;
+	}
+/* 新增关键样式 */
+#contentContainer {
+  width: 100%;
+  min-height: 100%; /* 确保内容容器撑开 */
+}
+
+
+	.page {
+		position: absolute;
+		width: 100vw;
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.banner {
+		background-image: url('https://miniapp.yuxingu.com.cn/yxg-mp/pic/botton.png');
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+		width: 750rpx;
+		height: 660rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		z-index: 0;
+	}
+
+
+
+
+	.test-desc {
+		font-size: 24rpx;
+		color: #888;
+	}
+
+
+
+
+	/* .scroll-style {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+	} */
+	
+	.scroll-style {
+	  box-sizing: border-box;
+	  padding: 0 !important; /* 清除可能的内边距 */
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order-detail/order-detail.vue b/pages/order-detail/order-detail.vue
new file mode 100644
index 0000000..dfed181
--- /dev/null
+++ b/pages/order-detail/order-detail.vue
@@ -0,0 +1,738 @@
+<template>
+	<view class="content">
+		<myNav title="订单详情" bgColor="#fff" titleColor="#614D49" :backIcon="true" :backHome="false" :flex="false"></myNav>
+
+		<view
+			style="width: 100%;display: flex;flex-direction: column;align-items: center;overflow-y: auto;padding-bottom: 80rpx;">
+			<view class="card" style="margin-top: 40rpx;">
+				<view
+					style="width: 670rpx;height: 60rpx;border-radius: 10rpx 32rpx 0rpx 0rpx;background: linear-gradient(180deg, #FFE7D9 0%, rgba(255, 255, 255, 0) 98%);">
+
+				</view>
+				<image src="/static/n-zx/order-status-icon.png" style="width: 60rpx;height: 60rpx;align-self: center;"
+					v-if="orderDetail.status==0">
+				</image>
+				<text style="font-size: 36rpx;color:#F37155 ;font-family: SourceHanSansBold;align-self: center;"
+					v-if="orderDetail.status==0">待支付
+				</text>
+				<text style="font-size: 36rpx;color:#F37155 ;font-family: SourceHanSansBold;align-self: center;"
+					v-if="orderDetail.status== 1 ">待咨询
+				</text>
+				<text style="font-size: 36rpx;color:#F37155 ;font-family: SourceHanSansBold;align-self: center;"
+					v-if="orderDetail.status== 4 ">待确认
+				</text>
+				<text style="font-size: 36rpx;color:#F37155 ;font-family: SourceHanSansBold;align-self: center;"
+					v-if="orderDetail.status== 5 ">已完成
+				</text>
+				<text style="font-size: 36rpx;color:#00B637 ;font-family: SourceHanSansBold;align-self: center;"
+					v-if="orderDetail.status== 6 ">申请退款中
+				</text>
+				<text style="font-size: 36rpx;color:#00B637 ;font-family: SourceHanSansBold;align-self: center;"
+					v-if="orderDetail.status== 7 ">退款中
+				</text>
+				<text style="font-size: 36rpx;color:#00B637 ;font-family: SourceHanSansBold;align-self: center;"
+					v-if="orderDetail.status== 8 ">已退款
+				</text>
+				<text style="font-size: 36rpx;color:#00B637 ;font-family: SourceHanSansBold;align-self: center;"
+					v-if="orderDetail.status== 9 ">交易关闭
+				</text>
+
+				<view style="align-self: center;margin-top: 20rpx;" v-if="orderDetail.status==0">
+					<text class="order-text" style="color: #186BF9;">
+						{{ orderDetail.validTime.split('T').join(' ') }}</text>
+					<text class="order-text">前未支付，订单将自动取消</text>
+				</view>
+				<view style="align-self: center;margin-top: 20rpx;" v-if="orderDetail.status==1">
+					<text class="order-text" @click="toConsultAppointment">支付成功，等待执行，相关详情请查看
+						<text style="color: #186BF9;">《预约须知》</text>
+					</text>
+				</view>
+				<view style="align-self: center;margin-top: 20rpx;" v-if="orderDetail.status==4">
+					<text class="order-text">等待客服确认本次咨询</text>
+				</view>
+				<view style="align-self: center;margin-top: 20rpx;" v-if="orderDetail.status==5">
+					<text class="order-text">订单已完成</text>
+				</view>
+				<view style="align-self: center;margin-top: 20rpx;" v-if="orderDetail.status==6">
+					<text class="order-text">申请退款中，请耐心等待</text>
+				</view>
+				<view style="align-self: center;margin-top: 20rpx;" v-if="orderDetail.status==7">
+					<text class="order-text">退款已受理，将会在1个工作日内返回到支付账户</text>
+				</view>
+				<view style="align-self: center;margin-top: 20rpx;" v-if="orderDetail.status==8">
+					<text class="order-text">退款金额已成功返回到支付账户</text>
+				</view>
+				<view style="align-self: center;margin-top: 20rpx;" v-if="orderDetail.status==9">
+					<text class="order-text" v-if="orderDetail.cancelFlag == 1">支付超时,已关闭交易</text>
+					<text class="order-text" v-if="orderDetail.cancelFlag == 2">订单已取消</text>
+				</view>
+
+
+				<view style="padding-left: 40rpx;padding-right: 40rpx;padding-bottom: 40rpx;
+				width: 670rpx;box-sizing: border-box;
+				margin-top: 98rpx; display: flex;flex-direction: column;">
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-text">咨询方式</text>
+						<view style="display: flex; align-items: center;">
+							<view v-if="orderDetail.consultationMethod == 'video' " style="width: 124rpx;height: 48rpx;border-radius: 80rpx;
+							box-sizing: border-box;border: 1px solid #F97559;display: flex;justify-content: center;align-items: center;">
+								<image src="/static/n-zx/video.png" style="width: 25.6rpx;height: 19.2rpx;"></image>
+								<text style="font-size: 24rpx;color: #F97559;margin-left: 8rpx;">视频</text>
+							</view>
+
+							<view v-if="orderDetail.consultationMethod == 'face_to_face'" style="width: 124rpx;height: 48rpx;border-radius: 80rpx;margin-left: 20rpx;
+							box-sizing: border-box;border: 1px solid #F97559;display: flex;justify-content: center;align-items: center;">
+								<image src="/static/n-zx/face-to-face-c.png" style="width: 26rpx;height: 28.66rpx;">
+								</image>
+								<text style="font-size: 24rpx;color: #F97559;margin-left: 8rpx;">面对面</text>
+							</view>
+						</view>
+					</view>
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-text">咨询时段</text>
+						<view>
+							<text class="psychic-detail-show-text" v-if="orderDetail.appointmentDate">
+								{{ orderDetail.appointmentDate.substring(0, 10) }}({{
+                  getWeekDay(orderDetail.appointmentDate)
+                }}){{ orderDetail.startTime.substring(0, 5) }}-{{ orderDetail.endTime.substring(0, 5) }}
+							</text>
+							<image src="/static/n-zx/right-icon.png" class="right-icon" @click="showChoiceDateTimePop">
+							</image>
+						</view>
+					</view>
+
+					<view class="psychic-detail-row" v-if="orderDetail.consultationMethod == 'face_to_face'">
+						<text class="psychic-detail-text">面询地址</text>
+						<view style="width: 70%;text-align: right;">
+							<text class="psychic-detail-show-text">{{ orderDetail.addressDetail }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+
+			<view class="card" style="margin-top: 20rpx;box-sizing: border-box;" v-if="!showDetailFlag">
+				<view style="padding-left: 40rpx;padding-right: 40rpx;width: 100%;box-sizing: border-box;">
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-text">预约人信息</text>
+						<view>
+							<text class="psychic-detail-show-text" v-if="orderDetail.phone">{{ orderDetail.phone }}
+							</text>
+
+							<!--              <text class="psychic-detail-show-text" v-else>去填写</text>-->
+							<image src="/static/n-zx/right-icon.png" class="right-icon" style="margin-left: 10rpx;"
+								@click="changeDetailFlag">
+							</image>
+						</view>
+					</view>
+				</view>
+				<view class="expand-bottom">
+					<view @click="changeDetailFlag"
+						style="display: flex;justify-content: center;flex-direction: column;align-items: center;justify-content: center;">
+						<text class="expand-text">展开更多</text>
+						<image src="/static/n-zx/down-icon.png" style="width: 16rpx;height: 11.82rpx;"></image>
+					</view>
+				</view>
+			</view>
+
+
+			<view class="card" style="margin-top: 20rpx;box-sizing: border-box;" v-if="showDetailFlag">
+				<view
+					style="padding-left: 40rpx;padding-right: 40rpx;width: 100%;box-sizing: border-box;padding-bottom: 40rpx;">
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-text">预约人信息</text>
+
+					</view>
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-title-text">预约人称呼</text>
+						<view style="text-align: right;">
+
+							<input type="text" class="input-text" disabled :maxlength="10"
+								v-model="orderDetail.appointmentName" placeholder="请输入预约人称呼" />
+						</view>
+					</view>
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-title-text">出生年月</text>
+
+						<view style="display: flex;justify-content: flex-end; align-items: center;">
+							<picker mode="date" value="date" :disabled="true" fields="month" @change="bindDateChange">
+								<view class="input-text">{{ orderDetail.birthday.slice(0, 7) }}</view>
+							</picker>
+							<image src="/static/n-zx/right-icon.png" class="right-icon" style="margin-left: 20rpx;">
+							</image>
+						</view>
+					</view>
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-title-text">联系方式</text>
+						<view style="text-align: right;">
+							<input class="input-text" type="number" v-model="orderDetail.phone" :disabled="true"
+								:maxlength="10" placeholder="请输入预约人联系电话" />
+						</view>
+					</view>
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-title-text">性别</text>
+						<view style="display: flex;align-items: center;" v-if="orderDetail.sex == 1">
+							<view style="margin-right: 44.44rpx;display: flex;align-items: center;">
+								<image src="/static/n-zx/choice.png" style="width: 40rpx;height: 40rpx;"></image>
+								<text class="input-text" style="margin-left:10rpx ;">男</text>
+							</view>
+							<view style="display: flex;align-items: center;">
+								<image src="/static/n-zx/nochoice.png" style="width: 31rpx;height: 31rpx;"></image>
+								<text class="input-text" style="margin-left:10rpx ;">女</text>
+							</view>
+						</view>
+
+						<view style="display: flex;align-items: center;" v-if="orderDetail.sex == 2">
+							<view style="margin-right: 44.44rpx;display: flex;align-items: center;">
+								<image src="/static/n-zx/nochoice.png" style="width: 31rpx;height: 31rpx;"></image>
+								<text class="input-text" style="margin-left:10rpx ;">男</text>
+							</view>
+							<view style="display: flex;align-items: center;">
+								<image src="/static/n-zx/choice.png" style="width: 40rpx;height: 40rpx;"></image>
+								<text class="input-text" style="margin-left:10rpx ;">女</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="card" style="margin-top: 20rpx;box-sizing: border-box;" v-if="showDetailFlag">
+				<view
+					style="padding-left: 40rpx;padding-right: 40rpx;width: 100%;box-sizing: border-box;padding-bottom: 40rpx;">
+					<view class="psychic-detail-row" style="justify-content: flex-start;">
+						<text class="psychic-detail-text">紧急联系人</text>
+					</view>
+
+					<!--          <view class="psychic-detail-row" style="justify-content: flex-start;margin-top: 20rpx;">-->
+
+					<!--            <view>-->
+					<!--              <text class="psychic-detail-show-text"-->
+					<!--                    style="color: #909099;">信息严格保密，仅常机状况时联系，以保障您的生命安全和福社-->
+					<!--              </text>-->
+					<!--            </view>-->
+					<!--          </view>-->
+
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-title-text">联系方式</text>
+						<view style="text-align: right;">
+							<input class="input-text" type="number" :maxlength="10" disabled
+								v-model="orderDetail.emergencyContactPhone" placeholder="请输入预约人联系电话" />
+						</view>
+					</view>
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-title-text">与你的关系</text>
+						<view style="text-align: right;display: flex;align-items: center;">
+							<input class="input-text" type="number" disabled
+								v-model="orderDetail.emergencyContactTypeText" :maxlength="10"
+								placeholder="请输入预约人联系电话" />
+							<!--              <image src="/static/n-zx/right-icon.png" class="right-icon" style="margin-left: 20rpx;">-->
+							<!--              </image>-->
+							<!--              <uni-data-select style="width: 80%;outline: none;border: none;text-align: right"-->
+							<!--                               v-model="orderDetail.emergencyContactType"-->
+							<!--                               :localdata="range"-->
+							<!--                               disabled-->
+							<!--                               @change="changeEmergencyContactType"-->
+							<!--                               :clear="false"-->
+							<!--                               placeholder="请选择"-->
+							<!--              >-->
+							<!--              </uni-data-select>-->
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="card" style="margin-top: 20rpx;box-sizing: border-box;">
+				<view
+					style="padding-left: 40rpx;padding-right: 40rpx;width: 100%;box-sizing: border-box;padding-bottom: 40rpx;">
+					<view class="psychic-detail-row" style="justify-content: flex-start;">
+						<text class="psychic-detail-text">订单信息</text>
+					</view>
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-title-text">订单编号</text>
+						<view style="text-align: right;">
+							<uni-tag text="复制" type="primary" @click="copyContent(orderDetail.orderSn)" :inverted="true"
+								style="margin-right: 10rpx;" />
+							<text class="psychic-detail-show-text">{{orderDetail.orderSn}} </text>
+						</view>
+					</view>
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-title-text">创建时间</text>
+						<view style="text-align: right;" v-if=" orderDetail.createTime">
+							<text
+								class="psychic-detail-show-text">{{ orderDetail.createTime.split('T').join(' ') }}</text>
+						</view>
+					</view>
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-title-text">订单原价</text>
+						<view style="text-align: right;">
+							<text class="psychic-detail-show-text">¥{{advancedFormat(orderDetail.totalAmount)}} </text>
+						</view>
+					</view>
+					<view class="psychic-detail-row">
+						<text class="psychic-detail-title-text">实付金额</text>
+						<view style="text-align: right;">
+							<text class="psychic-detail-show-text">¥{{advancedFormat(orderDetail.totalAmount)}} </text>
+						</view>
+					</view>
+					<!-- <view class="psychic-detail-row" style="margin-top: 20rpx;align-items: center;">
+            <view style="display: flex;align-items: center;">
+              <image src="/static/n-zx/wx-pay-icon.png" style="width:88rpx;height: 88rpx;"></image>
+              <text class="input-text">微信支付</text>
+            </view>
+            <image src="/static/n-zx/choice-pay-icon.png" style="width: 48rpx;height: 48rpx;"></image>
+          </view> -->
+				</view>
+			</view>
+
+			<!--      <view style="width: 670rpx;display: flex;align-items: center; margin-top: 22rpx">-->
+			<!--        <image src="/static/n-zx/choice.png" style="width: 36rpx;height: 36rpx;"></image>-->
+			<!--        <view-->
+			<!--            style="white-space: nowrap; text-overflow: ellipsis;overflow: hidden;width: 630rpx;margin-left: 10rpx;">-->
+			<!--          <text class="psychic-detail-title-text"> 同意</text>-->
+			<!--          <text class="psychic-detail-title-text" style="color:#F97559 ;">《知情同意书》、《心理咨询服务协议》</text>-->
+			<!--          <text class="psychic-detail-title-text">与</text>-->
+			<!--          <text class="psychic-detail-title-text" style="color:#F97559 ;">《专属助理服务须知》</text>-->
+			<!--          <text class="psychic-detail-title-text">，点击“同意"开始接受服务。</text>-->
+			<!--        </view>-->
+			<!--      </view>-->
+			<!--      <view class="bottom-btn" style="box-sizing: border-box;">-->
+			<!--        <text class="btn-text">立即预约¥600</text>-->
+			<!--      </view>-->
+
+
+			<view v-if="orderDetail.status==0||orderDetail.status==8||orderDetail.status==9"
+				style="margin-top: 40rpx;display: flex;justify-content: space-around;align-items: center;width: 100%">
+
+				<view v-if="orderDetail.status==0" class="btn1" @click.stop="cancelOrder(orderDetail)">
+					<text class="btn-text1">取消订单</text>
+				</view>
+				<view v-if="orderDetail.status==0" class="btn" @click.stop="toPay(orderDetail)">
+					<text class="btn-text">立即支付</text>
+				</view>
+				<view class="btn1" v-if="orderDetail.status==8||orderDetail.status==9"
+					@click.stop="deleteOrder(orderDetail)">
+					<text class="btn-text1">删除订单</text>
+				</view>
+
+				<view class="btn" v-if="orderDetail.status==9||orderDetail.status==8"
+					@click.stop="consultAgain(orderDetail)">
+					<text class="btn-text">再次咨询</text>
+				</view>
+
+
+				<!--   <view class="btn" v-if="orderDetail.status==8" @click.stop="findOtherDoctor">
+          <text class="btn-text">预约其他咨询师</text>
+        </view> -->
+			</view>
+
+
+			<view v-if="orderDetail.status==1||orderDetail.status==4||orderDetail.status==5"
+				style="margin-top: 40rpx;display: flex;justify-content: center;align-items: center;width: 100%">
+				<view class="btn2" v-if="orderDetail.status==1">
+					<button plain class="contact-btn" open-type="contact">
+						<text class="btn-text">联系助理</text>
+					</button>
+				</view>
+
+				<view class="btn2" v-if="orderDetail.status==4||orderDetail.status==5"
+					@click.stop="consultAgain(orderDetail)">
+					<text class="btn-text">再次咨询</text>
+				</view>
+
+			</view>
+		</view>
+	</view>
+
+</template>
+
+<script setup>
+	import myNav from '@/components/my-nav.vue'
+	import {
+		urls
+	} from '@/util/apiUrl.js'
+	import dohttp from '@/util/requestConfig.js'
+
+	const advancedFormat = (num) => {
+		const divided = Number(num) / 100;
+		// 转换为字符串处理科学计数法（如1e-7）
+		const str = divided.toLocaleString('en-US', {
+			maximumFractionDigits: 2,
+			useGrouping: false
+		});
+		return str.replace(/(\.\d*?[1-9])0+$/, '$1').replace(/\.$/, '');
+	}
+	const copyContent = (content) => {
+		uni.setClipboardData({
+			data: content,
+			success: () => {
+				uni.showToast({
+					title: '复制成功',
+					duration: 1500
+				});
+			}
+		});
+	}
+
+
+	const cancelOrder = (item) => {
+
+		uni.showModal({
+			content: '确定取消该订单吗?',
+			success: function(res) {
+				if (res.confirm) {
+					dohttp.post(urls.cancelOrder + "?orderId=" + item.id).then((result) => {
+						if (result) {
+							item.status = 9
+							item.cancelFlag = 2
+							uni.showToast({
+								title: '取消成功',
+								duration: 1500
+							});
+						}
+					})
+				}
+			}
+		})
+	}
+	const consultAgain = (item) => {
+		dohttp.navigateTo("/pages/consult-detail/consult-detail?id=" + item.doctorId)
+	}
+	
+	const onShareAppMessage = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    path: '/pages/index/index', // 分享的路径
+	  };
+	};
+	 
+	const onShareTimeline = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    query: 'id=51', // 分享路径的参数
+	  };
+	};
+	const deleteOrder = (item) => {
+
+		uni.showModal({
+			content: '是否删除该订单信息,删除后将不能恢复',
+			success: function(res) {
+				if (res.confirm) {
+					dohttp.post(urls.deleteOrder + "?orderId=" + item.id).then((result) => {
+						if (result) {
+							uni.showToast({
+								title: '删除成功',
+								duration: 1500
+							});
+							uni.navigateTo("/pages/order/order")
+						}
+					})
+				}
+			}
+		})
+	}
+
+	const findOtherDoctor = () => {
+		uni.switchTab({
+			"url": "/pages/consult/consult",
+			"animationType": "pop-in"
+		})
+	}
+	const toPay = (item) => {
+		let params = {
+			orderSn: item.orderSn
+		}
+		dohttp.get(urls.getPayParam, params).then((result) => {
+			console.log("urls.getPayParam", result)
+			uni.requestPayment({
+				provider: 'wxpay',
+				timeStamp: result.timeStamp,
+				nonceStr: result.nonceStr,
+				package: result.packageStr,
+				signType: result.signType,
+				paySign: result.paySign,
+				success: function(res) {
+					console.log('success:' + JSON.stringify(res));
+				},
+				fail: function(err) {
+					console.log('fail:' + JSON.stringify(err));
+				}
+			})
+		})
+
+	}
+
+	const getWeekDay = (dateString) => {
+		const date = new Date(dateString);
+		if (isNaN(date.getTime())) {
+			return '无效日期'; // 校验日期合法性[3](@ref)
+		}
+		const weekDays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
+		return weekDays[date.getDay()];
+	}
+
+
+	const range = ref([{
+			value: 1,
+			text: "朋友"
+		},
+		{
+			value: 2,
+			text: "子女"
+		},
+		{
+			value: 3,
+			text: "夫妻"
+		},
+		{
+			value: 4,
+			text: "父母"
+		},
+	])
+	const showDetailFlag = ref(false)
+
+	const toConsultAppointment = () => {
+		dohttp.navigateTo("/pages/consult-appointment/consult-appointment")
+	}
+
+
+	const changeDetailFlag = () => {
+		showDetailFlag.value = true
+		bgHeight.value = "fit-content"
+	}
+	const orderDetail = ref({})
+	onLoad((option) => {
+		if (option.id) {
+
+			getOrderDetail(option.id)
+
+
+		} else {
+			uni.showModal({
+				title: '数据异常',
+				content: '页面数据发生异常，即将返回主页',
+				showCancel: false,
+				success: function(res) {
+					if (res.confirm) {
+						uni.reLaunch({
+							url: "/pages/index/index"
+						})
+					}
+				}
+			})
+		}
+	})
+	const getOrderDetail = async (id) => {
+		dohttp.post(urls.orderDetail + "?orderId=" + id).then(res => {
+			orderDetail.value = res
+			if (orderDetail.value.emergencyContactType) {
+				range.value.forEach(item => {
+					if (item.value == orderDetail.value.emergencyContactType) {
+						orderDetail.value.emergencyContactTypeText = item.text
+					}
+				})
+			}
+
+		})
+	}
+</script>
+
+<style scoped>
+	.content {
+		width: 100vw;
+		height: 100vh;
+		background-color: #F9F6F5;
+		display: flex;
+		flex-direction: column;
+		font-family: SourceHanSans;
+		background-image: url('https://miniapp.yuxingu.com.cn/yxg-mp/pic/bg-all.png');
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+	}
+
+	.order-text {
+		font-size: 20rpx;
+		font-variation-settings: "opsz" auto;
+		color: #606271
+	}
+
+
+	.card {
+		width: 670rpx;
+		background-color: #ffffff;
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+		align-items: flex-start;
+		border-radius: 32rpx;
+	}
+
+	.psychic-detail-row {
+		display: flex;
+		justify-content: space-between;
+		width: 100%;
+		margin-top: 39rpx;
+	}
+
+	.psychic-detail-text {
+		font-family: SourceHanSansBold;
+		font-size: 28rpx;
+		line-height: normal;
+		text-align: center;
+		letter-spacing: 0px;
+
+		font-variation-settings: "opsz" auto;
+		/* 背景色/浅色背景2 */
+		color: #614D49;
+	}
+
+	.psychic-detail-show-text {
+		font-family: SourceHanSans;
+		font-size: 24rpx;
+		font-weight: normal;
+		line-height: normal;
+		text-align: center;
+		letter-spacing: 0px;
+		font-variation-settings: "opsz" auto;
+		/* 背景色/浅色背景2 */
+		color: #614D49;
+	}
+
+	.input-text {
+
+		font-family: SourceHanSans;
+		font-size: 28rpx;
+		font-weight: normal;
+		line-height: normal;
+		text-align: right;
+		letter-spacing: 0px;
+
+		font-variation-settings: "opsz" auto;
+		/* 正文色/正文辅助4 */
+		color: #909099;
+	}
+
+	.psychic-detail-title-text {
+		font-family: SourceHanSans;
+		font-size: 28rpx;
+		font-weight: normal;
+		line-height: normal;
+		text-align: center;
+		letter-spacing: 0px;
+
+		font-variation-settings: "opsz" auto;
+		/* 背景色/浅色背景2 */
+		color: #614D49;
+	}
+
+	.right-icon {
+		width: 12rpx;
+		height: 22rpx;
+		margin-left: 10rpx;
+	}
+
+	.bottom-btn {
+
+		width: 550rpx;
+		height: 96rpx;
+		border-radius: 2002rpx;
+		/* 自动布局 */
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		padding: 22rpx 40rpx;
+
+		background: linear-gradient(180deg, #E84B2A 0%, #FF846A 100%);
+		margin-top: 68rpx;
+	}
+
+	.btn-text {
+		font-family: SourceHanSansBold;
+		font-size: 36rpx;
+		line-height: normal;
+		letter-spacing: 0rpx;
+
+		/* 正文色/正文色 */
+		color: #FFFFFF;
+	}
+
+	.expand-bottom {
+		width: 670rpx;
+		margin-top: 40rpx;
+		display: flex;
+		justify-content: center;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		height: 62rpx;
+		border-radius: 0px 0px 10rpx 10rpx;
+		background: linear-gradient(180deg, #FF9079 0%, #F37155 100%);
+	}
+
+
+	.btn {
+		width: 282rpx;
+		height: 96rpx;
+		border-radius: 2002rpx;
+
+
+		/* 自动布局 */
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		background: linear-gradient(180deg, #E84B2A 0%, #FF846A 100%);
+	}
+
+	.btn-text {
+
+		font-size: 28rpx;
+		font-family: SourceHanSansBold;
+		color: #FFFFFF;
+	}
+
+	.btn1 {
+		width: 282rpx;
+		height: 76rpx;
+		border-radius: 2002rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+
+		box-sizing: border-box;
+		border: 2rpx solid #F36749;
+	}
+
+	.btn2 {
+		width: 650rpx;
+		height: 96rpx;
+		border-radius: 2002rpx;
+
+
+		/* 自动布局 */
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		background: linear-gradient(180deg, #E84B2A 0%, #FF846A 100%);
+	}
+
+	.btn-text1 {
+
+		font-size: 28rpx;
+		font-family: SourceHanSansBold;
+		color: #F36749;
+	}
+
+	.contact-btn {
+		border: none;
+		outline: none;
+		width: 100%;
+		height: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 0rpx;
+		margin: 0rpx;
+		background-color: transparent;
+		display: flex;
+		align-items: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/order.vue b/pages/order/order.vue
new file mode 100644
index 0000000..4f1d7df
--- /dev/null
+++ b/pages/order/order.vue
@@ -0,0 +1,484 @@
+<template>
+  <view class="content">
+    <myNav title="咨询订单" bgColor="#fff" titleColor="#614D49" :backIcon="true" :backHome="backHomeFlag" :flex="false"></myNav>
+
+
+    <scroll-view :scroll-y="enableScroll" @scrolltolower="scrolltolower" class="scroll-style"
+                 :style="{ height: `${showHight}rpx` }">
+
+      <view ref="contentRef" id="contentContainer" style="display:flex;align-items:center;flex-direction:column;"
+            v-if="orderList.length>0">
+
+        <view v-for="(item,index) in orderList" :key="index" @click="toDetail(item)"
+              style="width: 670rpx;background-color: #fff;padding: 40rpx;display: flex;flex-direction: column;margin-top: 40rpx; 	box-sizing: border-box;border-radius: 10rpx;">
+          <view style="display: flex;">
+            <image :src="item.avatar" style="width: 120rpx;height: 120rpx;border-radius: 10rpx;">
+            </image>
+            <view style="display: flex;flex-direction: column;margin-left: 20rpx;">
+              <text class="show-name">{{ item.name }}</text>
+              <view style="display: flex; align-items: last baseline;" v-if="item.consultationMethod == 'face_to_face'">
+                <image src="/static/n-zx/face-to-face.png" style="width: 26rpx;height: 28.66rpx;"></image>
+                <text class="consult-method-text" style="margin-left: 10rpx;">面对面咨询·1次</text>
+              </view>
+              <view style="display: flex; align-items: last baseline;" v-if="item.consultationMethod == 'video'">
+                <image src="/static/n-zx/video-camera.png" style="width: 26rpx;height: 28.66rpx;"></image>
+                <text class="consult-method-text" style="margin-left: 10rpx;">视频咨询·1次</text>
+              </view>
+            </view>
+            <view style="flex: 1;text-align: right;display: flex;flex-direction: column;">
+              <text class="order-status-text1" v-if="item.status== 0 ">待支付</text>
+              <text class="order-status-text1" v-if="item.status== 1 ">待咨询</text>
+              <text class="order-status-text1" v-if="item.status== 4 ">待确认</text>
+              <text class="order-status-text1" v-if="item.status== 5 ">已完成</text>
+              <text class="order-status-text1" style="color: #00B637" v-if="item.status== 6 ">申请退款中</text>
+              <text class="order-status-text1" style="color: #00B637" v-if="item.status== 7 ">退款中</text>
+              <text class="order-status-text1" style="color: #00B637" v-if="item.status== 8 ">已退款</text>
+              <text class="order-status-text1" style="color: #00B637" v-if="item.status== 9 ">交易关闭</text>
+			  <view style="">
+			    <text class="rmb-text">¥{{ advancedFormat(item.totalAmount) }}</text>
+<!-- 			    <text class="effect-time-text">/{{ calculateTimeDifference(item.startTime, item.endTime) }}分钟</text> -->
+			  </view>
+            </view>
+          </view>
+
+          <view
+              style="border-radius: 10rpx;background-color: #F7F4F3;padding: 20rpx;display: flex;margin-top: 20rpx;align-items: first baseline;">
+            <image src="/static/n-zx/notice-icon.png" style="width:21rpx ;height:18.48rpx;"></image>
+            <view style="line-height: 24rpx;" v-if="item.status==0">
+              <text class="order-text"
+                    style="margin-left: 10rpx;color: #186BF9;flex-wrap: nowrap;">
+                {{ item.validTime.split('T').join(' ') }}
+              </text>
+              <text class="order-text">前未支付，订单将自动取消，请及时完成支付</text>
+            </view>
+            <view style="line-height: 24rpx;margin-left: 5rpx" v-if="item.status==1">
+              <text class="order-text" @click="toConsultAppointment">支付成功，等待执行，相关详情请查看
+                <text style="color: #186BF9;">《预约须知》</text>
+              </text>
+            </view>
+            <view style="line-height: 24rpx;margin-left: 5rpx" v-if="item.status==4">
+              <text class="order-text">等待客服确认本次咨询</text>
+            </view>
+            <view style="line-height: 24rpx;margin-left: 5rpx" v-if="item.status==5">
+              <text class="order-text">订单已完成</text>
+            </view>
+            <view style="line-height: 24rpx;margin-left: 5rpx" v-if="item.status==6">
+              <text class="order-text">申请退款中，请耐心等待</text>
+            </view>
+            <view style="line-height: 24rpx;margin-left: 5rpx" v-if="item.status==7">
+              <text class="order-text">退款已受理，将会在1个工作日内返回到支付账户</text>
+            </view>
+            <view style="line-height: 24rpx;margin-left: 5rpx" v-if="item.status==8">
+              <text class="order-text">退款金额已成功返回到支付账户</text>
+            </view>
+            <view style="line-height: 24rpx;margin-left: 5rpx" v-if="item.status==9">
+              <text class="order-text" v-if="item.cancelFlag == 1">支付超时,已关闭交易</text>
+              <text class="order-text" v-if="item.cancelFlag == 2">订单已取消</text>
+            </view>
+          </view>
+          <view style="margin-top: 20rpx;display: flex;justify-content: space-between;align-items: center;">
+            <view style="display: flex;flex-direction: column;">
+            <!--  <view style="display: flex;align-items: baseline">
+                <text class="rmb-text">¥{{ advancedFormat(item.totalAmount) }}</text>
+                <text class="effect-time-text">/{{ calculateTimeDifference(item.startTime, item.endTime) }}分钟</text>
+              </view> -->
+              <text class="time-text">{{ item.createTime.split('T').join(' ') }}</text>
+            </view>
+            <view class="btn1" v-if="item.status==0" @click.stop="cancelOrder(item)">
+              <text class="btn-text1">取消订单</text>
+            </view>
+            <view class="btn" v-if="item.status==0" @click.stop="toPay(item)">
+              <text class="btn-text">立即支付</text>
+            </view>
+
+            <view class="btn" v-if="item.status==1">
+              <button plain class="contact-btn" open-type="contact">
+                <text class="btn-text">联系助理</text>
+              </button>
+            </view>
+
+
+            <view class="btn1" v-if="item.status==8||item.status==9" @click.stop="deleteOrder(item)">
+              <text class="btn-text1">删除订单</text>
+            </view>
+<!--            <view class="btn" v-if="item.status==8"  style="width: 40%;margin-left: 5%"  @click.stop="findOtherDoctor">
+              <text class="btn-text">预约其他咨询师</text>
+            </view> -->
+            <view class="btn" v-if="item.status==4||item.status==5||item.status==9||item.status==8" @click.stop="consultAgain(item)">
+              <text class="btn-text">再次咨询</text>
+            </view>
+          </view>
+        </view>
+
+      </view>
+      <view ref="contentRef" id="contentContainer" style="display:flex;align-items:center;flex-direction:column;width: 100%;height: 100%;
+                display: flex;align-items: center;justify-content: center"
+            v-if="orderList.length==0">
+        <text style="font-size: 30rpx;font-family: SourceHanSansBold;color: #EA4E2D">暂无订单数据</text>
+      </view>
+    </scroll-view>
+  </view>
+</template>
+
+<script setup>
+import myNav from '@/components/my-nav.vue'
+import {
+  urls
+} from '@/util/apiUrl.js'
+import dohttp from '@/util/requestConfig.js'
+
+const backHomeFlag = ref(false)
+onLoad((option) => {
+  if(option.backHome && option.backHome == 1){
+    backHomeFlag.value=true
+  }
+  if (option.num && option.num > 0) {
+    toOrderRead()
+  }
+
+  requestParam.value.pageNo = 1
+  orderList.value = []
+  const systemInfo = uni.getSystemInfoSync()
+  // 更精准的高度计算
+  showHight.value = (systemInfo.windowHeight * (750 / systemInfo.screenWidth)) - 200
+  getOrderList()
+
+
+})
+const timeToMinutes = (timeStr) => {
+  const [hours, minutes] = timeStr.split(':').map(Number);
+  return hours * 60 + minutes;
+}
+
+// 计算时间差（处理跨天情况）
+const calculateTimeDifference = (startTime, endTime) => {
+  const startMinutes = timeToMinutes(startTime);
+  const endMinutes = timeToMinutes(endTime);
+  let diff = endMinutes - startMinutes;
+  // 如果跨天（结束时间早于开始时间），补上24小时
+  if (diff < 0) diff += 24 * 60;
+  return diff;
+}
+
+const advancedFormat = (num) => {
+  const divided = Number(num) / 100;
+  // 转换为字符串处理科学计数法（如1e-7）
+  const str = divided.toLocaleString('en-US', {
+    maximumFractionDigits: 2,
+    useGrouping: false
+  });
+  return str.replace(/(\.\d*?[1-9])0+$/, '$1').replace(/\.$/, '');
+}
+
+
+import {
+  ref,
+  onMounted,
+  nextTick,
+  getCurrentInstance
+} from 'vue'
+
+const showHight = ref(0)
+const instance = getCurrentInstance()
+const enableScroll = ref(false) // 新增动态滚动控制
+
+
+// 新增高度检查方法
+const checkContentHeight = () => {
+  const query = uni.createSelectorQuery().in(instance.proxy)
+  query.select('#contentContainer').boundingClientRect(rect => {
+    if (rect) {
+      const systemInfo = uni.getSystemInfoSync()
+
+      // 转换为rpx比较
+      // 计算容器实际像素高度
+      const containerHeightPx = (showHight.value * systemInfo.screenWidth) / 750
+      const threshold = 5 // 容错阈值
+
+      enableScroll.value = rect.height > (containerHeightPx + threshold)
+      // console.log('[Layout Debug]', {
+      //   contentHeight: rect.height,
+      //   containerPx: containerHeightPx,
+      //   containerRpx: showHight.value,
+      //   shouldScroll: enableScroll.value
+      // })
+    }
+  }).exec()
+}
+
+// 初始加载检查
+onMounted(() => {
+  nextTick(checkContentHeight)
+})
+
+const orderList = ref([])
+const toOrderRead = () => {
+  dohttp.post(urls.orderToRead).then((result) => {
+
+  })
+}
+	
+	const onShareAppMessage = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    path: '/pages/index/index', // 分享的路径
+	  };
+	};
+	 
+	const onShareTimeline = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    query: 'id=5', // 分享路径的参数
+	  };
+	};
+
+const requestParam = ref({
+  pageNo: 1,
+  pageSize: 10
+})
+const totalNum = ref(0)
+const getOrderList = () => {
+  dohttp.post(urls.orderList, requestParam.value).then((result) => {
+    orderList.value = [...orderList.value, ...result.list]
+    totalNum.value = result.totalNum
+    // 确保图片加载完成
+    nextTick(() => {
+      setTimeout(() => {
+        checkContentHeight()
+        // 添加重试机制
+        if (!enableScroll.value) setTimeout(checkContentHeight, 500)
+      }, 300)
+    })
+  })
+}
+
+
+const findOtherDoctor = () => {
+  uni.switchTab({
+    "url": "/pages/consult/consult",
+    "animationType": "pop-in"
+  })
+}
+
+
+const deleteOrder = (item) => {
+
+  uni.showModal({
+    content: '是否删除该订单信息,删除后将不能恢复',
+    success: function(res) {
+      if (res.confirm) {
+        dohttp.post(urls.deleteOrder + "?orderId=" + item.id).then((result) => {
+          if (result) {
+            orderList.value = orderList.value.filter(order => order.id !== item.id);
+            // getOrderList()
+            uni.showToast({
+              title: '删除成功',
+              duration: 1500
+            });
+          }
+        })
+      }
+    }
+  })
+}
+
+const consultAgain = (item) => {
+  dohttp.navigateTo("/pages/consult-detail/consult-detail?id=" + item.doctorId)
+}
+
+const toPay = (item) => {
+  let params = {
+    orderSn: item.orderSn
+  }
+  dohttp.get(urls.getPayParam, params).then((result) => {
+    console.log("urls.getPayParam", result)
+    uni.requestPayment({
+      provider: 'wxpay',
+      timeStamp: result.timeStamp,
+      nonceStr: result.nonceStr,
+      package: result.packageStr,
+      signType: result.signType,
+      paySign: result.paySign,
+      success: function (res) {
+        console.log('success:' + JSON.stringify(res));
+      },
+      fail: function (err) {
+        console.log('fail:' + JSON.stringify(err));
+      }
+    })
+  })
+
+}
+
+
+const toDetail = (item) => {
+  dohttp.navigateTo("/pages/order-detail/order-detail?id=" + item.id)
+}
+const cancelOrder = (item) => {
+
+  uni.showModal({
+    content: '确定取消该订单吗?',
+    success: function(res) {
+      if (res.confirm) {
+        dohttp.post(urls.cancelOrder + "?orderId=" + item.id).then((result) => {
+          if (result) {
+            item.status = 9
+            item.cancelFlag = 2
+            uni.showToast({
+              title: '取消成功',
+              duration: 1500
+            });
+          }
+        })
+      }
+    }
+  })
+}
+const toConsultAppointment = () => {
+  dohttp.navigateTo("/pages/consult-appointment/consult-appointment")
+}
+
+const scrolltolower = () => {
+  if (totalNum.value > requestParam.value.pageNo * requestParam.value.pageSize) {
+    requestParam.value.pageNo += 1
+    getOrderList()
+  } else {
+    uni.showToast({
+      title: '没有更多数据了',
+      duration: 1500
+    });
+  }
+
+
+}
+</script>
+
+<style scoped>
+.content {
+  width: 100vw;
+  height: 100vh;
+  background-color: #F9F6F5;
+  display: flex;
+  flex-direction: column;
+  font-family: SourceHanSans;
+  background-image: url('https://miniapp.yuxingu.com.cn/yxg-mp/pic/bg-all.png');
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+}
+
+
+.scroll-style {
+  box-sizing: border-box;
+  padding: 0 !important;
+  /* 清除可能的内边距 */
+}
+
+.show-name {
+  font-family: SourceHanSansBold;
+  font-size: 40rpx;
+  font-variation-settings: "opsz" auto;
+  color: #614D49;
+}
+
+.consult-method-text {
+  font-size: 24rpx;
+  font-variation-settings: "opsz" auto;
+  /* 正文色/正文辅助4 */
+  color: #9B918C;
+}
+
+.order-text {
+  font-size: 20rpx;
+  font-variation-settings: "opsz" auto;
+  color: #9B918C
+}
+
+.rmb-text {
+  color: #F37155;
+  font-family: SourceHanSansBold;
+  font-size: 36rpx;
+}
+
+.effect-time-text {
+  color: #EA4E2D;
+  font-weight: 700;
+  font-size: 20rpx;
+
+}
+
+.time-text {
+  font-size: 24rpx;
+  font-variation-settings: "opsz" auto;
+  /* 正文色/正文色辅助3 */
+  color: #909099;
+}
+
+.order-status-text1 {
+  font-size: 28rpx;
+  font-family: SourceHanSansBold;
+  font-variation-settings: "opsz" auto;
+  color: #DB0000;
+}
+
+.order-status-text2 {
+  font-size: 28rpx;
+  font-family: SourceHanSansBold;
+  font-variation-settings: "opsz" auto;
+  color: #00B637;
+}
+
+.btn {
+  width: 152rpx;
+  height: 56rpx;
+  border-radius: 2002rpx;
+
+
+  /* 自动布局 */
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: linear-gradient(180deg, #FF9079 0%, #F37155 100%);
+}
+
+.btn-text {
+
+  font-size: 28rpx;
+  font-family: SourceHanSansBold;
+  color: #FFFFFF;
+}
+
+.btn1 {
+  width: 152rpx;
+  height: 56rpx;
+  border-radius: 2002rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  box-sizing: border-box;
+  border: 2rpx solid #F36749;
+}
+
+.btn-text1 {
+
+  font-size: 28rpx;
+  font-family: SourceHanSansBold;
+  color: #F36749;
+}
+
+.contact-btn {
+  border: none;
+  outline: none;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 0rpx;
+  margin: 0rpx;
+  background-color: transparent;
+  display: flex;
+  align-items: center;
+}
+</style>
\ No newline at end of file
diff --git a/pages/pay-demo/pay-demo.vue b/pages/pay-demo/pay-demo.vue
new file mode 100644
index 0000000..44fab18
--- /dev/null
+++ b/pages/pay-demo/pay-demo.vue
@@ -0,0 +1,101 @@
+<template>
+	<view class="content">
+		<myNav title="支付demo" bgColor="nonoe" titleColor="#614D49" :backIcon="false" :backHome="false" :flex="false">
+		</myNav>
+
+
+		<view class="button-container">
+			<button class="start-btn" @click="toPay">立即支付</button>
+		</view>
+		
+		<view class="button-container">
+			<button class="start-btn" @click="refund">立即退款</button>
+		</view>
+		
+	</view>
+</template>
+
+<script setup>
+	import {
+		onMounted,
+		ref
+	} from 'vue'
+	import myNav from '@/components/my-nav.vue'
+	import {
+		urls
+	} from '@/util/apiUrl.js'
+	import dohttp from '@/util/requestConfig.js'
+	const provider = ref("")
+
+
+	const toPay = async() => {
+		const result = await createOrder()
+		console.log("toPay------------",result)
+		uni.requestPayment({
+			provider:'wxpay',
+			timeStamp:result.timeStamp,
+			nonceStr:result.nonceStr,
+			package:result.packageStr,
+			signType:result.signType,
+			paySign:result.paySign,
+			 success: function (res) {
+			        console.log('success:' + JSON.stringify(res));
+			    },
+			    fail: function (err) {
+			        console.log('fail:' + JSON.stringify(err));
+			    }
+		})
+		
+		
+	}
+
+	const createOrder=()=>{
+		return  dohttp.post(urls.createOrder)	
+	}
+	const refund=()=>{
+		
+		  dohttp.post(urls.refund).then((result)=>{
+			  console.log("urls.refundurls.refund",result)
+		  })	
+		
+	}
+
+	onMounted(() => {
+		
+		uni.getProvider({
+			"service": "payment",
+			success(data) {
+				if (data.provider && data.provider.length > 0) {
+					provider.value = data.provider[0]
+				}
+			}
+		})
+
+	})
+</script>
+
+<style scoped>
+	.content {
+		width: 100vw;
+		height: 100vh;
+		background-color: #f9f8f8;
+		display: flex;
+		flex-direction: column;
+		font-family: SourceHanSansBold;
+	}
+
+	/* 按钮 */
+	.button-container {
+		text-align: center;
+		margin-top: 40rpx;
+	}
+
+	.start-btn {
+		width: 50%;
+		background: linear-gradient(to right, #7c5afe, #6253e5);
+		color: white;
+		font-size: 24rpx;
+		border-radius: 50rpx;
+		text-align: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/personal-center/personal-center.vue b/pages/personal-center/personal-center.vue
new file mode 100644
index 0000000..920d33c
--- /dev/null
+++ b/pages/personal-center/personal-center.vue
@@ -0,0 +1,236 @@
+<template>
+	<view class="content">
+		<myNav title="我的" bgColor="#fff" titleColor="#614D49" :backIcon="false" :backHome="false" :flex="false"></myNav>
+		<view
+			style="display: flex;margin-top: 20rpx; flex-direction: column;align-items: center;padding: 40rpx;box-sizing: border-box;width: 100%;">
+			<view style="display: flex;align-items: center;justify-content: space-between;width: 100%;">
+				<view style="display: flex;align-items: center;">
+					<image v-if="showObj.avatarUrl" :src="showObj.avatarUrl" style="width: 120rpx;height: 120rpx;border-radius: 120rpx;"></image>
+					<image v-else src="/static/n-pc/head.png" style="width: 120rpx;height: 120rpx;"></image>
+					<text v-if="showObj.nickName"  class="p-name" style="margin-left: 48rpx;">{{showObj.nickName}}</text>
+					<text v-else  class="p-name" style="margin-left: 48rpx;">未登录</text>
+					
+				</view>
+				<view style="display: flex;justify-content: flex-end;align-items: center;height: 50%;width: 80rpx;" @click="editUserInfo">
+					<image src="/static/n-pc/p-left.png" style="width: 12rpx;height: 22rpx" ></image>
+					
+				</view>	
+			</view>
+			<view
+				style="display: flex;align-items: center;justify-content: space-between;width: 100%;margin-top: 40rpx;">
+				<view style="position: relative;width: 316rpx;height: 138rpx;"  @click="myOrder">
+					<image src="/static/n-pc/order-bg.png"
+						style="position: absolute;width: 100%;height: 100%;z-index: 0;"></image>
+					<view style="display: flex;position: absolute;z-index: 1;width: 316rpx;height: 138rpx;">
+						<image src="/static/n-pc/wd-dd.png" mode="heightFix"
+							style="height: 74rpx;width: 66rpx;margin-left: 40rpx;margin-top: 28rpx;"></image>
+						<view
+							style="display: flex;flex-direction: column;margin-top: 26rpx;margin-left:20rpx;align-items: center;">
+							<text class="p-title">我的订单</text>
+							<text v-if="notReadNumObj?.orderNum&&notReadNumObj?.orderNum>0" class="p-num" style="margin-top: -10rpx;color: #B6640B;">{{notReadNumObj?.orderNum ? notReadNumObj?.orderNum : 0}}</text>
+						</view>
+					</view>
+				</view>
+				<view style="position: relative;width: 316rpx;height: 138rpx;" @click="myFocus">
+					<image src="/static/n-pc/focus-bg.png"
+						style="position: absolute;width: 100%;height: 100%;z-index: 0;"></image>
+					<view style="display: flex;position: absolute;z-index: 1;width: 316rpx;height: 138rpx;">
+						<image src="/static/n-pc/wd-gz.png" mode="heightFix"
+							style="height: 74rpx;width: 66rpx;margin-left: 40rpx;margin-top: 28rpx;"></image>
+						<view
+							style="display: flex;flex-direction: column;margin-top: 26rpx;margin-left:20rpx;align-items: center;">
+							<text class="p-title">我的关注</text>
+							<text v-if="notReadNumObj?.focusNum&&notReadNumObj?.focusNum>0" class="p-num" style="margin-top: -10rpx;color: #DC2602;">{{notReadNumObj?.focusNum ? notReadNumObj?.focusNum : 0}}</text>
+						</view>
+					</view>
+				</view>
+
+			</view>
+
+			<view style="display: flex;justify-content: space-between;width: 100%;margin-top: 40rpx;flex-direction: column;padding: 40rpx 40rpx;
+						border-radius: 32rpx; box-sizing: border-box;background-color: #fff;">
+						
+				<view style="display: flex;align-items: center;"    @click="toMyTest">
+					<image src="/static/n-pc/wd-wdpc.png" style="width:38rpx ;height: 38rpx;"></image>
+					<text class="p-menu" style="margin-left:42rpx; ">我的评测</text>
+					<view style="flex: 1;text-align: right;">
+						<image src="/static/n-pc/p-left.png" style="width: 12rpx;height: 22rpx;"></image>
+					</view>
+				</view>
+				<view style="display: flex;align-items: center;margin-top: 62rpx"    @click="toConsultAppointment">
+					<image src="/static/n-pc/wd-zxyx.png" style="width:38rpx ;height: 38rpx;"></image>
+					<text class="p-menu" style="margin-left:42rpx; ">咨询预约协议</text>
+					<view style="flex: 1;text-align: right;">
+						<image src="/static/n-pc/p-left.png" style="width: 12rpx;height: 22rpx;"></image>
+					</view>
+				</view>
+				<view style="display: flex;align-items: center;margin-top: 62rpx" @click="toKefu">
+					<image src="/static/n-pc/wd-kf.png" style="width:38rpx ;height: 38rpx;"></image>
+					<text class="p-menu" style="margin-left:42rpx; ">联系客服</text>
+					<view style="flex: 1;text-align: right;">
+						<image src="/static/n-pc/p-left.png" style="width: 12rpx;height: 22rpx;"></image>
+					</view>
+				</view>
+				<view style="display: flex;align-items: center;margin-top: 62rpx" @click="toFeedback">
+					<image src="/static/n-pc/wd-yj.png" style="width:38rpx ;height: 38rpx;"></image>
+					<text class="p-menu" style="margin-left:42rpx; ">意见反馈</text>
+					<view style="flex: 1;text-align: right;">
+						<image src="/static/n-pc/p-left.png" style="width: 12rpx;height: 22rpx;"></image>
+					</view>
+				</view>
+			</view>
+
+		</view>
+
+	</view>
+</template>
+
+<script setup>
+	import myNav from '@/components/my-nav.vue'
+	import {
+		urls
+	} from '@/util/apiUrl.js'
+	import dohttp from '@/util/requestConfig.js'
+	
+	const onShareAppMessage = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    path: '/pages/index/index', // 分享的路径
+	  };
+	};
+	 
+	const onShareTimeline = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    query: 'id=4', // 分享路径的参数
+	  };
+	};
+
+	const editUserInfo = () => {
+		dohttp.navigateTo("/pages/edit-userinfo/edit-userinfo")
+	}
+
+	const toKefu = () => {
+		dohttp.navigateTo("/pages/customer-service/customer-service")
+	}
+	const toFeedback = () => {
+		dohttp.navigateTo("/pages/feedback/feedback")
+	}
+	
+	const myFocus=()=>{
+		dohttp.navigateTo("/pages/my-focus/my-focus?num="+notReadNumObj.value?.focusNum)
+	}
+	const myOrder=()=>{
+		dohttp.navigateTo("/pages/order/order?num="+notReadNumObj.value?.orderNum)
+		
+	}
+	const showObj=ref({
+		id: null,
+		avatarUrl: null,
+		nickName: null
+	})
+	const notReadNumObj=ref({})
+	const notReadNum=()=>{
+		dohttp.get(urls.notReadNum).then((result) => {
+			notReadNumObj.value.id= result.id
+			notReadNumObj.value.focusNum = result.focusNum
+			notReadNumObj.value.orderNum = result.orderNum
+		})
+	}
+	
+	onLoad((option) => {
+		const isLoggedIn = uni.getStorageSync('token'); // 假设 token 保存在本地存储
+		if (!isLoggedIn) {
+			// uni.navigateTo({
+			// 	"url": "/pages/login-pop/login-pop?type=3&path=/pages/personal-center/personal-center",
+			// 	"animationType": "pop-in"
+			// })
+			return
+		}
+		
+		const userinfo = uni.getStorageSync('userinfo')
+		if(userinfo){
+			showObj.value.avatarUrl= userinfo.avatarUrl
+			showObj.value.nickName = userinfo.nickName
+			if(!showObj.value.nickName){
+				showObj.value.nickName = "微信用户"
+			}
+		}else{
+			getUserInfo()
+		}
+		
+		notReadNum()
+	})
+	const getUserInfo = () => {
+		dohttp.get(urls.getSelfInfo).then((result) => {
+			const userinfo = {
+				avatarUrl: result.avatarUrl,
+				nickName: result.nickName
+			}
+			uni.setStorageSync('userinfo', userinfo)
+			showObj.value.avatarUrl= result.avatarUrl
+			showObj.value.nickName = result.nickName
+			if(!showObj.value.nickName){
+				showObj.value.nickName = "微信用户"
+			}
+		})
+
+	}
+  onShow(() => {
+		const userinfo = uni.getStorageSync('userinfo')
+		if(userinfo){
+			showObj.value.avatarUrl= userinfo.avatarUrl
+			showObj.value.nickName = userinfo.nickName
+			if(!showObj.value.nickName){
+				showObj.value.nickName = "微信用户"
+			}
+		}else{
+			getUserInfo()
+		}
+		notReadNum()
+	})
+	const toConsultAppointment=()=>{
+		dohttp.navigateTo("/pages/consult-appointment/consult-appointment")
+	}
+	const toMyTest=()=> {
+		dohttp.navigateTo("/pages/my-test/my-test")
+	}
+</script>
+
+<style scoped>
+	.content {
+		width: 100vw;
+		height: 100vh;
+		background-color: #F9F6F5;
+		display: flex;
+		flex-direction: column;
+		font-family: SourceHanSans;
+		background-image: url('https://miniapp.yuxingu.com.cn/yxg-mp/pic/botton.png');
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+	}
+
+	.p-name {
+		font-size: 40rpx;
+		font-family: SourceHanSansBold;
+		color: #3D3D3D;
+	}
+
+	.p-title {
+		font-size: 28rpx;
+		font-family: SourceHanSansBold;
+		color: #614D49;
+
+	}
+
+	.p-num {
+		font-size: 40rpx;
+		font-family: SourceHanSansBold;
+	}
+
+	.p-menu {
+		font-size: 28rpx;
+		color: #3D3D3D;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/show-banner/show-banner.vue b/pages/show-banner/show-banner.vue
new file mode 100644
index 0000000..3838710
--- /dev/null
+++ b/pages/show-banner/show-banner.vue
@@ -0,0 +1,42 @@
+<template>
+	<view class="content">
+		<myNav title="" bgColor="#fff" titleColor="#614D49" :backIcon="true" :backHome="false" :flex="false" ></myNav>
+		<view style="box-sizing: border-box;overflow-y: auto;margin-top: 5rpx;">
+			<image :src="showUrl" style="width: 100%;"
+				mode="widthFix"></image>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import myNav from '@/components/my-nav.vue'
+	import {
+		urls
+	} from '@/util/apiUrl.js'
+	import dohttp from '@/util/requestConfig.js'
+	const showUrl=ref()
+	onLoad((option) => {
+		if(option.url){
+			showUrl.value = option.url
+		}else{
+			//TODO 报错 返回首页
+		}	
+
+	})
+</script>
+
+<style scoped>
+	.content {
+		width: 100vw;
+		height: 100vh;
+		background-color: #f9f8f8;
+		display: flex;
+		flex-direction: column;
+		font-family: 'pingfang';
+	}
+
+  image {
+    image-rendering: -webkit-optimize-contrast;
+    image-rendering: crisp-edges;
+  }
+</style>
\ No newline at end of file
diff --git a/pages/show-image/show-image.vue b/pages/show-image/show-image.vue
new file mode 100644
index 0000000..217f801
--- /dev/null
+++ b/pages/show-image/show-image.vue
@@ -0,0 +1,34 @@
+<template>
+	<view class="content">
+		<myNav title="" bgColor="#fff" titleColor="#614D49" :backIcon="true" :backHome="false" :flex="false"></myNav>
+
+	</view>
+</template>
+
+<script setup>
+import myNav from '@/components/my-nav.vue'
+import {
+  urls
+} from '@/util/apiUrl.js'
+import dohttp from '@/util/requestConfig.js'
+
+
+
+
+
+</script>
+
+<style scoped>
+.content {
+  width: 100vw;
+  height: 100vh;
+  background-color: #f9f8f8;
+  display: flex;
+  flex-direction: column;
+  font-family: SourceHanSansBold;
+}
+
+
+
+
+</style>
diff --git a/pages/show-question/show-question.vue b/pages/show-question/show-question.vue
new file mode 100644
index 0000000..2d0eb38
--- /dev/null
+++ b/pages/show-question/show-question.vue
@@ -0,0 +1,388 @@
+<template>
+	<view class="content">
+		<myNav :title="showTitle" bgColor="nonoe" titleColor="#614D49" :backIcon="true" :backHome="false" :flex="false">
+		</myNav>
+		<view class="flex-justify-center">
+			<view class="choice-process">
+				<text class="chice-show-num" style="margin-left: 36rpx;">
+					{{ answerList.length }}/{{ showListData.length }}
+				</text>
+				<view style="width: 416rpx;margin-left: 15rpx;margin-right: 16rpx;height: 18rpx;">
+					<uv-line-progress :percentage="percentage" :showText="false" activeColor="#F37155"
+						style=""></uv-line-progress>
+				</view>
+				<text class="chice-show-title" style="margin-left: 10rpx;">
+					单选题
+				</text>
+			</view>
+		</view>
+		<view class="flex-justify-center">
+			<view class="question-show">
+
+				<image v-if="showData.questionImgae" style="width:100%;margin-top: 40rpx;" :src="showData.questionImgae"
+					mode="aspectFill"></image>
+
+				<text class="question-content">
+					{{ showData.seq + 1 }}、{{ showData.questionText }}
+				</text>
+
+				<view class="option-show" v-for="(item, index) in showData.questionOptionVOList"
+					@click="toChoice(item,index)" :key="index">
+					<view :style="{color:showData.choiceindex&&showData.choiceindex==(index+1)?'#EA4E2D':'#303044'}">
+						<text>{{ getLabel(index) }}</text>
+						<text style="margin-left: 10rpx;">{{ item.optionText }}</text>
+					</view>
+
+					<view v-if="showData.choiceindex&&showData.choiceindex==(index+1)" class="no-choice">
+						<view class="choice-selected"></view>
+					</view>
+					<view v-else class="no-choice"></view>
+				</view>
+			</view>
+		</view>
+
+
+
+		<view class="button-container" style="display: flex;" v-if="showData.seq==(showListData.length-1)">
+			<button class="start-btn1" style="margin-left: 120rpx;" @click="toPre">
+				<text class="button-text">
+					上一题
+				</text>
+			</button>
+			<button class="start-btn1" style="margin-right: 120rpx;" @click="complete">
+				<text class="button-text">
+					完成
+				</text>
+			</button>
+		</view>
+		<view v-if="showData.seq>0&&showData.seq!=(showListData.length-1)" class="button-container">
+			<button class="start-btn" @click="toPre">
+
+				<text class="button-text">
+					上一题
+				</text>
+
+			</button>
+		</view>
+
+
+
+	</view>
+</template>
+
+<script setup>
+	import myNav from '@/components/my-nav.vue'
+	import {
+		urls
+	} from '@/util/apiUrl.js'
+	import dohttp from '@/util/requestConfig.js'
+
+	const showListData = ref([])
+	const showTitle = ref("")
+	const answerList = ref([])
+	const percentage = ref(0)
+	const showData = ref({})
+	const testId = ref(null)
+	const costTime = ref(0)
+	const testPic = ref("")
+
+
+	onLoad((option) => {
+
+		const instance = getCurrentInstance().proxy
+		const eventChannel = instance.getOpenerEventChannel();
+		eventChannel.on('acceptDataFromOpenerPage', function(data) {
+
+			showListData.value = data.data
+			showTitle.value = data.showTitle
+			testPic.value = data.testPic
+			testId.value = data.testId
+
+
+			let index = 0
+			showData.value = showListData.value[index]
+			showData.value.seq = index
+			percentage.value = (answerList.value.length / showListData.value.length).toFixed(2) * 100
+			setInterval(() => {
+				costTime.value = costTime.value + 1
+			}, 1000)
+		})
+
+	})
+	onMounted(() => {
+		// showListData.value = uni.getStorageSync("data")
+		// showTitle.value = uni.getStorageSync("showTitle")
+	})
+
+	const getLabel = (index) => {
+		return String.fromCharCode(65 + index) + "" // A. B. C. D.
+	}
+	const toChoice = (item, index) => {
+		for (let i = 0; i < answerList.value.length; i++) {
+			if (answerList.value[i].questionId == showData.value.id) {
+				answerList.value[i].optionId = item.id
+				showData.value.choiceindex = index + 1
+				toNext()
+				return
+			}
+		}
+		answerList.value.push({
+			optionId: item.id,
+			questionId: showData.value.id
+		})
+		percentage.value = (answerList.value.length / showListData.value.length).toFixed(2) * 100
+		showData.value.choiceindex = index + 1
+		toNext()
+	}
+	const toNext = () => {
+		let currentIndex = showData.value.seq + 1
+		if (showListData.value[currentIndex]) {
+			showData.value = showListData.value[currentIndex]
+			showData.value.seq = currentIndex
+
+		}
+	}
+
+	const toPre = () => {
+		let currentIndex = showData.value.seq - 1
+		if (showListData.value[currentIndex]) {
+			showData.value = showListData.value[currentIndex]
+			showData.value.seq = currentIndex
+		}
+	}
+
+	const complete = () => {
+		let params = {
+			id: testId.value,
+			totalTime: costTime.value,
+			userChoiceOptionVOList: answerList.value
+		}
+		if (answerList.value.length != showListData.value.length) {
+			// const uniqueIds = showListData.value
+			// 	.filter(item => !answerList.value.some(sItem => sItem.questionId === item.id))
+			// 	.map(item => item.id);
+					console.log("ssssssssssss",answerList.value,showListData.value)
+			const map = answerList.value.reduce((acc, item) => {
+			  acc.set(item.questionId, item); 
+			  return acc;
+			}, new Map());		
+					
+					
+			for (let i = 0; i < showListData.value.length; i++) {
+				let ele= map.get(showListData.value[i].id)
+				if(!ele){
+          let req = showListData.value[i].seq+1
+          uni.showModal({
+            title: '提示',
+            content: '序号为'+req+"的题目还未选择，请选择后再提交",
+            showCancel: false,
+            success: function (res) {
+              if (res.confirm) {
+
+              }
+            }
+          })
+				}
+				
+			}
+			return
+		}
+		dohttp.post(urls.userChoiceSave, params).then((result) => {
+			dohttp.navigateTo("/pages/test-result/test-result?resultId=" + result)
+		})
+	}
+	
+	const onShareAppMessage = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    path: '/pages/index/index', // 分享的路径
+	  };
+	};
+	 
+	const onShareTimeline = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    query: 'id=32', // 分享路径的参数
+	  };
+	};
+</script>
+
+<style scoped>
+	.content {
+		width: 100vw;
+		height: 100vh;
+		background-color: #f9f8f8;
+		display: flex;
+		flex-direction: column;
+		font-family: SourceHanSans;
+	}
+
+	.section {
+		background: white;
+		margin: 20rpx 30rpx;
+		padding: 27rpx 20rpx;
+		border-radius: 10rpx;
+		box-shadow: 0rpx 4rpx 8rpx rgba(0, 0, 0, 0.01);
+		height: fit-content;
+		display: flex;
+		align-items: center;
+	}
+
+	/* 顶部图片 */
+	.banner {
+		width: 690rpx;
+		height: 440rpx;
+		object-fit: cover;
+		margin-top: 20rpx;
+	}
+
+	/* 按钮 */
+	.button-container {
+		text-align: center;
+		margin-top: auto;
+		margin-bottom: 60rpx;
+	}
+
+	.start-btn {
+		width: 550rpx;
+		height: 96rpx;
+		border-radius: 2002rpx;
+		opacity: 1;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		padding: 8rpx 40rpx;
+
+		background: linear-gradient(180deg, #FF9079 0%, #F37155 100%);
+	}
+
+	.start-btn1 {
+	width: 250rpx;
+	height: 96rpx;
+	border-radius: 2002rpx;
+	opacity: 1;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	padding: 8rpx 40rpx;
+	
+	background: linear-gradient(180deg, #FF9079 0%, #F37155 100%);
+	}
+
+
+	.flex-justify-center {
+		display: flex;
+		justify-content: center;
+	}
+
+	.choice-process {
+		/* 正文色/正文色 */
+		background: #FFFFFF;
+		width: 670rpx;
+		height: 128rpx;
+		border-radius: 10rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.chice-show-num {
+		width: 70rpx;
+		height: 46rpx;
+		opacity: 1;
+
+		/* 按钮/按钮文本中号加粗 */
+		font-family: SourceHanSansBold;
+		font-size: 32rpx;
+		line-height: normal;
+		text-align: center;
+		letter-spacing: 0rpx;
+		font-variation-settings: "opsz" auto;
+		color: #9B918C;
+
+	}
+
+	.chice-show-title {
+
+		/* 正文/正文文本1 */
+		font-family: SourceHanSans;
+		font-size: 28rpx;
+		font-weight: normal;
+		line-height: normal;
+		letter-spacing: 0rpx;
+		font-variation-settings: "opsz" auto;
+		color: #9B918C;
+
+	}
+
+	.question-show {
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+		width: 670rpx;
+		margin-top: 20rpx;
+		border-radius: 10rpx;
+		background: #FFFFFF;
+		padding-left: 40rpx;
+		padding-right: 40rpx;
+		padding-bottom: 40rpx;
+	}
+
+	.question-content {
+		font-family: SourceHanSansBold;
+		font-size: 36rpx;
+		line-height: normal;
+		letter-spacing: 0rpx;
+
+		font-variation-settings: "opsz" auto;
+		/* 背景色/浅色背景2 */
+		color: #614D49;
+		margin-top: 40rpx;
+	}
+
+	.option-show {
+		display: flex;
+		margin-top: 40rpx;
+		align-items: center;
+		font-family: SourceHanSans;
+		justify-content: space-between;
+		font-size: 32rpx;
+		font-weight: normal;
+		line-height: normal;
+		letter-spacing: 0px;
+
+		font-variation-settings: "opsz" auto;
+		/* 背景色/浅色背景2 */
+		color: #614D49;
+	}
+
+	.no-choice {
+		width: 40rpx;
+		height: 40rpx;
+		box-sizing: border-box;
+		border: 1px solid #606271;
+		border-radius: 50%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.choice-selected {
+		width: 28rpx;
+		height: 28rpx;
+		border-radius: 50%;
+		background: #EA4E2D;
+	}
+
+	.button-text {
+		/* 按钮/按钮文本大号 */
+		/* 样式描述：常规大按钮 */
+		font-family: SourceHanSansBold;
+		font-size: 36rpx;
+		line-height: normal;
+		letter-spacing: 0px;
+		/* 正文色/正文色 */
+		color: #FFFFFF;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/test-detail/test-detail.vue b/pages/test-detail/test-detail.vue
new file mode 100644
index 0000000..6cedf14
--- /dev/null
+++ b/pages/test-detail/test-detail.vue
@@ -0,0 +1,360 @@
+<template>
+	<view class="content">
+		<myNav :title="title" bgColor="nonoe" titleColor="#614D49" :backIcon="true" :backHome="false" :flex="false">
+		</myNav>
+
+		<view style="display: flex;flex-direction: column;align-items: center;overflow-y: auto; ">
+			<view style="height: 100%;padding-bottom: 220rpx;display: flex;flex-direction: column;align-items: center;">
+				
+		
+			<image src="/static/n-test/test-bg-n.png" style="width: 750rpx;height: 420rpx;"></image>
+			<!-- 评测卡片 -->
+			<view class="card">
+				<view style="border-radius: 10px 10px 0px 0px;background: linear-gradient(180deg, #FFE7D9 0%, rgba(255, 255, 255, 0) 98%);
+					height: 60rpx;width: 670rpx;opacity: 1;">
+					<image :src="showData.testPic" style="width: 88rpx;height: 88rpx;border-radius: 558rpx;
+			border: 8rpx solid #FFFFFF;margin-left: 92rpx;margin-top: -48rpx;"></image>
+				</view>
+				<view style="padding-left: 40rpx;padding-right: 40rpx;display: flex;flex-direction: column;">
+					<text class="card-title">{{showData.testName}}</text>
+					<view style="display: flex;align-items: center;">
+						<image src="/static/n-test/hz-icon.png" style="width: 48rpx;height: 48rpx;"></image>
+						<text class="card-subtitle">{{showData.subTitle}}</text>
+					</view>
+				</view>
+				<view class="stats">
+					<!-- <image src="@/static/fire-icon.png" class="fire-icon"></image> -->
+					<image src="/static/n-test/icon1.png" style="width: 14rpx;height: 18rpx;margin-right: 10rpx;">
+					</image>
+					<text v-if="showData.questionDetailVOList&&showData.questionDetailVOList.length>0"
+						class="stats-text"
+						style="margin-right: 50rpx;">{{showData.questionDetailVOList.length}}道精选题</text>
+					<image src="/static/n-test/icon2.png" style="width: 16.54rpx;height: 17.5rpx;margin-right: 10rpx;">
+					</image>
+					<text class="stats-text">{{showData.showNum}}人已测</text>
+				</view>
+			</view>
+
+
+			<view style="display: flex;justify-content: center;height: 284rpx;">
+				<view class="introduce-card" style="">
+					<view style="width: 670rpx;height: 60rpx;
+						border-radius: 10rpx 10rpx 0rpx 0rpx;opacity: 1;
+							background: linear-gradient(180deg, #DEE8FF 0%, rgba(255, 255, 255, 0) 98%);">
+					</view>
+					<view style="display: flex;flex-direction: column;overflow-y: auto;margin-top: -28rpx;">
+						<view style="display: flex;padding-left: 40rpx;padding-right: 40rpx;flex-direction: column;">
+							<view style="display: flex;align-items: center;">
+								<view style="width: 12rpx;height: 38rpx;background: #99B1FF;border-radius: 180rpx;">
+								</view>
+								<text style="color: #614D49;margin-left: 6rpx;
+						font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+						font-size: 40rpx;
+						line-height: normal;
+						text-align: center;
+						letter-spacing: 0px;">
+									测评介绍
+								</text>
+							</view>
+							<rich-text class="rich-text" :nodes="showData.testIntroduction"></rich-text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view style="display: flex;justify-content: center;margin-top: 20rpx;height: 284rpx;">
+				<view class="introduce-card" style="">
+					<view style="width: 670rpx;height: 60rpx;
+						border-radius: 10rpx 10rpx 0rpx 0rpx;opacity: 1;
+							background: linear-gradient(180deg, #DEE8FF 0%, rgba(255, 255, 255, 0) 98%);">
+					</view>
+					<view style="display: flex;flex-direction: column;overflow-y: auto;margin-top: -28rpx;">
+						<view style="display: flex;padding-left: 40rpx;padding-right: 40rpx;flex-direction: column;">
+							<view style="display: flex;align-items: center;">
+								<view style="width: 12rpx;height: 38rpx;background: #99B1FF;border-radius: 180rpx;">
+								</view>
+								<text style="color: #614D49;margin-left: 6rpx;
+						font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+						font-size: 40rpx;
+						line-height: normal;
+						text-align: center;
+						letter-spacing: 0px;">
+									测评须知
+								</text>
+							</view>
+							<rich-text class="rich-text" :nodes="showData.testNotice"></rich-text>
+							
+						</view>
+					</view>
+				</view>
+
+			</view>
+			
+				</view>
+		</view>
+		
+
+			<!-- 立即测评按钮 -->
+			<view class="button-container">
+				<button class="start-btn" @click="startTest"><text class="btn-text">立即测评</text></button>
+			</view>
+	</view>
+</template>
+
+<script setup>
+	import myNav from '@/components/my-nav.vue'
+	import {
+		urls
+	} from '@/util/apiUrl.js'
+	import dohttp from '@/util/requestConfig.js'
+	const title = ref("")
+	const showData = ref({})
+	onLoad((option) => {
+
+		if (option && option.id) {
+
+			dohttp.post(urls.getSingleDetail + "?studyId=" + option.id).then((result) => {
+
+				if (result) {
+					if (result.totalNum && Number(result.totalNum) >= 10000) {
+						result.showNum = (Number(result.totalNum) / 10000).toFixed(1) + "W"
+					} else {
+						result.showNum = result.totalNum
+					}
+
+					title.value = result.testName
+					showData.value = result
+				}
+
+			})
+		}
+		//计算滑动块的高度
+
+		let sysInfo = uni.getSystemInfoSync(); //状态栏的高度
+		// 胶囊位置信息
+		let rect = uni.getMenuButtonBoundingClientRect();
+
+		// 导航栏高度
+		let navBarHeight = (rect.top - sysInfo.statusBarHeight) * 2 + rect.height;
+		// 自定义导航栏的高度
+		let topHeight = sysInfo.statusBarHeight + navBarHeight;
+
+
+		const windowWidth = sysInfo.windowWidth; // 可用窗口宽度（px）
+
+		const bottomPx = 184 / (750 / windowWidth)
+
+
+		let contextHeight = sysInfo.screenHeight - topHeight - bottomPx
+
+		console.log("contextHeightcontextHeightcontextHeightcontextHeight", contextHeight)
+
+
+	})
+	
+	const onShareAppMessage = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    path: '/pages/index/index', // 分享的路径
+	  };
+	};
+	 
+	const onShareTimeline = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    query: 'id=31', // 分享路径的参数
+	  };
+	};
+
+	const startTest = () => {
+
+		let data = {
+			data: showData.value.questionDetailVOList,
+			showTitle: showData.value.testName,
+			testPic: showData.value.testPic,
+			testId: showData.value.id
+		}
+		dohttp.navigateTo("/pages/show-question/show-question", data)
+	}
+</script>
+
+<style>
+	.content {
+		width: 100vw;
+		height: 100vh;
+		background-color: #f9f8f8;
+		display: flex;
+		flex-direction: column;
+		font-family: SourceHanSans;
+		
+	}
+	/* 评测卡片 */
+	.card {
+		background: #FFFFFF;
+		margin: -26rpx 40rpx 20rpx 40rpx;
+		border-radius: 10rpx;
+		height: 284rpx;
+		width: 670rpx;
+		display: flex;
+		flex-direction: column;
+		/* padding-left: 40rpx;
+		padding-right: 40rpx; */
+	}
+
+	.card-title {
+		font-size: 40rpx;
+		letter-spacing: 0px;
+		font-variation-settings: "opsz" auto;
+		color: #614D49;
+		margin-top: 12rpx;
+		font-family: SourceHanSansBold;
+	}
+
+	.card-subtitle {
+		font-family: SourceHanSans;
+		font-size: 28rpx;
+		font-weight: normal;
+		line-height: normal;
+		text-align: center;
+		letter-spacing: 0px;
+
+		font-variation-settings: "opsz" auto;
+		/* 正文色/正文辅助4 */
+		color: #9B918C;
+	}
+
+	.stats {
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+		padding-bottom: 40rpx;
+		color: #909099;
+		margin-top: auto;
+		font-family: SourceHanSansBold;
+		font-size: 20rpx;
+		line-height: normal;
+		text-align: center;
+		letter-spacing: 0px;
+		font-variation-settings: "opsz" auto;
+		padding-left: 40rpx;
+		padding-right: 40rpx;
+	}
+
+	.fire-icon {
+		width: 36rpx;
+		height: 36rpx;
+		margin-right: 10rpx;
+	}
+
+	.stats-text {
+		font-size: 22rpx;
+		color: #909099;
+	}
+
+	/* 评测介绍 & 评测须知 */
+	.section {
+		background: white;
+		margin: 20rpx 30rpx;
+		padding: 20rpx 40rpx;
+		margin-top: 5rpx;
+		border-radius: 10rpx;
+		box-shadow: 0rpx 8rpx 16rpx rgba(0, 0, 0, 0.05);
+		height: 210rpx;
+		overflow-y: auto;
+	}
+
+	.section-header {
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+	}
+
+	.blue-bar {
+		width: 12rpx;
+		height: 34rpx;
+		background-color: #7f75ff;
+		margin-right: 5rpx;
+	}
+
+	.section-title {
+		font-size: 36rpx;
+		font-family: SourceHanSansBold;
+		color: #333;
+	}
+
+	.bold {
+		font-family: SourceHanSansBold;
+	}
+
+	.description {
+		font-size: 28rpx;
+		color: #666;
+		line-height: 1.6;
+		margin-top: 10rpx;
+	}
+
+	/* 按钮 */
+	.button-container {
+		bottom: 0;
+		position: fixed;
+		height: 184rpx;
+		width: 100%;
+		text-align: center;
+		background: #FFFFFF;
+		box-shadow: 0px 4rpx 12rpx 0px rgba(67, 33, 26, 0.3);
+	}
+
+	.start-btn {
+		margin-top: 24rpx;
+		width: 550rpx;
+		height: 96rpx;
+		border-radius: 2002rpx;
+		opacity: 1;
+
+		/* 自动布局 */
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		padding: 4rpx 20rpx;
+
+		background: linear-gradient(180deg, #FF9079 0%, #F37155 100%);
+	}
+
+	.btn-text {
+
+		/* 按钮/按钮文本大号 */
+		/* 样式描述：常规大按钮 */
+		font-family: SourceHanSansBold;
+		font-size: 36rpx;
+		line-height: normal;
+		letter-spacing: 0px;
+
+		/* 正文色/正文色 */
+		color: #FFFFFF;
+	}
+
+	/* 评测卡片 */
+	.introduce-card {
+		width: 670rpx;
+		height: 284rpx;
+		border-radius: 32rpx;
+		background: #FFFFFF;
+		display: flex;
+		flex-direction: column;
+
+	}
+
+	.rich-text {
+		margin-top: 20rpx;
+		font-family: Source Han Sans;
+		font-size: 24rpx;
+		font-weight: normal;
+		line-height: normal;
+		letter-spacing: 0rpx;
+
+		font-variation-settings: "opsz" auto;
+		/* 正文色/正文辅助4 */
+		color: #606271;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/test-list/test-list.vue b/pages/test-list/test-list.vue
new file mode 100644
index 0000000..6b2a50d
--- /dev/null
+++ b/pages/test-list/test-list.vue
@@ -0,0 +1,251 @@
+<template>
+	<view class="content">
+		<view class="banner"></view>
+		<view class="page">
+			<myNav title="心理测评" bgColor="nonoe" titleColor="#614D49" :backIcon="false" :backHome="false" :flex="false">
+			</myNav>
+			<scroll-view :scroll-y="enableScroll" @scrolltolower="scrolltolower" class="scroll-style">
+				<view ref="contentRef" id="contentContainer" style="display:flex;align-items:center;flex-direction:column;margin-top: 10rpx;">
+				<view v-for="(item,index) in testList" :key="index" style="width: 630rpx;display: flex;
+				align-items: center;justify-content: space-between;background:#FFFFFF;padding: 20rpx;border-radius: 10rpx;">
+						<view style="display: flex;">
+							<image :src="item.testPic" style="width: 140rpx;height: 140rpx;border-radius: 10rpx;">
+							</image>
+							<view style="display: flex;flex-direction: column;margin-left: 20rpx;">
+								<text style="color: #614D49;
+					font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+					font-size: 28rpx;
+					line-height: normal;
+					letter-spacing: 0px;">
+									{{item.testName}}
+								</text>
+								<view style="margin-top: 8rpx;display: flex;align-items: center;">
+									<!-- <image src="/static/n-main/fire-icon.png" style="width:19.04rpx ;height:26.28rpx ;"> -->
+									<!-- </image> -->
+									<view style="width: fit-content;margin-left: 10rpx;
+								border-radius: 32rpx;
+								display: flex;
+								text-align: center;
+								justify-content: center;
+								padding-top: 4rpx;
+								padding-bottom: 4rpx;
+								padding-left: 10rpx;
+								padding-right: 10rpx;
+								border: 1px solid #EA8D7A;">
+										<text style="color: #F37155;
+							font-family: SourceHanSans;ont-variation-settings: 'opsz' auto;
+							font-size: 20rpx;
+							font-weight: normal;
+							letter-spacing: 0px;">
+											{{item.showNum}}人已测
+										</text>
+									</view>
+
+								</view>
+
+								<text style="color: #9B918C;margin-top: 26rpx;
+					font-family: SourceHanSans;ont-variation-settings: 'opsz' auto;
+					font-size: 20rpx;
+					font-weight: normal;
+					line-height: normal;
+					letter-spacing: 0px;">
+									{{item.subTitle}}
+								</text>
+
+							</view>
+						</view>
+						<view style="width:fit-content;
+					height: fit-content;
+					border-radius: 2002rpx;
+					opacity: 1;
+					display: flex;
+					padding: 8rpx 40rpx;justify-content: center;align-items: center;
+					background: linear-gradient(180deg, #FF9079 0%, #F37155 100%);" @click="goTest(item)">
+							<text style="color: #FFFFFF;
+					font-family: SourceHanSans;ont-variation-settings: 'opsz' auto;
+					font-size: 28rpx;
+					font-weight: normal;
+					line-height: normal;
+					letter-spacing: 0px;">
+								测评
+							</text>
+						</view>
+					</view>
+					<view v-if="testList.length==0" style="margin-top: 50%;">
+						<text style="color: #303044;
+						font-family: SourceHanSansBold;ont-variation-settings: 'opsz' auto;
+						font-size: 28rpx;
+						line-height: normal;
+						letter-spacing: 0px;">
+								暂无测评信息
+							</text>
+					</view>
+				</view>
+
+			</scroll-view>
+
+
+
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import myNav from '@/components/my-nav.vue'
+	import {
+		urls
+	} from '@/util/apiUrl.js'
+	import dohttp from '@/util/requestConfig.js'
+
+	const testList = ref([])
+
+
+	onMounted(() => {
+		getPsychicTest()
+	})
+	const getPsychicTest = () => {
+		dohttp.post(urls.getPsychicListTest).then((result) => {
+			console.log("getPsychicTestgetPsychicTestgetPsychicTest", result)
+			if (result) {
+				result.forEach((ele) => {
+					if (ele.totalNum && Number(ele.totalNum) >= 10000) {
+
+						ele.showNum = (Number(ele.totalNum) / 10000).toFixed(1) + "W"
+
+					} else {
+						ele.showNum = ele.totalNum
+					}
+				})
+			}
+			testList.value = result
+			// 确保图片加载完成
+			nextTick(() => {
+				setTimeout(() => {
+					checkContentHeight()
+					// 添加重试机制
+					if (!enableScroll.value) setTimeout(checkContentHeight, 500)
+				}, 300)
+			})
+		})
+	}
+
+
+	const goTest = (item) => {
+
+		dohttp.navigateTo("/pages/test-detail/test-detail?id=" + item.id)
+
+	}
+
+	// 新增代码
+	import {
+		ref,
+		onMounted,
+		nextTick,
+		getCurrentInstance
+	} from 'vue'
+	const showHight = ref(0)
+	const instance = getCurrentInstance()
+	const enableScroll = ref(false) // 新增动态滚动控制
+	onLoad(() => {
+		const systemInfo = uni.getSystemInfoSync()
+		// 更精准的高度计算
+		showHight.value = (systemInfo.windowHeight * (750 / systemInfo.screenWidth)) - 180
+	})
+
+
+	// 新增高度检查方法
+	const checkContentHeight = () => {
+		const query = uni.createSelectorQuery().in(instance.proxy)
+		query.select('#contentContainer').boundingClientRect(rect => {
+			if (rect) {
+				const systemInfo = uni.getSystemInfoSync()
+
+				// 转换为rpx比较
+				// 计算容器实际像素高度
+				const containerHeightPx = (showHight.value * systemInfo.screenWidth) / 750
+				const threshold = 5 // 容错阈值
+
+				enableScroll.value = rect.height > (containerHeightPx + threshold)
+				console.log('[Layout Debug]', {
+					contentHeight: rect.height,
+					containerPx: containerHeightPx,
+					containerRpx: showHight.value,
+					shouldScroll: enableScroll.value
+				})
+			}
+		}).exec()
+	}
+	
+	const onShareAppMessage = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    path: '/pages/index/index', // 分享的路径
+	  };
+	};
+	 
+	const onShareTimeline = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    query: 'id=3', // 分享路径的参数
+	  };
+	};
+
+	// 初始加载检查
+	onMounted(() => {
+		nextTick(checkContentHeight)
+	})
+</script>
+
+<style scoped>
+	.content {
+		width: 100vw;
+		height: 100vh;
+		background-image: url('https://miniapp.yuxingu.com.cn/yxg-mp/pic/test-list-bg.png');
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+		display: flex;
+		flex-direction: column;
+		position: relative;
+	}
+
+	.page {
+		position: absolute;
+		width: 100vw;
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.banner {
+		background-image: url('https://miniapp.yuxingu.com.cn/yxg-mp/pic/botton.png');
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+		width: 750rpx;
+		height: 660rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		z-index: 0;
+	}
+
+	/* 修改 #contentContainer 样式 */
+	#contentContainer {
+		width: 100%;
+		min-height: 100%;
+		/* 新增关键属性 */
+		flex-shrink: 0;
+		/* 禁止收缩 */
+		overflow: visible;
+		/* 确保子元素不被裁剪 */
+	}
+
+	.scroll-style {
+		box-sizing: border-box;
+		padding: 0 !important;
+		/* 清除可能的内边距 */
+	}
+</style>
\ No newline at end of file
diff --git a/pages/test-result/test-result.vue b/pages/test-result/test-result.vue
new file mode 100644
index 0000000..3b2dcc2
--- /dev/null
+++ b/pages/test-result/test-result.vue
@@ -0,0 +1,203 @@
+<template>
+	<view class="content">
+		<myNav :title="showData.testName" bgColor="nonoe" titleColor="#614D49" :backIcon="backIcon" :backHome="false"
+			:flex="false">
+		</myNav>
+		<image class="show-header-bg" src="/static/n-test/test-result-bg.png" mode="aspectFill"></image>
+
+		<view class="flex-justify-center">
+			<view class="show-content">
+				<view class="content-top">
+				</view>
+				<view style="display: flex;justify-content: center;margin-top: 45rpx;">
+					<image src="/static/n-test/result-icon.png" style="width: 160rpx;height:188rpx"></image>
+				</view>
+
+				<view style="margin-top: 60rpx;padding-left: 40rpx;margin-right: 38rpx;">
+					<view class="section-content" v-if="showData.resultDesc">
+						<text style="font-size: 38rpx;font-family: 'SourceHanSansBold';">结果描述</text>
+						<rich-text style="margin-top: 20rpx;" :nodes="showData.resultDesc"></rich-text>
+					</view>
+					<view class="section-content" style="margin-top: 40rpx;" v-if="showData.resultAnalysis">
+						<text style="font-size: 38rpx;font-family: 'SourceHanSansBold';">结果分析</text>
+						<rich-text style="margin-top: 20rpx;" :nodes="showData.resultAnalysis"></rich-text>
+					</view>
+					<view class="section-content" style="margin-top: 40rpx;" v-if="showData.treatPlan">
+						<text style="font-size: 38rpx;font-family: 'SourceHanSansBold';">治疗方案</text>
+						<rich-text style="margin-top: 20rpx;" :nodes="showData.treatPlan"></rich-text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="button-container" style="margin-top: 60rpx;">
+			<button class="start-btn" @click="goMainPage"><text class="btn-text">返回主页</text></button>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import myNav from '@/components/my-nav.vue'
+	import {
+		urls
+	} from '@/util/apiUrl.js'
+	import dohttp from '@/util/requestConfig.js'
+
+	const showData = ref({})
+	const backIcon = ref(false)
+	onLoad((option) => {
+
+		dohttp.post(urls.getResult + "?resultId=" + option.resultId).then((result) => {
+			showData.value = result
+		})
+		let pages = getCurrentPages()
+
+		let prePage = pages[pages.length - 2]
+		if (prePage && prePage.route) {
+			if (prePage.route == "pages/my-test/my-test") {
+				backIcon.value = true
+			}
+		}
+	})
+	
+	const onShareAppMessage = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    path: '/pages/index/index', // 分享的路径
+	  };
+	};
+	 
+	const onShareTimeline = () => {
+	  return {
+        title: '快来体验一下吧~',
+	    query: 'id=33', // 分享路径的参数
+	  };
+	};
+
+	const goMainPage = () => {
+
+		uni.switchTab({
+			url: "/pages/index/index",
+			animationType: "pop-in"
+		})
+	}
+</script>
+
+<style scoped>
+	.content {
+		width: 100vw;
+		height: 100vh;
+		background-color: #f9f8f8;
+		display: flex;
+		flex-direction: column;
+		font-family: 'pingfang';
+		box-sizing: border-box;
+	}
+
+	/* 顶部图片 */
+	.show-header-bg {
+		width: 750rpx;
+		height: 420rpx;
+	}
+
+	.show-content {
+
+		width: 670rpx;
+		border-radius: 10rpx;
+		opacity: 1;
+		/* 自动布局 */
+		display: flex;
+		flex-direction: column;
+		background: #FFFFFF;
+		margin-top: -20rpx;
+		height: 844rpx;
+		overflow-y: auto;
+	}
+
+	.content-top {
+		width: 670rpx;
+		height: 60rpx;
+		border-radius: 10rpx 10rpx 0rpx 0rpx;
+		opacity: 1;
+		background: linear-gradient(180deg, #FFE7D9 0%, rgba(255, 255, 255, 0) 98%);
+
+
+	}
+
+	.blue-bar {
+		width: 12rpx;
+		height: 42rpx;
+		background-color: #7f75ff;
+		margin-right: 5rpx;
+	}
+
+	.section-title {
+		font-size: 45rpx;
+		font-family: SourceHanSansBold;
+		color: #333;
+	}
+
+	.description {
+		font-size: 28rpx;
+		color: #666;
+		line-height: 1.6;
+		margin-top: 10rpx;
+	}
+
+	.section {
+		background: white;
+		margin: 20rpx 30rpx;
+		padding: 20rpx 40rpx;
+		margin-top: 5rpx;
+		border-radius: 10rpx;
+		box-shadow: 0rpx 8rpx 16rpx rgba(0, 0, 0, 0.05);
+		flex-grow: 1;
+		overflow-y: auto;
+	}
+
+	.section-content {
+		display: flex;
+		flex-direction: column;
+
+	}
+
+	.button-container {
+		text-align: center;
+		margin-top: auto;
+		margin-bottom: 60rpx;
+	}
+
+	.start-btn {
+		width: 550rpx;
+		height: 96rpx;
+		border-radius: 2002rpx;
+		opacity: 1;
+
+		/* 自动布局 */
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		padding: 8rpx 40rpx;
+
+		background: linear-gradient(180deg, #E84B2A 0%, #FF846A 100%);
+	}
+
+	.flex-justify-center {
+		display: flex;
+		justify-content: center;
+	}
+	.btn-text{
+		
+		/* 按钮/按钮文本大号 */
+		/* 样式描述：常规大按钮 */
+		font-family: SourceHanSansBold;
+		font-size: 36rpx;
+		font-weight: bold;
+		line-height: normal;
+		letter-spacing: 0px;
+		
+		/* 正文色/正文色 */
+		color: #FFFFFF;
+		
+	}
+</style>
\ No newline at end of file
diff --git a/static/back/back-black.png b/static/back/back-black.png
new file mode 100644
index 0000000..08bf18a
Binary files /dev/null and b/static/back/back-black.png differ
diff --git a/static/back/n-back-mini.png b/static/back/n-back-mini.png
new file mode 100644
index 0000000..41e579a
Binary files /dev/null and b/static/back/n-back-mini.png differ
diff --git a/static/font-bg.png b/static/font-bg.png
new file mode 100644
index 0000000..7af1a4c
Binary files /dev/null and b/static/font-bg.png differ
diff --git a/static/logo.png b/static/logo.png
new file mode 100644
index 0000000..b5771e2
Binary files /dev/null and b/static/logo.png differ
diff --git a/static/main/ask-icon.png b/static/main/ask-icon.png
new file mode 100644
index 0000000..93ae0a4
Binary files /dev/null and b/static/main/ask-icon.png differ
diff --git a/static/main/banner.png b/static/main/banner.png
new file mode 100644
index 0000000..c2b322d
Binary files /dev/null and b/static/main/banner.png differ
diff --git a/static/main/bottom-icon.png b/static/main/bottom-icon.png
new file mode 100644
index 0000000..6e45758
Binary files /dev/null and b/static/main/bottom-icon.png differ
diff --git a/static/main/boy.png b/static/main/boy.png
new file mode 100644
index 0000000..d064e87
Binary files /dev/null and b/static/main/boy.png differ
diff --git a/static/main/call-icon.png b/static/main/call-icon.png
new file mode 100644
index 0000000..10e8b96
Binary files /dev/null and b/static/main/call-icon.png differ
diff --git a/static/main/check-c.png b/static/main/check-c.png
new file mode 100644
index 0000000..74e5746
Binary files /dev/null and b/static/main/check-c.png differ
diff --git a/static/main/check-n.png b/static/main/check-n.png
new file mode 100644
index 0000000..31dfb33
Binary files /dev/null and b/static/main/check-n.png differ
diff --git a/static/main/family.png b/static/main/family.png
new file mode 100644
index 0000000..8ec4a51
Binary files /dev/null and b/static/main/family.png differ
diff --git a/static/main/fire.png b/static/main/fire.png
new file mode 100644
index 0000000..363fc75
Binary files /dev/null and b/static/main/fire.png differ
diff --git a/static/main/team-test.png b/static/main/team-test.png
new file mode 100644
index 0000000..3077bf3
Binary files /dev/null and b/static/main/team-test.png differ
diff --git a/static/main/test-icon.png b/static/main/test-icon.png
new file mode 100644
index 0000000..b8542d4
Binary files /dev/null and b/static/main/test-icon.png differ
diff --git a/static/main/wedding.png b/static/main/wedding.png
new file mode 100644
index 0000000..806ed59
Binary files /dev/null and b/static/main/wedding.png differ
diff --git a/static/main/zx-icon.png b/static/main/zx-icon.png
new file mode 100644
index 0000000..10e8b96
Binary files /dev/null and b/static/main/zx-icon.png differ
diff --git a/static/menu/cpsy-c.png b/static/menu/cpsy-c.png
new file mode 100644
index 0000000..0ced1de
Binary files /dev/null and b/static/menu/cpsy-c.png differ
diff --git a/static/menu/cpsy-n.png b/static/menu/cpsy-n.png
new file mode 100644
index 0000000..922a39d
Binary files /dev/null and b/static/menu/cpsy-n.png differ
diff --git a/static/menu/wdcp-c.png b/static/menu/wdcp-c.png
new file mode 100644
index 0000000..f883d21
Binary files /dev/null and b/static/menu/wdcp-c.png differ
diff --git a/static/menu/wdcp-n.png b/static/menu/wdcp-n.png
new file mode 100644
index 0000000..7a2c13c
Binary files /dev/null and b/static/menu/wdcp-n.png differ
diff --git a/static/menu/xlzx-c.png b/static/menu/xlzx-c.png
new file mode 100644
index 0000000..5908002
Binary files /dev/null and b/static/menu/xlzx-c.png differ
diff --git a/static/menu/xlzx-n.png b/static/menu/xlzx-n.png
new file mode 100644
index 0000000..cb7c989
Binary files /dev/null and b/static/menu/xlzx-n.png differ
diff --git a/static/n-login/login-title.png b/static/n-login/login-title.png
new file mode 100644
index 0000000..15e5e83
Binary files /dev/null and b/static/n-login/login-title.png differ
diff --git a/static/n-main/botton-bg.png b/static/n-main/botton-bg.png
new file mode 100644
index 0000000..6cea30a
Binary files /dev/null and b/static/n-main/botton-bg.png differ
diff --git a/static/n-main/child.png b/static/n-main/child.png
new file mode 100644
index 0000000..ae55329
Binary files /dev/null and b/static/n-main/child.png differ
diff --git a/static/n-main/dbx.png b/static/n-main/dbx.png
new file mode 100644
index 0000000..70a89a8
Binary files /dev/null and b/static/n-main/dbx.png differ
diff --git a/static/n-main/fire-icon.png b/static/n-main/fire-icon.png
new file mode 100644
index 0000000..9162e87
Binary files /dev/null and b/static/n-main/fire-icon.png differ
diff --git a/static/n-main/left.png b/static/n-main/left.png
new file mode 100644
index 0000000..9b7676d
Binary files /dev/null and b/static/n-main/left.png differ
diff --git a/static/n-main/marriage.png b/static/n-main/marriage.png
new file mode 100644
index 0000000..cdca36b
Binary files /dev/null and b/static/n-main/marriage.png differ
diff --git a/static/n-main/more-icon.png b/static/n-main/more-icon.png
new file mode 100644
index 0000000..21fc1e7
Binary files /dev/null and b/static/n-main/more-icon.png differ
diff --git a/static/n-main/overlap-bg.png b/static/n-main/overlap-bg.png
new file mode 100644
index 0000000..9d4d41c
Binary files /dev/null and b/static/n-main/overlap-bg.png differ
diff --git a/static/n-main/parent-child.png b/static/n-main/parent-child.png
new file mode 100644
index 0000000..1aab2e2
Binary files /dev/null and b/static/n-main/parent-child.png differ
diff --git a/static/n-main/right.png b/static/n-main/right.png
new file mode 100644
index 0000000..21cd867
Binary files /dev/null and b/static/n-main/right.png differ
diff --git a/static/n-main/team-test-icon.png b/static/n-main/team-test-icon.png
new file mode 100644
index 0000000..703223d
Binary files /dev/null and b/static/n-main/team-test-icon.png differ
diff --git a/static/n-main/to-right.png b/static/n-main/to-right.png
new file mode 100644
index 0000000..f34d495
Binary files /dev/null and b/static/n-main/to-right.png differ
diff --git a/static/n-main/yxg-icon.png b/static/n-main/yxg-icon.png
new file mode 100644
index 0000000..31206a5
Binary files /dev/null and b/static/n-main/yxg-icon.png differ
diff --git a/static/n-menu/hdbm-c.png b/static/n-menu/hdbm-c.png
new file mode 100644
index 0000000..cadaa5a
Binary files /dev/null and b/static/n-menu/hdbm-c.png differ
diff --git a/static/n-menu/hdbm-n.png b/static/n-menu/hdbm-n.png
new file mode 100644
index 0000000..8d16f02
Binary files /dev/null and b/static/n-menu/hdbm-n.png differ
diff --git a/static/n-menu/sy-c.png b/static/n-menu/sy-c.png
new file mode 100644
index 0000000..81713bc
Binary files /dev/null and b/static/n-menu/sy-c.png differ
diff --git a/static/n-menu/sy-n.png b/static/n-menu/sy-n.png
new file mode 100644
index 0000000..22d77cc
Binary files /dev/null and b/static/n-menu/sy-n.png differ
diff --git a/static/n-menu/wd-c.png b/static/n-menu/wd-c.png
new file mode 100644
index 0000000..c1d2d67
Binary files /dev/null and b/static/n-menu/wd-c.png differ
diff --git a/static/n-menu/wd-n.png b/static/n-menu/wd-n.png
new file mode 100644
index 0000000..410660d
Binary files /dev/null and b/static/n-menu/wd-n.png differ
diff --git a/static/n-menu/zx-c.png b/static/n-menu/zx-c.png
new file mode 100644
index 0000000..ca6bd56
Binary files /dev/null and b/static/n-menu/zx-c.png differ
diff --git a/static/n-menu/zx-n.png b/static/n-menu/zx-n.png
new file mode 100644
index 0000000..f37aac8
Binary files /dev/null and b/static/n-menu/zx-n.png differ
diff --git a/static/n-pc/focus-bg.png b/static/n-pc/focus-bg.png
new file mode 100644
index 0000000..8c7498b
Binary files /dev/null and b/static/n-pc/focus-bg.png differ
diff --git a/static/n-pc/head.png b/static/n-pc/head.png
new file mode 100644
index 0000000..3e9deb9
Binary files /dev/null and b/static/n-pc/head.png differ
diff --git a/static/n-pc/kf_code.png b/static/n-pc/kf_code.png
new file mode 100644
index 0000000..798068e
Binary files /dev/null and b/static/n-pc/kf_code.png differ
diff --git a/static/n-pc/kt-icon.png b/static/n-pc/kt-icon.png
new file mode 100644
index 0000000..e4920c8
Binary files /dev/null and b/static/n-pc/kt-icon.png differ
diff --git a/static/n-pc/order-bg.png b/static/n-pc/order-bg.png
new file mode 100644
index 0000000..0a05172
Binary files /dev/null and b/static/n-pc/order-bg.png differ
diff --git a/static/n-pc/overlap-bg.png b/static/n-pc/overlap-bg.png
new file mode 100644
index 0000000..07e825a
Binary files /dev/null and b/static/n-pc/overlap-bg.png differ
diff --git a/static/n-pc/p-left.png b/static/n-pc/p-left.png
new file mode 100644
index 0000000..f34d495
Binary files /dev/null and b/static/n-pc/p-left.png differ
diff --git a/static/n-pc/show-word.png b/static/n-pc/show-word.png
new file mode 100644
index 0000000..50b5aa9
Binary files /dev/null and b/static/n-pc/show-word.png differ
diff --git a/static/n-pc/wd-dd.png b/static/n-pc/wd-dd.png
new file mode 100644
index 0000000..788ef0a
Binary files /dev/null and b/static/n-pc/wd-dd.png differ
diff --git a/static/n-pc/wd-gz.png b/static/n-pc/wd-gz.png
new file mode 100644
index 0000000..6073a88
Binary files /dev/null and b/static/n-pc/wd-gz.png differ
diff --git a/static/n-pc/wd-kf.png b/static/n-pc/wd-kf.png
new file mode 100644
index 0000000..abf5659
Binary files /dev/null and b/static/n-pc/wd-kf.png differ
diff --git a/static/n-pc/wd-wdpc.png b/static/n-pc/wd-wdpc.png
new file mode 100644
index 0000000..6d7069e
Binary files /dev/null and b/static/n-pc/wd-wdpc.png differ
diff --git a/static/n-pc/wd-yj.png b/static/n-pc/wd-yj.png
new file mode 100644
index 0000000..d14daae
Binary files /dev/null and b/static/n-pc/wd-yj.png differ
diff --git a/static/n-pc/wd-zxyx.png b/static/n-pc/wd-zxyx.png
new file mode 100644
index 0000000..dff5a69
Binary files /dev/null and b/static/n-pc/wd-zxyx.png differ
diff --git a/static/n-test/hz-icon.png b/static/n-test/hz-icon.png
new file mode 100644
index 0000000..ea11ab8
Binary files /dev/null and b/static/n-test/hz-icon.png differ
diff --git a/static/n-test/icon1.png b/static/n-test/icon1.png
new file mode 100644
index 0000000..1beb2da
Binary files /dev/null and b/static/n-test/icon1.png differ
diff --git a/static/n-test/icon2.png b/static/n-test/icon2.png
new file mode 100644
index 0000000..7808f31
Binary files /dev/null and b/static/n-test/icon2.png differ
diff --git a/static/n-test/result-icon.png b/static/n-test/result-icon.png
new file mode 100644
index 0000000..0a870cd
Binary files /dev/null and b/static/n-test/result-icon.png differ
diff --git a/static/n-test/test-bg-n.png b/static/n-test/test-bg-n.png
new file mode 100644
index 0000000..dfe5f4f
Binary files /dev/null and b/static/n-test/test-bg-n.png differ
diff --git a/static/n-test/test-result-bg.png b/static/n-test/test-result-bg.png
new file mode 100644
index 0000000..fb00982
Binary files /dev/null and b/static/n-test/test-result-bg.png differ
diff --git a/static/n-zx/choice-pay-icon.png b/static/n-zx/choice-pay-icon.png
new file mode 100644
index 0000000..a610a99
Binary files /dev/null and b/static/n-zx/choice-pay-icon.png differ
diff --git a/static/n-zx/choice.png b/static/n-zx/choice.png
new file mode 100644
index 0000000..49e29dd
Binary files /dev/null and b/static/n-zx/choice.png differ
diff --git a/static/n-zx/down-icon.png b/static/n-zx/down-icon.png
new file mode 100644
index 0000000..678f9e1
Binary files /dev/null and b/static/n-zx/down-icon.png differ
diff --git a/static/n-zx/face-to-face-c.png b/static/n-zx/face-to-face-c.png
new file mode 100644
index 0000000..cceb9ef
Binary files /dev/null and b/static/n-zx/face-to-face-c.png differ
diff --git a/static/n-zx/face-to-face.png b/static/n-zx/face-to-face.png
new file mode 100644
index 0000000..ce0b8d9
Binary files /dev/null and b/static/n-zx/face-to-face.png differ
diff --git a/static/n-zx/gz.png b/static/n-zx/gz.png
new file mode 100644
index 0000000..f5e24a1
Binary files /dev/null and b/static/n-zx/gz.png differ
diff --git a/static/n-zx/header.png b/static/n-zx/header.png
new file mode 100644
index 0000000..64d1ddb
Binary files /dev/null and b/static/n-zx/header.png differ
diff --git a/static/n-zx/kf.png b/static/n-zx/kf.png
new file mode 100644
index 0000000..5ec1bfb
Binary files /dev/null and b/static/n-zx/kf.png differ
diff --git a/static/n-zx/l-icon.png b/static/n-zx/l-icon.png
new file mode 100644
index 0000000..508e51f
Binary files /dev/null and b/static/n-zx/l-icon.png differ
diff --git a/static/n-zx/nochoice.png b/static/n-zx/nochoice.png
new file mode 100644
index 0000000..5bae1db
Binary files /dev/null and b/static/n-zx/nochoice.png differ
diff --git a/static/n-zx/notice-icon.png b/static/n-zx/notice-icon.png
new file mode 100644
index 0000000..b72f124
Binary files /dev/null and b/static/n-zx/notice-icon.png differ
diff --git a/static/n-zx/order-status-icon.png b/static/n-zx/order-status-icon.png
new file mode 100644
index 0000000..787c963
Binary files /dev/null and b/static/n-zx/order-status-icon.png differ
diff --git a/static/n-zx/r-icon.png b/static/n-zx/r-icon.png
new file mode 100644
index 0000000..abd4c3e
Binary files /dev/null and b/static/n-zx/r-icon.png differ
diff --git a/static/n-zx/right-icon.png b/static/n-zx/right-icon.png
new file mode 100644
index 0000000..a676d09
Binary files /dev/null and b/static/n-zx/right-icon.png differ
diff --git a/static/n-zx/show-protocol-top.png b/static/n-zx/show-protocol-top.png
new file mode 100644
index 0000000..0568176
Binary files /dev/null and b/static/n-zx/show-protocol-top.png differ
diff --git a/static/n-zx/video-camera.png b/static/n-zx/video-camera.png
new file mode 100644
index 0000000..28423e4
Binary files /dev/null and b/static/n-zx/video-camera.png differ
diff --git a/static/n-zx/video.png b/static/n-zx/video.png
new file mode 100644
index 0000000..6d73b54
Binary files /dev/null and b/static/n-zx/video.png differ
diff --git a/static/n-zx/wx-pay-icon.png b/static/n-zx/wx-pay-icon.png
new file mode 100644
index 0000000..347d6c4
Binary files /dev/null and b/static/n-zx/wx-pay-icon.png differ
diff --git a/uni.promisify.adaptor.js b/uni.promisify.adaptor.js
new file mode 100644
index 0000000..5fec4f3
--- /dev/null
+++ b/uni.promisify.adaptor.js
@@ -0,0 +1,13 @@
+uni.addInterceptor({
+  returnValue (res) {
+    if (!(!!res && (typeof res === "object" || typeof res === "function") && typeof res.then === "function")) {
+      return res;
+    }
+    return new Promise((resolve, reject) => {
+      res.then((res) => {
+        if (!res) return resolve(res) 
+        return res[0] ? reject(res[0]) : resolve(res[1])
+      });
+    });
+  },
+});
\ No newline at end of file
diff --git a/uni.scss b/uni.scss
new file mode 100644
index 0000000..b9249e9
--- /dev/null
+++ b/uni.scss
@@ -0,0 +1,76 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+
+/* 颜色变量 */
+
+/* 行为相关颜色 */
+$uni-color-primary: #007aff;
+$uni-color-success: #4cd964;
+$uni-color-warning: #f0ad4e;
+$uni-color-error: #dd524d;
+
+/* 文字基本颜色 */
+$uni-text-color:#333;//基本色
+$uni-text-color-inverse:#fff;//反色
+$uni-text-color-grey:#999;//辅助灰色，如加载更多的提示信息
+$uni-text-color-placeholder: #808080;
+$uni-text-color-disable:#c0c0c0;
+
+/* 背景颜色 */
+$uni-bg-color:#ffffff;
+$uni-bg-color-grey:#f8f8f8;
+$uni-bg-color-hover:#f1f1f1;//点击状态颜色
+$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
+
+/* 边框颜色 */
+$uni-border-color:#c8c7cc;
+
+/* 尺寸变量 */
+
+/* 文字尺寸 */
+$uni-font-size-sm:12px;
+$uni-font-size-base:14px;
+$uni-font-size-lg:16px;
+
+/* 图片尺寸 */
+$uni-img-size-sm:20px;
+$uni-img-size-base:26px;
+$uni-img-size-lg:40px;
+
+/* Border Radius */
+$uni-border-radius-sm: 2px;
+$uni-border-radius-base: 3px;
+$uni-border-radius-lg: 6px;
+$uni-border-radius-circle: 50%;
+
+/* 水平间距 */
+$uni-spacing-row-sm: 5px;
+$uni-spacing-row-base: 10px;
+$uni-spacing-row-lg: 15px;
+
+/* 垂直间距 */
+$uni-spacing-col-sm: 4px;
+$uni-spacing-col-base: 8px;
+$uni-spacing-col-lg: 12px;
+
+/* 透明度 */
+$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
+
+/* 文章场景相关 */
+$uni-color-title: #2C405A; // 文章标题颜色
+$uni-font-size-title:20px;
+$uni-color-subtitle: #555555; // 二级标题颜色
+$uni-font-size-subtitle:26px;
+$uni-color-paragraph: #3F536E; // 文章段落颜色
+$uni-font-size-paragraph:15px;
diff --git a/uni_modules/next-date-picker/changelog.md b/uni_modules/next-date-picker/changelog.md
new file mode 100644
index 0000000..8661313
--- /dev/null
+++ b/uni_modules/next-date-picker/changelog.md
@@ -0,0 +1,18 @@
+## 1.0.8（2024-10-28）
+增加title插槽
+## 1.0.7（2024-09-14）
+更新说明
+## 1.0.6（2023-11-29）
+增加区间选择模式
+## 1.0.5（2023-11-02）
+修复h5打开报错
+## 1.0.4（2023-09-27）
+修复isAbleSelectFutureDate不生效问题
+## 1.0.3（2023-05-22）
+更新插件依赖说明
+## 1.0.2（2023-05-22）
+更新事件说明
+## 1.0.1（2023-05-22）
+更新说明
+## 1.0.0（2023-05-22）
+初始化控件
diff --git a/uni_modules/next-date-picker/components/next-date-picker/calendar.js b/uni_modules/next-date-picker/components/next-date-picker/calendar.js
new file mode 100644
index 0000000..eb3bc06
--- /dev/null
+++ b/uni_modules/next-date-picker/components/next-date-picker/calendar.js
@@ -0,0 +1,546 @@
+/**
+* @1900-2100区间内的公历、农历互转
+* @charset UTF-8
+* @github  https://github.com/jjonline/calendar.js
+* @Author  Jea杨(JJonline@JJonline.Cn)
+* @Time    2014-7-21
+* @Time    2016-8-13 Fixed 2033hex、Attribution Annals
+* @Time    2016-9-25 Fixed lunar LeapMonth Param Bug
+* @Time    2017-7-24 Fixed use getTerm Func Param Error.use solar year,NOT lunar year
+* @Version 1.0.3
+* @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0]
+* @农历转公历：calendar.lunar2solar(1987,09,10); //[you can ignore params of prefix 0]
+*/
+/* eslint-disable */
+var calendar = {
+
+  /**
+      * 农历1900-2100的润大小信息表
+      * @Array Of Property
+      * @return Hex
+      */
+  lunarInfo: [0x04bd8, 0x04ae0, 0x0a570, 0x054d5, 0x0d260, 0x0d950, 0x16554, 0x056a0, 0x09ad0, 0x055d2, // 1900-1909
+    0x04ae0, 0x0a5b6, 0x0a4d0, 0x0d250, 0x1d255, 0x0b540, 0x0d6a0, 0x0ada2, 0x095b0, 0x14977, // 1910-1919
+    0x04970, 0x0a4b0, 0x0b4b5, 0x06a50, 0x06d40, 0x1ab54, 0x02b60, 0x09570, 0x052f2, 0x04970, // 1920-1929
+    0x06566, 0x0d4a0, 0x0ea50, 0x06e95, 0x05ad0, 0x02b60, 0x186e3, 0x092e0, 0x1c8d7, 0x0c950, // 1930-1939
+    0x0d4a0, 0x1d8a6, 0x0b550, 0x056a0, 0x1a5b4, 0x025d0, 0x092d0, 0x0d2b2, 0x0a950, 0x0b557, // 1940-1949
+    0x06ca0, 0x0b550, 0x15355, 0x04da0, 0x0a5b0, 0x14573, 0x052b0, 0x0a9a8, 0x0e950, 0x06aa0, // 1950-1959
+    0x0aea6, 0x0ab50, 0x04b60, 0x0aae4, 0x0a570, 0x05260, 0x0f263, 0x0d950, 0x05b57, 0x056a0, // 1960-1969
+    0x096d0, 0x04dd5, 0x04ad0, 0x0a4d0, 0x0d4d4, 0x0d250, 0x0d558, 0x0b540, 0x0b6a0, 0x195a6, // 1970-1979
+    0x095b0, 0x049b0, 0x0a974, 0x0a4b0, 0x0b27a, 0x06a50, 0x06d40, 0x0af46, 0x0ab60, 0x09570, // 1980-1989
+    0x04af5, 0x04970, 0x064b0, 0x074a3, 0x0ea50, 0x06b58, 0x05ac0, 0x0ab60, 0x096d5, 0x092e0, // 1990-1999
+    0x0c960, 0x0d954, 0x0d4a0, 0x0da50, 0x07552, 0x056a0, 0x0abb7, 0x025d0, 0x092d0, 0x0cab5, // 2000-2009
+    0x0a950, 0x0b4a0, 0x0baa4, 0x0ad50, 0x055d9, 0x04ba0, 0x0a5b0, 0x15176, 0x052b0, 0x0a930, // 2010-2019
+    0x07954, 0x06aa0, 0x0ad50, 0x05b52, 0x04b60, 0x0a6e6, 0x0a4e0, 0x0d260, 0x0ea65, 0x0d530, // 2020-2029
+    0x05aa0, 0x076a3, 0x096d0, 0x04afb, 0x04ad0, 0x0a4d0, 0x1d0b6, 0x0d250, 0x0d520, 0x0dd45, // 2030-2039
+    0x0b5a0, 0x056d0, 0x055b2, 0x049b0, 0x0a577, 0x0a4b0, 0x0aa50, 0x1b255, 0x06d20, 0x0ada0, // 2040-2049
+    /** Add By JJonline@JJonline.Cn**/
+    0x14b63, 0x09370, 0x049f8, 0x04970, 0x064b0, 0x168a6, 0x0ea50, 0x06b20, 0x1a6c4, 0x0aae0, // 2050-2059
+    0x0a2e0, 0x0d2e3, 0x0c960, 0x0d557, 0x0d4a0, 0x0da50, 0x05d55, 0x056a0, 0x0a6d0, 0x055d4, // 2060-2069
+    0x052d0, 0x0a9b8, 0x0a950, 0x0b4a0, 0x0b6a6, 0x0ad50, 0x055a0, 0x0aba4, 0x0a5b0, 0x052b0, // 2070-2079
+    0x0b273, 0x06930, 0x07337, 0x06aa0, 0x0ad50, 0x14b55, 0x04b60, 0x0a570, 0x054e4, 0x0d160, // 2080-2089
+    0x0e968, 0x0d520, 0x0daa0, 0x16aa6, 0x056d0, 0x04ae0, 0x0a9d4, 0x0a2d0, 0x0d150, 0x0f252, // 2090-2099
+    0x0d520], // 2100
+
+  /**
+      * 公历每个月份的天数普通表
+      * @Array Of Property
+      * @return Number
+      */
+  solarMonth: [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
+
+  /**
+      * 天干地支之天干速查表
+      * @Array Of Property trans["甲","乙","丙","丁","戊","己","庚","辛","壬","癸"]
+      * @return Cn string
+      */
+  Gan: ['\u7532', '\u4e59', '\u4e19', '\u4e01', '\u620a', '\u5df1', '\u5e9a', '\u8f9b', '\u58ec', '\u7678'],
+
+  /**
+      * 天干地支之地支速查表
+      * @Array Of Property
+      * @trans["子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"]
+      * @return Cn string
+      */
+  Zhi: ['\u5b50', '\u4e11', '\u5bc5', '\u536f', '\u8fb0', '\u5df3', '\u5348', '\u672a', '\u7533', '\u9149', '\u620c', '\u4ea5'],
+
+  /**
+      * 天干地支之地支速查表<=>生肖
+      * @Array Of Property
+      * @trans["鼠","牛","虎","兔","龙","蛇","马","羊","猴","鸡","狗","猪"]
+      * @return Cn string
+      */
+  Animals: ['\u9f20', '\u725b', '\u864e', '\u5154', '\u9f99', '\u86c7', '\u9a6c', '\u7f8a', '\u7334', '\u9e21', '\u72d7', '\u732a'],
+
+  /**
+      * 24节气速查表
+      * @Array Of Property
+      * @trans["小寒","大寒","立春","雨水","惊蛰","春分","清明","谷雨","立夏","小满","芒种","夏至","小暑","大暑","立秋","处暑","白露","秋分","寒露","霜降","立冬","小雪","大雪","冬至"]
+      * @return Cn string
+      */
+  solarTerm: ['\u5c0f\u5bd2', '\u5927\u5bd2', '\u7acb\u6625', '\u96e8\u6c34', '\u60ca\u86f0', '\u6625\u5206', '\u6e05\u660e', '\u8c37\u96e8', '\u7acb\u590f', '\u5c0f\u6ee1', '\u8292\u79cd', '\u590f\u81f3', '\u5c0f\u6691', '\u5927\u6691', '\u7acb\u79cb', '\u5904\u6691', '\u767d\u9732', '\u79cb\u5206', '\u5bd2\u9732', '\u971c\u964d', '\u7acb\u51ac', '\u5c0f\u96ea', '\u5927\u96ea', '\u51ac\u81f3'],
+
+  /**
+      * 1900-2100各年的24节气日期速查表
+      * @Array Of Property
+      * @return 0x string For splice
+      */
+  sTermInfo: ['9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f',
+    '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f',
+    'b027097bd097c36b0b6fc9274c91aa', '9778397bd19801ec9210c965cc920e', '97b6b97bd19801ec95f8c965cc920f',
+    '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd197c36c9210c9274c91aa',
+    '97b6b97bd19801ec95f8c965cc920e', '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec95f8c965cc920e', '97bcf97c3598082c95f8e1cfcc920f',
+    '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f',
+    '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd097bd07f595b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9210c8dc2', '9778397bd19801ec9210c9274c920e', '97b6b97bd19801ec95f8c965cc920f',
+    '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+    '97b6b97bd19801ec95f8c965cc920f', '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bd07f1487f595b0b0bc920fb0722',
+    '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b97bd197c36c9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+    '97b6b7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36b0b70c9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '977837f0e37f149b0723b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c35b0b6fc9210c8dc2',
+    '977837f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '977837f0e37f14998082b0723b06bd', '7f07e7f0e37f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f595b0b0bb0b6fb0722', '7f0e37f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e37f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35',
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f149b0723b0787b0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0723b06bd',
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722', '7f0e37f0e366aa89801eb072297c35',
+    '7ec967f0e37f14998082b0723b06bd', '7f07e7f0e37f14998083b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14898082b0723b02d5', '7f07e7f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66aa89801e9808297c35', '665f67f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66a449801e9808297c35',
+    '665f67f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e36665b66a449801e9808297c35', '665f67f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e26665b66a449801e9808297c35', '665f67f0e37f1489801eb072297c35',
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722'],
+
+  /**
+      * 数字转中文速查表
+      * @Array Of Property
+      * @trans ['日','一','二','三','四','五','六','七','八','九','十']
+      * @return Cn string
+      */
+  nStr1: ['\u65e5', '\u4e00', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341'],
+
+  /**
+      * 日期转农历称呼速查表
+      * @Array Of Property
+      * @trans ['初','十','廿','卅']
+      * @return Cn string
+      */
+  nStr2: ['\u521d', '\u5341', '\u5eff', '\u5345'],
+
+  /**
+      * 月份转农历称呼速查表
+      * @Array Of Property
+      * @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊']
+      * @return Cn string
+      */
+  nStr3: ['\u6b63', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341', '\u51ac', '\u814a'],
+
+  /**
+      * 返回农历y年一整年的总天数
+      * @param lunar Year
+      * @return Number
+      * @eg:var count = calendar.lYearDays(1987) ;//count=387
+      */
+  lYearDays: function (y) {
+    var i; var sum = 348
+    for (i = 0x8000; i > 0x8; i >>= 1) { sum += (this.lunarInfo[y - 1900] & i) ? 1 : 0 }
+    return (sum + this.leapDays(y))
+  },
+
+  /**
+      * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
+      * @param lunar Year
+      * @return Number (0-12)
+      * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
+      */
+  leapMonth: function (y) { // 闰字编码 \u95f0
+    return (this.lunarInfo[y - 1900] & 0xf)
+  },
+
+  /**
+      * 返回农历y年闰月的天数 若该年没有闰月则返回0
+      * @param lunar Year
+      * @return Number (0、29、30)
+      * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
+      */
+  leapDays: function (y) {
+    if (this.leapMonth(y)) {
+      return ((this.lunarInfo[y - 1900] & 0x10000) ? 30 : 29)
+    }
+    return (0)
+  },
+
+  /**
+      * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法
+      * @param lunar Year
+      * @return Number (-1、29、30)
+      * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
+      */
+  monthDays: function (y, m) {
+    if (m > 12 || m < 1) { return -1 }// 月份参数从1至12，参数错误返回-1
+    return ((this.lunarInfo[y - 1900] & (0x10000 >> m)) ? 30 : 29)
+  },
+
+  /**
+      * 返回公历(!)y年m月的天数
+      * @param solar Year
+      * @return Number (-1、28、29、30、31)
+      * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
+      */
+  solarDays: function (y, m) {
+    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
+    var ms = m - 1
+    if (ms == 1) { // 2月份的闰平规律测算后确认返回28或29
+      return (((y % 4 == 0) && (y % 100 != 0) || (y % 400 == 0)) ? 29 : 28)
+    } else {
+      return (this.solarMonth[ms])
+    }
+  },
+
+  /**
+     * 农历年份转换为干支纪年
+     * @param  lYear 农历年的年份数
+     * @return Cn string
+     */
+  toGanZhiYear: function (lYear) {
+    var ganKey = (lYear - 3) % 10
+    var zhiKey = (lYear - 3) % 12
+    if (ganKey == 0) ganKey = 10// 如果余数为0则为最后一个天干
+    if (zhiKey == 0) zhiKey = 12// 如果余数为0则为最后一个地支
+    return this.Gan[ganKey - 1] + this.Zhi[zhiKey - 1]
+  },
+
+  /**
+     * 公历月、日判断所属星座
+     * @param  cMonth [description]
+     * @param  cDay [description]
+     * @return Cn string
+     */
+  toAstro: function (cMonth, cDay) {
+    var s = '\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf'
+    var arr = [20, 19, 21, 21, 21, 22, 23, 23, 23, 23, 22, 22]
+    return s.substr(cMonth * 2 - (cDay < arr[cMonth - 1] ? 2 : 0), 2) + '\u5ea7'// 座
+  },
+
+  /**
+      * 传入offset偏移量返回干支
+      * @param offset 相对甲子的偏移量
+      * @return Cn string
+      */
+  toGanZhi: function (offset) {
+    return this.Gan[offset % 10] + this.Zhi[offset % 12]
+  },
+
+  /**
+      * 传入公历(!)y年获得该年第n个节气的公历日期
+      * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起
+      * @return day Number
+      * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
+      */
+  getTerm: function (y, n) {
+    if (y < 1900 || y > 2100) { return -1 }
+    if (n < 1 || n > 24) { return -1 }
+    var _table = this.sTermInfo[y - 1900]
+    var _info = [
+      parseInt('0x' + _table.substr(0, 5)).toString(),
+      parseInt('0x' + _table.substr(5, 5)).toString(),
+      parseInt('0x' + _table.substr(10, 5)).toString(),
+      parseInt('0x' + _table.substr(15, 5)).toString(),
+      parseInt('0x' + _table.substr(20, 5)).toString(),
+      parseInt('0x' + _table.substr(25, 5)).toString()
+    ]
+    var _calday = [
+      _info[0].substr(0, 1),
+      _info[0].substr(1, 2),
+      _info[0].substr(3, 1),
+      _info[0].substr(4, 2),
+
+      _info[1].substr(0, 1),
+      _info[1].substr(1, 2),
+      _info[1].substr(3, 1),
+      _info[1].substr(4, 2),
+
+      _info[2].substr(0, 1),
+      _info[2].substr(1, 2),
+      _info[2].substr(3, 1),
+      _info[2].substr(4, 2),
+
+      _info[3].substr(0, 1),
+      _info[3].substr(1, 2),
+      _info[3].substr(3, 1),
+      _info[3].substr(4, 2),
+
+      _info[4].substr(0, 1),
+      _info[4].substr(1, 2),
+      _info[4].substr(3, 1),
+      _info[4].substr(4, 2),
+
+      _info[5].substr(0, 1),
+      _info[5].substr(1, 2),
+      _info[5].substr(3, 1),
+      _info[5].substr(4, 2)
+    ]
+    return parseInt(_calday[n - 1])
+  },
+
+  /**
+      * 传入农历数字月份返回汉语通俗表示法
+      * @param lunar month
+      * @return Cn string
+      * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
+      */
+  toChinaMonth: function (m) { // 月 => \u6708
+    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
+    var s = this.nStr3[m - 1]
+    s += '\u6708'// 加上月字
+    return s
+  },
+
+  /**
+      * 传入农历日期数字返回汉字表示法
+      * @param lunar day
+      * @return Cn string
+      * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
+      */
+  toChinaDay: function (d) { // 日 => \u65e5
+    var s
+    switch (d) {
+      case 10:
+        s = '\u521d\u5341'; break
+      case 20:
+        s = '\u4e8c\u5341'; break
+        break
+      case 30:
+        s = '\u4e09\u5341'; break
+        break
+      default :
+        s = this.nStr2[Math.floor(d / 10)]
+        s += this.nStr1[d % 10]
+    }
+    return (s)
+  },
+
+  /**
+      * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
+      * @param y year
+      * @return Cn string
+      * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
+      */
+  getAnimal: function (y) {
+    return this.Animals[(y - 4) % 12]
+  },
+
+  /**
+      * 传入阳历年月日获得详细的公历、农历object信息 <=>JSON
+      * @param y  solar year
+      * @param m  solar month
+      * @param d  solar day
+      * @return JSON object
+      * @eg://console.log(calendar.solar2lunar(1987,11,01));
+      */
+  solar2lunar: function (y, m, d) { // 参数区间1900.1.31~2100.12.31
+    // 年份限定、上限
+    if (y < 1900 || y > 2100) {
+      return -1// undefined转换为数字变为NaN
+    }
+    // 公历传参最下限
+    if (y == 1900 && m == 1 && d < 31) {
+      return -1
+    }
+    // 未传参  获得当天
+    if (!y) {
+      var objDate = new Date()
+    } else {
+      var objDate = new Date(y, parseInt(m) - 1, d)
+    }
+    var i; var leap = 0; var temp = 0
+    // 修正ymd参数
+    var y = objDate.getFullYear()
+    var m = objDate.getMonth() + 1
+    var d = objDate.getDate()
+    var offset = (Date.UTC(objDate.getFullYear(), objDate.getMonth(), objDate.getDate()) - Date.UTC(1900, 0, 31)) / 86400000
+    for (i = 1900; i < 2101 && offset > 0; i++) {
+      temp = this.lYearDays(i)
+      offset -= temp
+    }
+    if (offset < 0) {
+      offset += temp; i--
+    }
+
+    // 是否今天
+    var isTodayObj = new Date()
+    var isToday = false
+    if (isTodayObj.getFullYear() == y && isTodayObj.getMonth() + 1 == m && isTodayObj.getDate() == d) {
+      isToday = true
+    }
+    // 星期几
+    var nWeek = objDate.getDay()
+    var cWeek = this.nStr1[nWeek]
+    // 数字表示周几顺应天朝周一开始的惯例
+    if (nWeek == 0) {
+      nWeek = 7
+    }
+    // 农历年
+    var year = i
+    var leap = this.leapMonth(i) // 闰哪个月
+    var isLeap = false
+
+    // 效验闰月
+    for (i = 1; i < 13 && offset > 0; i++) {
+      // 闰月
+      if (leap > 0 && i == (leap + 1) && isLeap == false) {
+        --i
+        isLeap = true; temp = this.leapDays(year) // 计算农历闰月天数
+      } else {
+        temp = this.monthDays(year, i)// 计算农历普通月天数
+      }
+      // 解除闰月
+      if (isLeap == true && i == (leap + 1)) { isLeap = false }
+      offset -= temp
+    }
+    // 闰月导致数组下标重叠取反
+    if (offset == 0 && leap > 0 && i == leap + 1) {
+      if (isLeap) {
+        isLeap = false
+      } else {
+        isLeap = true; --i
+      }
+    }
+    if (offset < 0) {
+      offset += temp; --i
+    }
+    // 农历月
+    var month = i
+    // 农历日
+    var day = offset + 1
+    // 天干地支处理
+    var sm = m - 1
+    var gzY = this.toGanZhiYear(year)
+
+    // 当月的两个节气
+    // bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
+    var firstNode = this.getTerm(y, (m * 2 - 1))// 返回当月「节」为几日开始
+    var secondNode = this.getTerm(y, (m * 2))// 返回当月「节」为几日开始
+
+    // 依据12节气修正干支月
+    var gzM = this.toGanZhi((y - 1900) * 12 + m + 11)
+    if (d >= firstNode) {
+      gzM = this.toGanZhi((y - 1900) * 12 + m + 12)
+    }
+
+    // 传入的日期的节气与否
+    var isTerm = false
+    var Term = null
+    if (firstNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 2]
+    }
+    if (secondNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 1]
+    }
+    // 日柱 当月一日与 1900/1/1 相差天数
+    var dayCyclical = Date.UTC(y, sm, 1, 0, 0, 0, 0) / 86400000 + 25567 + 10
+    var gzD = this.toGanZhi(dayCyclical + d - 1)
+    // 该日期所属的星座
+    var astro = this.toAstro(m, d)
+
+    return { 'lYear': year, 'lMonth': month, 'lDay': day, 'Animal': this.getAnimal(year), 'IMonthCn': (isLeap ? '\u95f0' : '') + this.toChinaMonth(month), 'IDayCn': this.toChinaDay(day), 'cYear': y, 'cMonth': m, 'cDay': d, 'gzYear': gzY, 'gzMonth': gzM, 'gzDay': gzD, 'isToday': isToday, 'isLeap': isLeap, 'nWeek': nWeek, 'ncWeek': '\u661f\u671f' + cWeek, 'isTerm': isTerm, 'Term': Term, 'astro': astro }
+  },
+
+  /**
+      * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历object信息 <=>JSON
+      * @param y  lunar year
+      * @param m  lunar month
+      * @param d  lunar day
+      * @param isLeapMonth  lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可]
+      * @return JSON object
+      * @eg://console.log(calendar.lunar2solar(1987,9,10));
+      */
+  lunar2solar: function (y, m, d, isLeapMonth) { // 参数区间1900.1.31~2100.12.1
+    var isLeapMonth = !!isLeapMonth
+    var leapOffset = 0
+    var leapMonth = this.leapMonth(y)
+    var leapDay = this.leapDays(y)
+    if (isLeapMonth && (leapMonth != m)) { return -1 }// 传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
+    if (y == 2100 && m == 12 && d > 1 || y == 1900 && m == 1 && d < 31) { return -1 }// 超出了最大极限值
+    var day = this.monthDays(y, m)
+    var _day = day
+    // bugFix 2016-9-25
+    // if month is leap, _day use leapDays method
+    if (isLeapMonth) {
+      _day = this.leapDays(y, m)
+    }
+    if (y < 1900 || y > 2100 || d > _day) { return -1 }// 参数合法性效验
+
+    // 计算农历的时间差
+    var offset = 0
+    for (var i = 1900; i < y; i++) {
+      offset += this.lYearDays(i)
+    }
+    var leap = 0; var isAdd = false
+    for (var i = 1; i < m; i++) {
+      leap = this.leapMonth(y)
+      if (!isAdd) { // 处理闰月
+        if (leap <= i && leap > 0) {
+          offset += this.leapDays(y); isAdd = true
+        }
+      }
+      offset += this.monthDays(y, i)
+    }
+    // 转换闰月农历 需补充该年闰月的前一个月的时差
+    if (isLeapMonth) { offset += day }
+    // 1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点)
+    var stmap = Date.UTC(1900, 1, 30, 0, 0, 0)
+    var calObj = new Date((offset + d - 31) * 86400000 + stmap)
+    var cY = calObj.getUTCFullYear()
+    var cM = calObj.getUTCMonth() + 1
+    var cD = calObj.getUTCDate()
+
+    return this.solar2lunar(cY, cM, cD)
+  }
+}
+
+export default calendar
diff --git a/uni_modules/next-date-picker/components/next-date-picker/i18n/en.json b/uni_modules/next-date-picker/components/next-date-picker/i18n/en.json
new file mode 100644
index 0000000..fcbd13c
--- /dev/null
+++ b/uni_modules/next-date-picker/components/next-date-picker/i18n/en.json
@@ -0,0 +1,12 @@
+{
+	"uni-calender.ok": "ok",
+	"uni-calender.cancel": "cancel",
+	"uni-calender.today": "today",
+	"uni-calender.MON": "MON",
+	"uni-calender.TUE": "TUE",
+	"uni-calender.WED": "WED",
+	"uni-calender.THU": "THU",
+	"uni-calender.FRI": "FRI",
+	"uni-calender.SAT": "SAT",
+	"uni-calender.SUN": "SUN"
+}
diff --git a/uni_modules/next-date-picker/components/next-date-picker/i18n/index.js b/uni_modules/next-date-picker/components/next-date-picker/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/next-date-picker/components/next-date-picker/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/uni_modules/next-date-picker/components/next-date-picker/i18n/zh-Hans.json b/uni_modules/next-date-picker/components/next-date-picker/i18n/zh-Hans.json
new file mode 100644
index 0000000..8952f9f
--- /dev/null
+++ b/uni_modules/next-date-picker/components/next-date-picker/i18n/zh-Hans.json
@@ -0,0 +1,12 @@
+{
+	"uni-calender.ok": "确定",
+	"uni-calender.cancel": "取消",
+	"uni-calender.today": "今天",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六"
+}
diff --git a/uni_modules/next-date-picker/components/next-date-picker/i18n/zh-Hant.json b/uni_modules/next-date-picker/components/next-date-picker/i18n/zh-Hant.json
new file mode 100644
index 0000000..7412d50
--- /dev/null
+++ b/uni_modules/next-date-picker/components/next-date-picker/i18n/zh-Hant.json
@@ -0,0 +1,12 @@
+{
+	"uni-calender.ok": "確定",
+	"uni-calender.cancel": "取消",
+	"uni-calender.today": "今天",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六"
+}
diff --git a/uni_modules/next-date-picker/components/next-date-picker/icon/arrow-left.png b/uni_modules/next-date-picker/components/next-date-picker/icon/arrow-left.png
new file mode 100644
index 0000000..c9eabf6
Binary files /dev/null and b/uni_modules/next-date-picker/components/next-date-picker/icon/arrow-left.png differ
diff --git a/uni_modules/next-date-picker/components/next-date-picker/icon/arrow-right.png b/uni_modules/next-date-picker/components/next-date-picker/icon/arrow-right.png
new file mode 100644
index 0000000..f94c5fc
Binary files /dev/null and b/uni_modules/next-date-picker/components/next-date-picker/icon/arrow-right.png differ
diff --git a/uni_modules/next-date-picker/components/next-date-picker/icon/icon_mark_star.png b/uni_modules/next-date-picker/components/next-date-picker/icon/icon_mark_star.png
new file mode 100644
index 0000000..27edaa2
Binary files /dev/null and b/uni_modules/next-date-picker/components/next-date-picker/icon/icon_mark_star.png differ
diff --git a/uni_modules/next-date-picker/components/next-date-picker/icon/icon_selected.png b/uni_modules/next-date-picker/components/next-date-picker/icon/icon_selected.png
new file mode 100644
index 0000000..fb49645
Binary files /dev/null and b/uni_modules/next-date-picker/components/next-date-picker/icon/icon_selected.png differ
diff --git a/uni_modules/next-date-picker/components/next-date-picker/next-calendar.vue b/uni_modules/next-date-picker/components/next-date-picker/next-calendar.vue
new file mode 100644
index 0000000..2e00081
--- /dev/null
+++ b/uni_modules/next-date-picker/components/next-date-picker/next-calendar.vue
@@ -0,0 +1,594 @@
+<template>
+	<view class="uni-calendar" @touchstart="onCalendarTouchStart" @touchend="onCalendarTouchEnd">
+		<view v-if="show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}" @click="clean"></view>
+		<view class="uni-calendar__content" :class="{'uni-calendar--fixed': false,'uni-calendar--ani-show':aniMaskShow}">
+			<!-- 头部 START -->
+			<view v-if="isShowHeader" class="uni-calendar__header">
+				<view class="uni-calendar__header-btn-box" @click.stop="pre">
+					<view class="uni-calendar__header-btn uni-calendar--left"></view>
+				</view>
+				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
+					<text class="uni-calendar__header-text">{{ (nowDate.year||'') +' / '+( nowDate.month||'')}}</text>
+				</picker>
+				<view class="uni-calendar__header-btn-box" @click.stop="next">
+					<view class="uni-calendar__header-btn uni-calendar--right"></view>
+				</view>
+				<text class="uni-calendar__backtoday" @click="backtoday">{{todayText}}</text>
+			</view>
+			<!-- 头部 END -->
+			
+			<view class="uni-calendar__box">
+				<view v-if="showMonth" class="uni-calendar__box-bg">
+					<text class="uni-calendar__box-bg-text">{{nowDate && nowDate.month}}</text>
+				</view>
+				
+				<!-- 头部 周一 到 周日 START -->
+				<view class="uni-calendar__weeks next-calendar-title-bar">
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SUNText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{monText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{TUEText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{WEDText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{THUText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{FRIText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SATText}}</text>
+					</view>
+				</view>
+				<!-- 头部 周一 到 周日 END -->
+				
+				<!-- 具体的日期日历 START -->
+				<view class="uni-calendar__weeks" v-for="(item,weekIndex) in weeks" :key="weekIndex">
+					<view class="uni-calendar__weeks-item" v-for="(week,weeksIndex) in item" :key="weeksIndex">
+						<next-multiple-selector-item :themeColor="themeColor" :isAbleSelectFutureDate="isAbleSelectFutureDate" class="uni-calendar-item--hook" :curYear="curYear" :curMonth="curMonth" :curDate="curDate" :weeks="week" :calendar="calendar" :selected="selected" :lunar="lunar" @change="choiceDate"></next-multiple-selector-item>
+					</view>
+				</view>
+				<!-- 具体的日期日历 END -->
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import Calendar from './util.js';
+	import nextMultipleSelectorItem from './next-multiple-selector-item.vue'
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	/**
+	 * Calendar 日历
+	 * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=56
+	 * @property {String} date 自定义当前时间，默认为今天
+	 * @property {Boolean} lunar 显示农历
+	 * @property {String} startDate 日期选择范围-开始日期
+	 * @property {String} endDate 日期选择范围-结束日期
+	 * @property {Boolean} range 范围选择
+	 * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+	 * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
+	 * @property {Boolean} showMonth 是否选择月份为背景
+	 * @event {Function} monthSwitch 切换月份时触发
+	 */
+	
+	export default {
+		components: {
+			nextMultipleSelectorItem
+		},
+		emits:['close','confirm','change','monthSwitch'],
+		props: {
+			themeColor:{
+				type: String,
+				default: '#f9ae3d'
+			},
+			isAbleSelectFutureDate:{
+				type: Boolean,
+				default: true
+			},
+			isShowHeader:{
+				type: Boolean,
+				default: false
+			},
+			date: {
+				type: String,
+				default: ''
+			},
+			mode: {
+				type: String,
+				default: 'multiple'
+			},
+			selected: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			},
+			startDate: {
+				type: String,
+				default: ''
+			},
+			endDate: {
+				type: String,
+				default: ''
+			},
+			range: {
+				type: Boolean,
+				default: false
+			},
+			showMonth: {
+				type: Boolean,
+				default: true
+			},
+			clearDate: {
+				type: Boolean,
+				default: true
+			},
+		},
+		data() {
+			return {
+				touchStartX:0,
+				touchStartY:0,
+				
+				todayDate:1,
+				todayMonth:1,
+				todayYear:1970,
+				
+				show: false,
+				weeks: [],
+				calendar: {},
+				nowDate: '',
+				aniMaskShow: false,
+				curYear:2022,
+				curMonth:7,
+				curDate:12,
+				recordUnit: 0,
+			}
+		},
+		computed:{
+			/**
+			 * for i18n
+			 */
+
+			okText() {
+				return t("uni-calender.ok")
+			},
+			cancelText() {
+				return t("uni-calender.cancel")
+			},
+			todayText() {
+				return t("uni-calender.today")
+			},
+			monText() {
+				return t("uni-calender.MON")
+			},
+			TUEText() {
+				return t("uni-calender.TUE")
+			},
+			WEDText() {
+				return t("uni-calender.WED")
+			},
+			THUText() {
+				return t("uni-calender.THU")
+			},
+			FRIText() {
+				return t("uni-calender.FRI")
+			},
+			SATText() {
+				return t("uni-calender.SAT")
+			},
+			SUNText() {
+				return t("uni-calender.SUN")
+			},
+		},
+		created() {
+			// 获取日历方法实例
+			this.cale = new Calendar({
+				// date: new Date(),
+				selected: this.selected,
+				startDate: this.startDate,
+				endDate: this.endDate,
+				range: this.range,
+			})
+			
+			this.init(this.date)
+			// this.setDay
+			if(!this.$props.isAbleSelectFutureDate){
+				let date = new Date();
+				this.curMonth = date.getMonth() + 1;
+				this.curYear = date.getFullYear();
+				this.curDate = date.getDate();
+			}
+			
+			setTimeout(() => {
+				this.cale.setSelectInfo(this.nowDate.fullDate, this.selected)
+				this.weeks = this.cale.weeks
+			}, 0)
+			this.$watch(() => this.selected, (newVal) => {
+				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
+				this.weeks = this.cale.weeks
+			}, {deep: true})
+		},
+		methods: {
+			onCalendarTouchStart(e){
+				//console.log("触摸状态：",e);
+				this.touchStartX = e.changedTouches[0].pageX;
+				this.touchStartY = e.changedTouches[0].pageY;
+			},
+			onCalendarTouchEnd(e){
+				//console.log("触摸状态2：",e);
+				
+				let tempX = e.changedTouches[0].pageX;
+				let tempY = e.changedTouches[0].pageY;
+				
+				// 1. X轴移动距离大于等于 100
+				// 2. Y轴偏移不能大于 30
+				// ①  <---->  ②  <-----> ③
+				
+				// Y轴条件，不能偏离超过80
+				let diff = Math.abs(tempY - this.touchStartY);
+				if(diff <= 80){
+					//console.log("Y轴偏离值：",diff);
+					// 左滑
+					if(this.touchStartX - tempX >= 70) {
+						//console.log("左滑:",this.touchStartX - tempX);
+						this.$emit('scrollLeft');
+					}
+					// 右滑
+					else if(tempX - this.touchStartX >= 70){
+						//console.log("右滑:",tempX - this.touchStartX);
+						this.$emit('scrollRight');
+					}
+				}else{
+					//console.log("Y轴偏离了：",diff);
+				}
+			},
+			// 取消穿透
+			clean() {},
+			bindDateChange(e) {
+				const value = e.detail.value + '-1'
+				//console.log(this.cale.getDate(value));
+				this.init(value)
+			},
+			/**
+			 * 初始化日期显示
+			 * @param {Object} date
+			 */
+			init(date) {
+				this.cale.setDate(date);
+				this.weeks = this.cale.weeks;
+				this.nowDate = this.calendar = this.cale.getInfo(date);
+				
+				this.todayDate = this.nowDate.lunar.cDay;
+				this.todayMonth = this.nowDate.lunar.cMonth;
+				this.todayYear = this.nowDate.lunar.cYear;
+			},
+			/**
+			 * 关闭日历弹窗
+			 */
+			close() {
+				this.aniMaskShow = false
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.show = false
+						this.$emit('close')
+					}, 300)
+				})
+			},
+			/**
+			 * 确认按钮
+			 */
+			confirm() {
+				this.setEmit('confirm')
+				this.close()
+			},
+			/**
+			 * 变化触发
+			 */
+			change() {
+				this.setEmit('change');	
+			},
+			/**
+			 * 选择月份触发
+			 */
+			monthSwitch() {
+				let {
+					year,
+					month
+				} = this.nowDate
+				this.$emit('monthSwitch', {
+					year,
+					month: Number(month)
+				})
+			},
+			/**
+			 * 派发事件
+			 * @param {Object} name
+			 */
+			setEmit(name) {
+				let {
+					year,
+					month,
+					date,
+					fullDate,
+					// lunar,
+					// extraInfo,
+					recordData
+				} = this.calendar
+				this.$emit(name, {
+					range: this.cale.multipleStatus,
+					recordData,
+					year,
+					month,
+					date,
+					fulldate: fullDate,
+					// lunar,
+					// extraInfo: extraInfo || {}
+				})
+			},
+			/**
+			 * 选择天触发
+			 * @param {Object} weeks
+			 */
+			choiceDate(weeks) {
+				if (weeks.disable) return
+				
+				this.calendar = weeks;
+				// 设置多选
+				this.cale.setMultiple(this.calendar.fullDate);
+				this.weeks = this.cale.weeks;
+				this.change(weeks);
+			},
+			/**
+			 * 回到今天
+			 */
+			backtoday() {
+				//console.log(this.cale.getDate(new Date()).fullDate);
+				let date = this.cale.getDate(new Date()).fullDate
+				// this.cale.setDate(date)
+				this.init(date)
+				this.change()
+			},
+			/**
+			 * 上个月
+			 */
+			pre() {
+				const preDate = this.cale.getDate(this.nowDate.fullDate, -1, 'month').fullDate
+				this.setDate(preDate)
+				this.monthSwitch()
+
+			},
+			/**
+			 * 下个月
+			 */
+			next() {
+				const nextDate = this.cale.getDate(this.nowDate.fullDate, +1, 'month').fullDate
+				this.setDate(nextDate)
+				this.monthSwitch()
+			},
+			/**
+			 * 设置日期
+			 * @param {Object} date
+			 */
+			setDate(date) {
+				//console.log("设置日期：",date);
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-calendar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-calendar__mask {
+		position: fixed;
+		bottom: 0;
+		top: 0;
+		left: 0;
+		right: 0;
+		background-color: $uni-bg-color-mask;
+		transition-property: opacity;
+		transition-duration: 0.3s;
+		opacity: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--mask-show {
+		opacity: 1
+	}
+
+	.uni-calendar--fixed {
+		position: fixed;
+		/* #ifdef APP-NVUE */
+		bottom: 0;
+		/* #endif */
+		left: 0;
+		right: 0;
+		transition-property: transform;
+		transition-duration: 0.3s;
+		transform: translateY(460px);
+		/* #ifndef APP-NVUE */
+		bottom: calc(var(--window-bottom));
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--ani-show {
+		transform: translateY(0);
+	}
+
+	.uni-calendar__content {
+		background-color: #fff;
+	}
+
+	.uni-calendar__header {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 50px;
+		border-bottom-color: $uni-border-color;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar--fixed-top {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		border-top-color: $uni-border-color;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--fixed-width {
+		width: 50px;
+		// padding: 0 15px;
+	}
+
+	.uni-calendar__backtoday {
+		position: absolute;
+		right: 0;
+		top: 25rpx;
+		padding: 0 5px;
+		padding-left: 10px;
+		height: 25px;
+		line-height: 25px;
+		font-size: 12px;
+		border-top-left-radius: 25px;
+		border-bottom-left-radius: 25px;
+		color: $uni-text-color;
+		background-color: $uni-bg-color-hover;
+	}
+
+	.uni-calendar__header-text {
+		text-align: center;
+		width: 100px;
+		font-size: $uni-font-size-base;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar__header-btn-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		width: 50px;
+		height: 50px;
+	}
+
+	.uni-calendar__header-btn {
+		width: 10px;
+		height: 10px;
+		border-left-color: $uni-text-color-placeholder;
+		border-left-style: solid;
+		border-left-width: 2px;
+		border-top-color: $uni-color-subtitle;
+		border-top-style: solid;
+		border-top-width: 2px;
+	}
+
+	.uni-calendar--left {
+		transform: rotate(-45deg);
+	}
+
+	.uni-calendar--right {
+		transform: rotate(135deg);
+	}
+	
+	.next-calendar-title-bar{
+		background-color: #F4F6F8;
+	}
+
+	.uni-calendar__weeks {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-calendar__weeks-item {
+		flex: 1;
+	}
+
+	.uni-calendar__weeks-day {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 48rpx;
+		border-bottom-color: #F5F5F5;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar__weeks-day-text {
+		font-size: 20rpx;
+		font-weight: 400;
+		color: #666666;
+	}
+
+	.uni-calendar__box {
+		position: relative;
+	}
+
+	.uni-calendar__box-bg {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.uni-calendar__box-bg-text {
+		font-size: 200px;
+		font-weight: bold;
+		color: $uni-text-color-grey;
+		opacity: 0.1;
+		text-align: center;
+		/* #ifndef APP-NVUE */
+		line-height: 1;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/next-date-picker/components/next-date-picker/next-date-picker.css b/uni_modules/next-date-picker/components/next-date-picker/next-date-picker.css
new file mode 100644
index 0000000..e5ef12c
--- /dev/null
+++ b/uni_modules/next-date-picker/components/next-date-picker/next-date-picker.css
@@ -0,0 +1,62 @@
+
+.title_bar{
+	width: calc(100vw - 56rpx);
+	padding-left: 28rpx;
+	padding-right: 28rpx;
+	height: 100rpx;
+	background-color: #ffffff;
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+	border-bottom: 1rpx solid #F4F6F8;
+}
+
+.year_text{
+	font-size: 28rpx;
+	color: #333333;
+	margin-left: 28rpx;
+	margin-right: 34rpx;
+}
+
+.title_text{
+	color: #333333;
+	font-size: 28rpx;
+	font-weight: 500;
+}
+
+.year_month_bar{
+	padding-top: 10rpx;
+	padding-bottom: 10rpx;
+	background-color: #ffffff;
+	display: flex;
+	justify-content: flex-start;
+	align-items: center;
+}
+.divider_text {
+	font-size: 28rpx;
+	color: #ccc;
+	vertical-align: middle;
+}
+.clean_text {
+	font-size: 28rpx;
+	font-weight: 500;
+	vertical-align: middle;
+}
+.cancel_text{
+	/* color: #f9ae3d; */
+	font-size: 28rpx;
+	font-weight: 500;
+	vertical-align: middle;
+}
+.title_date {
+	font-size: 28rpx;
+	vertical-align: middle;
+}
+.confirm_text{
+	/* color: #f9ae3d; */
+	background-color: #ffffff;
+	font-size: 28rpx;
+	font-weight: 500;
+	vertical-align: middle;
+}
diff --git a/uni_modules/next-date-picker/components/next-date-picker/next-date-picker.vue b/uni_modules/next-date-picker/components/next-date-picker/next-date-picker.vue
new file mode 100644
index 0000000..2de3a4d
--- /dev/null
+++ b/uni_modules/next-date-picker/components/next-date-picker/next-date-picker.vue
@@ -0,0 +1,300 @@
+<template>
+	<uni-popup type="bottom" ref="popupDialogObj">
+		<view v-if="isSimple">
+			<simple-picker-date
+				v-if="ifShowComp"
+				ref="simplePickerObj"
+				@onCancel="onCancel"
+				@onConfirm="onConfirm" 
+				:defaultValue="defaultDate" 
+				:themeColor="themeColor"
+				:startDate="startDate"
+				:title="title"
+				:endDate="endDate">
+			</simple-picker-date>
+		</view>
+		<view v-else>
+			<view class="title_bar">
+				<view style="width: 180rpx"><text class="cancel_text" :style="'color:'+themeColor" @click="close">取消</text></view>
+				<slot v-if="$slots.title" name="title" :data="{ checkedList }"></slot>
+				<text class="title_text" v-else-if="isMultiple">{{title}}{{checkedList && checkedList.length > 0 ? '(已选'+checkedList.length+'天)':'(可选多天)'}}</text>
+				<text class="title_text" v-else>{{title}}</text>
+				<view style="width: 180rpx">
+					<text v-if="!isSimple" class="clean_text" :style="'color:red'" @click="clean">清空</text>
+					<text v-if="!isSimple" space="emsp" class="divider_text"> | </text>
+					<text class="cancel_text" :style="'color:'+themeColor" @click="comfirmModel">确定</text></view>
+			</view>
+			<view class="uni_flex_row_align_left year_month_bar">
+				<text class="year_text">{{year}}年</text>
+				<uni-icons type="back" @click="prveMonth" size="18"></uni-icons>
+				<text class="title_date" decode>{{&nbsp;}}{{month < 10 ? '0'+month:month}}月{{&nbsp;}}</text>
+				<uni-icons v-if="isAbleSelectFutureDate ? true : ((year < curYear) || (month < curMonth && year === curYear))" type="forward" @click="nextMonth" size="18"></uni-icons>
+			</view>		
+			<next-calendar
+				v-if="ifShowComp"
+				ref="calendarObj"
+				:mode="isMultiple ? 'multiple':'single'"
+				:isAbleSelectFutureDate="isAbleSelectFutureDate"
+				:selected="checkedList"
+				:lunar="true" 
+				:themeColor="themeColor"
+				:clearDate="false"
+				:showMonth="showMonthOnCenter"
+				:isShowHeader="false"
+				@change="checkedEvent"
+			 />
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	import nextCalendar from './next-calendar.vue';
+	import simplePickerDate from './simple-pickerdate.vue';
+	
+	function getNowDate() {
+		let date = new Date();
+		let year = date.getFullYear();
+		let month = date.getMonth() + 1;
+		let day = date.getDate();
+		if (month.toString().length == 1) {
+			month = "0" + month;
+		}
+		if (day.toString().length == 1) {
+			day = "0" + day;
+		}
+		return year + "-" + month + "-" + day;
+	}
+	
+	export default {
+		components:{ nextCalendar,simplePickerDate },
+		// 日期选择完成
+		emits:['finishSelectDate'],
+		props: {
+			// 是否默认选中今日
+			checkedToady:{
+				type:Boolean,
+				default:false
+			},
+			// 默认选中的日期列表(可用于传入之前选择的值)
+			defaultCheckedList:{
+				type: Array,
+				default:()=>{
+					return []
+				}
+			},
+			mode: {
+				type: String,
+				default: 'simple'
+			},
+			// 是否可以选择未来日期
+			isAbleSelectFutureDate:{
+				type: Boolean,
+				default: true
+			},
+			// 是否在日历中间显示大大的月份数字
+			showMonthOnCenter:{
+				type: Boolean,
+				default: true
+			},
+			// 主题风格颜色
+			themeColor:{
+				type: String,
+				default: '#f9ae3d'
+			},
+			// 弹窗的标题文字
+			title:{
+				type: String,
+				default: '选择日期'
+			},
+			startDate: {	
+				type: String,
+				default () {
+					return "1971-01-01"
+				}
+			},
+			endDate: {
+				type: String,
+				default () {
+					return "2099-12-31"
+				}
+			},
+			defaultDate: {
+				type: String,
+				default () {
+					return getNowDate()
+				}
+			}		
+		},
+		data() {
+			return {
+				checkedList:[],
+				year:2022,
+				month:7,
+				curYear:2022,
+				curMonth:6,
+				ifShowComp: false,
+			}
+		},
+		computed: {
+			isSimple() {
+				return this.mode === 'simple'
+			},
+			isMultiple() {
+				return this.mode === 'multiple'
+			},
+			isRange() {
+				return this.mode === 'range'
+			}
+		},
+		methods: {
+			init () {
+				let date = new Date();
+				this.month = date.getMonth() + 1;
+				this.year = date.getFullYear();
+				this.date = date.getDate();
+				
+				this.curYear = this.year;
+				this.curMonth = this.month;
+				
+				setTimeout(() => {
+					if (!this.isSimple) {	
+						const cale = this.$refs.calendarObj.cale
+						const dateStr = ''+this.year+'-'+(this.month < 10 ? '0'+this.month:this.month)+'-'+(this.date < 10 ? '0'+this.date:this.date);
+						if(this.isMultiple || this.isRange){
+							this.checkedList = []
+							if(this.defaultCheckedList){
+								this.defaultCheckedList.forEach((item,index)=>{
+									this.checkedList.push({date: cale.getDate(item).fullDate});
+								})
+							}
+							if(this.checkedToady){
+								this.checkedList.push({date:dateStr});
+							}
+						} else {
+							if(this.checkedToady){
+								this.checkedList = [{date:dateStr}];
+							} else if (this.defaultCheckedList && this.defaultCheckedList.length) {
+								this.checkedList = [{date:cale.getDate(this.defaultCheckedList[0]).fullDate}]
+							}
+						}
+					}
+				})	
+			},
+			onCancel(){
+				this.close();
+			},
+			onConfirm(date){
+				this.close();
+				this.$emit("finishSelectDate",[ date.dateValue]);
+			},
+			updateCheckedList(list){
+				this.checkedList = list || [];
+			},
+			comfirmModel(){
+				const list = (this.checkedList || []).map(item => item.date)
+				this.$emit("finishSelectDate",list);
+				this.close();
+			},
+			getCheckedList(){
+				return this.checkedList || [];
+			},
+			prveMonth(){
+				if(this.month === 1){
+					this.year -= 1;
+					this.month = 12;
+				}else{
+					this.month -= 1;
+				}
+				this.$refs.calendarObj.pre();
+			},
+			nextMonth(){
+				if(this.month === 12){
+					this.year += 1;
+					this.month = 1;
+				}else{
+					this.month += 1;
+				}
+				this.$refs.calendarObj.next();
+			},
+			getDatesBetween(startDateStr, endDateStr) {
+			  var startDate = new Date(startDateStr);
+			  var endDate = new Date(endDateStr);
+			  
+			  // 确保起始日期早于或等于结束日期
+			  if (startDate > endDate) {
+			    var temp = startDate;
+			    startDate = endDate;
+			    endDate = temp;
+			  }
+			  
+			  var dates = [];
+			  var currentDate = startDate;
+			  
+			  while (currentDate <= endDate) {
+			    dates.push(currentDate.toISOString().split('T')[0]);
+			    currentDate.setDate(currentDate.getDate() + 1);
+			  }	  
+			  return dates;
+			},
+			checkedEvent(week){
+				if(this.isRange) { // 区间
+					if(this.checkedList.length > 1) {
+						this.checkedList.length = 0;
+						this.checkedList.push({date: week.fulldate});
+					} else {
+						const index = this.checkedList.findIndex(item => item.date === week.fulldate)
+						if(index !== -1) {
+							this.checkedList.splice(index, 1)
+						} else if(this.checkedList.length === 0) {
+							this.checkedList.push({date: week.fulldate});
+						} else {
+							const dateList = this.getDatesBetween(this.checkedList[0].date, week.fulldate);
+							this.checkedList = dateList.map(dateStr => ({date: dateStr}));
+						}
+					}
+					
+				} else if (this.isMultiple) {	// 多选
+					const index = this.checkedList.findIndex(item => item.date === week.fulldate)
+					if (index !== -1) {
+						this.checkedList.splice(index, 1)
+					} else {
+						this.checkedList.push({date: week.fulldate})
+					}
+				} else {	// 单选
+					let temp = [{date: week.fulldate}];
+					this.checkedList = temp;			
+				}
+			},
+			open() {
+				this.ifShowComp = true;
+				
+				setTimeout(() => {
+					// #ifndef MP
+					let date = new Date();
+					this.month = date.getMonth() + 1;
+					this.year = date.getFullYear();
+					this.date = date.getDate();
+					
+					this.curYear = this.year;
+					this.curMonth = this.month;
+					// #endif
+					this.init();
+					this.$refs.popupDialogObj.open();
+				})	
+			},
+			clean() {
+				this.checkedList = []
+			},
+			close() {
+				this.$refs.popupDialogObj.close();
+				setTimeout(() => {
+					this.ifShowComp = false;
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+@import url('next-date-picker.css');
+</style>
diff --git a/uni_modules/next-date-picker/components/next-date-picker/next-multiple-selector-item.vue b/uni_modules/next-date-picker/components/next-date-picker/next-multiple-selector-item.vue
new file mode 100644
index 0000000..0cfffbb
--- /dev/null
+++ b/uni_modules/next-date-picker/components/next-date-picker/next-multiple-selector-item.vue
@@ -0,0 +1,242 @@
+<template>
+	<view class="uni-calendar-item__weeks-box" style="margin-bottom: 4rpx;" :class="{
+		'uni-calendar-item--disable': weeks.disable,
+		'uni-calendar-item--before-checked':weeks.beforeMultiple,
+		'uni-calendar-item--multiple': weeks.multiple,
+		'uni-calendar-item--after-checked':weeks.afterMultiple,
+		}"
+		@click.stop="onCheckDate(weeks)"
+		>
+		<view :class="weeks.extraInfo ? 'uni-calendar-checked':'uni-calendar-item__weeks-box-item'" :style="weeks.extraInfo ? 'border:1rpx solid '+themeColor:''">
+			<!-- !weeks.disable 过去的日期和下个月的未来日期不显示 -->
+			<text v-if="!weeks.disable" :style="weeks.extraInfo ? 'color:'+themeColor:''" :class="weeks.extraInfo ? 'next_date_text_selected':'next_date_text'">{{weeks.date}}</text>
+			<text v-if="!weeks.disable" :style="weeks.extraInfo ? 'color:'+themeColor:''" :class="weeks.extraInfo ? 'next_lanur_text_selected':'next_lanur_text'" style="margin-top: 2rpx;">{{weeks.isDay ? todayText : (weeks.lunar.IDayCn === '初一'?weeks.lunar.IMonthCn:weeks.lunar.IDayCn)}}</text>
+
+			<!-- 是否可以选择未来日期 -->
+			<view v-if="isAbleSelectFutureDate">
+				<view v-if="!weeks.disable && weeks.extraInfo" class="selected" :style="'background: '+themeColor+';'">
+					<uni-icons :style="'display: inline-flex;background:'+themeColor+';'" type="checkmarkempty" color="#ffffff" size="14"></uni-icons>
+				</view>
+				<view v-else-if="!weeks.disable" class="unselected"></view>
+			</view>
+			<view v-else>
+				<view v-if="!weeks.disable && weeks.extraInfo" class="selected">
+					<uni-icons :style="'display: inline-flex;background:'+themeColor+';'" type="checkmarkempty" color="#ffffff" size="14"></uni-icons>
+				</view>
+				<view v-else-if="!weeks.disable && ((weeks.lunar.cYear < curYear) 
+				|| (weeks.lunar.cYear === curYear && weeks.lunar.cMonth < curMonth) 
+				|| (weeks.lunar.cYear === curYear && weeks.lunar.cMonth === curMonth && weeks.lunar.cDay <= curDate))" class="unselected"></view>
+			</view>
+			<view v-if="weeks.extraInfo" :style="'background-color:'+themeColor+';opacity:0.2;position:absolute;top:0;left:0;right:0;bottom:0'"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	export default {
+		emits:['change'],
+		props: {
+			themeColor:{
+				type: String,
+				default: '#f9ae3d'
+			},
+			isAbleSelectFutureDate:{
+				type: Boolean,
+				default: true
+			},
+			curYear:{
+				type: Number,
+				default: 2022
+			},
+			curMonth:{
+				type: Number,
+				default: 7
+			},
+			curDate:{
+				type: Number,
+				default: 14
+			},
+			weeks: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			calendar: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			}
+		},
+		computed: {
+			todayText() {
+				return t("uni-calender.today")
+			},
+		},
+		methods: {
+			onCheckDate(weeks){
+				if(!this.$props.isAbleSelectFutureDate){
+					if((weeks.lunar.cYear < this.$props.curYear) 
+					|| (weeks.lunar.cYear === this.$props.curYear && weeks.lunar.cMonth < this.$props.curMonth) 
+					|| (weeks.lunar.cYear === this.$props.curYear && weeks.lunar.cMonth === this.$props.curMonth && weeks.lunar.cDay <= this.$props.curDate)){
+						this.$emit('change', weeks);
+					}
+				}else{
+					this.$emit('change', weeks);
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.selected{
+		width: 24rpx;
+		height: 24rpx;
+		margin-top: 6rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		.icon{
+			width: 24rpx;
+			height: 24rpx;
+		}
+	}
+	.unselected{
+		width: 24rpx;
+		height: 24rpx;
+		border: 1rpx solid #999999;
+		margin-top: 6rpx;
+	}
+	.uni-calendar-item__weeks-box {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+	
+	.next_lanur_text{
+		font-size: 20rpx;
+		font-weight: 400;
+		color: #999999;
+	}
+	
+	.next_lanur_text_selected{
+		font-size: 20rpx;
+		font-weight: 400;
+		color: #f9ae3d;
+	}
+	
+	.next_date_text{
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #333333;
+	}
+	
+	.next_date_text_selected{
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #f9ae3d;
+	}
+
+	.uni-calendar-item__weeks-box-text {
+		font-size: $uni-font-size-base;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar-item__weeks-lunar-text {
+		font-size: $uni-font-size-sm;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar-item__weeks-box-item {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: flex-start;
+		align-items: center;
+		width: 100rpx;
+		height: 120rpx;
+		border: 1rpx solid transparent;
+	}
+
+	.uni-calendar-checked{
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: flex-start;
+		align-items: center;
+		width: 98rpx;
+		height: 118rpx;
+	}
+	
+	.uni-calendar-item__weeks-box-circle {
+		position: absolute;
+		top: 5px;
+		right: 5px;
+		width: 8px;
+		height: 8px;
+		border-radius: 8px;
+		background-color: $uni-color-error;
+	}
+
+	.uni-calendar-item--disable {
+		background-color: rgba(249, 249, 249, $uni-opacity-disabled);
+	}
+
+	.uni-calendar-item--isDay-text {
+		color: $uni-color-primary;
+	}
+
+	.uni-calendar-item--isDay {
+		background-color: $uni-color-primary;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item--extra {
+		color: $uni-color-error;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item--checked {
+		background: #FBEDED;
+		border-radius: 4rpx;
+		border: 2rpx solid #f9ae3d;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item--multiple {
+		background-color: $uni-color-primary;
+		opacity: 0.8;
+	}
+	.uni-calendar-item--before-checked {
+		background-color: #ff5a5f;
+	}
+	.uni-calendar-item--after-checked {
+		background-color: #ff5a5f;
+	}
+</style>
diff --git a/uni_modules/next-date-picker/components/next-date-picker/simple-pickerdate.vue b/uni_modules/next-date-picker/components/next-date-picker/simple-pickerdate.vue
new file mode 100644
index 0000000..1676c78
--- /dev/null
+++ b/uni_modules/next-date-picker/components/next-date-picker/simple-pickerdate.vue
@@ -0,0 +1,378 @@
+<template>
+	<view class="gpp-datePicker">
+		<slot />
+		<!-- <view class="g-dp-mask" :class="{'show':pipkerShowFlag}" @click.stop="hide" @touchmove.stop.prevent -->
+			<!-- catchtouchmove="true"></view> -->
+		<view class="g-dp-content" :class="{'show':pipkerShowFlag}" @touchmove.stop.prevent catchtouchmove="true">
+			<view class="g-dp-ctt-head">
+				<view class="g-dp-ctt-hd-btn" :style="{'color':themeColor}" @click.stop="onCancel">取消</view>
+				<text>{{title}}</text>
+				<view class="g-dp-ctt-hd-btn" :style="{'color':themeColor}" @click.stop="onConfirm">确定</view>
+			</view>
+			<view class="g-dp-ctt-wrapper">
+				<picker-view :indicator-style="indicatorStyle" :value="selectedValue" @change="wrapperChange">
+					<picker-view-column v-if="showFormDate!=3">
+						<view class="g-dp-ctt-wp-item" :style="yearPickerIndex===index?'color:'+themeColor:''" v-for="(item,index) in years" :key="index">{{item}}年</view>
+					</picker-view-column>
+					<picker-view-column v-show="showFormDate==0||showFormDate==1||showFormDate==3">
+						<view class="g-dp-ctt-wp-item" :style="monthPickerIndex===index?'color:'+themeColor:''" v-for="(item,index) in months" :key="index">
+							{{dateFormate(item)}}月
+						</view>
+					</picker-view-column>
+					<picker-view-column  v-show="showFormDate==0">
+						<view class="g-dp-ctt-wp-item" :style="dayPickerIndex===index?'color:'+themeColor:''" v-for="(item,index) in days" :key="index">{{dateFormate(item)}}日
+						</view>
+					</picker-view-column>
+				</picker-view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	function getNowDate() {
+		let date = new Date();
+		let year = date.getFullYear();
+		let month = date.getMonth() + 1;
+		let day = date.getDate();
+		if (month.toString().length == 1) {
+			month = "0" + month;
+		}
+		if (day.toString().length == 1) {
+			day = "0" + day;
+		}
+		return year + "-" + month + "-" + day;
+	}
+	export default {
+		props: {
+			title:{
+				type: String,
+				default:'选择日期'
+			},
+			themeColor: {
+				type: String,
+				default () {
+					return "#f9ae3d"
+				}
+			},
+			defaultValue: {
+				type: String,
+				default () {
+					return getNowDate()
+				}
+			},
+			startDate: {
+				type: String,
+				default () {
+					return "1971-01-01"
+				}
+			},
+			endDate: {
+				type: String,
+				default () {
+					return "2099-12-31"
+				}
+			},
+			showFormDate:{				type:Number,				default(){					return 0; 
+			// 0显示年月日 1 显示年月 2显示年 3显示月				
+			}			},
+		},
+		data() {
+			return {
+				pipkerShowFlag: true,
+				indicatorStyle: `height: ${uni.upx2px(88)}px;`,
+
+				selectedValue: [],
+
+				years: [],
+				months: [],
+				days: [],
+				yearPickerIndex:'',
+				monthPickerIndex:'',
+				dayPickerIndex:''
+			}
+		},
+		created() {
+			this.init();
+		},
+		methods: {
+			init() {
+				if (this.propsCheck()) {
+					return;
+				}
+				this.getYears();
+				this.getMonths(this.defaultValue);
+				this.getDays(this.defaultValue);
+				setTimeout(() => {
+					this.getPickerValue(this.defaultValue);		
+				})
+			},
+			/**
+			 * props值校验
+			 */
+			propsCheck() {
+				let flag = false;
+				let start = new Date(this.startDate).getTime();
+				let end = new Date(this.endDate).getTime();
+				let now = new Date(this.defaultValue).getTime();
+				if (isNaN(start) || isNaN(end) || isNaN(now)) {
+					flag = true;
+				}
+				if (start > end || now > end || now < start) {
+					flag = true;
+				}
+
+				if (flag) {
+					uni.showToast({
+						title: "时间选择器参数错误",
+						icon: "none"
+					})
+				}
+				return flag;
+			},
+			onCancel() {
+				this.pipkerShowFlag = false;
+				this.$emit("onCancel", {
+					dateValue: this.getDateValue(this.selectedValue),
+					dateValueIndex: this.selectedValue
+				});
+			},
+			onConfirm() {
+				this.pipkerShowFlag = false;
+				this.$emit("onConfirm", {
+					dateValue: this.getDateValue(this.selectedValue),
+					dateValueIndex: this.selectedValue
+				});
+			},
+
+			/**
+			 * picker change时间触发
+			 * @param {Object} e
+			 */
+			wrapperChange(e) {
+				
+				
+				let detailValue = e.detail.value;
+				this.yearPickerIndex=detailValue[0];
+				this.monthPickerIndex=detailValue[1];
+				this.dayPickerIndex=detailValue[2];
+				let selectedDate = this.years[detailValue[0]] + "-" + this.months[detailValue[1]] + "-" + this.days[
+					detailValue[2]];
+				if (this.selectedValue[0] != detailValue[0]) {
+					this.getMonths(selectedDate);
+					selectedDate = this.years[detailValue[0]] + "-" + this.months[detailValue[1]] + "-" + this.days[
+						detailValue[2]];
+					this.getDays(selectedDate);
+				}
+				if (this.selectedValue[1] != detailValue[1]) {
+					this.getDays(selectedDate);
+				}
+				this.selectedValue = detailValue;
+			},
+			/**
+			 * 获取年
+			 */
+			getYears() {
+				let startDateArray = this.startDate.split("-");
+				let endDateArray = this.endDate.split("-");
+				let startYear = Number(startDateArray[0]);
+				let endYear = Number(endDateArray[0]);
+
+				let newYears = []
+				for (let i = startYear; i <= endYear; i++) {
+					newYears.push(i);
+				}
+				this.years = newYears;
+			},
+			/**
+			 * 获取月
+			 * @param {Object} nowDate 当前选中的日期（判断当前年有多少个月）
+			 */
+			getMonths(nowDate) {
+				let startDateArray = this.startDate.split("-");
+				let endDateArray = this.endDate.split("-");
+				let nowDateArray = nowDate.split("-");
+				let startYear = Number(startDateArray[0]);
+				let endYear = Number(endDateArray[0]);
+				let startMonth = Number(startDateArray[1]);
+				let endMonth = Number(endDateArray[1]);
+
+				let newMonths = [];
+				if (startYear == Number(nowDateArray[0])) {
+					if (endYear == Number(nowDateArray[0])) { // 起始年份,末尾年份一样时
+						for (let i = startMonth; i <= endMonth; i++) {
+							newMonths.push(i);
+						}
+					} else {
+						for (let i = startMonth; i <= 12; i++) {
+							newMonths.push(i);
+						}
+					}
+				} else if (endYear == Number(nowDateArray[0])) {
+					for (let i = 1; i <= endMonth; i++) {
+						newMonths.push(i);
+					}
+				} else {
+					for (let i = 1; i <= 12; i++) {
+						newMonths.push(i);
+					}
+				}
+				this.months = newMonths;
+			},
+			/**
+			 * 获取日
+			 * @param {Object} nowDate 当前选中的日期（判断当前年月有多少个日）
+			 */
+			getDays(nowDate) {
+				let startDateArray = this.startDate.split("-");
+				let endDateArray = this.endDate.split("-");
+				let nowDateArray = nowDate.split("-");
+				let startYear = Number(startDateArray[0]);
+				let endYear = Number(endDateArray[0]);
+				let startMonth = Number(startDateArray[1]);
+				let endMonth = Number(endDateArray[1]);
+				let startDay = Number(startDateArray[2]);
+				let endDay = Number(endDateArray[2]);
+				let totalDays = new Date(nowDateArray[0], nowDateArray[1], 0).getDate();
+
+				let newDays = [];
+				if (startYear == Number(nowDateArray[0]) && startMonth == Number(nowDateArray[1])) {
+					if (endYear == Number(nowDateArray[0]) && endMonth == Number(nowDateArray[1])) {
+						for (let i = startDay; i <= endDay; i++) {
+							newDays.push(i);
+						}
+					} else {
+						for (let i = startDay; i <= totalDays; i++) {
+							newDays.push(i);
+						}
+					}
+				} else if (endYear == Number(nowDateArray[0]) && endMonth == Number(nowDateArray[1])) {
+					for (let i = 1; i <= endDay; i++) {
+						newDays.push(i);
+					}
+				} else {
+					for (let i = 1; i <= totalDays; i++) {
+						newDays.push(i);
+					}
+				}
+				this.days = newDays;
+			},
+
+			dateFormate(val) {
+				if (Number(val) > 9) {
+					return val;
+				}
+				return "0" + val;
+			},
+			getPickerValue(showDate) {
+				let showArray = [0, 0, 0];
+				let showDateArray = showDate.split("-");
+				this.years.forEach((el, index) => {
+					if (Number(showDateArray[0]) == el) {
+						showArray[0] = index;
+						this.yearPickerIndex=index
+						return false;
+					}
+				})
+				this.months.forEach((el, index) => {
+					if (Number(showDateArray[1]) == el) {
+						showArray[1] = index;
+						this.monthPickerIndex=index
+						return false;
+					}
+				})
+				this.days.forEach((el, index) => {
+					if (Number(showDateArray[2]) == el) {
+						showArray[2] = index;
+						this.dayPickerIndex=index
+						return false;
+					}
+				})
+				this.$nextTick(() => {
+					this.selectedValue = showArray;
+				})
+			},
+			getDateValue(pikerValue) {
+				return this.years[pikerValue[0]] + "-" + this.dateFormate(this.months[pikerValue[1]]) + "-" + this
+					.dateFormate(this.days[pikerValue[2]]);
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.gpp-datePicker {
+		position: relative;
+		z-index: 999;
+
+		.g-dp-mask {
+			position: fixed;
+			z-index: 1000;
+			top: 0;
+			right: 0;
+			left: 0;
+			bottom: 0;
+			background: rgba(0, 0, 0, 0.6);
+			visibility: hidden;
+			opacity: 0;
+			transition: all 0.3s ease;
+		}
+
+		.g-dp-mask.show {
+			visibility: visible;
+			opacity: 1;
+		}
+
+		.g-dp-content {
+			position: fixed;
+			z-index: 1001;
+			bottom: 0;
+			right: 0;
+			width: 100%;
+			transition: all 0.3s ease;
+			transform: translateY(100%);
+
+			.g-dp-ctt-head {
+				height: 88upx;
+				background-color: #FFFFFF;
+				border-bottom: 1px solid #e5e5e5;
+				padding: 0 40upx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+
+				.g-dp-ctt-hd-btn {
+					color: #888;
+					font-size: 17px;
+				}
+			}
+
+			.g-dp-ctt-wrapper {
+				height: 480upx;
+				width: 100%;
+				background-color: #FFFFFF;
+
+				.g-dp-ctt-wp-item {
+					text-align: center;
+					width: 100%;
+					height: 88upx;
+					line-height: 88upx;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					font-size: 30upx;
+				}
+			}
+		}
+
+		.g-dp-content.show {
+			transform: translateY(0);
+		}
+
+		picker-view-column {
+			height: 480rpx !important;
+		}
+	}
+	.pick-text{
+		color: #f9ae3d;
+	}
+</style>
diff --git a/uni_modules/next-date-picker/components/next-date-picker/util.js b/uni_modules/next-date-picker/components/next-date-picker/util.js
new file mode 100644
index 0000000..8ebc8b7
--- /dev/null
+++ b/uni_modules/next-date-picker/components/next-date-picker/util.js
@@ -0,0 +1,349 @@
+import CALENDAR from './calendar.js'
+
+class Calendar {
+	constructor({
+		date,
+		selected,
+		startDate,
+		endDate,
+		range
+	} = {}) {
+		// 当前日期
+		this.date = this.getDate(new Date()) // 当前初入日期
+		// 打点信息
+		this.selected = selected || [];
+		// 范围开始
+		this.startDate = startDate
+		// 范围结束
+		this.endDate = endDate
+		this.range = range
+		// 多选状态
+		this.cleanMultipleStatus()
+		// 每周日期
+		this.weeks = {}
+		// this._getWeek(this.date.fullDate)
+	}
+	/**
+	 * 设置日期
+	 * @param {Object} date
+	 */
+	setDate(date) {
+		this.selectDate = this.getDate(date)
+		this._getWeek(this.selectDate.fullDate)
+	}
+
+	/**
+	 * 清理多选状态
+	 */
+	cleanMultipleStatus() {
+		this.multipleStatus = {
+			before: '',
+			after: '',
+			data: []
+		}
+	}
+
+	/**
+	 * 重置开始日期
+	 */
+	resetSatrtDate(startDate) {
+		// 范围开始
+		this.startDate = startDate
+
+	}
+
+	/**
+	 * 重置结束日期
+	 */
+	resetEndDate(endDate) {
+		// 范围结束
+		this.endDate = endDate
+	}
+
+	/**
+	 * 获取任意时间
+	 */
+	getDate(date, AddDayCount = 0, str = 'day') {
+		if (!date) {
+			date = new Date()
+		}
+		if (typeof date !== 'object') {
+			date = date.replace(/-/g, '/')
+		}
+		const dd = new Date(date)
+		switch (str) {
+			case 'day':
+				dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+			case 'month':
+				if (dd.getDate() === 31) {
+					dd.setDate(dd.getDate() + AddDayCount)
+				} else {
+					dd.setMonth(dd.getMonth() + AddDayCount) // 获取AddDayCount天后的日期
+				}
+				break
+			case 'year':
+				dd.setFullYear(dd.getFullYear() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+		}
+		const y = dd.getFullYear()
+		const m = dd.getMonth() + 1 < 10 ? '0' + (dd.getMonth() + 1) : dd.getMonth() + 1 // 获取当前月份的日期，不足10补0
+		const d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0
+		return {
+			fullDate: y + '-' + m + '-' + d,
+			year: y,
+			month: m,
+			date: d,
+			day: dd.getDay()
+		}
+	}
+
+
+	/**
+	 * 获取上月剩余天数
+	 */
+	_getLastMonthDays(firstDay, full) {
+		let dateArr = []
+		for (let i = firstDay; i > 0; i--) {
+			const beforeDate = new Date(full.year, full.month - 1, -i + 1).getDate()
+			dateArr.push({
+				date: beforeDate,
+				month: full.month - 1,
+				lunar: this.getlunar(full.year, full.month - 1, beforeDate),
+				disable: true
+			})
+		}
+		return dateArr
+	}
+	/**
+	 * 获取本月天数
+	 */
+	_currentMonthDys(dateData, full) {
+		let dateArr = []
+		let fullDate = this.date.fullDate
+		for (let i = 1; i <= dateData; i++) {
+			let isinfo = false
+			let nowDate = full.year + '-' + (full.month < 10 ?
+				full.month : full.month) + '-' + (i < 10 ?
+				'0' + i : i)
+			// 是否今天
+			let isDay = fullDate === nowDate
+			// 获取打点信息
+			let info = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(nowDate, item.date)) {
+					return item
+				}
+			})
+
+			// 日期禁用
+			let disableBefore = true
+			let disableAfter = true
+			if (this.startDate) {
+				disableBefore = this.dateCompare(this.startDate, nowDate)
+			}
+
+			if (this.endDate) {
+				disableAfter = this.dateCompare(nowDate, this.endDate)
+			}
+			let multiples = this.multipleStatus.data
+			let checked = false
+			let multiplesStatus = -1
+			if (this.range) {
+				if (multiples) {
+					multiplesStatus = multiples.findIndex((item) => {
+						return this.dateEqual(item, nowDate)
+					})
+				}
+				if (multiplesStatus !== -1) {
+					checked = true
+				}
+			}
+			let data = {
+				fullDate: nowDate,
+				year: full.year,
+				date: i,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.dateEqual(this.multipleStatus.before, nowDate),
+				afterMultiple: this.dateEqual(this.multipleStatus.after, nowDate),
+				month: full.month,
+				lunar: this.getlunar(full.year, full.month, i),
+				disable: !(disableBefore && disableAfter),
+				isDay
+			}
+			if (info) {
+				data.extraInfo = info
+			}
+
+			dateArr.push(data)
+		}
+		return dateArr
+	}
+	/**
+	 * 获取下月天数
+	 */
+	_getNextMonthDays(surplus, full) {
+		let dateArr = []
+		for (let i = 1; i < surplus + 1; i++) {
+			dateArr.push({
+				date: i,
+				month: Number(full.month) + 1,
+				lunar: this.getlunar(full.year, Number(full.month) + 1, i),
+				disable: true
+			})
+		}
+		return dateArr
+	}
+
+	/**
+	 * 获取当前日期详情
+	 * @param {Object} date
+	 */
+	getInfo(date) {
+		if (!date) {
+			date = new Date()
+		}
+		const dateInfo = this.canlender.find(item => item.fullDate === this.getDate(date).fullDate)
+		return dateInfo
+	}
+
+	/**
+	 * 比较时间大小
+	 */
+	dateCompare(startDate, endDate) {
+		// 计算截止时间
+		startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+		if (startDate <= endDate) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+	/**
+	 * 比较时间是否相等
+	 */
+	dateEqual(before, after) {
+		// 计算截止时间
+		before = new Date(before.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		after = new Date(after.replace('-', '/').replace('-', '/'))
+		if (before.getTime() - after.getTime() === 0) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+
+	/**
+	 * 获取日期范围内所有日期
+	 * @param {Object} begin
+	 * @param {Object} end
+	 */
+	geDateAll(begin, end) {
+		var arr = []
+		var ab = begin.split('-')
+		var ae = end.split('-')
+		var db = new Date()
+		db.setFullYear(ab[0], ab[1] - 1, ab[2])
+		var de = new Date()
+		de.setFullYear(ae[0], ae[1] - 1, ae[2])
+		var unixDb = db.getTime() - 24 * 60 * 60 * 1000
+		var unixDe = de.getTime() - 24 * 60 * 60 * 1000
+		for (var k = unixDb; k <= unixDe;) {
+			k = k + 24 * 60 * 60 * 1000
+			arr.push(this.getDate(new Date(parseInt(k))).fullDate)
+		}
+		return arr
+	}
+	/**
+	 * 计算阴历日期显示
+	 */
+	getlunar(year, month, date) {
+		return CALENDAR.solar2lunar(year, month, date)
+	}
+	/**
+	 * 设置打点
+	 */
+	setSelectInfo(data, value) {
+		this.selected = value
+		this._getWeek(data)
+	}
+
+	/**
+	 *  获取多选状态
+	 */
+	setMultiple(fullDate) {
+		let {
+			before,
+			after
+		} = this.multipleStatus
+		if (!this.range) return
+		if (before && after) {
+			this.multipleStatus.before = ''
+			this.multipleStatus.after = ''
+			this.multipleStatus.data = []
+		} else {
+			if (!before) {
+				this.multipleStatus.before = fullDate
+			} else {
+				this.multipleStatus.after = fullDate
+				if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus.after);
+				} else {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus.before);
+				}
+			}
+		}
+		this._getWeek(fullDate)
+	}
+
+	/**
+	 * 获取每周数据
+	 * @param {Object} dateData
+	 */
+	_getWeek(dateData) {
+		const {
+			fullDate,
+			year,
+			month,
+			date,
+			day
+		} = this.getDate(dateData)
+		let firstDay = new Date(year, month - 1, 1).getDay()
+		let currentDay = new Date(year, month, 0).getDate()
+		let dates = {
+			lastMonthDays: this._getLastMonthDays(firstDay, this.getDate(dateData)), // 上个月末尾几天
+			currentMonthDys: this._currentMonthDys(currentDay, this.getDate(dateData)), // 本月天数
+			nextMonthDays: [], // 下个月开始几天
+			weeks: []
+		}
+		let canlender = []
+		const surplus = 42 - (dates.lastMonthDays.length + dates.currentMonthDys.length)
+		dates.nextMonthDays = this._getNextMonthDays(surplus, this.getDate(dateData))
+		canlender = canlender.concat(dates.lastMonthDays, dates.currentMonthDys, dates.nextMonthDays)
+		let weeks = {}
+		// 拼接数组  上个月开始几天 + 本月天数+ 下个月开始几天
+		for (let i = 0; i < canlender.length; i++) {
+			if (i % 7 === 0) {
+				weeks[parseInt(i / 7)] = new Array(7)
+			}
+			weeks[parseInt(i / 7)][i % 7] = canlender[i]
+		}
+		this.canlender = canlender
+		this.weeks = weeks
+	}
+
+	//静态方法
+	// static init(date) {
+	// 	if (!this.instance) {
+	// 		this.instance = new Calendar(date);
+	// 	}
+	// 	return this.instance;
+	// }
+}
+
+
+export default Calendar
diff --git a/uni_modules/next-date-picker/package.json b/uni_modules/next-date-picker/package.json
new file mode 100644
index 0000000..c1a6aa3
--- /dev/null
+++ b/uni_modules/next-date-picker/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "next-date-picker",
+  "displayName": "next-date-picker日历选择 日期多选 日期单选 自定义日历组件",
+  "version": "1.0.8",
+  "description": "可以自由定义简单滚轮选择日期，或是日历组件弹出选择日期，可以设定单选还是多选日期，可更改主题色，自定义自己想要的颜色值",
+  "keywords": [
+    "日历选择",
+    "年月日选择",
+    "日期多选",
+    "时间选择",
+    "datepicker"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.6.15"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "插件不采集任何数据",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": ["uni-popup","uni-icons"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        },
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y",
+          "钉钉": "y",
+          "快手": "y",
+          "飞书": "y",
+          "京东": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/next-date-picker/readme.md b/uni_modules/next-date-picker/readme.md
new file mode 100644
index 0000000..fc9ac61
--- /dev/null
+++ b/uni_modules/next-date-picker/readme.md
@@ -0,0 +1,120 @@
+# next-date-picker
+日期选择组件
+
+有四种模式：  
+1. 简单的年月日弹窗选择(mode="simple")
+2. 日历弹窗选择多个日期（多选）(mode="multiple")
+3. 日历弹窗选择单个日期（单选）(mode="single")
+3. 日历弹窗选择区间日期（区间）(mode="range")
+
+> 遇到问题或有建议可以加入QQ群(<font color=#f00>455948571</font>)反馈  
+> 如果觉得组件不错，<font color=#f00>给五星鼓励鼓励</font>咯！
+> 
+
+### 如果有使用问题请加群
+
+注意：如果插件问题，请务必给一个完整的复现demo，谢谢配合；
+[点击链接加入群聊前端开发（uniapp插件）】](https://qm.qq.com/q/S1bJzQfJAG)
+
+### 预览
+
+***
+
+|                 						功能预览                  			                |                    						区间选择模式                              		 |
+| :---------------------------------------------------------------------:   | :-------------------------------------------------------------------------:|
+| ![](https://lixueshiaa.github.io/webtest/www/static/next-date-picker.gif) |![](https://lixueshiaa.github.io/webtest/www/static/next-date-picker-h.gif) |
+
+## 依赖插件
+1. [uni-popup](https://ext.dcloud.net.cn/plugin?id=329)
+2. [uni-icons](https://ext.dcloud.net.cn/plugin?id=28)
+
+## 参数
+可选参数属性列表
+
+|参数名				|说明																																																						|类型		|是否必填	|默认值		|可选值	|
+|----					|----																																																						|----		|----			|----			|----		|
+|checkedToady	|是否默认选中今日，仅(mode="multiple" 或 mode="single")模式生效 																									|Boolean|否				|false		|true		|
+defaultCheckedList|默认选中的日期，仅(mode="multiple" 或 mode="single")模式生效																									|Array	|是				|[]				|-			|
+isAbleSelectFutureDate|是否可以选择未来日期，仅(mode="multiple" 或 mode="single")模式生效																				|Boolean|否				|true			|false	|
+showMonthOnCenter|是否在日历中间显示大大的月份数字，仅(mode="multiple" 或 mode="single")模式生效																	|Boolean|否				|true			|false	|
+title|日期弹窗的标题|'选择日期'																																																|String	|否				|选择日期	|-			|
+startDate|(mode="single")简单模式下的开始日期| '1971-01-01'																																		|String	|否				|''				|-			|
+endDate|(mode="single")简单模式下的结束日期| '2099-12-31'																																			|String	|否				|''				|-			|
+defaultDate|(mode="single")简单模式下的默认日期| 今日的日期																																			|String	|否				|''				|-			|
+themeColor|组件的主题色，包含选择时的颜色，以及常见文字按钮颜色|'#f9ae3d'																												  |String	|否				|'#f9ae3d'|-			|
+mode|组件的模式|mode="multiple"(多选),mode="single"(单选),mode="simple"(简单),mode="range"(区间)																|String	|否				|'simple'	|-			|
+
+## Event 事件
+|事件名	|说明																										|类型	|回调参数	|
+|----		|----																										|----	|----			|
+|finishSelectDate|菜单收起时返回的筛选结果(例如：['2023-03-11'])	|emit	|array		|
+
+## Slot 插槽
+
+|名称		        |说明									|参数																          |
+|----		        |----									|----																          |
+|title	        |title标题栏插槽  			|data: {checkedList}(当前选中的数据checkedList)	|
+
+
+## 示例代码vue3
+```
+<template>
+	<view>
+		<next-date-picker 
+			ref="nextDatePickerRef" 
+			:mode="mode"
+			:isAbleSelectFutureDate="false"
+			:defaultDate="dateModel"
+			@finishSelectDate="finishSelectDate" 
+			:defaultCheckedList="[]">
+		</next-date-picker>
+		
+		<view style="margin-top: 48rpx;">
+			<view @click="show('simple')" class="btn">简单选择模式</view>
+			<view @click="show('range')" class="btn">日历区间模式</view>
+			<view @click="show('multiple')" class="btn">日历多选模式</view>
+			<view @click="show('single')" class="btn">日历单选模式</view>
+		</view>	
+	</view>
+</template>
+
+<script>
+	import {ref, unref} from 'vue'
+	export default {
+		setup() {
+			const mode = ref('simple');
+			const nextDatePickerRef = ref();
+			function show(showType) {
+				mode.value = showType;
+				nextDatePickerRef.value.open();
+			}
+			function finishSelectDate(e) {
+				console.log("选择了日期：",e);
+			}
+			const dateModel = ref('2023-5-11')
+			return {
+				mode,
+				show,
+				finishSelectDate,
+				nextDatePickerRef,
+				dateModel
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+.btn{
+	width: 600rpx;
+	margin-left: 74rpx;
+	margin-right: 74rpx;
+	text-align: center;
+	padding: 12rpx;
+	background-color: #e49a30;
+	color: aliceblue;
+	border-radius: 12rpx;
+	margin-top: 24rpx;
+}
+</style>
+
+```
\ No newline at end of file
diff --git a/uni_modules/uni-data-checkbox/changelog.md b/uni_modules/uni-data-checkbox/changelog.md
new file mode 100644
index 0000000..7c99f6c
--- /dev/null
+++ b/uni_modules/uni-data-checkbox/changelog.md
@@ -0,0 +1,51 @@
+## 1.0.6（2024-10-22）
+- 新增 当 multiple 为 false 且传递的 value 为 数组时，使用数组第一项用作反显
+## 1.0.5（2024-03-20）
+- 修复 单选模式下选中样式不生效的bug
+## 1.0.4（2024-01-27）
+- 修复 修复错别字chagne为change
+## 1.0.3（2022-09-16）
+- 可以使用 uni-scss 控制主题色
+## 1.0.2（2022-06-30）
+- 优化 在 uni-forms 中的依赖注入方式
+## 1.0.1（2022-02-07）
+- 修复 multiple 为 true 时，v-model 的值为 null 报错的 bug
+## 1.0.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-data-checkbox](https://uniapp.dcloud.io/component/uniui/uni-data-checkbox)
+## 0.2.5（2021-08-23）
+- 修复 在uni-forms中 modelValue 中不存在当前字段，当前字段必填写也不参与校验的问题
+## 0.2.4（2021-08-17）
+- 修复 单选 list 模式下 ，icon 为 left 时，选中图标不显示的问题
+## 0.2.3（2021-08-11）
+- 修复 在 uni-forms 中重置表单，错误信息无法清除的问题
+## 0.2.2（2021-07-30）
+- 优化 在uni-forms组件，与label不对齐的问题
+## 0.2.1（2021-07-27）
+- 修复 单选默认值为0不能选中的Bug
+## 0.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.1.11（2021-07-06）
+- 优化 删除无用日志
+## 0.1.10（2021-07-05）
+- 修复 由 0.1.9 引起的非 nvue 端图标不显示的问题
+## 0.1.9（2021-07-05）
+- 修复 nvue 黑框样式问题
+## 0.1.8（2021-06-28）
+- 修复 selectedTextColor 属性不生效的Bug
+## 0.1.7（2021-06-02）
+- 新增 map 属性，可以方便映射text/value属性
+## 0.1.6（2021-05-26）
+- 修复 不关联服务空间的情况下组件报错的Bug
+## 0.1.5（2021-05-12）
+- 新增 组件示例地址
+## 0.1.4（2021-04-09）
+- 修复 nvue 下无法选中的问题
+## 0.1.3（2021-03-22）
+- 新增 disabled属性
+## 0.1.2（2021-02-24）
+- 优化 默认颜色显示
+## 0.1.1（2021-02-24）
+- 新增 支持nvue
+## 0.1.0（2021-02-18）
+- “暂无数据”显示居中
diff --git a/uni_modules/uni-data-checkbox/components/uni-data-checkbox/clientdb.js b/uni_modules/uni-data-checkbox/components/uni-data-checkbox/clientdb.js
new file mode 100644
index 0000000..9a44a9e
--- /dev/null
+++ b/uni_modules/uni-data-checkbox/components/uni-data-checkbox/clientdb.js
@@ -0,0 +1,316 @@
+
+const events = {
+	load: 'load',
+	error: 'error'
+}
+const pageMode = {
+	add: 'add',
+	replace: 'replace'
+}
+
+const attrs = [
+	'pageCurrent',
+	'pageSize',
+	'collection',
+	'action',
+	'field',
+	'getcount',
+	'orderby',
+	'where'
+]
+
+export default {
+	data() {
+		return {
+			loading: false,
+			listData: this.getone ? {} : [],
+			paginationInternal: {
+				current: this.pageCurrent,
+				size: this.pageSize,
+				count: 0
+			},
+			errorMessage: ''
+		}
+	},
+	created() {
+		let db = null;
+		let dbCmd = null;
+
+		if(this.collection){
+			this.db = uniCloud.database();
+			this.dbCmd = this.db.command;
+		}
+
+		this._isEnded = false
+
+		this.$watch(() => {
+			let al = []
+			attrs.forEach(key => {
+				al.push(this[key])
+			})
+			return al
+		}, (newValue, oldValue) => {
+			this.paginationInternal.pageSize = this.pageSize
+
+			let needReset = false
+			for (let i = 2; i < newValue.length; i++) {
+				if (newValue[i] != oldValue[i]) {
+					needReset = true
+					break
+				}
+			}
+			if (needReset) {
+				this.clear()
+				this.reset()
+			}
+			if (newValue[0] != oldValue[0]) {
+				this.paginationInternal.current = this.pageCurrent
+			}
+
+			this._execLoadData()
+		})
+
+		// #ifdef H5
+		if (process.env.NODE_ENV === 'development') {
+			this._debugDataList = []
+			if (!window.unidev) {
+				window.unidev = {
+					clientDB: {
+						data: []
+					}
+				}
+			}
+			unidev.clientDB.data.push(this._debugDataList)
+		}
+		// #endif
+
+		// #ifdef MP-TOUTIAO
+		let changeName
+		let events = this.$scope.dataset.eventOpts
+		for (let i = 0; i < events.length; i++) {
+			let event = events[i]
+			if (event[0].includes('^load')) {
+				changeName = event[1][0][0]
+			}
+		}
+		if (changeName) {
+			let parent = this.$parent
+			let maxDepth = 16
+			this._changeDataFunction = null
+			while (parent && maxDepth > 0) {
+				let fun = parent[changeName]
+				if (fun && typeof fun === 'function') {
+					this._changeDataFunction = fun
+					maxDepth = 0
+					break
+				}
+				parent = parent.$parent
+				maxDepth--;
+			}
+		}
+		// #endif
+
+		// if (!this.manual) {
+		// 	this.loadData()
+		// }
+	},
+	// #ifdef H5
+	beforeDestroy() {
+		if (process.env.NODE_ENV === 'development' && window.unidev) {
+			let cd = this._debugDataList
+			let dl = unidev.clientDB.data
+			for (let i = dl.length - 1; i >= 0; i--) {
+				if (dl[i] === cd) {
+					dl.splice(i, 1)
+					break
+				}
+			}
+		}
+	},
+	// #endif
+	methods: {
+		loadData(args1, args2) {
+			let callback = null
+			if (typeof args1 === 'object') {
+				if (args1.clear) {
+					this.clear()
+					this.reset()
+				}
+				if (args1.current !== undefined) {
+					this.paginationInternal.current = args1.current
+				}
+				if (typeof args2 === 'function') {
+					callback = args2
+				}
+			} else if (typeof args1 === 'function') {
+				callback = args1
+			}
+
+			this._execLoadData(callback)
+		},
+		loadMore() {
+			if (this._isEnded) {
+				return
+			}
+			this._execLoadData()
+		},
+		refresh() {
+			this.clear()
+			this._execLoadData()
+		},
+		clear() {
+			this._isEnded = false
+			this.listData = []
+		},
+		reset() {
+			this.paginationInternal.current = 1
+		},
+		remove(id, {
+			action,
+			callback,
+			confirmTitle,
+			confirmContent
+		} = {}) {
+			if (!id || !id.length) {
+				return
+			}
+			uni.showModal({
+				title: confirmTitle || '提示',
+				content: confirmContent || '是否删除该数据',
+				showCancel: true,
+				success: (res) => {
+					if (!res.confirm) {
+						return
+					}
+					this._execRemove(id, action, callback)
+				}
+			})
+		},
+		_execLoadData(callback) {
+			if (this.loading) {
+				return
+			}
+			this.loading = true
+			this.errorMessage = ''
+
+			this._getExec().then((res) => {
+				this.loading = false
+				const {
+					data,
+					count
+				} = res.result
+				this._isEnded = data.length < this.pageSize
+
+				callback && callback(data, this._isEnded)
+				this._dispatchEvent(events.load, data)
+
+				if (this.getone) {
+					this.listData = data.length ? data[0] : undefined
+				} else if (this.pageData === pageMode.add) {
+					this.listData.push(...data)
+					if (this.listData.length) {
+						this.paginationInternal.current++
+					}
+				} else if (this.pageData === pageMode.replace) {
+					this.listData = data
+					this.paginationInternal.count = count
+				}
+
+				// #ifdef H5
+				if (process.env.NODE_ENV === 'development') {
+					this._debugDataList.length = 0
+					this._debugDataList.push(...JSON.parse(JSON.stringify(this.listData)))
+				}
+				// #endif
+			}).catch((err) => {
+				this.loading = false
+				this.errorMessage = err
+				callback && callback()
+				this.$emit(events.error, err)
+			})
+		},
+		_getExec() {
+			let exec = this.db
+			if (this.action) {
+				exec = exec.action(this.action)
+			}
+
+			exec = exec.collection(this.collection)
+
+			if (!(!this.where || !Object.keys(this.where).length)) {
+				exec = exec.where(this.where)
+			}
+			if (this.field) {
+				exec = exec.field(this.field)
+			}
+			if (this.orderby) {
+				exec = exec.orderBy(this.orderby)
+			}
+
+			const {
+				current,
+				size
+			} = this.paginationInternal
+			exec = exec.skip(size * (current - 1)).limit(size).get({
+				getCount: this.getcount
+			})
+
+			return exec
+		},
+		_execRemove(id, action, callback) {
+			if (!this.collection || !id) {
+				return
+			}
+
+			const ids = Array.isArray(id) ? id : [id]
+			if (!ids.length) {
+				return
+			}
+
+			uni.showLoading({
+				mask: true
+			})
+
+			let exec = this.db
+			if (action) {
+				exec = exec.action(action)
+			}
+
+			exec.collection(this.collection).where({
+				_id: dbCmd.in(ids)
+			}).remove().then((res) => {
+				callback && callback(res.result)
+				if (this.pageData === pageMode.replace) {
+					this.refresh()
+				} else {
+					this.removeData(ids)
+				}
+			}).catch((err) => {
+				uni.showModal({
+					content: err.message,
+					showCancel: false
+				})
+			}).finally(() => {
+				uni.hideLoading()
+			})
+		},
+		removeData(ids) {
+			let il = ids.slice(0)
+			let dl = this.listData
+			for (let i = dl.length - 1; i >= 0; i--) {
+				let index = il.indexOf(dl[i]._id)
+				if (index >= 0) {
+					dl.splice(i, 1)
+					il.splice(index, 1)
+				}
+			}
+		},
+		_dispatchEvent(type, data) {
+			if (this._changeDataFunction) {
+				this._changeDataFunction(data, this._isEnded)
+			} else {
+				this.$emit(type, data, this._isEnded)
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue b/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue
new file mode 100644
index 0000000..4da7bbe
--- /dev/null
+++ b/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue
@@ -0,0 +1,853 @@
+<template>
+	<view class="uni-data-checklist" :style="{'margin-top':isTop+'px'}">
+		<template v-if="!isLocal">
+			<view class="uni-data-loading">
+				<uni-load-more v-if="!mixinDatacomErrorMessage" status="loading" iconType="snow" :iconSize="18"
+					:content-text="contentText"></uni-load-more>
+				<text v-else>{{mixinDatacomErrorMessage}}</text>
+			</view>
+		</template>
+		<template v-else>
+			<checkbox-group v-if="multiple" class="checklist-group" :class="{'is-list':mode==='list' || wrap}"
+				@change="change">
+				<label class="checklist-box"
+					:class="['is--'+mode,item.selected?'is-checked':'',(disabled || !!item.disabled)?'is-disable':'',index!==0&&mode==='list'?'is-list-border':'']"
+					:style="item.styleBackgroud" v-for="(item,index) in dataList" :key="index">
+					<checkbox class="hidden" hidden :disabled="disabled || !!item.disabled" :value="item[map.value]+''"
+						:checked="item.selected" />
+					<view v-if="(mode !=='tag' && mode !== 'list') || ( mode === 'list' && icon === 'left')"
+						class="checkbox__inner" :style="item.styleIcon">
+						<view class="checkbox__inner-icon"></view>
+					</view>
+					<view class="checklist-content" :class="{'list-content':mode === 'list' && icon ==='left'}">
+						<text class="checklist-text" :style="item.styleIconText">{{item[map.text]}}</text>
+						<view v-if="mode === 'list' && icon === 'right'" class="checkobx__list" :style="item.styleBackgroud"></view>
+					</view>
+				</label>
+			</checkbox-group>
+			<radio-group v-else class="checklist-group" :class="{'is-list':mode==='list','is-wrap':wrap}" @change="change">
+				<label class="checklist-box"
+					:class="['is--'+mode,item.selected?'is-checked':'',(disabled || !!item.disabled)?'is-disable':'',index!==0&&mode==='list'?'is-list-border':'']"
+					:style="item.styleBackgroud" v-for="(item,index) in dataList" :key="index">
+					<radio class="hidden" hidden :disabled="disabled || item.disabled" :value="item[map.value]+''"
+						:checked="item.selected" />
+					<view v-if="(mode !=='tag' && mode !== 'list') || ( mode === 'list' && icon === 'left')" class="radio__inner"
+						:style="item.styleBackgroud">
+						<view class="radio__inner-icon" :style="item.styleIcon"></view>
+					</view>
+					<view class="checklist-content" :class="{'list-content':mode === 'list' && icon ==='left'}">
+						<text class="checklist-text" :style="item.styleIconText">{{item[map.text]}}</text>
+						<view v-if="mode === 'list' && icon === 'right'" :style="item.styleRightIcon" class="checkobx__list"></view>
+					</view>
+				</label>
+			</radio-group>
+		</template>
+	</view>
+</template>
+
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染 checkbox 和 radio
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
+	 * @property {String} mode = [default| list | button | tag] 显示模式
+	 * @value default  	默认横排模式
+	 * @value list		列表模式
+	 * @value button	按钮模式
+	 * @value tag 		标签模式
+	 * @property {Boolean} multiple = [true|false] 是否多选
+	 * @property {Array|String|Number} value 默认值
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Number|String} min 最小选择个数 ，multiple为true时生效
+	 * @property {Number|String} max 最大选择个数 ，multiple为true时生效
+	 * @property {Boolean} wrap 是否换行显示
+	 * @property {String} icon = [left|right]  list 列表模式下icon显示位置
+	 * @property {Boolean} selectedColor 选中颜色
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {Boolean} selectedTextColor 选中文本颜色，如不填写则自动显示
+	 * @property {Object} map 字段映射， 默认 map={text:'text',value:'value'}
+	 * @value left 左侧显示
+	 * @value right 右侧显示
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: 'uniDataChecklist',
+		mixins: [uniCloud.mixinDatacom || {}],
+		emits: ['input', 'update:modelValue', 'change'],
+		props: {
+			mode: {
+				type: String,
+				default: 'default'
+			},
+
+			multiple: {
+				type: Boolean,
+				default: false
+			},
+			value: {
+				type: [Array, String, Number],
+				default () {
+					return ''
+				}
+			},
+			// TODO vue3
+			modelValue: {
+				type: [Array, String, Number],
+				default () {
+					return '';
+				}
+			},
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			min: {
+				type: [Number, String],
+				default: ''
+			},
+			max: {
+				type: [Number, String],
+				default: ''
+			},
+			wrap: {
+				type: Boolean,
+				default: false
+			},
+			icon: {
+				type: String,
+				default: 'left'
+			},
+			selectedColor: {
+				type: String,
+				default: ''
+			},
+			selectedTextColor: {
+				type: String,
+				default: ''
+			},
+			emptyText: {
+				type: String,
+				default: '暂无数据'
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			map: {
+				type: Object,
+				default () {
+					return {
+						text: 'text',
+						value: 'value'
+					}
+				}
+			}
+		},
+		watch: {
+			localdata: {
+				handler(newVal) {
+					this.range = newVal
+					this.dataList = this.getDataList(this.getSelectedValue(newVal))
+				},
+				deep: true
+			},
+			mixinDatacomResData(newVal) {
+				this.range = newVal
+				this.dataList = this.getDataList(this.getSelectedValue(newVal))
+			},
+			value(newVal) {
+				this.dataList = this.getDataList(newVal)
+				// fix by mehaotian is_reset 在 uni-forms 中定义
+				// if(!this.is_reset){
+				// 	this.is_reset = false
+				// 	this.formItem && this.formItem.setValue(newVal)
+				// }
+			},
+			modelValue(newVal) {
+				this.dataList = this.getDataList(newVal);
+				// if(!this.is_reset){
+				// 	this.is_reset = false
+				// 	this.formItem && this.formItem.setValue(newVal)
+				// }
+			}
+		},
+		data() {
+			return {
+				dataList: [],
+				range: [],
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				isLocal: true,
+				styles: {
+					selectedColor: '#2979ff',
+					selectedTextColor: '#666',
+				},
+				isTop: 0
+			};
+		},
+		computed: {
+			dataValue() {
+				if (this.value === '') return this.modelValue
+				if (this.modelValue === '') return this.value
+				return this.value
+			}
+		},
+		created() {
+			// this.form = this.getForm('uniForms')
+			// this.formItem = this.getForm('uniFormsItem')
+			// this.formItem && this.formItem.setValue(this.value)
+
+			// if (this.formItem) {
+			// 	this.isTop = 6
+			// 	if (this.formItem.name) {
+			// 		// 如果存在name添加默认值,否则formData 中不存在这个字段不校验
+			// 		if(!this.is_reset){
+			// 			this.is_reset = false
+			// 			this.formItem.setValue(this.dataValue)
+			// 		}
+			// 		this.rename = this.formItem.name
+			// 		this.form.inputChildrens.push(this)
+			// 	}
+			// }
+
+			if (this.localdata && this.localdata.length !== 0) {
+				this.isLocal = true
+				this.range = this.localdata
+				this.dataList = this.getDataList(this.getSelectedValue(this.range))
+			} else {
+				if (this.collection) {
+					this.isLocal = false
+					this.loadData()
+				}
+			}
+		},
+		methods: {
+			loadData() {
+				this.mixinDatacomGet().then(res => {
+					this.mixinDatacomResData = res.result.data
+					if (this.mixinDatacomResData.length === 0) {
+						this.isLocal = false
+						this.mixinDatacomErrorMessage = this.emptyText
+					} else {
+						this.isLocal = true
+					}
+				}).catch(err => {
+					this.mixinDatacomErrorMessage = err.message
+				})
+			},
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniForms') {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== name) {
+					parent = parent.$parent;
+					if (!parent) return false
+					parentName = parent.$options.name;
+				}
+				return parent;
+			},
+			change(e) {
+				const values = e.detail.value
+
+				let detail = {
+					value: [],
+					data: []
+				}
+
+				if (this.multiple) {
+					this.range.forEach(item => {
+
+						if (values.includes(item[this.map.value] + '')) {
+							detail.value.push(item[this.map.value])
+							detail.data.push(item)
+						}
+					})
+				} else {
+					const range = this.range.find(item => (item[this.map.value] + '') === values)
+					if (range) {
+						detail = {
+							value: range[this.map.value],
+							data: range
+						}
+					}
+				}
+				// this.formItem && this.formItem.setValue(detail.value)
+				// TODO 兼容 vue2
+				this.$emit('input', detail.value);
+				// // TOTO 兼容 vue3
+				this.$emit('update:modelValue', detail.value);
+				this.$emit('change', {
+					detail
+				})
+				if (this.multiple) {
+					// 如果 v-model 没有绑定 ，则走内部逻辑
+					// if (this.value.length === 0) {
+					this.dataList = this.getDataList(detail.value, true)
+					// }
+				} else {
+					this.dataList = this.getDataList(detail.value)
+				}
+			},
+
+			/**
+			 * 获取渲染的新数组
+			 * @param {Object} value 选中内容
+			 */
+			getDataList(value) {
+				// 解除引用关系，破坏原引用关系，避免污染源数据
+				let dataList = JSON.parse(JSON.stringify(this.range))
+				let list = []
+				if (this.multiple) {
+					if (!Array.isArray(value)) {
+						value = []
+					}
+				} else {
+					if (Array.isArray(value) && value.length) {
+						value = value[0]
+					}
+				}
+				dataList.forEach((item, index) => {
+					item.disabled = item.disable || item.disabled || false
+					if (this.multiple) {
+						if (value.length > 0) {
+							let have = value.find(val => val === item[this.map.value])
+							item.selected = have !== undefined
+						} else {
+							item.selected = false
+						}
+					} else {
+						item.selected = value === item[this.map.value]
+					}
+
+					list.push(item)
+				})
+				return this.setRange(list)
+			},
+			/**
+			 * 处理最大最小值
+			 * @param {Object} list
+			 */
+			setRange(list) {
+				let selectList = list.filter(item => item.selected)
+				let min = Number(this.min) || 0
+				let max = Number(this.max) || ''
+				list.forEach((item, index) => {
+					if (this.multiple) {
+						if (selectList.length <= min) {
+							let have = selectList.find(val => val[this.map.value] === item[this.map.value])
+							if (have !== undefined) {
+								item.disabled = true
+							}
+						}
+
+						if (selectList.length >= max && max !== '') {
+							let have = selectList.find(val => val[this.map.value] === item[this.map.value])
+							if (have === undefined) {
+								item.disabled = true
+							}
+						}
+					}
+					this.setStyles(item, index)
+					list[index] = item
+				})
+				return list
+			},
+			/**
+			 * 设置 class
+			 * @param {Object} item
+			 * @param {Object} index
+			 */
+			setStyles(item, index) {
+				//  设置自定义样式
+				item.styleBackgroud = this.setStyleBackgroud(item)
+				item.styleIcon = this.setStyleIcon(item)
+				item.styleIconText = this.setStyleIconText(item)
+				item.styleRightIcon = this.setStyleRightIcon(item)
+			},
+
+			/**
+			 * 获取选中值
+			 * @param {Object} range
+			 */
+			getSelectedValue(range) {
+				if (!this.multiple) return this.dataValue
+				let selectedArr = []
+				range.forEach((item) => {
+					if (item.selected) {
+						selectedArr.push(item[this.map.value])
+					}
+				})
+				return this.dataValue.length > 0 ? this.dataValue : selectedArr
+			},
+
+			/**
+			 * 设置背景样式
+			 */
+			setStyleBackgroud(item) {
+				let styles = {}
+				let selectedColor = this.selectedColor ? this.selectedColor : '#2979ff'
+				if (this.selectedColor) {
+					if (this.mode !== 'list') {
+						styles['border-color'] = item.selected ? selectedColor : '#DCDFE6'
+					}
+					if (this.mode === 'tag') {
+						styles['background-color'] = item.selected ? selectedColor : '#f5f5f5'
+					}
+				}
+				let classles = ''
+				for (let i in styles) {
+					classles += `${i}:${styles[i]};`
+				}
+				return classles
+			},
+			setStyleIcon(item) {
+				let styles = {}
+				let classles = ''
+				if (this.selectedColor) {
+					let selectedColor = this.selectedColor ? this.selectedColor : '#2979ff'
+					styles['background-color'] = item.selected ? selectedColor : '#fff'
+					styles['border-color'] = item.selected ? selectedColor : '#DCDFE6'
+
+					if (!item.selected && item.disabled) {
+						styles['background-color'] = '#F2F6FC'
+						styles['border-color'] = item.selected ? selectedColor : '#DCDFE6'
+					}
+				}
+				for (let i in styles) {
+					classles += `${i}:${styles[i]};`
+				}
+				return classles
+			},
+			setStyleIconText(item) {
+				let styles = {}
+				let classles = ''
+				if (this.selectedColor) {
+					let selectedColor = this.selectedColor ? this.selectedColor : '#2979ff'
+					if (this.mode === 'tag') {
+						styles.color = item.selected ? (this.selectedTextColor ? this.selectedTextColor : '#fff') : '#666'
+					} else {
+						styles.color = item.selected ? (this.selectedTextColor ? this.selectedTextColor : selectedColor) : '#666'
+					}
+					if (!item.selected && item.disabled) {
+						styles.color = '#999'
+					}
+				}
+				for (let i in styles) {
+					classles += `${i}:${styles[i]};`
+				}
+				return classles
+			},
+			setStyleRightIcon(item) {
+				let styles = {}
+				let classles = ''
+				if (this.mode === 'list') {
+					styles['border-color'] = item.selected ? this.styles.selectedColor : '#DCDFE6'
+				}
+				for (let i in styles) {
+					classles += `${i}:${styles[i]};`
+				}
+
+				return classles
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-primary: #2979ff !default;
+	$border-color: #DCDFE6;
+	$disable: 0.4;
+
+	@mixin flex {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+	}
+
+	.uni-data-loading {
+		@include flex;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 36px;
+		padding-left: 10px;
+		color: #999;
+	}
+
+	.uni-data-checklist {
+		position: relative;
+		z-index: 0;
+		flex: 1;
+
+		// 多选样式
+		.checklist-group {
+			@include flex;
+			flex-direction: row;
+			flex-wrap: wrap;
+
+			&.is-list {
+				flex-direction: column;
+			}
+
+			.checklist-box {
+				@include flex;
+				flex-direction: row;
+				align-items: center;
+				position: relative;
+				margin: 5px 0;
+				margin-right: 25px;
+
+				.hidden {
+					position: absolute;
+					opacity: 0;
+				}
+
+				// 文字样式
+				.checklist-content {
+					@include flex;
+					flex: 1;
+					flex-direction: row;
+					align-items: center;
+					justify-content: space-between;
+
+					.checklist-text {
+						font-size: 14px;
+						color: #666;
+						margin-left: 5px;
+						line-height: 14px;
+					}
+
+					.checkobx__list {
+						border-right-width: 1px;
+						border-right-color: #007aff;
+						border-right-style: solid;
+						border-bottom-width: 1px;
+						border-bottom-color: #007aff;
+						border-bottom-style: solid;
+						height: 12px;
+						width: 6px;
+						left: -5px;
+						transform-origin: center;
+						transform: rotate(45deg);
+						opacity: 0;
+					}
+				}
+
+				// 多选样式
+				.checkbox__inner {
+					/* #ifndef APP-NVUE */
+					flex-shrink: 0;
+					box-sizing: border-box;
+					/* #endif */
+					position: relative;
+					width: 16px;
+					height: 16px;
+					border: 1px solid $border-color;
+					border-radius: 4px;
+					background-color: #fff;
+					z-index: 1;
+
+					.checkbox__inner-icon {
+						position: absolute;
+						/* #ifdef APP-NVUE */
+						top: 2px;
+						/* #endif */
+						/* #ifndef APP-NVUE */
+						top: 1px;
+						/* #endif */
+						left: 5px;
+						height: 8px;
+						width: 4px;
+						border-right-width: 1px;
+						border-right-color: #fff;
+						border-right-style: solid;
+						border-bottom-width: 1px;
+						border-bottom-color: #fff;
+						border-bottom-style: solid;
+						opacity: 0;
+						transform-origin: center;
+						transform: rotate(40deg);
+					}
+				}
+
+				// 单选样式
+				.radio__inner {
+					@include flex;
+					/* #ifndef APP-NVUE */
+					flex-shrink: 0;
+					box-sizing: border-box;
+					/* #endif */
+					justify-content: center;
+					align-items: center;
+					position: relative;
+					width: 16px;
+					height: 16px;
+					border: 1px solid $border-color;
+					border-radius: 16px;
+					background-color: #fff;
+					z-index: 1;
+
+					.radio__inner-icon {
+						width: 8px;
+						height: 8px;
+						border-radius: 10px;
+						opacity: 0;
+					}
+				}
+
+				// 默认样式
+				&.is--default {
+
+					// 禁用
+					&.is-disable {
+						/* #ifdef H5 */
+						cursor: not-allowed;
+
+						/* #endif */
+						.checkbox__inner {
+							background-color: #F2F6FC;
+							border-color: $border-color;
+							/* #ifdef H5 */
+							cursor: not-allowed;
+							/* #endif */
+						}
+
+						.radio__inner {
+							background-color: #F2F6FC;
+							border-color: $border-color;
+						}
+
+						.checklist-text {
+							color: #999;
+						}
+					}
+
+					// 选中
+					&.is-checked {
+						.checkbox__inner {
+							border-color: $uni-primary;
+							background-color: $uni-primary;
+
+							.checkbox__inner-icon {
+								opacity: 1;
+								transform: rotate(45deg);
+							}
+						}
+
+						.radio__inner {
+							border-color: $uni-primary;
+
+							.radio__inner-icon {
+								opacity: 1;
+								background-color: $uni-primary;
+							}
+						}
+
+						.checklist-text {
+							color: $uni-primary;
+						}
+
+						// 选中禁用
+						&.is-disable {
+							.checkbox__inner {
+								opacity: $disable;
+							}
+
+							.checklist-text {
+								opacity: $disable;
+							}
+
+							.radio__inner {
+								opacity: $disable;
+							}
+						}
+					}
+				}
+
+				// 按钮样式
+				&.is--button {
+					margin-right: 10px;
+					padding: 5px 10px;
+					border: 1px $border-color solid;
+					border-radius: 3px;
+					transition: border-color 0.2s;
+
+					// 禁用
+					&.is-disable {
+						/* #ifdef H5 */
+						cursor: not-allowed;
+						/* #endif */
+						border: 1px #eee solid;
+						opacity: $disable;
+
+						.checkbox__inner {
+							background-color: #F2F6FC;
+							border-color: $border-color;
+							/* #ifdef H5 */
+							cursor: not-allowed;
+							/* #endif */
+						}
+
+						.radio__inner {
+							background-color: #F2F6FC;
+							border-color: $border-color;
+							/* #ifdef H5 */
+							cursor: not-allowed;
+							/* #endif */
+						}
+
+						.checklist-text {
+							color: #999;
+						}
+					}
+
+					&.is-checked {
+						border-color: $uni-primary;
+
+						.checkbox__inner {
+							border-color: $uni-primary;
+							background-color: $uni-primary;
+
+							.checkbox__inner-icon {
+								opacity: 1;
+								transform: rotate(45deg);
+							}
+						}
+
+						.radio__inner {
+							border-color: $uni-primary;
+
+							.radio__inner-icon {
+								opacity: 1;
+								background-color: $uni-primary;
+							}
+						}
+
+						.checklist-text {
+							color: $uni-primary;
+						}
+
+						// 选中禁用
+						&.is-disable {
+							opacity: $disable;
+						}
+					}
+				}
+
+				// 标签样式
+				&.is--tag {
+					margin-right: 10px;
+					padding: 5px 10px;
+					border: 1px $border-color solid;
+					border-radius: 3px;
+					background-color: #f5f5f5;
+
+					.checklist-text {
+						margin: 0;
+						color: #666;
+					}
+
+					// 禁用
+					&.is-disable {
+						/* #ifdef H5 */
+						cursor: not-allowed;
+						/* #endif */
+						opacity: $disable;
+					}
+
+					&.is-checked {
+						background-color: $uni-primary;
+						border-color: $uni-primary;
+
+						.checklist-text {
+							color: #fff;
+						}
+					}
+				}
+
+				// 列表样式
+				&.is--list {
+					/* #ifndef APP-NVUE */
+					display: flex;
+					/* #endif */
+					padding: 10px 15px;
+					padding-left: 0;
+					margin: 0;
+
+					&.is-list-border {
+						border-top: 1px #eee solid;
+					}
+
+					// 禁用
+					&.is-disable {
+						/* #ifdef H5 */
+						cursor: not-allowed;
+
+						/* #endif */
+						.checkbox__inner {
+							background-color: #F2F6FC;
+							border-color: $border-color;
+							/* #ifdef H5 */
+							cursor: not-allowed;
+							/* #endif */
+						}
+
+						.checklist-text {
+							color: #999;
+						}
+					}
+
+					&.is-checked {
+						.checkbox__inner {
+							border-color: $uni-primary;
+							background-color: $uni-primary;
+
+							.checkbox__inner-icon {
+								opacity: 1;
+								transform: rotate(45deg);
+							}
+						}
+
+						.radio__inner {
+							border-color: $uni-primary;
+							.radio__inner-icon {
+								opacity: 1;
+								background-color: $uni-primary;
+							}
+						}
+
+						.checklist-text {
+							color: $uni-primary;
+						}
+
+						.checklist-content {
+							.checkobx__list {
+								opacity: 1;
+								border-color: $uni-primary;
+							}
+						}
+
+						// 选中禁用
+						&.is-disable {
+							.checkbox__inner {
+								opacity: $disable;
+							}
+
+							.checklist-text {
+								opacity: $disable;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/uni_modules/uni-data-checkbox/package.json b/uni_modules/uni-data-checkbox/package.json
new file mode 100644
index 0000000..f823e8b
--- /dev/null
+++ b/uni_modules/uni-data-checkbox/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-data-checkbox",
+  "displayName": "uni-data-checkbox 数据选择器",
+  "version": "1.0.6",
+  "description": "通过数据驱动的单选框和复选框",
+  "keywords": [
+    "uni-ui",
+    "checkbox",
+    "单选",
+    "多选",
+    "单选多选"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.1"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-load-more","uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+            "app-vue": "y",
+            "app-nvue": "y",
+            "app-harmony": "u",
+            "app-uvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-data-checkbox/readme.md b/uni_modules/uni-data-checkbox/readme.md
new file mode 100644
index 0000000..6eb253d
--- /dev/null
+++ b/uni_modules/uni-data-checkbox/readme.md
@@ -0,0 +1,18 @@
+
+
+## DataCheckbox 数据驱动的单选复选框
+> **组件名：uni-data-checkbox**
+> 代码块： `uDataCheckbox`
+
+
+本组件是基于uni-app基础组件checkbox的封装。本组件要解决问题包括：
+
+1. 数据绑定型组件：给本组件绑定一个data，会自动渲染一组候选内容。再以往，开发者需要编写不少代码实现类似功能
+2. 自动的表单校验：组件绑定了data，且符合[uni-forms](https://ext.dcloud.net.cn/plugin?id=2773)组件的表单校验规范，搭配使用会自动实现表单校验
+3. 本组件合并了单选多选
+4. 本组件有若干风格选择，如普通的单选多选框、并列button风格、tag风格。开发者可以快速选择需要的风格。但作为一个封装组件，样式代码虽然不用自己写了，却会牺牲一定的样式自定义性
+
+在uniCloud开发中，`DB Schema`中配置了enum枚举等类型后，在web控制台的[自动生成表单](https://uniapp.dcloud.io/uniCloud/schema?id=autocode)功能中，会自动生成``uni-data-checkbox``组件并绑定好data
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-checkbox)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-data-select/changelog.md b/uni_modules/uni-data-select/changelog.md
new file mode 100644
index 0000000..0658510
--- /dev/null
+++ b/uni_modules/uni-data-select/changelog.md
@@ -0,0 +1,43 @@
+## 1.0.10（2025-04-14）
+- 修复 清除按钮不展示问题
+## 1.0.9（2025-03-26）
+- 优化 默认背景为白色与整体组件保持风格统一
+## 1.0.8（2024-03-28）
+- 修复 在vue2下:style动态绑定导致编译失败的bug
+## 1.0.7（2024-01-20）
+- 修复 长文本回显超过容器的bug，超过容器部分显示省略号
+## 1.0.6（2023-04-12）
+- 修复 微信小程序点击时会改变背景颜色的 bug
+## 1.0.5（2023-02-03）
+- 修复 禁用时会显示清空按钮
+## 1.0.4（2023-02-02）
+- 优化 查询条件短期内多次变更只查询最后一次变更后的结果
+- 调整 内部缓存键名调整为 uni-data-select-lastSelectedValue
+## 1.0.3（2023-01-16）
+- 修复 不关联服务空间报错的问题
+## 1.0.2（2023-01-14）
+- 新增  属性 `format` 可用于格式化显示选项内容
+## 1.0.1（2022-12-06）
+- 修复  当where变化时，数据不会自动更新的问题
+## 0.1.9（2022-09-05）
+- 修复 微信小程序下拉框出现后选择会点击到蒙板后面的输入框
+## 0.1.8（2022-08-29）
+- 修复 点击的位置不准确
+## 0.1.7（2022-08-12）
+- 新增 支持 disabled 属性
+## 0.1.6（2022-07-06）
+- 修复 pc端宽度异常的bug
+## 0.1.5
+- 修复 pc端宽度异常的bug
+## 0.1.4（2022-07-05）
+- 优化 显示样式
+## 0.1.3（2022-06-02）
+- 修复 localdata 赋值不生效的 bug
+- 新增 支持  uni.scss 修改颜色
+- 新增 支持选项禁用（数据选项设置 disabled: true 即禁用）
+## 0.1.2（2022-05-08）
+- 修复 当 value 为 0 时选择不生效的 bug
+## 0.1.1（2022-05-07）
+- 新增 记住上次的选项（仅 collection 存在时有效）
+## 0.1.0（2022-04-22）
+- 初始化
diff --git a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
new file mode 100644
index 0000000..71ee950
--- /dev/null
+++ b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@@ -0,0 +1,562 @@
+<template>
+	<view class="uni-stat__select">
+		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
+		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
+			<view class="uni-select" :class="{'uni-select--disabled':disabled}">
+				<view class="uni-select__input-box" @click="toggleSelector">
+					<view v-if="current" class="uni-select__input-text">{{textShow}}</view>
+					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
+					<view key="clear-button" v-if="current && clear && !disabled" @click.stop="clearVal">
+						<uni-icons type="clear" color="#c0c4cc" size="24" />
+					</view>
+					<view key="arrow-button" v-else>
+						<uni-icons :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
+					</view>
+				</view>
+				<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
+				<view class="uni-select__selector" :style="getOffsetByPlacement" v-if="showSelector">
+					<view :class="placement=='bottom'?'uni-popper__arrow_bottom':'uni-popper__arrow_top'"></view>
+					<scroll-view scroll-y="true" class="uni-select__selector-scroll">
+						<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
+							<text>{{emptyTips}}</text>
+						</view>
+						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData" :key="index"
+							@click="change(item)">
+							<text :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染的下拉框组件
+	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
+	 * @property {String} value 默认值
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Boolean} clear 是否可以清空已选项
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {String} label 左侧标题
+	 * @property {String} placeholder 输入框的提示文字
+	 * @property {Boolean} disabled 是否禁用
+	 * @property {String} placement 弹出位置
+	 * 	@value top   		顶部弹出
+	 * 	@value bottom		底部弹出（default)
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: "uni-data-select",
+		mixins: [uniCloud.mixinDatacom || {}],
+		props: {
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			placeholder: {
+				type: String,
+				default: '请选择'
+			},
+			emptyTips: {
+				type: String,
+				default: '无选项'
+			},
+			clear: {
+				type: Boolean,
+				default: true
+			},
+			defItem: {
+				type: Number,
+				default: 0
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 格式化输出 用法 field="_id as value, version as text, uni_platform as label" format="{label} - {text}"
+			format: {
+				type: String,
+				default: ''
+			},
+			placement: {
+				type: String,
+				default: 'bottom'
+			}
+		},
+		data() {
+			return {
+				showSelector: false,
+				current: '',
+				mixinDatacomResData: [],
+				apps: [],
+				channels: [],
+				cacheKey: "uni-data-select-lastSelectedValue",
+			};
+		},
+		created() {
+			this.debounceGet = this.debounce(() => {
+				this.query();
+			}, 300);
+			if (this.collection && !this.localdata.length) {
+				this.debounceGet();
+			}
+		},
+		computed: {
+			typePlaceholder() {
+				const text = {
+					'opendb-stat-app-versions': '版本',
+					'opendb-app-channels': '渠道',
+					'opendb-app-list': '应用'
+				}
+				const common = this.placeholder
+				const placeholder = text[this.collection]
+				return placeholder ?
+					common + placeholder :
+					common
+			},
+			valueCom() {
+				// #ifdef VUE3
+				return this.modelValue;
+				// #endif
+				// #ifndef VUE3
+				return this.value;
+				// #endif
+			},
+			textShow() {
+				// 长文本显示
+				let text = this.current;
+				return text;
+			},
+			getOffsetByPlacement() {
+				switch (this.placement) {
+					case 'top':
+						return "bottom:calc(100% + 12px);";
+					case 'bottom':
+						return "top:calc(100% + 12px);";
+				}
+			}
+		},
+
+		watch: {
+			localdata: {
+				immediate: true,
+				handler(val, old) {
+					if (Array.isArray(val) && old !== val) {
+						this.mixinDatacomResData = val
+					}
+				}
+			},
+			valueCom(val, old) {
+				this.initDefVal()
+			},
+			mixinDatacomResData: {
+				immediate: true,
+				handler(val) {
+					if (val.length) {
+						this.initDefVal()
+					}
+				}
+			},
+
+		},
+		methods: {
+			debounce(fn, time = 100) {
+				let timer = null
+				return function(...args) {
+					if (timer) clearTimeout(timer)
+					timer = setTimeout(() => {
+						fn.apply(this, args)
+					}, time)
+				}
+			},
+			// 执行数据库查询
+			query() {
+				this.mixinDatacomEasyGet();
+			},
+			// 监听查询条件变更事件
+			onMixinDatacomPropsChange() {
+				if (this.collection) {
+					this.debounceGet();
+				}
+			},
+			initDefVal() {
+				let defValue = ''
+				if ((this.valueCom || this.valueCom === 0) && !this.isDisabled(this.valueCom)) {
+					defValue = this.valueCom
+				} else {
+					let strogeValue
+					if (this.collection) {
+						strogeValue = this.getCache()
+					}
+					if (strogeValue || strogeValue === 0) {
+						defValue = strogeValue
+					} else {
+						let defItem = ''
+						if (this.defItem > 0 && this.defItem <= this.mixinDatacomResData.length) {
+							defItem = this.mixinDatacomResData[this.defItem - 1].value
+						}
+						defValue = defItem
+					}
+					if (defValue || defValue === 0) {
+						this.emit(defValue)
+					}
+				}
+				const def = this.mixinDatacomResData.find(item => item.value === defValue)
+				this.current = def ? this.formatItemName(def) : ''
+			},
+
+			/**
+			 * @param {[String, Number]} value
+			 * 判断用户给的 value 是否同时为禁用状态
+			 */
+			isDisabled(value) {
+				let isDisabled = false;
+
+				this.mixinDatacomResData.forEach(item => {
+					if (item.value === value) {
+						isDisabled = item.disable
+					}
+				})
+
+				return isDisabled;
+			},
+
+			clearVal() {
+				this.emit('')
+				this.current = ''
+				if (this.collection) {
+					this.removeCache()
+				}
+			},
+			change(item) {
+				if (!item.disable) {
+					this.showSelector = false
+					this.current = this.formatItemName(item)
+					this.emit(item.value)
+				}
+			},
+			emit(val) {
+				this.$emit('input', val)
+				this.$emit('update:modelValue', val)
+				this.$emit('change', val)
+				if (this.collection) {
+					this.setCache(val);
+				}
+			},
+			toggleSelector() {
+				if (this.disabled) {
+					return
+				}
+
+				this.showSelector = !this.showSelector
+			},
+			formatItemName(item) {
+				let {
+					text,
+					value,
+					channel_code
+				} = item
+				channel_code = channel_code ? `(${channel_code})` : ''
+
+				if (this.format) {
+					// 格式化输出
+					let str = "";
+					str = this.format;
+					for (let key in item) {
+						str = str.replace(new RegExp(`{${key}}`, "g"), item[key]);
+					}
+					return str;
+				} else {
+					return this.collection.indexOf('app-list') > 0 ?
+						`${text}(${value})` :
+						(
+							text ?
+							text :
+							`未命名${channel_code}`
+						)
+				}
+			},
+			// 获取当前加载的数据
+			getLoadData() {
+				return this.mixinDatacomResData;
+			},
+			// 获取当前缓存key
+			getCurrentCacheKey() {
+				return this.collection;
+			},
+			// 获取缓存
+			getCache(name = this.getCurrentCacheKey()) {
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				return cacheData[name];
+			},
+			// 设置缓存
+			setCache(value, name = this.getCurrentCacheKey()) {
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				cacheData[name] = value;
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+			// 删除缓存
+			removeCache(name = this.getCurrentCacheKey()) {
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				delete cacheData[name];
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-base-color: #6a6a6a !default;
+	$uni-main-color: #333 !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-border-3: #e5e5e5;
+
+	/* #ifndef APP-NVUE */
+	@media screen and (max-width: 500px) {
+		.hide-on-phone {
+			display: none;
+		}
+	}
+
+	/* #endif */
+	.uni-stat__select {
+		display: flex;
+		align-items: center;
+		// padding: 15px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+		width: 100%;
+		flex: 1;
+		box-sizing: border-box;
+	}
+
+	.uni-stat-box {
+		background-color: #fff;
+		width: 100%;
+		flex: 1;
+	}
+
+	.uni-stat__actived {
+		width: 100%;
+		flex: 1;
+		// outline: 1px solid #2979ff;
+	}
+
+	.uni-label-text {
+		font-size: 14px;
+		font-weight: bold;
+		color: $uni-base-color;
+		margin: auto 0;
+		margin-right: 5px;
+	}
+
+	.uni-select {
+		font-size: 14px;
+		border: 1px solid $uni-border-3;
+		box-sizing: border-box;
+		border-radius: 4px;
+		padding: 0 5px;
+		padding-left: 10px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		user-select: none;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		border-bottom: solid 1px $uni-border-3;
+		width: 100%;
+		flex: 1;
+		height: 35px;
+
+		&--disabled {
+			background-color: #f5f7fa;
+			cursor: not-allowed;
+		}
+	}
+
+	.uni-select__label {
+		font-size: 16px;
+		// line-height: 22px;
+		height: 35px;
+		padding-right: 10px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__input-box {
+		height: 35px;
+		width: 0px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-select__input {
+		flex: 1;
+		font-size: 14px;
+		height: 22px;
+		line-height: 22px;
+	}
+
+	.uni-select__input-plac {
+		font-size: 14px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__selector {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		position: absolute;
+		left: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
+		border-radius: 6px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		z-index: 3;
+		padding: 4px 0;
+	}
+
+	.uni-select__selector-scroll {
+		/* #ifndef APP-NVUE */
+		max-height: 200px;
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	/* #ifdef H5 */
+	@media (min-width: 768px) {
+		.uni-select__selector-scroll {
+			max-height: 600px;
+		}
+	}
+
+	/* #endif */
+
+	.uni-select__selector-empty,
+	.uni-select__selector-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		line-height: 35px;
+		font-size: 14px;
+		text-align: center;
+		/* border-bottom: solid 1px $uni-border-3; */
+		padding: 0px 10px;
+	}
+
+	.uni-select__selector-item:hover {
+		background-color: #f9f9f9;
+	}
+
+	.uni-select__selector-empty:last-child,
+	.uni-select__selector-item:last-child {
+		/* #ifndef APP-NVUE */
+		border-bottom: none;
+		/* #endif */
+	}
+
+	.uni-select__selector__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	/* picker 弹出层通用的指示小三角 */
+	.uni-popper__arrow_bottom,
+	.uni-popper__arrow_bottom::after,
+	.uni-popper__arrow_top,
+	.uni-popper__arrow_top::after,
+	{
+	position: absolute;
+	display: block;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+	border-width: 6px;
+	}
+
+	.uni-popper__arrow_bottom {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow_bottom::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+
+	.uni-popper__arrow_top {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		bottom: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-bottom-width: 0;
+		border-top-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow_top::after {
+		content: " ";
+		bottom: 1px;
+		margin-left: -6px;
+		border-bottom-width: 0;
+		border-top-color: #fff;
+	}
+
+
+	.uni-select__input-text {
+		// width: 280px;
+		width: 100%;
+		color: $uni-main-color;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		overflow: hidden;
+	}
+
+	.uni-select__input-placeholder {
+		color: $uni-base-color;
+		font-size: 12px;
+	}
+
+	.uni-select--mask {
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+		z-index: 2;
+	}
+</style>
diff --git a/uni_modules/uni-data-select/package.json b/uni_modules/uni-data-select/package.json
new file mode 100644
index 0000000..d21cc2d
--- /dev/null
+++ b/uni_modules/uni-data-select/package.json
@@ -0,0 +1,88 @@
+{
+  "id": "uni-data-select",
+  "displayName": "uni-data-select 下拉框选择器",
+  "version": "1.0.10",
+  "description": "通过数据驱动的下拉框选择器",
+  "keywords": [
+    "uni-ui",
+    "select",
+    "uni-data-select",
+    "下拉框",
+    "下拉选"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.1"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-load-more"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+            "app-vue": "y",
+            "app-nvue": "n",
+            "app-harmony": "u",
+            "app-uvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+        "QQ": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-data-select/readme.md b/uni_modules/uni-data-select/readme.md
new file mode 100644
index 0000000..eb58de3
--- /dev/null
+++ b/uni_modules/uni-data-select/readme.md
@@ -0,0 +1,8 @@
+## DataSelect 下拉框选择器
+> **组件名：uni-data-select**
+> 代码块： `uDataSelect`
+
+当选项过多时，使用下拉菜单展示并选择内容
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-select)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
diff --git a/uni_modules/uni-icons/changelog.md b/uni_modules/uni-icons/changelog.md
new file mode 100644
index 0000000..0261131
--- /dev/null
+++ b/uni_modules/uni-icons/changelog.md
@@ -0,0 +1,42 @@
+## 2.0.10（2024-06-07）
+- 优化 uni-app x 中，size 属性的类型
+## 2.0.9（2024-01-12）
+fix: 修复图标大小默认值错误的问题
+## 2.0.8（2023-12-14）
+- 修复 项目未使用 ts 情况下，打包报错的bug
+## 2.0.7（2023-12-14）
+- 修复 size 属性为 string 时，不加单位导致尺寸异常的bug
+## 2.0.6（2023-12-11）
+- 优化 兼容老版本icon类型，如 top ，bottom 等
+## 2.0.5（2023-12-11）
+- 优化 兼容老版本icon类型，如 top ，bottom 等
+## 2.0.4（2023-12-06）
+- 优化 uni-app x 下示例项目图标排序
+## 2.0.3（2023-12-06）
+- 修复 nvue下引入组件报错的bug
+## 2.0.2（2023-12-05）
+-优化 size 属性支持单位
+## 2.0.1（2023-12-05）
+- 新增 uni-app x 支持定义图标
+## 1.3.5（2022-01-24）
+- 优化 size 属性可以传入不带单位的字符串数值
+## 1.3.4（2022-01-24）
+- 优化 size 支持其他单位
+## 1.3.3（2022-01-17）
+- 修复 nvue 有些图标不显示的bug，兼容老版本图标
+## 1.3.2（2021-12-01）
+- 优化 示例可复制图标名称
+## 1.3.1（2021-11-23）
+- 优化 兼容旧组件 type 值
+## 1.3.0（2021-11-19）
+- 新增 更多图标
+- 优化 自定义图标使用方式
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-icons](https://uniapp.dcloud.io/component/uniui/uni-icons)
+## 1.1.7（2021-11-08）
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.5（2021-05-12）
+- 新增 组件示例地址
+## 1.1.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue b/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
new file mode 100644
index 0000000..8740559
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
@@ -0,0 +1,91 @@
+<template>
+  <text class="uni-icons" :style="styleObj">
+    <slot>{{unicode}}</slot>
+  </text>
+</template>
+
+<script>
+  import { fontData, IconsDataItem } from './uniicons_file'
+
+  /**
+   * Icons 图标
+   * @description 用于展示 icon 图标
+   * @tutorial https://ext.dcloud.net.cn/plugin?id=28
+   * @property {Number,String} size 图标大小
+   * @property {String} type 图标图案，参考示例
+   * @property {String} color 图标颜色
+   * @property {String} customPrefix 自定义图标
+   * @event {Function} click 点击 Icon 触发事件
+   */
+  export default {
+    name: "uni-icons",
+    props: {
+      type: {
+        type: String,
+        default: ''
+      },
+      color: {
+        type: String,
+        default: '#333333'
+      },
+      size: {
+        type: [Number, String],
+        default: 16
+      },
+      fontFamily: {
+        type: String,
+        default: ''
+      }
+    },
+    data() {
+      return {};
+    },
+    computed: {
+      unicode() : string {
+        let codes = fontData.find((item : IconsDataItem) : boolean => { return item.font_class == this.type })
+        if (codes !== null) {
+          return codes.unicode
+        }
+        return ''
+      },
+      iconSize() : string {
+        const size = this.size
+        if (typeof size == 'string') {
+          const reg = /^[0-9]*$/g
+          return reg.test(size as string) ? '' + size + 'px' : '' + size;
+          // return '' + this.size
+        }
+        return this.getFontSize(size as number)
+      },
+      styleObj() : UTSJSONObject {
+        if (this.fontFamily !== '') {
+          return { color: this.color, fontSize: this.iconSize, fontFamily: this.fontFamily }
+        }
+        return { color: this.color, fontSize: this.iconSize }
+      }
+    },
+    created() { },
+    methods: {
+      /**
+       * 字体大小
+       */
+      getFontSize(size : number) : string {
+        return size + 'px';
+      },
+    },
+  }
+</script>
+
+<style scoped>
+  @font-face {
+    font-family: UniIconsFontFamily;
+    src: url('./uniicons.ttf');
+  }
+
+  .uni-icons {
+    font-family: UniIconsFontFamily;
+    font-size: 18px;
+    font-style: normal;
+    color: #333;
+  }
+</style>
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
new file mode 100644
index 0000000..7da5356
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -0,0 +1,110 @@
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<text :style="styleObj" class="uni-icons" @click="_onClick">{{unicode}}</text>
+	<!-- #endif -->
+	<!-- #ifndef APP-NVUE -->
+	<text :style="styleObj" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick">
+		<slot></slot>
+	</text>
+	<!-- #endif -->
+</template>
+
+<script>
+	import { fontData } from './uniicons_file_vue.js';
+
+	const getVal = (val) => {
+		const reg = /^[0-9]*$/g
+		return (typeof val === 'number' || reg.test(val)) ? val + 'px' : val;
+	}
+
+	// #ifdef APP-NVUE
+	var domModule = weex.requireModule('dom');
+	import iconUrl from './uniicons.ttf'
+	domModule.addRule('fontFace', {
+		'fontFamily': "uniicons",
+		'src': "url('" + iconUrl + "')"
+	});
+	// #endif
+
+	/**
+	 * Icons 图标
+	 * @description 用于展示 icons 图标
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
+	 * @property {Number} size 图标大小
+	 * @property {String} type 图标图案，参考示例
+	 * @property {String} color 图标颜色
+	 * @property {String} customPrefix 自定义图标
+	 * @event {Function} click 点击 Icon 触发事件
+	 */
+	export default {
+		name: 'UniIcons',
+		emits: ['click'],
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			size: {
+				type: [Number, String],
+				default: 16
+			},
+			customPrefix: {
+				type: String,
+				default: ''
+			},
+			fontFamily: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				icons: fontData
+			}
+		},
+		computed: {
+			unicode() {
+				let code = this.icons.find(v => v.font_class === this.type)
+				if (code) {
+					return code.unicode
+				}
+				return ''
+			},
+			iconSize() {
+				return getVal(this.size)
+			},
+			styleObj() {
+				if (this.fontFamily !== '') {
+					return `color: ${this.color}; font-size: ${this.iconSize}; font-family: ${this.fontFamily};`
+				}
+				return `color: ${this.color}; font-size: ${this.iconSize};`
+			}
+		},
+		methods: {
+			_onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	/* #ifndef APP-NVUE */
+	@import './uniicons.css';
+
+	@font-face {
+		font-family: uniicons;
+		src: url('./uniicons.ttf');
+	}
+
+	/* #endif */
+	.uni-icons {
+		font-family: uniicons;
+		text-decoration: none;
+		text-align: center;
+	}
+</style>
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.css b/uni_modules/uni-icons/components/uni-icons/uniicons.css
new file mode 100644
index 0000000..0a6b6fe
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons.css
@@ -0,0 +1,664 @@
+
+.uniui-cart-filled:before {
+  content: "\e6d0";
+}
+
+.uniui-gift-filled:before {
+  content: "\e6c4";
+}
+
+.uniui-color:before {
+  content: "\e6cf";
+}
+
+.uniui-wallet:before {
+  content: "\e6b1";
+}
+
+.uniui-settings-filled:before {
+  content: "\e6ce";
+}
+
+.uniui-auth-filled:before {
+  content: "\e6cc";
+}
+
+.uniui-shop-filled:before {
+  content: "\e6cd";
+}
+
+.uniui-staff-filled:before {
+  content: "\e6cb";
+}
+
+.uniui-vip-filled:before {
+  content: "\e6c6";
+}
+
+.uniui-plus-filled:before {
+  content: "\e6c7";
+}
+
+.uniui-folder-add-filled:before {
+  content: "\e6c8";
+}
+
+.uniui-color-filled:before {
+  content: "\e6c9";
+}
+
+.uniui-tune-filled:before {
+  content: "\e6ca";
+}
+
+.uniui-calendar-filled:before {
+  content: "\e6c0";
+}
+
+.uniui-notification-filled:before {
+  content: "\e6c1";
+}
+
+.uniui-wallet-filled:before {
+  content: "\e6c2";
+}
+
+.uniui-medal-filled:before {
+  content: "\e6c3";
+}
+
+.uniui-fire-filled:before {
+  content: "\e6c5";
+}
+
+.uniui-refreshempty:before {
+  content: "\e6bf";
+}
+
+.uniui-location-filled:before {
+  content: "\e6af";
+}
+
+.uniui-person-filled:before {
+  content: "\e69d";
+}
+
+.uniui-personadd-filled:before {
+  content: "\e698";
+}
+
+.uniui-arrowthinleft:before {
+  content: "\e6d2";
+}
+
+.uniui-arrowthinup:before {
+  content: "\e6d3";
+}
+
+.uniui-arrowthindown:before {
+  content: "\e6d4";
+}
+
+.uniui-back:before {
+  content: "\e6b9";
+}
+
+.uniui-forward:before {
+  content: "\e6ba";
+}
+
+.uniui-arrow-right:before {
+  content: "\e6bb";
+}
+
+.uniui-arrow-left:before {
+  content: "\e6bc";
+}
+
+.uniui-arrow-up:before {
+  content: "\e6bd";
+}
+
+.uniui-arrow-down:before {
+  content: "\e6be";
+}
+
+.uniui-arrowthinright:before {
+  content: "\e6d1";
+}
+
+.uniui-down:before {
+  content: "\e6b8";
+}
+
+.uniui-bottom:before {
+  content: "\e6b8";
+}
+
+.uniui-arrowright:before {
+  content: "\e6d5";
+}
+
+.uniui-right:before {
+  content: "\e6b5";
+}
+
+.uniui-up:before {
+  content: "\e6b6";
+}
+
+.uniui-top:before {
+  content: "\e6b6";
+}
+
+.uniui-left:before {
+  content: "\e6b7";
+}
+
+.uniui-arrowup:before {
+  content: "\e6d6";
+}
+
+.uniui-eye:before {
+  content: "\e651";
+}
+
+.uniui-eye-filled:before {
+  content: "\e66a";
+}
+
+.uniui-eye-slash:before {
+  content: "\e6b3";
+}
+
+.uniui-eye-slash-filled:before {
+  content: "\e6b4";
+}
+
+.uniui-info-filled:before {
+  content: "\e649";
+}
+
+.uniui-reload:before {
+  content: "\e6b2";
+}
+
+.uniui-micoff-filled:before {
+  content: "\e6b0";
+}
+
+.uniui-map-pin-ellipse:before {
+  content: "\e6ac";
+}
+
+.uniui-map-pin:before {
+  content: "\e6ad";
+}
+
+.uniui-location:before {
+  content: "\e6ae";
+}
+
+.uniui-starhalf:before {
+  content: "\e683";
+}
+
+.uniui-star:before {
+  content: "\e688";
+}
+
+.uniui-star-filled:before {
+  content: "\e68f";
+}
+
+.uniui-calendar:before {
+  content: "\e6a0";
+}
+
+.uniui-fire:before {
+  content: "\e6a1";
+}
+
+.uniui-medal:before {
+  content: "\e6a2";
+}
+
+.uniui-font:before {
+  content: "\e6a3";
+}
+
+.uniui-gift:before {
+  content: "\e6a4";
+}
+
+.uniui-link:before {
+  content: "\e6a5";
+}
+
+.uniui-notification:before {
+  content: "\e6a6";
+}
+
+.uniui-staff:before {
+  content: "\e6a7";
+}
+
+.uniui-vip:before {
+  content: "\e6a8";
+}
+
+.uniui-folder-add:before {
+  content: "\e6a9";
+}
+
+.uniui-tune:before {
+  content: "\e6aa";
+}
+
+.uniui-auth:before {
+  content: "\e6ab";
+}
+
+.uniui-person:before {
+  content: "\e699";
+}
+
+.uniui-email-filled:before {
+  content: "\e69a";
+}
+
+.uniui-phone-filled:before {
+  content: "\e69b";
+}
+
+.uniui-phone:before {
+  content: "\e69c";
+}
+
+.uniui-email:before {
+  content: "\e69e";
+}
+
+.uniui-personadd:before {
+  content: "\e69f";
+}
+
+.uniui-chatboxes-filled:before {
+  content: "\e692";
+}
+
+.uniui-contact:before {
+  content: "\e693";
+}
+
+.uniui-chatbubble-filled:before {
+  content: "\e694";
+}
+
+.uniui-contact-filled:before {
+  content: "\e695";
+}
+
+.uniui-chatboxes:before {
+  content: "\e696";
+}
+
+.uniui-chatbubble:before {
+  content: "\e697";
+}
+
+.uniui-upload-filled:before {
+  content: "\e68e";
+}
+
+.uniui-upload:before {
+  content: "\e690";
+}
+
+.uniui-weixin:before {
+  content: "\e691";
+}
+
+.uniui-compose:before {
+  content: "\e67f";
+}
+
+.uniui-qq:before {
+  content: "\e680";
+}
+
+.uniui-download-filled:before {
+  content: "\e681";
+}
+
+.uniui-pyq:before {
+  content: "\e682";
+}
+
+.uniui-sound:before {
+  content: "\e684";
+}
+
+.uniui-trash-filled:before {
+  content: "\e685";
+}
+
+.uniui-sound-filled:before {
+  content: "\e686";
+}
+
+.uniui-trash:before {
+  content: "\e687";
+}
+
+.uniui-videocam-filled:before {
+  content: "\e689";
+}
+
+.uniui-spinner-cycle:before {
+  content: "\e68a";
+}
+
+.uniui-weibo:before {
+  content: "\e68b";
+}
+
+.uniui-videocam:before {
+  content: "\e68c";
+}
+
+.uniui-download:before {
+  content: "\e68d";
+}
+
+.uniui-help:before {
+  content: "\e679";
+}
+
+.uniui-navigate-filled:before {
+  content: "\e67a";
+}
+
+.uniui-plusempty:before {
+  content: "\e67b";
+}
+
+.uniui-smallcircle:before {
+  content: "\e67c";
+}
+
+.uniui-minus-filled:before {
+  content: "\e67d";
+}
+
+.uniui-micoff:before {
+  content: "\e67e";
+}
+
+.uniui-closeempty:before {
+  content: "\e66c";
+}
+
+.uniui-clear:before {
+  content: "\e66d";
+}
+
+.uniui-navigate:before {
+  content: "\e66e";
+}
+
+.uniui-minus:before {
+  content: "\e66f";
+}
+
+.uniui-image:before {
+  content: "\e670";
+}
+
+.uniui-mic:before {
+  content: "\e671";
+}
+
+.uniui-paperplane:before {
+  content: "\e672";
+}
+
+.uniui-close:before {
+  content: "\e673";
+}
+
+.uniui-help-filled:before {
+  content: "\e674";
+}
+
+.uniui-paperplane-filled:before {
+  content: "\e675";
+}
+
+.uniui-plus:before {
+  content: "\e676";
+}
+
+.uniui-mic-filled:before {
+  content: "\e677";
+}
+
+.uniui-image-filled:before {
+  content: "\e678";
+}
+
+.uniui-locked-filled:before {
+  content: "\e668";
+}
+
+.uniui-info:before {
+  content: "\e669";
+}
+
+.uniui-locked:before {
+  content: "\e66b";
+}
+
+.uniui-camera-filled:before {
+  content: "\e658";
+}
+
+.uniui-chat-filled:before {
+  content: "\e659";
+}
+
+.uniui-camera:before {
+  content: "\e65a";
+}
+
+.uniui-circle:before {
+  content: "\e65b";
+}
+
+.uniui-checkmarkempty:before {
+  content: "\e65c";
+}
+
+.uniui-chat:before {
+  content: "\e65d";
+}
+
+.uniui-circle-filled:before {
+  content: "\e65e";
+}
+
+.uniui-flag:before {
+  content: "\e65f";
+}
+
+.uniui-flag-filled:before {
+  content: "\e660";
+}
+
+.uniui-gear-filled:before {
+  content: "\e661";
+}
+
+.uniui-home:before {
+  content: "\e662";
+}
+
+.uniui-home-filled:before {
+  content: "\e663";
+}
+
+.uniui-gear:before {
+  content: "\e664";
+}
+
+.uniui-smallcircle-filled:before {
+  content: "\e665";
+}
+
+.uniui-map-filled:before {
+  content: "\e666";
+}
+
+.uniui-map:before {
+  content: "\e667";
+}
+
+.uniui-refresh-filled:before {
+  content: "\e656";
+}
+
+.uniui-refresh:before {
+  content: "\e657";
+}
+
+.uniui-cloud-upload:before {
+  content: "\e645";
+}
+
+.uniui-cloud-download-filled:before {
+  content: "\e646";
+}
+
+.uniui-cloud-download:before {
+  content: "\e647";
+}
+
+.uniui-cloud-upload-filled:before {
+  content: "\e648";
+}
+
+.uniui-redo:before {
+  content: "\e64a";
+}
+
+.uniui-images-filled:before {
+  content: "\e64b";
+}
+
+.uniui-undo-filled:before {
+  content: "\e64c";
+}
+
+.uniui-more:before {
+  content: "\e64d";
+}
+
+.uniui-more-filled:before {
+  content: "\e64e";
+}
+
+.uniui-undo:before {
+  content: "\e64f";
+}
+
+.uniui-images:before {
+  content: "\e650";
+}
+
+.uniui-paperclip:before {
+  content: "\e652";
+}
+
+.uniui-settings:before {
+  content: "\e653";
+}
+
+.uniui-search:before {
+  content: "\e654";
+}
+
+.uniui-redo-filled:before {
+  content: "\e655";
+}
+
+.uniui-list:before {
+  content: "\e644";
+}
+
+.uniui-mail-open-filled:before {
+  content: "\e63a";
+}
+
+.uniui-hand-down-filled:before {
+  content: "\e63c";
+}
+
+.uniui-hand-down:before {
+  content: "\e63d";
+}
+
+.uniui-hand-up-filled:before {
+  content: "\e63e";
+}
+
+.uniui-hand-up:before {
+  content: "\e63f";
+}
+
+.uniui-heart-filled:before {
+  content: "\e641";
+}
+
+.uniui-mail-open:before {
+  content: "\e643";
+}
+
+.uniui-heart:before {
+  content: "\e639";
+}
+
+.uniui-loop:before {
+  content: "\e633";
+}
+
+.uniui-pulldown:before {
+  content: "\e632";
+}
+
+.uniui-scan:before {
+  content: "\e62a";
+}
+
+.uniui-bars:before {
+  content: "\e627";
+}
+
+.uniui-checkbox:before {
+  content: "\e62b";
+}
+
+.uniui-checkbox-filled:before {
+  content: "\e62c";
+}
+
+.uniui-shop:before {
+  content: "\e62f";
+}
+
+.uniui-headphones:before {
+  content: "\e630";
+}
+
+.uniui-cart:before {
+  content: "\e631";
+}
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.ttf b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
new file mode 100644
index 0000000..14696d0
Binary files /dev/null and b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf differ
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts b/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts
new file mode 100644
index 0000000..98e93aa
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts
@@ -0,0 +1,664 @@
+
+export type IconsData = {
+	id : string
+	name : string
+	font_family : string
+	css_prefix_text : string
+	description : string
+	glyphs : Array<IconsDataItem>
+}
+
+export type IconsDataItem = {
+	font_class : string
+	unicode : string
+}
+
+
+export const fontData = [
+  {
+    "font_class": "arrow-down",
+    "unicode": "\ue6be"
+  },
+  {
+    "font_class": "arrow-left",
+    "unicode": "\ue6bc"
+  },
+  {
+    "font_class": "arrow-right",
+    "unicode": "\ue6bb"
+  },
+  {
+    "font_class": "arrow-up",
+    "unicode": "\ue6bd"
+  },
+  {
+    "font_class": "auth",
+    "unicode": "\ue6ab"
+  },
+  {
+    "font_class": "auth-filled",
+    "unicode": "\ue6cc"
+  },
+  {
+    "font_class": "back",
+    "unicode": "\ue6b9"
+  },
+  {
+    "font_class": "bars",
+    "unicode": "\ue627"
+  },
+  {
+    "font_class": "calendar",
+    "unicode": "\ue6a0"
+  },
+  {
+    "font_class": "calendar-filled",
+    "unicode": "\ue6c0"
+  },
+  {
+    "font_class": "camera",
+    "unicode": "\ue65a"
+  },
+  {
+    "font_class": "camera-filled",
+    "unicode": "\ue658"
+  },
+  {
+    "font_class": "cart",
+    "unicode": "\ue631"
+  },
+  {
+    "font_class": "cart-filled",
+    "unicode": "\ue6d0"
+  },
+  {
+    "font_class": "chat",
+    "unicode": "\ue65d"
+  },
+  {
+    "font_class": "chat-filled",
+    "unicode": "\ue659"
+  },
+  {
+    "font_class": "chatboxes",
+    "unicode": "\ue696"
+  },
+  {
+    "font_class": "chatboxes-filled",
+    "unicode": "\ue692"
+  },
+  {
+    "font_class": "chatbubble",
+    "unicode": "\ue697"
+  },
+  {
+    "font_class": "chatbubble-filled",
+    "unicode": "\ue694"
+  },
+  {
+    "font_class": "checkbox",
+    "unicode": "\ue62b"
+  },
+  {
+    "font_class": "checkbox-filled",
+    "unicode": "\ue62c"
+  },
+  {
+    "font_class": "checkmarkempty",
+    "unicode": "\ue65c"
+  },
+  {
+    "font_class": "circle",
+    "unicode": "\ue65b"
+  },
+  {
+    "font_class": "circle-filled",
+    "unicode": "\ue65e"
+  },
+  {
+    "font_class": "clear",
+    "unicode": "\ue66d"
+  },
+  {
+    "font_class": "close",
+    "unicode": "\ue673"
+  },
+  {
+    "font_class": "closeempty",
+    "unicode": "\ue66c"
+  },
+  {
+    "font_class": "cloud-download",
+    "unicode": "\ue647"
+  },
+  {
+    "font_class": "cloud-download-filled",
+    "unicode": "\ue646"
+  },
+  {
+    "font_class": "cloud-upload",
+    "unicode": "\ue645"
+  },
+  {
+    "font_class": "cloud-upload-filled",
+    "unicode": "\ue648"
+  },
+  {
+    "font_class": "color",
+    "unicode": "\ue6cf"
+  },
+  {
+    "font_class": "color-filled",
+    "unicode": "\ue6c9"
+  },
+  {
+    "font_class": "compose",
+    "unicode": "\ue67f"
+  },
+  {
+    "font_class": "contact",
+    "unicode": "\ue693"
+  },
+  {
+    "font_class": "contact-filled",
+    "unicode": "\ue695"
+  },
+  {
+    "font_class": "down",
+    "unicode": "\ue6b8"
+  },
+	{
+	  "font_class": "bottom",
+	  "unicode": "\ue6b8"
+	},
+  {
+    "font_class": "download",
+    "unicode": "\ue68d"
+  },
+  {
+    "font_class": "download-filled",
+    "unicode": "\ue681"
+  },
+  {
+    "font_class": "email",
+    "unicode": "\ue69e"
+  },
+  {
+    "font_class": "email-filled",
+    "unicode": "\ue69a"
+  },
+  {
+    "font_class": "eye",
+    "unicode": "\ue651"
+  },
+  {
+    "font_class": "eye-filled",
+    "unicode": "\ue66a"
+  },
+  {
+    "font_class": "eye-slash",
+    "unicode": "\ue6b3"
+  },
+  {
+    "font_class": "eye-slash-filled",
+    "unicode": "\ue6b4"
+  },
+  {
+    "font_class": "fire",
+    "unicode": "\ue6a1"
+  },
+  {
+    "font_class": "fire-filled",
+    "unicode": "\ue6c5"
+  },
+  {
+    "font_class": "flag",
+    "unicode": "\ue65f"
+  },
+  {
+    "font_class": "flag-filled",
+    "unicode": "\ue660"
+  },
+  {
+    "font_class": "folder-add",
+    "unicode": "\ue6a9"
+  },
+  {
+    "font_class": "folder-add-filled",
+    "unicode": "\ue6c8"
+  },
+  {
+    "font_class": "font",
+    "unicode": "\ue6a3"
+  },
+  {
+    "font_class": "forward",
+    "unicode": "\ue6ba"
+  },
+  {
+    "font_class": "gear",
+    "unicode": "\ue664"
+  },
+  {
+    "font_class": "gear-filled",
+    "unicode": "\ue661"
+  },
+  {
+    "font_class": "gift",
+    "unicode": "\ue6a4"
+  },
+  {
+    "font_class": "gift-filled",
+    "unicode": "\ue6c4"
+  },
+  {
+    "font_class": "hand-down",
+    "unicode": "\ue63d"
+  },
+  {
+    "font_class": "hand-down-filled",
+    "unicode": "\ue63c"
+  },
+  {
+    "font_class": "hand-up",
+    "unicode": "\ue63f"
+  },
+  {
+    "font_class": "hand-up-filled",
+    "unicode": "\ue63e"
+  },
+  {
+    "font_class": "headphones",
+    "unicode": "\ue630"
+  },
+  {
+    "font_class": "heart",
+    "unicode": "\ue639"
+  },
+  {
+    "font_class": "heart-filled",
+    "unicode": "\ue641"
+  },
+  {
+    "font_class": "help",
+    "unicode": "\ue679"
+  },
+  {
+    "font_class": "help-filled",
+    "unicode": "\ue674"
+  },
+  {
+    "font_class": "home",
+    "unicode": "\ue662"
+  },
+  {
+    "font_class": "home-filled",
+    "unicode": "\ue663"
+  },
+  {
+    "font_class": "image",
+    "unicode": "\ue670"
+  },
+  {
+    "font_class": "image-filled",
+    "unicode": "\ue678"
+  },
+  {
+    "font_class": "images",
+    "unicode": "\ue650"
+  },
+  {
+    "font_class": "images-filled",
+    "unicode": "\ue64b"
+  },
+  {
+    "font_class": "info",
+    "unicode": "\ue669"
+  },
+  {
+    "font_class": "info-filled",
+    "unicode": "\ue649"
+  },
+  {
+    "font_class": "left",
+    "unicode": "\ue6b7"
+  },
+  {
+    "font_class": "link",
+    "unicode": "\ue6a5"
+  },
+  {
+    "font_class": "list",
+    "unicode": "\ue644"
+  },
+  {
+    "font_class": "location",
+    "unicode": "\ue6ae"
+  },
+  {
+    "font_class": "location-filled",
+    "unicode": "\ue6af"
+  },
+  {
+    "font_class": "locked",
+    "unicode": "\ue66b"
+  },
+  {
+    "font_class": "locked-filled",
+    "unicode": "\ue668"
+  },
+  {
+    "font_class": "loop",
+    "unicode": "\ue633"
+  },
+  {
+    "font_class": "mail-open",
+    "unicode": "\ue643"
+  },
+  {
+    "font_class": "mail-open-filled",
+    "unicode": "\ue63a"
+  },
+  {
+    "font_class": "map",
+    "unicode": "\ue667"
+  },
+  {
+    "font_class": "map-filled",
+    "unicode": "\ue666"
+  },
+  {
+    "font_class": "map-pin",
+    "unicode": "\ue6ad"
+  },
+  {
+    "font_class": "map-pin-ellipse",
+    "unicode": "\ue6ac"
+  },
+  {
+    "font_class": "medal",
+    "unicode": "\ue6a2"
+  },
+  {
+    "font_class": "medal-filled",
+    "unicode": "\ue6c3"
+  },
+  {
+    "font_class": "mic",
+    "unicode": "\ue671"
+  },
+  {
+    "font_class": "mic-filled",
+    "unicode": "\ue677"
+  },
+  {
+    "font_class": "micoff",
+    "unicode": "\ue67e"
+  },
+  {
+    "font_class": "micoff-filled",
+    "unicode": "\ue6b0"
+  },
+  {
+    "font_class": "minus",
+    "unicode": "\ue66f"
+  },
+  {
+    "font_class": "minus-filled",
+    "unicode": "\ue67d"
+  },
+  {
+    "font_class": "more",
+    "unicode": "\ue64d"
+  },
+  {
+    "font_class": "more-filled",
+    "unicode": "\ue64e"
+  },
+  {
+    "font_class": "navigate",
+    "unicode": "\ue66e"
+  },
+  {
+    "font_class": "navigate-filled",
+    "unicode": "\ue67a"
+  },
+  {
+    "font_class": "notification",
+    "unicode": "\ue6a6"
+  },
+  {
+    "font_class": "notification-filled",
+    "unicode": "\ue6c1"
+  },
+  {
+    "font_class": "paperclip",
+    "unicode": "\ue652"
+  },
+  {
+    "font_class": "paperplane",
+    "unicode": "\ue672"
+  },
+  {
+    "font_class": "paperplane-filled",
+    "unicode": "\ue675"
+  },
+  {
+    "font_class": "person",
+    "unicode": "\ue699"
+  },
+  {
+    "font_class": "person-filled",
+    "unicode": "\ue69d"
+  },
+  {
+    "font_class": "personadd",
+    "unicode": "\ue69f"
+  },
+  {
+    "font_class": "personadd-filled",
+    "unicode": "\ue698"
+  },
+  {
+    "font_class": "personadd-filled-copy",
+    "unicode": "\ue6d1"
+  },
+  {
+    "font_class": "phone",
+    "unicode": "\ue69c"
+  },
+  {
+    "font_class": "phone-filled",
+    "unicode": "\ue69b"
+  },
+  {
+    "font_class": "plus",
+    "unicode": "\ue676"
+  },
+  {
+    "font_class": "plus-filled",
+    "unicode": "\ue6c7"
+  },
+  {
+    "font_class": "plusempty",
+    "unicode": "\ue67b"
+  },
+  {
+    "font_class": "pulldown",
+    "unicode": "\ue632"
+  },
+  {
+    "font_class": "pyq",
+    "unicode": "\ue682"
+  },
+  {
+    "font_class": "qq",
+    "unicode": "\ue680"
+  },
+  {
+    "font_class": "redo",
+    "unicode": "\ue64a"
+  },
+  {
+    "font_class": "redo-filled",
+    "unicode": "\ue655"
+  },
+  {
+    "font_class": "refresh",
+    "unicode": "\ue657"
+  },
+  {
+    "font_class": "refresh-filled",
+    "unicode": "\ue656"
+  },
+  {
+    "font_class": "refreshempty",
+    "unicode": "\ue6bf"
+  },
+  {
+    "font_class": "reload",
+    "unicode": "\ue6b2"
+  },
+  {
+    "font_class": "right",
+    "unicode": "\ue6b5"
+  },
+  {
+    "font_class": "scan",
+    "unicode": "\ue62a"
+  },
+  {
+    "font_class": "search",
+    "unicode": "\ue654"
+  },
+  {
+    "font_class": "settings",
+    "unicode": "\ue653"
+  },
+  {
+    "font_class": "settings-filled",
+    "unicode": "\ue6ce"
+  },
+  {
+    "font_class": "shop",
+    "unicode": "\ue62f"
+  },
+  {
+    "font_class": "shop-filled",
+    "unicode": "\ue6cd"
+  },
+  {
+    "font_class": "smallcircle",
+    "unicode": "\ue67c"
+  },
+  {
+    "font_class": "smallcircle-filled",
+    "unicode": "\ue665"
+  },
+  {
+    "font_class": "sound",
+    "unicode": "\ue684"
+  },
+  {
+    "font_class": "sound-filled",
+    "unicode": "\ue686"
+  },
+  {
+    "font_class": "spinner-cycle",
+    "unicode": "\ue68a"
+  },
+  {
+    "font_class": "staff",
+    "unicode": "\ue6a7"
+  },
+  {
+    "font_class": "staff-filled",
+    "unicode": "\ue6cb"
+  },
+  {
+    "font_class": "star",
+    "unicode": "\ue688"
+  },
+  {
+    "font_class": "star-filled",
+    "unicode": "\ue68f"
+  },
+  {
+    "font_class": "starhalf",
+    "unicode": "\ue683"
+  },
+  {
+    "font_class": "trash",
+    "unicode": "\ue687"
+  },
+  {
+    "font_class": "trash-filled",
+    "unicode": "\ue685"
+  },
+  {
+    "font_class": "tune",
+    "unicode": "\ue6aa"
+  },
+  {
+    "font_class": "tune-filled",
+    "unicode": "\ue6ca"
+  },
+  {
+    "font_class": "undo",
+    "unicode": "\ue64f"
+  },
+  {
+    "font_class": "undo-filled",
+    "unicode": "\ue64c"
+  },
+  {
+    "font_class": "up",
+    "unicode": "\ue6b6"
+  },
+	{
+	  "font_class": "top",
+	  "unicode": "\ue6b6"
+	},
+  {
+    "font_class": "upload",
+    "unicode": "\ue690"
+  },
+  {
+    "font_class": "upload-filled",
+    "unicode": "\ue68e"
+  },
+  {
+    "font_class": "videocam",
+    "unicode": "\ue68c"
+  },
+  {
+    "font_class": "videocam-filled",
+    "unicode": "\ue689"
+  },
+  {
+    "font_class": "vip",
+    "unicode": "\ue6a8"
+  },
+  {
+    "font_class": "vip-filled",
+    "unicode": "\ue6c6"
+  },
+  {
+    "font_class": "wallet",
+    "unicode": "\ue6b1"
+  },
+  {
+    "font_class": "wallet-filled",
+    "unicode": "\ue6c2"
+  },
+  {
+    "font_class": "weibo",
+    "unicode": "\ue68b"
+  },
+  {
+    "font_class": "weixin",
+    "unicode": "\ue691"
+  }
+] as IconsDataItem[]
+
+// export const fontData = JSON.parse<IconsDataItem>(fontDataJson)
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js b/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js
new file mode 100644
index 0000000..1cd11e1
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js
@@ -0,0 +1,649 @@
+
+export const fontData = [
+  {
+    "font_class": "arrow-down",
+    "unicode": "\ue6be"
+  },
+  {
+    "font_class": "arrow-left",
+    "unicode": "\ue6bc"
+  },
+  {
+    "font_class": "arrow-right",
+    "unicode": "\ue6bb"
+  },
+  {
+    "font_class": "arrow-up",
+    "unicode": "\ue6bd"
+  },
+  {
+    "font_class": "auth",
+    "unicode": "\ue6ab"
+  },
+  {
+    "font_class": "auth-filled",
+    "unicode": "\ue6cc"
+  },
+  {
+    "font_class": "back",
+    "unicode": "\ue6b9"
+  },
+  {
+    "font_class": "bars",
+    "unicode": "\ue627"
+  },
+  {
+    "font_class": "calendar",
+    "unicode": "\ue6a0"
+  },
+  {
+    "font_class": "calendar-filled",
+    "unicode": "\ue6c0"
+  },
+  {
+    "font_class": "camera",
+    "unicode": "\ue65a"
+  },
+  {
+    "font_class": "camera-filled",
+    "unicode": "\ue658"
+  },
+  {
+    "font_class": "cart",
+    "unicode": "\ue631"
+  },
+  {
+    "font_class": "cart-filled",
+    "unicode": "\ue6d0"
+  },
+  {
+    "font_class": "chat",
+    "unicode": "\ue65d"
+  },
+  {
+    "font_class": "chat-filled",
+    "unicode": "\ue659"
+  },
+  {
+    "font_class": "chatboxes",
+    "unicode": "\ue696"
+  },
+  {
+    "font_class": "chatboxes-filled",
+    "unicode": "\ue692"
+  },
+  {
+    "font_class": "chatbubble",
+    "unicode": "\ue697"
+  },
+  {
+    "font_class": "chatbubble-filled",
+    "unicode": "\ue694"
+  },
+  {
+    "font_class": "checkbox",
+    "unicode": "\ue62b"
+  },
+  {
+    "font_class": "checkbox-filled",
+    "unicode": "\ue62c"
+  },
+  {
+    "font_class": "checkmarkempty",
+    "unicode": "\ue65c"
+  },
+  {
+    "font_class": "circle",
+    "unicode": "\ue65b"
+  },
+  {
+    "font_class": "circle-filled",
+    "unicode": "\ue65e"
+  },
+  {
+    "font_class": "clear",
+    "unicode": "\ue66d"
+  },
+  {
+    "font_class": "close",
+    "unicode": "\ue673"
+  },
+  {
+    "font_class": "closeempty",
+    "unicode": "\ue66c"
+  },
+  {
+    "font_class": "cloud-download",
+    "unicode": "\ue647"
+  },
+  {
+    "font_class": "cloud-download-filled",
+    "unicode": "\ue646"
+  },
+  {
+    "font_class": "cloud-upload",
+    "unicode": "\ue645"
+  },
+  {
+    "font_class": "cloud-upload-filled",
+    "unicode": "\ue648"
+  },
+  {
+    "font_class": "color",
+    "unicode": "\ue6cf"
+  },
+  {
+    "font_class": "color-filled",
+    "unicode": "\ue6c9"
+  },
+  {
+    "font_class": "compose",
+    "unicode": "\ue67f"
+  },
+  {
+    "font_class": "contact",
+    "unicode": "\ue693"
+  },
+  {
+    "font_class": "contact-filled",
+    "unicode": "\ue695"
+  },
+  {
+    "font_class": "down",
+    "unicode": "\ue6b8"
+  },
+	{
+	  "font_class": "bottom",
+	  "unicode": "\ue6b8"
+	},
+  {
+    "font_class": "download",
+    "unicode": "\ue68d"
+  },
+  {
+    "font_class": "download-filled",
+    "unicode": "\ue681"
+  },
+  {
+    "font_class": "email",
+    "unicode": "\ue69e"
+  },
+  {
+    "font_class": "email-filled",
+    "unicode": "\ue69a"
+  },
+  {
+    "font_class": "eye",
+    "unicode": "\ue651"
+  },
+  {
+    "font_class": "eye-filled",
+    "unicode": "\ue66a"
+  },
+  {
+    "font_class": "eye-slash",
+    "unicode": "\ue6b3"
+  },
+  {
+    "font_class": "eye-slash-filled",
+    "unicode": "\ue6b4"
+  },
+  {
+    "font_class": "fire",
+    "unicode": "\ue6a1"
+  },
+  {
+    "font_class": "fire-filled",
+    "unicode": "\ue6c5"
+  },
+  {
+    "font_class": "flag",
+    "unicode": "\ue65f"
+  },
+  {
+    "font_class": "flag-filled",
+    "unicode": "\ue660"
+  },
+  {
+    "font_class": "folder-add",
+    "unicode": "\ue6a9"
+  },
+  {
+    "font_class": "folder-add-filled",
+    "unicode": "\ue6c8"
+  },
+  {
+    "font_class": "font",
+    "unicode": "\ue6a3"
+  },
+  {
+    "font_class": "forward",
+    "unicode": "\ue6ba"
+  },
+  {
+    "font_class": "gear",
+    "unicode": "\ue664"
+  },
+  {
+    "font_class": "gear-filled",
+    "unicode": "\ue661"
+  },
+  {
+    "font_class": "gift",
+    "unicode": "\ue6a4"
+  },
+  {
+    "font_class": "gift-filled",
+    "unicode": "\ue6c4"
+  },
+  {
+    "font_class": "hand-down",
+    "unicode": "\ue63d"
+  },
+  {
+    "font_class": "hand-down-filled",
+    "unicode": "\ue63c"
+  },
+  {
+    "font_class": "hand-up",
+    "unicode": "\ue63f"
+  },
+  {
+    "font_class": "hand-up-filled",
+    "unicode": "\ue63e"
+  },
+  {
+    "font_class": "headphones",
+    "unicode": "\ue630"
+  },
+  {
+    "font_class": "heart",
+    "unicode": "\ue639"
+  },
+  {
+    "font_class": "heart-filled",
+    "unicode": "\ue641"
+  },
+  {
+    "font_class": "help",
+    "unicode": "\ue679"
+  },
+  {
+    "font_class": "help-filled",
+    "unicode": "\ue674"
+  },
+  {
+    "font_class": "home",
+    "unicode": "\ue662"
+  },
+  {
+    "font_class": "home-filled",
+    "unicode": "\ue663"
+  },
+  {
+    "font_class": "image",
+    "unicode": "\ue670"
+  },
+  {
+    "font_class": "image-filled",
+    "unicode": "\ue678"
+  },
+  {
+    "font_class": "images",
+    "unicode": "\ue650"
+  },
+  {
+    "font_class": "images-filled",
+    "unicode": "\ue64b"
+  },
+  {
+    "font_class": "info",
+    "unicode": "\ue669"
+  },
+  {
+    "font_class": "info-filled",
+    "unicode": "\ue649"
+  },
+  {
+    "font_class": "left",
+    "unicode": "\ue6b7"
+  },
+  {
+    "font_class": "link",
+    "unicode": "\ue6a5"
+  },
+  {
+    "font_class": "list",
+    "unicode": "\ue644"
+  },
+  {
+    "font_class": "location",
+    "unicode": "\ue6ae"
+  },
+  {
+    "font_class": "location-filled",
+    "unicode": "\ue6af"
+  },
+  {
+    "font_class": "locked",
+    "unicode": "\ue66b"
+  },
+  {
+    "font_class": "locked-filled",
+    "unicode": "\ue668"
+  },
+  {
+    "font_class": "loop",
+    "unicode": "\ue633"
+  },
+  {
+    "font_class": "mail-open",
+    "unicode": "\ue643"
+  },
+  {
+    "font_class": "mail-open-filled",
+    "unicode": "\ue63a"
+  },
+  {
+    "font_class": "map",
+    "unicode": "\ue667"
+  },
+  {
+    "font_class": "map-filled",
+    "unicode": "\ue666"
+  },
+  {
+    "font_class": "map-pin",
+    "unicode": "\ue6ad"
+  },
+  {
+    "font_class": "map-pin-ellipse",
+    "unicode": "\ue6ac"
+  },
+  {
+    "font_class": "medal",
+    "unicode": "\ue6a2"
+  },
+  {
+    "font_class": "medal-filled",
+    "unicode": "\ue6c3"
+  },
+  {
+    "font_class": "mic",
+    "unicode": "\ue671"
+  },
+  {
+    "font_class": "mic-filled",
+    "unicode": "\ue677"
+  },
+  {
+    "font_class": "micoff",
+    "unicode": "\ue67e"
+  },
+  {
+    "font_class": "micoff-filled",
+    "unicode": "\ue6b0"
+  },
+  {
+    "font_class": "minus",
+    "unicode": "\ue66f"
+  },
+  {
+    "font_class": "minus-filled",
+    "unicode": "\ue67d"
+  },
+  {
+    "font_class": "more",
+    "unicode": "\ue64d"
+  },
+  {
+    "font_class": "more-filled",
+    "unicode": "\ue64e"
+  },
+  {
+    "font_class": "navigate",
+    "unicode": "\ue66e"
+  },
+  {
+    "font_class": "navigate-filled",
+    "unicode": "\ue67a"
+  },
+  {
+    "font_class": "notification",
+    "unicode": "\ue6a6"
+  },
+  {
+    "font_class": "notification-filled",
+    "unicode": "\ue6c1"
+  },
+  {
+    "font_class": "paperclip",
+    "unicode": "\ue652"
+  },
+  {
+    "font_class": "paperplane",
+    "unicode": "\ue672"
+  },
+  {
+    "font_class": "paperplane-filled",
+    "unicode": "\ue675"
+  },
+  {
+    "font_class": "person",
+    "unicode": "\ue699"
+  },
+  {
+    "font_class": "person-filled",
+    "unicode": "\ue69d"
+  },
+  {
+    "font_class": "personadd",
+    "unicode": "\ue69f"
+  },
+  {
+    "font_class": "personadd-filled",
+    "unicode": "\ue698"
+  },
+  {
+    "font_class": "personadd-filled-copy",
+    "unicode": "\ue6d1"
+  },
+  {
+    "font_class": "phone",
+    "unicode": "\ue69c"
+  },
+  {
+    "font_class": "phone-filled",
+    "unicode": "\ue69b"
+  },
+  {
+    "font_class": "plus",
+    "unicode": "\ue676"
+  },
+  {
+    "font_class": "plus-filled",
+    "unicode": "\ue6c7"
+  },
+  {
+    "font_class": "plusempty",
+    "unicode": "\ue67b"
+  },
+  {
+    "font_class": "pulldown",
+    "unicode": "\ue632"
+  },
+  {
+    "font_class": "pyq",
+    "unicode": "\ue682"
+  },
+  {
+    "font_class": "qq",
+    "unicode": "\ue680"
+  },
+  {
+    "font_class": "redo",
+    "unicode": "\ue64a"
+  },
+  {
+    "font_class": "redo-filled",
+    "unicode": "\ue655"
+  },
+  {
+    "font_class": "refresh",
+    "unicode": "\ue657"
+  },
+  {
+    "font_class": "refresh-filled",
+    "unicode": "\ue656"
+  },
+  {
+    "font_class": "refreshempty",
+    "unicode": "\ue6bf"
+  },
+  {
+    "font_class": "reload",
+    "unicode": "\ue6b2"
+  },
+  {
+    "font_class": "right",
+    "unicode": "\ue6b5"
+  },
+  {
+    "font_class": "scan",
+    "unicode": "\ue62a"
+  },
+  {
+    "font_class": "search",
+    "unicode": "\ue654"
+  },
+  {
+    "font_class": "settings",
+    "unicode": "\ue653"
+  },
+  {
+    "font_class": "settings-filled",
+    "unicode": "\ue6ce"
+  },
+  {
+    "font_class": "shop",
+    "unicode": "\ue62f"
+  },
+  {
+    "font_class": "shop-filled",
+    "unicode": "\ue6cd"
+  },
+  {
+    "font_class": "smallcircle",
+    "unicode": "\ue67c"
+  },
+  {
+    "font_class": "smallcircle-filled",
+    "unicode": "\ue665"
+  },
+  {
+    "font_class": "sound",
+    "unicode": "\ue684"
+  },
+  {
+    "font_class": "sound-filled",
+    "unicode": "\ue686"
+  },
+  {
+    "font_class": "spinner-cycle",
+    "unicode": "\ue68a"
+  },
+  {
+    "font_class": "staff",
+    "unicode": "\ue6a7"
+  },
+  {
+    "font_class": "staff-filled",
+    "unicode": "\ue6cb"
+  },
+  {
+    "font_class": "star",
+    "unicode": "\ue688"
+  },
+  {
+    "font_class": "star-filled",
+    "unicode": "\ue68f"
+  },
+  {
+    "font_class": "starhalf",
+    "unicode": "\ue683"
+  },
+  {
+    "font_class": "trash",
+    "unicode": "\ue687"
+  },
+  {
+    "font_class": "trash-filled",
+    "unicode": "\ue685"
+  },
+  {
+    "font_class": "tune",
+    "unicode": "\ue6aa"
+  },
+  {
+    "font_class": "tune-filled",
+    "unicode": "\ue6ca"
+  },
+  {
+    "font_class": "undo",
+    "unicode": "\ue64f"
+  },
+  {
+    "font_class": "undo-filled",
+    "unicode": "\ue64c"
+  },
+  {
+    "font_class": "up",
+    "unicode": "\ue6b6"
+  },
+	{
+	  "font_class": "top",
+	  "unicode": "\ue6b6"
+	},
+  {
+    "font_class": "upload",
+    "unicode": "\ue690"
+  },
+  {
+    "font_class": "upload-filled",
+    "unicode": "\ue68e"
+  },
+  {
+    "font_class": "videocam",
+    "unicode": "\ue68c"
+  },
+  {
+    "font_class": "videocam-filled",
+    "unicode": "\ue689"
+  },
+  {
+    "font_class": "vip",
+    "unicode": "\ue6a8"
+  },
+  {
+    "font_class": "vip-filled",
+    "unicode": "\ue6c6"
+  },
+  {
+    "font_class": "wallet",
+    "unicode": "\ue6b1"
+  },
+  {
+    "font_class": "wallet-filled",
+    "unicode": "\ue6c2"
+  },
+  {
+    "font_class": "weibo",
+    "unicode": "\ue68b"
+  },
+  {
+    "font_class": "weixin",
+    "unicode": "\ue691"
+  }
+]
+
+// export const fontData = JSON.parse<IconsDataItem>(fontDataJson)
diff --git a/uni_modules/uni-icons/package.json b/uni_modules/uni-icons/package.json
new file mode 100644
index 0000000..6b681b4
--- /dev/null
+++ b/uni_modules/uni-icons/package.json
@@ -0,0 +1,89 @@
+{
+  "id": "uni-icons",
+  "displayName": "uni-icons 图标",
+  "version": "2.0.10",
+  "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "icon",
+    "图标"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.2.14"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y",
+          "app-uvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y",
+					"钉钉": "y",
+					"快手": "y",
+					"飞书": "y",
+					"京东": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-icons/readme.md b/uni_modules/uni-icons/readme.md
new file mode 100644
index 0000000..86234ba
--- /dev/null
+++ b/uni_modules/uni-icons/readme.md
@@ -0,0 +1,8 @@
+## Icons 图标
+> **组件名：uni-icons**
+> 代码块： `uIcons`
+
+用于展示 icons 图标 。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-icons)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
diff --git a/uni_modules/uni-load-more/changelog.md b/uni_modules/uni-load-more/changelog.md
new file mode 100644
index 0000000..667abdb
--- /dev/null
+++ b/uni_modules/uni-load-more/changelog.md
@@ -0,0 +1,25 @@
+## 1.3.6（2024-10-15）
+- 修复 微信小程序中的getSystemInfo警告
+## 1.3.5（2024-10-12）
+- 修复 微信小程序中的getSystemInfo警告
+## 1.3.4（2024-10-12）
+- 修复 微信小程序中的getSystemInfo警告
+## 1.3.3（2022-01-20）
+- 新增 showText属性 ，是否显示文本
+## 1.3.2（2022-01-19）
+- 修复 nvue 平台下不显示文本的bug
+## 1.3.1（2022-01-19）
+- 修复 微信小程序平台样式选择器报警告的问题
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-load-more](https://uniapp.dcloud.io/component/uniui/uni-load-more)
+## 1.2.1（2021-08-24）
+- 新增 支持国际化
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.8（2021-05-12）
+- 新增 组件示例地址
+## 1.1.7（2021-03-30）
+- 修复 uni-load-more 在首页使用时，h5 平台报 'uni is not defined' 的 bug
+## 1.1.6（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json
new file mode 100644
index 0000000..a4f14a5
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json
@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "Pull up to show more",
+	"uni-load-more.contentrefresh": "loading...",
+	"uni-load-more.contentnomore": "No more data"
+}
diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js b/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
new file mode 100644
index 0000000..f15d510
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "上拉显示更多",
+	"uni-load-more.contentrefresh": "正在加载...",
+	"uni-load-more.contentnomore": "没有更多数据了"
+}
diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json
new file mode 100644
index 0000000..a255c6d
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json
@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "上拉顯示更多",
+	"uni-load-more.contentrefresh": "正在加載...",
+	"uni-load-more.contentnomore": "沒有更多數據了"
+}
diff --git a/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
new file mode 100644
index 0000000..a203417
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
@@ -0,0 +1,404 @@
+<template>
+	<view class="uni-load-more" @click="onClick">
+		<!-- #ifdef APP-NVUE -->
+		<loading-indicator v-if="!webviewHide && status === 'loading' && showIcon"
+			:style="{color: color,width:iconSize+'px',height:iconSize+'px'}" :animating="true"
+			class="uni-load-more__img uni-load-more__img--nvue"></loading-indicator>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+		<svg width="24" height="24" viewBox="25 25 50 50"
+			v-if="!webviewHide && (iconType==='circle' || iconType==='auto' && platform === 'android') && status === 'loading' && showIcon"
+			:style="{width:iconSize+'px',height:iconSize+'px'}"
+			class="uni-load-more__img uni-load-more__img--android-H5">
+			<circle cx="50" cy="50" r="20" fill="none" :style="{color:color}" :stroke-width="3"></circle>
+		</svg>
+		<!-- #endif -->
+		<!-- #ifndef APP-NVUE || H5 -->
+		<view
+			v-if="!webviewHide && (iconType==='circle' || iconType==='auto' && platform === 'android') && status === 'loading' && showIcon"
+			:style="{width:iconSize+'px',height:iconSize+'px'}"
+			class="uni-load-more__img uni-load-more__img--android-MP">
+			<view class="uni-load-more__img-icon" :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
+			<view class="uni-load-more__img-icon" :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
+			<view class="uni-load-more__img-icon" :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
+		</view>
+		<!-- #endif -->
+		<!-- #ifndef APP-NVUE -->
+		<view v-else-if="!webviewHide && status === 'loading' && showIcon"
+			:style="{width:iconSize+'px',height:iconSize+'px'}" class="uni-load-more__img uni-load-more__img--ios-H5">
+			<image :src="imgBase64" mode="widthFix"></image>
+		</view>
+		<!-- #endif -->
+		<text v-if="showText" class="uni-load-more__text"
+			:style="{color: color}">{{ status === 'more' ? contentdownText : status === 'loading' ? contentrefreshText : contentnomoreText }}</text>
+	</view>
+</template>
+
+<script>
+	let platform
+	setTimeout(() => {
+		// #ifdef MP-WEIXIN
+		platform = uni.getDeviceInfo().platform
+		// #endif
+		// #ifndef MP-WEIXIN
+		platform = uni.getSystemInfoSync().platform
+		// #endif
+	}, 16)
+
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+
+	/**
+	 * LoadMore 加载更多
+	 * @description 用于列表中，做滚动加载使用，展示 loading 的各种状态
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=29
+	 * @property {String} status = [more|loading|noMore] loading 的状态
+	 * 	@value more loading前
+	 * 	@value loading loading中
+	 * 	@value noMore 没有更多了
+	 * @property {Number} iconSize 指定图标大小
+	 * @property {Boolean} iconSize = [true|false] 是否显示 loading 图标
+	 * @property {String} iconType = [snow|circle|auto] 指定图标样式
+	 * 	@value snow ios雪花加载样式
+	 * 	@value circle 安卓唤醒加载样式
+	 * 	@value auto 根据平台自动选择加载样式
+	 * @property {String} color 图标和文字颜色
+	 * @property {Object} contentText 各状态文字说明，值为：{contentdown: "上拉显示更多",contentrefresh: "正在加载...",contentnomore: "没有更多数据了"}
+	 * @event {Function} clickLoadMore 点击加载更多时触发
+	 */
+	export default {
+		name: 'UniLoadMore',
+		emits: ['clickLoadMore'],
+		props: {
+			status: {
+				// 上拉的状态：more-loading前；loading-loading中；noMore-没有更多了
+				type: String,
+				default: 'more'
+			},
+			showIcon: {
+				type: Boolean,
+				default: true
+			},
+			iconType: {
+				type: String,
+				default: 'auto'
+			},
+			iconSize: {
+				type: Number,
+				default: 24
+			},
+			color: {
+				type: String,
+				default: '#777777'
+			},
+			contentText: {
+				type: Object,
+				default () {
+					return {
+						contentdown: '',
+						contentrefresh: '',
+						contentnomore: ''
+					}
+				}
+			},
+			showText: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				webviewHide: false,
+				platform: platform,
+				imgBase64: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QzlBMzU3OTlEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QzlBMzU3OUFEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpDOUEzNTc5N0Q5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpDOUEzNTc5OEQ5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pt+ALSwAAA6CSURBVHja1FsLkFZV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'
+			}
+		},
+		computed: {
+			iconSnowWidth() {
+				return (Math.floor(this.iconSize / 24) || 1) * 2
+			},
+			contentdownText() {
+				return this.contentText.contentdown || t("uni-load-more.contentdown")
+			},
+			contentrefreshText() {
+				return this.contentText.contentrefresh || t("uni-load-more.contentrefresh")
+			},
+			contentnomoreText() {
+				return this.contentText.contentnomore || t("uni-load-more.contentnomore")
+			}
+		},
+		mounted() {
+			// #ifdef APP-PLUS
+			var pages = getCurrentPages();
+			var page = pages[pages.length - 1];
+			var currentWebview = page.$getAppWebview();
+			currentWebview.addEventListener('hide', () => {
+				this.webviewHide = true
+			})
+			currentWebview.addEventListener('show', () => {
+				this.webviewHide = false
+			})
+			// #endif
+		},
+		methods: {
+			onClick() {
+				this.$emit('clickLoadMore', {
+					detail: {
+						status: this.status,
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-load-more {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		height: 40px;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.uni-load-more__text {
+		font-size: 14px;
+		margin-left: 8px;
+	}
+
+	.uni-load-more__img {
+		width: 24px;
+		height: 24px;
+		// margin-right: 8px;
+	}
+
+	.uni-load-more__img--nvue {
+		color: #666666;
+	}
+
+	.uni-load-more__img--android,
+	.uni-load-more__img--ios {
+		width: 24px;
+		height: 24px;
+		transform: rotate(0deg);
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-load-more__img--android {
+		animation: loading-ios 1s 0s linear infinite;
+	}
+
+	@keyframes loading-android {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	.uni-load-more__img--ios-H5 {
+		position: relative;
+		animation: loading-ios-H5 1s 0s step-end infinite;
+	}
+
+	.uni-load-more__img--ios-H5 image {
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top: 0;
+	}
+
+	@keyframes loading-ios-H5 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		8% {
+			transform: rotate(30deg);
+		}
+
+		16% {
+			transform: rotate(60deg);
+		}
+
+		24% {
+			transform: rotate(90deg);
+		}
+
+		32% {
+			transform: rotate(120deg);
+		}
+
+		40% {
+			transform: rotate(150deg);
+		}
+
+		48% {
+			transform: rotate(180deg);
+		}
+
+		56% {
+			transform: rotate(210deg);
+		}
+
+		64% {
+			transform: rotate(240deg);
+		}
+
+		73% {
+			transform: rotate(270deg);
+		}
+
+		82% {
+			transform: rotate(300deg);
+		}
+
+		91% {
+			transform: rotate(330deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	/* #endif */
+
+	/* #ifdef H5 */
+	.uni-load-more__img--android-H5 {
+		animation: loading-android-H5-rotate 2s linear infinite;
+		transform-origin: center center;
+	}
+
+	.uni-load-more__img--android-H5 circle {
+		display: inline-block;
+		animation: loading-android-H5-dash 1.5s ease-in-out infinite;
+		stroke: currentColor;
+		stroke-linecap: round;
+	}
+
+	@keyframes loading-android-H5-rotate {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-H5-dash {
+		0% {
+			stroke-dasharray: 1, 200;
+			stroke-dashoffset: 0;
+		}
+
+		50% {
+			stroke-dasharray: 90, 150;
+			stroke-dashoffset: -40;
+		}
+
+		100% {
+			stroke-dasharray: 90, 150;
+			stroke-dashoffset: -120;
+		}
+	}
+
+	/* #endif */
+
+	/* #ifndef APP-NVUE || H5 */
+	.uni-load-more__img--android-MP {
+		position: relative;
+		width: 24px;
+		height: 24px;
+		transform: rotate(0deg);
+		animation: loading-ios 1s 0s ease infinite;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon {
+		position: absolute;
+		box-sizing: border-box;
+		width: 100%;
+		height: 100%;
+		border-radius: 50%;
+		border: solid 2px transparent;
+		border-top: solid 2px #777777;
+		transform-origin: center;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(1) {
+		animation: loading-android-MP-1 1s 0s linear infinite;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(2) {
+		animation: loading-android-MP-2 1s 0s linear infinite;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(3) {
+		animation: loading-android-MP-3 1s 0s linear infinite;
+	}
+
+	@keyframes loading-android {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-MP-1 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		50% {
+			transform: rotate(90deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-MP-2 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		50% {
+			transform: rotate(180deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-MP-3 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		50% {
+			transform: rotate(270deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-load-more/package.json b/uni_modules/uni-load-more/package.json
new file mode 100644
index 0000000..cf44bff
--- /dev/null
+++ b/uni_modules/uni-load-more/package.json
@@ -0,0 +1,84 @@
+{
+  "id": "uni-load-more",
+  "displayName": "uni-load-more 加载更多",
+  "version": "1.3.6",
+  "description": "LoadMore 组件，常用在列表里面，做滚动加载使用。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "加载更多",
+    "load-more"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-load-more/readme.md b/uni_modules/uni-load-more/readme.md
new file mode 100644
index 0000000..54dc1fa
--- /dev/null
+++ b/uni_modules/uni-load-more/readme.md
@@ -0,0 +1,14 @@
+
+
+### LoadMore 加载更多
+> **组件名：uni-load-more**
+> 代码块： `uLoadMore`
+
+
+用于列表中，做滚动加载使用，展示 loading 的各种状态。
+
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-load-more)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md
new file mode 100644
index 0000000..505fc70
--- /dev/null
+++ b/uni_modules/uni-popup/changelog.md
@@ -0,0 +1,90 @@
+## 1.9.6（2025-01-08）
+- 修复 示例中过期图片地址
+## 1.9.5（2024-10-15）
+- 修复 微信小程序中的getSystemInfo警告
+## 1.9.2（2024-09-21）
+- 修复 uni-popup在android上的重复点击弹出位置不正确的bug
+## 1.9.1（2024-04-02）
+- 修复 uni-popup-dialog vue3下使用value无法进行绑定的bug(双向绑定兼容旧写法)
+## 1.9.0（2024-03-28）
+- 修复 uni-popup-dialog 双向绑定时初始化逻辑修正
+## 1.8.9（2024-03-20）
+- 修复 uni-popup-dialog 数据输入时修正为双向绑定
+## 1.8.8（2024-02-20）
+- 修复 uni-popup 在微信小程序下出现文字向上闪动的bug
+## 1.8.7（2024-02-02）
+- 新增 uni-popup-dialog 新增属性focus：input模式下，是否自动自动聚焦
+## 1.8.6（2024-01-30）
+- 新增 uni-popup-dialog 新增属性maxLength:限制输入框字数
+## 1.8.5（2024-01-26）
+- 新增 uni-popup-dialog 新增属性showClose:控制关闭按钮的显示
+## 1.8.4（2023-11-15）
+- 新增 uni-popup 支持uni-app-x 注意暂时仅支持 `maskClick` `@open` `@close`
+## 1.8.3（2023-04-17）
+- 修复 uni-popup 重复打开时的 bug
+## 1.8.2（2023-02-02）
+- uni-popup-dialog 组件新增 inputType 属性
+## 1.8.1（2022-12-01）
+- 修复 nvue 下 v-show 报错
+## 1.8.0（2022-11-29）
+- 优化 主题样式
+## 1.7.9（2022-04-02）
+- 修复 弹出层内部无法滚动的bug
+## 1.7.8（2022-03-28）
+- 修复 小程序中高度错误的bug
+## 1.7.7（2022-03-17）
+- 修复 快速调用open出现问题的Bug
+## 1.7.6（2022-02-14）
+- 修复 safeArea 属性不能设置为false的bug
+## 1.7.5（2022-01-19）
+- 修复 isMaskClick 失效的bug
+## 1.7.4（2022-01-19）
+- 新增 cancelText \ confirmText 属性 ，可自定义文本
+- 新增 maskBackgroundColor 属性 ，可以修改蒙版颜色
+- 优化 maskClick属性 更新为 isMaskClick ，解决微信小程序警告的问题
+## 1.7.3（2022-01-13）
+- 修复 设置 safeArea 属性不生效的bug
+## 1.7.2（2021-11-26）
+- 优化 组件示例
+## 1.7.1（2021-11-26）
+- 修复 vuedoc 文字错误
+## 1.7.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-popup](https://uniapp.dcloud.io/component/uniui/uni-popup)
+## 1.6.2（2021-08-24）
+- 新增 支持国际化
+## 1.6.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.6.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.5.0（2021-06-23）
+- 新增 mask-click 遮罩层点击事件
+## 1.4.5（2021-06-22）
+- 修复 nvue 平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.4（2021-06-18）
+- 修复 H5平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.3（2021-06-08）
+- 修复 错误的 watch 字段
+- 修复 safeArea 属性不生效的问题
+- 修复 点击内容，再点击遮罩无法关闭的Bug
+## 1.4.2（2021-05-12）
+- 新增 组件示例地址
+## 1.4.1（2021-04-29）
+- 修复 组件内放置 input 、textarea 组件，无法聚焦的问题
+## 1.4.0 （2021-04-29）
+- 新增 type 属性的 left\right 值，支持左右弹出
+- 新增 open(String:type) 方法参数 ，可以省略 type 属性 ，直接传入类型打开指定弹窗
+- 新增 backgroundColor 属性，可定义主窗口背景色,默认不显示背景色
+- 新增 safeArea 属性，是否适配底部安全区
+- 修复 App\h5\微信小程序底部安全区占位不对的Bug
+- 修复 App 端弹出等待的Bug
+- 优化 提升低配设备性能，优化动画卡顿问题
+- 优化 更简单的组件自定义方式
+## 1.2.9（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.2.8（2021-02-05）
+- 调整为uni_modules目录规范
+## 1.2.7（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 支持 PC 端
+- 新增 uni-popup-message 、uni-popup-dialog扩展组件支持 PC 端
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js b/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
new file mode 100644
index 0000000..6ef26a2
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    this.$once('hook:beforeDestroy', () => {
+      document.removeEventListener('keyup', listener)
+    })
+  },
+	render: () => {}
+}
+// #endif
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
new file mode 100644
index 0000000..08707d4
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -0,0 +1,316 @@
+<template>
+	<view class="uni-popup-dialog">
+		<view class="uni-dialog-title">
+			<text class="uni-dialog-title-text" :class="['uni-popup__'+dialogType]">{{titleText}}</text>
+		</view>
+		<view v-if="mode === 'base'" class="uni-dialog-content">
+			<slot>
+				<text class="uni-dialog-content-text">{{content}}</text>
+			</slot>
+		</view>
+		<view v-else class="uni-dialog-content">
+			<slot>
+				<input class="uni-dialog-input" :maxlength="maxlength" v-model="val" :type="inputType"
+					:placeholder="placeholderText" :focus="focus">
+			</slot>
+		</view>
+		<view class="uni-dialog-button-group">
+			<view class="uni-dialog-button" v-if="showClose" @click="closeDialog">
+				<text class="uni-dialog-button-text">{{closeText}}</text>
+			</view>
+			<view class="uni-dialog-button" :class="showClose?'uni-border-left':''" @click="onOk">
+				<text class="uni-dialog-button-text uni-button-color">{{okText}}</text>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+	/**
+	 * PopUp 弹出层-对话框样式
+	 * @description 弹出层-对话框样式
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} value input 模式下的默认值
+	 * @property {String} placeholder input 模式下输入提示
+	 * @property {Boolean} focus input模式下是否自动聚焦，默认为true
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} mode = [base|input] 模式、
+	 * 	@value base 基础对话框
+	 * 	@value input 可输入对话框
+	 * @showClose {Boolean} 是否显示关闭按钮
+	 * @property {String} content 对话框内容
+	 * @property {Boolean} beforeClose 是否拦截取消事件
+	 * @property {Number} maxlength 输入
+	 * @event {Function} confirm 点击确认按钮触发
+	 * @event {Function} close 点击取消按钮触发
+	 */
+
+	export default {
+		name: "uniPopupDialog",
+		mixins: [popup],
+		emits: ['confirm', 'close', 'update:modelValue', 'input'],
+		props: {
+			inputType: {
+				type: String,
+				default: 'text'
+			},
+			showClose: {
+				type: Boolean,
+				default: true
+			},
+			// #ifdef VUE2
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				type: [Number, String],
+				default: ''
+			},
+			// #endif
+
+
+			placeholder: {
+				type: [String, Number],
+				default: ''
+			},
+			type: {
+				type: String,
+				default: 'error'
+			},
+			mode: {
+				type: String,
+				default: 'base'
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			content: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			},
+			cancelText: {
+				type: String,
+				default: ''
+			},
+			confirmText: {
+				type: String,
+				default: ''
+			},
+			maxlength: {
+				type: Number,
+				default: -1,
+			},
+			focus: {
+				type: Boolean,
+				default: true,
+			}
+		},
+		data() {
+			return {
+				dialogType: 'error',
+				val: ""
+			}
+		},
+		computed: {
+			okText() {
+				return this.confirmText || t("uni-popup.ok")
+			},
+			closeText() {
+				return this.cancelText || t("uni-popup.cancel")
+			},
+			placeholderText() {
+				return this.placeholder || t("uni-popup.placeholder")
+			},
+			titleText() {
+				return this.title || t("uni-popup.title")
+			}
+		},
+		watch: {
+			type(val) {
+				this.dialogType = val
+			},
+			mode(val) {
+				if (val === 'input') {
+					this.dialogType = 'info'
+				}
+			},
+			value(val) {
+				if (this.maxlength != -1 && this.mode === 'input') {
+					this.val = val.slice(0, this.maxlength);
+				} else {
+					this.val = val
+				}
+			},
+			val(val) {
+				// #ifdef VUE2
+				// TODO 兼容 vue2
+				this.$emit('input', val);
+				// #endif
+				// #ifdef VUE3
+				// TODO　兼容　vue3
+				this.$emit('update:modelValue', val);
+				// #endif
+			}
+		},
+		created() {
+			// 对话框遮罩不可点击
+			this.popup.disableMask()
+			// this.popup.closeMask()
+			if (this.mode === 'input') {
+				this.dialogType = 'info'
+				this.val = this.value;
+				// #ifdef VUE3
+				this.val = this.modelValue;
+				// #endif
+			} else {
+				this.dialogType = this.type
+			}
+		},
+		methods: {
+			/**
+			 * 点击确认按钮
+			 */
+			onOk() {
+				if (this.mode === 'input') {
+					this.$emit('confirm', this.val)
+				} else {
+					this.$emit('confirm')
+				}
+				if (this.beforeClose) return
+				this.popup.close()
+			},
+			/**
+			 * 点击取消按钮
+			 */
+			closeDialog() {
+				this.$emit('close')
+				if (this.beforeClose) return
+				this.popup.close()
+			},
+			close() {
+				this.popup.close()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-popup-dialog {
+		width: 300px;
+		border-radius: 11px;
+		background-color: #fff;
+	}
+
+	.uni-dialog-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 25px;
+	}
+
+	.uni-dialog-title-text {
+		font-size: 16px;
+		font-weight: 500;
+	}
+
+	.uni-dialog-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		padding: 20px;
+	}
+
+	.uni-dialog-content-text {
+		font-size: 14px;
+		color: #6C6C6C;
+	}
+
+	.uni-dialog-button-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		border-top-color: #f5f5f5;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-dialog-button {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+
+		flex: 1;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 45px;
+	}
+
+	.uni-border-left {
+		border-left-color: #f0f0f0;
+		border-left-style: solid;
+		border-left-width: 1px;
+	}
+
+	.uni-dialog-button-text {
+		font-size: 16px;
+		color: #333;
+	}
+
+	.uni-button-color {
+		color: #007aff;
+	}
+
+	.uni-dialog-input {
+		flex: 1;
+		font-size: 14px;
+		border: 1px #eee solid;
+		height: 40px;
+		padding: 0 10px;
+		border-radius: 5px;
+		color: #555;
+	}
+
+	.uni-popup__success {
+		color: #4cd964;
+	}
+
+	.uni-popup__warn {
+		color: #f0ad4e;
+	}
+
+	.uni-popup__error {
+		color: #dd524d;
+	}
+
+	.uni-popup__info {
+		color: #909399;
+	}
+</style>
diff --git a/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue b/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
new file mode 100644
index 0000000..91370a8
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
@@ -0,0 +1,143 @@
+<template>
+	<view class="uni-popup-message">
+		<view class="uni-popup-message__box fixforpc-width" :class="'uni-popup__'+type">
+			<slot>
+				<text class="uni-popup-message-text" :class="'uni-popup__'+type+'-text'">{{message}}</text>
+			</slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	/**
+	 * PopUp 弹出层-消息提示
+	 * @description 弹出层-消息提示
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} message 消息提示文字
+	 * @property {String} duration 显示时间，设置为 0 则不会自动关闭
+	 */
+
+	export default {
+		name: 'uniPopupMessage',
+		mixins:[popup],
+		props: {
+			/**
+			 * 主题 success/warning/info/error	  默认 success
+			 */
+			type: {
+				type: String,
+				default: 'success'
+			},
+			/**
+			 * 消息文字
+			 */
+			message: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 显示时间，设置为 0 则不会自动关闭
+			 */
+			duration: {
+				type: Number,
+				default: 3000
+			},
+			maskShow:{
+				type:Boolean,
+				default:false
+			}
+		},
+		data() {
+			return {}
+		},
+		created() {
+			this.popup.maskShow = this.maskShow
+			this.popup.messageChild = this
+		},
+		methods: {
+			timerClose(){
+				if(this.duration === 0) return
+				clearTimeout(this.timer) 
+				this.timer = setTimeout(()=>{
+					this.popup.close()
+				},this.duration)
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-popup-message {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+	}
+
+	.uni-popup-message__box {
+		background-color: #e1f3d8;
+		padding: 10px 15px;
+		border-color: #eee;
+		border-style: solid;
+		border-width: 1px;
+		flex: 1;
+	}
+
+	@media screen and (min-width: 500px) {
+		.fixforpc-width {
+			margin-top: 20px;
+			border-radius: 4px;
+			flex: none;
+			min-width: 380px;
+			/* #ifndef APP-NVUE */
+			max-width: 50%;
+			/* #endif */
+			/* #ifdef APP-NVUE */
+			max-width: 500px;
+			/* #endif */
+		}
+	}
+
+	.uni-popup-message-text {
+		font-size: 14px;
+		padding: 0;
+	}
+
+	.uni-popup__success {
+		background-color: #e1f3d8;
+	}
+
+	.uni-popup__success-text {
+		color: #67C23A;
+	}
+
+	.uni-popup__warn {
+		background-color: #faecd8;
+	}
+
+	.uni-popup__warn-text {
+		color: #E6A23C;
+	}
+
+	.uni-popup__error {
+		background-color: #fde2e2;
+	}
+
+	.uni-popup__error-text {
+		color: #F56C6C;
+	}
+
+	.uni-popup__info {
+		background-color: #F2F6FC;
+	}
+
+	.uni-popup__info-text {
+		color: #909399;
+	}
+</style>
diff --git a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
new file mode 100644
index 0000000..c8945d5
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
@@ -0,0 +1,188 @@
+<template>
+	<view class="uni-popup-share">
+		<view class="uni-share-title"><text class="uni-share-title-text">{{shareTitleText}}</text></view>
+		<view class="uni-share-content">
+			<view class="uni-share-content-box">
+				<view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index" @click.stop="select(item,index)">
+					<image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
+					<text class="uni-share-text">{{item.text}}</text>
+				</view>
+
+			</view>
+		</view>
+		<view class="uni-share-button-box">
+			<button class="uni-share-button" @click="close">{{cancelText}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	export default {
+		name: 'UniPopupShare',
+		mixins:[popup],
+		emits:['select'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				// TODO 替换为自己的图标
+				bottomData: [{
+						text: '微信',
+						icon: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png',
+						name: 'wx'
+					},
+					{
+						text: '支付宝',
+						icon: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png',
+						name: 'ali'
+					},
+					{
+						text: 'QQ',
+						icon: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png',
+						name: 'qq'
+					},
+					{
+						text: '新浪',
+						icon: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png',
+						name: 'sina'
+					},
+					// {
+					// 	text: '百度',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/1ec6e920-50bf-11eb-8a36-ebb87efcf8c0.png',
+					// 	name: 'copy'
+					// },
+					// {
+					// 	text: '其他',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/2e0fdfe0-50bf-11eb-b997-9918a5dda011.png',
+					// 	name: 'more'
+					// }
+				]
+			}
+		},
+		created() {},
+		computed: {
+			cancelText() {
+				return t("uni-popup.cancel")
+			},
+		shareTitleText() {
+				return this.title || t("uni-popup.shareTitle")
+			}
+		},
+		methods: {
+			/**
+			 * 选择内容
+			 */
+			select(item, index) {
+				this.$emit('select', {
+					item,
+					index
+				})
+				this.close()
+
+			},
+			/**
+			 * 关闭窗口
+			 */
+			close() {
+				if(this.beforeClose) return
+				this.popup.close()
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-popup-share {
+		background-color: #fff;
+		border-top-left-radius: 11px;
+		border-top-right-radius: 11px;
+	}
+	.uni-share-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		height: 40px;
+	}
+	.uni-share-title-text {
+		font-size: 14px;
+		color: #666;
+	}
+	.uni-share-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 10px;
+	}
+
+	.uni-share-content-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: wrap;
+		width: 360px;
+	}
+
+	.uni-share-content-item {
+		width: 90px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		padding: 10px 0;
+		align-items: center;
+	}
+
+	.uni-share-content-item:active {
+		background-color: #f5f5f5;
+	}
+
+	.uni-share-image {
+		width: 30px;
+		height: 30px;
+	}
+
+	.uni-share-text {
+		margin-top: 10px;
+		font-size: 14px;
+		color: #3B4144;
+	}
+
+	.uni-share-button-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		padding: 10px 15px;
+	}
+
+	.uni-share-button {
+		flex: 1;
+		border-radius: 50px;
+		color: #666;
+		font-size: 16px;
+	}
+
+	.uni-share-button::after {
+		border-radius: 50px;
+	}
+</style>
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/en.json b/uni_modules/uni-popup/components/uni-popup/i18n/en.json
new file mode 100644
index 0000000..7f1bd06
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/en.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "cancel",
+	"uni-popup.ok": "ok",
+	"uni-popup.placeholder": "pleace enter",
+	"uni-popup.title": "Hint",
+	"uni-popup.shareTitle": "Share to"
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/index.js b/uni_modules/uni-popup/components/uni-popup/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
new file mode 100644
index 0000000..5e3003c
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "确定",
+	"uni-popup.placeholder": "请输入",
+		"uni-popup.title": "提示",
+		"uni-popup.shareTitle": "分享到"
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
new file mode 100644
index 0000000..13e39eb
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "確定",
+	"uni-popup.placeholder": "請輸入",
+	"uni-popup.title": "提示",
+	"uni-popup.shareTitle": "分享到"
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/keypress.js b/uni_modules/uni-popup/components/uni-popup/keypress.js
new file mode 100644
index 0000000..62dda46
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    // this.$once('hook:beforeDestroy', () => {
+    //   document.removeEventListener('keyup', listener)
+    // })
+  },
+	render: () => {}
+}
+// #endif
diff --git a/uni_modules/uni-popup/components/uni-popup/popup.js b/uni_modules/uni-popup/components/uni-popup/popup.js
new file mode 100644
index 0000000..c4e5781
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/popup.js
@@ -0,0 +1,26 @@
+
+export default {
+	data() {
+		return {
+			
+		}
+	},
+	created(){
+		this.popup = this.getParent()
+	},
+	methods:{
+		/**
+		 * 获取父元素实例
+		 */
+		getParent(name = 'uniPopup') {
+			let parent = this.$parent;
+			let parentName = parent.$options.name;
+			while (parentName !== name) {
+				parent = parent.$parent;
+				if (!parent) return false
+				parentName = parent.$options.name;
+			}
+			return parent;
+		},
+	}
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue b/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
new file mode 100644
index 0000000..5eb8d5b
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
@@ -0,0 +1,90 @@
+<template>
+  <view class="popup-root" v-if="isOpen" v-show="isShow" @click="clickMask">
+    <view @click.stop>
+      <slot></slot>
+    </view>
+  </view>
+</template>
+
+<script>
+  type CloseCallBack = ()=> void;
+  let closeCallBack:CloseCallBack = () :void => {};
+  export default {
+    emits:["close","clickMask"],
+    data() {
+      return {
+        isShow:false,
+        isOpen:false
+      }
+    },
+    props: {
+      maskClick: {
+        type: Boolean,
+        default: true
+      },
+    },
+    watch: {
+      // 设置show = true 时，如果没有 open 需要设置为 open
+      isShow:{
+        handler(isShow) {
+          // console.log("isShow",isShow)
+          if(isShow && this.isOpen == false){
+            this.isOpen = true
+          }
+        },
+        immediate:true
+      },
+      // 设置isOpen = true 时，如果没有 isShow 需要设置为 isShow
+      isOpen:{
+        handler(isOpen) {
+          // console.log("isOpen",isOpen)
+          if(isOpen && this.isShow == false){
+            this.isShow = true
+          }
+        },
+        immediate:true
+      }
+    },
+    methods:{
+      open(){
+        // ...funs : CloseCallBack[]
+        // if(funs.length > 0){
+        //   closeCallBack = funs[0]
+        // }
+        this.isOpen = true;
+      },
+      clickMask(){
+        if(this.maskClick == true){
+          this.$emit('clickMask')
+          this.close()
+        }
+      },
+      close(): void{
+        this.isOpen = false;
+        this.$emit('close')
+        closeCallBack()
+      },
+      hiden(){
+        this.isShow = false
+      },
+      show(){
+        this.isShow = true
+      }
+    }
+  }
+</script>
+
+<style>
+.popup-root {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 750rpx;
+  height: 100%;
+  flex: 1;
+  background-color: rgba(0, 0, 0, 0.3);
+  justify-content: center;
+  align-items: center;
+  z-index: 99;
+}
+</style>
\ No newline at end of file
diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
new file mode 100644
index 0000000..5af55e0
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
@@ -0,0 +1,518 @@
+<template>
+	<view v-if="showPopup" class="uni-popup" :class="[popupstyle, isDesktop ? 'fixforpc-z-index' : '']">
+		<view @touchstart="touchstart">
+			<uni-transition key="1" v-if="maskShow" name="mask" mode-class="fade" :styles="maskClass"
+				:duration="duration" :show="showTrans" @click="onTap" />
+			<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration"
+				:show="showTrans" @click="onTap">
+				<view class="uni-popup__wrapper" :style="getStyles" :class="[popupstyle]" @click="clear">
+					<slot />
+				</view>
+			</uni-transition>
+		</view>
+		<!-- #ifdef H5 -->
+		<keypress v-if="maskShow" @esc="onTap" />
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import keypress from './keypress.js'
+	// #endif
+
+	/**
+	 * PopUp 弹出层
+	 * @description 弹出层组件，为了解决遮罩弹层的问题
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [top|center|bottom|left|right|message|dialog|share] 弹出方式
+	 * 	@value top 顶部弹出
+	 * 	@value center 中间弹出
+	 * 	@value bottom 底部弹出
+	 * 	@value left		左侧弹出
+	 * 	@value right  右侧弹出
+	 * 	@value message 消息提示
+	 * 	@value dialog 对话框
+	 * 	@value share 底部分享示例
+	 * @property {Boolean} animation = [true|false] 是否开启动画
+	 * @property {Boolean} maskClick = [true|false] 蒙版点击是否关闭弹窗(废弃)
+	 * @property {Boolean} isMaskClick = [true|false] 蒙版点击是否关闭弹窗
+	 * @property {String}  backgroundColor 主窗口背景色
+	 * @property {String}  maskBackgroundColor 蒙版颜色
+	 * @property {String}  borderRadius 设置圆角(左上、右上、右下和左下) 示例:"10px 10px 10px 10px"
+	 * @property {Boolean} safeArea		   是否适配底部安全区
+	 * @event {Function} change 打开关闭弹窗触发，e={show: false}
+	 * @event {Function} maskClick 点击遮罩触发
+	 */
+
+	export default {
+		name: 'uniPopup',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
+		},
+		emits: ['change', 'maskClick'],
+		props: {
+			// 开启动画
+			animation: {
+				type: Boolean,
+				default: true
+			},
+			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+			// message: 消息提示 ; dialog : 对话框
+			type: {
+				type: String,
+				default: 'center'
+			},
+			// maskClick
+			isMaskClick: {
+				type: Boolean,
+				default: null
+			},
+			// TODO 2 个版本后废弃属性 ，使用 isMaskClick
+			maskClick: {
+				type: Boolean,
+				default: null
+			},
+			backgroundColor: {
+				type: String,
+				default: 'none'
+			},
+			safeArea: {
+				type: Boolean,
+				default: true
+			},
+			maskBackgroundColor: {
+				type: String,
+				default: 'rgba(0, 0, 0, 0.4)'
+			},
+			borderRadius:{
+				type: String,
+			}
+		},
+
+		watch: {
+			/**
+			 * 监听type类型
+			 */
+			type: {
+				handler: function(type) {
+					if (!this.config[type]) return
+					this[this.config[type]](true)
+				},
+				immediate: true
+			},
+			isDesktop: {
+				handler: function(newVal) {
+					if (!this.config[newVal]) return
+					this[this.config[this.type]](true)
+				},
+				immediate: true
+			},
+			/**
+			 * 监听遮罩是否可点击
+			 * @param {Object} val
+			 */
+			maskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			isMaskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			// H5 下禁止底部滚动
+			showPopup(show) {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'
+				// #endif
+			}
+		},
+		data() {
+			return {
+				duration: 300,
+				ani: [],
+				showPopup: false,
+				showTrans: false,
+				popupWidth: 0,
+				popupHeight: 0,
+				config: {
+					top: 'top',
+					bottom: 'bottom',
+					center: 'center',
+					left: 'left',
+					right: 'right',
+					message: 'top',
+					dialog: 'center',
+					share: 'bottom'
+				},
+				maskClass: {
+					position: 'fixed',
+					bottom: 0,
+					top: 0,
+					left: 0,
+					right: 0,
+					backgroundColor: 'rgba(0, 0, 0, 0.4)'
+				},
+				transClass: {
+					backgroundColor: 'transparent',
+					borderRadius: this.borderRadius || "0",
+					position: 'fixed',
+					left: 0,
+					right: 0
+				},
+				maskShow: true,
+				mkclick: true,
+				popupstyle: 'top'
+			}
+		},
+		computed: {
+			getStyles() {
+				let res = { backgroundColor: this.bg };
+				if (this.borderRadius || "0") {
+					res = Object.assign(res, { borderRadius: this.borderRadius })
+				}
+				return res;
+			},
+			isDesktop() {
+				return this.popupWidth >= 500 && this.popupHeight >= 500
+			},
+			bg() {
+				if (this.backgroundColor === '' || this.backgroundColor === 'none') {
+					return 'transparent'
+				}
+				return this.backgroundColor
+			}
+		},
+		mounted() {
+			const fixSize = () => {
+				// #ifdef MP-WEIXIN
+				const {
+					windowWidth,
+					windowHeight,
+					windowTop,
+					safeArea,
+					screenHeight,
+					safeAreaInsets
+				} = uni.getWindowInfo()
+				// #endif
+				// #ifndef MP-WEIXIN
+				const {
+					windowWidth,
+					windowHeight,
+					windowTop,
+					safeArea,
+					screenHeight,
+					safeAreaInsets
+				} = uni.getSystemInfoSync()
+				// #endif
+				this.popupWidth = windowWidth
+				this.popupHeight = windowHeight + (windowTop || 0)
+				// TODO fix by mehaotian 是否适配底部安全区 ,目前微信ios 、和 app ios 计算有差异，需要框架修复
+				if (safeArea && this.safeArea) {
+					// #ifdef MP-WEIXIN
+					this.safeAreaInsets = screenHeight - safeArea.bottom
+					// #endif
+					// #ifndef MP-WEIXIN
+					this.safeAreaInsets = safeAreaInsets.bottom
+					// #endif
+				} else {
+					this.safeAreaInsets = 0
+				}
+			}
+			fixSize()
+			// #ifdef H5
+			// window.addEventListener('resize', fixSize)
+			// this.$once('hook:beforeDestroy', () => {
+			// 	window.removeEventListener('resize', fixSize)
+			// })
+			// #endif
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			this.setH5Visible()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.setH5Visible()
+		},
+		// #endif
+		activated() {
+   	  this.setH5Visible(!this.showPopup);
+    },
+    deactivated() {
+      this.setH5Visible(true);
+    },
+		created() {
+			// this.mkclick =  this.isMaskClick || this.maskClick
+			if (this.isMaskClick === null && this.maskClick === null) {
+				this.mkclick = true
+			} else {
+				this.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick
+			}
+			if (this.animation) {
+				this.duration = 300
+			} else {
+				this.duration = 0
+			}
+			// TODO 处理 message 组件生命周期异常的问题
+			this.messageChild = null
+			// TODO 解决头条冒泡的问题
+			this.clearPropagation = false
+			this.maskClass.backgroundColor = this.maskBackgroundColor
+		},
+		methods: {
+			setH5Visible(visible = true) {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow =  visible ? "visible" : "hidden";
+				// #endif
+			},
+			/**
+			 * 公用方法，不显示遮罩层
+			 */
+			closeMask() {
+				this.maskShow = false
+			},
+			/**
+			 * 公用方法，遮罩层禁止点击
+			 */
+			disableMask() {
+				this.mkclick = false
+			},
+			// TODO nvue 取消冒泡
+			clear(e) {
+				// #ifndef APP-NVUE
+				e.stopPropagation()
+				// #endif
+				this.clearPropagation = true
+			},
+
+			open(direction) {
+				// fix by mehaotian 处理快速打开关闭的情况
+				if (this.showPopup) {
+					return
+				}
+				let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
+				if (!(direction && innerType.indexOf(direction) !== -1)) {
+					direction = this.type
+				}
+				if (!this.config[direction]) {
+					console.error('缺少类型：', direction)
+					return
+				}
+				this[this.config[direction]]()
+				this.$emit('change', {
+					show: true,
+					type: direction
+				})
+			},
+			close(type) {
+				this.showTrans = false
+				this.$emit('change', {
+					show: false,
+					type: this.type
+				})
+				clearTimeout(this.timer)
+				// // 自定义关闭事件
+				// this.customOpen && this.customClose()
+				this.timer = setTimeout(() => {
+					this.showPopup = false
+				}, 300)
+			},
+			// TODO 处理冒泡事件，头条的冒泡事件有问题 ，先这样兼容
+			touchstart() {
+				this.clearPropagation = false
+			},
+
+			onTap() {
+				if (this.clearPropagation) {
+					// fix by mehaotian 兼容 nvue
+					this.clearPropagation = false
+					return
+				}
+				this.$emit('maskClick')
+				if (!this.mkclick) return
+				this.close()
+			},
+			/**
+			 * 顶部弹出样式处理
+			 */
+			top(type) {
+				this.popupstyle = this.isDesktop ? 'fixforpc-top' : 'top'
+				this.ani = ['slide-top']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0"
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+				this.$nextTick(() => {
+					this.showPoptrans()
+					if (this.messageChild && this.type === 'message') {
+						this.messageChild.timerClose()
+					}
+				})
+			},
+			/**
+			 * 底部弹出样式处理
+			 */
+			bottom(type) {
+				this.popupstyle = 'bottom'
+				this.ani = ['slide-bottom']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					bottom: 0,
+					paddingBottom: this.safeAreaInsets + 'px',
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0",
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPoptrans()
+			},
+			/**
+			 * 中间弹出样式处理
+			 */
+			center(type) {
+				this.popupstyle = 'center'
+				//微信小程序下，组合动画会出现文字向上闪动问题，再此做特殊处理
+				// #ifdef MP-WEIXIN
+					this.ani = ['fade']
+				// #endif
+				// #ifndef MP-WEIXIN
+					this.ani = ['zoom-out', 'fade']
+				// #endif
+				this.transClass = {
+					position: 'fixed',
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column',
+					/* #endif */
+					bottom: 0,
+					left: 0,
+					right: 0,
+					top: 0,
+					justifyContent: 'center',
+					alignItems: 'center',
+					borderRadius:this.borderRadius || "0"
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPoptrans()
+			},
+			left(type) {
+				this.popupstyle = 'left'
+				this.ani = ['slide-left']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					bottom: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0",
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPoptrans()
+			},
+			right(type) {
+				this.popupstyle = 'right'
+				this.ani = ['slide-right']
+				this.transClass = {
+					position: 'fixed',
+					bottom: 0,
+					right: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0",
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPoptrans()
+			},
+			showPoptrans(){
+				this.$nextTick(()=>{
+					this.showPopup = true
+					this.showTrans = true
+				})
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	.uni-popup {
+		position: fixed;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+
+		/* #endif */
+		&.top,
+		&.left,
+		&.right {
+			/* #ifdef H5 */
+			top: var(--window-top);
+			/* #endif */
+			/* #ifndef H5 */
+			top: 0;
+			/* #endif */
+		}
+
+		.uni-popup__wrapper {
+			/* #ifndef APP-NVUE */
+			display: block;
+			/* #endif */
+			position: relative;
+
+			/* iphonex 等安全区设置，底部安全区适配 */
+			/* #ifndef APP-NVUE */
+			// padding-bottom: constant(safe-area-inset-bottom);
+			// padding-bottom: env(safe-area-inset-bottom);
+			/* #endif */
+			&.left,
+			&.right {
+				/* #ifdef H5 */
+				padding-top: var(--window-top);
+				/* #endif */
+				/* #ifndef H5 */
+				padding-top: 0;
+				/* #endif */
+				flex: 1;
+			}
+		}
+	}
+
+	.fixforpc-z-index {
+		/* #ifndef APP-NVUE */
+		z-index: 999;
+		/* #endif */
+	}
+
+	.fixforpc-top {
+		top: 0;
+	}
+</style>
diff --git a/uni_modules/uni-popup/package.json b/uni_modules/uni-popup/package.json
new file mode 100644
index 0000000..da485a4
--- /dev/null
+++ b/uni_modules/uni-popup/package.json
@@ -0,0 +1,90 @@
+{
+	"id": "uni-popup",
+	"displayName": "uni-popup 弹出层",
+	"version": "1.9.6",
+	"description": " Popup 组件，提供常用的弹层",
+	"keywords": [
+        "uni-ui",
+        "弹出层",
+        "弹窗",
+        "popup",
+        "弹框"
+    ],
+	"repository": "https://github.com/dcloudio/uni-ui",
+	"engines": {
+		"HBuilderX": ""
+	},
+	"directories": {
+		"example": "../../temps/example_temps"
+	},
+    "dcloudext": {
+        "sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+        "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+        "type": "component-vue"
+	},
+	"uni_modules": {
+		"dependencies": [
+			"uni-scss",
+			"uni-transition"
+		],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+                "aliyun": "y",
+                "alipay": "n"
+			},
+			"client": {
+				"App": {
+                    "app-vue": "y",
+                    "app-nvue": "y",
+                    "app-harmony": "u",
+                    "app-uvue": "u"
+                },
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "y",
+					"IE": "y",
+					"Edge": "y",
+					"Firefox": "y",
+					"Safari": "y"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "y",
+					"百度": "y",
+					"字节跳动": "y",
+					"QQ": "y"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+                },
+                "Vue": {
+                    "vue2": "y",
+                    "vue3": "y"
+                }
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-popup/readme.md b/uni_modules/uni-popup/readme.md
new file mode 100644
index 0000000..fdad4b3
--- /dev/null
+++ b/uni_modules/uni-popup/readme.md
@@ -0,0 +1,17 @@
+
+
+## Popup 弹出层
+> **组件名：uni-popup**
+> 代码块： `uPopup`
+> 关联组件：`uni-transition`
+
+
+弹出层组件，在应用中弹出一个消息提示窗口、提示框等
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-popup)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
+
+
+
diff --git a/uni_modules/uni-scss/changelog.md b/uni_modules/uni-scss/changelog.md
new file mode 100644
index 0000000..b863bb0
--- /dev/null
+++ b/uni_modules/uni-scss/changelog.md
@@ -0,0 +1,8 @@
+## 1.0.3（2022-01-21）
+- 优化 组件示例
+## 1.0.2（2021-11-22）
+- 修复 / 符号在 vue 不同版本兼容问题引起的报错问题
+## 1.0.1（2021-11-22）
+- 修复 vue3中scss语法兼容问题
+## 1.0.0（2021-11-18）
+- init
diff --git a/uni_modules/uni-scss/index.scss b/uni_modules/uni-scss/index.scss
new file mode 100644
index 0000000..1744a5f
--- /dev/null
+++ b/uni_modules/uni-scss/index.scss
@@ -0,0 +1 @@
+@import './styles/index.scss';
diff --git a/uni_modules/uni-scss/package.json b/uni_modules/uni-scss/package.json
new file mode 100644
index 0000000..7cc0ccb
--- /dev/null
+++ b/uni_modules/uni-scss/package.json
@@ -0,0 +1,82 @@
+{
+  "id": "uni-scss",
+  "displayName": "uni-scss 辅助样式",
+  "version": "1.0.3",
+  "description": "uni-sass是uni-ui提供的一套全局样式 ，通过一些简单的类名和sass变量，实现简单的页面布局操作，比如颜色、边距、圆角等。",
+  "keywords": [
+    "uni-scss",
+    "uni-ui",
+    "辅助样式"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "JS SDK",
+        "通用 SDK"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "n",
+          "联盟": "n"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-scss/readme.md b/uni_modules/uni-scss/readme.md
new file mode 100644
index 0000000..b7d1c25
--- /dev/null
+++ b/uni_modules/uni-scss/readme.md
@@ -0,0 +1,4 @@
+`uni-sass` 是 `uni-ui`提供的一套全局样式 ，通过一些简单的类名和`sass`变量，实现简单的页面布局操作，比如颜色、边距、圆角等。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-sass)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/index.scss b/uni_modules/uni-scss/styles/index.scss
new file mode 100644
index 0000000..ffac4fe
--- /dev/null
+++ b/uni_modules/uni-scss/styles/index.scss
@@ -0,0 +1,7 @@
+@import './setting/_variables.scss';
+@import './setting/_border.scss';
+@import './setting/_color.scss';
+@import './setting/_space.scss';
+@import './setting/_radius.scss';
+@import './setting/_text.scss';
+@import './setting/_styles.scss';
diff --git a/uni_modules/uni-scss/styles/setting/_border.scss b/uni_modules/uni-scss/styles/setting/_border.scss
new file mode 100644
index 0000000..12a11c3
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_border.scss
@@ -0,0 +1,3 @@
+.uni-border {
+	border: 1px $uni-border-1 solid;
+}
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/setting/_color.scss b/uni_modules/uni-scss/styles/setting/_color.scss
new file mode 100644
index 0000000..1ededd9
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_color.scss
@@ -0,0 +1,66 @@
+
+// TODO 暂时不需要 class ，需要用户使用变量实现 ，如果使用类名其实并不推荐
+// @mixin get-styles($k,$c) {
+// 	@if $k == size or $k == weight{
+// 		font-#{$k}:#{$c}
+// 	}@else{
+// 		#{$k}:#{$c}
+// 	}
+// }
+$uni-ui-color:(
+	// 主色
+	primary: $uni-primary,
+	primary-disable: $uni-primary-disable,
+	primary-light: $uni-primary-light,
+	// 辅助色
+	success: $uni-success,
+	success-disable: $uni-success-disable,
+	success-light: $uni-success-light,
+	warning: $uni-warning,
+	warning-disable: $uni-warning-disable,
+	warning-light: $uni-warning-light,
+	error: $uni-error,
+	error-disable: $uni-error-disable,
+	error-light: $uni-error-light,
+	info: $uni-info,
+	info-disable: $uni-info-disable,
+	info-light: $uni-info-light,
+	// 中性色
+	main-color: $uni-main-color,
+	base-color: $uni-base-color,
+	secondary-color: $uni-secondary-color,
+	extra-color: $uni-extra-color,
+	// 背景色
+	bg-color: $uni-bg-color,
+	// 边框颜色
+	border-1: $uni-border-1,
+	border-2: $uni-border-2,
+	border-3: $uni-border-3,
+	border-4: $uni-border-4,
+	// 黑色
+	black:$uni-black,
+	// 白色
+	white:$uni-white,
+	// 透明
+	transparent:$uni-transparent
+) !default;
+@each $key, $child in $uni-ui-color {
+	.uni-#{"" + $key} {
+		color: $child;
+	}
+	.uni-#{"" + $key}-bg {
+		background-color: $child;
+	}
+}
+.uni-shadow-sm {
+	box-shadow: $uni-shadow-sm;
+}
+.uni-shadow-base {
+	box-shadow: $uni-shadow-base;
+}
+.uni-shadow-lg {
+	box-shadow: $uni-shadow-lg;
+}
+.uni-mask {
+	background-color:$uni-mask;
+}
diff --git a/uni_modules/uni-scss/styles/setting/_radius.scss b/uni_modules/uni-scss/styles/setting/_radius.scss
new file mode 100644
index 0000000..9a0428b
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_radius.scss
@@ -0,0 +1,55 @@
+@mixin radius($r,$d:null ,$important: false){
+  $radius-value:map-get($uni-radius, $r) if($important, !important, null);
+  // Key exists within the $uni-radius variable
+  @if (map-has-key($uni-radius, $r) and  $d){
+		@if $d == t {
+				border-top-left-radius:$radius-value;
+				border-top-right-radius:$radius-value;
+		}@else if $d == r {
+				border-top-right-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == b {
+				border-bottom-left-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == l {
+				border-top-left-radius:$radius-value;
+				border-bottom-left-radius:$radius-value;
+		}@else if $d == tl {
+				border-top-left-radius:$radius-value;
+		}@else if $d == tr {
+				border-top-right-radius:$radius-value;
+		}@else if $d == br {
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == bl {
+				border-bottom-left-radius:$radius-value;
+		}
+  }@else{
+		border-radius:$radius-value;
+  }
+}
+
+@each $key, $child in $uni-radius {
+	@if($key){
+		.uni-radius-#{"" + $key} {
+				@include radius($key)
+		}
+	}@else{
+		.uni-radius {
+				@include radius($key)
+		}
+	}
+}
+
+@each $direction in t, r, b, l,tl, tr, br, bl {
+	@each $key, $child in $uni-radius {
+		@if($key){
+			.uni-radius-#{"" + $direction}-#{"" + $key} {
+				@include radius($key,$direction,false)
+			}
+		}@else{
+			.uni-radius-#{$direction} {
+				@include radius($key,$direction,false)
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-scss/styles/setting/_space.scss b/uni_modules/uni-scss/styles/setting/_space.scss
new file mode 100644
index 0000000..3c89528
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_space.scss
@@ -0,0 +1,56 @@
+
+@mixin fn($space,$direction,$size,$n) {
+	@if $n {
+		#{$space}-#{$direction}: #{$size*$uni-space-root}px
+	} @else {
+		 #{$space}-#{$direction}: #{-$size*$uni-space-root}px
+	}
+}
+@mixin get-styles($direction,$i,$space,$n){
+	@if $direction == t {
+		@include fn($space, top,$i,$n);
+	} 
+	@if $direction == r {
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == b {
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == l {
+	 @include fn($space, left,$i,$n);
+	} 
+	@if $direction == x {
+		@include fn($space, left,$i,$n);
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == y {
+		@include fn($space, top,$i,$n);
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == a {
+		@if $n {
+			#{$space}:#{$i*$uni-space-root}px;
+		} @else {
+			#{$space}:#{-$i*$uni-space-root}px;
+		}
+	} 
+}
+
+@each $orientation in m,p {
+	$space: margin;
+	@if $orientation == m {
+		$space: margin;
+	} @else {
+		$space: padding;
+	}
+	@for $i from 0 through 16 {
+		@each $direction in t, r, b, l, x, y, a {
+			.uni-#{$orientation}#{$direction}-#{$i} { 
+				@include  get-styles($direction,$i,$space,true);
+			} 
+			.uni-#{$orientation}#{$direction}-n#{$i} { 
+				@include  get-styles($direction,$i,$space,false);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/setting/_styles.scss b/uni_modules/uni-scss/styles/setting/_styles.scss
new file mode 100644
index 0000000..689afec
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_styles.scss
@@ -0,0 +1,167 @@
+/* #ifndef APP-NVUE */
+
+$-color-white:#fff;
+$-color-black:#000;
+@mixin base-style($color) {
+	color: #fff;
+	background-color: $color;
+	border-color: mix($-color-black, $color, 8%);
+	&:not([hover-class]):active {
+		background: mix($-color-black, $color, 10%);
+		border-color: mix($-color-black, $color, 20%);
+		color: $-color-white;
+		outline: none;
+	}
+}
+@mixin is-color($color) {
+	@include base-style($color);
+	&[loading] {
+		@include base-style($color);
+		&::before {
+			margin-right:5px;
+		}
+	}
+	&[disabled] {
+	  &,
+		&[loading],
+	  &:not([hover-class]):active {
+	    color: $-color-white;
+			border-color: mix(darken($color,10%), $-color-white);
+	    background-color: mix($color, $-color-white);
+	  }
+	}
+
+}
+@mixin base-plain-style($color) {
+	color:$color;
+	background-color: mix($-color-white, $color, 90%);
+	border-color: mix($-color-white, $color, 70%);
+	&:not([hover-class]):active {
+	  background: mix($-color-white, $color, 80%);
+	  color: $color;
+	  outline: none;
+		border-color: mix($-color-white, $color, 50%);
+	}
+}
+@mixin is-plain($color){
+	&[plain] {
+		@include base-plain-style($color);
+		&[loading] {
+			@include base-plain-style($color);
+			&::before {
+				margin-right:5px;
+			}
+		}
+		&[disabled] {
+		  &,
+		  &:active {
+		    color: mix($-color-white, $color, 40%);
+		    background-color: mix($-color-white, $color, 90%);
+				border-color: mix($-color-white, $color, 80%);
+		  }
+		}
+	}
+}
+
+
+.uni-btn {
+	margin: 5px;
+	color: #393939;
+	border:1px solid #ccc;
+	font-size: 16px;
+	font-weight: 200;
+	background-color: #F9F9F9;
+	// TODO 暂时处理边框隐藏一边的问题
+	overflow: visible;
+	&::after{
+		border: none;
+	}
+
+	&:not([type]),&[type=default] {
+		color: #999;
+		&[loading] {
+			background: none;
+			&::before {
+				margin-right:5px;
+			}
+		}
+
+
+
+		&[disabled]{
+			color: mix($-color-white, #999, 60%);
+		  &,
+			&[loading],
+		  &:active {
+				color: mix($-color-white, #999, 60%);
+		    background-color: mix($-color-white,$-color-black , 98%);
+				border-color: mix($-color-white,  #999, 85%);
+		  }
+		}
+
+		&[plain] {
+			color: #999;
+			background: none;
+			border-color: $uni-border-1;
+			&:not([hover-class]):active {
+				background: none;
+			  color: mix($-color-white, $-color-black, 80%);
+				border-color: mix($-color-white, $-color-black, 90%);
+			  outline: none;
+			}
+			&[disabled]{
+			  &,
+				&[loading],
+			  &:active {
+			    background: none;
+					color: mix($-color-white, #999, 60%);
+					border-color: mix($-color-white,  #999, 85%);
+			  }
+			}
+		}
+	}
+
+	&:not([hover-class]):active {
+	  color: mix($-color-white, $-color-black, 50%);
+	}
+
+	&[size=mini] {
+		font-size: 16px;
+		font-weight: 200;
+		border-radius: 8px;
+	}
+
+
+
+	&.uni-btn-small {
+		font-size: 14px;
+	}
+	&.uni-btn-mini {
+		font-size: 12px;
+	}
+
+	&.uni-btn-radius {
+		border-radius: 999px;
+	}
+	&[type=primary] {
+		@include is-color($uni-primary);
+		@include is-plain($uni-primary)
+	}
+	&[type=success] {
+		@include is-color($uni-success);
+		@include is-plain($uni-success)
+	}
+	&[type=error] {
+		@include is-color($uni-error);
+		@include is-plain($uni-error)
+	}
+	&[type=warning] {
+		@include is-color($uni-warning);
+		@include is-plain($uni-warning)
+	}
+	&[type=info] {
+		@include is-color($uni-info);
+		@include is-plain($uni-info)
+	}
+}
+/* #endif */
diff --git a/uni_modules/uni-scss/styles/setting/_text.scss b/uni_modules/uni-scss/styles/setting/_text.scss
new file mode 100644
index 0000000..a34d08f
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_text.scss
@@ -0,0 +1,24 @@
+@mixin get-styles($k,$c) {
+	@if $k == size or $k == weight{
+		font-#{$k}:#{$c}
+	}@else{
+		#{$k}:#{$c}
+	}
+}
+
+@each $key, $child in $uni-headings {
+	/* #ifndef APP-NVUE */
+	.uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	.container .uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+}
diff --git a/uni_modules/uni-scss/styles/setting/_variables.scss b/uni_modules/uni-scss/styles/setting/_variables.scss
new file mode 100644
index 0000000..557d3d7
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_variables.scss
@@ -0,0 +1,146 @@
+// @use "sass:math";
+@import  '../tools/functions.scss';
+// 间距基础倍数
+$uni-space-root: 2 !default;
+// 边框半径默认值
+$uni-radius-root:5px !default;
+$uni-radius: () !default;
+// 边框半径断点
+$uni-radius: map-deep-merge(
+  (
+    0: 0,
+		// TODO 当前版本暂时不支持 sm 属性
+    // 'sm': math.div($uni-radius-root, 2),
+    null: $uni-radius-root,
+    'lg': $uni-radius-root * 2,
+    'xl': $uni-radius-root * 6,
+    'pill': 9999px,
+    'circle': 50%
+  ),
+  $uni-radius
+);
+// 字体家族
+$body-font-family: 'Roboto', sans-serif !default;
+// 文本
+$heading-font-family: $body-font-family !default;
+$uni-headings: () !default;
+$letterSpacing: -0.01562em;
+$uni-headings: map-deep-merge(
+  (
+    'h1': (
+      size: 32px,
+			weight: 300,
+			line-height: 50px,
+			// letter-spacing:-0.01562em
+    ),
+    'h2': (
+      size: 28px,
+      weight: 300,
+      line-height: 40px,
+      // letter-spacing: -0.00833em
+    ),
+    'h3': (
+      size: 24px,
+      weight: 400,
+      line-height: 32px,
+      // letter-spacing: normal
+    ),
+    'h4': (
+      size: 20px,
+      weight: 400,
+      line-height: 30px,
+      // letter-spacing: 0.00735em
+    ),
+    'h5': (
+      size: 16px,
+      weight: 400,
+      line-height: 24px,
+      // letter-spacing: normal
+    ),
+    'h6': (
+      size: 14px,
+      weight: 500,
+      line-height: 18px,
+      // letter-spacing: 0.0125em
+    ),
+    'subtitle': (
+      size: 12px,
+      weight: 400,
+      line-height: 20px,
+      // letter-spacing: 0.00937em
+    ),
+    'body': (
+      font-size: 14px,
+			font-weight: 400,
+			line-height: 22px,
+			// letter-spacing: 0.03125em
+    ),
+    'caption': (
+      'size': 12px,
+      'weight': 400,
+      'line-height': 20px,
+      // 'letter-spacing': 0.03333em,
+      // 'text-transform': false
+    )
+  ),
+  $uni-headings
+);
+
+
+
+// 主色
+$uni-primary: #2979ff !default;
+$uni-primary-disable:lighten($uni-primary,20%) !default;
+$uni-primary-light: lighten($uni-primary,25%) !default;
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37 !default;
+$uni-success-disable:lighten($uni-success,20%) !default;
+$uni-success-light: lighten($uni-success,25%) !default;
+
+$uni-warning: #f3a73f !default;
+$uni-warning-disable:lighten($uni-warning,20%) !default;
+$uni-warning-light: lighten($uni-warning,25%) !default;
+
+$uni-error: #e43d33 !default;
+$uni-error-disable:lighten($uni-error,20%) !default;
+$uni-error-light: lighten($uni-error,25%) !default;
+
+$uni-info: #8f939c !default;
+$uni-info-disable:lighten($uni-info,20%) !default;
+$uni-info-light: lighten($uni-info,25%) !default;
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a !default; 			// 主要文字
+$uni-base-color: #6a6a6a !default;			// 常规文字
+$uni-secondary-color: #909399 !default;	// 次要文字
+$uni-extra-color: #c7c7c7 !default;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0 !default;
+$uni-border-2: #EDEDED !default;
+$uni-border-3: #DCDCDC !default;
+$uni-border-4: #B9B9B9 !default;
+
+// 常规色
+$uni-black: #000000 !default;
+$uni-white: #ffffff !default;
+$uni-transparent: rgba($color: #000000, $alpha: 0) !default;
+
+// 背景色
+$uni-bg-color: #f7f7f7 !default;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px !default;
+$uni-spacing-base: 15px !default;
+$uni-spacing-lg: 30px !default;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5) !default;
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5) !default;
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4) !default;
diff --git a/uni_modules/uni-scss/styles/tools/functions.scss b/uni_modules/uni-scss/styles/tools/functions.scss
new file mode 100644
index 0000000..ac6f63e
--- /dev/null
+++ b/uni_modules/uni-scss/styles/tools/functions.scss
@@ -0,0 +1,19 @@
+// 合并 map
+@function map-deep-merge($parent-map, $child-map){
+	$result: $parent-map;
+	@each $key, $child in $child-map {
+		$parent-has-key: map-has-key($result, $key);
+		$parent-value: map-get($result, $key);
+		$parent-type: type-of($parent-value);
+		$child-type: type-of($child);
+		$parent-is-map: $parent-type == map;
+		$child-is-map: $child-type == map;
+			
+		@if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){
+			$result: map-merge($result, ( $key: $child ));
+		}@else {
+			$result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) ));
+		}
+	}
+	@return $result;
+};
diff --git a/uni_modules/uni-scss/theme.scss b/uni_modules/uni-scss/theme.scss
new file mode 100644
index 0000000..80ee62f
--- /dev/null
+++ b/uni_modules/uni-scss/theme.scss
@@ -0,0 +1,31 @@
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+// 主色
+$uni-primary: #2979ff;
+// 辅助色
+$uni-success: #4cd964;
+// 警告色
+$uni-warning: #f0ad4e;
+// 错误色
+$uni-error: #dd524d;
+// 描述色
+$uni-info: #909399;
+// 中性色
+$uni-main-color: #303133;
+$uni-base-color: #606266;
+$uni-secondary-color: #909399;
+$uni-extra-color: #C0C4CC;
+// 背景色
+$uni-bg-color: #f5f5f5;
+// 边框颜色
+$uni-border-1: #DCDFE6;
+$uni-border-2: #E4E7ED;
+$uni-border-3: #EBEEF5;
+$uni-border-4: #F2F6FC;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
diff --git a/uni_modules/uni-scss/variables.scss b/uni_modules/uni-scss/variables.scss
new file mode 100644
index 0000000..1c062d4
--- /dev/null
+++ b/uni_modules/uni-scss/variables.scss
@@ -0,0 +1,62 @@
+@import './styles/setting/_variables.scss';
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+
+// 主色
+$uni-primary: #2979ff;
+$uni-primary-disable:mix(#fff,$uni-primary,50%);
+$uni-primary-light: mix(#fff,$uni-primary,80%);
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37;
+$uni-success-disable:mix(#fff,$uni-success,50%);
+$uni-success-light: mix(#fff,$uni-success,80%);
+
+$uni-warning: #f3a73f;
+$uni-warning-disable:mix(#fff,$uni-warning,50%);
+$uni-warning-light: mix(#fff,$uni-warning,80%);
+
+$uni-error: #e43d33;
+$uni-error-disable:mix(#fff,$uni-error,50%);
+$uni-error-light: mix(#fff,$uni-error,80%);
+
+$uni-info: #8f939c;
+$uni-info-disable:mix(#fff,$uni-info,50%);
+$uni-info-light: mix(#fff,$uni-info,80%);
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a; 			// 主要文字
+$uni-base-color: #6a6a6a;			// 常规文字
+$uni-secondary-color: #909399;	// 次要文字
+$uni-extra-color: #c7c7c7;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0;
+$uni-border-2: #EDEDED;
+$uni-border-3: #DCDCDC;
+$uni-border-4: #B9B9B9;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
+
+// 背景色
+$uni-bg-color: #f7f7f7;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px;
+$uni-spacing-base: 15px;
+$uni-spacing-lg: 30px;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5);
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2);
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5);
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4);
diff --git a/uni_modules/uni-segmented-control/changelog.md b/uni_modules/uni-segmented-control/changelog.md
new file mode 100644
index 0000000..02d0c8a
--- /dev/null
+++ b/uni_modules/uni-segmented-control/changelog.md
@@ -0,0 +1,15 @@
+## 1.2.3（2024-04-02）
+- 修复 修复在微信小程序下inactiveColor失效bug
+## 1.2.2（2024-03-28）
+- 修复 在vue2下:style动态绑定导致编译失败的bug
+## 1.2.1（2024-03-20）
+- 新增 inActiveColor属性，可供配置未激活时的颜色
+## 1.2.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-segmented-control](https://uniapp.dcloud.io/component/uniui/uni-segmented-control)
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.5（2021-05-12）
+- 新增 项目示例地址
+## 1.0.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue b/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue
new file mode 100644
index 0000000..a69366a
--- /dev/null
+++ b/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue
@@ -0,0 +1,146 @@
+<template>
+	<view :class="[styleType === 'text'?'segmented-control--text' : 'segmented-control--button' ]"
+		:style="{ borderColor: styleType === 'text' ? '' : activeColor }" class="segmented-control">
+		<view v-for="(item, index) in values" :class="[styleType === 'text' ? '' : 'segmented-control__item--button',
+					index === 0 && styleType === 'button' ? 'segmented-control__item--button--first' : '',
+					index === values.length - 1 && styleType === 'button' ? 'segmented-control__item--button--last':'']" :key="index"
+			:style="{backgroundColor: index === currentIndex && styleType === 'button' ? activeColor : styleType === 'button' ?inActiveColor:'transparent', borderColor: index === currentIndex && styleType === 'text' || styleType === 'button' ? activeColor : inActiveColor}"
+			class="segmented-control__item" @click="_onClick(index)">
+			<view>
+				<text
+					:style="{color:index === currentIndex? styleType === 'text'? activeColor: '#fff': styleType === 'text'? '#000': activeColor}"
+					class="segmented-control__text"
+					:class="styleType === 'text' && index === currentIndex ? 'segmented-control__item--text': ''">{{ item }}</text>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * SegmentedControl 分段器
+	 * @description 用作不同视图的显示
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=54
+	 * @property {Number} current 当前选中的tab索引值，从0计数
+	 * @property {String} styleType = [button|text] 分段器样式类型
+	 * 	@value button 按钮类型
+	 * 	@value text 文字类型
+	 * @property {String} activeColor 选中的标签背景色与边框颜色
+	 * @property {String} inActiveColor 未选中的标签背景色与边框颜色
+	 * @property {Array} values 选项数组
+	 * @event {Function} clickItem 组件触发点击事件时触发，e={currentIndex}
+	 */
+
+	export default {
+		name: 'UniSegmentedControl',
+		emits: ['clickItem'],
+		props: {
+			current: {
+				type: Number,
+				default: 0
+			},
+			values: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			activeColor: {
+				type: String,
+				default: '#2979FF'
+			},
+			inActiveColor: {
+				type: String,
+				default: 'transparent'
+			},
+			styleType: {
+				type: String,
+				default: 'button'
+			}
+		},
+		data() {
+			return {
+				currentIndex: 0
+			}
+		},
+		watch: {
+			current(val) {
+				if (val !== this.currentIndex) {
+					this.currentIndex = val
+				}
+			}
+		},
+		computed: {},
+		created() {
+			this.currentIndex = this.current
+		},
+		methods: {
+			_onClick(index) {
+				if (this.currentIndex !== index) {
+					this.currentIndex = index
+					this.$emit('clickItem', {
+						currentIndex: index
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.segmented-control {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		box-sizing: border-box;
+		/* #endif */
+		flex-direction: row;
+		height: 36px;
+		overflow: hidden;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.segmented-control__item {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		box-sizing: border-box;
+		/* #endif */
+		position: relative;
+		flex: 1;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.segmented-control__item--button {
+		border-style: solid;
+		border-top-width: 1px;
+		border-bottom-width: 1px;
+		border-right-width: 1px;
+		border-left-width: 0;
+	}
+
+	.segmented-control__item--button--first {
+		border-left-width: 1px;
+		border-top-left-radius: 5px;
+		border-bottom-left-radius: 5px;
+	}
+
+	.segmented-control__item--button--last {
+		border-top-right-radius: 5px;
+		border-bottom-right-radius: 5px;
+	}
+
+	.segmented-control__item--text {
+		border-bottom-style: solid;
+		border-bottom-width: 2px;
+		padding: 6px 0;
+	}
+
+	.segmented-control__text {
+		font-size: 14px;
+		line-height: 20px;
+		text-align: center;
+	}
+</style>
diff --git a/uni_modules/uni-segmented-control/package.json b/uni_modules/uni-segmented-control/package.json
new file mode 100644
index 0000000..49f9eff
--- /dev/null
+++ b/uni_modules/uni-segmented-control/package.json
@@ -0,0 +1,85 @@
+{
+  "id": "uni-segmented-control",
+  "displayName": "uni-segmented-control 分段器",
+  "version": "1.2.3",
+  "description": "分段器由至少 2 个分段控件组成，用作不同视图的显示",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "分段器",
+    "segement",
+    "顶部选择"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-segmented-control/readme.md b/uni_modules/uni-segmented-control/readme.md
new file mode 100644
index 0000000..3527b03
--- /dev/null
+++ b/uni_modules/uni-segmented-control/readme.md
@@ -0,0 +1,13 @@
+
+
+## SegmentedControl 分段器
+> **组件名：uni-segmented-control**
+> 代码块： `uSegmentedControl`
+
+
+用作不同视图的显示
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-segmented-control)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uni_modules/uni-swiper-dot/changelog.md b/uni_modules/uni-swiper-dot/changelog.md
new file mode 100644
index 0000000..85cf54d
--- /dev/null
+++ b/uni_modules/uni-swiper-dot/changelog.md
@@ -0,0 +1,12 @@
+## 1.2.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-swiper-dot](https://uniapp.dcloud.io/component/uniui/uni-swiper-dot)
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.6（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的Bug
+## 1.0.5（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 clickItem 事件，支持指示点控制轮播
+- 新增 支持 pc 可用
diff --git a/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue b/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue
new file mode 100644
index 0000000..e66b6c7
--- /dev/null
+++ b/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue
@@ -0,0 +1,218 @@
+<template>
+	<view class="uni-swiper__warp">
+		<slot />
+		<view v-if="mode === 'default'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='default'>
+			<view v-for="(item,index) in info" @click="clickItem(index)" :style="{
+        'width': (index === current? dots.width*2:dots.width ) + 'px','height':dots.width/2 +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border-radius':'0px'}"
+			 :key="index" class="uni-swiper__dots-item uni-swiper__dots-bar" />
+		</view>
+		<view v-if="mode === 'dot'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='dot'>
+			<view v-for="(item,index) in info" @click="clickItem(index)" :style="{
+        'width': dots.width + 'px','height':dots.height +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
+			 :key="index" class="uni-swiper__dots-item" />
+		</view>
+		<view v-if="mode === 'round'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='round'>
+			<view v-for="(item,index) in info" @click="clickItem(index)" :class="[index === current&&'uni-swiper__dots-long']" :style="{
+		    'width':(index === current? dots.width*3:dots.width ) + 'px','height':dots.height +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
+			 :key="index" class="uni-swiper__dots-item " />
+		</view>
+		<view v-if="mode === 'nav'" key='nav' :style="{'background-color':dotsStyles.backgroundColor,'bottom':'0'}" class="uni-swiper__dots-box uni-swiper__dots-nav">
+			<text :style="{'color':dotsStyles.color}" class="uni-swiper__dots-nav-item">{{ (current+1)+"/"+info.length +' ' +info[current][field] }}</text>
+		</view>
+		<view v-if="mode === 'indexes'" key='indexes' :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box">
+			<view v-for="(item,index) in info" @click="clickItem(index)" :style="{
+        'width':dots.width + 'px','height':dots.height +'px' ,'color':index === current?dots.selectedColor:dots.color,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
+			 :key="index" class="uni-swiper__dots-item uni-swiper__dots-indexes"><text class="uni-swiper__dots-indexes-text">{{ index+1 }}</text></view>
+		</view>
+	</view>
+</template>
+
+<script>
+
+	/**
+	 * SwiperDod 轮播图指示点
+	 * @description 自定义轮播图指示点
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=284
+	 * @property {Number} current 当前指示点索引，必须是通过 `swiper` 的 `change` 事件获取到的 `e.detail.current`
+	 * @property {String} mode = [default|round|nav|indexes] 指示点的类型
+	 * 	@value defualt 默认指示点
+	 * 	@value round 圆形指示点
+	 * 	@value nav 条形指示点
+	 * 	@value indexes 索引指示点
+	 * @property {String} field mode 为 nav 时，显示的内容字段（mode = nav 时必填）
+	 * @property {String} info 轮播图的数据，通过数组长度决定指示点个数
+	 * @property {Object} dotsStyles 指示点样式
+	 * @event {Function} clickItem 组件触发点击事件时触发，e={currentIndex}
+	 */
+
+	export default {
+		name: 'UniSwiperDot',
+		emits:['clickItem'],
+		props: {
+			info: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			current: {
+				type: Number,
+				default: 0
+			},
+			dotsStyles: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 类型 ：default(默认) indexes long nav
+			mode: {
+				type: String,
+				default: 'default'
+			},
+			// 只在 nav 模式下生效，变量名称
+			field: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				dots: {
+					width: 6,
+					height: 6,
+					bottom: 10,
+					color: '#fff',
+					backgroundColor: 'rgba(0, 0, 0, .3)',
+					border: '1px rgba(0, 0, 0, .3) solid',
+					selectedBackgroundColor: '#333',
+					selectedBorder: '1px rgba(0, 0, 0, .9) solid'
+				}
+			}
+		},
+		watch: {
+			dotsStyles(newVal) {
+				this.dots = Object.assign(this.dots, this.dotsStyles)
+			},
+			mode(newVal) {
+				if (newVal === 'indexes') {
+					this.dots.width = 14
+					this.dots.height = 14
+				} else {
+					this.dots.width = 6
+					this.dots.height = 6
+				}
+			}
+
+		},
+		created() {
+			if (this.mode === 'indexes') {
+				this.dots.width = 12
+				this.dots.height = 12
+			}
+			this.dots = Object.assign(this.dots, this.dotsStyles)
+		},
+		methods: {
+			clickItem(index) {
+				this.$emit('clickItem', index)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-swiper__warp {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: column;
+		position: relative;
+		overflow: hidden;
+	}
+
+	.uni-swiper__dots-box {
+		position: absolute;
+		bottom: 10px;
+		left: 0;
+		right: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.uni-swiper__dots-item {
+		width: 8px;
+		border-radius: 100px;
+		margin-left: 6px;
+		background-color: rgba(0, 0, 0, 0.4);
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+		/* #ifdef H5 */
+		// border-width: 5px 0;
+		// border-style: solid;
+		// border-color: transparent;
+		// background-clip: padding-box;
+		/* #endif */
+		// transition: width 0.2s linear;  不要取消注释，不然会不能变色
+	}
+
+	.uni-swiper__dots-item:first-child {
+		margin: 0;
+	}
+
+	.uni-swiper__dots-default {
+		border-radius: 100px;
+	}
+
+	.uni-swiper__dots-long {
+		border-radius: 50px;
+	}
+
+	.uni-swiper__dots-bar {
+		border-radius: 50px;
+	}
+
+	.uni-swiper__dots-nav {
+		bottom: 0px;
+		// height: 26px;
+		padding: 8px 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		justify-content: flex-start;
+		align-items: center;
+		background-color: rgba(0, 0, 0, 0.2);
+	}
+
+	.uni-swiper__dots-nav-item {
+		/* overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap; */
+		font-size: 14px;
+		color: #fff;
+		margin: 0 15px;
+	}
+
+	.uni-swiper__dots-indexes {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		// flex: 1;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.uni-swiper__dots-indexes-text {
+		color: #fff;
+		font-size: 12px;
+		line-height: 14px;
+	}
+</style>
diff --git a/uni_modules/uni-swiper-dot/package.json b/uni_modules/uni-swiper-dot/package.json
new file mode 100644
index 0000000..f2dd8d2
--- /dev/null
+++ b/uni_modules/uni-swiper-dot/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-swiper-dot",
+  "displayName": "uni-swiper-dot 轮播图指示点",
+  "version": "1.2.0",
+  "description": "自定义轮播图指示点组件",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "轮播图指示点",
+    "dot",
+    "swiper"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-swiper-dot/readme.md b/uni_modules/uni-swiper-dot/readme.md
new file mode 100644
index 0000000..7d397e2
--- /dev/null
+++ b/uni_modules/uni-swiper-dot/readme.md
@@ -0,0 +1,11 @@
+
+
+## SwiperDot 轮播图指示点
+> **组件名：uni-swiper-dot**
+> 代码块： `uSwiperDot`
+
+
+自定义轮播图指示点
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-swiper-dot)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-transition/changelog.md b/uni_modules/uni-transition/changelog.md
new file mode 100644
index 0000000..faaf336
--- /dev/null
+++ b/uni_modules/uni-transition/changelog.md
@@ -0,0 +1,24 @@
+## 1.3.3（2024-04-23）
+- 修复 当元素会受变量影响自动隐藏的bug
+## 1.3.2（2023-05-04）
+- 修复 NVUE 平台报错的问题
+## 1.3.1（2021-11-23）
+- 修复 init 方法初始化问题
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-transition](https://uniapp.dcloud.io/component/uniui/uni-transition)
+## 1.2.1（2021-09-27）
+- 修复 init 方法不生效的 Bug
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.1（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的 Bug
+## 1.1.0（2021-04-22）
+- 新增 通过方法自定义动画
+- 新增 custom-class 非 NVUE 平台支持自定义 class 定制样式
+- 优化 动画触发逻辑，使动画更流畅
+- 优化 支持单独的动画类型
+- 优化 文档示例
+## 1.0.2（2021-02-05）
+- 调整为 uni_modules 目录规范
diff --git a/uni_modules/uni-transition/components/uni-transition/createAnimation.js b/uni_modules/uni-transition/components/uni-transition/createAnimation.js
new file mode 100644
index 0000000..8f89b18
--- /dev/null
+++ b/uni_modules/uni-transition/components/uni-transition/createAnimation.js
@@ -0,0 +1,131 @@
+// const defaultOption = {
+// 	duration: 300,
+// 	timingFunction: 'linear',
+// 	delay: 0,
+// 	transformOrigin: '50% 50% 0'
+// }
+// #ifdef APP-NVUE
+const nvueAnimation = uni.requireNativePlugin('animation')
+// #endif
+class MPAnimation {
+	constructor(options, _this) {
+		this.options = options
+		// 在iOS10+QQ小程序平台下，传给原生的对象一定是个普通对象而不是Proxy对象，否则会报parameter should be Object instead of ProxyObject的错误
+		this.animation = uni.createAnimation({
+			...options
+		})
+		this.currentStepAnimates = {}
+		this.next = 0
+		this.$ = _this
+
+	}
+
+	_nvuePushAnimates(type, args) {
+		let aniObj = this.currentStepAnimates[this.next]
+		let styles = {}
+		if (!aniObj) {
+			styles = {
+				styles: {},
+				config: {}
+			}
+		} else {
+			styles = aniObj
+		}
+		if (animateTypes1.includes(type)) {
+			if (!styles.styles.transform) {
+				styles.styles.transform = ''
+			}
+			let unit = ''
+			if(type === 'rotate'){
+				unit = 'deg'
+			}
+			styles.styles.transform += `${type}(${args+unit}) `
+		} else {
+			styles.styles[type] = `${args}`
+		}
+		this.currentStepAnimates[this.next] = styles
+	}
+	_animateRun(styles = {}, config = {}) {
+		let ref = this.$.$refs['ani'].ref
+		if (!ref) return
+		return new Promise((resolve, reject) => {
+			nvueAnimation.transition(ref, {
+				styles,
+				...config
+			}, res => {
+				resolve()
+			})
+		})
+	}
+
+	_nvueNextAnimate(animates, step = 0, fn) {
+		let obj = animates[step]
+		if (obj) {
+			let {
+				styles,
+				config
+			} = obj
+			this._animateRun(styles, config).then(() => {
+				step += 1
+				this._nvueNextAnimate(animates, step, fn)
+			})
+		} else {
+			this.currentStepAnimates = {}
+			typeof fn === 'function' && fn()
+			this.isEnd = true
+		}
+	}
+
+	step(config = {}) {
+		// #ifndef APP-NVUE
+		this.animation.step(config)
+		// #endif
+		// #ifdef APP-NVUE
+		this.currentStepAnimates[this.next].config = Object.assign({}, this.options, config)
+		this.currentStepAnimates[this.next].styles.transformOrigin = this.currentStepAnimates[this.next].config.transformOrigin
+		this.next++
+		// #endif
+		return this
+	}
+
+	run(fn) {
+		// #ifndef APP-NVUE
+		this.$.animationData = this.animation.export()
+		this.$.timer = setTimeout(() => {
+			typeof fn === 'function' && fn()
+		}, this.$.durationTime)
+		// #endif
+		// #ifdef APP-NVUE
+		this.isEnd = false
+		let ref = this.$.$refs['ani'] && this.$.$refs['ani'].ref
+		if(!ref) return
+		this._nvueNextAnimate(this.currentStepAnimates, 0, fn)
+		this.next = 0
+		// #endif
+	}
+}
+
+
+const animateTypes1 = ['matrix', 'matrix3d', 'rotate', 'rotate3d', 'rotateX', 'rotateY', 'rotateZ', 'scale', 'scale3d',
+	'scaleX', 'scaleY', 'scaleZ', 'skew', 'skewX', 'skewY', 'translate', 'translate3d', 'translateX', 'translateY',
+	'translateZ'
+]
+const animateTypes2 = ['opacity', 'backgroundColor']
+const animateTypes3 = ['width', 'height', 'left', 'right', 'top', 'bottom']
+animateTypes1.concat(animateTypes2, animateTypes3).forEach(type => {
+	MPAnimation.prototype[type] = function(...args) {
+		// #ifndef APP-NVUE
+		this.animation[type](...args)
+		// #endif
+		// #ifdef APP-NVUE
+		this._nvuePushAnimates(type, args)
+		// #endif
+		return this
+	}
+})
+
+export function createAnimation(option, _this) {
+	if(!_this) return
+	clearTimeout(_this.timer)
+	return new MPAnimation(option, _this)
+}
diff --git a/uni_modules/uni-transition/components/uni-transition/uni-transition.vue b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
new file mode 100644
index 0000000..f3ddd1f
--- /dev/null
+++ b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
@@ -0,0 +1,286 @@
+<template>
+  <!-- #ifndef APP-NVUE -->
+  <view v-show="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
+  <!-- #endif -->
+  <!-- #ifdef APP-NVUE -->
+  <view v-if="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
+  <!-- #endif -->
+</template>
+
+<script>
+import { createAnimation } from './createAnimation'
+
+/**
+ * Transition 过渡动画
+ * @description 简单过渡动画组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=985
+ * @property {Boolean} show = [false|true] 控制组件显示或隐藏
+ * @property {Array|String} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
+ *  @value fade 渐隐渐出过渡
+ *  @value slide-top 由上至下过渡
+ *  @value slide-right 由右至左过渡
+ *  @value slide-bottom 由下至上过渡
+ *  @value slide-left 由左至右过渡
+ *  @value zoom-in 由小到大过渡
+ *  @value zoom-out 由大到小过渡
+ * @property {Number} duration 过渡动画持续时间
+ * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
+ */
+export default {
+	name: 'uniTransition',
+	emits:['click','change'],
+	props: {
+		show: {
+			type: Boolean,
+			default: false
+		},
+		modeClass: {
+			type: [Array, String],
+			default() {
+				return 'fade'
+			}
+		},
+		duration: {
+			type: Number,
+			default: 300
+		},
+		styles: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		customClass:{
+			type: String,
+			default: ''
+		},
+		onceRender:{
+			type:Boolean,
+			default:false
+		},
+	},
+	data() {
+		return {
+			isShow: false,
+			transform: '',
+			opacity: 1,
+			animationData: {},
+			durationTime: 300,
+			config: {}
+		}
+	},
+	watch: {
+		show: {
+			handler(newVal) {
+				if (newVal) {
+					this.open()
+				} else {
+					// 避免上来就执行 close,导致动画错乱
+					if (this.isShow) {
+						this.close()
+					}
+				}
+			},
+			immediate: true
+		}
+	},
+	computed: {
+		// 生成样式数据
+		stylesObject() {
+			let styles = {
+				...this.styles,
+				'transition-duration': this.duration / 1000 + 's'
+			}
+			let transform = ''
+			for (let i in styles) {
+				let line = this.toLine(i)
+				transform += line + ':' + styles[i] + ';'
+			}
+			return transform
+		},
+		// 初始化动画条件
+		transformStyles() {
+			return 'transform:' + this.transform + ';' + 'opacity:' + this.opacity + ';' + this.stylesObject
+		}
+	},
+	created() {
+		// 动画默认配置
+		this.config = {
+			duration: this.duration,
+			timingFunction: 'ease',
+			transformOrigin: '50% 50%',
+			delay: 0
+		}
+		this.durationTime = this.duration
+	},
+	methods: {
+		/**
+		 *  ref 触发 初始化动画
+		 */
+		init(obj = {}) {
+			if (obj.duration) {
+				this.durationTime = obj.duration
+			}
+			this.animation = createAnimation(Object.assign(this.config, obj),this)
+		},
+		/**
+		 * 点击组件触发回调
+		 */
+		onClick() {
+			this.$emit('click', {
+				detail: this.isShow
+			})
+		},
+		/**
+		 * ref 触发 动画分组
+		 * @param {Object} obj
+		 */
+		step(obj, config = {}) {
+			if (!this.animation) return
+			for (let i in obj) {
+				try {
+					if(typeof obj[i] === 'object'){
+						this.animation[i](...obj[i])
+					}else{
+						this.animation[i](obj[i])
+					}
+				} catch (e) {
+					console.error(`方法 ${i} 不存在`)
+				}
+			}
+			this.animation.step(config)
+			return this
+		},
+		/**
+		 *  ref 触发 执行动画
+		 */
+		run(fn) {
+			if (!this.animation) return
+			this.animation.run(fn)
+		},
+		// 开始过度动画
+		open() {
+			clearTimeout(this.timer)
+			this.transform = ''
+			this.isShow = true
+			let { opacity, transform } = this.styleInit(false)
+			if (typeof opacity !== 'undefined') {
+				this.opacity = opacity
+			}
+			this.transform = transform
+			// 确保动态样式已经生效后，执行动画，如果不加 nextTick ，会导致 wx 动画执行异常
+			this.$nextTick(() => {
+				// TODO 定时器保证动画完全执行，目前有些问题，后面会取消定时器
+				this.timer = setTimeout(() => {
+					this.animation = createAnimation(this.config, this)
+					this.tranfromInit(false).step()
+					this.animation.run()
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				}, 20)
+			})
+		},
+		// 关闭过度动画
+		close(type) {
+			if (!this.animation) return
+			this.tranfromInit(true)
+				.step()
+				.run(() => {
+					this.isShow = false
+					this.animationData = null
+					this.animation = null
+					let { opacity, transform } = this.styleInit(false)
+					this.opacity = opacity || 1
+					this.transform = transform
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				})
+		},
+		// 处理动画开始前的默认样式
+		styleInit(type) {
+			let styles = {
+				transform: ''
+			}
+			let buildStyle = (type, mode) => {
+				if (mode === 'fade') {
+					styles.opacity = this.animationType(type)[mode]
+				} else {
+					styles.transform += this.animationType(type)[mode] + ' '
+				}
+			}
+			if (typeof this.modeClass === 'string') {
+				buildStyle(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildStyle(type, mode)
+				})
+			}
+			return styles
+		},
+		// 处理内置组合动画
+		tranfromInit(type) {
+			let buildTranfrom = (type, mode) => {
+				let aniNum = null
+				if (mode === 'fade') {
+					aniNum = type ? 0 : 1
+				} else {
+					aniNum = type ? '-100%' : '0'
+					if (mode === 'zoom-in') {
+						aniNum = type ? 0.8 : 1
+					}
+					if (mode === 'zoom-out') {
+						aniNum = type ? 1.2 : 1
+					}
+					if (mode === 'slide-right') {
+						aniNum = type ? '100%' : '0'
+					}
+					if (mode === 'slide-bottom') {
+						aniNum = type ? '100%' : '0'
+					}
+				}
+				this.animation[this.animationMode()[mode]](aniNum)
+			}
+			if (typeof this.modeClass === 'string') {
+				buildTranfrom(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildTranfrom(type, mode)
+				})
+			}
+
+			return this.animation
+		},
+		animationType(type) {
+			return {
+				fade: type ? 0 : 1,
+				'slide-top': `translateY(${type ? '0' : '-100%'})`,
+				'slide-right': `translateX(${type ? '0' : '100%'})`,
+				'slide-bottom': `translateY(${type ? '0' : '100%'})`,
+				'slide-left': `translateX(${type ? '0' : '-100%'})`,
+				'zoom-in': `scaleX(${type ? 1 : 0.8}) scaleY(${type ? 1 : 0.8})`,
+				'zoom-out': `scaleX(${type ? 1 : 1.2}) scaleY(${type ? 1 : 1.2})`
+			}
+		},
+		// 内置动画类型与实际动画对应字典
+		animationMode() {
+			return {
+				fade: 'opacity',
+				'slide-top': 'translateY',
+				'slide-right': 'translateX',
+				'slide-bottom': 'translateY',
+				'slide-left': 'translateX',
+				'zoom-in': 'scale',
+				'zoom-out': 'scale'
+			}
+		},
+		// 驼峰转中横线
+		toLine(name) {
+			return name.replace(/([A-Z])/g, '-$1').toLowerCase()
+		}
+	}
+}
+</script>
+
+<style></style>
diff --git a/uni_modules/uni-transition/package.json b/uni_modules/uni-transition/package.json
new file mode 100644
index 0000000..d5c20e1
--- /dev/null
+++ b/uni_modules/uni-transition/package.json
@@ -0,0 +1,85 @@
+{
+  "id": "uni-transition",
+  "displayName": "uni-transition 过渡动画",
+  "version": "1.3.3",
+  "description": "元素的简单过渡动画",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "动画",
+    "过渡",
+    "过渡动画"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-transition/readme.md b/uni_modules/uni-transition/readme.md
new file mode 100644
index 0000000..2f8a77e
--- /dev/null
+++ b/uni_modules/uni-transition/readme.md
@@ -0,0 +1,11 @@
+
+
+## Transition 过渡动画
+> **组件名：uni-transition**
+> 代码块： `uTransition`
+
+
+元素过渡动画
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-transition)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uv-line-progress/changelog.md b/uni_modules/uv-line-progress/changelog.md
new file mode 100644
index 0000000..975acce
--- /dev/null
+++ b/uni_modules/uv-line-progress/changelog.md
@@ -0,0 +1,7 @@
+## 1.0.2（2023-06-20）
+1. 适配height参数携带单位
+## 1.0.1（2023-05-16）
+1. 优化组件依赖，修改后无需全局引入，组件导入即可使用
+2. 优化部分功能
+## 1.0.0（2023-05-10）
+uv-line-progress 线形进度条
diff --git a/uni_modules/uv-line-progress/components/uv-line-progress/props.js b/uni_modules/uv-line-progress/components/uv-line-progress/props.js
new file mode 100644
index 0000000..23138c7
--- /dev/null
+++ b/uni_modules/uv-line-progress/components/uv-line-progress/props.js
@@ -0,0 +1,29 @@
+export default {
+	props: {
+		// 激活部分的颜色
+		activeColor: {
+			type: String,
+			default: '#19be6b'
+		},
+		inactiveColor: {
+			type: String,
+			default: '#ececec'
+		},
+		// 进度百分比，数值
+		percentage: {
+			type: [String, Number],
+			default: 0
+		},
+		// 是否在进度条内部显示百分比的值
+		showText: {
+			type: Boolean,
+			default: true
+		},
+		// 进度条的高度，单位px
+		height: {
+			type: [String, Number],
+			default: 12
+		},
+		...uni.$uv?.props?.lineProgress
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uv-line-progress/components/uv-line-progress/uv-line-progress.vue b/uni_modules/uv-line-progress/components/uv-line-progress/uv-line-progress.vue
new file mode 100644
index 0000000..229c2aa
--- /dev/null
+++ b/uni_modules/uv-line-progress/components/uv-line-progress/uv-line-progress.vue
@@ -0,0 +1,146 @@
+<template>
+	<view
+	    class="uv-line-progress"
+	    :style="[$uv.addStyle(customStyle)]"
+	>
+		<view
+		    class="uv-line-progress__background"
+		    ref="uv-line-progress__background"
+		    :style="[{
+				backgroundColor: inactiveColor,
+				height: $uv.addUnit($uv.getPx(height))
+			}]"
+		>
+		</view>
+		<view
+		    class="uv-line-progress__line"
+		    :style="[progressStyle]"
+		> 
+			<slot>
+				<text v-if="showText && percentage >= 10" class="uv-line-progress__text">{{innserPercentage + '%'}}</text>
+			</slot> 
+		</view>
+	</view>
+</template>
+
+<script>
+	import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js'
+	import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
+	import props from './props.js';
+	// #ifdef APP-NVUE
+	const dom = uni.requireNativePlugin('dom')
+	// #endif
+	/**
+	 * lineProgress 线型进度条
+	 * @description 展示操作或任务的当前进度，比如上传文件，是一个线形的进度条。
+	 * @tutorial https://www.uvui.cn/components/lineProgress.html
+	 * @property {String}			activeColor		激活部分的颜色 ( 默认 '#19be6b' )
+	 * @property {String}			inactiveColor	背景色 ( 默认 '#ececec' )
+	 * @property {String | Number}	percentage		进度百分比，数值 ( 默认 0 )
+	 * @property {Boolean}			showText		是否在进度条内部显示百分比的值 ( 默认 true )
+	 * @property {String | Number}	height			进度条的高度，单位px ( 默认 12 )
+	 * 
+	 * @example <uv-line-progress :percent="70" :show-percent="true"></uv-line-progress>
+	 */
+	export default {
+		name: "uv-line-progress",
+		mixins: [mpMixin, mixin, props],
+		data() {
+			return {
+				lineWidth: 0,
+			}
+		},
+		watch: {
+			percentage(n) {
+				this.resizeProgressWidth()
+			}
+		},
+		computed: {
+			progressStyle() { 
+				let style = {}
+				style.width = this.lineWidth
+				style.backgroundColor = this.activeColor
+				style.height = this.$uv.addUnit(this.$uv.getPx(this.height))
+				return style
+			},
+			innserPercentage() {
+				// 控制范围在0-100之间
+				return this.$uv.range(0, 100, this.percentage)
+			}
+		},
+		mounted() {
+			this.init()
+		},
+		methods: {
+			init() {
+				this.$uv.sleep(20).then(() => {
+					this.resizeProgressWidth()
+				})
+			},
+			getProgressWidth() {
+				// #ifndef APP-NVUE
+				return this.$uvGetRect('.uv-line-progress__background')
+				// #endif
+
+				// #ifdef APP-NVUE
+				// 返回一个promise
+				return new Promise(resolve => {
+					dom.getComponentRect(this.$refs['uv-line-progress__background'], (res) => {
+						resolve(res.size)
+					})
+				})
+				// #endif
+			},
+			resizeProgressWidth() {
+				this.getProgressWidth().then(size => {
+					const {
+						width
+					} = size
+					// 通过设置的percentage值，计算其所占总长度的百分比
+					this.lineWidth = width * this.innserPercentage / 100 + 'px'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import '@/uni_modules/uv-ui-tools/libs/css/components.scss';
+
+	.uv-line-progress {
+		align-items: stretch;
+		position: relative;
+		@include flex(row);
+		flex: 1;
+		overflow: hidden;
+		border-radius: 100px;
+
+		&__background {
+			background-color: #ececec;
+			border-radius: 100px;
+			flex: 1;
+		}
+
+		&__line {
+			position: absolute;
+			top: 0;
+			left: 0;
+			bottom: 0;
+			align-items: center;
+			@include flex(row);
+			color: #ffffff;
+			border-radius: 100px;
+			transition: width 0.5s ease;
+			justify-content: flex-end;
+		}
+
+		&__text {
+			font-size: 10px;
+			align-items: center;
+			text-align: right;
+			color: #FFFFFF;
+			margin-right: 5px;
+			transform: scale(0.9);
+		}
+	}
+</style>
diff --git a/uni_modules/uv-line-progress/package.json b/uni_modules/uv-line-progress/package.json
new file mode 100644
index 0000000..01e550e
--- /dev/null
+++ b/uni_modules/uv-line-progress/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uv-line-progress",
+  "displayName": "uv-line-progress 线形进度条  全面兼容小程序、nvue、vue2、vue3等多端",
+  "version": "1.0.2",
+  "description": "uv-line-progress 该组件展示操作或任务的当前进度，比如上传文件，是一个线形的进度条。",
+  "keywords": [
+    "uv-line-progress",
+    "uvui",
+    "uv-ui",
+    "progress",
+    "进度条"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+    	"ads": "无",
+    	"data": "插件不采集任何数据",
+    	"permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uv-ui-tools"
+		],
+    "encrypt": [],
+    "platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				},
+				"App": {
+					"app-vue": "y",
+					"app-nvue": "y"
+				},
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "y",
+					"IE": "y",
+					"Edge": "y",
+					"Firefox": "y",
+					"Safari": "y"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "y",
+					"百度": "y",
+					"字节跳动": "y",
+					"QQ": "y",
+					"钉钉": "u",
+					"快手": "u",
+					"飞书": "u",
+					"京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uv-line-progress/readme.md b/uni_modules/uv-line-progress/readme.md
new file mode 100644
index 0000000..98e5d49
--- /dev/null
+++ b/uni_modules/uv-line-progress/readme.md
@@ -0,0 +1,11 @@
+## LineProgress 线形进度条
+
+> **组件名：uv-line-progress**
+
+展示操作或任务的当前进度，比如上传文件，是一个线形的进度条。
+
+### <a href="https://www.uvui.cn/components/lineProgress.html" target="_blank">查看文档</a>
+
+### [完整示例项目下载 | 关注更多组件](https://ext.dcloud.net.cn/plugin?name=uv-ui)
+
+#### 如使用过程中有任何问题，或者您对uv-ui有一些好的建议，欢迎加入 uv-ui 交流群：<a href="https://ext.dcloud.net.cn/plugin?id=12287" target="_blank">uv-ui</a>、<a href="https://www.uvui.cn/components/addQQGroup.html" target="_blank">官方QQ群</a>
diff --git a/uni_modules/uv-ui-tools/changelog.md b/uni_modules/uv-ui-tools/changelog.md
new file mode 100644
index 0000000..998373e
--- /dev/null
+++ b/uni_modules/uv-ui-tools/changelog.md
@@ -0,0 +1,76 @@
+## 1.1.25（2024-01-20）
+1.1.20版本更新
+## 1.1.24（2023-12-21）
+1. luch-request更新
+## 1.1.23（2023-12-12）
+1. 1.1.19版本
+## 1.1.22（2023-11-28）
+1. 优化
+## 1.1.21（2023-11-10）
+1. 1.1.17版本
+## 1.1.20（2023-10-30）
+1. 1.1.16版本
+## 1.1.19（2023-10-13）
+1. 兼容vue3
+## 1.1.18（2023-10-12）
+1. 1.1.15版本
+## 1.1.17（2023-09-27）
+1. 1.1.14版本发布
+## 1.1.16（2023-09-15）
+1. 1.1.13版本发布
+## 1.1.15（2023-09-15）
+1. 更新button.js相关按钮支持open-type="agreePrivacyAuthorization"
+## 1.1.14（2023-09-14）
+1. 优化dayjs
+## 1.1.13（2023-09-13）
+1. 优化，$uv中增加unit参数，方便组件中使用
+## 1.1.12（2023-09-10）
+1. 升级版本
+## 1.1.11（2023-09-04）
+1. 1.1.11版本
+## 1.1.10（2023-08-31）
+1. 修复customStyle和customClass存在冲突的问题
+## 1.1.9（2023-08-27）
+1. 版本升级
+2. 优化
+## 1.1.8（2023-08-24）
+1. 版本升级
+## 1.1.7（2023-08-22）
+1. 版本升级
+## 1.1.6（2023-08-18）
+uvui版本：1.1.6
+## 1.0.15（2023-08-14）
+1. 更新uvui版本号
+## 1.0.13（2023-08-06）
+1. 优化
+## 1.0.12（2023-08-06）
+1. 修改版本号
+## 1.0.11（2023-08-06）
+1. 路由增加events参数
+2. 路由拦截修复
+## 1.0.10（2023-08-01）
+1. 优化
+## 1.0.9（2023-06-28）
+优化openType.js
+## 1.0.8（2023-06-15）
+1. 修改支付宝报错的BUG
+## 1.0.7（2023-06-07）
+1. 解决微信小程序使用uvui提示 Some selectors are not allowed in component wxss, including tag name selectors, ID selectors, and attribute selectors
+2. 解决上述提示，需要在uni.scss配置$uvui-nvue-style: false; 然后在APP.vue下面引入uvui内置的基础样式:@import '@/uni_modules/uv-ui-tools/index.scss';
+## 1.0.6（2023-06-04）
+1.  uv-ui-tools 优化工具组件，兼容更多功能
+2.  小程序分享功能优化等
+## 1.0.5（2023-06-02）
+1. 修改扩展使用mixin中方法的问题
+## 1.0.4（2023-05-23）
+1. 兼容百度小程序修改bem函数
+## 1.0.3（2023-05-16）
+1. 优化组件依赖，修改后无需全局引入，组件导入即可使用
+2. 优化部分功能
+## 1.0.2（2023-05-10）
+1. 增加Http请求封装
+2. 优化
+## 1.0.1（2023-05-04）
+1. 修改名称及备注
+## 1.0.0（2023-05-04）
+1. uv-ui工具集首次发布
diff --git a/uni_modules/uv-ui-tools/components/uv-ui-tools/uv-ui-tools.vue b/uni_modules/uv-ui-tools/components/uv-ui-tools/uv-ui-tools.vue
new file mode 100644
index 0000000..baf45e9
--- /dev/null
+++ b/uni_modules/uv-ui-tools/components/uv-ui-tools/uv-ui-tools.vue
@@ -0,0 +1,6 @@
+<template>
+</template>
+<script>
+</script>
+<style>
+</style>
diff --git a/uni_modules/uv-ui-tools/index.js b/uni_modules/uv-ui-tools/index.js
new file mode 100644
index 0000000..71a8b66
--- /dev/null
+++ b/uni_modules/uv-ui-tools/index.js
@@ -0,0 +1,79 @@
+// 全局挂载引入http相关请求拦截插件
+import Request from './libs/luch-request'
+
+// 引入全局mixin
+import mixin from './libs/mixin/mixin.js'
+// 小程序特有的mixin
+import mpMixin from './libs/mixin/mpMixin.js'
+// #ifdef MP
+import mpShare from './libs/mixin/mpShare.js'
+// #endif
+
+// 路由封装
+import route from './libs/util/route.js'
+// 公共工具函数
+import * as index from './libs/function/index.js'
+// 防抖方法
+import debounce from './libs/function/debounce.js'
+// 节流方法
+import throttle from './libs/function/throttle.js'
+// 规则检验
+import * as test from './libs/function/test.js'
+
+// 颜色渐变相关,colorGradient-颜色渐变,hexToRgb-十六进制颜色转rgb颜色,rgbToHex-rgb转十六进制
+import * as colorGradient from './libs/function/colorGradient.js'
+
+// 配置信息
+import config from './libs/config/config.js'
+// 平台
+import platform from './libs/function/platform'
+
+const $uv = {
+	route,
+	config,
+	test,
+	date: index.timeFormat, // 另名date
+	...index,
+	colorGradient: colorGradient.colorGradient,
+	hexToRgb: colorGradient.hexToRgb,
+	rgbToHex: colorGradient.rgbToHex,
+	colorToRgba: colorGradient.colorToRgba,
+	http: new Request(),
+	debounce,
+	throttle,
+	platform,
+	mixin,
+	mpMixin
+}
+uni.$uv = $uv;
+const install = (Vue,options={}) => {
+		// #ifndef APP-NVUE
+		const cloneMixin = index.deepClone(mixin);
+		delete cloneMixin?.props?.customClass;
+		delete cloneMixin?.props?.customStyle;
+		Vue.mixin(cloneMixin);
+		// #ifdef MP
+		if(options.mpShare){
+			Vue.mixin(mpShare);
+		}
+		// #endif
+		// #endif
+		// #ifdef VUE2
+		// 时间格式化，同时两个名称，date和timeFormat
+		Vue.filter('timeFormat', (timestamp, format) => uni.$uv.timeFormat(timestamp, format));
+		Vue.filter('date', (timestamp, format) => uni.$uv.timeFormat(timestamp, format));
+		// 将多久以前的方法，注入到全局过滤器
+		Vue.filter('timeFrom', (timestamp, format) => uni.$uv.timeFrom(timestamp, format));
+		// 同时挂载到uni和Vue.prototype中
+		// #ifndef APP-NVUE
+		// 只有vue，挂载到Vue.prototype才有意义，因为nvue中全局Vue.prototype和Vue.mixin是无效的
+		Vue.prototype.$uv = $uv;
+		// #endif
+		// #endif
+		// #ifdef VUE3
+		Vue.config.globalProperties.$uv = $uv;
+		// #endif
+}
+export default {
+	install
+}
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/index.scss b/uni_modules/uv-ui-tools/index.scss
new file mode 100644
index 0000000..8d05b8d
--- /dev/null
+++ b/uni_modules/uv-ui-tools/index.scss
@@ -0,0 +1,7 @@
+// 引入公共基础类
+@import "./libs/css/common.scss";
+
+// 非nvue的样式
+/* #ifndef APP-NVUE */
+@import "./libs/css/vue.scss";
+/* #endif */
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/libs/config/config.js b/uni_modules/uv-ui-tools/libs/config/config.js
new file mode 100644
index 0000000..f18ae74
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/config/config.js
@@ -0,0 +1,34 @@
+// 此版本发布于2024-01-20
+const version = '1.1.20'
+
+// 开发环境才提示，生产环境不会提示
+if (process.env.NODE_ENV === 'development') {
+	console.log(`\n %c uvui V${version} https://www.uvui.cn/ \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0; border-radius: 5px;');
+}
+
+export default {
+    v: version,
+    version,
+    // 主题名称
+    type: [
+        'primary',
+        'success',
+        'info',
+        'error',
+        'warning'
+    ],
+    // 颜色部分，本来可以通过scss的:export导出供js使用，但是奈何nvue不支持
+    color: {
+        'uv-primary': '#2979ff',
+        'uv-warning': '#ff9900',
+        'uv-success': '#19be6b',
+        'uv-error': '#fa3534',
+        'uv-info': '#909399',
+        'uv-main-color': '#303133',
+        'uv-content-color': '#606266',
+        'uv-tips-color': '#909399',
+        'uv-light-color': '#c0c4cc'
+    },
+	// 默认单位，可以通过配置为rpx，那么在用于传入组件大小参数为数值时，就默认为rpx
+	unit: 'px'
+}
diff --git a/uni_modules/uv-ui-tools/libs/css/color.scss b/uni_modules/uv-ui-tools/libs/css/color.scss
new file mode 100644
index 0000000..ce65743
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/css/color.scss
@@ -0,0 +1,32 @@
+$uv-main-color: #303133 !default;
+$uv-content-color: #606266 !default;
+$uv-tips-color: #909193 !default;
+$uv-light-color: #c0c4cc !default;
+$uv-border-color: #dadbde !default;
+$uv-bg-color: #f3f4f6 !default;
+$uv-disabled-color: #c8c9cc !default;
+
+$uv-primary: #3c9cff !default;
+$uv-primary-dark: #398ade !default;
+$uv-primary-disabled: #9acafc !default;
+$uv-primary-light: #ecf5ff !default;
+
+$uv-warning: #f9ae3d !default;
+$uv-warning-dark: #f1a532 !default;
+$uv-warning-disabled: #f9d39b !default;
+$uv-warning-light: #fdf6ec !default;
+
+$uv-success: #5ac725 !default;
+$uv-success-dark: #53c21d !default;
+$uv-success-disabled: #a9e08f !default;
+$uv-success-light: #f5fff0;
+
+$uv-error: #f56c6c !default;
+$uv-error-dark: #e45656 !default;
+$uv-error-disabled: #f7b2b2 !default;
+$uv-error-light: #fef0f0 !default;
+
+$uv-info: #909399 !default;
+$uv-info-dark: #767a82 !default;
+$uv-info-disabled: #c4c6c9 !default;
+$uv-info-light: #f4f4f5 !default;
diff --git a/uni_modules/uv-ui-tools/libs/css/common.scss b/uni_modules/uv-ui-tools/libs/css/common.scss
new file mode 100644
index 0000000..7ab99f8
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/css/common.scss
@@ -0,0 +1,100 @@
+// 超出行数，自动显示行尾省略号，最多5行
+// 来自uvui的温馨提示：当您在控制台看到此报错，说明需要在App.vue的style标签加上【lang="scss"】
+@for $i from 1 through 5 {
+	.uv-line-#{$i} {
+		/* #ifdef APP-NVUE */
+		// nvue下，可以直接使用lines属性，这是weex特有样式
+		lines: $i;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		flex: 1;
+		/* #endif */
+
+		/* #ifndef APP-NVUE */
+		// vue下，单行和多行显示省略号需要单独处理
+		@if $i == '1' {
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		} @else {
+			display: -webkit-box!important;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			word-break: break-all;
+			-webkit-line-clamp: $i;
+			-webkit-box-orient: vertical!important;
+		}
+		/* #endif */
+	}
+}
+$uv-bordercolor: #dadbde;
+@if variable-exists(uv-border-color) {
+	$uv-bordercolor: $uv-border-color;
+}
+
+// 此处加上!important并非随意乱用，而是因为目前*.nvue页面编译到H5时，
+// App.vue的样式会被uni-app的view元素的自带border属性覆盖，导致无效
+// 综上，这是uni-app的缺陷导致我们为了多端兼容，而必须要加上!important
+// 移动端兼容性较好，直接使用0.5px去实现细边框，不使用伪元素形式实现
+.uv-border {
+	border-width: 0.5px!important;
+	border-color: $uv-bordercolor!important;
+    border-style: solid;
+}
+
+.uv-border-top {
+	border-top-width: 0.5px!important;
+	border-color: $uv-bordercolor!important;
+    border-top-style: solid;
+}
+
+.uv-border-left {
+	border-left-width: 0.5px!important;
+	border-color: $uv-bordercolor!important;
+    border-left-style: solid;
+}
+
+.uv-border-right {
+	border-right-width: 0.5px!important;
+	border-color: $uv-bordercolor!important;
+    border-right-style: solid;
+}
+
+.uv-border-bottom {
+	border-bottom-width: 0.5px!important;
+	border-color: $uv-bordercolor!important;
+    border-bottom-style: solid;
+}
+
+.uv-border-top-bottom {
+	border-top-width: 0.5px!important;
+	border-bottom-width: 0.5px!important;
+	border-color: $uv-bordercolor!important;
+    border-top-style: solid;
+    border-bottom-style: solid;
+}
+
+// 去除button的所有默认样式，让其表现跟普通的view、text元素一样
+.uv-reset-button {
+	padding: 0;
+	background-color: transparent;
+	/* #ifndef APP-PLUS */
+	font-size: inherit;
+	line-height: inherit;
+	color: inherit;
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	border-width: 0;
+	/* #endif */
+}
+
+/* #ifndef APP-NVUE */
+.uv-reset-button::after {
+   border: none;
+}
+/* #endif */
+
+.uv-hover-class {
+	opacity: 0.7;
+}
+
diff --git a/uni_modules/uv-ui-tools/libs/css/components.scss b/uni_modules/uv-ui-tools/libs/css/components.scss
new file mode 100644
index 0000000..81ce15d
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/css/components.scss
@@ -0,0 +1,23 @@
+@mixin flex($direction: row) {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: $direction;
+}
+
+/* #ifndef APP-NVUE */
+// 由于uvui是基于nvue环境进行开发的，此环境中普通元素默认为flex-direction: column;
+// 所以在非nvue中，需要对元素进行重置为flex-direction: column; 否则可能会表现异常
+$uvui-nvue-style: true !default;
+@if $uvui-nvue-style == true {
+	view, scroll-view, swiper-item {
+		display: flex;
+		flex-direction: column;
+		flex-shrink: 0;
+		flex-grow: 0;
+		flex-basis: auto;
+		align-items: stretch;
+		align-content: flex-start;
+	}
+}
+/* #endif */
diff --git a/uni_modules/uv-ui-tools/libs/css/variable.scss b/uni_modules/uv-ui-tools/libs/css/variable.scss
new file mode 100644
index 0000000..63903c9
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/css/variable.scss
@@ -0,0 +1,111 @@
+// 超出行数，自动显示行尾省略号，最多5行
+// 来自uvui的温馨提示：当您在控制台看到此报错，说明需要在App.vue的style标签加上【lang="scss"】
+@if variable-exists(show-lines) {
+	@for $i from 1 through 5 {
+		.uv-line-#{$i} {
+			/* #ifdef APP-NVUE */
+			// nvue下，可以直接使用lines属性，这是weex特有样式
+			lines: $i;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			flex: 1;
+			/* #endif */
+
+			/* #ifndef APP-NVUE */
+			// vue下，单行和多行显示省略号需要单独处理
+			@if $i == '1' {
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+			} @else {
+				display: -webkit-box!important;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				word-break: break-all;
+				-webkit-line-clamp: $i;
+				-webkit-box-orient: vertical!important;
+			}
+			/* #endif */
+		}
+	}
+}
+@if variable-exists(show-border) {
+	$uv-bordercolor: #dadbde;
+	@if variable-exists(uv-border-color) {
+		$uv-bordercolor: $uv-border-color;
+	}
+	// 此处加上!important并非随意乱用，而是因为目前*.nvue页面编译到H5时，
+	// App.vue的样式会被uni-app的view元素的自带border属性覆盖，导致无效
+	// 综上，这是uni-app的缺陷导致我们为了多端兼容，而必须要加上!important
+	// 移动端兼容性较好，直接使用0.5px去实现细边框，不使用伪元素形式实现
+	@if variable-exists(show-border-surround) {
+		.uv-border {
+			border-width: 0.5px!important;
+			border-color: $uv-bordercolor!important;
+			border-style: solid;
+		}
+	}
+	@if variable-exists(show-border-top) {
+		.uv-border-top {
+			border-top-width: 0.5px!important;
+			border-color: $uv-bordercolor!important;
+			border-top-style: solid;
+		}
+	}
+	@if variable-exists(show-border-left) {
+		.uv-border-left {
+			border-left-width: 0.5px!important;
+			border-color: $uv-bordercolor!important;
+			border-left-style: solid;
+		}
+	}
+	@if variable-exists(show-border-right) {
+		.uv-border-right {
+			border-right-width: 0.5px!important;
+			border-color: $uv-bordercolor!important;
+			border-right-style: solid;
+		}
+	}
+	@if variable-exists(show-border-bottom) {
+		.uv-border-bottom {
+			border-bottom-width: 0.5px!important;
+			border-color: $uv-bordercolor!important;
+				border-bottom-style: solid;
+		}
+	}
+	@if variable-exists(show-border-top-bottom) {
+		.uv-border-top-bottom {
+			border-top-width: 0.5px!important;
+			border-bottom-width: 0.5px!important;
+			border-color: $uv-bordercolor!important;
+			border-top-style: solid;
+			border-bottom-style: solid;
+		}
+	}
+}
+@if variable-exists(show-reset-button) {
+	// 去除button的所有默认样式，让其表现跟普通的view、text元素一样
+	.uv-reset-button {
+		padding: 0;
+		background-color: transparent;
+		/* #ifndef APP-PLUS */
+		font-size: inherit;
+		line-height: inherit;
+		color: inherit;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		border-width: 0;
+		/* #endif */
+	}
+
+	/* #ifndef APP-NVUE */
+	.uv-reset-button::after {
+		 border: none;
+	}
+	/* #endif */
+}
+@if variable-exists(show-hover) {
+	.uv-hover-class {
+		opacity: 0.7;
+	}
+}
diff --git a/uni_modules/uv-ui-tools/libs/css/vue.scss b/uni_modules/uv-ui-tools/libs/css/vue.scss
new file mode 100644
index 0000000..bdbefdd
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/css/vue.scss
@@ -0,0 +1,40 @@
+// 历遍生成4个方向的底部安全区
+@each $d in top, right, bottom, left {
+	.uv-safe-area-inset-#{$d} {
+		padding-#{$d}: 0;
+		padding-#{$d}: constant(safe-area-inset-#{$d});  
+		padding-#{$d}: env(safe-area-inset-#{$d});  
+	}
+}
+
+//提升H5端uni.toast()的层级，避免被uvui的modal等遮盖
+/* #ifdef H5 */
+uni-toast {
+    z-index: 10090;
+}
+uni-toast .uni-toast {
+   z-index: 10090;
+}
+/* #endif */
+
+// 隐藏scroll-view的滚动条
+::-webkit-scrollbar {
+    display: none;  
+    width: 0 !important;  
+    height: 0 !important;  
+    -webkit-appearance: none;  
+    background: transparent;  
+}
+
+$uvui-nvue-style: true !default;
+@if $uvui-nvue-style == false {
+	view, scroll-view, swiper-item {
+		display: flex;
+		flex-direction: column;
+		flex-shrink: 0;
+		flex-grow: 0;
+		flex-basis: auto;
+		align-items: stretch;
+		align-content: flex-start;
+	}
+}
diff --git a/uni_modules/uv-ui-tools/libs/function/colorGradient.js b/uni_modules/uv-ui-tools/libs/function/colorGradient.js
new file mode 100644
index 0000000..55c188f
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/function/colorGradient.js
@@ -0,0 +1,134 @@
+/**
+ * 求两个颜色之间的渐变值
+ * @param {string} startColor 开始的颜色
+ * @param {string} endColor 结束的颜色
+ * @param {number} step 颜色等分的份额
+ * */
+function colorGradient(startColor = 'rgb(0, 0, 0)', endColor = 'rgb(255, 255, 255)', step = 10) {
+    const startRGB = hexToRgb(startColor, false) // 转换为rgb数组模式
+    const startR = startRGB[0]
+    const startG = startRGB[1]
+    const startB = startRGB[2]
+
+    const endRGB = hexToRgb(endColor, false)
+    const endR = endRGB[0]
+    const endG = endRGB[1]
+    const endB = endRGB[2]
+
+    const sR = (endR - startR) / step // 总差值
+    const sG = (endG - startG) / step
+    const sB = (endB - startB) / step
+    const colorArr = []
+    for (let i = 0; i < step; i++) {
+        // 计算每一步的hex值
+        let hex = rgbToHex(`rgb(${Math.round((sR * i + startR))},${Math.round((sG * i + startG))},${Math.round((sB
+			* i + startB))})`)
+        // 确保第一个颜色值为startColor的值
+        if (i === 0) hex = rgbToHex(startColor)
+        // 确保最后一个颜色值为endColor的值
+        if (i === step - 1) hex = rgbToHex(endColor)
+        colorArr.push(hex)
+    }
+    return colorArr
+}
+
+// 将hex表示方式转换为rgb表示方式(这里返回rgb数组模式)
+function hexToRgb(sColor, str = true) {
+    const reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/
+    sColor = String(sColor).toLowerCase()
+    if (sColor && reg.test(sColor)) {
+        if (sColor.length === 4) {
+            let sColorNew = '#'
+            for (let i = 1; i < 4; i += 1) {
+                sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1))
+            }
+            sColor = sColorNew
+        }
+        // 处理六位的颜色值
+        const sColorChange = []
+        for (let i = 1; i < 7; i += 2) {
+            sColorChange.push(parseInt(`0x${sColor.slice(i, i + 2)}`))
+        }
+        if (!str) {
+            return sColorChange
+        }
+        return `rgb(${sColorChange[0]},${sColorChange[1]},${sColorChange[2]})`
+    } if (/^(rgb|RGB)/.test(sColor)) {
+        const arr = sColor.replace(/(?:\(|\)|rgb|RGB)*/g, '').split(',')
+        return arr.map((val) => Number(val))
+    }
+    return sColor
+}
+
+// 将rgb表示方式转换为hex表示方式
+function rgbToHex(rgb) {
+    const _this = rgb
+    const reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/
+    if (/^(rgb|RGB)/.test(_this)) {
+        const aColor = _this.replace(/(?:\(|\)|rgb|RGB)*/g, '').split(',')
+        let strHex = '#'
+        for (let i = 0; i < aColor.length; i++) {
+            let hex = Number(aColor[i]).toString(16)
+            hex = String(hex).length == 1 ? `${0}${hex}` : hex // 保证每个rgb的值为2位
+            if (hex === '0') {
+                hex += hex
+            }
+            strHex += hex
+        }
+        if (strHex.length !== 7) {
+            strHex = _this
+        }
+        return strHex
+    } if (reg.test(_this)) {
+        const aNum = _this.replace(/#/, '').split('')
+        if (aNum.length === 6) {
+            return _this
+        } if (aNum.length === 3) {
+            let numHex = '#'
+            for (let i = 0; i < aNum.length; i += 1) {
+                numHex += (aNum[i] + aNum[i])
+            }
+            return numHex
+        }
+    } else {
+        return _this
+    }
+}
+
+/**
+* JS颜色十六进制转换为rgb或rgba,返回的格式为 rgba（255，255，255，0.5）字符串
+* sHex为传入的十六进制的色值
+* alpha为rgba的透明度
+*/
+function colorToRgba(color, alpha) {
+    color = rgbToHex(color)
+    // 十六进制颜色值的正则表达式
+    const reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/
+    /* 16进制颜色转为RGB格式 */
+    let sColor = String(color).toLowerCase()
+    if (sColor && reg.test(sColor)) {
+        if (sColor.length === 4) {
+            let sColorNew = '#'
+            for (let i = 1; i < 4; i += 1) {
+                sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1))
+            }
+            sColor = sColorNew
+        }
+        // 处理六位的颜色值
+        const sColorChange = []
+        for (let i = 1; i < 7; i += 2) {
+            sColorChange.push(parseInt(`0x${sColor.slice(i, i + 2)}`))
+        }
+        // return sColorChange.join(',')
+        return `rgba(${sColorChange.join(',')},${alpha})`
+    }
+
+    return sColor
+}
+
+export {
+    colorGradient,
+    hexToRgb,
+    rgbToHex,
+    colorToRgba
+}
diff --git a/uni_modules/uv-ui-tools/libs/function/debounce.js b/uni_modules/uv-ui-tools/libs/function/debounce.js
new file mode 100644
index 0000000..ad3996b
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/function/debounce.js
@@ -0,0 +1,29 @@
+let timeout = null
+
+/**
+ * 防抖原理：一定时间内，只有最后一次操作，再过wait毫秒后才执行函数
+ *
+ * @param {Function} func 要执行的回调函数
+ * @param {Number} wait 延时的时间
+ * @param {Boolean} immediate 是否立即执行
+ * @return null
+ */
+function debounce(func, wait = 500, immediate = false) {
+    // 清除定时器
+    if (timeout !== null) clearTimeout(timeout)
+    // 立即执行，此类情况一般用不到
+    if (immediate) {
+        const callNow = !timeout
+        timeout = setTimeout(() => {
+            timeout = null
+        }, wait)
+        if (callNow) typeof func === 'function' && func()
+    } else {
+        // 设置定时器，当最后一次操作后，timeout不会再被清除，所以在延时wait毫秒后执行func回调方法
+        timeout = setTimeout(() => {
+            typeof func === 'function' && func()
+        }, wait)
+    }
+}
+
+export default debounce
diff --git a/uni_modules/uv-ui-tools/libs/function/digit.js b/uni_modules/uv-ui-tools/libs/function/digit.js
new file mode 100644
index 0000000..c8260a0
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/function/digit.js
@@ -0,0 +1,167 @@
+let _boundaryCheckingState = true; // 是否进行越界检查的全局开关
+
+/**
+ * 把错误的数据转正
+ * @private
+ * @example strip(0.09999999999999998)=0.1
+ */
+function strip(num, precision = 15) {
+  return +parseFloat(Number(num).toPrecision(precision));
+}
+
+/**
+ * Return digits length of a number
+ * @private
+ * @param {*number} num Input number
+ */
+function digitLength(num) {
+  // Get digit length of e
+  const eSplit = num.toString().split(/[eE]/);
+  const len = (eSplit[0].split('.')[1] || '').length - +(eSplit[1] || 0);
+  return len > 0 ? len : 0;
+}
+
+/**
+ * 把小数转成整数,如果是小数则放大成整数
+ * @private
+ * @param {*number} num 输入数
+ */
+function float2Fixed(num) {
+  if (num.toString().indexOf('e') === -1) {
+    return Number(num.toString().replace('.', ''));
+  }
+  const dLen = digitLength(num);
+  return dLen > 0 ? strip(Number(num) * Math.pow(10, dLen)) : Number(num);
+}
+
+/**
+ * 检测数字是否越界，如果越界给出提示
+ * @private
+ * @param {*number} num 输入数
+ */
+function checkBoundary(num) {
+  if (_boundaryCheckingState) {
+    if (num > Number.MAX_SAFE_INTEGER || num < Number.MIN_SAFE_INTEGER) {
+      console.warn(`${num} 超出了精度限制，结果可能不正确`);
+    }
+  }
+}
+
+/**
+ * 把递归操作扁平迭代化
+ * @param {number[]} arr 要操作的数字数组
+ * @param {function} operation 迭代操作
+ * @private
+ */
+function iteratorOperation(arr, operation) {
+  const [num1, num2, ...others] = arr;
+  let res = operation(num1, num2);
+
+  others.forEach((num) => {
+    res = operation(res, num);
+  });
+
+  return res;
+}
+
+/**
+ * 高精度乘法
+ * @export
+ */
+export function times(...nums) {
+  if (nums.length > 2) {
+    return iteratorOperation(nums, times);
+  }
+
+  const [num1, num2] = nums;
+  const num1Changed = float2Fixed(num1);
+  const num2Changed = float2Fixed(num2);
+  const baseNum = digitLength(num1) + digitLength(num2);
+  const leftValue = num1Changed * num2Changed;
+
+  checkBoundary(leftValue);
+
+  return leftValue / Math.pow(10, baseNum);
+}
+
+/**
+ * 高精度加法
+ * @export
+ */
+export function plus(...nums) {
+  if (nums.length > 2) {
+    return iteratorOperation(nums, plus);
+  }
+
+  const [num1, num2] = nums;
+  // 取最大的小数位
+  const baseNum = Math.pow(10, Math.max(digitLength(num1), digitLength(num2)));
+  // 把小数都转为整数然后再计算
+  return (times(num1, baseNum) + times(num2, baseNum)) / baseNum;
+}
+
+/**
+ * 高精度减法
+ * @export
+ */
+export function minus(...nums) {
+  if (nums.length > 2) {
+    return iteratorOperation(nums, minus);
+  }
+
+  const [num1, num2] = nums;
+  const baseNum = Math.pow(10, Math.max(digitLength(num1), digitLength(num2)));
+  return (times(num1, baseNum) - times(num2, baseNum)) / baseNum;
+}
+
+/**
+ * 高精度除法
+ * @export
+ */
+export function divide(...nums) {
+  if (nums.length > 2) {
+    return iteratorOperation(nums, divide);
+  }
+
+  const [num1, num2] = nums;
+  const num1Changed = float2Fixed(num1);
+  const num2Changed = float2Fixed(num2);
+  checkBoundary(num1Changed);
+  checkBoundary(num2Changed);
+  // 重要，这里必须用strip进行修正
+  return times(num1Changed / num2Changed, strip(Math.pow(10, digitLength(num2) - digitLength(num1))));
+}
+
+/**
+ * 四舍五入
+ * @export
+ */
+export function round(num, ratio) {
+  const base = Math.pow(10, ratio);
+  let result = divide(Math.round(Math.abs(times(num, base))), base);
+  if (num < 0 && result !== 0) {
+    result = times(result, -1);
+  }
+  // 位数不足则补0
+  return result;
+}
+
+/**
+ * 是否进行边界检查，默认开启
+ * @param flag 标记开关，true 为开启，false 为关闭，默认为 true
+ * @export
+ */
+export function enableBoundaryChecking(flag = true) {
+  _boundaryCheckingState = flag;
+}
+
+
+export default {
+  times,
+  plus,
+  minus,
+  divide,
+  round,
+  enableBoundaryChecking,
+};
+
diff --git a/uni_modules/uv-ui-tools/libs/function/index.js b/uni_modules/uv-ui-tools/libs/function/index.js
new file mode 100644
index 0000000..b35e0ab
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/function/index.js
@@ -0,0 +1,734 @@
+import { number, empty } from './test.js'
+import { round } from './digit.js'
+/**
+ * @description 如果value小于min，取min；如果value大于max，取max
+ * @param {number} min
+ * @param {number} max
+ * @param {number} value
+ */
+function range(min = 0, max = 0, value = 0) {
+	return Math.max(min, Math.min(max, Number(value)))
+}
+
+/**
+ * @description 用于获取用户传递值的px值  如果用户传递了"xxpx"或者"xxrpx"，取出其数值部分，如果是"xxxrpx"还需要用过uni.upx2px进行转换
+ * @param {number|string} value 用户传递值的px值
+ * @param {boolean} unit
+ * @returns {number|string}
+ */
+function getPx(value, unit = false) {
+	if (number(value)) {
+		return unit ? `${value}px` : Number(value)
+	}
+	// 如果带有rpx，先取出其数值部分，再转为px值
+	if (/(rpx|upx)$/.test(value)) {
+		return unit ? `${uni.upx2px(parseInt(value))}px` : Number(uni.upx2px(parseInt(value)))
+	}
+	return unit ? `${parseInt(value)}px` : parseInt(value)
+}
+
+/**
+ * @description 进行延时，以达到可以简写代码的目的 比如: await uni.$uv.sleep(20)将会阻塞20ms
+ * @param {number} value 堵塞时间 单位ms 毫秒
+ * @returns {Promise} 返回promise
+ */
+function sleep(value = 30) {
+	return new Promise((resolve) => {
+		setTimeout(() => {
+			resolve()
+		}, value)
+	})
+}
+/**
+ * @description 运行期判断平台
+ * @returns {string} 返回所在平台(小写)
+ * @link 运行期判断平台 https://uniapp.dcloud.io/frame?id=判断平台
+ */
+function os() {
+	return uni.getSystemInfoSync().platform.toLowerCase()
+}
+/**
+ * @description 获取系统信息同步接口
+ * @link 获取系统信息同步接口 https://uniapp.dcloud.io/api/system/info?id=getsysteminfosync
+ */
+function sys() {
+	return uni.getSystemInfoSync()
+}
+
+/**
+ * @description 取一个区间数
+ * @param {Number} min 最小值
+ * @param {Number} max 最大值
+ */
+function random(min, max) {
+	if (min >= 0 && max > 0 && max >= min) {
+		const gab = max - min + 1
+		return Math.floor(Math.random() * gab + min)
+	}
+	return 0
+}
+
+/**
+ * @param {Number} len uuid的长度
+ * @param {Boolean} firstU 将返回的首字母置为"u"
+ * @param {Nubmer} radix 生成uuid的基数(意味着返回的字符串都是这个基数),2-二进制,8-八进制,10-十进制,16-十六进制
+ */
+function guid(len = 32, firstU = true, radix = null) {
+	const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('')
+	const uuid = []
+	radix = radix || chars.length
+
+	if (len) {
+		// 如果指定uuid长度,只是取随机的字符,0|x为位运算,能去掉x的小数位,返回整数位
+		for (let i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix]
+	} else {
+		let r
+		// rfc4122标准要求返回的uuid中,某些位为固定的字符
+		uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-'
+		uuid[14] = '4'
+
+		for (let i = 0; i < 36; i++) {
+			if (!uuid[i]) {
+				r = 0 | Math.random() * 16
+				uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r]
+			}
+		}
+	}
+	// 移除第一个字符,并用u替代,因为第一个字符为数值时,该guuid不能用作id或者class
+	if (firstU) {
+		uuid.shift()
+		return `u${uuid.join('')}`
+	}
+	return uuid.join('')
+}
+
+/**
+* @description 获取父组件的参数，因为支付宝小程序不支持provide/inject的写法
+   this.$parent在非H5中，可以准确获取到父组件，但是在H5中，需要多次this.$parent.$parent.xxx
+   这里默认值等于undefined有它的含义，因为最顶层元素(组件)的$parent就是undefined，意味着不传name
+   值(默认为undefined)，就是查找最顶层的$parent
+*  @param {string|undefined} name 父组件的参数名
+*/
+function $parent(name = undefined) {
+	let parent = this.$parent
+	// 通过while历遍，这里主要是为了H5需要多层解析的问题
+	while (parent) {
+		// 父组件
+		if (parent.$options && parent.$options.name !== name) {
+			// 如果组件的name不相等，继续上一级寻找
+			parent = parent.$parent
+		} else {
+			return parent
+		}
+	}
+	return false
+}
+
+/**
+ * @description 样式转换
+ * 对象转字符串，或者字符串转对象
+ * @param {object | string} customStyle 需要转换的目标
+ * @param {String} target 转换的目的，object-转为对象，string-转为字符串
+ * @returns {object|string}
+ */
+function addStyle(customStyle, target = 'object') {
+	// 字符串转字符串，对象转对象情形，直接返回
+	if (empty(customStyle) || typeof(customStyle) === 'object' && target === 'object' || target === 'string' &&
+		typeof(customStyle) === 'string') {
+		return customStyle
+	}
+	// 字符串转对象
+	if (target === 'object') {
+		// 去除字符串样式中的两端空格(中间的空格不能去掉，比如padding: 20px 0如果去掉了就错了)，空格是无用的
+		customStyle = trim(customStyle)
+		// 根据";"将字符串转为数组形式
+		const styleArray = customStyle.split(';')
+		const style = {}
+		// 历遍数组，拼接成对象
+		for (let i = 0; i < styleArray.length; i++) {
+			// 'font-size:20px;color:red;'，如此最后字符串有";"的话，会导致styleArray最后一个元素为空字符串，这里需要过滤
+			if (styleArray[i]) {
+				const item = styleArray[i].split(':')
+				style[trim(item[0])] = trim(item[1])
+			}
+		}
+		return style
+	}
+	// 这里为对象转字符串形式
+	let string = ''
+	for (const i in customStyle) {
+		// 驼峰转为中划线的形式，否则css内联样式，无法识别驼峰样式属性名
+		const key = i.replace(/([A-Z])/g, '-$1').toLowerCase()
+		string += `${key}:${customStyle[i]};`
+	}
+	// 去除两端空格
+	return trim(string)
+}
+
+/**
+ * @description 添加单位，如果有rpx，upx，%，px等单位结尾或者值为auto，直接返回，否则加上px单位结尾
+ * @param {string|number} value 需要添加单位的值
+ * @param {string} unit 添加的单位名 比如px
+ */
+function addUnit(value = 'auto', unit = uni?.$uv?.config?.unit ? uni?.$uv?.config?.unit : 'px') {
+	value = String(value)
+	// 用uvui内置验证规则中的number判断是否为数值
+	return number(value) ? `${value}${unit}` : value
+}
+
+/**
+ * @description 深度克隆
+ * @param {object} obj 需要深度克隆的对象
+ * @param cache 缓存
+ * @returns {*} 克隆后的对象或者原值（不是对象）
+ */
+function deepClone(obj, cache = new WeakMap()) {
+	if (obj === null || typeof obj !== 'object') return obj;
+	if (cache.has(obj)) return cache.get(obj);
+	let clone;
+	if (obj instanceof Date) {
+		clone = new Date(obj.getTime());
+	} else if (obj instanceof RegExp) {
+		clone = new RegExp(obj);
+	} else if (obj instanceof Map) {
+		clone = new Map(Array.from(obj, ([key, value]) => [key, deepClone(value, cache)]));
+	} else if (obj instanceof Set) {
+		clone = new Set(Array.from(obj, value => deepClone(value, cache)));
+	} else if (Array.isArray(obj)) {
+		clone = obj.map(value => deepClone(value, cache));
+	} else if (Object.prototype.toString.call(obj) === '[object Object]') {
+		clone = Object.create(Object.getPrototypeOf(obj));
+		cache.set(obj, clone);
+		for (const [key, value] of Object.entries(obj)) {
+			clone[key] = deepClone(value, cache);
+		}
+	} else {
+		clone = Object.assign({}, obj);
+	}
+	cache.set(obj, clone);
+	return clone;
+}
+
+/**
+ * @description JS对象深度合并
+ * @param {object} target 需要拷贝的对象
+ * @param {object} source 拷贝的来源对象
+ * @returns {object|boolean} 深度合并后的对象或者false（入参有不是对象）
+ */
+function deepMerge(target = {}, source = {}) {
+	target = deepClone(target)
+	if (typeof target !== 'object' || target === null || typeof source !== 'object' || source === null) return target;
+	const merged = Array.isArray(target) ? target.slice() : Object.assign({}, target);
+	for (const prop in source) {
+		if (!source.hasOwnProperty(prop)) continue;
+		const sourceValue = source[prop];
+		const targetValue = merged[prop];
+		if (sourceValue instanceof Date) {
+			merged[prop] = new Date(sourceValue);
+		} else if (sourceValue instanceof RegExp) {
+			merged[prop] = new RegExp(sourceValue);
+		} else if (sourceValue instanceof Map) {
+			merged[prop] = new Map(sourceValue);
+		} else if (sourceValue instanceof Set) {
+			merged[prop] = new Set(sourceValue);
+		} else if (typeof sourceValue === 'object' && sourceValue !== null) {
+			merged[prop] = deepMerge(targetValue, sourceValue);
+		} else {
+			merged[prop] = sourceValue;
+		}
+	}
+	return merged;
+}
+
+/**
+ * @description error提示
+ * @param {*} err 错误内容
+ */
+function error(err) {
+	// 开发环境才提示，生产环境不会提示
+	if (process.env.NODE_ENV === 'development') {
+		console.error(`uvui提示：${err}`)
+	}
+}
+
+/**
+ * @description 打乱数组
+ * @param {array} array 需要打乱的数组
+ * @returns {array} 打乱后的数组
+ */
+function randomArray(array = []) {
+	// 原理是sort排序,Math.random()产生0<= x < 1之间的数,会导致x-0.05大于或者小于0
+	return array.sort(() => Math.random() - 0.5)
+}
+
+// padStart 的 polyfill，因为某些机型或情况，还无法支持es7的padStart，比如电脑版的微信小程序
+// 所以这里做一个兼容polyfill的兼容处理
+if (!String.prototype.padStart) {
+	// 为了方便表示这里 fillString 用了ES6 的默认参数，不影响理解
+	String.prototype.padStart = function(maxLength, fillString = ' ') {
+		if (Object.prototype.toString.call(fillString) !== '[object String]') {
+			throw new TypeError(
+				'fillString must be String'
+			)
+		}
+		const str = this
+		// 返回 String(str) 这里是为了使返回的值是字符串字面量，在控制台中更符合直觉
+		if (str.length >= maxLength) return String(str)
+
+		const fillLength = maxLength - str.length
+		let times = Math.ceil(fillLength / fillString.length)
+		while (times >>= 1) {
+			fillString += fillString
+			if (times === 1) {
+				fillString += fillString
+			}
+		}
+		return fillString.slice(0, fillLength) + str
+	}
+}
+
+/**
+ * @description 格式化时间
+ * @param {String|Number} dateTime 需要格式化的时间戳
+ * @param {String} fmt 格式化规则 yyyy:mm:dd|yyyy:mm|yyyy年mm月dd日|yyyy年mm月dd日 hh时MM分等,可自定义组合 默认yyyy-mm-dd
+ * @returns {string} 返回格式化后的字符串
+ */
+function timeFormat(dateTime = null, formatStr = 'yyyy-mm-dd') {
+	let date
+	// 若传入时间为假值，则取当前时间
+	if (!dateTime) {
+		date = new Date()
+	}
+	// 若为unix秒时间戳，则转为毫秒时间戳（逻辑有点奇怪，但不敢改，以保证历史兼容）
+	else if (/^\d{10}$/.test(dateTime?.toString().trim())) {
+		date = new Date(dateTime * 1000)
+	}
+	// 若用户传入字符串格式时间戳，new Date无法解析，需做兼容
+	else if (typeof dateTime === 'string' && /^\d+$/.test(dateTime.trim())) {
+		date = new Date(Number(dateTime))
+	}
+	// 处理平台性差异，在Safari/Webkit中，new Date仅支持/作为分割符的字符串时间
+	// 处理 '2022-07-10 01:02:03'，跳过 '2022-07-10T01:02:03'
+	else if (typeof dateTime === 'string' && dateTime.includes('-') && !dateTime.includes('T')) {
+		date = new Date(dateTime.replace(/-/g, '/'))
+	}
+	// 其他都认为符合 RFC 2822 规范
+	else {
+		date = new Date(dateTime)
+	}
+
+	const timeSource = {
+		'y': date.getFullYear().toString(), // 年
+		'm': (date.getMonth() + 1).toString().padStart(2, '0'), // 月
+		'd': date.getDate().toString().padStart(2, '0'), // 日
+		'h': date.getHours().toString().padStart(2, '0'), // 时
+		'M': date.getMinutes().toString().padStart(2, '0'), // 分
+		's': date.getSeconds().toString().padStart(2, '0') // 秒
+		// 有其他格式化字符需求可以继续添加，必须转化成字符串
+	}
+
+	for (const key in timeSource) {
+		const [ret] = new RegExp(`${key}+`).exec(formatStr) || []
+		if (ret) {
+			// 年可能只需展示两位
+			const beginIndex = key === 'y' && ret.length === 2 ? 2 : 0
+			formatStr = formatStr.replace(ret, timeSource[key].slice(beginIndex))
+		}
+	}
+
+	return formatStr
+}
+
+/**
+ * @description 时间戳转为多久之前
+ * @param {String|Number} timestamp 时间戳
+ * @param {String|Boolean} format
+ * 格式化规则如果为时间格式字符串，超出一定时间范围，返回固定的时间格式；
+ * 如果为布尔值false，无论什么时间，都返回多久以前的格式
+ * @returns {string} 转化后的内容
+ */
+function timeFrom(timestamp = null, format = 'yyyy-mm-dd') {
+	if (timestamp == null) timestamp = Number(new Date())
+	timestamp = parseInt(timestamp)
+	// 判断用户输入的时间戳是秒还是毫秒,一般前端js获取的时间戳是毫秒(13位),后端传过来的为秒(10位)
+	if (timestamp.toString().length == 10) timestamp *= 1000
+	let timer = (new Date()).getTime() - timestamp
+	timer = parseInt(timer / 1000)
+	// 如果小于5分钟,则返回"刚刚",其他以此类推
+	let tips = ''
+	switch (true) {
+		case timer < 300:
+			tips = '刚刚'
+			break
+		case timer >= 300 && timer < 3600:
+			tips = `${parseInt(timer / 60)}分钟前`
+			break
+		case timer >= 3600 && timer < 86400:
+			tips = `${parseInt(timer / 3600)}小时前`
+			break
+		case timer >= 86400 && timer < 2592000:
+			tips = `${parseInt(timer / 86400)}天前`
+			break
+		default:
+			// 如果format为false，则无论什么时间戳，都显示xx之前
+			if (format === false) {
+				if (timer >= 2592000 && timer < 365 * 86400) {
+					tips = `${parseInt(timer / (86400 * 30))}个月前`
+				} else {
+					tips = `${parseInt(timer / (86400 * 365))}年前`
+				}
+			} else {
+				tips = timeFormat(timestamp, format)
+			}
+	}
+	return tips
+}
+
+/**
+ * @description 去除空格
+ * @param String str 需要去除空格的字符串
+ * @param String pos both(左右)|left|right|all 默认both
+ */
+function trim(str, pos = 'both') {
+	str = String(str)
+	if (pos == 'both') {
+		return str.replace(/^\s+|\s+$/g, '')
+	}
+	if (pos == 'left') {
+		return str.replace(/^\s*/, '')
+	}
+	if (pos == 'right') {
+		return str.replace(/(\s*$)/g, '')
+	}
+	if (pos == 'all') {
+		return str.replace(/\s+/g, '')
+	}
+	return str
+}
+
+/**
+ * @description 对象转url参数
+ * @param {object} data,对象
+ * @param {Boolean} isPrefix,是否自动加上"?"
+ * @param {string} arrayFormat 规则 indices|brackets|repeat|comma
+ */
+function queryParams(data = {}, isPrefix = true, arrayFormat = 'brackets') {
+	const prefix = isPrefix ? '?' : ''
+	const _result = []
+	if (['indices', 'brackets', 'repeat', 'comma'].indexOf(arrayFormat) == -1) arrayFormat = 'brackets'
+	for (const key in data) {
+		const value = data[key]
+		// 去掉为空的参数
+		if (['', undefined, null].indexOf(value) >= 0) {
+			continue
+		}
+		// 如果值为数组，另行处理
+		if (value.constructor === Array) {
+			// e.g. {ids: [1, 2, 3]}
+			switch (arrayFormat) {
+				case 'indices':
+					// 结果: ids[0]=1&ids[1]=2&ids[2]=3
+					for (let i = 0; i < value.length; i++) {
+						_result.push(`${key}[${i}]=${value[i]}`)
+					}
+					break
+				case 'brackets':
+					// 结果: ids[]=1&ids[]=2&ids[]=3
+					value.forEach((_value) => {
+						_result.push(`${key}[]=${_value}`)
+					})
+					break
+				case 'repeat':
+					// 结果: ids=1&ids=2&ids=3
+					value.forEach((_value) => {
+						_result.push(`${key}=${_value}`)
+					})
+					break
+				case 'comma':
+					// 结果: ids=1,2,3
+					let commaStr = ''
+					value.forEach((_value) => {
+						commaStr += (commaStr ? ',' : '') + _value
+					})
+					_result.push(`${key}=${commaStr}`)
+					break
+				default:
+					value.forEach((_value) => {
+						_result.push(`${key}[]=${_value}`)
+					})
+			}
+		} else {
+			_result.push(`${key}=${value}`)
+		}
+	}
+	return _result.length ? prefix + _result.join('&') : ''
+}
+
+/**
+ * 显示消息提示框
+ * @param {String} title 提示的内容，长度与 icon 取值有关。
+ * @param {Number} duration 提示的延迟时间，单位毫秒，默认：2000
+ */
+function toast(title, duration = 2000) {
+	uni.showToast({
+		title: String(title),
+		icon: 'none',
+		duration
+	})
+}
+
+/**
+ * @description 根据主题type值,获取对应的图标
+ * @param {String} type 主题名称,primary|info|error|warning|success
+ * @param {boolean} fill 是否使用fill填充实体的图标
+ */
+function type2icon(type = 'success', fill = false) {
+	// 如果非预置值,默认为success
+	if (['primary', 'info', 'error', 'warning', 'success'].indexOf(type) == -1) type = 'success'
+	let iconName = ''
+	// 目前(2019-12-12),info和primary使用同一个图标
+	switch (type) {
+		case 'primary':
+			iconName = 'info-circle'
+			break
+		case 'info':
+			iconName = 'info-circle'
+			break
+		case 'error':
+			iconName = 'close-circle'
+			break
+		case 'warning':
+			iconName = 'error-circle'
+			break
+		case 'success':
+			iconName = 'checkmark-circle'
+			break
+		default:
+			iconName = 'checkmark-circle'
+	}
+	// 是否是实体类型,加上-fill,在icon组件库中,实体的类名是后面加-fill的
+	if (fill) iconName += '-fill'
+	return iconName
+}
+
+/**
+ * @description 数字格式化
+ * @param {number|string} number 要格式化的数字
+ * @param {number} decimals 保留几位小数
+ * @param {string} decimalPoint 小数点符号
+ * @param {string} thousandsSeparator 千分位符号
+ * @returns {string} 格式化后的数字
+ */
+function priceFormat(number, decimals = 0, decimalPoint = '.', thousandsSeparator = ',') {
+	number = (`${number}`).replace(/[^0-9+-Ee.]/g, '')
+	const n = !isFinite(+number) ? 0 : +number
+	const prec = !isFinite(+decimals) ? 0 : Math.abs(decimals)
+	const sep = (typeof thousandsSeparator === 'undefined') ? ',' : thousandsSeparator
+	const dec = (typeof decimalPoint === 'undefined') ? '.' : decimalPoint
+	let s = ''
+
+	s = (prec ? round(n, prec) + '' : `${Math.round(n)}`).split('.')
+	const re = /(-?\d+)(\d{3})/
+	while (re.test(s[0])) {
+		s[0] = s[0].replace(re, `$1${sep}$2`)
+	}
+
+	if ((s[1] || '').length < prec) {
+		s[1] = s[1] || ''
+		s[1] += new Array(prec - s[1].length + 1).join('0')
+	}
+	return s.join(dec)
+}
+
+/**
+ * @description 获取duration值
+ * 如果带有ms或者s直接返回，如果大于一定值，认为是ms单位，小于一定值，认为是s单位
+ * 比如以30位阈值，那么300大于30，可以理解为用户想要的是300ms，而不是想花300s去执行一个动画
+ * @param {String|number} value 比如: "1s"|"100ms"|1|100
+ * @param {boolean} unit  提示: 如果是false 默认返回number
+ * @return {string|number}
+ */
+function getDuration(value, unit = true) {
+	const valueNum = parseInt(value)
+	if (unit) {
+		if (/s$/.test(value)) return value
+		return value > 30 ? `${value}ms` : `${value}s`
+	}
+	if (/ms$/.test(value)) return valueNum
+	if (/s$/.test(value)) return valueNum > 30 ? valueNum : valueNum * 1000
+	return valueNum
+}
+
+/**
+ * @description 日期的月或日补零操作
+ * @param {String} value 需要补零的值
+ */
+function padZero(value) {
+	return `00${value}`.slice(-2)
+}
+
+/**
+ * @description 在uv-form的子组件内容发生变化，或者失去焦点时，尝试通知uv-form执行校验方法
+ * @param {*} instance
+ * @param {*} event
+ */
+function formValidate(instance, event) {
+	const formItem = $parent.call(instance, 'uv-form-item')
+	const form = $parent.call(instance, 'uv-form')
+	// 如果发生变化的input或者textarea等，其父组件中有uv-form-item或者uv-form等，就执行form的validate方法
+	// 同时将form-item的pros传递给form，让其进行精确对象验证
+	if (formItem && form) {
+		form.validateField(formItem.prop, () => {}, event)
+	}
+}
+
+/**
+ * @description 获取某个对象下的属性，用于通过类似'a.b.c'的形式去获取一个对象的的属性的形式
+ * @param {object} obj 对象
+ * @param {string} key 需要获取的属性字段
+ * @returns {*}
+ */
+function getProperty(obj, key) {
+	if (!obj) {
+		return
+	}
+	if (typeof key !== 'string' || key === '') {
+		return ''
+	}
+	if (key.indexOf('.') !== -1) {
+		const keys = key.split('.')
+		let firstObj = obj[keys[0]] || {}
+
+		for (let i = 1; i < keys.length; i++) {
+			if (firstObj) {
+				firstObj = firstObj[keys[i]]
+			}
+		}
+		return firstObj
+	}
+	return obj[key]
+}
+
+/**
+ * @description 设置对象的属性值，如果'a.b.c'的形式进行设置
+ * @param {object} obj 对象
+ * @param {string} key 需要设置的属性
+ * @param {string} value 设置的值
+ */
+function setProperty(obj, key, value) {
+	if (!obj) {
+		return
+	}
+	// 递归赋值
+	const inFn = function(_obj, keys, v) {
+		// 最后一个属性key
+		if (keys.length === 1) {
+			_obj[keys[0]] = v
+			return
+		}
+		// 0~length-1个key
+		while (keys.length > 1) {
+			const k = keys[0]
+			if (!_obj[k] || (typeof _obj[k] !== 'object')) {
+				_obj[k] = {}
+			}
+			const key = keys.shift()
+			// 自调用判断是否存在属性，不存在则自动创建对象
+			inFn(_obj[k], keys, v)
+		}
+	}
+
+	if (typeof key !== 'string' || key === '') {
+
+	} else if (key.indexOf('.') !== -1) { // 支持多层级赋值操作
+		const keys = key.split('.')
+		inFn(obj, keys, value)
+	} else {
+		obj[key] = value
+	}
+}
+
+/**
+ * @description 获取当前页面路径
+ */
+function page() {
+	const pages = getCurrentPages();
+	const route = pages[pages.length - 1]?.route;
+	// 某些特殊情况下(比如页面进行redirectTo时的一些时机)，pages可能为空数组
+	return `/${route ? route : ''}`
+}
+
+/**
+ * @description 获取当前路由栈实例数组
+ */
+function pages() {
+	const pages = getCurrentPages()
+	return pages
+}
+
+/**
+ * 获取页面历史栈指定层实例
+ * @param back {number} [0] - 0或者负数，表示获取历史栈的哪一层，0表示获取当前页面实例，-1 表示获取上一个页面实例。默认0。
+ */
+function getHistoryPage(back = 0) {
+	const pages = getCurrentPages()
+	const len = pages.length
+	return pages[len - 1 + back]
+}
+
+
+
+/**
+ * @description 修改uvui内置属性值
+ * @param {object} props 修改内置props属性
+ * @param {object} config 修改内置config属性
+ * @param {object} color 修改内置color属性
+ * @param {object} zIndex 修改内置zIndex属性
+ */
+function setConfig({
+	props = {},
+	config = {},
+	color = {},
+	zIndex = {}
+}) {
+	const {
+		deepMerge,
+	} = uni.$uv
+	uni.$uv.config = deepMerge(uni.$uv.config, config)
+	uni.$uv.props = deepMerge(uni.$uv.props, props)
+	uni.$uv.color = deepMerge(uni.$uv.color, color)
+	uni.$uv.zIndex = deepMerge(uni.$uv.zIndex, zIndex)
+}
+
+export {
+	range,
+	getPx,
+	sleep,
+	os,
+	sys,
+	random,
+	guid,
+	$parent,
+	addStyle,
+	addUnit,
+	deepClone,
+	deepMerge,
+	error,
+	randomArray,
+	timeFormat,
+	timeFrom,
+	trim,
+	queryParams,
+	toast,
+	type2icon,
+	priceFormat,
+	getDuration,
+	padZero,
+	formValidate,
+	getProperty,
+	setProperty,
+	page,
+	pages,
+	getHistoryPage,
+	setConfig
+}
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/libs/function/platform.js b/uni_modules/uv-ui-tools/libs/function/platform.js
new file mode 100644
index 0000000..d6b926e
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/function/platform.js
@@ -0,0 +1,75 @@
+/**
+ * 注意：
+ * 此部分内容，在vue-cli模式下，需要在vue.config.js加入如下内容才有效：
+ * module.exports = {
+ *     transpileDependencies: ['uview-v2']
+ * }
+ */
+
+let platform = 'none'
+
+// #ifdef VUE3
+platform = 'vue3'
+// #endif
+
+// #ifdef VUE2
+platform = 'vue2'
+// #endif
+
+// #ifdef APP-PLUS
+platform = 'plus'
+// #endif
+
+// #ifdef APP-NVUE
+platform = 'nvue'
+// #endif
+
+// #ifdef H5
+platform = 'h5'
+// #endif
+
+// #ifdef MP-WEIXIN
+platform = 'weixin'
+// #endif
+
+// #ifdef MP-ALIPAY
+platform = 'alipay'
+// #endif
+
+// #ifdef MP-BAIDU
+platform = 'baidu'
+// #endif
+
+// #ifdef MP-TOUTIAO
+platform = 'toutiao'
+// #endif
+
+// #ifdef MP-QQ
+platform = 'qq'
+// #endif
+
+// #ifdef MP-KUAISHOU
+platform = 'kuaishou'
+// #endif
+
+// #ifdef MP-360
+platform = '360'
+// #endif
+
+// #ifdef MP
+platform = 'mp'
+// #endif
+
+// #ifdef QUICKAPP-WEBVIEW
+platform = 'quickapp-webview'
+// #endif
+
+// #ifdef QUICKAPP-WEBVIEW-HUAWEI
+platform = 'quickapp-webview-huawei'
+// #endif
+
+// #ifdef QUICKAPP-WEBVIEW-UNION
+platform = 'quckapp-webview-union'
+// #endif
+
+export default platform
diff --git a/uni_modules/uv-ui-tools/libs/function/test.js b/uni_modules/uv-ui-tools/libs/function/test.js
new file mode 100644
index 0000000..7c8b747
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/function/test.js
@@ -0,0 +1,287 @@
+/**
+ * 验证电子邮箱格式
+ */
+function email(value) {
+    return /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/.test(value)
+}
+
+/**
+ * 验证手机格式
+ */
+function mobile(value) {
+    return /^1([3589]\d|4[5-9]|6[1-2,4-7]|7[0-8])\d{8}$/.test(value)
+}
+
+/**
+ * 验证URL格式
+ */
+function url(value) {
+    return /^((https|http|ftp|rtsp|mms):\/\/)(([0-9a-zA-Z_!~*'().&=+$%-]+: )?[0-9a-zA-Z_!~*'().&=+$%-]+@)?(([0-9]{1,3}.){3}[0-9]{1,3}|([0-9a-zA-Z_!~*'()-]+.)*([0-9a-zA-Z][0-9a-zA-Z-]{0,61})?[0-9a-zA-Z].[a-zA-Z]{2,6})(:[0-9]{1,4})?((\/?)|(\/[0-9a-zA-Z_!~*'().;?:@&=+$,%#-]+)+\/?)$/
+        .test(value)
+}
+
+/**
+ * 验证日期格式
+ */
+function date(value) {
+    if (!value) return false
+    // 判断是否数值或者字符串数值(意味着为时间戳)，转为数值，否则new Date无法识别字符串时间戳
+    if (number(value)) value = +value
+    return !/Invalid|NaN/.test(new Date(value).toString())
+}
+
+/**
+ * 验证ISO类型的日期格式
+ */
+function dateISO(value) {
+    return /^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test(value)
+}
+
+/**
+ * 验证十进制数字
+ */
+function number(value) {
+    return /^[\+-]?(\d+\.?\d*|\.\d+|\d\.\d+e\+\d+)$/.test(value)
+}
+
+/**
+ * 验证字符串
+ */
+function string(value) {
+    return typeof value === 'string'
+}
+
+/**
+ * 验证整数
+ */
+function digits(value) {
+    return /^\d+$/.test(value)
+}
+
+/**
+ * 验证身份证号码
+ */
+function idCard(value) {
+    return /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(
+        value
+    )
+}
+
+/**
+ * 是否车牌号
+ */
+function carNo(value) {
+    // 新能源车牌
+    const xreg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DF]$)|([DF][A-HJ-NP-Z0-9][0-9]{4}$))/
+    // 旧车牌
+    const creg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1}$/
+    if (value.length === 7) {
+        return creg.test(value)
+    } if (value.length === 8) {
+        return xreg.test(value)
+    }
+    return false
+}
+
+/**
+ * 金额,只允许2位小数
+ */
+function amount(value) {
+    // 金额，只允许保留两位小数
+    return /^[1-9]\d*(,\d{3})*(\.\d{1,2})?$|^0\.\d{1,2}$/.test(value)
+}
+
+/**
+ * 中文
+ */
+function chinese(value) {
+    const reg = /^[\u4e00-\u9fa5]+$/gi
+    return reg.test(value)
+}
+
+/**
+ * 只能输入字母
+ */
+function letter(value) {
+    return /^[a-zA-Z]*$/.test(value)
+}
+
+/**
+ * 只能是字母或者数字
+ */
+function enOrNum(value) {
+    // 英文或者数字
+    const reg = /^[0-9a-zA-Z]*$/g
+    return reg.test(value)
+}
+
+/**
+ * 验证是否包含某个值
+ */
+function contains(value, param) {
+    return value.indexOf(param) >= 0
+}
+
+/**
+ * 验证一个值范围[min, max]
+ */
+function range(value, param) {
+    return value >= param[0] && value <= param[1]
+}
+
+/**
+ * 验证一个长度范围[min, max]
+ */
+function rangeLength(value, param) {
+    return value.length >= param[0] && value.length <= param[1]
+}
+
+/**
+ * 是否固定电话
+ */
+function landline(value) {
+    const reg = /^\d{3,4}-\d{7,8}(-\d{3,4})?$/
+    return reg.test(value)
+}
+
+/**
+ * 判断是否为空
+ */
+function empty(value) {
+    switch (typeof value) {
+    case 'undefined':
+        return true
+    case 'string':
+        if (value.replace(/(^[ \t\n\r]*)|([ \t\n\r]*$)/g, '').length == 0) return true
+        break
+    case 'boolean':
+        if (!value) return true
+        break
+    case 'number':
+        if (value === 0 || isNaN(value)) return true
+        break
+    case 'object':
+        if (value === null || value.length === 0) return true
+        for (const i in value) {
+            return false
+        }
+        return true
+    }
+    return false
+}
+
+/**
+ * 是否json字符串
+ */
+function jsonString(value) {
+    if (typeof value === 'string') {
+        try {
+            const obj = JSON.parse(value)
+            if (typeof obj === 'object' && obj) {
+                return true
+            }
+            return false
+        } catch (e) {
+            return false
+        }
+    }
+    return false
+}
+
+/**
+ * 是否数组
+ */
+function array(value) {
+    if (typeof Array.isArray === 'function') {
+        return Array.isArray(value)
+    }
+    return Object.prototype.toString.call(value) === '[object Array]'
+}
+
+/**
+ * 是否对象
+ */
+function object(value) {
+    return Object.prototype.toString.call(value) === '[object Object]'
+}
+
+/**
+ * 是否短信验证码
+ */
+function code(value, len = 6) {
+    return new RegExp(`^\\d{${len}}$`).test(value)
+}
+
+/**
+ * 是否函数方法
+ * @param {Object} value
+ */
+function func(value) {
+    return typeof value === 'function'
+}
+
+/**
+ * 是否promise对象
+ * @param {Object} value
+ */
+function promise(value) {
+    return object(value) && func(value.then) && func(value.catch)
+}
+
+/** 是否图片格式
+ * @param {Object} value
+ */
+function image(value) {
+    const newValue = value.split('?')[0]
+    const IMAGE_REGEXP = /\.(jpeg|jpg|gif|png|svg|webp|jfif|bmp|dpg)/i
+    return IMAGE_REGEXP.test(newValue)
+}
+
+/**
+ * 是否视频格式
+ * @param {Object} value
+ */
+function video(value) {
+    const VIDEO_REGEXP = /\.(mp4|mpg|mpeg|dat|asf|avi|rm|rmvb|mov|wmv|flv|mkv|m3u8)/i
+    return VIDEO_REGEXP.test(value)
+}
+
+/**
+ * 是否为正则对象
+ * @param {Object}
+ * @return {Boolean}
+ */
+function regExp(o) {
+    return o && Object.prototype.toString.call(o) === '[object RegExp]'
+}
+
+export {
+    email,
+    mobile,
+    url,
+    date,
+    dateISO,
+    number,
+    digits,
+    idCard,
+    carNo,
+    amount,
+    chinese,
+    letter,
+    enOrNum,
+    contains,
+    range,
+    rangeLength,
+    empty,
+    jsonString,
+    landline,
+    object,
+    array,
+    code,
+    func,
+    promise,
+    video,
+    image,
+    regExp,
+    string
+}
diff --git a/uni_modules/uv-ui-tools/libs/function/throttle.js b/uni_modules/uv-ui-tools/libs/function/throttle.js
new file mode 100644
index 0000000..2f33611
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/function/throttle.js
@@ -0,0 +1,30 @@
+let timer; let
+    flag
+/**
+ * 节流原理：在一定时间内，只能触发一次
+ *
+ * @param {Function} func 要执行的回调函数
+ * @param {Number} wait 延时的时间
+ * @param {Boolean} immediate 是否立即执行
+ * @return null
+ */
+function throttle(func, wait = 500, immediate = true) {
+    if (immediate) {
+        if (!flag) {
+            flag = true
+            // 如果是立即执行，则在wait毫秒内开始时执行
+            typeof func === 'function' && func()
+            timer = setTimeout(() => {
+                flag = false
+            }, wait)
+        }
+    } else if (!flag) {
+        flag = true
+        // 如果是非立即执行，则在wait毫秒内的结束处执行
+        timer = setTimeout(() => {
+            flag = false
+            typeof func === 'function' && func()
+        }, wait)
+    }
+}
+export default throttle
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/adapters/index.js b/uni_modules/uv-ui-tools/libs/luch-request/adapters/index.js
new file mode 100644
index 0000000..31a5cfc
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/adapters/index.js
@@ -0,0 +1,132 @@
+import buildURL from '../helpers/buildURL'
+import buildFullPath from '../core/buildFullPath'
+import settle from '../core/settle'
+import {isUndefined} from "../utils"
+
+/**
+ * 返回可选值存在的配置
+ * @param {Array} keys - 可选值数组
+ * @param {Object} config2 - 配置
+ * @return {{}} - 存在的配置项
+ */
+const mergeKeys = (keys, config2) => {
+  let config = {}
+  keys.forEach(prop => {
+    if (!isUndefined(config2[prop])) {
+      config[prop] = config2[prop]
+    }
+  })
+  return config
+}
+export default (config) => {
+  return new Promise((resolve, reject) => {
+    let fullPath = buildURL(buildFullPath(config.baseURL, config.url), config.params, config.paramsSerializer)
+    const _config = {
+      url: fullPath,
+      header: config.header,
+      complete: (response) => {
+        config.fullPath = fullPath
+        response.config = config
+        response.rawData = response.data
+        try {
+          let jsonParseHandle = false
+          const forcedJSONParsingType = typeof config.forcedJSONParsing
+          if (forcedJSONParsingType === 'boolean') {
+            jsonParseHandle = config.forcedJSONParsing
+          } else if (forcedJSONParsingType === 'object') {
+            const includesMethod = config.forcedJSONParsing.include || []
+            jsonParseHandle = includesMethod.includes(config.method)
+          }
+
+          // 对可能字符串不是json 的情况容错
+          if (jsonParseHandle && typeof response.data === 'string') {
+            response.data = JSON.parse(response.data)
+          }
+          // eslint-disable-next-line no-empty
+        } catch (e) {
+        }
+        settle(resolve, reject, response)
+      }
+    }
+    let requestTask
+    if (config.method === 'UPLOAD') {
+      delete _config.header['content-type']
+      delete _config.header['Content-Type']
+      let otherConfig = {
+        // #ifdef MP-ALIPAY
+        fileType: config.fileType,
+        // #endif
+        filePath: config.filePath,
+        name: config.name
+      }
+      const optionalKeys = [
+        // #ifdef APP-PLUS || H5
+        'files',
+        // #endif
+        // #ifdef H5
+        'file',
+        // #endif
+        // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+        'timeout',
+        // #endif
+        'formData'
+      ]
+      requestTask = uni.uploadFile({..._config, ...otherConfig, ...mergeKeys(optionalKeys, config)})
+    } else if (config.method === 'DOWNLOAD') {
+      const optionalKeys = [
+        // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+        'timeout',
+        // #endif
+        // #ifdef MP
+        'filePath',
+        // #endif
+      ]
+      requestTask = uni.downloadFile({..._config, ...mergeKeys(optionalKeys, config)})
+    } else {
+      const optionalKeys = [
+        'data',
+        'method',
+        // #ifdef H5 || APP-PLUS || MP-ALIPAY || MP-WEIXIN
+        'timeout',
+        // #endif
+        'dataType',
+        // #ifndef MP-ALIPAY
+        'responseType',
+        // #endif
+        // #ifdef APP-PLUS
+        'sslVerify',
+        // #endif
+        // #ifdef H5
+        'withCredentials',
+        // #endif
+        // #ifdef APP-PLUS
+        'firstIpv4',
+        // #endif
+        // #ifdef MP-WEIXIN
+        'enableHttp2',
+        'enableQuic',
+        // #endif
+        // #ifdef MP-TOUTIAO || MP-WEIXIN
+        'enableCache',
+        // #endif
+        // #ifdef MP-WEIXIN
+        'enableHttpDNS',
+        'httpDNSServiceId',
+        'enableChunked',
+        'forceCellularNetwork',
+        // #endif
+        // #ifdef MP-ALIPAY
+        'enableCookie',
+        // #endif
+        // #ifdef MP-BAIDU
+        'cloudCache',
+        'defer'
+        // #endif
+      ]
+      requestTask = uni.request({..._config, ...mergeKeys(optionalKeys, config)})
+    }
+    if (config.getTask) {
+      config.getTask(requestTask, config)
+    }
+  })
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/core/InterceptorManager.js b/uni_modules/uv-ui-tools/libs/luch-request/core/InterceptorManager.js
new file mode 100644
index 0000000..3ea0d5e
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/core/InterceptorManager.js
@@ -0,0 +1,51 @@
+'use strict'
+
+
+function InterceptorManager() {
+  this.handlers = []
+}
+
+/**
+ * Add a new interceptor to the stack
+ *
+ * @param {Function} fulfilled The function to handle `then` for a `Promise`
+ * @param {Function} rejected The function to handle `reject` for a `Promise`
+ *
+ * @return {Number} An ID used to remove interceptor later
+ */
+InterceptorManager.prototype.use = function use(fulfilled, rejected) {
+  this.handlers.push({
+    fulfilled: fulfilled,
+    rejected: rejected
+  })
+  return this.handlers.length - 1
+}
+
+/**
+ * Remove an interceptor from the stack
+ *
+ * @param {Number} id The ID that was returned by `use`
+ */
+InterceptorManager.prototype.eject = function eject(id) {
+  if (this.handlers[id]) {
+    this.handlers[id] = null
+  }
+}
+
+/**
+ * Iterate over all the registered interceptors
+ *
+ * This method is particularly useful for skipping over any
+ * interceptors that may have become `null` calling `eject`.
+ *
+ * @param {Function} fn The function to call for each interceptor
+ */
+InterceptorManager.prototype.forEach = function forEach(fn) {
+  this.handlers.forEach(h => {
+    if (h !== null) {
+      fn(h)
+    }
+  })
+}
+
+export default InterceptorManager
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/core/Request.js b/uni_modules/uv-ui-tools/libs/luch-request/core/Request.js
new file mode 100644
index 0000000..96c89a8
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/core/Request.js
@@ -0,0 +1,201 @@
+/**
+ * @Class Request
+ * @description luch-request http请求插件
+ * @Author lu-ch
+ * @Email webwork.s@qq.com
+ * 文档: https://www.quanzhan.co/luch-request/
+ * github: https://github.com/lei-mu/luch-request
+ * DCloud: http://ext.dcloud.net.cn/plugin?id=392
+ */
+
+
+import dispatchRequest from './dispatchRequest'
+import InterceptorManager from './InterceptorManager'
+import mergeConfig from './mergeConfig'
+import defaults from './defaults'
+import { isPlainObject } from '../utils'
+import clone from '../utils/clone'
+
+export default class Request {
+  /**
+   * @param {Object} arg - 全局配置
+   * @param {String} arg.baseURL - 全局根路径
+   * @param {Object} arg.header - 全局header
+   * @param {String} arg.method = [GET|POST|PUT|DELETE|CONNECT|HEAD|OPTIONS|TRACE] - 全局默认请求方式
+   * @param {String} arg.dataType = [json] - 全局默认的dataType
+   * @param {String} arg.responseType = [text|arraybuffer] - 全局默认的responseType。支付宝小程序不支持
+   * @param {Object} arg.custom - 全局默认的自定义参数
+   * @param {Number} arg.timeout - 全局默认的超时时间，单位 ms。默认60000。H5(HBuilderX 2.9.9+)、APP(HBuilderX 2.9.9+)、微信小程序（2.10.0）、支付宝小程序
+   * @param {Boolean} arg.sslVerify - 全局默认的是否验证 ssl 证书。默认true.仅App安卓端支持（HBuilderX 2.3.3+）
+   * @param {Boolean} arg.withCredentials - 全局默认的跨域请求时是否携带凭证（cookies）。默认false。仅H5支持（HBuilderX 2.6.15+）
+   * @param {Boolean} arg.firstIpv4 - 全DNS解析时优先使用ipv4。默认false。仅 App-Android 支持 (HBuilderX 2.8.0+)
+   * @param {Function(statusCode):Boolean} arg.validateStatus - 全局默认的自定义验证器。默认statusCode >= 200 && statusCode < 300
+   */
+  constructor(arg = {}) {
+    if (!isPlainObject(arg)) {
+      arg = {}
+      console.warn('设置全局参数必须接收一个Object')
+    }
+    this.config = clone({...defaults, ...arg})
+    this.interceptors = {
+      request: new InterceptorManager(),
+      response: new InterceptorManager()
+    }
+  }
+
+  /**
+   * @Function
+   * @param {Request~setConfigCallback} f - 设置全局默认配置
+   */
+  setConfig(f) {
+    this.config = f(this.config)
+  }
+
+  middleware(config) {
+    config = mergeConfig(this.config, config)
+    let chain = [dispatchRequest, undefined]
+    let promise = Promise.resolve(config)
+
+    this.interceptors.request.forEach(function unshiftRequestInterceptors(interceptor) {
+      chain.unshift(interceptor.fulfilled, interceptor.rejected)
+    })
+
+    this.interceptors.response.forEach(function pushResponseInterceptors(interceptor) {
+      chain.push(interceptor.fulfilled, interceptor.rejected)
+    })
+
+    while (chain.length) {
+      promise = promise.then(chain.shift(), chain.shift())
+    }
+
+    return promise
+  }
+
+  /**
+   * @Function
+   * @param {Object} config - 请求配置项
+   * @prop {String} options.url - 请求路径
+   * @prop {Object} options.data - 请求参数
+   * @prop {Object} [options.responseType = config.responseType] [text|arraybuffer] - 响应的数据类型
+   * @prop {Object} [options.dataType = config.dataType] - 如果设为 json，会尝试对返回的数据做一次 JSON.parse
+   * @prop {Object} [options.header = config.header] - 请求header
+   * @prop {Object} [options.method = config.method] - 请求方法
+   * @returns {Promise<unknown>}
+   */
+  request(config = {}) {
+    return this.middleware(config)
+  }
+
+  get(url, options = {}) {
+    return this.middleware({
+      url,
+      method: 'GET',
+      ...options
+    })
+  }
+
+  post(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'POST',
+      ...options
+    })
+  }
+
+  // #ifndef MP-ALIPAY || MP-KUAISHOU || MP-JD
+  put(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'PUT',
+      ...options
+    })
+  }
+
+  // #endif
+
+  // #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-BAIDU
+  delete(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'DELETE',
+      ...options
+    })
+  }
+
+  // #endif
+
+  // #ifdef H5 || MP-WEIXIN
+  connect(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'CONNECT',
+      ...options
+    })
+  }
+
+  // #endif
+
+  // #ifdef  H5 || MP-WEIXIN || MP-BAIDU
+  head(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'HEAD',
+      ...options
+    })
+  }
+
+  // #endif
+
+  // #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-BAIDU
+  options(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'OPTIONS',
+      ...options
+    })
+  }
+
+  // #endif
+
+  // #ifdef H5 || MP-WEIXIN
+  trace(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'TRACE',
+      ...options
+    })
+  }
+
+  // #endif
+
+  upload(url, config = {}) {
+    config.url = url
+    config.method = 'UPLOAD'
+    return this.middleware(config)
+  }
+
+  download(url, config = {}) {
+    config.url = url
+    config.method = 'DOWNLOAD'
+    return this.middleware(config)
+  }
+
+  get version () {
+    return '3.1.0'
+  }
+}
+
+
+/**
+ * setConfig回调
+ * @return {Object} - 返回操作后的config
+ * @callback Request~setConfigCallback
+ * @param {Object} config - 全局默认config
+ */
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/core/buildFullPath.js b/uni_modules/uv-ui-tools/libs/luch-request/core/buildFullPath.js
new file mode 100644
index 0000000..f2852f4
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/core/buildFullPath.js
@@ -0,0 +1,20 @@
+'use strict'
+
+import isAbsoluteURL from '../helpers/isAbsoluteURL'
+import combineURLs from '../helpers/combineURLs'
+
+/**
+ * Creates a new URL by combining the baseURL with the requestedURL,
+ * only when the requestedURL is not already an absolute URL.
+ * If the requestURL is absolute, this function returns the requestedURL untouched.
+ *
+ * @param {string} baseURL The base URL
+ * @param {string} requestedURL Absolute or relative URL to combine
+ * @returns {string} The combined full path
+ */
+export default function buildFullPath(baseURL, requestedURL) {
+  if (baseURL && !isAbsoluteURL(requestedURL)) {
+    return combineURLs(baseURL, requestedURL)
+  }
+  return requestedURL
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/core/defaults.js b/uni_modules/uv-ui-tools/libs/luch-request/core/defaults.js
new file mode 100644
index 0000000..db74609
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/core/defaults.js
@@ -0,0 +1,33 @@
+/**
+ * 默认的全局配置
+ */
+
+
+export default {
+  baseURL: '',
+  header: {},
+  method: 'GET',
+  dataType: 'json',
+  paramsSerializer: null,
+  // #ifndef MP-ALIPAY
+  responseType: 'text',
+  // #endif
+  custom: {},
+  // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+  timeout: 60000,
+  // #endif
+  // #ifdef APP-PLUS
+  sslVerify: true,
+  // #endif
+  // #ifdef H5
+  withCredentials: false,
+  // #endif
+  // #ifdef APP-PLUS
+  firstIpv4: false,
+  // #endif
+  validateStatus: function validateStatus(status) {
+    return status >= 200 && status < 300
+  },
+  // 是否尝试将响应数据json化
+  forcedJSONParsing: true
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/core/dispatchRequest.js b/uni_modules/uv-ui-tools/libs/luch-request/core/dispatchRequest.js
new file mode 100644
index 0000000..c5f2c85
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/core/dispatchRequest.js
@@ -0,0 +1,6 @@
+import adapter from '../adapters/index'
+
+
+export default (config) => {
+  return adapter(config)
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/core/mergeConfig.js b/uni_modules/uv-ui-tools/libs/luch-request/core/mergeConfig.js
new file mode 100644
index 0000000..99c8ecd
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/core/mergeConfig.js
@@ -0,0 +1,126 @@
+import {deepMerge, isUndefined} from '../utils'
+
+/**
+ * 合并局部配置优先的配置，如果局部有该配置项则用局部，如果全局有该配置项则用全局
+ * @param {Array} keys - 配置项
+ * @param {Object} globalsConfig - 当前的全局配置
+ * @param {Object} config2 - 局部配置
+ * @return {{}}
+ */
+const mergeKeys = (keys, globalsConfig, config2) => {
+  let config = {}
+  keys.forEach(prop => {
+    if (!isUndefined(config2[prop])) {
+      config[prop] = config2[prop]
+    } else if (!isUndefined(globalsConfig[prop])) {
+      config[prop] = globalsConfig[prop]
+    }
+  })
+  return config
+}
+/**
+ *
+ * @param globalsConfig - 当前实例的全局配置
+ * @param config2 - 当前的局部配置
+ * @return - 合并后的配置
+ */
+export default (globalsConfig, config2 = {}) => {
+  const method = config2.method || globalsConfig.method || 'GET'
+  let config = {
+    baseURL: config2.baseURL || globalsConfig.baseURL || '',
+    method: method,
+    url: config2.url || '',
+    params: config2.params || {},
+    custom: {...(globalsConfig.custom || {}), ...(config2.custom || {})},
+    header: deepMerge(globalsConfig.header || {}, config2.header || {})
+  }
+  const defaultToConfig2Keys = ['getTask', 'validateStatus', 'paramsSerializer', 'forcedJSONParsing']
+  config = {...config, ...mergeKeys(defaultToConfig2Keys, globalsConfig, config2)}
+
+  // eslint-disable-next-line no-empty
+  if (method === 'DOWNLOAD') {
+    const downloadKeys = [
+      // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+      'timeout',
+      // #endif
+      // #ifdef MP
+      'filePath',
+      // #endif
+    ]
+    config = {...config, ...mergeKeys(downloadKeys, globalsConfig, config2)}
+  } else if (method === 'UPLOAD') {
+    delete config.header['content-type']
+    delete config.header['Content-Type']
+    const uploadKeys = [
+      // #ifdef APP-PLUS || H5
+      'files',
+      // #endif
+      // #ifdef MP-ALIPAY
+      'fileType',
+      // #endif
+      // #ifdef H5
+      'file',
+      // #endif
+      'filePath',
+      'name',
+      // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+      'timeout',
+      // #endif
+      'formData',
+    ]
+    uploadKeys.forEach(prop => {
+      if (!isUndefined(config2[prop])) {
+        config[prop] = config2[prop]
+      }
+    })
+    // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+    if (isUndefined(config.timeout) && !isUndefined(globalsConfig.timeout)) {
+      config['timeout'] = globalsConfig['timeout']
+    }
+    // #endif
+  } else {
+    const defaultsKeys = [
+      'data',
+      // #ifdef H5 || APP-PLUS || MP-ALIPAY || MP-WEIXIN
+      'timeout',
+      // #endif
+      'dataType',
+      // #ifndef MP-ALIPAY
+      'responseType',
+      // #endif
+      // #ifdef APP-PLUS
+      'sslVerify',
+      // #endif
+      // #ifdef H5
+      'withCredentials',
+      // #endif
+      // #ifdef APP-PLUS
+      'firstIpv4',
+      // #endif
+      // #ifdef MP-WEIXIN
+      'enableHttp2',
+      'enableQuic',
+      // #endif
+      // #ifdef MP-TOUTIAO || MP-WEIXIN
+      'enableCache',
+      // #endif
+      // #ifdef MP-WEIXIN
+      'enableHttpDNS',
+      'httpDNSServiceId',
+      'enableChunked',
+      'forceCellularNetwork',
+      // #endif
+      // #ifdef MP-ALIPAY
+      'enableCookie',
+      // #endif
+      // #ifdef MP-BAIDU
+      'cloudCache',
+      'defer'
+      // #endif
+
+    ]
+    config = {...config, ...mergeKeys(defaultsKeys, globalsConfig, config2)}
+  }
+
+  return config
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/core/settle.js b/uni_modules/uv-ui-tools/libs/luch-request/core/settle.js
new file mode 100644
index 0000000..b2f1659
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/core/settle.js
@@ -0,0 +1,16 @@
+/**
+ * Resolve or reject a Promise based on response status.
+ *
+ * @param {Function} resolve A function that resolves the promise.
+ * @param {Function} reject A function that rejects the promise.
+ * @param {object} response The response.
+ */
+export default function settle(resolve, reject, response) {
+  const validateStatus = response.config.validateStatus
+  const status = response.statusCode
+  if (status && (!validateStatus || validateStatus(status))) {
+    resolve(response)
+  } else {
+    reject(response)
+  }
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/helpers/buildURL.js b/uni_modules/uv-ui-tools/libs/luch-request/helpers/buildURL.js
new file mode 100644
index 0000000..e90b908
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/helpers/buildURL.js
@@ -0,0 +1,64 @@
+'use strict'
+
+import * as utils from './../utils'
+
+function encode(val) {
+  return encodeURIComponent(val).replace(/%40/gi, '@').replace(/%3A/gi, ':').replace(/%24/g, '$').replace(/%2C/gi, ',').replace(/%20/g, '+').replace(/%5B/gi, '[').replace(/%5D/gi, ']')
+}
+
+/**
+ * Build a URL by appending params to the end
+ *
+ * @param {string} url The base of the url (e.g., http://www.google.com)
+ * @param {object} [params] The params to be appended
+ * @returns {string} The formatted url
+ */
+export default function buildURL(url, params, paramsSerializer) {
+  /*eslint no-param-reassign:0*/
+  if (!params) {
+    return url
+  }
+
+  var serializedParams
+  if (paramsSerializer) {
+    serializedParams = paramsSerializer(params)
+  } else if (utils.isURLSearchParams(params)) {
+    serializedParams = params.toString()
+  } else {
+    var parts = []
+
+    utils.forEach(params, function serialize(val, key) {
+      if (val === null || typeof val === 'undefined') {
+        return
+      }
+
+      if (utils.isArray(val)) {
+        key = key + '[]'
+      } else {
+        val = [val]
+      }
+
+      utils.forEach(val, function parseValue(v) {
+        if (utils.isDate(v)) {
+          v = v.toISOString()
+        } else if (utils.isObject(v)) {
+          v = JSON.stringify(v)
+        }
+        parts.push(encode(key) + '=' + encode(v))
+      })
+    })
+
+    serializedParams = parts.join('&')
+  }
+
+  if (serializedParams) {
+    var hashmarkIndex = url.indexOf('#')
+    if (hashmarkIndex !== -1) {
+      url = url.slice(0, hashmarkIndex)
+    }
+
+    url += (url.indexOf('?') === -1 ? '?' : '&') + serializedParams
+  }
+
+  return url
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/helpers/combineURLs.js b/uni_modules/uv-ui-tools/libs/luch-request/helpers/combineURLs.js
new file mode 100644
index 0000000..7b9d1ef
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/helpers/combineURLs.js
@@ -0,0 +1,14 @@
+'use strict'
+
+/**
+ * Creates a new URL by combining the specified URLs
+ *
+ * @param {string} baseURL The base URL
+ * @param {string} relativeURL The relative URL
+ * @returns {string} The combined URL
+ */
+export default function combineURLs(baseURL, relativeURL) {
+  return relativeURL
+    ? baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, '')
+    : baseURL
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/helpers/isAbsoluteURL.js b/uni_modules/uv-ui-tools/libs/luch-request/helpers/isAbsoluteURL.js
new file mode 100644
index 0000000..2a82517
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/helpers/isAbsoluteURL.js
@@ -0,0 +1,14 @@
+'use strict'
+
+/**
+ * Determines whether the specified URL is absolute
+ *
+ * @param {string} url The URL to test
+ * @returns {boolean} True if the specified URL is absolute, otherwise false
+ */
+export default function isAbsoluteURL(url) {
+  // A URL is considered absolute if it begins with "<scheme>://" or "//" (protocol-relative URL).
+  // RFC 3986 defines scheme name as a sequence of characters beginning with a letter and followed
+  // by any combination of letters, digits, plus, period, or hyphen.
+  return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(url)
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/index.d.ts b/uni_modules/uv-ui-tools/libs/luch-request/index.d.ts
new file mode 100644
index 0000000..62d3fb9
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/index.d.ts
@@ -0,0 +1,197 @@
+export type HttpTask = UniApp.RequestTask | UniApp.UploadTask | UniApp.DownloadTask;
+
+export type HttpRequestTask = UniApp.RequestTask;
+
+export type HttpUploadTask = UniApp.UploadTask;
+
+export type HttpDownloadTask = UniApp.DownloadTask;
+
+export type HttpMethod =
+    "GET"
+    | "POST"
+    | "PUT"
+    | "DELETE"
+    | "CONNECT"
+    | "HEAD"
+    | "OPTIONS"
+    | "TRACE"
+    | "UPLOAD"
+    | "DOWNLOAD";
+
+export type HttpRequestHeader = Record<string, string>;
+
+export type HttpParams = Record<string, any>;
+
+export type HttpData = Record<string, any>;
+
+export type HttpResponseType = 'arraybuffer' | 'text';
+
+export type HttpCustom = Record<string, any>;
+
+export type HttpFileType = 'image' | 'video' | 'audio';
+
+export type HttpFormData = Record<string, any>;
+
+export type HttpResponseHeader = Record<string, string> & {
+    "set-cookie"?: string[]
+};
+
+export interface HttpRequestConfig<T = HttpTask> {
+    /** @desc 请求服务器接口地址 */
+    url?: string;
+    /** @desc 请求方式，默认为 GET */
+    method?: HttpMethod;
+    /** @desc 请求基地址 */
+    baseURL?: string;
+    /** @desc 请求头信息，不能设置 Referer，App、H5 端会自动带上 cookie，且 H5 端不可手动修改 */
+    header?: HttpRequestHeader;
+    /** @desc 请求查询参数，自动拼接为查询字符串 */
+    params?: HttpParams;
+    /** @desc 请求体参数 */
+    data?: HttpData;
+    /** @desc 超时时间，单位 ms，默认为 60000，仅 H5 (HBuilderX 2.9.9+)、APP (HBuilderX 2.9.9+)、微信小程序 (2.10.0)、支付宝小程序支持 */
+    timeout?: number;
+    /** @desc 跨域请求时是否携带凭证 (cookies)，默认为 false，仅 H5 (HBuilderX 2.6.15+) 支持 */
+    withCredentials?: boolean;
+    /** @desc 设置响应的数据类型，支付宝小程序不支持 */
+    responseType?: HttpResponseType;
+    /** @desc 全局自定义验证器 */
+    validateStatus?: ((statusCode: number) => boolean) | null;
+
+
+    /** params 参数自定义处理 */
+    paramsSerializer?: (params: AnyObject) => string | void;
+
+    /** @desc 默认为 json，如果设为 json，会尝试对返回的数据做一次 JSON.parse */
+    dataType?: string;
+    /** @desc DNS 解析时是否优先使用 ipv4，默认为 false，仅 App-Android (HBuilderX 2.8.0+) 支持 */
+    firstIpv4?: boolean;
+    /** @desc 是否验证 SSL 证书，默认为 true，仅 App-Android (HBuilderX 2.3.3+) 支持 */
+    sslVerify?: boolean;
+
+    /** @desc 开启 http2;微信小程序 */
+    enableHttp2?: boolean;
+
+    /** @desc 开启 quic；微信小程序 */
+    enableQuic?: boolean;
+    /** @desc 开启 cache;微信小程序、字节跳动小程序 2.31.0+ */
+    enableCache?: boolean;
+    /** @desc 开启 httpDNS;微信小程序 */
+    enableHttpDNS?: boolean;
+    /** @desc httpDNS 服务商；微信小程序 */
+    httpDNSServiceId?: string;
+    /** @desc 开启 transfer-encoding chunked;微信小程序 */
+    enableChunked?: boolean;
+    /** @desc wifi下使用移动网络发送请求;微信小程序 */
+    forceCellularNetwork?: boolean;
+    /** @desc 开启后可在headers中编辑cookie;支付宝小程序 10.2.33+ */
+    enableCookie?: boolean;
+    /** @desc 是否开启云加速;百度小程序 3.310.11+ */
+    cloudCache?: boolean | object;
+    /** @desc 控制当前请求是否延时至首屏内容渲染后发送；百度小程序 3.310.11+ */
+    defer?: boolean;
+
+    /** @desc 自定义参数 */
+    custom?: HttpCustom;
+
+    /** @desc 返回当前请求的 task 和 options，不要在这里修改 options */
+    getTask?: (task: T, options: HttpRequestConfig<T>) => void;
+
+    /** @desc 需要上传的文件列表，使用 files 时，filePath 和 name 不生效，仅支持 App、H5 (2.6.15+) */
+    files?: { name?: string; file?: File; uri: string; }[];
+    /** @desc 文件类型，仅支付宝小程序支持且为必填项 */
+    fileType?: HttpFileType;
+    /** @desc 要上传的文件对象，仅 H5 (2.6.15+) 支持 */
+    file?: File;
+    /** @desc 要上传文件资源的路径，使用 files 时，filePath 和 name 不生效 */
+    filePath?: string;
+    /** @desc 文件对应的 key，开发者在服务器端通过这个 key 可以获取到文件二进制内容，使用 files 时，filePath 和 name 不生效 */
+    name?: string;
+    /** @desc 请求中其他额外的 form data */
+    formData?: HttpFormData;
+}
+
+export interface HttpResponse<T = any, D = HttpTask> {
+    data: T;
+    statusCode: number;
+    header: HttpResponseHeader;
+    config: HttpRequestConfig<D>;
+    cookies: string[];
+    errMsg: string;
+    rawData: any;
+}
+
+export interface HttpUploadResponse<T = any, D = HttpTask> {
+    data: T;
+    statusCode: number;
+    config: HttpRequestConfig<D>;
+    errMsg: string;
+    rawData: any;
+}
+
+export interface HttpDownloadResponse extends HttpResponse {
+    tempFilePath: string;
+    apFilePath?: string;
+    filePath?: string;
+    fileContent?: string;
+}
+
+export interface HttpError<T = any, D = HttpTask> {
+    data?: T;
+    statusCode?: number;
+    header?: HttpResponseHeader;
+    config: HttpRequestConfig<D>;
+    cookies?: string[];
+    errMsg: string;
+}
+
+export interface HttpPromise<T = any> extends Promise<HttpResponse<T>> {
+}
+
+export interface HttpInterceptorManager<V, E = V> {
+    use(onFulfilled?: (value: V) => V | Promise<V>, onRejected?: (error: E) => T | Promise<E>): void;
+
+    eject(id: number): void;
+}
+
+export abstract class HttpRequestAbstract {
+    constructor(config?: HttpRequestConfig);
+
+    interceptors: {
+        request: HttpInterceptorManager<HttpRequestConfig>;
+        response: HttpInterceptorManager<HttpResponse, HttpError>;
+    }
+
+    request<T = any, R = HttpResponse<T>, D = HttpRequestTask>(config: HttpRequestConfig<D>): Promise<R>;
+
+    get<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, config?: HttpRequestConfig<D>): Promise<R>;
+
+    delete<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, data?: HttpData, config?: HttpRequestConfig<D>): Promise<R>;
+
+    head<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, data?: HttpData, config?: HttpRequestConfig<D>): Promise<R>;
+
+    options<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, data?: HttpData, config?: HttpRequestConfig<D>): Promise<R>;
+
+    post<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, data?: HttpData, config?: HttpRequestConfig<D>): Promise<R>;
+
+    put<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, data?: HttpData, config?: HttpRequestConfig<D>): Promise<R>;
+
+    config: HttpRequestConfig;
+
+    setConfig<D = HttpTask>(onSend: (config: HttpRequestConfig<D>) => HttpRequestConfig<D>): void;
+
+    connect<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, data?: HttpData, config?: HttpRequestConfig<D>): Promise<R>;
+
+    trace<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, data?: HttpData, config?: HttpRequestConfig<D>): Promise<R>;
+
+    upload<T = any, R = HttpUploadResponse<T>, D = HttpUploadTask>(url: string, config?: HttpRequestConfig<D>): Promise<R>;
+
+    download<T = any, R = HttpDownloadResponse<T>, D = HttpDownloadTask>(url: string, config?: HttpRequestConfig<D>): Promise<R>;
+
+    middleware<T = any, R = HttpResponse<T>, D = HttpTask>(config: HttpRequestConfig<D>): Promise<R>;
+}
+
+declare class HttpRequest extends HttpRequestAbstract {
+}
+
+export default HttpRequest;
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/index.js b/uni_modules/uv-ui-tools/libs/luch-request/index.js
new file mode 100644
index 0000000..d8fe348
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/index.js
@@ -0,0 +1,2 @@
+import Request from './core/Request'
+export default Request
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/utils.js b/uni_modules/uv-ui-tools/libs/luch-request/utils.js
new file mode 100644
index 0000000..0b5bf21
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/utils.js
@@ -0,0 +1,135 @@
+'use strict'
+
+// utils is a library of generic helper functions non-specific to axios
+
+var toString = Object.prototype.toString
+
+/**
+ * Determine if a value is an Array
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an Array, otherwise false
+ */
+export function isArray (val) {
+  return toString.call(val) === '[object Array]'
+}
+
+
+/**
+ * Determine if a value is an Object
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an Object, otherwise false
+ */
+export function isObject (val) {
+  return val !== null && typeof val === 'object'
+}
+
+/**
+ * Determine if a value is a Date
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Date, otherwise false
+ */
+export function isDate (val) {
+  return toString.call(val) === '[object Date]'
+}
+
+/**
+ * Determine if a value is a URLSearchParams object
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a URLSearchParams object, otherwise false
+ */
+export function isURLSearchParams (val) {
+  return typeof URLSearchParams !== 'undefined' && val instanceof URLSearchParams
+}
+
+
+/**
+ * Iterate over an Array or an Object invoking a function for each item.
+ *
+ * If `obj` is an Array callback will be called passing
+ * the value, index, and complete array for each item.
+ *
+ * If 'obj' is an Object callback will be called passing
+ * the value, key, and complete object for each property.
+ *
+ * @param {Object|Array} obj The object to iterate
+ * @param {Function} fn The callback to invoke for each item
+ */
+export function forEach (obj, fn) {
+  // Don't bother if no value provided
+  if (obj === null || typeof obj === 'undefined') {
+    return
+  }
+
+  // Force an array if not already something iterable
+  if (typeof obj !== 'object') {
+    /*eslint no-param-reassign:0*/
+    obj = [obj]
+  }
+
+  if (isArray(obj)) {
+    // Iterate over array values
+    for (var i = 0, l = obj.length; i < l; i++) {
+      fn.call(null, obj[i], i, obj)
+    }
+  } else {
+    // Iterate over object keys
+    for (var key in obj) {
+      if (Object.prototype.hasOwnProperty.call(obj, key)) {
+        fn.call(null, obj[key], key, obj)
+      }
+    }
+  }
+}
+
+/**
+ * 是否为boolean 值
+ * @param val
+ * @returns {boolean}
+ */
+export function isBoolean(val) {
+  return typeof val === 'boolean'
+}
+
+/**
+ * 是否为真正的对象{} new Object
+ * @param {any} obj - 检测的对象
+ * @returns {boolean}
+ */
+export function isPlainObject(obj) {
+  return Object.prototype.toString.call(obj) === '[object Object]'
+}
+
+
+
+/**
+ * Function equal to merge with the difference being that no reference
+ * to original objects is kept.
+ *
+ * @see merge
+ * @param {Object} obj1 Object to merge
+ * @returns {Object} Result of all merge properties
+ */
+export function deepMerge(/* obj1, obj2, obj3, ... */) {
+  let result = {}
+  function assignValue(val, key) {
+    if (typeof result[key] === 'object' && typeof val === 'object') {
+      result[key] = deepMerge(result[key], val)
+    } else if (typeof val === 'object') {
+      result[key] = deepMerge({}, val)
+    } else {
+      result[key] = val
+    }
+  }
+  for (let i = 0, l = arguments.length; i < l; i++) {
+    forEach(arguments[i], assignValue)
+  }
+  return result
+}
+
+export function isUndefined (val) {
+  return typeof val === 'undefined'
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/utils/clone.js b/uni_modules/uv-ui-tools/libs/luch-request/utils/clone.js
new file mode 100644
index 0000000..2fee704
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/utils/clone.js
@@ -0,0 +1,264 @@
+/* eslint-disable */
+var clone = (function() {
+  'use strict';
+
+  function _instanceof(obj, type) {
+    return type != null && obj instanceof type;
+  }
+
+  var nativeMap;
+  try {
+    nativeMap = Map;
+  } catch(_) {
+    // maybe a reference error because no `Map`. Give it a dummy value that no
+    // value will ever be an instanceof.
+    nativeMap = function() {};
+  }
+
+  var nativeSet;
+  try {
+    nativeSet = Set;
+  } catch(_) {
+    nativeSet = function() {};
+  }
+
+  var nativePromise;
+  try {
+    nativePromise = Promise;
+  } catch(_) {
+    nativePromise = function() {};
+  }
+
+  /**
+   * Clones (copies) an Object using deep copying.
+   *
+   * This function supports circular references by default, but if you are certain
+   * there are no circular references in your object, you can save some CPU time
+   * by calling clone(obj, false).
+   *
+   * Caution: if `circular` is false and `parent` contains circular references,
+   * your program may enter an infinite loop and crash.
+   *
+   * @param `parent` - the object to be cloned
+   * @param `circular` - set to true if the object to be cloned may contain
+   *    circular references. (optional - true by default)
+   * @param `depth` - set to a number if the object is only to be cloned to
+   *    a particular depth. (optional - defaults to Infinity)
+   * @param `prototype` - sets the prototype to be used when cloning an object.
+   *    (optional - defaults to parent prototype).
+   * @param `includeNonEnumerable` - set to true if the non-enumerable properties
+   *    should be cloned as well. Non-enumerable properties on the prototype
+   *    chain will be ignored. (optional - false by default)
+   */
+  function clone(parent, circular, depth, prototype, includeNonEnumerable) {
+    if (typeof circular === 'object') {
+      depth = circular.depth;
+      prototype = circular.prototype;
+      includeNonEnumerable = circular.includeNonEnumerable;
+      circular = circular.circular;
+    }
+    // maintain two arrays for circular references, where corresponding parents
+    // and children have the same index
+    var allParents = [];
+    var allChildren = [];
+
+    var useBuffer = typeof Buffer != 'undefined';
+
+    if (typeof circular == 'undefined')
+      circular = true;
+
+    if (typeof depth == 'undefined')
+      depth = Infinity;
+
+    // recurse this function so we don't reset allParents and allChildren
+    function _clone(parent, depth) {
+      // cloning null always returns null
+      if (parent === null)
+        return null;
+
+      if (depth === 0)
+        return parent;
+
+      var child;
+      var proto;
+      if (typeof parent != 'object') {
+        return parent;
+      }
+
+      if (_instanceof(parent, nativeMap)) {
+        child = new nativeMap();
+      } else if (_instanceof(parent, nativeSet)) {
+        child = new nativeSet();
+      } else if (_instanceof(parent, nativePromise)) {
+        child = new nativePromise(function (resolve, reject) {
+          parent.then(function(value) {
+            resolve(_clone(value, depth - 1));
+          }, function(err) {
+            reject(_clone(err, depth - 1));
+          });
+        });
+      } else if (clone.__isArray(parent)) {
+        child = [];
+      } else if (clone.__isRegExp(parent)) {
+        child = new RegExp(parent.source, __getRegExpFlags(parent));
+        if (parent.lastIndex) child.lastIndex = parent.lastIndex;
+      } else if (clone.__isDate(parent)) {
+        child = new Date(parent.getTime());
+      } else if (useBuffer && Buffer.isBuffer(parent)) {
+        if (Buffer.from) {
+          // Node.js >= 5.10.0
+          child = Buffer.from(parent);
+        } else {
+          // Older Node.js versions
+          child = new Buffer(parent.length);
+          parent.copy(child);
+        }
+        return child;
+      } else if (_instanceof(parent, Error)) {
+        child = Object.create(parent);
+      } else {
+        if (typeof prototype == 'undefined') {
+          proto = Object.getPrototypeOf(parent);
+          child = Object.create(proto);
+        }
+        else {
+          child = Object.create(prototype);
+          proto = prototype;
+        }
+      }
+
+      if (circular) {
+        var index = allParents.indexOf(parent);
+
+        if (index != -1) {
+          return allChildren[index];
+        }
+        allParents.push(parent);
+        allChildren.push(child);
+      }
+
+      if (_instanceof(parent, nativeMap)) {
+        parent.forEach(function(value, key) {
+          var keyChild = _clone(key, depth - 1);
+          var valueChild = _clone(value, depth - 1);
+          child.set(keyChild, valueChild);
+        });
+      }
+      if (_instanceof(parent, nativeSet)) {
+        parent.forEach(function(value) {
+          var entryChild = _clone(value, depth - 1);
+          child.add(entryChild);
+        });
+      }
+
+      for (var i in parent) {
+        var attrs = Object.getOwnPropertyDescriptor(parent, i);
+        if (attrs) {
+          child[i] = _clone(parent[i], depth - 1);
+        }
+
+        try {
+          var objProperty = Object.getOwnPropertyDescriptor(parent, i);
+          if (objProperty.set === 'undefined') {
+            // no setter defined. Skip cloning this property
+            continue;
+          }
+          child[i] = _clone(parent[i], depth - 1);
+        } catch(e){
+          if (e instanceof TypeError) {
+            // when in strict mode, TypeError will be thrown if child[i] property only has a getter
+            // we can't do anything about this, other than inform the user that this property cannot be set.
+            continue
+          } else if (e instanceof ReferenceError) {
+            //this may happen in non strict mode
+            continue
+          }
+        }
+
+      }
+
+      if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(parent);
+        for (var i = 0; i < symbols.length; i++) {
+          // Don't need to worry about cloning a symbol because it is a primitive,
+          // like a number or string.
+          var symbol = symbols[i];
+          var descriptor = Object.getOwnPropertyDescriptor(parent, symbol);
+          if (descriptor && !descriptor.enumerable && !includeNonEnumerable) {
+            continue;
+          }
+          child[symbol] = _clone(parent[symbol], depth - 1);
+          Object.defineProperty(child, symbol, descriptor);
+        }
+      }
+
+      if (includeNonEnumerable) {
+        var allPropertyNames = Object.getOwnPropertyNames(parent);
+        for (var i = 0; i < allPropertyNames.length; i++) {
+          var propertyName = allPropertyNames[i];
+          var descriptor = Object.getOwnPropertyDescriptor(parent, propertyName);
+          if (descriptor && descriptor.enumerable) {
+            continue;
+          }
+          child[propertyName] = _clone(parent[propertyName], depth - 1);
+          Object.defineProperty(child, propertyName, descriptor);
+        }
+      }
+
+      return child;
+    }
+
+    return _clone(parent, depth);
+  }
+
+  /**
+   * Simple flat clone using prototype, accepts only objects, usefull for property
+   * override on FLAT configuration object (no nested props).
+   *
+   * USE WITH CAUTION! This may not behave as you wish if you do not know how this
+   * works.
+   */
+  clone.clonePrototype = function clonePrototype(parent) {
+    if (parent === null)
+      return null;
+
+    var c = function () {};
+    c.prototype = parent;
+    return new c();
+  };
+
+// private utility functions
+
+  function __objToStr(o) {
+    return Object.prototype.toString.call(o);
+  }
+  clone.__objToStr = __objToStr;
+
+  function __isDate(o) {
+    return typeof o === 'object' && __objToStr(o) === '[object Date]';
+  }
+  clone.__isDate = __isDate;
+
+  function __isArray(o) {
+    return typeof o === 'object' && __objToStr(o) === '[object Array]';
+  }
+  clone.__isArray = __isArray;
+
+  function __isRegExp(o) {
+    return typeof o === 'object' && __objToStr(o) === '[object RegExp]';
+  }
+  clone.__isRegExp = __isRegExp;
+
+  function __getRegExpFlags(re) {
+    var flags = '';
+    if (re.global) flags += 'g';
+    if (re.ignoreCase) flags += 'i';
+    if (re.multiline) flags += 'm';
+    return flags;
+  }
+  clone.__getRegExpFlags = __getRegExpFlags;
+
+  return clone;
+})();
+
+export default clone
diff --git a/uni_modules/uv-ui-tools/libs/mixin/button.js b/uni_modules/uv-ui-tools/libs/mixin/button.js
new file mode 100644
index 0000000..0c019c2
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/mixin/button.js
@@ -0,0 +1,13 @@
+export default {
+    props: {
+        lang: String,
+        sessionFrom: String,
+        sendMessageTitle: String,
+        sendMessagePath: String,
+        sendMessageImg: String,
+        showMessageCard: Boolean,
+        appParameter: String,
+        formType: String,
+        openType: String
+    }
+}
diff --git a/uni_modules/uv-ui-tools/libs/mixin/mixin.js b/uni_modules/uv-ui-tools/libs/mixin/mixin.js
new file mode 100644
index 0000000..0dd3b03
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/mixin/mixin.js
@@ -0,0 +1,172 @@
+import * as index from '../function/index.js';
+import * as test from '../function/test.js';
+import route from '../util/route.js';
+import debounce from '../function/debounce.js';
+import throttle from '../function/throttle.js';
+export default {
+	// 定义每个组件都可能需要用到的外部样式以及类名
+	props: {
+		// 每个组件都有的父组件传递的样式，可以为字符串或者对象形式
+		customStyle: {
+			type: [Object, String],
+			default: () => ({})
+		},
+		customClass: {
+			type: String,
+			default: ''
+		},
+		// 跳转的页面路径
+		url: {
+			type: String,
+			default: ''
+		},
+		// 页面跳转的类型
+		linkType: {
+			type: String,
+			default: 'navigateTo'
+		}
+	},
+	data() {
+		return {}
+	},
+	onLoad() {
+		// getRect挂载到$uv上，因为这方法需要使用in(this)，所以无法把它独立成一个单独的文件导出
+		this.$uv.getRect = this.$uvGetRect
+	},
+	created() {
+		// 组件当中，只有created声明周期，为了能在组件使用，故也在created中将方法挂载到$uv
+		this.$uv.getRect = this.$uvGetRect
+	},
+	computed: {
+		$uv() {
+			return {
+				...index,
+				test,
+				route,
+				debounce,
+				throttle,
+				unit: uni?.$uv?.config?.unit
+			}
+		},
+		/**
+		 * 生成bem规则类名
+		 * 由于微信小程序，H5，nvue之间绑定class的差异，无法通过:class="[bem()]"的形式进行同用
+		 * 故采用如下折中做法，最后返回的是数组（一般平台）或字符串（支付宝和字节跳动平台），类似['a', 'b', 'c']或'a b c'的形式
+		 * @param {String} name 组件名称
+		 * @param {Array} fixed 一直会存在的类名
+		 * @param {Array} change 会根据变量值为true或者false而出现或者隐藏的类名
+		 * @returns {Array|string}
+		 */
+		bem() {
+			return function(name, fixed, change) {
+				// 类名前缀
+				const prefix = `uv-${name}--`
+				const classes = {}
+				if (fixed) {
+					fixed.map((item) => {
+						// 这里的类名，会一直存在
+						classes[prefix + this[item]] = true
+					})
+				}
+				if (change) {
+					change.map((item) => {
+						// 这里的类名，会根据this[item]的值为true或者false，而进行添加或者移除某一个类
+						this[item] ? (classes[prefix + item] = this[item]) : (delete classes[prefix + item])
+					})
+				}
+				return Object.keys(classes)
+					// 支付宝，头条小程序无法动态绑定一个数组类名，否则解析出来的结果会带有","，而导致失效
+					// #ifdef MP-ALIPAY || MP-TOUTIAO || MP-LARK || MP-BAIDU
+					.join(' ')
+				// #endif
+			}
+		}
+	},
+	methods: {
+		// 跳转某一个页面
+		openPage(urlKey = 'url') {
+			const url = this[urlKey]
+			if (url) {
+				// 执行类似uni.navigateTo的方法
+				uni[this.linkType]({
+					url
+				})
+			}
+		},
+		// 查询节点信息
+		// 目前此方法在支付宝小程序中无法获取组件跟接点的尺寸，为支付宝的bug(2020-07-21)
+		// 解决办法为在组件根部再套一个没有任何作用的view元素
+		$uvGetRect(selector, all) {
+			return new Promise((resolve) => {
+				uni.createSelectorQuery()
+					.in(this)[all ? 'selectAll' : 'select'](selector)
+					.boundingClientRect((rect) => {
+						if (all && Array.isArray(rect) && rect.length) {
+							resolve(rect)
+						}
+						if (!all && rect) {
+							resolve(rect)
+						}
+					})
+					.exec()
+			})
+		},
+		getParentData(parentName = '') {
+			// 避免在created中去定义parent变量
+			if (!this.parent) this.parent = {}
+			// 这里的本质原理是，通过获取父组件实例(也即类似uv-radio的父组件uv-radio-group的this)
+			// 将父组件this中对应的参数，赋值给本组件(uv-radio的this)的parentData对象中对应的属性
+			// 之所以需要这么做，是因为所有端中，头条小程序不支持通过this.parent.xxx去监听父组件参数的变化
+			// 此处并不会自动更新子组件的数据，而是依赖父组件uv-radio-group去监听data的变化，手动调用更新子组件的方法去重新获取
+			this.parent = this.$uv.$parent.call(this, parentName)
+			if (this.parent.children) {
+				// 如果父组件的children不存在本组件的实例，才将本实例添加到父组件的children中
+				this.parent.children.indexOf(this) === -1 && this.parent.children.push(this)
+			}
+			if (this.parent && this.parentData) {
+				// 历遍parentData中的属性，将parent中的同名属性赋值给parentData
+				Object.keys(this.parentData).map((key) => {
+					this.parentData[key] = this.parent[key]
+				})
+			}
+		},
+		// 阻止事件冒泡
+		preventEvent(e) {
+			e && typeof(e.stopPropagation) === 'function' && e.stopPropagation()
+		},
+		// 空操作
+		noop(e) {
+			this.preventEvent(e)
+		}
+	},
+	onReachBottom() {
+		uni.$emit('uvOnReachBottom')
+	},
+	beforeDestroy() {
+		// 判断当前页面是否存在parent和chldren，一般在checkbox和checkbox-group父子联动的场景会有此情况
+		// 组件销毁时，移除子组件在父组件children数组中的实例，释放资源，避免数据混乱
+		if (this.parent && test.array(this.parent.children)) {
+			// 组件销毁时，移除父组件中的children数组中对应的实例
+			const childrenList = this.parent.children
+			childrenList.map((child, index) => {
+				// 如果相等，则移除
+				if (child === this) {
+					childrenList.splice(index, 1)
+				}
+			})
+		}
+	},
+	// 兼容vue3
+	unmounted() {
+		if (this.parent && test.array(this.parent.children)) {
+			// 组件销毁时，移除父组件中的children数组中对应的实例
+			const childrenList = this.parent.children
+			childrenList.map((child, index) => {
+				// 如果相等，则移除
+				if (child === this) {
+					childrenList.splice(index, 1)
+				}
+			})
+		}
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js b/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js
new file mode 100644
index 0000000..90b6903
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js
@@ -0,0 +1,8 @@
+export default {
+    // #ifdef MP-WEIXIN
+    // 将自定义节点设置成虚拟的（去掉自定义组件包裹层），更加接近Vue组件的表现，能更好的使用flex属性
+    options: {
+        virtualHost: true
+    }
+    // #endif
+}
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/libs/mixin/mpShare.js b/uni_modules/uv-ui-tools/libs/mixin/mpShare.js
new file mode 100644
index 0000000..c9695a0
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/mixin/mpShare.js
@@ -0,0 +1,13 @@
+export default {
+	onLoad() {
+	    // 设置默认的转发参数
+	    uni.$uv.mpShare = {
+	        title: '', // 默认为小程序名称
+	        path: '', // 默认为当前页面路径
+	        imageUrl: '' // 默认为当前页面的截图
+	    }
+	},
+	onShareAppMessage() {
+	    return uni.$uv.mpShare
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/libs/mixin/openType.js b/uni_modules/uv-ui-tools/libs/mixin/openType.js
new file mode 100644
index 0000000..1b94b7e
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/mixin/openType.js
@@ -0,0 +1,47 @@
+export default {
+    props: {
+        openType: String
+    },
+		emits: ['getphonenumber','getuserinfo','error','opensetting','launchapp','contact','chooseavatar','addgroupapp','chooseaddress','subscribe','login','im'],
+    methods: {
+        onGetPhoneNumber(event) {
+            this.$emit('getphonenumber', event.detail)
+        },
+        onGetUserInfo(event) {
+            this.$emit('getuserinfo', event.detail)
+        },
+        onError(event) {
+            this.$emit('error', event.detail)
+        },
+        onOpenSetting(event) {
+            this.$emit('opensetting', event.detail)
+        },
+        onLaunchApp(event) {
+            this.$emit('launchapp', event.detail)
+        },
+        onContact(event) {
+            this.$emit('contact', event.detail)
+        },
+        onChooseavatar(event) {
+            this.$emit('chooseavatar', event.detail)
+        },
+        onAgreeprivacyauthorization(event) {
+            this.$emit('agreeprivacyauthorization', event.detail)
+        },
+        onAddgroupapp(event) {
+            this.$emit('addgroupapp', event.detail)
+        },
+        onChooseaddress(event) {
+            this.$emit('chooseaddress', event.detail)
+        },
+        onSubscribe(event) {
+            this.$emit('subscribe', event.detail)
+        },
+        onLogin(event) {
+            this.$emit('login', event.detail)
+        },
+        onIm(event) {
+            this.$emit('im', event.detail)
+        }
+    }
+}
diff --git a/uni_modules/uv-ui-tools/libs/mixin/touch.js b/uni_modules/uv-ui-tools/libs/mixin/touch.js
new file mode 100644
index 0000000..0ecbd88
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/mixin/touch.js
@@ -0,0 +1,59 @@
+const MIN_DISTANCE = 10
+
+function getDirection(x, y) {
+    if (x > y && x > MIN_DISTANCE) {
+        return 'horizontal'
+    }
+    if (y > x && y > MIN_DISTANCE) {
+        return 'vertical'
+    }
+    return ''
+}
+
+export default {
+    methods: {
+        getTouchPoint(e) {
+            if (!e) {
+                return {
+                    x: 0,
+                    y: 0
+                }
+            } if (e.touches && e.touches[0]) {
+                return {
+                    x: e.touches[0].pageX,
+                    y: e.touches[0].pageY
+                }
+            } if (e.changedTouches && e.changedTouches[0]) {
+                return {
+                    x: e.changedTouches[0].pageX,
+                    y: e.changedTouches[0].pageY
+                }
+            }
+            return {
+                x: e.clientX || 0,
+                y: e.clientY || 0
+            }
+        },
+        resetTouchStatus() {
+            this.direction = ''
+            this.deltaX = 0
+            this.deltaY = 0
+            this.offsetX = 0
+            this.offsetY = 0
+        },
+        touchStart(event) {
+            this.resetTouchStatus()
+            const touch = this.getTouchPoint(event)
+            this.startX = touch.x
+            this.startY = touch.y
+        },
+        touchMove(event) {
+            const touch = this.getTouchPoint(event)
+            this.deltaX = touch.x - this.startX
+            this.deltaY = touch.y - this.startY
+            this.offsetX = Math.abs(this.deltaX)
+            this.offsetY = Math.abs(this.deltaY)
+            this.direction =				this.direction || getDirection(this.offsetX, this.offsetY)
+        }
+    }
+}
diff --git a/uni_modules/uv-ui-tools/libs/util/dayjs.js b/uni_modules/uv-ui-tools/libs/util/dayjs.js
new file mode 100644
index 0000000..c84ab68
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/util/dayjs.js
@@ -0,0 +1,216 @@
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+
+var require_dayjs_min = __commonJS({
+  "uvuidayjs"(exports, module) {
+    !function(t, e) {
+      "object" == typeof exports && "undefined" != typeof module ? module.exports = e() : "function" == typeof define && define.amd ? define(e) : (t = "undefined" != typeof globalThis ? globalThis : t || self).dayjs = e();
+    }(exports, function() {
+      "use strict";
+      var t = 1e3, e = 6e4, n = 36e5, r = "millisecond", i = "second", s = "minute", u = "hour", a = "day", o = "week", f = "month", h = "quarter", c = "year", d = "date", l = "Invalid Date", $ = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/, y = /\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g, M = { name: "en", weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"), ordinal: function(t2) {
+        var e2 = ["th", "st", "nd", "rd"], n2 = t2 % 100;
+        return "[" + t2 + (e2[(n2 - 20) % 10] || e2[n2] || e2[0]) + "]";
+      } }, m = function(t2, e2, n2) {
+        var r2 = String(t2);
+        return !r2 || r2.length >= e2 ? t2 : "" + Array(e2 + 1 - r2.length).join(n2) + t2;
+      }, v = { s: m, z: function(t2) {
+        var e2 = -t2.utcOffset(), n2 = Math.abs(e2), r2 = Math.floor(n2 / 60), i2 = n2 % 60;
+        return (e2 <= 0 ? "+" : "-") + m(r2, 2, "0") + ":" + m(i2, 2, "0");
+      }, m: function t2(e2, n2) {
+        if (e2.date() < n2.date())
+          return -t2(n2, e2);
+        var r2 = 12 * (n2.year() - e2.year()) + (n2.month() - e2.month()), i2 = e2.clone().add(r2, f), s2 = n2 - i2 < 0, u2 = e2.clone().add(r2 + (s2 ? -1 : 1), f);
+        return +(-(r2 + (n2 - i2) / (s2 ? i2 - u2 : u2 - i2)) || 0);
+      }, a: function(t2) {
+        return t2 < 0 ? Math.ceil(t2) || 0 : Math.floor(t2);
+      }, p: function(t2) {
+        return { M: f, y: c, w: o, d: a, D: d, h: u, m: s, s: i, ms: r, Q: h }[t2] || String(t2 || "").toLowerCase().replace(/s$/, "");
+      }, u: function(t2) {
+        return void 0 === t2;
+      } }, g = "en", D = {};
+      D[g] = M;
+      var p = function(t2) {
+        return t2 instanceof _;
+      }, S = function t2(e2, n2, r2) {
+        var i2;
+        if (!e2)
+          return g;
+        if ("string" == typeof e2) {
+          var s2 = e2.toLowerCase();
+          D[s2] && (i2 = s2), n2 && (D[s2] = n2, i2 = s2);
+          var u2 = e2.split("-");
+          if (!i2 && u2.length > 1)
+            return t2(u2[0]);
+        } else {
+          var a2 = e2.name;
+          D[a2] = e2, i2 = a2;
+        }
+        return !r2 && i2 && (g = i2), i2 || !r2 && g;
+      }, w = function(t2, e2) {
+        if (p(t2))
+          return t2.clone();
+        var n2 = "object" == typeof e2 ? e2 : {};
+        return n2.date = t2, n2.args = arguments, new _(n2);
+      }, O = v;
+      O.l = S, O.i = p, O.w = function(t2, e2) {
+        return w(t2, { locale: e2.$L, utc: e2.$u, x: e2.$x, $offset: e2.$offset });
+      };
+      var _ = function() {
+        function M2(t2) {
+          this.$L = S(t2.locale, null, true), this.parse(t2);
+        }
+        var m2 = M2.prototype;
+        return m2.parse = function(t2) {
+          this.$d = function(t3) {
+            var e2 = t3.date, n2 = t3.utc;
+            if (null === e2)
+              return new Date(NaN);
+            if (O.u(e2))
+              return new Date();
+            if (e2 instanceof Date)
+              return new Date(e2);
+            if ("string" == typeof e2 && !/Z$/i.test(e2)) {
+              var r2 = e2.match($);
+              if (r2) {
+                var i2 = r2[2] - 1 || 0, s2 = (r2[7] || "0").substring(0, 3);
+                return n2 ? new Date(Date.UTC(r2[1], i2, r2[3] || 1, r2[4] || 0, r2[5] || 0, r2[6] || 0, s2)) : new Date(r2[1], i2, r2[3] || 1, r2[4] || 0, r2[5] || 0, r2[6] || 0, s2);
+              }
+            }
+            return new Date(e2);
+          }(t2), this.$x = t2.x || {}, this.init();
+        }, m2.init = function() {
+          var t2 = this.$d;
+          this.$y = t2.getFullYear(), this.$M = t2.getMonth(), this.$D = t2.getDate(), this.$W = t2.getDay(), this.$H = t2.getHours(), this.$m = t2.getMinutes(), this.$s = t2.getSeconds(), this.$ms = t2.getMilliseconds();
+        }, m2.$utils = function() {
+          return O;
+        }, m2.isValid = function() {
+          return !(this.$d.toString() === l);
+        }, m2.isSame = function(t2, e2) {
+          var n2 = w(t2);
+          return this.startOf(e2) <= n2 && n2 <= this.endOf(e2);
+        }, m2.isAfter = function(t2, e2) {
+          return w(t2) < this.startOf(e2);
+        }, m2.isBefore = function(t2, e2) {
+          return this.endOf(e2) < w(t2);
+        }, m2.$g = function(t2, e2, n2) {
+          return O.u(t2) ? this[e2] : this.set(n2, t2);
+        }, m2.unix = function() {
+          return Math.floor(this.valueOf() / 1e3);
+        }, m2.valueOf = function() {
+          return this.$d.getTime();
+        }, m2.startOf = function(t2, e2) {
+          var n2 = this, r2 = !!O.u(e2) || e2, h2 = O.p(t2), l2 = function(t3, e3) {
+            var i2 = O.w(n2.$u ? Date.UTC(n2.$y, e3, t3) : new Date(n2.$y, e3, t3), n2);
+            return r2 ? i2 : i2.endOf(a);
+          }, $2 = function(t3, e3) {
+            return O.w(n2.toDate()[t3].apply(n2.toDate("s"), (r2 ? [0, 0, 0, 0] : [23, 59, 59, 999]).slice(e3)), n2);
+          }, y2 = this.$W, M3 = this.$M, m3 = this.$D, v2 = "set" + (this.$u ? "UTC" : "");
+          switch (h2) {
+            case c:
+              return r2 ? l2(1, 0) : l2(31, 11);
+            case f:
+              return r2 ? l2(1, M3) : l2(0, M3 + 1);
+            case o:
+              var g2 = this.$locale().weekStart || 0, D2 = (y2 < g2 ? y2 + 7 : y2) - g2;
+              return l2(r2 ? m3 - D2 : m3 + (6 - D2), M3);
+            case a:
+            case d:
+              return $2(v2 + "Hours", 0);
+            case u:
+              return $2(v2 + "Minutes", 1);
+            case s:
+              return $2(v2 + "Seconds", 2);
+            case i:
+              return $2(v2 + "Milliseconds", 3);
+            default:
+              return this.clone();
+          }
+        }, m2.endOf = function(t2) {
+          return this.startOf(t2, false);
+        }, m2.$set = function(t2, e2) {
+          var n2, o2 = O.p(t2), h2 = "set" + (this.$u ? "UTC" : ""), l2 = (n2 = {}, n2[a] = h2 + "Date", n2[d] = h2 + "Date", n2[f] = h2 + "Month", n2[c] = h2 + "FullYear", n2[u] = h2 + "Hours", n2[s] = h2 + "Minutes", n2[i] = h2 + "Seconds", n2[r] = h2 + "Milliseconds", n2)[o2], $2 = o2 === a ? this.$D + (e2 - this.$W) : e2;
+          if (o2 === f || o2 === c) {
+            var y2 = this.clone().set(d, 1);
+            y2.$d[l2]($2), y2.init(), this.$d = y2.set(d, Math.min(this.$D, y2.daysInMonth())).$d;
+          } else
+            l2 && this.$d[l2]($2);
+          return this.init(), this;
+        }, m2.set = function(t2, e2) {
+          return this.clone().$set(t2, e2);
+        }, m2.get = function(t2) {
+          return this[O.p(t2)]();
+        }, m2.add = function(r2, h2) {
+          var d2, l2 = this;
+          r2 = Number(r2);
+          var $2 = O.p(h2), y2 = function(t2) {
+            var e2 = w(l2);
+            return O.w(e2.date(e2.date() + Math.round(t2 * r2)), l2);
+          };
+          if ($2 === f)
+            return this.set(f, this.$M + r2);
+          if ($2 === c)
+            return this.set(c, this.$y + r2);
+          if ($2 === a)
+            return y2(1);
+          if ($2 === o)
+            return y2(7);
+          var M3 = (d2 = {}, d2[s] = e, d2[u] = n, d2[i] = t, d2)[$2] || 1, m3 = this.$d.getTime() + r2 * M3;
+          return O.w(m3, this);
+        }, m2.subtract = function(t2, e2) {
+          return this.add(-1 * t2, e2);
+        }, m2.format = function(t2) {
+          var e2 = this, n2 = this.$locale();
+          if (!this.isValid())
+            return n2.invalidDate || l;
+          var r2 = t2 || "YYYY-MM-DDTHH:mm:ssZ", i2 = O.z(this), s2 = this.$H, u2 = this.$m, a2 = this.$M, o2 = n2.weekdays, f2 = n2.months, h2 = function(t3, n3, i3, s3) {
+            return t3 && (t3[n3] || t3(e2, r2)) || i3[n3].slice(0, s3);
+          }, c2 = function(t3) {
+            return O.s(s2 % 12 || 12, t3, "0");
+          }, d2 = n2.meridiem || function(t3, e3, n3) {
+            var r3 = t3 < 12 ? "AM" : "PM";
+            return n3 ? r3.toLowerCase() : r3;
+          }, $2 = { YY: String(this.$y).slice(-2), YYYY: this.$y, M: a2 + 1, MM: O.s(a2 + 1, 2, "0"), MMM: h2(n2.monthsShort, a2, f2, 3), MMMM: h2(f2, a2), D: this.$D, DD: O.s(this.$D, 2, "0"), d: String(this.$W), dd: h2(n2.weekdaysMin, this.$W, o2, 2), ddd: h2(n2.weekdaysShort, this.$W, o2, 3), dddd: o2[this.$W], H: String(s2), HH: O.s(s2, 2, "0"), h: c2(1), hh: c2(2), a: d2(s2, u2, true), A: d2(s2, u2, false), m: String(u2), mm: O.s(u2, 2, "0"), s: String(this.$s), ss: O.s(this.$s, 2, "0"), SSS: O.s(this.$ms, 3, "0"), Z: i2 };
+          return r2.replace(y, function(t3, e3) {
+            return e3 || $2[t3] || i2.replace(":", "");
+          });
+        }, m2.utcOffset = function() {
+          return 15 * -Math.round(this.$d.getTimezoneOffset() / 15);
+        }, m2.diff = function(r2, d2, l2) {
+          var $2, y2 = O.p(d2), M3 = w(r2), m3 = (M3.utcOffset() - this.utcOffset()) * e, v2 = this - M3, g2 = O.m(this, M3);
+          return g2 = ($2 = {}, $2[c] = g2 / 12, $2[f] = g2, $2[h] = g2 / 3, $2[o] = (v2 - m3) / 6048e5, $2[a] = (v2 - m3) / 864e5, $2[u] = v2 / n, $2[s] = v2 / e, $2[i] = v2 / t, $2)[y2] || v2, l2 ? g2 : O.a(g2);
+        }, m2.daysInMonth = function() {
+          return this.endOf(f).$D;
+        }, m2.$locale = function() {
+          return D[this.$L];
+        }, m2.locale = function(t2, e2) {
+          if (!t2)
+            return this.$L;
+          var n2 = this.clone(), r2 = S(t2, e2, true);
+          return r2 && (n2.$L = r2), n2;
+        }, m2.clone = function() {
+          return O.w(this.$d, this);
+        }, m2.toDate = function() {
+          return new Date(this.valueOf());
+        }, m2.toJSON = function() {
+          return this.isValid() ? this.toISOString() : null;
+        }, m2.toISOString = function() {
+          return this.$d.toISOString();
+        }, m2.toString = function() {
+          return this.$d.toUTCString();
+        }, M2;
+      }(), T = _.prototype;
+      return w.prototype = T, [["$ms", r], ["$s", i], ["$m", s], ["$H", u], ["$W", a], ["$M", f], ["$y", c], ["$D", d]].forEach(function(t2) {
+        T[t2[1]] = function(e2) {
+          return this.$g(e2, t2[0], t2[1]);
+        };
+      }), w.extend = function(t2, e2) {
+        return t2.$i || (t2(e2, _, w), t2.$i = true), w;
+      }, w.locale = S, w.isDayjs = p, w.unix = function(t2) {
+        return w(1e3 * t2);
+      }, w.en = D[g], w.Ls = D, w.p = {}, w;
+    });
+  }
+});
+export default require_dayjs_min();
diff --git a/uni_modules/uv-ui-tools/libs/util/route.js b/uni_modules/uv-ui-tools/libs/util/route.js
new file mode 100644
index 0000000..80c0afd
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/util/route.js
@@ -0,0 +1,126 @@
+/**
+ * 路由跳转方法，该方法相对于直接使用uni.xxx的好处是使用更加简单快捷
+ * 并且带有路由拦截功能
+ */
+import { queryParams, deepMerge, page } from '@/uni_modules/uv-ui-tools/libs/function/index.js'
+class Router {
+	constructor() {
+		// 原始属性定义
+		this.config = {
+			type: 'navigateTo',
+			url: '',
+			delta: 1, // navigateBack页面后退时,回退的层数
+			params: {}, // 传递的参数
+			animationType: 'pop-in', // 窗口动画,只在APP有效
+			animationDuration: 300, // 窗口动画持续时间,单位毫秒,只在APP有效
+			intercept: false ,// 是否需要拦截
+			events: {} // 页面间通信接口，用于监听被打开页面发送到当前页面的数据。hbuilderx 2.8.9+ 开始支持。
+		}
+		// 因为route方法是需要对外赋值给另外的对象使用，同时route内部有使用this，会导致route失去上下文
+		// 这里在构造函数中进行this绑定
+		this.route = this.route.bind(this)
+	}
+
+	// 判断url前面是否有"/"，如果没有则加上，否则无法跳转
+	addRootPath(url) {
+		return url[0] === '/' ? url : `/${url}`
+	}
+
+	// 整合路由参数
+	mixinParam(url, params) {
+		url = url && this.addRootPath(url)
+
+		// 使用正则匹配，主要依据是判断是否有"/","?","="等，如“/page/index/index?name=mary"
+		// 如果有url中有get参数，转换后无需带上"?"
+		let query = ''
+		if (/.*\/.*\?.*=.*/.test(url)) {
+			// object对象转为get类型的参数
+			query = queryParams(params, false)
+			// 因为已有get参数,所以后面拼接的参数需要带上"&"隔开
+			return url += `&${query}`
+		}
+		// 直接拼接参数，因为此处url中没有后面的query参数，也就没有"?/&"之类的符号
+		query = queryParams(params)
+		return url += query
+	}
+
+	// 对外的方法名称
+	async route(options = {}, params = {}) {
+		// 合并用户的配置和内部的默认配置
+		let mergeConfig = {}
+
+		if (typeof options === 'string') {
+			// 如果options为字符串，则为route(url, params)的形式
+			mergeConfig.url = this.mixinParam(options, params)
+			mergeConfig.type = 'navigateTo'
+		} else {
+			mergeConfig = deepMerge(this.config, options)
+			// 否则正常使用mergeConfig中的url和params进行拼接
+			mergeConfig.url = this.mixinParam(options.url, options.params)
+		}
+		// 如果本次跳转的路径和本页面路径一致，不执行跳转，防止用户快速点击跳转按钮，造成多次跳转同一个页面的问题
+		if (mergeConfig.url === page()) return
+
+		if (params.intercept) {
+			mergeConfig.intercept = params.intercept
+		}
+		// params参数也带给拦截器
+		mergeConfig.params = params
+		// 合并内外部参数
+		mergeConfig = deepMerge(this.config, mergeConfig)
+		// 判断用户是否定义了拦截器
+		if (typeof mergeConfig.intercept === 'function') {
+			// 定一个promise，根据用户执行resolve(true)或者resolve(false)来决定是否进行路由跳转
+			const isNext = await new Promise((resolve, reject) => {
+				mergeConfig.intercept(mergeConfig, resolve)
+			})
+			// 如果isNext为true，则执行路由跳转
+			isNext && this.openPage(mergeConfig)
+		} else {
+			this.openPage(mergeConfig)
+		}
+	}
+
+	// 执行路由跳转
+	openPage(config) {
+		// 解构参数
+		const {
+			url,
+			type,
+			delta,
+			animationType,
+			animationDuration,
+			events
+		} = config
+		if (config.type == 'navigateTo' || config.type == 'to') {
+			uni.navigateTo({
+				url,
+				animationType,
+				animationDuration,
+				events
+			})
+		}
+		if (config.type == 'redirectTo' || config.type == 'redirect') {
+			uni.redirectTo({
+				url
+			})
+		}
+		if (config.type == 'switchTab' || config.type == 'tab') {
+			uni.switchTab({
+				url
+			})
+		}
+		if (config.type == 'reLaunch' || config.type == 'launch') {
+			uni.reLaunch({
+				url
+			})
+		}
+		if (config.type == 'navigateBack' || config.type == 'back') {
+			uni.navigateBack({
+				delta
+			})
+		}
+	}
+}
+
+export default (new Router()).route
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/package.json b/uni_modules/uv-ui-tools/package.json
new file mode 100644
index 0000000..2d940f6
--- /dev/null
+++ b/uni_modules/uv-ui-tools/package.json
@@ -0,0 +1,81 @@
+{
+  "id": "uv-ui-tools",
+  "displayName": "uv-ui-tools 工具集 全面兼容vue3+2、app、h5、小程序等多端",
+  "version": "1.1.25",
+  "description": "uv-ui-tools，集成工具库，强大的Http请求封装，清晰的文档说明，开箱即用。方便使用，可以全局使用",
+  "keywords": [
+    "uv-ui-tools,uv-ui组件库,工具集,uvui,uView2.x"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "插件不采集任何数据",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        },
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y",
+          "钉钉": "y",
+          "快手": "y",
+          "飞书": "y",
+          "京东": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/readme.md b/uni_modules/uv-ui-tools/readme.md
new file mode 100644
index 0000000..79a7df5
--- /dev/null
+++ b/uni_modules/uv-ui-tools/readme.md
@@ -0,0 +1,23 @@
+## uv-ui-tools 工具集
+
+> **组件名：uv-ui-tools**
+
+uv-ui工具集成，包括网络Http请求、便捷工具、节流防抖、对象操作、时间格式化、路由跳转、全局唯一标识符、规则校验等等。
+
+该组件推荐配合[uv-ui组件库](https://www.uvui.cn/components/intro.html)使用，单独下载也可以在自己项目中使用，需要做相应的配置，可查看文档。强烈推荐使用[uv-ui组件库](https://www.uvui.cn/components/intro.html)，导入组件都会自动导入`uv-ui-tools`。需要在自己的项目中使用请参考[扩展配置](https://www.uvui.cn/components/setting.html)。
+
+uv-ui破釜沉舟之兼容vue3+2、app、h5、多端小程序的uni-app生态框架，大部分组件基于uView2.x，在经过改进后全面支持vue3，部分组件做了进一步的优化，修复大量BUG，支持单独导入，方便开发者选择导入需要的组件。开箱即用，灵活配置。
+
+# <a href="https://www.uvui.cn/js/intro.html" target="_blank">查看文档</a>
+
+## [下载完整示例项目](https://ext.dcloud.net.cn/plugin?name=uv-ui) <small>（请不要 下载插件ZIP）</small>
+
+### [更多插件，请关注uv-ui组件库](https://ext.dcloud.net.cn/plugin?name=uv-ui)
+
+<a href="https://ext.dcloud.net.cn/plugin?name=uv-ui" target="_blank">
+
+![image](https://mp-a667b617-c5f1-4a2d-9a54-683a67cff588.cdn.bspapp.com/uv-ui/banner.png)
+
+</a>
+
+#### 如使用过程中有任何问题反馈，或者您对uv-ui有一些好的建议，欢迎加入uv-ui官方交流群：<a href="https://www.uvui.cn/components/addQQGroup.html" target="_blank">官方QQ群</a>
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/theme.scss b/uni_modules/uv-ui-tools/theme.scss
new file mode 100644
index 0000000..cfaae92
--- /dev/null
+++ b/uni_modules/uv-ui-tools/theme.scss
@@ -0,0 +1,43 @@
+// 此文件为uvUI的主题变量，这些变量目前只能通过uni.scss引入才有效，另外由于
+// uni.scss中引入的样式会同时混入到全局样式文件和单独每一个页面的样式中，造成微信程序包太大，
+// 故uni.scss只建议放scss变量名相关样式，其他的样式可以通过main.js或者App.vue引入
+
+$uv-main-color: #303133;
+$uv-content-color: #606266;
+$uv-tips-color: #909193;
+$uv-light-color: #c0c4cc;
+$uv-border-color: #dadbde;
+$uv-bg-color: #f3f4f6;
+$uv-disabled-color: #c8c9cc;
+
+$uv-primary: #3c9cff;
+$uv-primary-dark: #398ade;
+$uv-primary-disabled: #9acafc;
+$uv-primary-light: #ecf5ff;
+
+$uv-warning: #f9ae3d;
+$uv-warning-dark: #f1a532;
+$uv-warning-disabled: #f9d39b;
+$uv-warning-light: #fdf6ec;
+
+$uv-success: #5ac725;
+$uv-success-dark: #53c21d;
+$uv-success-disabled: #a9e08f;
+$uv-success-light: #f5fff0;
+
+$uv-error: #f56c6c;
+$uv-error-dark: #e45656;
+$uv-error-disabled: #f7b2b2;
+$uv-error-light: #fef0f0;
+
+$uv-info: #909399;
+$uv-info-dark: #767a82;
+$uv-info-disabled: #c4c6c9;
+$uv-info-light: #f4f4f5;
+
+@mixin flex($direction: row) {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: $direction;
+}
\ No newline at end of file
diff --git a/util/apiUrl.js b/util/apiUrl.js
new file mode 100644
index 0000000..52cf71e
--- /dev/null
+++ b/util/apiUrl.js
@@ -0,0 +1,52 @@
+//统一设置API接口地址
+let urls = {
+	// 七牛相关API
+
+	upload: `/admin-api/infra/file/upload`,
+	newPageUrl: `/app-api/psychic/news/page`,
+	newDetailUrl: `/app-api/psychic/news/get`,
+	loginUrl: `/app-api/oauth/app/login`,
+	getBanner: `/app-api/psychic/banner/all`,
+	psychicSave: `/app-api/psychic/save`,
+	getPsychicListTest: `/app-api/psychic/study/list`,
+	getSingleDetail: `/app-api/psychic/study/getSingleDetail`,
+	userChoiceSave: `/app-api/psychic/user-choice/save`,
+	getResult: `/app-api/psychic/user-choice/getResult`,
+	myTest: `/app-api/psychic/user-choice/my-test`,
+	businessScopeList: `/app-api/psychic/doctor-info/business-scope-list`,
+	getDoctorInfo: `/app-api/psychic/doctor-info/get`,
+	doctorInfopage: `/app-api/psychic/doctor-info/page`,
+	focus: `/app-api/psychic/doctor-info/focus`,
+	cancelFocus: `/app-api/psychic/doctor-info/cancel-focus`,
+	appointTotalList: `/app-api/psychic/appointment/remain-list`,
+	dateDetailList: `/app-api/psychic/appointment/date-detail-list`,
+	getShowInfo: `/app-api/psychic/doctor-info/get-show-info`,
+	createOrder: `/app-api/psychic/pay/createOrder`,
+	refund: `/app-api/psychic/pay/refund`,
+
+	getSelfInfo: `/app-api/psychic/platform-user/getSelfInfo`,
+	updateUserInfo: `/app-api/psychic/platform-user/update`,
+
+	notReadNum: `/app-api/psychic/platform-user/not-read-num`,
+	focusToRead: `/app-api/psychic/platform-user/focus-to-read`,
+	orderToRead: `/app-api/psychic/platform-user/order-to-read`,
+	userFeedback: `/app-api/psychic/platform-user/user-feedback`,
+	feedbackFlag: `/app-api/psychic/platform-user/feedback-flag`,
+	
+	focusAll: `/app-api/psychic/platform-user/focus-all`,
+	getByCode: `/app-api/psychic/procotol/getByCode`,
+
+
+	// 订单
+	createZxOrder: `/app-api/psychic/order/create`,
+
+	orderList: `/app-api/psychic/order/order-list`,
+	orderDetail: `/app-api/psychic/order/order-detail`,
+	getPayParam: `/app-api/psychic/order/get-pay-param`,
+	cancelOrder: `/app-api/psychic/order/cancel`,
+	deleteOrder: `/app-api/psychic/order/delete-order`,
+
+}
+export {
+	urls
+}
\ No newline at end of file
diff --git a/util/request/core/request.js b/util/request/core/request.js
new file mode 100644
index 0000000..897d19e
--- /dev/null
+++ b/util/request/core/request.js
@@ -0,0 +1,171 @@
+import { mergeConfig, dispatchRequest, jsonpRequest} from "./utils.js";
+export default class request {
+	constructor(options) {
+		//请求公共地址
+		this.baseUrl = options.baseUrl || "";
+		//公共文件上传请求地址
+		this.fileUrl = options.fileUrl || "";
+		// 超时时间
+		this.timeout = options.timeout || 6000;
+		// 服务器上传图片默认url
+		this.defaultUploadUrl = options.defaultUploadUrl || "";
+		//默认请求头
+		this.header = options.header || {};
+		//默认配置
+		this.config = options.config || {
+			isPrompt: true,
+			load: true,
+			isFactory: true,
+            resend: 0
+		};
+	}
+	
+	 navigateTo(url,data) {
+	    const isLoggedIn = uni.getStorageSync('token'); // 假设 token 保存在本地存储
+		console.log("isLoggedIn",isLoggedIn)
+	    if (isLoggedIn) {
+			if(data){
+				uni.navigateTo({
+					url: url,
+					animationType: "pop-in",
+					success: function(res) {
+						res.eventChannel.emit('acceptDataFromOpenerPage',data)
+					}
+				})
+			}else{
+				uni.navigateTo({
+					"url": url,
+					"animationType": "pop-in"
+				});
+			}
+			
+	       
+	    } else {
+	       uni.showModal({
+	       	title: '提示',
+	       	content: '您还未登录,是否前往登录？',
+			confirmText: '前往',
+	       	success: function (res) {
+	       		if (res.confirm) {
+				  uni.navigateTo({
+					"url":"/pages/login-pop/login-pop?type=2",
+					"animationType": "pop-in"
+				  })
+	       		} 
+	       	}
+	       });
+	    }
+	}
+	
+	
+	//post请求
+	post(url = '', data = {}, options = {}) {
+		return this.request({
+			method: "POST",
+			data: data,
+			url: url,
+			...options
+		});
+	}
+
+	//get请求
+	get(url = '', data = {}, options = {}) {
+		return this.request({
+			method: "GET",
+			data: data,
+			url: url,
+			...options
+		});
+	}
+
+	//put请求
+	put(url = '', data = {}, options = {}) {
+		return this.request({
+			method: "PUT",
+			data: data,
+			url: url,
+			...options
+		});
+	}
+
+	//delete请求
+	delete(url = '', data = {}, options = {}) {
+		return this.request({
+			method: "DELETE",
+			data: data,
+			url: url,
+			...options
+		});
+	}
+	//jsonp请求(只限于H5使用)
+	jsonp(url = '', data = {}, options = {}) {
+		return this.request({
+			method: "JSONP",
+			data: data,
+			url: url,
+			...options
+		});
+	}
+	//接口请求方法
+	async request(data) {
+		// 请求数据
+		let requestInfo,
+		// 是否运行过请求开始钩子
+		runRequestStart = false;
+		try {
+			if (!data.url) {
+				throw { errMsg: "【request】缺失数据url", statusCode: 0}
+			}
+			// 数据合并
+			requestInfo = mergeConfig(this, data);
+			// 代表之前运行到这里
+			runRequestStart = true;
+			//请求前回调
+			if (this.requestStart) {
+				let requestStart = this.requestStart(requestInfo);
+				if (typeof requestStart == "object") {
+					let changekeys = ["data", "header", "isPrompt", "load", "isFactory"];
+					changekeys.forEach(key => {
+						requestInfo[key] = requestStart[key];
+					});
+				} else {
+					throw {
+						errMsg: "【request】请求开始拦截器未通过",
+						statusCode: 0,
+						data: requestInfo.data,
+						method: requestInfo.method,
+						header: requestInfo.header,
+						url: requestInfo.url,
+					}
+				}
+			}
+			let requestResult = {};
+			if(requestInfo.method == "JSONP"){
+				requestResult = await jsonpRequest(requestInfo);
+			} else {
+				requestResult = await dispatchRequest(requestInfo);
+			}
+			//是否用外部的数据处理方法
+			if (requestInfo.isFactory && this.dataFactory) {
+				//数据处理
+				let result = await this.dataFactory({
+					...requestInfo,
+					response: requestResult
+				});
+				return Promise.resolve(result);
+			} else {
+				return Promise.resolve(requestResult);
+			}
+		} catch (err){
+
+
+			this.requestError && this.requestError(err);
+			return Promise.reject(err);
+		} finally {
+			// 如果请求开始未运行到，请求结束也不运行
+			if(runRequestStart){
+				this.requestEnd && this.requestEnd(requestInfo);
+			}
+		}
+	}
+}
diff --git a/util/request/core/utils.js b/util/request/core/utils.js
new file mode 100644
index 0000000..65e4a70
--- /dev/null
+++ b/util/request/core/utils.js
@@ -0,0 +1,101 @@
+// 获取合并的数据
+export const mergeConfig = function(_this, options) {
+	//判断url是不是链接
+	let urlType = /^(http|https):\/\//.test(options.url);
+	let config = Object.assign({
+		timeout: _this.timeout
+	}, _this.config, options);
+	if (options.method == "FILE") {
+		config.url = urlType ? options.url : _this.fileUrl + options.url;
+	} else {
+		config.url = urlType ? options.url : _this.baseUrl + options.url;
+	}
+	//请求头
+	if (options.header) {
+		config.header = Object.assign({}, _this.header, options.header);
+	} else {
+		config.header = Object.assign({}, _this.header);
+	}
+	return config;
+}
+// 请求
+export const dispatchRequest = function(requestInfo) {
+	return new Promise((resolve, reject) => {
+		let requestAbort = true;
+		let requestData = {
+			url: requestInfo.url,
+			header: requestInfo.header, //加入请求头
+			success: (res) => {
+				requestAbort = false;
+				resolve(res);
+			},
+			fail: (err) => {
+				requestAbort = false;
+				if(err.errMsg == "request:fail abort"){
+					reject({
+						errMsg: "请求超时，请重新尝试",
+						statusCode: 0,
+					});
+				} else {
+					reject(err);
+				}
+			}
+		};
+		//请求类型
+		if (requestInfo.method) {
+			requestData.method = requestInfo.method;
+		}
+		if (requestInfo.data) {
+			requestData.data = requestInfo.data;
+		}
+		// #ifdef MP-WEIXIN || MP-ALIPAY
+		if (requestInfo.timeout) {
+			requestData.timeout = requestInfo.timeout;
+		}
+		// #endif
+		if (requestInfo.dataType) {
+			requestData.dataType = requestInfo.dataType;
+		}
+		// #ifndef APP-PLUS || MP-ALIPAY
+		if (requestInfo.responseType) {
+			requestData.responseType = requestInfo.responseType;
+		}
+		// #endif
+		// #ifdef H5
+		if (requestInfo.withCredentials) {
+			requestData.withCredentials = requestInfo.withCredentials;
+		}
+		// #endif
+		let requestTask = uni.request(requestData);
+		setTimeout(() => {
+			if(requestAbort){
+				requestTask.abort();
+			}
+		}, requestInfo.timeout)
+	})
+}
+// jsonp请求
+export const jsonpRequest = function(requestInfo) {
+	return new Promise((resolve, reject) => {
+		let dataStr = '';
+		Object.keys(requestInfo.data).forEach(key => {
+			dataStr += key + '=' + requestInfo.data[key] + '&';
+		});
+		//匹配最后一个&并去除
+		if (dataStr !== '') {
+			dataStr = dataStr.substr(0, dataStr.lastIndexOf('&'));
+		}
+		requestInfo.url = requestInfo.url + '?' + dataStr;
+		let callbackName = "callback" + Math.ceil(Math.random() * 1000000);
+		// #ifdef H5
+		window[callbackName] = function(data) {
+			resolve(data);
+		}
+		let script = document.createElement("script");
+		script.src = requestInfo.url + "&callback=" + callbackName;
+		document.head.appendChild(script);
+		// 及时删除，防止加载过多的JS
+		document.head.removeChild(script);
+		// #endif
+	});
+}
\ No newline at end of file
diff --git a/util/request/index.js b/util/request/index.js
new file mode 100644
index 0000000..d328401
--- /dev/null
+++ b/util/request/index.js
@@ -0,0 +1,2 @@
+import request from "./core/request.js";
+export default request;
diff --git a/util/requestConfig.js b/util/requestConfig.js
new file mode 100644
index 0000000..f9ff268
--- /dev/null
+++ b/util/requestConfig.js
@@ -0,0 +1,204 @@
+import {
+	sysConsts
+} from '../common/sysConsts.js';
+import request from "./request";
+// 全局配置的请求域名
+// const baseUrl = 'http://192.168.100.19:8922'; //线上正式环境888
+// const baseUrl = 'https://api-qa.scyuelai.com/';					//qa测试环境
+// const baseUrl = 'https://api-zsh-dev.scyuelai.com/'				//dev开发环境
+// const baseUrl = 'https://local.scyuelai.com/';					//本地测试环境
+ const baseUrl = "https://miniapp.yuxingu.com.cn" //https://miniapp.yuxingu.com.cn   
+// const baseUrl = "http://8.137.99.227:8922"
+
+
+//可以new多个request来支持多个域名请求
+let $http = new request({
+	//接口请求地址
+	baseUrl: baseUrl,
+	//服务器本地上传文件地址
+	fileUrl: baseUrl,
+	// 服务器上传图片默认url
+	defaultUploadUrl: "api/common/v1/upload_image",
+	//设置请求头（如果使用报错跨域问题，可能是content-type请求类型和后台那边设置的不一致）
+	header: {
+		'content-type': 'application/json;charset=UTF-8'
+	},
+	// 请求超时时间（默认6000）
+	timeout: 20000,
+	// 默认配置（可不写）
+	config: {
+		// 是否自动提示错误
+		isPrompt: true,
+		// 是否显示加载动画
+		load: true,
+		// 是否使用数据工厂
+		isFactory: true,
+		// 加载动画提示文字
+		loadingText: '加载中',
+	}
+});
+
+//当前接口请求数
+let requestNum = 0;
+//请求开始拦截器
+$http.requestStart = function(options) {
+	if (options.load) {
+		if (requestNum <= 0) {
+			//打开加载动画
+			uni.showLoading({
+				title: options.loadingText,
+				mask: true
+			});
+		}
+		requestNum += 1;
+	}
+	// 图片上传大小限制
+	if (options.method == "FILE" && options.maxSize) {
+		// 文件最大字节: options.maxSize 可以在调用方法的时候加入参数
+		const maxSize = options.maxSize;
+		for (let item of options.files) {
+			if (item.size > maxSize) {
+				setTimeout(() => {
+					uni.showToast({
+						title: "图片过大，请重新上传",
+						icon: "none"
+					});
+				}, 500);
+				return false;
+			}
+		}
+	}
+	//请求前加入token
+	let myToken = uni.getStorageSync('token')
+	if (myToken) {
+		myToken = myToken.replace(/\"/g, "");
+		options.header['Authorization'] = 'Bearer ' + myToken;
+	}
+
+	return options; // return false 表示请求拦截，不会继续请求
+}
+//请求结束
+$http.requestEnd = function(options) {
+	//判断当前接口是否需要加载动画
+	if (options.load) {
+		requestNum = requestNum - 1;
+		if (requestNum <= 0) {
+			 uni.hideLoading();			
+		}
+	}
+}
+//所有接口数据处理（可在接口里设置不调用此方法）
+//此方法需要开发者根据各自的接口返回类型修改，以下只是模板
+$http.dataFactory = async function(res) {
+	// console.log("接口请求数据", {
+	// 	url: res.url,
+	// 	resolve: res.response,
+	// 	header: res.header,
+	// 	data: res.data,
+	// 	method: res.method,
+	// });
+	if (res.response.statusCode && res.response.statusCode == 200) {
+		let httpData = res.response.data;
+
+		if (typeof(httpData) == "string") {
+			httpData = JSON.parse(httpData);
+		}
+		/*********以下只是模板(及共参考)，需要开发者根据各自的接口返回类型修改*********/
+
+		//判断数据是否请求成功
+		if (httpData.success || httpData.code == 0) {
+			// 返回正确的结果(then接受数据)
+			return Promise.resolve(httpData.data);
+		} else if (httpData.code == "401" || httpData.code == "1001" || httpData.code == 1100) {
+			// let content = '此时此刻需要您登录喔~';
+			// if (!uni.getStorageSync('loginPageAlive')) {
+			// 	await gotoLogin().then(()=>{
+
+			// 	})
+			// }
+
+			gotoLogin(res)
+			// 返回错误的结果(catch接受数据)
+			return Promise.reject({
+				statusCode: 0,
+				errMsg: "【request】" + (httpData.info || httpData.msg)
+			});
+		} else { //其他错误提示
+			if (res.isPrompt) {
+				setTimeout(() => {
+					uni.showToast({
+						title: httpData.info || httpData.msg,
+						icon: "none",
+						duration: 3000
+					});
+				}, 100)
+			}
+			// 返回错误的结果(catch接受数据)
+			return Promise.reject({
+				statusCode: 0,
+				errMsg: "【request】" + (httpData.info || httpData.msg)
+			});
+		}
+	} else if (res.response.statusCode && res.response.statusCode == 401) {
+		gotoLogin(res)
+	} else {
+		// 返回错误的结果(catch接受数据)
+		return Promise.reject({
+			statusCode: res.response.statusCode,
+			errMsg: "【request】数据工厂验证不通过"
+		});
+	}
+};
+// 错误回调
+$http.requestError = function(e) {
+	// e.statusCode === 0 是参数效验错误抛出的
+	if (e.statusCode === 0) {
+		throw e;
+	} else {
+		setTimeout(() => {
+			uni.showToast({
+				title: "网络错误 请检查一下网络",
+				icon: "none"
+			});
+		}, 100)
+	}
+}
+
+//token过期，退出登录
+function gotoLogin(res) {
+	uni.removeStorageSync("token")
+	uni.removeStorageSync("userinfo")
+	console.log('res', res)
+	// uni.navigateTo({
+	// 	"url": "/pages/login-pop/login-pop?type=1",
+	// 	"animationType": "pop-in"
+	// })
+	// return new Promise((resolve, rejict)=>{
+
+
+
+
+	// 	// uni.switchTab({
+	// 	// 	"url":"/pages/login-pop/login-pop",
+	// 	// 	success:(res)=>{
+	// 	// 		// uni.showToast({
+	// 	// 		// 	title: "登录已失效,请重新登录",
+	// 	// 		// 	icon: "none"
+	// 	// 		// });
+	// 	// 		uni.showModal({
+	// 	// 			title: '提示',
+	// 	// 			content: '登录已失效,是否重新登录',
+	// 	// 			success: function (res) {
+	// 	// 				if (res.confirm) {
+	// 	// 					uni.navigateTo({
+	// 	// 						"url":"/pageLogin/user-detail/user-detail"
+	// 	// 					})
+	// 	// 				} 
+	// 	// 			}
+	// 	// 		});	
+	// 	// 	}
+	// 	// })
+	// 	resolve()
+	// })
+}
+export default $http;
\ No newline at end of file
diff --git a/vite.config.js b/vite.config.js
new file mode 100644
index 0000000..23b01a8
--- /dev/null
+++ b/vite.config.js
@@ -0,0 +1,18 @@
+import { defineConfig } from 'vite'
+import uni from '@dcloudio/vite-plugin-uni'
+import AutoImport from 'unplugin-auto-import/vite'
+ 
+export default defineConfig({
+    plugins: [
+        uni(),        
+        // 自动导入配置
+        AutoImport({
+            imports:[
+                // 预设
+                'vue',
+                'uni-app'                
+            ]
+        })
+    ]    
+})
+