2 долоо хоног өмнө · 43d5561f7a
--- a/App.vue
+++ b/App.vue
@@ -0,0 +1,17 @@
 
				+<script>

			
 
				+	export default {

			
 
				+		onLaunch: function() {

			
 
				+			console.log('App Launch')

			
 
				+		},

			
 
				+		onShow: function() {

			
 
				+			console.log('App Show')

			
 
				+		},

			
 
				+		onHide: function() {

			
 
				+			console.log('App Hide')

			
 
				+		}

			
 
				+	}

			
 
				+</script>

			
 
				+

			
 
				+<style>

			
 
				+	/*每个页面公共css */

			
 
				+</style>
			
--- a/index.html
+++ b/index.html
@@ -0,0 +1,20 @@
 
				+<!DOCTYPE html>
			
 
				+<html lang="zh-CN">
			
 
				+  <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>
			
--- a/main.js
+++ b/main.js
@@ -0,0 +1,31 @@
 
				+import App from './App'
			
 
				+

			
 
				+

			
 
				+import uView from './uni_modules/uview-ui'

			
 
				+// 载入uView库

			
 
				+Vue.use(uView)

			
 
				+

			
 
				+
			
 
				+import common from 'static/js/common.js';

			
 
				+Vue.prototype.$dialog = common;

			
 
				+
			
 
				+// #ifndef VUE3
			
 
				+import Vue from 'vue'
			
 
				+import './uni.promisify.adaptor'
			
 
				+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
			
--- a/manifest.json
+++ b/manifest.json
@@ -0,0 +1,74 @@
 
				+{
			
 
				+    "name" : "核销工具DY",
			
 
				+    "appid" : "__UNI__9C28A0C",
			
 
				+    "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" : "",
			
 
				+        "setting" : {
			
 
				+            "urlCheck" : false
			
 
				+        },
			
 
				+        "usingComponents" : true
			
 
				+    },
			
 
				+    "mp-alipay" : {
			
 
				+        "usingComponents" : true
			
 
				+    },
			
 
				+    "mp-baidu" : {
			
 
				+        "usingComponents" : true
			
 
				+    },
			
 
				+    "mp-toutiao" : {
			
 
				+        "usingComponents" : true,
			
 
				+        "appid" : "tt991cefa106104d2b01"
			
 
				+    },
			
 
				+    "uniStatistics" : {
			
 
				+        "enable" : false
			
 
				+    },
			
 
				+    "vueVersion" : "2",

			
 
				+	"sassImplementationName":"node-sass"
			
 
				+}
			
--- a/pages.json
+++ b/pages.json
@@ -0,0 +1,79 @@
 
				+{

			
 
				+	"pages": [

			
 
				+		{

			
 
				+			"path": "pages/index/index",

			
 
				+			"style": {

			
 
				+				"navigationBarTitleText": "团购自助兑换"

			
 
				+			}

			
 
				+		},

			
 
				+		{

			
 
				+			"path": "pages/order/order",

			
 
				+			"style": {

			
 
				+				"navigationBarTitleText": "订单"

			
 
				+			}

			
 
				+		},

			
 
				+		{

			
 
				+			"path": "pages/user/user",

			
 
				+			"style": {

			
 
				+				"navigationBarTitleText": "我的"

			
 
				+			}

			
 
				+		},

			
 
				+		{

			
 
				+			"path": "pages/order/confirm",

			
 
				+			"style": {

			
 
				+				"navigationBarTitleText": "确认订单"

			
 
				+			}

			
 
				+		},

			
 
				+		{

			
 
				+			"path": "pages/order/detail",

			
 
				+			"style": {

			
 
				+				"navigationBarTitleText": "团购券"

			
 
				+			}

			
 
				+		},

			
 
				+		{

			
 
				+			"path": "pages/user/license",

			
 
				+			"style": {

			
 
				+				"navigationBarTitleText": "资质亮照"

			
 
				+			}

			
 
				+		},

			
 
				+		{

			
 
				+			"path": "pages/order/store",

			
 
				+			"style": {

			
 
				+				"navigationBarTitleText": "选择门店"

			
 
				+			}

			
 
				+		}

			
 
				+	],

			
 
				+	"globalStyle": {

			
 
				+		"navigationBarTextStyle": "black",

			
 
				+		"navigationBarTitleText": "团购自助兑换",

			
 
				+		"navigationBarBackgroundColor": "#ffffff",

			
 
				+		"backgroundColor": "#F8F8F8"

			
 
				+	},

			
 
				+	"tabBar": {

			
 
				+		"backgroundColor": "#ffffff",

			
 
				+		"borderStyle": "white",

			
 
				+		"color": "#666666",

			
 
				+		"selectedColor": "#224d7a",

			
 
				+		"list": [

			
 
				+			{

			
 
				+				"iconPath": "/static/image/coupon.png",

			
 
				+				"selectedIconPath": "/static/image/coupon-fill.png",

			
 
				+				"pagePath": "pages/index/index",

			
 
				+				"text": "首页"

			
 
				+			},

			
 
				+			{

			
 
				+				"iconPath": "/static/image/order.png",

			
 
				+				"selectedIconPath": "/static/image/order-fill.png",

			
 
				+				"pagePath": "pages/order/order",

			
 
				+				"text": "订单"

			
 
				+			},

			
 
				+			{

			
 
				+				"iconPath": "/static/image/user.png",

			
 
				+				"selectedIconPath": "/static/image/user-fill.png",

			
 
				+				"pagePath": "pages/user/user",

			
 
				+				"text": "我的"

			
 
				+			}

			
 
				+		]

			
 
				+	},

			
 
				+	"uniIdRouter": {}

			
 
				+}
			
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -0,0 +1,100 @@
 
				+<template>

			
 
				+	<view class="content">

			
 
				+		<view class="empty-data" v-if="coupon.length == 0">

			
 
				+			<u-empty mode="order" icon="/static/image/order_none.png" text="暂无抖音团购订单"></u-empty>

			
 
				+		</view>

			
 
				+		<view class="coupon-list" v-else>

			
 
				+			<view class="coupon-item" v-for="(item,indx) in coupon" :key="indx">

			
 
				+				<view class="header">订单编号 {{item.order_id}}</view>

			
 
				+				<view class="body">

			
 
				+					<view class="img"><image :src="item.product_img"></image></view>

			
 
				+					<view class="info">

			
 
				+						<view class="name">{{item.product_name}}</view>

			
 
				+						<view class="desc">x {{item.count}}张</view>

			
 
				+						<view class="desc">有效期至{{item.end_at}}</view>

			
 
				+					</view>

			
 
				+				</view>

			
 
				+				<view class="footer">

			
 
				+					<view class="state"></view>

			
 
				+					<button class="btn" type="primary" @click="toDetail(item.order_id)">立即使用</button>

			
 
				+				</view>

			
 
				+				<view class="state-img"><image src="/static/image/no.png" mode="widthFix"></image></view>

			
 
				+			</view>

			
 
				+		</view>

			
 
				+	</view>

			
 
				+</template>

			
 
				+

			
 
				+<script>

			
 
				+var app;

			
 
				+import * as Api from "@/static/api/home.js";

			
 
				+export default {

			
 
				+	data() {

			
 
				+		return {

			
 
				+			user:{},

			
 
				+			coupon:[]

			
 
				+		}

			
 
				+	},

			
 
				+	onLoad() {

			
 
				+		app = this;

			
 
				+		app.getData()

			
 
				+	},

			
 
				+	onShareAppMessage(res) {

			
 
				+	    if (res.from === 'button') {// 来自页面内分享按钮

			
 
				+			console.log(res.target)

			
 
				+	    }

			
 
				+	    return {

			
 
				+			title: "团购自助兑换",

			
 
				+			path: '/pages/index/index'

			
 
				+	    }

			
 
				+	},

			
 
				+	methods: {

			
 
				+		toDetail(order){

			
 
				+			uni.navigateTo({

			
 
				+				url:"/pages/order/store?type=1&order="+order

			
 
				+			})

			
 
				+		},

			
 
				+		getData(){

			
 
				+			uni.login({

			
 
				+				success(lres){

			
 
				+					Api.data({"code":lres.code}).then((res)=>{

			
 
				+						uni.hideLoading();

			
 
				+						if (res.code == 0) {

			
 
				+							return app.$dialog.showSuccess(res.info);

			
 
				+						}

			
 
				+						uni.setStorageSync("user_data", res.data.user)

			
 
				+						uni.setStorageSync("user_token", res.data.user.access_token)

			
 
				+						app.userInfo = res.data.user;

			
 
				+						app.coupon = res.data.coupon;

			
 
				+					})

			
 
				+				},fail(res){

			
 
				+					app.$dialog.showSuccess("登录失败,请重启小程序")

			
 
				+				}

			
 
				+			})

			
 
				+		}

			
 
				+	}

			
 
				+}

			
 
				+</script>

			
 
				+

			
 
				+<style>

			
 
				+page{

			
 
				+	background-color: #f8f8f8;

			
 
				+}

			
 
				+.empty-data{

			
 
				+	height: 100vh;

			
 
				+	display: flex;

			
 
				+	align-items: center;

			
 
				+	justify-content: center;

			
 
				+}

			
 
				+.coupon-item{background-color: #fff;border-radius: 10upx;width: calc(95% - 40upx);margin: 20upx auto;box-shadow: 8px 8px 20px 0 rgba(55, 99, 170, .1);border: 2upx solid #fff;border-radius: 10upx;position: relative;}

			
 
				+.coupon-item .state-img{position: absolute;right: 0;top: 0;}

			
 
				+.coupon-item .state-img image{width: 100upx;height: 100upx;}

			
 
				+.coupon-item .header{padding: 20upx;font-size: 28upx;color: #333;line-height: 48upx;border-bottom: 2upx solid #f8f8f8;}

			
 
				+.coupon-item .footer{padding: 20upx;border-top: 2upx solid #f8f8f8;display: flex;justify-content: space-between;}

			
 
				+.coupon-item .footer .state{flex: 1;}

			
 
				+.coupon-item .footer .btn{width: 50%;font-size: 28upx;}

			
 
				+.coupon-item .body{display: flex;align-items: center;margin: 20upx 0;}

			
 
				+.coupon-item .img image{width: 160upx;height: 160upx;}

			
 
				+.coupon-item .info{margin-left: 20upx;}

			
 
				+.coupon-item .name{font-size: 32upx;color: #333;line-height: 46upx;}

			
 
				+.coupon-item .desc{color: #666;font-size: 28upx;line-height: 48upx;}

			
 
				+</style>
			
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -0,0 +1,170 @@
 
				+<template>
			
 
				+	<view>

			
 
				+		<view class="address" v-if="storeInfo && storeInfo.service_type==2">

			
 
				+			

			
 
				+		</view>

			
 
				+	
			
 
				+		<view class="location" @click="toDetail">

			
 
				+			<view class="left">

			
 
				+				<view class="name">{{poi_name}}</view>

			
 
				+				<view class="desc"><image src="/static/image/location.png"></image>距您{{juli}}公里</view>

			
 
				+			</view>

			
 
				+			<view class="right"><image src="/static/image/right.png"></image></view>

			
 
				+		</view>

			
 
				+		

			
 
				+		<view class="goods" v-if="goodsInfo">

			
 
				+			<view class="goods-info">

			
 
				+				<view class="image"><image :src="goodsInfo.product_img"></image></view>

			
 
				+				<view class="info">

			
 
				+					<view class="name">{{ goodsInfo.product_name }}</view>

			
 
				+					<view class="desc">x {{goodsInfo.count}}</view>

			
 
				+				</view>

			
 
				+			</view>

			
 
				+			<view class="goods-item">

			
 
				+				<view class="left">商品总额</view>

			
 
				+				<view class="right">￥{{goodsInfo.order_amount}}</view>

			
 
				+			</view>

			
 
				+			<view class="goods-item">

			
 
				+				<view class="left">商品优惠</view>

			
 
				+				<view class="right red">￥{{goodsInfo.order_amount}}</view>

			
 
				+			</view>

			
 
				+		</view>

			
 
				+		<view class="empty-data" v-else>

			
 
				+			<u-skeleton

			
 
				+				rows="3"

			
 
				+				title

			
 
				+				loading

			
 
				+			></u-skeleton>

			
 
				+		</view>

			
 
				+		

			
 
				+		<view class="order-time" v-if="storeInfo && storeInfo.service_type==1">

			
 
				+			<view class="title">期望时间</view>

			
 
				+			<view class="msg" @click="selectTime(1)">

			
 
				+				{{timeStr?timeStr:'请选择'}}

			
 
				+				<view class="right"><image src="/static/image/right.png"></image></view>

			
 
				+			</view>

			
 
				+		</view>

			
 
				+		

			
 
				+		<view class="order-msg">

			
 
				+			<view class="title">订单备注</view>

			
 
				+			<view class="msg"><textarea class="textarea" placeholder="请输入" v-model="msg" :rows="5"></textarea></view>

			
 
				+		</view>

			
 
				+		

			
 
				+		<view class="flx-footer">

			
 
				+			<view class="footer-btn">

			
 
				+				<view class="price"><text class="desc">已优惠：￥{{goodsInfo.order_amount}}，</text>合计<text class="money">￥0</text></view>

			
 
				+				<view class="btn-group"><button :disabled="disabled" class="btn">{{disabled?'处理中...':'确认兑换'}}</button></view>

			
 
				+			</view>

			
 
				+			<view class="footer-safe"></view>

			
 
				+		</view>

			
 
				+		

			
 
				+		<uni-popup ref="timepopup" type="bottom" borderRadius="10px 10px 0 0" backgroundColor="#F8F8F8">

			
 
				+			<view class="time-select">

			
 
				+				<view class="title">选择时间<view class="close" @click="selectTime(2)"><image src="/static/image/round_close.png"></image></view> </view>

			
 
				+			</view>

			
 
				+			<view class="time-body">

			
 
				+				<view class="time-left"></view>

			
 
				+				<view class="time-right"></view>

			
 
				+			</view>

			
 
				+			<view class="time-btn">

			
 
				+				<button class="btn">确认选择</button>

			
 
				+			</view>

			
 
				+		</uni-popup>
			
 
				+	</view>
			
 
				+</template>
			
 
				+
			
 
				+<script>

			
 
				+var app;

			
 
				+import * as Api from "@/static/api/order.js";
			
 
				+export default {
			
 
				+	data() {
			
 
				+		return {

			
 
				+			disabled:false,
			
 
				+			order:"",
			
 
				+			poi_name:"",
			
 
				+			poi_id:"",
			
 
				+			juli:"",

			
 
				+			goodsInfo:null,

			
 
				+			storeInfo:null,

			
 
				+			timeStr:null,

			
 
				+			timeState:false,

			
 
				+			timeData:[]
			
 
				+		}
			
 
				+	},

			
 
				+	onLoad({order,poi_id,poi_name,juli}) {

			
 
				+		app = this;

			
 
				+		app.order = order;

			
 
				+		app.poi_id = poi_id;

			
 
				+		app.poi_name = poi_name;

			
 
				+		app.juli = juli;

			
 
				+		app.getOrder();

			
 
				+	},
			
 
				+	methods: {

			
 
				+		selectTime(type){

			
 
				+			if (type == 1) {

			
 
				+				app.$refs.timepopup.open()

			
 
				+			}

			
 
				+			if (type == 2) {

			
 
				+				app.$refs.timepopup.close()

			
 
				+			}

			
 
				+		},

			
 
				+		getOrder(){

			
 
				+			Api.detail({"order":app.order}).then((res)=>{

			
 
				+				if (res.code == 0) {

			
 
				+					return app.$dialog.showSuccess(res.info,"none",function(){

			
 
				+						uni.navigateBack()

			
 
				+					});

			
 
				+				}

			
 
				+				app.goodsInfo = res.data.order;

			
 
				+				app.storeInfo = res.data.store;

			
 
				+				app.timeData = res.data.time

			
 
				+			});

			
 
				+		},

			
 
				+		toDetail(){

			
 
				+			uni.navigateTo({

			
 
				+				url:"/pages/order/store?type=1&order="+app.order

			
 
				+			})

			
 
				+		},
			
 
				+	}
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+<style>

			
 
				+	

			
 
				+.time-body{height: 30vh;}

			
 
				+.time-body .time-left{width: 30%;background-color: #F5FAFD;height: 100%;overflow-y: auto;}

			
 
				+.time-body .time-right{width: calc(70% - 20upx);margin-left: 20upx;}

			
 
				+.time-select .title{height: 100upx;line-height: 100upx;display: flex;align-items: center;justify-content: space-between;font-size: 28upx;padding: 0 20upx;font-weight: bold;}

			
 
				+.time-select image{width: 40upx;height: 40upx;vertical-align: middle;}

			
 
				+.time-btn{padding: 20upx;}	

			
 
				+
			
 
				+.location,.order-time{background-color: #fff;border-radius: 20upx;padding: 20upx;width: calc(95% - 40upx);margin: 20upx auto;display: flex;align-items: center;justify-content: space-between;}

			
 
				+.location .right image{width: 40upx;height: 40upx;vertical-align: middle;}

			
 
				+.location .name{font-size: 32upx;color: #333;font-weight: bold;margin-bottom: 20upx;}

			
 
				+.location .desc{color: #666;font-size: 28upx;display: flex;align-items: center;}

			
 
				+.location .desc image{width: 40upx;height: 40upx;margin-right: 20upx;}

			
 
				+.goods,.order-msg{background-color: #fff;border-radius: 20upx;padding: 20upx;width: calc(95% - 40upx);margin: 20upx auto;}

			
 
				+.goods .goods-info{display: flex;align-items: center;}

			
 
				+.goods .goods-info .info{flex: 1;margin-left: 20upx;}

			
 
				+.goods .goods-info .image image{width: 160upx;height: 160upx;}

			
 
				+.goods .goods-info .name{font-size: 32upx;color: #333;line-height: 46upx;font-weight: bold;margin-bottom: 20upx;}

			
 
				+.goods .goods-info .desc{color: #666;font-size: 28upx;line-height: 48upx;}

			
 
				+.goods .goods-item{display: flex;align-items: center;border-top: 2upx solid #f8f8f8;line-height: 80upx;justify-content: space-between;font-size: 28upx;color: #333;}

			
 
				+.goods .goods-item .right.red{color: #f00;}
			
 
				+

			
 
				+.order-time .title{font-size: 28upx;}

			
 
				+.order-time image{width: 40upx;height: 40upx;vertical-align: middle;}

			
 
				+.order-time .msg{display: flex;align-items: center;font-size: 28upx;color: #333;}

			
 
				+

			
 
				+.order-msg .title{color: #333;font-size: 28upx;border-bottom: 2upx solid #f8f8f8;margin-bottom: 20upx;padding-bottom: 20upx;}

			
 
				+.order-msg .textarea{width: 100%;height: 120upx;font-size: 28upx;}

			
 
				+

			
 
				+.flx-footer{position: fixed;bottom: 0;background-color: #fff;padding: 20upx;border-top: 2upx solid #f8f8f8;left: 0;right: 0;}

			
 
				+.flx-footer .footer-safe {height: env(safe-area-inset-bottom);width: 100%;}

			
 
				+.flx-footer .btn,.time-btn .btn{font-size: 28rpx;height: 80upx;border-radius: 10upx;line-height: 80upx;text-align: center;width: 100%;color: #333;background-color: #224d7a;color: #fff;border:2upx solid #224d7a;}

			
 
				+.flx-footer .btn[disabled],.flx-footer .btn.disabled{background-color: rgba(34, 77, 122, 0.3);}

			
 
				+.flx-footer .footer-btn{display: flex;align-items: center;justify-content: space-between;}

			
 
				+.flx-footer .footer-btn text.desc{color: #666;font-size: 24upx;}

			
 
				+.flx-footer .footer-btn text.money{color: #f00;font-size: 28upx;font-weight: bold;}

			
 
				+.flx-footer .footer-btn .price{color: #333;font-size: 28upx;}
			
 
				+</style>
			
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -0,0 +1,111 @@
 
				+<template>
			
 
				+	<view>

			
 
				+		<view class="coupon-list" v-if="orderData">

			
 
				+			<view class="coupon-item">

			
 
				+				<view class="header">订单编号 {{orderData.order_id}}</view>

			
 
				+				<view class="body">

			
 
				+					<view class="img"><image :src="orderData.product_img"></image></view>

			
 
				+					<view class="info">

			
 
				+						<view class="name">{{orderData.product_name}}</view>

			
 
				+						<view class="desc">x {{orderData.count}}张</view>

			
 
				+						<view class="desc">有效期至{{orderData.end_at}}</view>

			
 
				+					</view>

			
 
				+				</view>

			
 
				+				<view class="footer">

			
 
				+					<view class="state"></view>

			
 
				+					<button class="btn" type="primary" @click="toDetail(orderData.order_id)">立即使用</button>

			
 
				+				</view>

			
 
				+				<view class="state-img"><image src="/static/image/no.png" mode="widthFix"></image></view>

			
 
				+			</view>

			
 
				+			<navigator hover-class="none" url="/pages/user/license" class="tips">小程序资质亮照</navigator>

			
 
				+		</view>

			
 
				+		<view class="" v-else>

			
 
				+			<u-skeleton

			
 
				+				rows="3"

			
 
				+				title

			
 
				+				loading

			
 
				+			></u-skeleton>

			
 
				+		</view>

			
 
				+		<view class="dialog-msg" v-if="msgDialog">

			
 
				+			<view class="mark"></view>

			
 
				+			<view class="msg-body">

			
 
				+				<view class="title">第三方服务声明<image src="/static/image/round_close.png" @click="msgDialog=false"></image></view>

			
 
				+				<view class="desc">本商品信息、交易以及售后服务由第三方提供，如由问题请联系在线客服或电话客服</view>

			
 
				+			</view>

			
 
				+		</view>
			
 
				+	</view>
			
 
				+</template>
			
 
				+
			
 
				+<script>

			
 
				+var app;

			
 
				+import * as Api from "@/static/api/home.js";
			
 
				+export default {
			
 
				+	data() {
			
 
				+		return {
			
 
				+			order:"",

			
 
				+			msgDialog:true,

			
 
				+			orderData:null
			
 
				+		}
			
 
				+	},

			
 
				+	onLoad({order}) {

			
 
				+		app = this;

			
 
				+		if (!order) {

			
 
				+			return app.$dialog.showSuccess("参数错误","none",function(){

			
 
				+				uni.navigateBack()

			
 
				+			})

			
 
				+		}

			
 
				+		app.order = order;

			
 
				+		setTimeout(function(){

			
 
				+			app.msgDialog = false;

			
 
				+		},3000)

			
 
				+		app.getData();

			
 
				+	},
			
 
				+	methods: {

			
 
				+		toDetail(order){

			
 
				+			uni.navigateTo({

			
 
				+				url:"/pages/order/store?type=1&order="+order

			
 
				+			})

			
 
				+		},

			
 
				+		getData(){

			
 
				+			uni.login({

			
 
				+				success(lres){

			
 
				+					Api.detail({"code":lres.code,"order":app.order}).then((res)=>{

			
 
				+						uni.hideLoading();

			
 
				+						if (res.code == 0) {

			
 
				+							return app.$dialog.showSuccess(res.info);

			
 
				+						}

			
 
				+						uni.setStorageSync("user_data", res.data.user)

			
 
				+						uni.setStorageSync("user_token", res.data.user.access_token)

			
 
				+						app.orderData = res.data.order;

			
 
				+					})

			
 
				+				},fail(res){

			
 
				+					app.$dialog.showSuccess("登录失败,请重启小程序")

			
 
				+				}

			
 
				+			})

			
 
				+		}
			
 
				+	}
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+<style>
			
 
				+page{background-color: #f8f8f8;}

			
 
				+.dialog-msg .mark{position: fixed;top: 0;left: 0;right: 0;bottom: 0;z-index: 90;background-color: rgba(0, 0,0, 0.3);}

			
 
				+.dialog-msg .msg-body{position: fixed;background-color: #fff;z-index: 99;left: 5%;right: 5%;top: 50%;transform: translateY(-50%);border-radius: 10upx;padding: 40upx;}

			
 
				+.dialog-msg .msg-body .title{text-align: center;line-height: 48upx;color: #333;font-weight: bold;margin-bottom: 20upx;position: relative;padding: 20upx 0;}

			
 
				+.dialog-msg .msg-body .title image{width: 60upx;height: 60upx;position: absolute;top: 0;right: 0;}
			
 
				+.dialog-msg .msg-body .desc{line-height: 48upx;color: #666;font-weight: bold;font-size: 26upx;}

			
 
				+

			
 
				+.coupon-item{background-color: #fff;border-radius: 10upx;width: calc(100% - 40upx);margin: 20upx auto;box-shadow: 8px 8px 20px 0 rgba(55, 99, 170, .1);border: 2upx solid #fff;border-radius: 10upx;position: relative;}

			
 
				+.coupon-item .state-img{position: absolute;right: 0;top: 0;}

			
 
				+.coupon-item .state-img image{width: 100upx;height: 100upx;}

			
 
				+.coupon-item .header{padding: 20upx;font-size: 28upx;color: #333;line-height: 48upx;border-bottom: 2upx solid #f8f8f8;}

			
 
				+.coupon-item .footer{padding: 20upx;border-top: 2upx solid #f8f8f8;display: flex;justify-content: space-between;}

			
 
				+.coupon-item .footer .state{flex: 1;}

			
 
				+.coupon-item .footer .btn{width: 50%;font-size: 28upx;}

			
 
				+.coupon-item .body{display: flex;align-items: center;margin: 20upx 0;}

			
 
				+.coupon-item .img image{width: 160upx;height: 160upx;}

			
 
				+.coupon-item .info{margin-left: 20upx;}

			
 
				+.coupon-item .name{font-size: 32upx;color: #333;line-height: 46upx;}

			
 
				+.coupon-item .desc{color: #666;font-size: 28upx;line-height: 48upx;}

			
 
				+.tips{text-align: center;line-height: 80upx;color: #666;font-size: 28upx;}
			
 
				+</style>
			
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -0,0 +1,107 @@
 
				+<template>
			
 
				+	<view>
			
 
				+		<view class="header">

			
 
				+			<view class="header-tabs">

			
 
				+				<view @click="checkType(0)" :class="tabType==0?'tab-item active':'tab-item'">全部</view>

			
 
				+				<view @click="checkType(1)" :class="tabType==1?'tab-item active':'tab-item'">已核销</view>

			
 
				+				<view @click="checkType(2)" :class="tabType==2?'tab-item active':'tab-item'">已撤销</view>

			
 
				+				<view @click="checkType(3)" :class="tabType==3?'tab-item active':'tab-item'">已完成</view>

			
 
				+			</view>

			
 
				+		</view>

			
 
				+		<view class="order-body">

			
 
				+			<view class="empty-data" v-if="dataList.length == 0">

			
 
				+				<image src="/static/image/order_none.png" mode="widthFix"></image>

			
 
				+				<view class="name">还没有订单</view>

			
 
				+			</view>

			
 
				+		</view>
			
 
				+	</view>
			
 
				+</template>
			
 
				+
			
 
				+<script>

			
 
				+var app;

			
 
				+import * as Api from "@/static/api/order.js";
			
 
				+export default {
			
 
				+	data() {
			
 
				+		return {

			
 
				+			formData:{},

			
 
				+			tabType:0,

			
 
				+			dataList:[]
			
 
				+		}
			
 
				+	},

			
 
				+	onLoad() {

			
 
				+		app = this;

			
 
				+	},
			
 
				+	methods: {

			
 
				+		checkType(type){

			
 
				+			app.tabType = type;

			
 
				+			app.queryList(1,10);

			
 
				+		},

			
 
				+		queryList(pageNo, pageSize){

			
 
				+			var formData = {};

			
 
				+			formData.page = pageNo;

			
 
				+			formData.size = pageSize;

			
 
				+			formData.status = app.tabType;

			
 
				+			Api.order(formData).then((res)=>{

			
 
				+				uni.hideLoading();

			
 
				+				if (res.code !== 1) {

			
 
				+					this.$refs.paging.complete(false);

			
 
				+					return false;

			
 
				+				}

			
 
				+				this.$refs.paging.complete(res.data.rows);

			
 
				+			})

			
 
				+		}
			
 
				+	}
			
 
				+}
			
 
				+</script>
			
 
				+

			
 
				+<style lang="scss" scoped>

			
 
				+page{

			
 
				+	background-color: #f8f8f8;

			
 
				+}

			
 
				+.order-body{

			
 
				+	height: calc(100vh - 100upx);

			
 
				+}

			
 
				+.empty-data{

			
 
				+	display: flex;

			
 
				+	height: 100%;

			
 
				+	align-items: center;

			
 
				+	justify-content: center;

			
 
				+	flex-direction: column;

			
 
				+	font-size: 28upx;

			
 
				+	color: #666;

			
 
				+	image{

			
 
				+		width: 50%;

			
 
				+	}

			
 
				+}

			
 
				+.header{

			
 
				+	background-color: #fff;

			
 
				+	padding: 20upx 20upx 0 20upx;

			
 
				+	.header-tabs{

			
 
				+		display: flex;

			
 
				+		align-items: center;

			
 
				+		height: 80upx;

			
 
				+		line-height: 80upx;

			
 
				+		.tab-item{

			
 
				+			width: 33.333%;

			
 
				+			text-align: center;

			
 
				+			font-size: 30upx;

			
 
				+			color: #333;

			
 
				+			position: relative;

			
 
				+			&.active{

			
 
				+				color: #005BAC;

			
 
				+				font-weight: bold;

			
 
				+				&::after{

			
 
				+					content: "";

			
 
				+					position: absolute;

			
 
				+					width: 40%;

			
 
				+					height: 8upx;

			
 
				+					border-radius: 4upx;

			
 
				+					left: 30%;

			
 
				+					bottom: 0;

			
 
				+					background-color: #005BAC;

			
 
				+				}

			
 
				+			}

			
 
				+		}

			
 
				+	}

			
 
				+}

			
 
				+</style>
			
--- a/pages/order/store.vue
+++ b/pages/order/store.vue
@@ -0,0 +1,138 @@
 
				+<template>
			
 
				+	<view>
			
 
				+		<view class="search">

			
 
				+			<image src="/static/image/search.png"></image>

			
 
				+			<input type="text" placeholder="请输入关键字" v-model="keyword" @confirm="getStore" class="search-input" />

			
 
				+		</view>

			
 
				+		<view class="store-list">

			
 
				+			<view :class="checkIndex==indx?'store-item active':'store-item'" @click="checkStore(indx)" v-for="(item,indx) in storeData" :key="indx">

			
 
				+				<view class="item-left">

			
 
				+					<view class="name">{{item.poi_name}}</view>

			
 
				+					<view class="desc">{{item.poi_address}}</view>

			
 
				+					<view class="desc" v-if="storeInfo.status==1">{{ storeInfo.service_at_start }}-{{ storeInfo.service_at_end }}</view>

			
 
				+					<view class="desc" v-else>休息中</view>

			
 
				+				</view>

			
 
				+				<view class="item-right">

			
 
				+					<view class="top">

			
 
				+						<view class="icon-img" @click="tel()"><image src="/static/image/tel.png"></image></view>

			
 
				+						<view class="icon-img" @click="locaJump(item.longitude,item.latitude)"><image src="/static/image/map.png"></image></view>

			
 
				+					</view>

			
 
				+					<view class="footer">距离{{ item.juli }}公里</view>

			
 
				+				</view>

			
 
				+				<view class="check"><image src="/static/image/check.png"></image></view>

			
 
				+			</view>

			
 
				+		</view>

			
 
				+		<view class="flx-footer">

			
 
				+			<view class="check-btn"><button class="btn" :disabled="disabled" @click="checkOrder">{{disabled?'处理中...':'确 认'}}</button></view>

			
 
				+			<view class="footer-safe"></view>

			
 
				+		</view>
			
 
				+	</view>
			
 
				+</template>
			
 
				+
			
 
				+<script>

			
 
				+var app;

			
 
				+import * as Api from "@/static/api/order.js";
			
 
				+export default {
			
 
				+	data() {
			
 
				+		return {

			
 
				+			checkIndex:null,

			
 
				+			order:"",

			
 
				+			location:"",

			
 
				+			storeData:[],

			
 
				+			storeInfo:null,

			
 
				+			keyword:"",

			
 
				+			disabled:false,

			
 
				+			type:1
			
 
				+		}
			
 
				+	},

			
 
				+	onLoad({order,type}) {

			
 
				+		app = this;

			
 
				+		if (!order) {

			
 
				+			return app.$dialog.showSuccess("参数错误","none",function(){

			
 
				+				uni.navigateBack()

			
 
				+			})

			
 
				+		}

			
 
				+		app.type = type;

			
 
				+		app.order = order;

			
 
				+		app.getStoreData();

			
 
				+	},
			
 
				+	methods: {

			
 
				+		checkOrder(){

			
 
				+			if (app.checkIndex==null) {

			
 
				+				return app.$dialog.showSuccess("请选择门店");

			
 
				+			}

			
 
				+			app.disabled = true;

			
 
				+			var poi = app.storeData[app.checkIndex];

			
 
				+			uni.navigateTo({

			
 
				+				url:"/pages/order/confirm?order="+app.order+"&poi_id="+poi.poi_id+"&poi_name="+poi.poi_name+"&juli="+poi.juli

			
 
				+			})

			
 
				+		},

			
 
				+		checkStore(index){

			
 
				+			app.checkIndex = index;

			
 
				+		},

			
 
				+		tel(){

			
 
				+			

			
 
				+		},

			
 
				+		locaJump(longitude,latitude){

			
 
				+			uni.openLocation({

			
 
				+				latitude:latitude,

			
 
				+				longitude:longitude,

			
 
				+				fail() {

			
 
				+					app.$dialog.showSuccess("打开地图失败");

			
 
				+				}

			
 
				+			})

			
 
				+		},

			
 
				+		getStoreData(){

			
 
				+			uni.getLocation({

			
 
				+				type:"gcj02",

			
 
				+				success(res) {

			
 
				+					console.log(res)

			
 
				+					app.location = res.longitude+","+res.latitude;

			
 
				+					app.getStore();

			
 
				+				},

			
 
				+				fail() {

			
 
				+					app.location = "117.172398,34.226209";

			
 
				+					app.getStore();

			
 
				+					app.$dialog.showSuccess("获取定位信息失败");

			
 
				+				}

			
 
				+			})

			
 
				+		},

			
 
				+		getStore(){

			
 
				+			Api.store({"order":app.order,"location":app.location,"keyword":app.keyword}).then((res)=>{

			
 
				+				if (res.code == 0) {

			
 
				+					return app.$dialog.showSuccess(res.msg,"none",function(){

			
 
				+						uni.navigateBack()

			
 
				+					})

			
 
				+				}

			
 
				+				app.storeData = res.data.data;

			
 
				+				app.storeInfo = res.data.store;

			
 
				+			})

			
 
				+		}
			
 
				+	}
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+<style>
			
 
				+.search{padding: 20upx;display: flex;align-items: center;background-color: #fff;width: calc(95% - 60upx);margin: 20upx auto;border-radius: 60upx;}

			
 
				+.search image{width: 50upx;height: 46upx;}

			
 
				+.search .search-input{border-radius: 30upx;font-size: 28upx;height: 60upx;margin-left: 20upx;}

			
 
				+

			
 
				+.store-item{background-color: #fff;width: calc(95% - 40upx);padding: 20upx;border-radius: 20upx;display: flex;align-items: center;justify-content: space-between;margin: 20upx auto;position: relative;}

			
 
				+.store-item.active{border: 2upx solid #224d7a;}

			
 
				+.store-item .check{display: none;position: absolute;top: 0;right: 0;background-color: #224d7a;width: 40upx;height: 40upx;border-radius: 0 20upx 0 20upx;}

			
 
				+.store-item .check image{width: 30upx;height: 30upx;display: flex;align-items: center;justify-content: center;padding: 5upx;}

			
 
				+.store-item.active .check{display: block;}

			
 
				+.store-item .item-left{flex: 1;}

			
 
				+.store-item .name{font-size: 32upx;color: #333;line-height: 48upx;font-weight: bold;}
			
 
				+.store-item .desc{font-size: 24upx;color: #666;line-height: 36upx;margin-top: 10upx;}

			
 
				+.store-item .item-right{text-align: center;}

			
 
				+.store-item .item-right .footer{font-size: 24upx;color: #666;}
			
 
				+.store-item .item-right .top{display: flex;align-items: center;gap: 20upx;margin-bottom: 20upx;}

			
 
				+.store-item .item-right .top .icon-img{width: 60upx;height: 60upx;background-color: #f8f8f8;border-radius: 60upx;display: flex;align-items: center;justify-content: center;}

			
 
				+.store-item .item-right .top .icon-img image{width: 40upx;height: 40upx;}

			
 
				+

			
 
				+.flx-footer{position: fixed;bottom: 0;background-color: #fff;padding: 20upx;border-top: 2upx solid #f8f8f8;left: 0;right: 0;}

			
 
				+.flx-footer .footer-safe {height: env(safe-area-inset-bottom);width: 100%;}

			
 
				+.flx-footer .btn{font-size: 28rpx;height: 80upx;border-radius: 10upx;line-height: 80upx;text-align: center;width: 100%;color: #333;background-color: #224d7a;color: #fff;border:2upx solid #224d7a;}

			
 
				+.flx-footer .btn[disabled],.flx-footer .btn.disabled{background-color: rgba(34, 77, 122, 0.3);}
			
 
				+</style>
			
--- a/pages/user/license.vue
+++ b/pages/user/license.vue
@@ -0,0 +1,68 @@
 
				+<template>
			
 
				+	<view>

			
 
				+		<block v-if="loading">

			
 
				+			<view class="skeleton">

			
 
				+				<view class="skeleton-line max animate" style="height: 200upx;"></view>

			
 
				+				<view class="skeleton-line animate"></view>

			
 
				+				<view class="skeleton-line min animate"></view>

			
 
				+				<view class="skeleton-line min animate"></view>

			
 
				+				<view class="skeleton-line max animate" style="height: 200upx;"></view>

			
 
				+				<view class="skeleton-line max animate" style="height: 200upx;"></view>

			
 
				+			</view>

			
 
				+		</block>

			
 
				+		<block v-else>
			
 
				+		<view class="info-item">

			
 
				+			<view class="title">营业执照</view>

			
 
				+			<view class="img" @click="preview"><image :src="license" mode="widthFix"></image></view>

			
 
				+		</view>
			
 
				+		<view class="info-item">

			
 
				+			<view class="title">特别提示</view>

			
 
				+			<view class="info">商家资质图片为官方展示<text>严禁下载复印</text>，违者后果自负</view>

			
 
				+		</view>

			
 
				+		</block>
			
 
				+	</view>
			
 
				+</template>
			
 
				+
			
 
				+<script>

			
 
				+var app;

			
 
				+import * as Api from "@/static/api/home.js";
			
 
				+export default {
			
 
				+	data() {
			
 
				+		return {
			
 
				+			loading:true,

			
 
				+			license:""
			
 
				+		}
			
 
				+	},

			
 
				+	onLoad() {

			
 
				+		app = this;

			
 
				+		app.getLicense()

			
 
				+	},
			
 
				+	methods: {

			
 
				+		preview(){

			
 
				+			uni.previewImage({

			
 
				+				urls:[app.license]

			
 
				+			})

			
 
				+		},
			
 
				+		getLicense(){

			
 
				+			Api.license({}).then((res)=>{

			
 
				+				app.loading = false;

			
 
				+				if (res.code !== 1) {

			
 
				+					return app.$dialog.showSuccess(res.msg,function(){

			
 
				+						uni.navigateBack()

			
 
				+					})

			
 
				+				}

			
 
				+				app.license = res.data.img;

			
 
				+			})

			
 
				+		}
			
 
				+	}
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+<style>
			
 
				+page{background-color: #f8f8f8;}

			
 
				+.info-item{background-color: #fff;padding: 20upx;margin-bottom: 20upx;}

			
 
				+.info-item .title{font-size: 30upx;color: #333;font-weight: bold;line-height: 80upx;border-bottom: 2upx solid #f8f8f8;}

			
 
				+.info-item .info{font-size: 28upx;color: #666;line-height: 60upx;}

			
 
				+.info-item .info text{color: #f00;}

			
 
				+.info-item image{width: 100%;}
			
 
				+</style>
			
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -0,0 +1,112 @@
 
				+<template>
			
 
				+	<view>
			
 
				+		<view class="user-header" v-if="userInfo">

			
 
				+			<view class="avatar-btn">

			
 
				+				<image :src="userInfo?userInfo.avatar:'https://inmei-print.oss-cn-guangzhou.aliyuncs.com/logo.png'"></image>

			
 
				+			</view>

			
 
				+			<view class="user-info">

			
 
				+				<view class="name">{{userInfo.nickname}}</view>

			
 
				+			</view>

			
 
				+		</view>
			
 
				+		<view class="user-header" v-else>

			
 
				+			<view class="avatar-btn">

			
 
				+				<image src="https://inmei-print.oss-cn-guangzhou.aliyuncs.com/logo.png"></image>

			
 
				+			</view>

			
 
				+			<view class="user-info">

			
 
				+				<view class="name" @click="toLogin">请先登录</view>

			
 
				+			</view>

			
 
				+		</view>

			
 
				+		<view class="user-menu">

			
 
				+			<!-- <view class="menu-item">

			
 
				+				<view class="icon"><image src="/static/image/info.png"></image></view>

			
 
				+				<view class="name">个人信息</view>

			
 
				+				<view class="right"><image src="/static/image/right.png"></image></view>

			
 
				+			</view>

			
 
				+			<view class="menu-item">

			
 
				+				<view class="icon"><image src="/static/image/address.png"></image></view>

			
 
				+				<view class="name">会员地址</view>

			
 
				+				<view class="right"><image src="/static/image/right.png"></image></view>

			
 
				+			</view>

			
 
				+			<view class="menu-item" @click="showService()">

			
 
				+				<view class="icon"><image src="/static/image/service.png"></image></view>

			
 
				+				<view class="name">客服</view>

			
 
				+				<view class="right"><image src="/static/image/right.png"></image></view>

			
 
				+			</view> -->

			
 
				+			<navigator hover-class="none" class="menu-item" url="/pages/user/license">

			
 
				+				<view class="icon"><image src="/static/image/zizhi.png"></image></view>

			
 
				+				<view class="name">服务资质</view>

			
 
				+				<view class="right"><image src="/static/image/right.png"></image></view>

			
 
				+			</navigator>

			
 
				+			<view class="menu-item" @click="outLogin">

			
 
				+				<view class="icon"><image src="/static/image/out.png"></image></view>

			
 
				+				<view class="name">退出</view>

			
 
				+				<view class="right"><image src="/static/image/right.png"></image></view>

			
 
				+			</view>

			
 
				+		</view>
			
 
				+	</view>
			
 
				+</template>
			
 
				+
			
 
				+<script>

			
 
				+var app;
			
 
				+export default {
			
 
				+	data() {
			
 
				+		return {
			
 
				+			userInfo:null,

			
 
				+			storeData:{}
			
 
				+		}
			
 
				+	},

			
 
				+	onShow() {

			
 
				+		var userInfo = uni.getStorageSync("user_data")

			
 
				+		if (userInfo) {

			
 
				+			this.userInfo = userInfo;

			
 
				+		}

			
 
				+	},

			
 
				+	onLoad() {

			
 
				+		app = this;

			
 
				+		app.storeData = uni.getStorageSync("contact");

			
 
				+	},
			
 
				+	methods: {

			
 
				+		outLogin(order){

			
 
				+			app.$dialog.showError("确定要退出登录吗",function(res){

			
 
				+				if (res.confirm) {

			
 
				+					app.userInfo = null;

			
 
				+					uni.clearStorageSync();

			
 
				+				}

			
 
				+			})

			
 
				+		},

			
 
				+		callMobile(mobile){

			
 
				+			uni.makePhoneCall({

			
 
				+				phoneNumber:mobile,

			
 
				+				success(res) {

			
 
				+					console.log(res)

			
 
				+				},fail(res) {

			
 
				+					console.log(res)

			
 
				+				}

			
 
				+			})

			
 
				+		},

			
 
				+		showService(){

			
 
				+			

			
 
				+		}
			
 
				+	}
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+<style>

			
 
				+page{background-color: #f8f8f8;}
			
 
				+.user-header{background-color: #005bac;padding: 40upx;display: flex;align-items: center;background: linear-gradient(to right, #094d89, #007aff);width: calc(95% - 80upx);margin: 40upx auto;border-radius: 10upx;}

			
 
				+.user-header image{width: 100upx;height: 100upx;border-radius: 100upx;}

			
 
				+.user-header .user-info{margin-left: 20upx;}

			
 
				+.user-header .name{font-size: 32upx;color: #fff;}

			
 
				+.user-header .desc{font-size: 24upx;color: #f8f8f8;margin-top: 20upx;}

			
 
				+.user-menu{width: 95%;margin: 40upx auto;border-radius: 10upx;background-color: #fff;}

			
 
				+.user-menu .menu-item{height: 100upx;line-height: 100upx;display: flex;align-items: center;font-size: 28upx;color: #333;padding: 0 20upx;border-bottom: 2upx solid #f8f8f8;}

			
 
				+.user-menu .menu-item .icon{margin-right: 20upx;display: flex;align-items: center;justify-content: center;}

			
 
				+.user-menu .menu-item .right{margin-right: 0;margin-left: auto;}

			
 
				+.user-menu .menu-item .icon image{width: 40upx;height: 40upx;}

			
 
				+.user-menu .menu-item .right image{width: 40upx;height: 40upx;}

			
 
				+

			
 
				+.service-popup .item{height: 100upx;line-height: 100upx;text-align: center;font-size: 28upx;color: #333;border-bottom: 2upx solid #f8f8f8;}

			
 
				+.service-popup .item .btn{background-color: #fff;border: 0;height: 100upx;line-height: 100upx;text-align: center;font-size: 28upx;color: #333;}

			
 
				+.service-popup .item .btn::after{border: 0;}

			
 
				+.service-popup .foot{height: 100upx;line-height: 100upx;text-align: center;font-size: 28upx;color: #333;border-top: 20upx solid #f8f8f8;}
			
 
				+</style>
			
--- a/static/api/home.js
+++ b/static/api/home.js
@@ -0,0 +1,19 @@
 
				+import request from '@/static/js/request.js'

			
 
				+
			
 
				+const apiUri = {

			
 
				+	data: '/home/login',

			
 
				+	detail: '/order/life',

			
 
				+	license: '/home/license'
			
 
				+}

			
 
				+

			
 
				+export function data(param) {

			
 
				+	return request.request(apiUri.data,'POST', param,false,true,false)

			
 
				+}

			
 
				+

			
 
				+export function detail(param) {

			
 
				+	return request.request(apiUri.detail,'POST', param,false,true,false)

			
 
				+}

			
 
				+

			
 
				+export function license(param) {

			
 
				+	return request.request(apiUri.license,'POST', param,false,true,false)

			
 
				+}
			
--- a/static/api/order.js
+++ b/static/api/order.js
@@ -0,0 +1,19 @@
 
				+import request from '@/static/js/request.js'

			
 
				+
			
 
				+const apiUri = {

			
 
				+	store: '/order/store',

			
 
				+	detail: '/confirm/detail',
			
 
				+}

			
 
				+

			
 
				+export function store(param) {

			
 
				+	return request.request(apiUri.store,'POST', param,false,true,false)

			
 
				+}

			
 
				+

			
 
				+export function detail(param) {

			
 
				+	return request.request(apiUri.detail,'POST', param,false,true,false)

			
 
				+}

			
 
				+

			
 
				+

			
 
				+export function license(param) {

			
 
				+	return request.request(apiUri.license,'POST', param,false,true,false)

			
 
				+}
			
--- a/static/api/user.js
+++ b/static/api/user.js
@@ -0,0 +1,18 @@
 
				+import request from '@/static/js/request.js'

			
 
				+
			
 
				+const apiUri = {

			
 
				+	info: '/user/info',

			
 
				+	order: '/order/data'
			
 
				+}

			
 
				+

			
 
				+export function info(param) {

			
 
				+	return request.request(apiUri.info,'GET', param,false,true,false)

			
 
				+}

			
 
				+

			
 
				+export function order(param) {

			
 
				+	return request.request(apiUri.order,'GET', param,false,true,false)

			
 
				+}

			
 
				+

			
 
				+export function license(param) {

			
 
				+	return request.request(apiUri.license,'POST', param,false,true,false)

			
 
				+}
			
--- a/static/image/address.png
+++ b/static/image/address.png
--- a/static/image/check.png
+++ b/static/image/check.png
--- a/static/image/coupon-fill.png
+++ b/static/image/coupon-fill.png
--- a/static/image/coupon.png
+++ b/static/image/coupon.png
--- a/static/image/info.png
+++ b/static/image/info.png
--- a/static/image/location.png
+++ b/static/image/location.png
--- a/static/image/map.png
+++ b/static/image/map.png
--- a/static/image/no.png
+++ b/static/image/no.png
--- a/static/image/order-fill.png
+++ b/static/image/order-fill.png
--- a/static/image/order.png
+++ b/static/image/order.png
--- a/static/image/order_none.png
+++ b/static/image/order_none.png
--- a/static/image/out.png
+++ b/static/image/out.png
--- a/static/image/right.png
+++ b/static/image/right.png
--- a/static/image/round_close.png
+++ b/static/image/round_close.png
--- a/static/image/search.png
+++ b/static/image/search.png
--- a/static/image/service.png
+++ b/static/image/service.png
--- a/static/image/tel.png
+++ b/static/image/tel.png
--- a/static/image/user-fill.png
+++ b/static/image/user-fill.png
--- a/static/image/user.png
+++ b/static/image/user.png
--- a/static/image/zizhi.png
+++ b/static/image/zizhi.png
--- a/static/js/common.js
+++ b/static/js/common.js
@@ -0,0 +1,154 @@
 
				+export default {

			
 
				+	shopName(){

			
 
				+		return "曦成自助核销";

			
 
				+	},

			
 
				+	clearUri(url){

			
 
				+		var userInfo = uni.getStorageSync("user_data");

			
 
				+		if(!userInfo){

			
 
				+			uni.showLoading({

			
 
				+				title:"加载中..."

			
 
				+			});

			
 
				+			setTimeout(function(){

			
 
				+				uni.hideLoading();

			
 
				+				uni.$u.route({

			
 
				+					url:'/pages/user/user',

			
 
				+					type:"switchTab",

			
 
				+					animationType:"slide-in-bottom"

			
 
				+				});

			
 
				+			},800);

			
 
				+			return ;

			
 
				+		}

			
 
				+		uni.$u.route({

			
 
				+			url:url,

			
 
				+			animationType:"slide-in-bottom",

			
 
				+			animationDuration:300

			
 
				+		});

			
 
				+	},

			
 
				+	jumpUri(url,type,param){

			
 
				+		var userInfo = uni.getStorageSync("user_data");

			
 
				+		var cacheShop = this.shopId();

			
 
				+		if(!userInfo){

			
 
				+			setTimeout(function(){

			
 
				+				uni.hideLoading();

			
 
				+				uni.$u.route({

			
 
				+					url:'/pages/user/login?store='+cacheShop,

			
 
				+					type:"navigateTo",

			
 
				+					animationType:"slide-in-bottom"

			
 
				+				});

			
 
				+			},800);

			
 
				+			return ;

			
 
				+		}

			
 
				+		if(type == 1 && !userInfo){

			
 
				+			uni.showToast({

			
 
				+				title:"请先登录",

			
 
				+				icon:"none"

			
 
				+			});

			
 
				+			return true;

			
 
				+		}

			
 
				+		uni.$u.route(url,param);

			
 
				+	},
			
 
				+	//判断是否登录
			
 
				+	navTo: function(url,param) {

			
 
				+		uni.$u.route(url,param);
			
 
				+	},
			
 
				+	//判断是否登录
			
 
				+	isLogin: function() {
			
 
				+		return uni.getStorageSync("user") ? true : false
			
 
				+	},

			
 
				+	
			
 
				+	/**
			
 
				+	 * 操作成功提示框
			
 
				+	 * @param {*} msg 
			
 
				+	 * @param {*} callback 
			
 
				+	 * @param {*} icon 
			
 
				+	 */
			
 
				+	showSuccess(msg,icon,callback){
			
 
				+		// #ifdef APP-PLUS
			
 
				+		plus.nativeUI.toast(msg);
			
 
				+		// #endif
			
 
				+		// #ifdef MP
			
 
				+		uni.showToast({
			
 
				+			title: msg,
			
 
				+			icon: icon?icon:'none',
			
 
				+			mask: true,
			
 
				+			duration: 1500,
			
 
				+			success() {
			
 
				+				callback && (setTimeout(function() {
			
 
				+					callback();
			
 
				+				}, 1500));
			
 
				+			}
			
 
				+		});
			
 
				+		// #endif
			
 
				+	},
			
 
				+
			
 
				+	/**
			
 
				+	 * 操作错误提示
			
 
				+	 * @param {*} msg 
			
 
				+	 * @param {*} showCancel 
			
 
				+	 * @param {*} callback 
			
 
				+	 * @param {*} title 
			
 
				+	 */
			
 
				+	showError(msg,callback,title = "友情提示",showCancel = true){
			
 
				+		uni.showModal({
			
 
				+			title: title,
			
 
				+			content: msg,
			
 
				+			showCancel: showCancel,
			
 
				+			success(res) {
			
 
				+				callback && callback(res);
			
 
				+			}
			
 
				+		});
			
 
				+	},
			
 
				+	
			
 
				+	showConfirm(msg,callback,title,yes,cancel){
			
 
				+		plus.nativeUI.confirm(msg, function(e){
			
 
				+				callback && callback(e);
			
 
				+			},
			
 
				+			{"title":title,"buttons":[yes?yes:"确定",cancel?cancel:"取消"]}
			
 
				+		);
			
 
				+	},
			
 
				+	
			
 
				+	showSysAlert(msg,callback,title,showCancel){
			
 
				+		plus.nativeUI.alert(msg,callback,title,showCancel);
			
 
				+	},
			
 
				+	showSysMsg(msg){
			
 
				+		plus.nativeUI.toast(msg);
			
 
				+	},
			
 
				+	/**
			
 
				+	 * loading
			
 
				+	 * @param {Object} msg
			
 
				+	 * @param {Object} callback
			
 
				+	 */
			
 
				+	loading(msg,callback){
			
 
				+		uni.showLoading({
			
 
				+			title:msg ?? '请求中...',
			
 
				+			mask:true,
			
 
				+			success(res) {
			
 
				+				callback && callback(res);
			
 
				+			}
			
 
				+		})
			
 
				+	},
			
 
				+	hideLoad(){
			
 
				+		uni.hideLoading();
			
 
				+	},

			
 
				+	formatDate(value) {

			
 
				+		const data = new Date(value);

			
 
				+		const month = data.getMonth() + 1;

			
 
				+		const day = data.getDate();

			
 
				+		const year = data.getFullYear();

			
 
				+		const hours = data.getHours();

			
 
				+		const minutes = data.getMinutes();

			
 
				+		const seconds = data.getSeconds();

			
 
				+		const formattedTime = `${year}-${month}-${day}`;

			
 
				+		// const formattedTime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;

			
 
				+		return formattedTime;

			
 
				+	},

			
 
				+	formatMoney(num) {

			
 
				+		if (num == 0) return "￥0.00";

			
 
				+		return Intl.NumberFormat("zh-CN", {

			
 
				+			style: "currency",

			
 
				+			currency: "CNY",

			
 
				+			minimumFractionDigits: 2,

			
 
				+			maximumFractionDigits: 2,

			
 
				+		}).format(num / 100);

			
 
				+	}
			
 
				+}
			
--- a/static/js/form.js
+++ b/static/js/form.js
@@ -0,0 +1,267 @@
 
				+/**

			
 
				+ * 表单验证

			
 
				+ * @author dingyong

			
 
				+ * @version 1.4.0

			
 
				+ **/

			
 
				+

			
 
				+const form = {

			
 
				+	//当出现错误时返回错误消息，否则返回空即为验证通过

			
 
				+	/*

			
 
				+	 formData:Object 表单对象。{key:value,key:value},key==rules.name

			
 
				+	 rules: Array [{name:name,rule:[],msg:[]},{name:name,rule:[],msg:[]}]

			
 
				+			name:name 属性=> 元素的名称

			
 
				+			rule:字符串数组 ["required","isMobile","isEmail","isCarNo","isIdCard","isAmount","isNum","isChinese","isEnglish",isEnAndNo","isSpecial","isEmoji",""isDate","isUrl","isSame:key","range:[1,9]","minLength:9","maxLength:Number"]

			
 
				+			msg:数组 []。 与数组 rule 长度相同,对应的错误提示信息

			
 
				+	*/

			
 
				+	validation: function(formData, rules) {

			
 
				+		for (let item of rules) {

			
 
				+			let key = item.name;

			
 
				+			let rule = item.rule;

			
 
				+			let msgArr = item.msg;

			
 
				+			if (!key || !rule || rule.length === 0 || !msgArr || msgArr.length === 0) {

			
 
				+				continue;

			
 
				+			}

			
 
				+			for (let i = 0, length = rule.length; i < length; i++) {

			
 
				+				let ruleItem = rule[i];

			
 
				+				let msg = msgArr[i];

			
 
				+				if (!ruleItem || !msg) {

			
 
				+					continue;

			
 
				+				}

			
 
				+				//数据处理

			
 
				+				let value = null;

			
 
				+				if (~ruleItem.indexOf(":")) {

			
 
				+					let temp = ruleItem.split(":");

			
 
				+					ruleItem = temp[0];

			
 
				+					value = temp[1];

			
 
				+				}

			
 
				+				let isError = false;

			
 
				+				switch (ruleItem) {

			
 
				+					case "required":

			
 
				+						isError = form._isNullOrEmpty(formData[key]);

			
 
				+						break;

			
 
				+					case "isMobile":

			
 
				+						isError = !form._isMobile(formData[key]);

			
 
				+						break;

			
 
				+					case "isEmail":

			
 
				+						isError = !form._isEmail(formData[key]);

			
 
				+						break;

			
 
				+					case "isCarNo":

			
 
				+						isError = !form._isCarNo(formData[key]);

			
 
				+						break;

			
 
				+					case "isIdCard":

			
 
				+						isError = !form._isIdCard(formData[key]);

			
 
				+						break;

			
 
				+					case "isAmount":

			
 
				+						isError = !form._isAmount(formData[key]);

			
 
				+						break;

			
 
				+					case "isNum":

			
 
				+						isError = !form._isNum(formData[key]);

			
 
				+						break;

			
 
				+					case "isChinese":

			
 
				+						isError = !form._isChinese(formData[key]);

			
 
				+						break;

			
 
				+					case "isEnglish":

			
 
				+						isError = !form._isEnglish(formData[key]);

			
 
				+						break;

			
 
				+					case "isEnAndNo":

			
 
				+						isError = !form._isEnAndNo(formData[key]);

			
 
				+						break;

			
 
				+					case "isEnOrNo":

			
 
				+						isError = !form._isEnOrNo(formData[key]);

			
 
				+						break;

			
 
				+					case "isSpecial":

			
 
				+						isError = form._isSpecial(formData[key]);

			
 
				+						break;

			
 
				+					case "isEmoji":

			
 
				+						isError = form._isEmoji(formData[key]);

			
 
				+						break;

			
 
				+					case "isDate":

			
 
				+						isError = !form._isDate(formData[key]);

			
 
				+						break;

			
 
				+					case "isUrl":

			
 
				+						isError = !form._isUrl(formData[key]);

			
 
				+						break;

			
 
				+					case "isSame":

			
 
				+						isError = !form._isSame(formData[key], formData[value]);

			
 
				+						break;

			
 
				+					case "range":

			
 
				+						let range = null;

			
 
				+						try {

			
 
				+							range = JSON.parse(value);

			
 
				+							if (range.length <= 1) {

			
 
				+								throw new Error("range值传入有误！")

			
 
				+							}

			
 
				+						} catch (e) {

			
 
				+							return "range值传入有误！"

			
 
				+						}

			
 
				+						isError = !form._isRange(formData[key], range[0], range[1])

			
 
				+						break;

			
 
				+					case "minLength":

			
 
				+						isError = !form._minLength(formData[key], value)

			
 
				+						break;

			
 
				+					case "maxLength":

			
 
				+						isError = !form._maxLength(formData[key], value)

			
 
				+						break;

			
 
				+					default:

			
 
				+						break;

			
 
				+				}

			
 
				+				if (isError) {

			
 
				+					return msg;

			
 
				+				}

			
 
				+			}

			
 
				+		}

			
 
				+		return "";

			
 
				+	},

			
 
				+	_isNullOrEmpty: function(value) {

			
 
				+		return (value === null || value === '' || value === undefined) ? true : false;

			
 
				+	},

			
 
				+	_isMobile: function(value) {

			
 
				+		return /^(?:13\d|14\d|15\d|16\d|17\d|18\d|19\d)\d{5}(\d{3}|\*{3})$/.test(value);

			
 
				+	},

			
 
				+	_isEmail: function(value) {

			
 
				+		return /^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/.test(value);

			
 
				+	},

			
 
				+	_isCarNo: function(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);

			
 
				+		} else if (value.length === 8) {

			
 
				+			return xreg.test(value);

			
 
				+		} else {

			
 
				+			return false;

			
 
				+		}

			
 
				+	},

			
 
				+	_isIdCard: function(value) {

			
 
				+		let idCard = value;

			
 
				+		if (idCard.length == 15) {

			
 
				+			return this.__isValidityBrithBy15IdCard;

			
 
				+		} else if (idCard.length == 18) {

			
 
				+			let arrIdCard = idCard.split("");

			
 
				+			if (this.__isValidityBrithBy18IdCard(idCard) && this.__isTrueValidateCodeBy18IdCard(arrIdCard)) {

			
 
				+				return true;

			
 
				+			} else {

			
 
				+				return false;

			
 
				+			}

			
 
				+		} else {

			
 
				+			return false;

			
 
				+		}

			
 
				+	},

			
 
				+	__isTrueValidateCodeBy18IdCard: function(arrIdCard) {

			
 
				+		let sum = 0;

			
 
				+		let Wi = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2, 1];

			
 
				+		let ValideCode = [1, 0, 10, 9, 8, 7, 6, 5, 4, 3, 2];

			
 
				+		if (arrIdCard[17].toLowerCase() == 'x') {

			
 
				+			arrIdCard[17] = 10;

			
 
				+		}

			
 
				+		for (let i = 0; i < 17; i++) {

			
 
				+			sum += Wi[i] * arrIdCard[i];

			
 
				+		}

			
 
				+		let valCodePosition = sum % 11;

			
 
				+		if (arrIdCard[17] == ValideCode[valCodePosition]) {

			
 
				+			return true;

			
 
				+		} else {

			
 
				+			return false;

			
 
				+		}

			
 
				+	},

			
 
				+	__isValidityBrithBy18IdCard: function(idCard18) {

			
 
				+		let year = idCard18.substring(6, 10);

			
 
				+		let month = idCard18.substring(10, 12);

			
 
				+		let day = idCard18.substring(12, 14);

			
 
				+		let temp_date = new Date(year, parseFloat(month) - 1, parseFloat(day));

			
 
				+		if (temp_date.getFullYear() != parseFloat(year) || temp_date.getMonth() != parseFloat(month) - 1 || temp_date.getDate() !=

			
 
				+			parseFloat(day)) {

			
 
				+			return false;

			
 
				+		} else {

			
 
				+			return true;

			
 
				+		}

			
 
				+	},

			
 
				+	__isValidityBrithBy15IdCard: function(idCard15) {

			
 
				+		let year = idCard15.substring(6, 8);

			
 
				+		let month = idCard15.substring(8, 10);

			
 
				+		let day = idCard15.substring(10, 12);

			
 
				+		let temp_date = new Date(year, parseFloat(month) - 1, parseFloat(day));

			
 
				+

			
 
				+		if (temp_date.getYear() != parseFloat(year) || temp_date.getMonth() != parseFloat(month) - 1 || temp_date.getDate() !=

			
 
				+			parseFloat(day)) {

			
 
				+			return false;

			
 
				+		} else {

			
 
				+			return true;

			
 
				+		}

			
 
				+	},

			
 
				+	_isAmount: function(value) {

			
 
				+		//金额，只允许保留两位小数

			
 
				+		return /^([0-9]*[.]?[0-9])[0-9]{0,1}$/.test(value);

			
 
				+	},

			
 
				+	_isNum: function(value) {

			
 
				+		//只能为数字

			
 
				+		return /^[0-9]+$/.test(value);

			
 
				+	},

			
 
				+	_isChinese: function(value) {

			
 
				+		let reg = /.*[\u4e00-\u9fa5]+.*$/;

			
 
				+		return value !== "" && reg.test(value) && !form._isSpecial(value) && !form._isEmoji(value)

			
 
				+	},

			
 
				+	_isEnglish: function(value) {

			
 
				+		return /^[a-zA-Z]*$/.test(value)

			
 
				+	},

			
 
				+	_isEnAndNo: function(value) {

			
 
				+		//8~20位数字和字母组合

			
 
				+		return /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$/.test(value);

			
 
				+	},

			
 
				+	_isEnOrNo: function(value) {

			
 
				+		//英文或者数字

			
 
				+		let reg = /.*[\u4e00-\u9fa5]+.*$/;

			
 
				+		let result = true;

			
 
				+		if (reg.test(value) || form._isSpecial(value) || form._isEmoji(value)) {

			
 
				+			result = false

			
 
				+		}

			
 
				+		return result

			
 
				+	},

			
 
				+	_isSpecial: function(value) {

			
 
				+		//是否包含特殊字符

			
 
				+		let regEn = /[`~!@#$%^&*()_+<>?:"{},.\/;'[\]]/im,

			
 
				+			regCn = /[·！#￥（——）：；“”‘、，|《。》？、【】[\]]/im;

			
 
				+		if (regEn.test(value) || regCn.test(value)) {

			
 
				+			return true;

			
 
				+		}

			
 
				+		return false;

			
 
				+	},

			
 
				+	_isEmoji: function(value) {

			
 
				+		//是否包含表情

			
 
				+		return /\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/g.test(value);

			
 
				+	},

			
 
				+	_isDate: function(value) {

			
 
				+		//2019-10-12

			
 
				+		const reg =

			
 
				+			/^(?:(?!0000)[0-9]{4}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[0-9]{2}(?:0[48]|[2468][048]|[13579][26])|(?:0[48]|[2468][048]|[13579][26])00)-02-29)$/;

			
 
				+		return reg.test(value);

			
 
				+	},

			
 
				+	_isUrl: function(value) {

			
 
				+		return /^((https?|ftp|file):\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$/.test(value);

			
 
				+	},

			
 
				+	_isSame: function(value1, value2) {

			
 
				+		return value1 === value2

			
 
				+	},

			
 
				+	_isRange: function(value, range1, range2) {

			
 
				+		if ((!range1 && range1 != 0) && (!range2 && range2 != 0)) {

			
 
				+			return true;

			
 
				+		} else if (!range1 && range1 != 0) {

			
 
				+			return value <= range2

			
 
				+		} else if (!range2 && range2 != 0) {

			
 
				+			return value >= range1

			
 
				+		} else {

			
 
				+			return value >= range1 && value <= range2

			
 
				+		}

			
 
				+	},

			
 
				+	_minLength: function(value, min) {

			
 
				+		return value.length >= Number(min)

			
 
				+	},

			
 
				+	_maxLength: function(value, max) {

			
 
				+		return value.length <= Number(max)

			
 
				+	}

			
 
				+};

			
 
				+module.exports = {

			
 
				+	validation: form.validation

			
 
				+};
			
--- a/static/js/request.js
+++ b/static/js/request.js
@@ -0,0 +1,226 @@
 
				+/**
			
 
				+ * 常用方法封装 请求，文件上传等
			
 
				+ * @author echo. 
			
 
				+ **/
			
 
				+
			
 
				+const axg = {

			
 
				+	shopId: function() {

			
 
				+		return "10108618787549";

			
 
				+	},
			
 
				+	//接口地址
			
 
				+	interfaceUrl: function() {

			
 
				+		// #ifdef H5
			
 
				+		return '/api';

			
 
				+		// #endif

			
 
				+		// #ifdef MP
			
 
				+		// return 'https://apiv.jsshuita.com.cn/mini'
			
 
				+		return 'http://127.0.0.1:8190/api/dy'

			
 
				+		// #endif
			
 
				+	},
			
 
				+	toast: function(text, duration, success) { 
			
 
				+		// #ifdef APP-PLUS
			
 
				+		plus.nativeUI.toast(text || "出错啦~");
			
 
				+		// #endif
			
 
				+		// #ifndef MP
			
 
				+		uni.showToast({
			
 
				+			title: text || "出错啦~",
			
 
				+			icon: success ? 'success' : 'none',
			
 
				+			duration: duration || 2000
			
 
				+		})
			
 
				+		// #endif
			
 
				+	},
			
 
				+	modal: function(title, content, showCancel, callback, confirmColor, confirmText) {
			
 
				+		uni.showModal({
			
 
				+			title: title || '提示',
			
 
				+			content: content,
			
 
				+			showCancel: showCancel,
			
 
				+			cancelColor: "#555",
			
 
				+			confirmColor: confirmColor || "#5677fc",
			
 
				+			confirmText: confirmText || "确定",
			
 
				+			success(res) {
			
 
				+				if (res.confirm) {
			
 
				+					callback && callback(true)
			
 
				+				} else {
			
 
				+					callback && callback(false)
			
 
				+				}
			
 
				+			}
			
 
				+		})
			
 
				+	},
			
 
				+	isAndroid: function() {
			
 
				+		const res = uni.getSystemInfoSync();

			
 
				+		if(res.platform.toLocaleLowerCase() == 'android')

			
 
				+		{

			
 
				+			return true;

			
 
				+		}

			
 
				+		return false;
			
 
				+	},
			
 
				+	isPhoneX: function() {
			
 
				+		const res = uni.getSystemInfoSync();
			
 
				+		let iphonex = false;
			
 
				+		let models=['iphonex','iphonexr','iphonexsmax','iphone11','iphone11pro','iphone11promax']
			
 
				+		const model=res.model.replace(/\s/g,"").toLowerCase()
			
 
				+		if (models.includes(model)) {
			
 
				+			iphonex = true;
			
 
				+		}
			
 
				+		return iphonex;
			
 
				+	},
			
 
				+	constNum: function() {
			
 
				+		let time = 0;
			
 
				+		// #ifdef APP-PLUS
			
 
				+		time = this.isAndroid() ? 300 : 0;
			
 
				+		// #endif
			
 
				+		return time
			
 
				+	},
			
 
				+	delayed: null,
			
 
				+	/**
			
 
				+	 * 请求数据处理
			
 
				+	 * @param string url 请求地址
			
 
				+	 * @param string method 请求方式
			
 
				+	 *  GET or POST
			
 
				+	 * @param {*} postData 请求参数
			
 
				+	 * @param bool isDelay 是否延迟显示loading
			
 
				+	 * @param bool isForm 数据格式
			
 
				+	 *  true: 'application/x-www-form-urlencoded'
			
 
				+	 *  false:'application/json'
			
 
				+	 * @param bool hideLoading 是否隐藏loading
			
 
				+	 *  true: 隐藏
			
 
				+	 *  false:显示
			
 
				+	 */
			
 
				+	request: function(url, method, postData, isDelay, isForm, hideLoading) {
			
 
				+		//接口请求
			
 
				+		let loadding = false;
			
 
				+		axg.delayed && uni.hideLoading();
			
 
				+		clearTimeout(axg.delayed);
			
 
				+		axg.delayed = null;
			
 
				+		if (!hideLoading) {
			
 
				+			axg.delayed = setTimeout(() => {
			
 
				+				uni.showLoading({
			
 
				+					mask: true,
			
 
				+					title: '请求中...',
			
 
				+					success(res) {
			
 
				+						loadding = true
			
 
				+					}
			
 
				+				})
			
 
				+			}, isDelay ? 1000 : 0)
			
 
				+		}

			
 
				+		var header = {

			
 
				+			'Content-Type': isForm ? 'application/x-www-form-urlencoded' : 'application/json',

			
 
				+			'authorization': "Bearer "+axg.getToken(),

			
 
				+			'platform': "mini"

			
 
				+		}

			
 
				+		// postData.shop = axg.shopId();

			
 
				+		axg.toast(axg.interfaceUrl() + url)
			
 
				+		
			
 
				+		return new Promise((resolve, reject) => {
			
 
				+			uni.request({
			
 
				+				url: axg.interfaceUrl() + url,
			
 
				+				data: postData,
			
 
				+				header: header,
			
 
				+				method: method, //'GET','POST'
			
 
				+				dataType: 'json',
			
 
				+				success: (res) => {
			
 
				+					clearTimeout(axg.delayed)
			
 
				+					axg.delayed = null;

			
 
				+					uni.hideLoading()
			
 
				+					if (loadding && !hideLoading) {
			
 
				+						uni.hideLoading()
			
 
				+					}
			
 
				+					// if (res.data && res.data.code == 401) {

			
 
				+					// 	uni.showToast({
			
 
				+					// 		title: res.data.msg,
			
 
				+					// 		icon: 'none',
			
 
				+					// 		mask: true,
			
 
				+					// 		duration: 1500,
			
 
				+					// 		success() {

			
 
				+					// 			// uni.navigateTo({

			
 
				+					// 			// 	url:"/pages/user/login"

			
 
				+					// 			// });
			
 
				+					// 			uni.clearStorageSync();

			
 
				+					// 		}

			
 
				+					// 	});

			
 
				+					// 	return ;
			
 
				+					// }
			
 
				+					resolve(res.data)
			
 
				+				},
			
 
				+				fail: (res) => {
			
 
				+					clearTimeout(axg.delayed)
			
 
				+					axg.delayed = null;
			
 
				+					axg.toast("网络不给力，请稍后再试~")
			
 
				+					reject(res)
			
 
				+				}
			
 
				+			})
			
 
				+		})
			
 
				+	},
			
 
				+	/**
			
 
				+	 * 上传文件
			
 
				+	 * @param string url 请求地址
			
 
				+	 * @param string src 文件路径
			
 
				+	 */
			
 
				+	uploadFile: function(url, src, param) {
			
 
				+		return new Promise((resolve, reject) => {
			
 
				+			const uploadTask = uni.uploadFile({
			
 
				+				url: axg.interfaceUrl() + url,
			
 
				+				filePath: src,
			
 
				+				name: 'file',
			
 
				+				header: {

			
 
				+					'authorization': "Bearer "+axg.getToken(),

			
 
				+					'platform': "mini"
			
 
				+				},
			
 
				+				formData:param,
			
 
				+				success: function(res) {
			
 
				+					uni.hideLoading()
			
 
				+					let d = JSON.parse(res.data.replace(/\ufeff/g, "") || "{}")
			
 
				+					if (d.code == 200) {
			
 
				+						//返回图片地址
			
 
				+						let fileObj = d.data;
			
 
				+						resolve(fileObj)
			
 
				+					} else {
			
 
				+						axg.toast(res.msg);
			
 
				+					}
			
 
				+				},
			
 
				+				fail: function(res) {

			
 
				+					console.log('上传错误：',res)
			
 
				+					reject(res)
			
 
				+					axg.toast(res.msg);
			
 
				+				}
			
 
				+			})
			
 
				+		})
			
 
				+	},
			
 
				+	tuiJsonp: function(url, callback, callbackname) {
			
 
				+		// #ifdef H5
			
 
				+		window[callbackname] = callback;
			
 
				+		let tuiScript = document.createElement("script");
			
 
				+		tuiScript.src = url;
			
 
				+		tuiScript.type = "text/javascript";
			
 
				+		document.head.appendChild(tuiScript);
			
 
				+		document.head.removeChild(tuiScript);
			
 
				+		// #endif
			
 
				+	},
			
 
				+	//设置用户信息
			
 
				+	setUserInfo: function(mobile, token) {
			
 
				+		//uni.setStorageSync("thorui_token", token)
			
 
				+		uni.setStorageSync("user_token", mobile)
			
 
				+	},
			
 
				+	//获取token
			
 
				+	getToken() {
			
 
				+		return uni.getStorageSync("user_token") || 'None'
			
 
				+	},
			
 
				+	//判断是否登录
			
 
				+	isLogin: function() {
			
 
				+		return uni.getStorageSync("user_token") ? true : false
			
 
				+	},
			
 
				+	//跳转页面，校验登录状态
			
 
				+	href(url, isVerify) {
			
 
				+		if (isVerify && !axg.isLogin()) {
			
 
				+			uni.navigateTo({
			
 
				+				url: '/pages/user/login/login'
			
 
				+			})
			
 
				+		} else {
			
 
				+			uni.navigateTo({
			
 
				+				url: url
			
 
				+			});
			
 
				+		}
			
 
				+	}
			
 
				+}
			
 
				+
			
 
				+export default axg
			
--- a/static/logo.png
+++ b/static/logo.png
--- a/uni.scss
+++ b/uni.scss
@@ -0,0 +1,79 @@
 
				+/**

			
 
				+ * 这里是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;

			
 
				+

			
 
				+/* 引入uView全局scss变量文件 */

			
 
				+@import "uni_modules/uview-ui/theme.scss";
			
--- a/uni_modules/uni-popup/changelog.md
+++ b/uni_modules/uni-popup/changelog.md
@@ -0,0 +1,102 @@
 
				+## 1.9.11（2025-08-20）
			
 
				+- 修复 uni-popup-dialog组件设置 borderRadius 不生效的 Bug
			
 
				+## 1.9.10（2025-07-18）
			
 
				+- 修复 nvue 下弹窗样式错乱的问题 ，更新依赖 uni-transition 组件
			
 
				+- 更新 示例取消 borderRadius 属性 ，如需内容圆角，用户应该直接在内容插槽中实现
			
 
				+## 1.9.9（2025-06-11）
			
 
				+- 修复 uni-popup-dialog 中 setVal 方法报错的问题
			
 
				+- 修复 uni-popup-dialog 数据双向绑定问题。
			
 
				+## 1.9.8（2025-04-16）
			
 
				+- 修复 更新组件示例 ，解决更新数据或保存项目导致弹窗消失的问题
			
 
				+## 1.9.7（2025-04-14）
			
 
				+- 修复 uni-popup-dialog 弹出框在vue3中双向绑定问题
			
 
				+## 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 端
			
--- a/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
+++ 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

			
--- 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
@@ -0,0 +1,330 @@
 
				+<template>

			
 
				+	<view class="uni-popup-dialog" :style="{ borderRadius }">

			
 
				+		<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,

			
 
				+			},

			
 
				+		    borderRadius: {

			
 
				+				type: String,

			
 
				+				default: '11px',

			
 
				+			}

			
 
				+		},

			
 
				+		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) {

			
 
				+				this.setVal(val)

			
 
				+			},

			
 
				+			// #ifdef VUE3

			
 
				+			modelValue(val) {

			
 
				+				this.setVal(val)

			
 
				+			},

			
 
				+			// #endif

			
 
				+			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: {

			
 
				+			/**

			
 
				+			 * 给val属性赋值

			
 
				+			 */

			
 
				+			setVal(val) {

			
 
				+				if (this.maxlength != -1 && this.mode === 'input') {

			
 
				+					this.val = val.slice(0, this.maxlength);

			
 
				+				} else {

			
 
				+					this.val = val

			
 
				+				}

			
 
				+			},

			
 
				+			/**

			
 
				+			 * 点击确认按钮

			
 
				+			 */

			
 
				+			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;

			
 
				+		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>

			
--- 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
@@ -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>

			
--- 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
@@ -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>

			
--- a/uni_modules/uni-popup/components/uni-popup/i18n/en.json
+++ 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"
			
 
				+}
			
--- a/uni_modules/uni-popup/components/uni-popup/i18n/index.js
+++ 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

			
 
				+}
			
--- a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
+++ 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": "分享到"

			
 
				+}
			
--- a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
+++ 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": "分享到"

			
 
				+}
			
--- a/uni_modules/uni-popup/components/uni-popup/keypress.js
+++ 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

			
--- a/uni_modules/uni-popup/components/uni-popup/popup.js
+++ 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;
			
 
				+		},
			
 
				+	}

			
 
				+}

			
--- a/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
+++ 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>
			
--- a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
+++ 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>
			
--- a/uni_modules/uni-popup/package.json
+++ b/uni_modules/uni-popup/package.json
@@ -0,0 +1,107 @@
 
				+{
			
 
				+  "id": "uni-popup",
			
 
				+  "displayName": "uni-popup 弹出层",
			
 
				+  "version": "1.9.11",
			
 
				+  "description": " Popup 组件，提供常用的弹层",
			
 
				+  "keywords": [
			
 
				+    "uni-ui",
			
 
				+    "弹出层",
			
 
				+    "弹窗",
			
 
				+    "popup",
			
 
				+    "弹框"
			
 
				+],
			
 
				+  "repository": "https://github.com/dcloudio/uni-ui",
			
 
				+  "engines": {
			
 
				+    "HBuilderX": "",
			
 
				+    "uni-app": "^4.07",
			
 
				+    "uni-app-x": ""
			
 
				+  },
			
 
				+  "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",
			
 
				+    "darkmode": "x",
			
 
				+    "i18n": "x",
			
 
				+    "widescreen": "x"
			
 
				+  },
			
 
				+  "uni_modules": {
			
 
				+    "dependencies": [
			
 
				+      "uni-scss",
			
 
				+      "uni-transition"
			
 
				+    ],
			
 
				+    "encrypt": [],
			
 
				+    "platforms": {
			
 
				+      "cloud": {
			
 
				+        "tcb": "x",
			
 
				+        "aliyun": "x",
			
 
				+        "alipay": "x"
			
 
				+      },
			
 
				+      "client": {
			
 
				+        "uni-app": {
			
 
				+          "vue": {
			
 
				+            "vue2": "√",
			
 
				+            "vue3": "√"
			
 
				+          },
			
 
				+          "web": {
			
 
				+            "safari": "√",
			
 
				+            "chrome": "√"
			
 
				+          },
			
 
				+          "app": {
			
 
				+            "vue": "√",
			
 
				+            "nvue": "√",
			
 
				+            "android": "√",
			
 
				+            "ios": "√",
			
 
				+            "harmony": "√"
			
 
				+          },
			
 
				+          "mp": {
			
 
				+            "weixin": "√",
			
 
				+            "alipay": "√",
			
 
				+            "toutiao": "√",
			
 
				+            "baidu": "√",
			
 
				+            "kuaishou": "-",
			
 
				+            "jd": "-",
			
 
				+            "harmony": "-",
			
 
				+            "qq": "√",
			
 
				+            "lark": "-"
			
 
				+          },
			
 
				+          "quickapp": {
			
 
				+            "huawei": "-",
			
 
				+            "union": "-"
			
 
				+          }
			
 
				+        },
			
 
				+        "uni-app-x": {
			
 
				+          "web": {
			
 
				+            "safari": "√",
			
 
				+            "chrome": "√"
			
 
				+          },
			
 
				+          "app": {
			
 
				+            "android": "√",
			
 
				+            "ios": "√",
			
 
				+            "harmony": "√"
			
 
				+          },
			
 
				+          "mp": {
			
 
				+            "weixin": "√"
			
 
				+          }
			
 
				+        }
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+}
			
--- a/uni_modules/uni-popup/readme.md
+++ 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 
			
 
				+
			
 
				+
			
 
				+
			
 
				+
			
 
				+
			
--- a/uni_modules/uni-scss/changelog.md
+++ 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
			
--- a/uni_modules/uni-scss/index.scss
+++ b/uni_modules/uni-scss/index.scss
@@ -0,0 +1 @@
 
				+@import './styles/index.scss';
			
--- a/uni_modules/uni-scss/package.json
+++ 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"
			
 
				+        }
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+}
			
--- a/uni_modules/uni-scss/readme.md
+++ 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 
			
--- a/uni_modules/uni-scss/styles/index.scss
+++ 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';
			
--- a/uni_modules/uni-scss/styles/setting/_border.scss
+++ b/uni_modules/uni-scss/styles/setting/_border.scss
@@ -0,0 +1,3 @@
 
				+.uni-border {
			
 
				+	border: 1px $uni-border-1 solid;
			
 
				+}
			
--- a/uni_modules/uni-scss/styles/setting/_color.scss
+++ 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;
			
 
				+}
			
--- a/uni_modules/uni-scss/styles/setting/_radius.scss
+++ 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)
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+}
			
--- a/uni_modules/uni-scss/styles/setting/_space.scss
+++ 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);
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+}
			
--- a/uni_modules/uni-scss/styles/setting/_styles.scss
+++ 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 */
			
--- a/uni_modules/uni-scss/styles/setting/_text.scss
+++ 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 */
			
 
				+}
			
--- a/uni_modules/uni-scss/styles/setting/_variables.scss
+++ 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;
			
--- a/uni_modules/uni-scss/styles/tools/functions.scss
+++ 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;
			
 
				+};
			
--- a/uni_modules/uni-scss/theme.scss
+++ 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);
			
--- a/uni_modules/uni-scss/variables.scss
+++ 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);
			
--- a/uni_modules/uni-transition/changelog.md
+++ b/uni_modules/uni-transition/changelog.md
@@ -0,0 +1,31 @@
 
				+## 1.3.6（2025-07-18）
			
 
				+- 修复 nvue 页面，样式错误问题
			
 
				+## 1.3.5（2025-06-11）
			
 
				+- 修复 第一次执行不显示动画的问题
			
 
				+## 1.3.4（2025-04-16）
			
 
				+- 修复 页面数据更新到底动画复原的问题
			
 
				+- 修复 示例页面打开报错的问题
			
 
				+## 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 目录规范
			
--- a/uni_modules/uni-transition/components/uni-transition/createAnimation.js
+++ 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)
			
 
				+}
			
--- a/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
+++ b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
@@ -0,0 +1,292 @@
 
				+<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: 0,

			
 
				+				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 this

			
 
				+				Object.keys(obj).forEach(key => {

			
 
				+					const value = obj[key]

			
 
				+					if (typeof this.animation[key] === 'function') {

			
 
				+						Array.isArray(value) ?

			
 
				+							this.animation[key](...value) :

			
 
				+							this.animation[key](value)

			
 
				+					}

			
 
				+				})

			
 
				+				this.animation.step(config)

			
 
				+				return this

			
 
				+			},

			
 
				+			/**

			
 
				+			 *  ref 触发 执行动画

			
 
				+			 */

			
 
				+			run(fn) {

			
 
				+				if (!this.animation) return

			
 
				+				this.animation.run(fn)

			
 
				+			},

			
 
				+			// 开始过度动画

			
 
				+			open() {

			
 
				+				clearTimeout(this.timer)

			
 
				+				this.isShow = true

			
 
				+				// 新增初始状态重置逻辑（关键）

			
 
				+				this.transform = this.styleInit(false).transform || ''

			
 
				+				this.opacity = this.styleInit(false).opacity || 0

			
 
				+

			
 
				+				// 确保动态样式已经生效后，执行动画，如果不加 nextTick ，会导致 wx 动画执行异常

			
 
				+				this.$nextTick(() => {

			
 
				+					// TODO 定时器保证动画完全执行，目前有些问题，后面会取消定时器

			
 
				+					this.timer = setTimeout(() => {

			
 
				+						this.animation = createAnimation(this.config, this)

			
 
				+						this.tranfromInit(false).step()

			
 
				+						this.animation.run(() => {

			
 
				+							// #ifdef APP-NVUE
			
 
				+							this.transform = this.styleInit(false).transform || ''
			
 
				+							this.opacity = this.styleInit(false).opacity || 1
			
 
				+							// #endif
			
 
				+							// #ifndef APP-NVUE
			
 
				+							this.transform = ''
			
 
				+							this.opacity = this.styleInit(false).opacity || 1
			
 
				+							// #endif

			
 
				+							this.$emit('change', {

			
 
				+								detail: this.isShow

			
 
				+							})

			
 
				+						})

			
 
				+					}, 80)

			
 
				+				})

			
 
				+			},

			
 
				+			// 关闭过度动画

			
 
				+			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: '', opacity: 1 }

			
 
				+				const buildStyle = (type, mode) => {

			
 
				+					const value = this.animationType(type)[mode] // 直接使用 type 控制状态

			
 
				+					if (mode.startsWith('fade')) {

			
 
				+						styles.opacity = value

			
 
				+					} else {

			
 
				+						styles.transform += value + ' '

			
 
				+					}

			
 
				+				}

			
 
				+

			
 
				+				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 ? 1 : 0,

			
 
				+					'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>
			
--- a/uni_modules/uni-transition/package.json
+++ b/uni_modules/uni-transition/package.json
@@ -0,0 +1,112 @@
 
				+{
			
 
				+  "id": "uni-transition",
			
 
				+  "displayName": "uni-transition 过渡动画",
			
 
				+  "version": "1.3.6",
			
 
				+  "description": "元素的简单过渡动画",
			
 
				+  "keywords": [
			
 
				+    "uni-ui",
			
 
				+    "uniui",
			
 
				+    "动画",
			
 
				+    "过渡",
			
 
				+    "过渡动画"
			
 
				+],
			
 
				+  "repository": "https://github.com/dcloudio/uni-ui",
			
 
				+  "engines": {
			
 
				+    "HBuilderX": "",
			
 
				+    "uni-app": "^4.12",
			
 
				+    "uni-app-x": ""
			
 
				+  },
			
 
				+  "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",
			
 
				+    "darkmode": "x",
			
 
				+    "i18n": "x",
			
 
				+    "widescreen": "x"
			
 
				+  },
			
 
				+  "uni_modules": {
			
 
				+    "dependencies": [
			
 
				+      "uni-scss"
			
 
				+    ],
			
 
				+    "encrypt": [],
			
 
				+    "platforms": {
			
 
				+      "cloud": {
			
 
				+        "tcb": "x",
			
 
				+        "aliyun": "x",
			
 
				+        "alipay": "x"
			
 
				+      },
			
 
				+      "client": {
			
 
				+        "uni-app": {
			
 
				+          "vue": {
			
 
				+            "vue2": "√",
			
 
				+            "vue3": "√"
			
 
				+          },
			
 
				+          "web": {
			
 
				+            "safari": "√",
			
 
				+            "chrome": "√"
			
 
				+          },
			
 
				+          "app": {
			
 
				+            "vue": "√",
			
 
				+            "nvue": "√",
			
 
				+            "android": "√",
			
 
				+            "ios": "√",
			
 
				+            "harmony": "√"
			
 
				+          },
			
 
				+          "mp": {
			
 
				+            "weixin": {
			
 
				+            },
			
 
				+            "alipay": {
			
 
				+            },
			
 
				+            "toutiao": {
			
 
				+            },
			
 
				+            "baidu": {
			
 
				+            },
			
 
				+            "kuaishou": {
			
 
				+            },
			
 
				+            "jd": {
			
 
				+            },
			
 
				+            "harmony": "-",
			
 
				+            "qq": "√",
			
 
				+            "lark": "-"
			
 
				+          },
			
 
				+          "quickapp": {
			
 
				+            "huawei": "√",
			
 
				+            "union": "√"
			
 
				+          }
			
 
				+        },
			
 
				+        "uni-app-x": {
			
 
				+          "web": {
			
 
				+            "safari": "-",
			
 
				+            "chrome": "-"
			
 
				+          },
			
 
				+          "app": {
			
 
				+            "android": "-",
			
 
				+            "ios": "-",
			
 
				+            "harmony": "-"
			
 
				+          },
			
 
				+          "mp": {
			
 
				+            "weixin": "-"
			
 
				+          }
			
 
				+        }
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+}
			
--- a/uni_modules/uni-transition/readme.md
+++ 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 
			
--- a/uni_modules/uview-ui/LICENSE
+++ b/uni_modules/uview-ui/LICENSE
@@ -0,0 +1,21 @@
 
				+MIT License

			
 
				+

			
 
				+Copyright (c) 2023 www.uviewui.com

			
 
				+

			
 
				+Permission is hereby granted, free of charge, to any person obtaining a copy

			
 
				+of this software and associated documentation files (the "Software"), to deal

			
 
				+in the Software without restriction, including without limitation the rights

			
 
				+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

			
 
				+copies of the Software, and to permit persons to whom the Software is

			
 
				+furnished to do so, subject to the following conditions:

			
 
				+

			
 
				+The above copyright notice and this permission notice shall be included in all

			
 
				+copies or substantial portions of the Software.

			
 
				+

			
 
				+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

			
 
				+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

			
 
				+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

			
 
				+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

			
 
				+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

			
 
				+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

			
 
				+SOFTWARE.

			
--- a/uni_modules/uview-ui/README.md
+++ b/uni_modules/uview-ui/README.md
@@ -0,0 +1,66 @@
 
				+<p align="center">
			
 
				+    <img alt="logo" src="https://uviewui.com/common/logo.png" width="120" height="120" style="margin-bottom: 10px;">
			
 
				+</p>
			
 
				+<h3 align="center" style="margin: 30px 0 30px;font-weight: bold;font-size:40px;">uView 2.0</h3>
			
 
				+<h3 align="center">多平台快速开发的UI框架</h3>
			
 
				+
			
 
				+[![stars](https://img.shields.io/github/stars/umicro/uView2.0?style=flat-square&logo=GitHub)](https://github.com/umicro/uView2.0)
			
 
				+[![forks](https://img.shields.io/github/forks/umicro/uView2.0?style=flat-square&logo=GitHub)](https://github.com/umicro/uView2.0)
			
 
				+[![issues](https://img.shields.io/github/issues/umicro/uView2.0?style=flat-square&logo=GitHub)](https://github.com/umicro/uView2.0/issues)
			
 
				+[![Website](https://img.shields.io/badge/uView-up-blue?style=flat-square)](https://uviewui.com)
			
 
				+[![release](https://img.shields.io/github/v/release/umicro/uView2.0?style=flat-square)](https://gitee.com/umicro/uView2.0/releases)
			
 
				+[![license](https://img.shields.io/github/license/umicro/uView2.0?style=flat-square)](https://en.wikipedia.org/wiki/MIT_License)
			
 
				+
			
 
				+## 说明
			
 
				+
			
 
				+uView UI，是[uni-app](https://uniapp.dcloud.io/)全面兼容nvue的uni-app生态框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水
			
 
				+
			
 
				+## [官方文档：https://uviewui.com](https://uviewui.com)
			
 
				+
			
 
				+
			
 
				+## 预览
			
 
				+
			
 
				+您可以通过**微信**扫码，查看最佳的演示效果。
			
 
				+<br>
			
 
				+<br>
			
 
				+<img src="https://uviewui.com/common/weixin_mini_qrcode.png" width="220" height="220" >
			
 
				+
			
 
				+
			
 
				+## 链接
			
 
				+
			
 
				+- [官方文档](https://www.uviewui.com/)
			
 
				+- [更新日志](https://www.uviewui.com/components/changelog.html)
			
 
				+- [升级指南](https://www.uviewui.com/components/changeGuide.html)
			
 
				+- [关于我们](https://www.uviewui.com/cooperation/about.html)
			
 
				+
			
 
				+## 交流反馈
			
 
				+
			
 
				+欢迎加入我们的QQ群交流反馈：[点此跳转](https://www.uviewui.com/components/addQQGroup.html)
			
 
				+
			
 
				+## 关于PR
			
 
				+
			
 
				+> 我们非常乐意接受各位的优质PR，但在此之前我希望您了解uView2.0是一个需要兼容多个平台的（小程序、h5、ios app、android app）包括nvue页面、vue页面。
			
 
				+> 所以希望在您修复bug并提交之前尽可能的去这些平台测试一下兼容性。最好能携带测试截图以方便审核。非常感谢！
			
 
				+
			
 
				+## 安装
			
 
				+
			
 
				+#### **uni-app插件市场链接** —— [https://ext.dcloud.net.cn/plugin?id=1593](https://ext.dcloud.net.cn/plugin?id=1593)
			
 
				+
			
 
				+请通过[官网安装文档](https://www.uviewui.com/components/install.html)了解更详细的内容
			
 
				+
			
 
				+## 快速上手
			
 
				+
			
 
				+请通过[快速上手](https://uviewui.com/components/quickstart.html)了解更详细的内容
			
 
				+
			
 
				+## 使用方法
			
 
				+配置easycom规则后，自动按需引入，无需`import`组件，直接引用即可。
			
 
				+
			
 
				+```html
			
 
				+<template>
			
 
				+	<u-button text="按钮"></u-button>
			
 
				+</template>
			
 
				+```
			
 
				+
			
 
				+## 版权信息
			
 
				+uView遵循[MIT](https://en.wikipedia.org/wiki/MIT_License)开源协议，意味着您无需支付任何费用，也无需授权，即可将uView应用到您的产品中。
			
 
				+
			
--- a/uni_modules/uview-ui/changelog.md
+++ b/uni_modules/uview-ui/changelog.md
@@ -0,0 +1,376 @@
 
				+## 2.0.38（2024-06-12）
			
 
				+插件市场处理
			
 
				+## 2.0.37（2024-03-17）
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 修复表单校验`trigger`触发器参数无效问题
			
 
				+2. 修复`u-input`组件的`password`属性在动态切换为`false`时失效的问题
			
 
				+3. 添加微信小程序用户同意隐私协议事件回调
			
 
				+4. 修复支付宝小程序picker样式问题
			
 
				+5. `u-modal`添加`duration`字段控制动画过度时间
			
 
				+6. 修复`picker` `lastIndex`异常导致的`column`异常问题
			
 
				+7. `tabs`增加长按事件支持
			
 
				+8. 修复`u-avatar` `square`属性在小程序`open-data`下无效问题
			
 
				+9. 其他一些修复
			
 
				+## 2.0.36（2023-03-27）
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 重构`deepClone` & `deepMerge`方法
			
 
				+2. 其他优化
			
 
				+## 2.0.34（2022-09-24）
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. `u-input`、`u-textarea`增加`ignoreCompositionEvent`属性
			
 
				+2. 修复`route`方法调用可能报错的问题
			
 
				+3. 修复`u-no-network`组件`z-index`无效的问题
			
 
				+4. 修复`textarea`组件在h5上confirmType=""报错的问题
			
 
				+5. `u-rate`适配`nvue`
			
 
				+6. 优化验证手机号码的正则表达式(根据工信部发布的《电信网编号计划（2017年版）》进行修改。)
			
 
				+7. `form-item`添加`labelPosition`属性
			
 
				+8. `u-calendar`修复`maxDate`设置为当前日期，并且当前时间大于08：00时无法显示日期列表的问题 (#724)
			
 
				+9. `u-radio`增加一个默认插槽用于自定义修改label内容 (#680)
			
 
				+10. 修复`timeFormat`函数在safari重的兼容性问题 (#664)
			
 
				+## 2.0.33（2022-06-17）
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 修复`loadmore`组件`lineColor`类型错误问题
			
 
				+2. 修复`u-parse`组件`imgtap`、`linktap`不生效问题
			
 
				+## 2.0.32（2022-06-16）
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+1. `u-loadmore`新增自定义颜色、虚/实线
			
 
				+2. 修复`u-swiper-action`组件部分平台不能上下滑动的问题
			
 
				+3. 修复`u-list`回弹问题
			
 
				+4. 修复`notice-bar`组件动画在低端安卓机可能会抖动的问题
			
 
				+5. `u-loading-page`添加控制图标大小的属性`iconSize`
			
 
				+6. 修复`u-tooltip`组件`color`参数不生效的问题
			
 
				+7. 修复`u--input`组件使用`blur`事件输出为`undefined`的bug
			
 
				+8. `u-code-input`组件新增键盘弹起时，是否自动上推页面参数`adjustPosition`
			
 
				+9. 修复`image`组件`load`事件无回调对象问题
			
 
				+10. 修复`button`组件`loadingSize`设置无效问题
			
 
				+10. 其他修复
			
 
				+## 2.0.31（2022-04-19）
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 修复`upload`在`vue`页面上传成功后没有成功标志的问题
			
 
				+2. 解决演示项目中微信小程序模拟上传图片一直出于上传中问题
			
 
				+3. 修复`u-code-input`组件在`nvue`页面编译到`app`平台上光标异常问题（`app`去除此功能）
			
 
				+4. 修复`actionSheet`组件标题关闭按钮点击事件名称错误的问题
			
 
				+5. 其他修复
			
 
				+## 2.0.30（2022-04-04）
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. `u-rate`增加`readonly`属性
			
 
				+2. `tabs`滑块支持设置背景图片
			
 
				+3. 修复`u-subsection` `mode`为`subsection`时，滑块样式不正确的问题
			
 
				+4. `u-code-input`添加光标效果动画
			
 
				+5. 修复`popup`的`open`事件不触发
			
 
				+6. 修复`u-flex-column`无效的问题
			
 
				+7. 修复`u-datetime-picker`索引在特定场合异常问题
			
 
				+8. 修复`u-datetime-picker`最小时间字符串模板错误问题
			
 
				+9. `u-swiper`添加`m3u8`验证
			
 
				+10. `u-swiper`修改判断image和video逻辑
			
 
				+11. 修复`swiper`无法使用本地图片问题，增加`type`参数
			
 
				+12. 修复`u-row-notice`格式错误问题
			
 
				+13. 修复`u-switch`组件当`unit`为`rpx`时,`nodeStyle`消失的问题
			
 
				+14. 修复`datetime-picker`组件`showToolbar`与`visibleItemCount`属性无效的问题
			
 
				+15. 修复`upload`组件条件编译位置判断错误，导致`previewImage`属性设置为`false`时，整个组件都会被隐藏的问题
			
 
				+16. 修复`u-checkbox-group`设置`shape`属性无效的问题
			
 
				+17. 修复`u-upload`的`capture`传入字符串的时候不生效的问题
			
 
				+18. 修复`u-action-sheet`组件，关闭事件逻辑错误的问题
			
 
				+19. 修复`u-list`触顶事件的触发错误的问题
			
 
				+20. 修复`u-text`只有手机号可拨打的问题
			
 
				+21. 修复`u-textarea`不能换行的问题
			
 
				+22. 其他修复
			
 
				+## 2.0.29（2022-03-13）
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 修复`u--text`组件设置`decoration`属性未生效的问题
			
 
				+2. 修复`u-datetime-picker`使用`formatter`后返回值不正确
			
 
				+3. 修复`u-datetime-picker` `intercept` 可能为undefined
			
 
				+4. 修复已设置单位 uni..config.unit = 'rpx'时，线型指示器 `transform` 的位置翻倍，导致指示器超出宽度
			
 
				+5. 修复mixin中bem方法生成的类名在支付宝和字节小程序中失效
			
 
				+6. 修复默认值传值为空的时候，打开`u-datetime-picker`报错，不能选中第一列时间的bug
			
 
				+7. 修复`u-datetime-picker`使用`formatter`后返回值不正确
			
 
				+8. 修复`u-image`组件`loading`无效果的问题
			
 
				+9. 修复`config.unit`属性设为`rpx`时，导航栏占用高度不足导致塌陷的问题
			
 
				+10. 修复`u-datetime-picker`组件`itemHeight`无效问题
			
 
				+11. 其他修复
			
 
				+## 2.0.28（2022-02-22）
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. search组件新增searchIconSize属性
			
 
				+2. 兼容Safari/Webkit中传入时间格式如2022-02-17 12:00:56
			
 
				+3. 修复text value.js 判断日期出format错误问题
			
 
				+4. priceFormat格式化金额出现精度错误
			
 
				+5. priceFormat在部分情况下出现精度损失问题
			
 
				+6. 优化表单rules提示
			
 
				+7. 修复avatar组件src为空时，展示状态不对
			
 
				+8. 其他修复
			
 
				+## 2.0.27（2022-01-28）
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1.样式修复
			
 
				+## 2.0.26（2022-01-28）
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1.样式修复
			
 
				+## 2.0.25（2022-01-27）
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 修复text组件mode=price时，可能会导致精度错误的问题
			
 
				+2. 添加$u.setConfig()方法，可设置uView内置的config, props, zIndex, color属性，详见：[修改uView内置配置方案](https://uviewui.com/components/setting.html#%E9%BB%98%E8%AE%A4%E5%8D%95%E4%BD%8D%E9%85%8D%E7%BD%AE)
			
 
				+3. 优化form组件在errorType=toast时，如果输入错误页面会有抖动的问题
			
 
				+4. 修复$u.addUnit()对配置默认单位可能无效的问题
			
 
				+## 2.0.24（2022-01-25）
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 修复swiper在current指定非0时缩放有误
			
 
				+2. 修复u-icon添加stop属性的时候报错
			
 
				+3. 优化遗留的通过正则判断rpx单位的问题
			
 
				+4. 优化Layout布局 vue使用gutter时，会超出固定区域
			
 
				+5. 优化search组件高度单位问题（rpx -> px）
			
 
				+6. 修复u-image slot 加载和错误的图片失去了高度
			
 
				+7. 修复u-index-list中footer插槽与header插槽存在性判断错误
			
 
				+8. 修复部分机型下u-popup关闭时会闪烁
			
 
				+9. 修复u-image在nvue-app下失去宽高
			
 
				+10. 修复u-popup运行报错
			
 
				+11. 修复u-tooltip报错
			
 
				+12. 修复box-sizing在app下的警告
			
 
				+13. 修复u-navbar在小程序中报运行时错误
			
 
				+14. 其他修复
			
 
				+## 2.0.23（2022-01-24）
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 修复image组件在hx3.3.9的nvue下可能会显示异常的问题
			
 
				+2. 修复col组件gutter参数带rpx单位处理不正确的问题
			
 
				+3. 修复text组件单行时无法显示省略号的问题
			
 
				+4. navbar添加titleStyle参数
			
 
				+5. 升级到hx3.3.9可消除nvue下控制台样式警告的问题
			
 
				+## 2.0.22（2022-01-19）
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. $u.page()方法优化，避免在特殊场景可能报错的问题
			
 
				+2. picker组件添加immediateChange参数
			
 
				+3. 新增$u.pages()方法
			
 
				+## 2.0.21（2022-01-19）
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 优化：form组件在用户设置rules的时候提示用户model必传
			
 
				+2. 优化遗留的通过正则判断rpx单位的问题
			
 
				+3. 修复微信小程序环境中tabbar组件开启safeAreaInsetBottom属性后，placeholder高度填充不正确
			
 
				+4. 修复swiper在current指定非0时缩放有误
			
 
				+5. 修复u-icon添加stop属性的时候报错
			
 
				+6. 修复upload组件在accept=all的时候没有作用
			
 
				+7. 修复在text组件mode为phone时call属性无效的问题
			
 
				+8. 处理u-form clearValidate方法
			
 
				+9. 其他修复
			
 
				+## 2.0.20（2022-01-14）
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 修复calendar默认会选择一个日期，如果直接点确定的话，无法取到值的问题
			
 
				+2. 修复Slider缺少disabled props 还有注释
			
 
				+3. 修复u-notice-bar点击事件无法拿到index索引值的问题
			
 
				+4. 修复u-collapse-item在vue文件下，app端自定义插槽不生效的问题
			
 
				+5. 优化头像为空时显示默认头像 
			
 
				+6. 修复图片地址赋值后判断加载状态为完成问题
			
 
				+7. 修复日历滚动到默认日期月份区域
			
 
				+8. search组件暴露点击左边icon事件
			
 
				+9. 修复u-form clearValidate方法不生效
			
 
				+10. upload h5端增加返回文件参数（文件的name参数）
			
 
				+11. 处理upload选择文件后url为blob类型无法预览的问题
			
 
				+12. u-code-input 修复输入框没有往左移出一半屏幕
			
 
				+13. 修复Upload上传 disabled为true时，控制台报hoverClass类型错误
			
 
				+14. 临时处理ios app下grid点击坍塌问题
			
 
				+15. 其他修复
			
 
				+## 2.0.19（2021-12-29）
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 优化微信小程序包体积可在微信中预览，请升级HbuilderX3.3.4，同时在“运行->运行到小程序模拟器”中勾选“运行时是否压缩代码”
			
 
				+2. 优化微信小程序setData性能，处理某些方法如$u.route()无法在模板中使用的问题
			
 
				+3. navbar添加autoBack参数
			
 
				+4. 允许avatar组件的事件冒泡
			
 
				+5. 修复cell组件报错问题
			
 
				+6. 其他修复
			
 
				+## 2.0.18（2021-12-28）
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 修复app端编译报错问题
			
 
				+2. 重新处理微信小程序端setData过大的性能问题
			
 
				+3. 修复边框问题
			
 
				+4. 修复最大最小月份不大于0则没有数据出现的问题
			
 
				+5. 修复SwipeAction微信小程序端无法上下滑动问题
			
 
				+6. 修复input的placeholder在小程序端默认显示为true问题
			
 
				+7. 修复divider组件click事件无效问题
			
 
				+8. 修复u-code-input maxlength 属性值为 String 类型时显示异常
			
 
				+9. 修复当 grid只有 1到2时 在小程序端algin设置无效的问题
			
 
				+10. 处理form-item的label为top时，取消错误提示的左边距
			
 
				+11. 其他修复
			
 
				+## 2.0.17（2021-12-26）
			
 
				+## uView正在参与开源中国的“年度最佳项目”评选，之前投过票的现在也可以投票，恳请同学们投一票，[点此帮助uView](https://www.oschina.net/project/top_cn_2021/?id=583)
			
 
				+
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 解决HBuilderX3.3.3.20211225版本导致的样式问题
			
 
				+2. calendar日历添加monthNum参数
			
 
				+3. navbar添加center slot
			
 
				+## 2.0.16（2021-12-25）
			
 
				+## uView正在参与开源中国的“年度最佳项目”评选，之前投过票的现在也可以投票，恳请同学们投一票，[点此帮助uView](https://www.oschina.net/project/top_cn_2021/?id=583)
			
 
				+
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 解决微信小程序setData性能问题
			
 
				+2. 修复count-down组件change事件不触发问题
			
 
				+## 2.0.15（2021-12-21）
			
 
				+## uView正在参与开源中国的“年度最佳项目”评选，之前投过票的现在也可以投票，恳请同学们投一票，[点此帮助uView](https://www.oschina.net/project/top_cn_2021/?id=583)
			
 
				+
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 修复Cell单元格titleWidth无效
			
 
				+2. 修复cheakbox组件ischecked不更新
			
 
				+3. 修复keyboard是否显示"."按键默认值问题
			
 
				+4. 修复number-keyboard是否显示键盘的"."符号问题
			
 
				+5. 修复Input输入框 readonly无效
			
 
				+6. 修复u-avatar 导致打包app、H5时候报错问题
			
 
				+7. 修复Upload上传deletable无效
			
 
				+8. 修复upload当设置maxSize时无效的问题
			
 
				+9. 修复tabs lineWidth传入带单位的字符串的时候偏移量计算错误问题
			
 
				+10. 修复rate组件在有padding的view内，显示的星星位置和可触摸区域不匹配，无法正常选中星星
			
 
				+## 2.0.13（2021-12-14）
			
 
				+## [点击加群交流反馈：364463526](https://jq.qq.com/?_chanwv=1027&k=mCxS3TGY)
			
 
				+
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 修复配置默认单位为rpx可能会导致自定义导航栏高度异常的问题
			
 
				+## 2.0.12（2021-12-14）
			
 
				+## [点击加群交流反馈：364463526](https://jq.qq.com/?_chanwv=1027&k=mCxS3TGY)
			
 
				+
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 修复tabs组件在vue环境下划线消失的问题
			
 
				+2. 修复upload组件在安卓小程序无法选择视频的问题
			
 
				+3. 添加uni.$u.config.unit配置，用于配置参数默认单位，详见：[默认单位配置](https://www.uviewui.com/components/setting.html#%E9%BB%98%E8%AE%A4%E5%8D%95%E4%BD%8D%E9%85%8D%E7%BD%AE)
			
 
				+4. 修复textarea组件在没绑定v-model时，字符统计不生效问题
			
 
				+5. 修复nvue下控制是否出现滚动条失效问题
			
 
				+## 2.0.11（2021-12-13）
			
 
				+## [点击加群交流反馈：364463526](https://jq.qq.com/?_chanwv=1027&k=mCxS3TGY)
			
 
				+
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. text组件align参数无效的问题
			
 
				+2. subsection组件添加keyName参数
			
 
				+3. upload组件无法判断[Object file]类型的问题
			
 
				+4. 处理notify层级过低问题
			
 
				+5. codeInput组件添加disabledDot参数
			
 
				+6. 处理actionSheet组件round参数无效的问题
			
 
				+7. calendar组件添加round参数用于控制圆角值
			
 
				+8. 处理swipeAction组件在vue环境下默认被打开的问题
			
 
				+9. button组件的throttleTime节流参数无效的问题
			
 
				+10. 解决u-notify手动关闭方法close()无效的问题
			
 
				+11. input组件readonly不生效问题
			
 
				+12. tag组件type参数为info不生效问题
			
 
				+## 2.0.10（2021-12-08）
			
 
				+## [点击加群交流反馈：364463526](https://jq.qq.com/?_chanwv=1027&k=mCxS3TGY)
			
 
				+
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 修复button sendMessagePath属性不生效
			
 
				+2. 修复DatetimePicker选择器title无效
			
 
				+3. 修复u-toast设置loading=true不生效
			
 
				+4. 修复u-text金额模式传0报错
			
 
				+5. 修复u-toast组件的icon属性配置不生效
			
 
				+6. button的icon在特殊场景下的颜色优化
			
 
				+7. IndexList优化，增加#
			
 
				+## 2.0.9（2021-12-01）
			
 
				+## [点击加群交流反馈：232041042](https://jq.qq.com/?_wv=1027&k=KnbeceDU)
			
 
				+
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 优化swiper的height支持100%值(仅vue有效)，修复嵌入视频时click事件无法触发的问题
			
 
				+2. 优化tabs组件对list值为空的判断，或者动态变化list时重新计算相关尺寸的问题
			
 
				+3. 优化datetime-picker组件逻辑，让其后续打开的默认值为上一次的选中值，需要通过v-model绑定值才有效
			
 
				+4. 修复upload内嵌在其他组件中，选择图片可能不会换行的问题
			
 
				+## 2.0.8（2021-12-01）
			
 
				+## [点击加群交流反馈：232041042](https://jq.qq.com/?_wv=1027&k=KnbeceDU)
			
 
				+
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 修复toast的position参数无效问题
			
 
				+2. 处理input在ios nvue上无法获得焦点的问题
			
 
				+3. avatar-group组件添加extraValue参数，让剩余展示数量可手动控制
			
 
				+4. tabs组件添加keyName参数用于配置从对象中读取的键名
			
 
				+5. 处理text组件名字脱敏默认配置无效的问题
			
 
				+6. 处理picker组件item文本太长换行问题
			
 
				+## 2.0.7（2021-11-30）
			
 
				+## [点击加群交流反馈：232041042](https://jq.qq.com/?_wv=1027&k=KnbeceDU)
			
 
				+
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 修复radio和checkbox动态改变v-model无效的问题。
			
 
				+2. 优化form规则validator在微信小程序用法
			
 
				+3. 修复backtop组件mode参数在微信小程序无效的问题
			
 
				+4. 处理Album的previewFullImage属性无效的问题
			
 
				+5. 处理u-datetime-picker组件mode='time'在选择改变时间时，控制台报错的问题
			
 
				+## 2.0.6（2021-11-27）
			
 
				+## [点击加群交流反馈：232041042](https://jq.qq.com/?_wv=1027&k=KnbeceDU)
			
 
				+
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. 处理tag组件在vue下边框无效的问题。
			
 
				+2. 处理popup组件圆角参数可能无效的问题。
			
 
				+3. 处理tabs组件lineColor参数可能无效的问题。
			
 
				+4. propgress组件在值很小时，显示异常的问题。
			
 
				+## 2.0.5（2021-11-25）
			
 
				+## [点击加群交流反馈：232041042](https://jq.qq.com/?_wv=1027&k=KnbeceDU)
			
 
				+
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. calendar在vue下显示异常问题。 
			
 
				+2. form组件labelPosition和errorType参数无效的问题
			
 
				+3. input组件inputAlign无效的问题
			
 
				+4. 其他一些修复
			
 
				+## 2.0.4（2021-11-23）
			
 
				+## [点击加群交流反馈：232041042](https://jq.qq.com/?_wv=1027&k=KnbeceDU)
			
 
				+
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+0. input组件缺失@confirm事件，以及subfix和prefix无效问题
			
 
				+1. component.scss文件样式在vue下干扰全局布局问题
			
 
				+2. 修复subsection在vue环境下表现异常的问题
			
 
				+3. tag组件的bgColor等参数无效的问题
			
 
				+4. upload组件不换行的问题
			
 
				+5. 其他的一些修复处理
			
 
				+## 2.0.3（2021-11-16）
			
 
				+## [点击加群交流反馈：1129077272](https://jq.qq.com/?_wv=1027&k=KnbeceDU)
			
 
				+
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. uView2.0已实现全面兼容nvue
			
 
				+2. uView2.0对1.x进行了架构重构，细节和性能都有极大提升
			
 
				+3. 目前uView2.0为公测阶段，相关细节可能会有变动
			
 
				+4. 我们写了一份与1.x的对比指南，详见[对比1.x](https://www.uviewui.com/components/diff1.x.html)
			
 
				+5. 处理modal的confirm回调事件拼写错误问题
			
 
				+6. 处理input组件@input事件参数错误问题
			
 
				+7. 其他一些修复
			
 
				+## 2.0.2（2021-11-16）
			
 
				+## [点击加群交流反馈：1129077272](https://jq.qq.com/?_wv=1027&k=KnbeceDU)
			
 
				+
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. uView2.0已实现全面兼容nvue
			
 
				+2. uView2.0对1.x进行了架构重构，细节和性能都有极大提升
			
 
				+3. 目前uView2.0为公测阶段，相关细节可能会有变动
			
 
				+4. 我们写了一份与1.x的对比指南，详见[对比1.x](https://www.uviewui.com/components/diff1.x.html)
			
 
				+5. 修复input组件formatter参数缺失问题
			
 
				+6. 优化loading-icon组件的scss写法问题，防止不兼容新版本scss
			
 
				+## 2.0.0(2020-11-15)
			
 
				+## [点击加群交流反馈：1129077272](https://jq.qq.com/?_wv=1027&k=KnbeceDU)
			
 
				+
			
 
				+# uView2.0重磅发布，利剑出鞘，一统江湖
			
 
				+
			
 
				+1. uView2.0已实现全面兼容nvue
			
 
				+2. uView2.0对1.x进行了架构重构，细节和性能都有极大提升
			
 
				+3. 目前uView2.0为公测阶段，相关细节可能会有变动
			
 
				+4. 我们写了一份与1.x的对比指南，详见[对比1.x](https://www.uviewui.com/components/diff1.x.html)
			
 
				+5. 修复input组件formatter参数缺失问题
			
 
				+
			
 
				+
			
--- a/uni_modules/uview-ui/components/u--form/u--form.vue
+++ b/uni_modules/uview-ui/components/u--form/u--form.vue
@@ -0,0 +1,78 @@
 
				+<template>

			
 
				+	<uvForm

			
 
				+		ref="uForm"

			
 
				+		:model="model"

			
 
				+		:rules="rules"

			
 
				+		:errorType="errorType"

			
 
				+		:borderBottom="borderBottom"

			
 
				+		:labelPosition="labelPosition"

			
 
				+		:labelWidth="labelWidth"

			
 
				+		:labelAlign="labelAlign"

			
 
				+		:labelStyle="labelStyle"

			
 
				+		:customStyle="customStyle"

			
 
				+	>

			
 
				+		<slot />

			
 
				+	</uvForm>

			
 
				+</template>

			
 
				+

			
 
				+<script>

			
 
				+	/**

			
 
				+	 * 此组件存在的理由是，在nvue下，u-form被uni-app官方占用了，u-form在nvue中相当于form组件

			
 
				+	 * 所以在nvue下，取名为u--form，内部其实还是u-form.vue，只不过做一层中转

			
 
				+	 */

			
 
				+	import uvForm from '../u-form/u-form.vue';

			
 
				+	import props from '../u-form/props.js'
			
 
				+	export default {

			
 
				+		// #ifdef MP-WEIXIN

			
 
				+		name: 'u-form',

			
 
				+		// #endif

			
 
				+		// #ifndef MP-WEIXIN

			
 
				+		name: 'u--form',

			
 
				+		// #endif

			
 
				+		mixins: [uni.$u.mpMixin, props, uni.$u.mixin],

			
 
				+		components: {

			
 
				+			uvForm

			
 
				+		},

			
 
				+		created() {

			
 
				+			this.children = []

			
 
				+		},

			
 
				+		methods: {
			
 
				+			// 手动设置校验的规则，如果规则中有函数的话，微信小程序中会过滤掉，所以只能手动调用设置规则
			
 
				+			setRules(rules) {
			
 
				+				this.$refs.uForm.setRules(rules)
			
 
				+			},

			
 
				+			validate() {

			
 
				+				/**

			
 
				+				 * 在微信小程序中，通过this.$parent拿到的父组件是u--form，而不是其内嵌的u-form

			
 
				+				 * 导致在u-form组件中，拿不到对应的children数组，从而校验无效，所以这里每次调用u-form组件中的

			
 
				+				 * 对应方法的时候，在小程序中都先将u--form的children赋值给u-form中的children

			
 
				+				 */

			
 
				+				// #ifdef MP-WEIXIN

			
 
				+				this.setMpData()

			
 
				+				// #endif

			
 
				+				return this.$refs.uForm.validate()

			
 
				+			},

			
 
				+			validateField(value, callback, event) {

			
 
				+				// #ifdef MP-WEIXIN

			
 
				+				this.setMpData()

			
 
				+				// #endif

			
 
				+				return this.$refs.uForm.validateField(value, callback, event)

			
 
				+			},

			
 
				+			resetFields() {

			
 
				+				// #ifdef MP-WEIXIN

			
 
				+				this.setMpData()

			
 
				+				// #endif

			
 
				+				return this.$refs.uForm.resetFields()

			
 
				+			},

			
 
				+			clearValidate(props) {

			
 
				+				// #ifdef MP-WEIXIN

			
 
				+				this.setMpData()

			
 
				+				// #endif

			
 
				+				return this.$refs.uForm.clearValidate(props)

			
 
				+			},

			
 
				+			setMpData() {

			
 
				+				this.$refs.uForm.children = this.children

			
 
				+			}

			
 
				+		},

			
 
				+	}

			
 
				+</script>

			
--- a/uni_modules/uview-ui/components/u--image/u--image.vue
+++ b/uni_modules/uview-ui/components/u--image/u--image.vue
@@ -0,0 +1,47 @@
 
				+<template>

			
 
				+	<uvImage 

			
 
				+		:src="src"

			
 
				+		:mode="mode"

			
 
				+		:width="width"

			
 
				+		:height="height"

			
 
				+		:shape="shape"

			
 
				+		:radius="radius"

			
 
				+		:lazyLoad="lazyLoad"

			
 
				+		:showMenuByLongpress="showMenuByLongpress"

			
 
				+		:loadingIcon="loadingIcon"

			
 
				+		:errorIcon="errorIcon"

			
 
				+		:showLoading="showLoading"

			
 
				+		:showError="showError"

			
 
				+		:fade="fade"

			
 
				+		:webp="webp"

			
 
				+		:duration="duration"

			
 
				+		:bgColor="bgColor"

			
 
				+		:customStyle="customStyle"

			
 
				+		@click="$emit('click')"

			
 
				+		@error="$emit('error')"

			
 
				+		@load="$emit('load')"

			
 
				+	>
			
 
				+		<template v-slot:loading>
			
 
				+			<slot name="loading"></slot>
			
 
				+		</template>
			
 
				+		<template v-slot:error>
			
 
				+			<slot name="error"></slot>
			
 
				+		</template>
			
 
				+	</uvImage>

			
 
				+</template>

			
 
				+

			
 
				+<script>

			
 
				+	/**

			
 
				+	 * 此组件存在的理由是，在nvue下，u-image被uni-app官方占用了，u-image在nvue中相当于image组件

			
 
				+	 * 所以在nvue下，取名为u--image，内部其实还是u-iamge.vue，只不过做一层中转

			
 
				+	 */

			
 
				+	import uvImage from '../u-image/u-image.vue';

			
 
				+	import props from '../u-image/props.js';

			
 
				+	export default {

			
 
				+		name: 'u--image',

			
 
				+		mixins: [uni.$u.mpMixin, props, uni.$u.mixin],

			
 
				+		components: {

			
 
				+			uvImage

			
 
				+		},

			
 
				+	}

			
 
				+</script>
			
--- a/uni_modules/uview-ui/components/u--input/u--input.vue
+++ b/uni_modules/uview-ui/components/u--input/u--input.vue
@@ -0,0 +1,73 @@
 
				+<template>

			
 
				+	<uvInput 

			
 
				+		:value="value"

			
 
				+		:type="type"

			
 
				+		:fixed="fixed"

			
 
				+		:disabled="disabled"

			
 
				+		:disabledColor="disabledColor"

			
 
				+		:clearable="clearable"

			
 
				+		:password="password"

			
 
				+		:maxlength="maxlength"

			
 
				+		:placeholder="placeholder"

			
 
				+		:placeholderClass="placeholderClass"

			
 
				+		:placeholderStyle="placeholderStyle"

			
 
				+		:showWordLimit="showWordLimit"

			
 
				+		:confirmType="confirmType"

			
 
				+		:confirmHold="confirmHold"

			
 
				+		:holdKeyboard="holdKeyboard"

			
 
				+		:focus="focus"

			
 
				+		:autoBlur="autoBlur"

			
 
				+		:disableDefaultPadding="disableDefaultPadding"

			
 
				+		:cursor="cursor"

			
 
				+		:cursorSpacing="cursorSpacing"

			
 
				+		:selectionStart="selectionStart"

			
 
				+		:selectionEnd="selectionEnd"

			
 
				+		:adjustPosition="adjustPosition"

			
 
				+		:inputAlign="inputAlign"

			
 
				+		:fontSize="fontSize"

			
 
				+		:color="color"

			
 
				+		:prefixIcon="prefixIcon"

			
 
				+		:suffixIcon="suffixIcon"

			
 
				+		:suffixIconStyle="suffixIconStyle"

			
 
				+		:prefixIconStyle="prefixIconStyle"

			
 
				+		:border="border"

			
 
				+		:readonly="readonly"

			
 
				+		:shape="shape"

			
 
				+		:customStyle="customStyle"

			
 
				+		:formatter="formatter"

			
 
				+		:ignoreCompositionEvent="ignoreCompositionEvent"

			
 
				+		@focus="$emit('focus')"

			
 
				+		@blur="e => $emit('blur', e)"

			
 
				+		@keyboardheightchange="$emit('keyboardheightchange')"

			
 
				+		@change="e => $emit('change', e)"

			
 
				+		@input="e => $emit('input', e)"

			
 
				+		@confirm="e => $emit('confirm', e)"

			
 
				+		@clear="$emit('clear')"

			
 
				+		@click="$emit('click')"

			
 
				+	>

			
 
				+		<!-- #ifdef MP -->

			
 
				+		<slot name="prefix"></slot>

			
 
				+		<slot name="suffix"></slot>

			
 
				+		<!-- #endif -->

			
 
				+		<!-- #ifndef MP -->

			
 
				+		<slot name="prefix" slot="prefix"></slot>

			
 
				+		<slot name="suffix" slot="suffix"></slot>

			
 
				+		<!-- #endif -->

			
 
				+	</uvInput>

			
 
				+</template>

			
 
				+

			
 
				+<script>

			
 
				+	/**

			
 
				+	 * 此组件存在的理由是，在nvue下，u-input被uni-app官方占用了，u-input在nvue中相当于input组件

			
 
				+	 * 所以在nvue下，取名为u--input，内部其实还是u-input.vue，只不过做一层中转

			
 
				+	 */

			
 
				+	import uvInput from '../u-input/u-input.vue';

			
 
				+	import props from '../u-input/props.js'

			
 
				+	export default {

			
 
				+		name: 'u--input',

			
 
				+		mixins: [uni.$u.mpMixin, props, uni.$u.mixin],

			
 
				+		components: {

			
 
				+			uvInput

			
 
				+		},

			
 
				+	}

			
 
				+</script>
			
--- a/uni_modules/uview-ui/components/u--text/u--text.vue
+++ b/uni_modules/uview-ui/components/u--text/u--text.vue
@@ -0,0 +1,44 @@
 
				+<template>

			
 
				+    <uvText

			
 
				+        :type="type"

			
 
				+        :show="show"

			
 
				+        :text="text"

			
 
				+        :prefixIcon="prefixIcon"

			
 
				+        :suffixIcon="suffixIcon"

			
 
				+        :mode="mode"

			
 
				+        :href="href"

			
 
				+        :format="format"

			
 
				+        :call="call"

			
 
				+        :openType="openType"

			
 
				+        :bold="bold"

			
 
				+        :block="block"

			
 
				+        :lines="lines"

			
 
				+        :color="color"

			
 
				+		:decoration="decoration"

			
 
				+        :size="size"

			
 
				+        :iconStyle="iconStyle"

			
 
				+        :margin="margin"

			
 
				+        :lineHeight="lineHeight"

			
 
				+        :align="align"

			
 
				+        :wordWrap="wordWrap"

			
 
				+        :customStyle="customStyle"

			
 
				+        @click="$emit('click')"

			
 
				+    ></uvText>

			
 
				+</template>

			
 
				+

			
 
				+<script>

			
 
				+/**

			
 
				+ * 此组件存在的理由是，在nvue下，u-text被uni-app官方占用了，u-text在nvue中相当于input组件

			
 
				+ * 所以在nvue下，取名为u--input，内部其实还是u-text.vue，只不过做一层中转

			
 
				+ * 不使用v-bind="$attrs"，而是分开独立写传参，是因为微信小程序不支持此写法

			
 
				+ */

			
 
				+import uvText from "../u-text/u-text.vue";

			
 
				+import props from "../u-text/props.js";

			
 
				+export default {

			
 
				+    name: "u--text",

			
 
				+    mixins: [uni.$u.mpMixin, props, uni.$u.mixin],

			
 
				+    components: {

			
 
				+        uvText,

			
 
				+    },

			
 
				+};

			
 
				+</script>

			
--- a/uni_modules/uview-ui/components/u--textarea/u--textarea.vue
+++ b/uni_modules/uview-ui/components/u--textarea/u--textarea.vue
@@ -0,0 +1,48 @@
 
				+<template>

			
 
				+	<uvTextarea

			
 
				+		:value="value"

			
 
				+		:placeholder="placeholder"

			
 
				+		:height="height"

			
 
				+		:confirmType="confirmType"

			
 
				+		:disabled="disabled"

			
 
				+		:count="count"

			
 
				+		:focus="focus"

			
 
				+		:autoHeight="autoHeight"

			
 
				+		:fixed="fixed"

			
 
				+		:cursorSpacing="cursorSpacing"

			
 
				+		:cursor="cursor"

			
 
				+		:showConfirmBar="showConfirmBar"

			
 
				+		:selectionStart="selectionStart"

			
 
				+		:selectionEnd="selectionEnd"

			
 
				+		:adjustPosition="adjustPosition"

			
 
				+		:disableDefaultPadding="disableDefaultPadding"

			
 
				+		:holdKeyboard="holdKeyboard"

			
 
				+		:maxlength="maxlength"

			
 
				+		:border="border"

			
 
				+		:customStyle="customStyle"

			
 
				+		:formatter="formatter"

			
 
				+		:ignoreCompositionEvent="ignoreCompositionEvent"

			
 
				+		@focus="e => $emit('focus')"

			
 
				+		@blur="e => $emit('blur')"

			
 
				+		@linechange="e => $emit('linechange', e)"

			
 
				+		@confirm="e => $emit('confirm')"

			
 
				+		@input="e => $emit('input', e)"

			
 
				+		@keyboardheightchange="e => $emit('keyboardheightchange')"

			
 
				+	></uvTextarea>

			
 
				+</template>

			
 
				+

			
 
				+<script>

			
 
				+	/**

			
 
				+	 * 此组件存在的理由是，在nvue下，u--textarea被uni-app官方占用了，u-textarea在nvue中相当于textarea组件

			
 
				+	 * 所以在nvue下，取名为u--textarea，内部其实还是u-textarea.vue，只不过做一层中转

			
 
				+	 */

			
 
				+	import uvTextarea from '../u-textarea/u-textarea.vue';

			
 
				+	import props from '../u-textarea/props.js'

			
 
				+	export default {

			
 
				+		name: 'u--textarea',

			
 
				+		mixins: [uni.$u.mpMixin, props, uni.$u.mixin],

			
 
				+		components: {

			
 
				+			uvTextarea

			
 
				+		},

			
 
				+	}

			
 
				+</script>

			
--- a/uni_modules/uview-ui/components/u-action-sheet/props.js
+++ b/uni_modules/uview-ui/components/u-action-sheet/props.js
@@ -0,0 +1,54 @@
 
				+export default {
			
 
				+    props: {
			
 
				+        // 操作菜单是否展示 （默认false）
			
 
				+        show: {
			
 
				+            type: Boolean,
			
 
				+            default: uni.$u.props.actionSheet.show
			
 
				+        },
			
 
				+        // 标题
			
 
				+        title: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.actionSheet.title
			
 
				+        },
			
 
				+        // 选项上方的描述信息
			
 
				+        description: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.actionSheet.description
			
 
				+        },
			
 
				+        // 数据
			
 
				+        actions: {
			
 
				+            type: Array,
			
 
				+            default: uni.$u.props.actionSheet.actions
			
 
				+        },
			
 
				+        // 取消按钮的文字，不为空时显示按钮
			
 
				+        cancelText: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.actionSheet.cancelText
			
 
				+        },
			
 
				+        // 点击某个菜单项时是否关闭弹窗
			
 
				+        closeOnClickAction: {
			
 
				+            type: Boolean,
			
 
				+            default: uni.$u.props.actionSheet.closeOnClickAction
			
 
				+        },
			
 
				+        // 处理底部安全区（默认true）
			
 
				+        safeAreaInsetBottom: {
			
 
				+            type: Boolean,
			
 
				+            default: uni.$u.props.actionSheet.safeAreaInsetBottom
			
 
				+        },
			
 
				+        // 小程序的打开方式
			
 
				+        openType: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.actionSheet.openType
			
 
				+        },
			
 
				+        // 点击遮罩是否允许关闭 (默认true)
			
 
				+        closeOnClickOverlay: {
			
 
				+            type: Boolean,
			
 
				+            default: uni.$u.props.actionSheet.closeOnClickOverlay
			
 
				+        },
			
 
				+        // 圆角值
			
 
				+        round: {
			
 
				+            type: [Boolean, String, Number],
			
 
				+            default: uni.$u.props.actionSheet.round
			
 
				+        }
			
 
				+    }
			
 
				+}
			
--- a/uni_modules/uview-ui/components/u-action-sheet/u-action-sheet.vue
+++ b/uni_modules/uview-ui/components/u-action-sheet/u-action-sheet.vue
@@ -0,0 +1,278 @@
 
				+
			
 
				+<template>
			
 
				+	<u-popup
			
 
				+	    :show="show"
			
 
				+	    mode="bottom"
			
 
				+	    @close="closeHandler"
			
 
				+	    :safeAreaInsetBottom="safeAreaInsetBottom"
			
 
				+	    :round="round"
			
 
				+	>
			
 
				+		<view class="u-action-sheet">
			
 
				+			<view
			
 
				+			    class="u-action-sheet__header"
			
 
				+			    v-if="title"
			
 
				+			>
			
 
				+				<text class="u-action-sheet__header__title u-line-1">{{title}}</text>
			
 
				+				<view
			
 
				+				    class="u-action-sheet__header__icon-wrap"
			
 
				+				    @tap.stop="cancel"
			
 
				+				>
			
 
				+					<u-icon
			
 
				+					    name="close"
			
 
				+					    size="17"
			
 
				+					    color="#c8c9cc"
			
 
				+					    bold
			
 
				+					></u-icon>
			
 
				+				</view>
			
 
				+			</view>
			
 
				+			<text
			
 
				+			    class="u-action-sheet__description"
			
 
				+				:style="[{
			
 
				+					marginTop: `${title && description ? 0 : '18px'}`
			
 
				+				}]"
			
 
				+			    v-if="description"
			
 
				+			>{{description}}</text>
			
 
				+			<slot>
			
 
				+				<u-line v-if="description"></u-line>
			
 
				+				<view class="u-action-sheet__item-wrap">
			
 
				+					<template v-for="(item, index) in actions">
			
 
				+						<!-- #ifdef MP -->
			
 
				+						<button
			
 
				+						    :key="index"
			
 
				+						    class="u-reset-button"
			
 
				+						    :openType="item.openType"
			
 
				+						    @getuserinfo="onGetUserInfo"
			
 
				+						    @contact="onContact"
			
 
				+						    @getphonenumber="onGetPhoneNumber"
			
 
				+						    @error="onError"
			
 
				+						    @launchapp="onLaunchApp"
			
 
				+						    @opensetting="onOpenSetting"
			
 
				+						    :lang="lang"
			
 
				+						    :session-from="sessionFrom"
			
 
				+						    :send-message-title="sendMessageTitle"
			
 
				+						    :send-message-path="sendMessagePath"
			
 
				+						    :send-message-img="sendMessageImg"
			
 
				+						    :show-message-card="showMessageCard"
			
 
				+						    :app-parameter="appParameter"
			
 
				+						    @tap="selectHandler(index)"
			
 
				+						    :hover-class="!item.disabled && !item.loading ? 'u-action-sheet--hover' : ''"
			
 
				+						>
			
 
				+							<!-- #endif -->
			
 
				+							<view
			
 
				+							    class="u-action-sheet__item-wrap__item"
			
 
				+							    @tap.stop="selectHandler(index)"
			
 
				+							    :hover-class="!item.disabled && !item.loading ? 'u-action-sheet--hover' : ''"
			
 
				+							    :hover-stay-time="150"
			
 
				+							>
			
 
				+								<template v-if="!item.loading">
			
 
				+									<text
			
 
				+									    class="u-action-sheet__item-wrap__item__name"
			
 
				+									    :style="[itemStyle(index)]"
			
 
				+									>{{ item.name }}</text>
			
 
				+									<text
			
 
				+									    v-if="item.subname"
			
 
				+									    class="u-action-sheet__item-wrap__item__subname"
			
 
				+									>{{ item.subname }}</text>
			
 
				+								</template>
			
 
				+								<u-loading-icon
			
 
				+								    v-else
			
 
				+								    custom-class="van-action-sheet__loading"
			
 
				+								    size="18"
			
 
				+								    mode="circle"
			
 
				+								/>
			
 
				+							</view>
			
 
				+							<!-- #ifdef MP -->
			
 
				+						</button>
			
 
				+						<!-- #endif -->
			
 
				+						<u-line v-if="index !== actions.length - 1"></u-line>
			
 
				+					</template>
			
 
				+				</view>
			
 
				+			</slot>
			
 
				+			<u-gap
			
 
				+			    bgColor="#eaeaec"
			
 
				+			    height="6"
			
 
				+			    v-if="cancelText"
			
 
				+			></u-gap>
			
 
				+			<view hover-class="u-action-sheet--hover">
			
 
				+				<text
			
 
				+				    @touchmove.stop.prevent
			
 
				+				    :hover-stay-time="150"
			
 
				+				    v-if="cancelText"
			
 
				+				    class="u-action-sheet__cancel-text"
			
 
				+				    @tap="cancel"
			
 
				+				>{{cancelText}}</text>
			
 
				+			</view>
			
 
				+		</view>
			
 
				+	</u-popup>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+	import openType from '../../libs/mixin/openType'
			
 
				+	import button from '../../libs/mixin/button'
			
 
				+	import props from './props.js';
			
 
				+	/**
			
 
				+	 * ActionSheet 操作菜单
			
 
				+	 * @description 本组件用于从底部弹出一个操作菜单，供用户选择并返回结果。本组件功能类似于uni的uni.showActionSheetAPI，配置更加灵活，所有平台都表现一致。
			
 
				+	 * @tutorial https://www.uviewui.com/components/actionSheet.html
			
 
				+	 * 
			
 
				+	 * @property {Boolean}			show				操作菜单是否展示 （默认 false ）
			
 
				+	 * @property {String}			title				操作菜单标题
			
 
				+	 * @property {String}			description			选项上方的描述信息
			
 
				+	 * @property {Array<Object>}	actions				按钮的文字数组，见官方文档示例
			
 
				+	 * @property {String}			cancelText			取消按钮的提示文字,不为空时显示按钮
			
 
				+	 * @property {Boolean}			closeOnClickAction	点击某个菜单项时是否关闭弹窗 （默认 true ）
			
 
				+	 * @property {Boolean}			safeAreaInsetBottom	处理底部安全区 （默认 true ）
			
 
				+	 * @property {String}			openType			小程序的打开方式 (contact | launchApp | getUserInfo | openSetting ｜getPhoneNumber ｜error )
			
 
				+	 * @property {Boolean}			closeOnClickOverlay	点击遮罩是否允许关闭  (默认 true )
			
 
				+	 * @property {Number|String}	round				圆角值，默认无圆角  (默认 0 )
			
 
				+	 * @property {String}			lang				指定返回用户信息的语言，zh_CN 简体中文，zh_TW 繁体中文，en 英文
			
 
				+	 * @property {String}			sessionFrom			会话来源，openType="contact"时有效
			
 
				+	 * @property {String}			sendMessageTitle	会话内消息卡片标题，openType="contact"时有效
			
 
				+	 * @property {String}			sendMessagePath		会话内消息卡片点击跳转小程序路径，openType="contact"时有效
			
 
				+	 * @property {String}			sendMessageImg		会话内消息卡片图片，openType="contact"时有效
			
 
				+	 * @property {Boolean}			showMessageCard		是否显示会话内消息卡片，设置此参数为 true，用户进入客服会话会在右下角显示"可能要发送的小程序"提示，用户点击后可以快速发送小程序消息，openType="contact"时有效 （默认 false ）
			
 
				+	 * @property {String}			appParameter		打开 APP 时，向 APP 传递的参数，openType=launchApp 时有效
			
 
				+	 * 
			
 
				+	 * @event {Function} select			点击ActionSheet列表项时触发 
			
 
				+	 * @event {Function} close			点击取消按钮时触发
			
 
				+	 * @event {Function} getuserinfo	用户点击该按钮时，会返回获取到的用户信息，回调的 detail 数据与 wx.getUserInfo 返回的一致，openType="getUserInfo"时有效
			
 
				+	 * @event {Function} contact		客服消息回调，openType="contact"时有效
			
 
				+	 * @event {Function} getphonenumber	获取用户手机号回调，openType="getPhoneNumber"时有效
			
 
				+	 * @event {Function} error			当使用开放能力时，发生错误的回调，openType="error"时有效
			
 
				+	 * @event {Function} launchapp		打开 APP 成功的回调，openType="launchApp"时有效
			
 
				+	 * @event {Function} opensetting	在打开授权设置页后回调，openType="openSetting"时有效
			
 
				+	 * @example <u-action-sheet :actions="list" :title="title" :show="show"></u-action-sheet>
			
 
				+	 */
			
 
				+	export default {
			
 
				+		name: "u-action-sheet",
			
 
				+		// 一些props参数和methods方法，通过mixin混入，因为其他文件也会用到
			
 
				+		mixins: [openType, button, uni.$u.mixin, props],
			
 
				+		data() {
			
 
				+			return {
			
 
				+
			
 
				+			}
			
 
				+		},
			
 
				+		computed: {
			
 
				+			// 操作项目的样式
			
 
				+			itemStyle() {
			
 
				+				return (index) => {
			
 
				+					let style = {};
			
 
				+					if (this.actions[index].color) style.color = this.actions[index].color
			
 
				+					if (this.actions[index].fontSize) style.fontSize = uni.$u.addUnit(this.actions[index].fontSize)
			
 
				+					// 选项被禁用的样式
			
 
				+					if (this.actions[index].disabled) style.color = '#c0c4cc'
			
 
				+					return style;
			
 
				+				}
			
 
				+			},
			
 
				+		},
			
 
				+		methods: {
			
 
				+			closeHandler() {
			
 
				+				// 允许点击遮罩关闭时，才发出close事件
			
 
				+				if(this.closeOnClickOverlay) {
			
 
				+					this.$emit('close')
			
 
				+				}
			
 
				+			},
			
 
				+			// 点击取消按钮
			
 
				+			cancel() {
			
 
				+				this.$emit('close')
			
 
				+			},
			
 
				+			selectHandler(index) {
			
 
				+				const item = this.actions[index]
			
 
				+				if (item && !item.disabled && !item.loading) {
			
 
				+					this.$emit('select', item)
			
 
				+					if (this.closeOnClickAction) {
			
 
				+						this.$emit('close')
			
 
				+					}
			
 
				+				}
			
 
				+			},
			
 
				+		}
			
 
				+	}
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+	@import "../../libs/css/components.scss";
			
 
				+	$u-action-sheet-reset-button-width:100% !default;
			
 
				+	$u-action-sheet-title-font-size: 16px !default;
			
 
				+	$u-action-sheet-title-padding: 12px 30px !default;
			
 
				+	$u-action-sheet-title-color: $u-main-color !default;
			
 
				+	$u-action-sheet-header-icon-wrap-right:15px !default;
			
 
				+	$u-action-sheet-header-icon-wrap-top:15px !default;
			
 
				+	$u-action-sheet-description-font-size:13px !default;
			
 
				+	$u-action-sheet-description-color:14px !default;
			
 
				+	$u-action-sheet-description-margin: 18px 15px !default;
			
 
				+	$u-action-sheet-item-wrap-item-padding:15px !default;
			
 
				+	$u-action-sheet-item-wrap-name-font-size:16px !default;
			
 
				+	$u-action-sheet-item-wrap-subname-font-size:13px !default;
			
 
				+	$u-action-sheet-item-wrap-subname-color: #c0c4cc !default;
			
 
				+	$u-action-sheet-item-wrap-subname-margin-top:10px !default;
			
 
				+	$u-action-sheet-cancel-text-font-size:16px !default;
			
 
				+	$u-action-sheet-cancel-text-color:$u-content-color !default;
			
 
				+	$u-action-sheet-cancel-text-font-size:15px !default;
			
 
				+	$u-action-sheet-cancel-text-hover-background-color:rgb(242, 243, 245) !default;
			
 
				+
			
 
				+	.u-reset-button {
			
 
				+		width: $u-action-sheet-reset-button-width;
			
 
				+	}
			
 
				+
			
 
				+	.u-action-sheet {
			
 
				+		text-align: center;
			
 
				+		&__header {
			
 
				+			position: relative;
			
 
				+			padding: $u-action-sheet-title-padding;
			
 
				+			&__title {
			
 
				+				font-size: $u-action-sheet-title-font-size;
			
 
				+				color: $u-action-sheet-title-color;
			
 
				+				font-weight: bold;
			
 
				+				text-align: center;
			
 
				+			}
			
 
				+
			
 
				+			&__icon-wrap {
			
 
				+				position: absolute;
			
 
				+				right: $u-action-sheet-header-icon-wrap-right;
			
 
				+				top: $u-action-sheet-header-icon-wrap-top;
			
 
				+			}
			
 
				+		}
			
 
				+
			
 
				+		&__description {
			
 
				+			font-size: $u-action-sheet-description-font-size;
			
 
				+			color: $u-tips-color;
			
 
				+			margin: $u-action-sheet-description-margin;
			
 
				+			text-align: center;
			
 
				+		}
			
 
				+
			
 
				+		&__item-wrap {
			
 
				+
			
 
				+			&__item {
			
 
				+				padding: $u-action-sheet-item-wrap-item-padding;
			
 
				+				@include flex;
			
 
				+				align-items: center;
			
 
				+				justify-content: center;
			
 
				+				flex-direction: column;
			
 
				+
			
 
				+				&__name {
			
 
				+					font-size: $u-action-sheet-item-wrap-name-font-size;
			
 
				+					color: $u-main-color;
			
 
				+					text-align: center;
			
 
				+				}
			
 
				+
			
 
				+				&__subname {
			
 
				+					font-size: $u-action-sheet-item-wrap-subname-font-size;
			
 
				+					color: $u-action-sheet-item-wrap-subname-color;
			
 
				+					margin-top: $u-action-sheet-item-wrap-subname-margin-top;
			
 
				+					text-align: center;
			
 
				+				}
			
 
				+			}
			
 
				+		}
			
 
				+
			
 
				+		&__cancel-text {
			
 
				+			font-size: $u-action-sheet-cancel-text-font-size;
			
 
				+			color: $u-action-sheet-cancel-text-color;
			
 
				+			text-align: center;
			
 
				+			padding: $u-action-sheet-cancel-text-font-size;
			
 
				+		}
			
 
				+
			
 
				+		&--hover {
			
 
				+			background-color: $u-action-sheet-cancel-text-hover-background-color;
			
 
				+		}
			
 
				+	}
			
 
				+</style>
			
--- a/uni_modules/uview-ui/components/u-album/props.js
+++ b/uni_modules/uview-ui/components/u-album/props.js
@@ -0,0 +1,59 @@
 
				+export default {
			
 
				+    props: {
			
 
				+        // 图片地址，Array<String>|Array<Object>形式
			
 
				+        urls: {
			
 
				+            type: Array,
			
 
				+            default: uni.$u.props.album.urls
			
 
				+        },
			
 
				+        // 指定从数组的对象元素中读取哪个属性作为图片地址
			
 
				+        keyName: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.album.keyName
			
 
				+        },
			
 
				+        // 单图时，图片长边的长度
			
 
				+        singleSize: {
			
 
				+            type: [String, Number],
			
 
				+            default: uni.$u.props.album.singleSize
			
 
				+        },
			
 
				+        // 多图时，图片边长
			
 
				+        multipleSize: {
			
 
				+            type: [String, Number],
			
 
				+            default: uni.$u.props.album.multipleSize
			
 
				+        },
			
 
				+        // 多图时，图片水平和垂直之间的间隔
			
 
				+        space: {
			
 
				+            type: [String, Number],
			
 
				+            default: uni.$u.props.album.space
			
 
				+        },
			
 
				+        // 单图时，图片缩放裁剪的模式
			
 
				+        singleMode: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.album.singleMode
			
 
				+        },
			
 
				+        // 多图时，图片缩放裁剪的模式
			
 
				+        multipleMode: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.album.multipleMode
			
 
				+        },
			
 
				+        // 最多展示的图片数量，超出时最后一个位置将会显示剩余图片数量
			
 
				+        maxCount: {
			
 
				+            type: [String, Number],
			
 
				+            default: uni.$u.props.album.maxCount
			
 
				+        },
			
 
				+        // 是否可以预览图片
			
 
				+        previewFullImage: {
			
 
				+            type: Boolean,
			
 
				+            default: uni.$u.props.album.previewFullImage
			
 
				+        },
			
 
				+        // 每行展示图片数量，如设置，singleSize和multipleSize将会无效
			
 
				+        rowCount: {
			
 
				+            type: [String, Number],
			
 
				+            default: uni.$u.props.album.rowCount
			
 
				+        },
			
 
				+        // 超出maxCount时是否显示查看更多的提示
			
 
				+        showMore: {
			
 
				+            type: Boolean,
			
 
				+            default: uni.$u.props.album.showMore
			
 
				+        }
			
 
				+    }
			
 
				+}
			
--- a/uni_modules/uview-ui/components/u-album/u-album.vue
+++ b/uni_modules/uview-ui/components/u-album/u-album.vue
@@ -0,0 +1,259 @@
 
				+<template>
			
 
				+    <view class="u-album">
			
 
				+        <view
			
 
				+            class="u-album__row"
			
 
				+            ref="u-album__row"
			
 
				+            v-for="(arr, index) in showUrls"
			
 
				+            :forComputedUse="albumWidth"
			
 
				+            :key="index"
			
 
				+        >
			
 
				+            <view
			
 
				+                class="u-album__row__wrapper"
			
 
				+                v-for="(item, index1) in arr"
			
 
				+                :key="index1"
			
 
				+                :style="[imageStyle(index + 1, index1 + 1)]"
			
 
				+                @tap="previewFullImage ? onPreviewTap(getSrc(item)) : ''"
			
 
				+            >
			
 
				+                <image
			
 
				+                    :src="getSrc(item)"
			
 
				+                    :mode="
			
 
				+                        urls.length === 1
			
 
				+                            ? imageHeight > 0
			
 
				+                                ? singleMode
			
 
				+                                : 'widthFix'
			
 
				+                            : multipleMode
			
 
				+                    "
			
 
				+                    :style="[
			
 
				+                        {
			
 
				+                            width: imageWidth,
			
 
				+                            height: imageHeight
			
 
				+                        }
			
 
				+                    ]"
			
 
				+                ></image>
			
 
				+                <view
			
 
				+                    v-if="
			
 
				+                        showMore &&
			
 
				+                        urls.length > rowCount * showUrls.length &&
			
 
				+                        index === showUrls.length - 1 &&
			
 
				+                        index1 === showUrls[showUrls.length - 1].length - 1
			
 
				+                    "
			
 
				+                    class="u-album__row__wrapper__text"
			
 
				+                >
			
 
				+                    <u--text
			
 
				+                        :text="`+${urls.length - maxCount}`"
			
 
				+                        color="#fff"
			
 
				+                        :size="multipleSize * 0.3"
			
 
				+                        align="center"
			
 
				+                        customStyle="justify-content: center"
			
 
				+                    ></u--text>
			
 
				+                </view>
			
 
				+            </view>
			
 
				+        </view>
			
 
				+    </view>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+import props from './props.js'
			
 
				+// #ifdef APP-NVUE
			
 
				+// 由于weex为阿里的KPI业绩考核的产物，所以不支持百分比单位，这里需要通过dom查询组件的宽度
			
 
				+const dom = uni.requireNativePlugin('dom')
			
 
				+// #endif
			
 
				+
			
 
				+/**
			
 
				+ * Album 相册
			
 
				+ * @description 本组件提供一个类似相册的功能，让开发者开发起来更加得心应手。减少重复的模板代码
			
 
				+ * @tutorial https://www.uviewui.com/components/album.html
			
 
				+ *
			
 
				+ * @property {Array}           urls             图片地址列表 Array<String>|Array<Object>形式
			
 
				+ * @property {String}          keyName          指定从数组的对象元素中读取哪个属性作为图片地址
			
 
				+ * @property {String | Number} singleSize       单图时，图片长边的长度  （默认 180 ）
			
 
				+ * @property {String | Number} multipleSize     多图时，图片边长 （默认 70 ）
			
 
				+ * @property {String | Number} space            多图时，图片水平和垂直之间的间隔 （默认 6 ）
			
 
				+ * @property {String}          singleMode       单图时，图片缩放裁剪的模式 （默认 'scaleToFill' ）
			
 
				+ * @property {String}          multipleMode     多图时，图片缩放裁剪的模式 （默认 'aspectFill' ）
			
 
				+ * @property {String | Number} maxCount         取消按钮的提示文字 （默认 9 ）
			
 
				+ * @property {Boolean}         previewFullImage 是否可以预览图片 （默认 true ）
			
 
				+ * @property {String | Number} rowCount         每行展示图片数量，如设置，singleSize和multipleSize将会无效	（默认 3 ）
			
 
				+ * @property {Boolean}         showMore         超出maxCount时是否显示查看更多的提示 （默认 true ）
			
 
				+ *
			
 
				+ * @event    {Function}        albumWidth       某些特殊的情况下，需要让文字与相册的宽度相等，这里事件的形式对外发送  （回调参数 width ）
			
 
				+ * @example <u-album :urls="urls2" @albumWidth="width => albumWidth = width" multipleSize="68" ></u-album>
			
 
				+ */
			
 
				+export default {
			
 
				+    name: 'u-album',
			
 
				+    mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
			
 
				+    data() {
			
 
				+        return {
			
 
				+            // 单图的宽度
			
 
				+            singleWidth: 0,
			
 
				+            // 单图的高度
			
 
				+            singleHeight: 0,
			
 
				+            // 单图时，如果无法获取图片的尺寸信息，让图片宽度默认为容器的一定百分比
			
 
				+            singlePercent: 0.6
			
 
				+        }
			
 
				+    },
			
 
				+    watch: {
			
 
				+        urls: {
			
 
				+            immediate: true,
			
 
				+            handler(newVal) {
			
 
				+                if (newVal.length === 1) {
			
 
				+                    this.getImageRect()
			
 
				+                }
			
 
				+            }
			
 
				+        }
			
 
				+    },
			
 
				+    computed: {
			
 
				+        imageStyle() {
			
 
				+            return (index1, index2) => {
			
 
				+                const { space, rowCount, multipleSize, urls } = this,
			
 
				+                    { addUnit, addStyle } = uni.$u,
			
 
				+                    rowLen = this.showUrls.length,
			
 
				+                    allLen = this.urls.length
			
 
				+                const style = {
			
 
				+                    marginRight: addUnit(space),
			
 
				+                    marginBottom: addUnit(space)
			
 
				+                }
			
 
				+                // 如果为最后一行，则每个图片都无需下边框
			
 
				+                if (index1 === rowLen) style.marginBottom = 0
			
 
				+                // 每行的最右边一张和总长度的最后一张无需右边框
			
 
				+                if (
			
 
				+                    index2 === rowCount ||
			
 
				+                    (index1 === rowLen &&
			
 
				+                        index2 === this.showUrls[index1 - 1].length)
			
 
				+                )
			
 
				+                    style.marginRight = 0
			
 
				+                return style
			
 
				+            }
			
 
				+        },
			
 
				+        // 将数组划分为二维数组
			
 
				+        showUrls() {
			
 
				+            const arr = []
			
 
				+            this.urls.map((item, index) => {
			
 
				+                // 限制最大展示数量
			
 
				+                if (index + 1 <= this.maxCount) {
			
 
				+                    // 计算该元素为第几个素组内
			
 
				+                    const itemIndex = Math.floor(index / this.rowCount)
			
 
				+                    // 判断对应的索引是否存在
			
 
				+                    if (!arr[itemIndex]) {
			
 
				+                        arr[itemIndex] = []
			
 
				+                    }
			
 
				+                    arr[itemIndex].push(item)
			
 
				+                }
			
 
				+            })
			
 
				+            return arr
			
 
				+        },
			
 
				+        imageWidth() {
			
 
				+            return uni.$u.addUnit(
			
 
				+                this.urls.length === 1 ? this.singleWidth : this.multipleSize
			
 
				+            )
			
 
				+        },
			
 
				+        imageHeight() {
			
 
				+            return uni.$u.addUnit(
			
 
				+                this.urls.length === 1 ? this.singleHeight : this.multipleSize
			
 
				+            )
			
 
				+        },
			
 
				+        // 此变量无实际用途，仅仅是为了利用computed特性，让其在urls长度等变化时，重新计算图片的宽度
			
 
				+        // 因为用户在某些特殊的情况下，需要让文字与相册的宽度相等，所以这里事件的形式对外发送
			
 
				+        albumWidth() {
			
 
				+            let width = 0
			
 
				+            if (this.urls.length === 1) {
			
 
				+                width = this.singleWidth
			
 
				+            } else {
			
 
				+                width =
			
 
				+                    this.showUrls[0].length * this.multipleSize +
			
 
				+                    this.space * (this.showUrls[0].length - 1)
			
 
				+            }
			
 
				+            this.$emit('albumWidth', width)
			
 
				+            return width
			
 
				+        }
			
 
				+    },
			
 
				+    methods: {
			
 
				+        // 预览图片
			
 
				+        onPreviewTap(url) {
			
 
				+            const urls = this.urls.map((item) => {
			
 
				+                return this.getSrc(item)
			
 
				+            })
			
 
				+            uni.previewImage({
			
 
				+                current: url,
			
 
				+                urls
			
 
				+            })
			
 
				+        },
			
 
				+        // 获取图片的路径
			
 
				+        getSrc(item) {
			
 
				+            return uni.$u.test.object(item)
			
 
				+                ? (this.keyName && item[this.keyName]) || item.src
			
 
				+                : item
			
 
				+        },
			
 
				+        // 单图时，获取图片的尺寸
			
 
				+        // 在小程序中，需要将网络图片的的域名添加到小程序的download域名才可能获取尺寸
			
 
				+        // 在没有添加的情况下，让单图宽度默认为盒子的一定宽度(singlePercent)
			
 
				+        getImageRect() {
			
 
				+            const src = this.getSrc(this.urls[0])
			
 
				+            uni.getImageInfo({
			
 
				+                src,
			
 
				+                success: (res) => {
			
 
				+                    // 判断图片横向还是竖向展示方式
			
 
				+                    const isHorizotal = res.width >= res.height
			
 
				+                    this.singleWidth = isHorizotal
			
 
				+                        ? this.singleSize
			
 
				+                        : (res.width / res.height) * this.singleSize
			
 
				+                    this.singleHeight = !isHorizotal
			
 
				+                        ? this.singleSize
			
 
				+                        : (res.height / res.width) * this.singleWidth
			
 
				+                },
			
 
				+                fail: () => {
			
 
				+                    this.getComponentWidth()
			
 
				+                }
			
 
				+            })
			
 
				+        },
			
 
				+        // 获取组件的宽度
			
 
				+        async getComponentWidth() {
			
 
				+            // 延时一定时间，以获取dom尺寸
			
 
				+            await uni.$u.sleep(30)
			
 
				+            // #ifndef APP-NVUE
			
 
				+            this.$uGetRect('.u-album__row').then((size) => {
			
 
				+                this.singleWidth = size.width * this.singlePercent
			
 
				+            })
			
 
				+            // #endif
			
 
				+
			
 
				+            // #ifdef APP-NVUE
			
 
				+            // 这里ref="u-album__row"所在的标签为通过for循环出来，导致this.$refs['u-album__row']是一个数组
			
 
				+            const ref = this.$refs['u-album__row'][0]
			
 
				+            ref &&
			
 
				+                dom.getComponentRect(ref, (res) => {
			
 
				+                    this.singleWidth = res.size.width * this.singlePercent
			
 
				+                })
			
 
				+            // #endif
			
 
				+        }
			
 
				+    }
			
 
				+}
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+@import '../../libs/css/components.scss';
			
 
				+
			
 
				+.u-album {
			
 
				+    @include flex(column);
			
 
				+
			
 
				+    &__row {
			
 
				+        @include flex(row);
			
 
				+        flex-wrap: wrap;
			
 
				+
			
 
				+        &__wrapper {
			
 
				+            position: relative;
			
 
				+
			
 
				+            &__text {
			
 
				+                position: absolute;
			
 
				+                top: 0;
			
 
				+                left: 0;
			
 
				+                right: 0;
			
 
				+                bottom: 0;
			
 
				+                background-color: rgba(0, 0, 0, 0.3);
			
 
				+                @include flex(row);
			
 
				+                justify-content: center;
			
 
				+                align-items: center;
			
 
				+            }
			
 
				+        }
			
 
				+    }
			
 
				+}
			
 
				+</style>
			
--- a/uni_modules/uview-ui/components/u-alert/props.js
+++ b/uni_modules/uview-ui/components/u-alert/props.js
@@ -0,0 +1,44 @@
 
				+export default {

			
 
				+    props: {

			
 
				+        // 显示文字

			
 
				+        title: {

			
 
				+            type: String,

			
 
				+            default: uni.$u.props.alert.title

			
 
				+        },

			
 
				+        // 主题，success/warning/info/error

			
 
				+        type: {

			
 
				+            type: String,

			
 
				+            default: uni.$u.props.alert.type

			
 
				+        },

			
 
				+        // 辅助性文字

			
 
				+        description: {

			
 
				+            type: String,

			
 
				+            default: uni.$u.props.alert.description

			
 
				+        },

			
 
				+        // 是否可关闭

			
 
				+        closable: {

			
 
				+            type: Boolean,

			
 
				+            default: uni.$u.props.alert.closable

			
 
				+        },

			
 
				+        // 是否显示图标

			
 
				+        showIcon: {

			
 
				+            type: Boolean,

			
 
				+            default: uni.$u.props.alert.showIcon

			
 
				+        },

			
 
				+        // 浅或深色调，light-浅色，dark-深色

			
 
				+        effect: {

			
 
				+            type: String,

			
 
				+            default: uni.$u.props.alert.effect

			
 
				+        },

			
 
				+        // 文字是否居中

			
 
				+        center: {

			
 
				+            type: Boolean,

			
 
				+            default: uni.$u.props.alert.center

			
 
				+        },

			
 
				+        // 字体大小

			
 
				+        fontSize: {

			
 
				+            type: [String, Number],

			
 
				+            default: uni.$u.props.alert.fontSize

			
 
				+        }

			
 
				+    }

			
 
				+}

			
--- a/uni_modules/uview-ui/components/u-alert/u-alert.vue
+++ b/uni_modules/uview-ui/components/u-alert/u-alert.vue
@@ -0,0 +1,243 @@
 
				+<template>
			
 
				+	<u-transition
			
 
				+	    mode="fade"
			
 
				+	    :show="show"
			
 
				+	>
			
 
				+		<view
			
 
				+		    class="u-alert"
			
 
				+		    :class="[`u-alert--${type}--${effect}`]"
			
 
				+		    @tap.stop="clickHandler"
			
 
				+		    :style="[$u.addStyle(customStyle)]"
			
 
				+		>
			
 
				+			<view
			
 
				+			    class="u-alert__icon"
			
 
				+			    v-if="showIcon"
			
 
				+			>
			
 
				+				<u-icon
			
 
				+				    :name="iconName"
			
 
				+				    size="18"
			
 
				+				    :color="iconColor"
			
 
				+				></u-icon>
			
 
				+			</view>
			
 
				+			<view
			
 
				+			    class="u-alert__content"
			
 
				+			    :style="[{
			
 
				+					paddingRight: closable ? '20px' : 0
			
 
				+				}]"
			
 
				+			>
			
 
				+				<text
			
 
				+				    class="u-alert__content__title"
			
 
				+				    v-if="title"
			
 
				+					:style="[{
			
 
				+						fontSize: $u.addUnit(fontSize),
			
 
				+						textAlign: center ? 'center' : 'left'
			
 
				+					}]"
			
 
				+				    :class="[effect === 'dark' ? 'u-alert__text--dark' : `u-alert__text--${type}--light`]"
			
 
				+				>{{ title }}</text>
			
 
				+				<text
			
 
				+				    class="u-alert__content__desc"
			
 
				+					v-if="description"
			
 
				+					:style="[{
			
 
				+						fontSize: $u.addUnit(fontSize),
			
 
				+						textAlign: center ? 'center' : 'left'
			
 
				+					}]"
			
 
				+				    :class="[effect === 'dark' ? 'u-alert__text--dark' : `u-alert__text--${type}--light`]"
			
 
				+				>{{ description }}</text>
			
 
				+			</view>
			
 
				+			<view
			
 
				+			    class="u-alert__close"
			
 
				+			    v-if="closable"
			
 
				+			    @tap.stop="closeHandler"
			
 
				+			>
			
 
				+				<u-icon
			
 
				+				    name="close"
			
 
				+				    :color="iconColor"
			
 
				+				    size="15"
			
 
				+				></u-icon>
			
 
				+			</view>
			
 
				+		</view>
			
 
				+	</u-transition>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+	import props from './props.js';
			
 
				+	/**
			
 
				+	 * Alert  警告提示
			
 
				+	 * @description 警告提示，展现需要关注的信息。
			
 
				+	 * @tutorial https://www.uviewui.com/components/alertTips.html
			
 
				+	 * 
			
 
				+	 * @property {String}			title       显示的文字 
			
 
				+	 * @property {String}			type        使用预设的颜色  （默认 'warning' ）
			
 
				+	 * @property {String}			description 辅助性文字，颜色比title浅一点，字号也小一点，可选  
			
 
				+	 * @property {Boolean}			closable    关闭按钮(默认为叉号icon图标)  （默认 false ）
			
 
				+	 * @property {Boolean}			showIcon    是否显示左边的辅助图标   （ 默认 false ）
			
 
				+	 * @property {String}			effect      多图时，图片缩放裁剪的模式  （默认 'light' ）
			
 
				+	 * @property {Boolean}			center		文字是否居中  （默认 false ）
			
 
				+	 * @property {String | Number}	fontSize    字体大小  （默认 14 ）
			
 
				+	 * @property {Object}			customStyle	定义需要用到的外部样式
			
 
				+	 * @event    {Function}        click       点击组件时触发
			
 
				+	 * @example  <u-alert :title="title"  type = "warning" :closable="closable" :description = "description"></u-alert>
			
 
				+	 */
			
 
				+	export default {
			
 
				+		name: 'u-alert',
			
 
				+		mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
			
 
				+		data() {
			
 
				+			return {
			
 
				+				show: true
			
 
				+			}
			
 
				+		},
			
 
				+		computed: {
			
 
				+			iconColor() {
			
 
				+				return this.effect === 'light' ? this.type : '#fff'
			
 
				+			},
			
 
				+			// 不同主题对应不同的图标
			
 
				+			iconName() {
			
 
				+				switch (this.type) {
			
 
				+					case 'success':
			
 
				+						return 'checkmark-circle-fill';
			
 
				+						break;
			
 
				+					case 'error':
			
 
				+						return 'close-circle-fill';
			
 
				+						break;
			
 
				+					case 'warning':
			
 
				+						return 'error-circle-fill';
			
 
				+						break;
			
 
				+					case 'info':
			
 
				+						return 'info-circle-fill';
			
 
				+						break;
			
 
				+					case 'primary':
			
 
				+						return 'more-circle-fill';
			
 
				+						break;
			
 
				+					default: 
			
 
				+						return 'error-circle-fill';
			
 
				+				}
			
 
				+			}
			
 
				+		},
			
 
				+		methods: {
			
 
				+			// 点击内容
			
 
				+			clickHandler() {
			
 
				+				this.$emit('click')
			
 
				+			},
			
 
				+			// 点击关闭按钮
			
 
				+			closeHandler() {
			
 
				+				this.show = false
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+	@import "../../libs/css/components.scss";
			
 
				+
			
 
				+	.u-alert {
			
 
				+		position: relative;
			
 
				+		background-color: $u-primary;
			
 
				+		padding: 8px 10px;
			
 
				+		@include flex(row);
			
 
				+		align-items: center;
			
 
				+		border-top-left-radius: 4px;
			
 
				+		border-top-right-radius: 4px;
			
 
				+		border-bottom-left-radius: 4px;
			
 
				+		border-bottom-right-radius: 4px;
			
 
				+
			
 
				+		&--primary--dark {
			
 
				+			background-color: $u-primary;
			
 
				+		}
			
 
				+
			
 
				+		&--primary--light {
			
 
				+			background-color: #ecf5ff;
			
 
				+		}
			
 
				+
			
 
				+		&--error--dark {
			
 
				+			background-color: $u-error;
			
 
				+		}
			
 
				+
			
 
				+		&--error--light {
			
 
				+			background-color: #FEF0F0;
			
 
				+		}
			
 
				+
			
 
				+		&--success--dark {
			
 
				+			background-color: $u-success;
			
 
				+		}
			
 
				+
			
 
				+		&--success--light {
			
 
				+			background-color: #f5fff0;
			
 
				+		}
			
 
				+
			
 
				+		&--warning--dark {
			
 
				+			background-color: $u-warning;
			
 
				+		}
			
 
				+
			
 
				+		&--warning--light {
			
 
				+			background-color: #FDF6EC;
			
 
				+		}
			
 
				+
			
 
				+		&--info--dark {
			
 
				+			background-color: $u-info;
			
 
				+		}
			
 
				+
			
 
				+		&--info--light {
			
 
				+			background-color: #f4f4f5;
			
 
				+		}
			
 
				+
			
 
				+		&__icon {
			
 
				+			margin-right: 5px;
			
 
				+		}
			
 
				+
			
 
				+		&__content {
			
 
				+			@include flex(column);
			
 
				+			flex: 1;
			
 
				+
			
 
				+			&__title {
			
 
				+				color: $u-main-color;
			
 
				+				font-size: 14px;
			
 
				+				font-weight: bold;
			
 
				+				color: #fff;
			
 
				+				margin-bottom: 2px;
			
 
				+			}
			
 
				+
			
 
				+			&__desc {
			
 
				+				color: $u-main-color;
			
 
				+				font-size: 14px;
			
 
				+				flex-wrap: wrap;
			
 
				+				color: #fff;
			
 
				+			}
			
 
				+		}
			
 
				+
			
 
				+		&__title--dark,
			
 
				+		&__desc--dark {
			
 
				+			color: #FFFFFF;
			
 
				+		}
			
 
				+
			
 
				+		&__text--primary--light,
			
 
				+		&__text--primary--light {
			
 
				+			color: $u-primary;
			
 
				+		}
			
 
				+
			
 
				+		&__text--success--light,
			
 
				+		&__text--success--light {
			
 
				+			color: $u-success;
			
 
				+		}
			
 
				+
			
 
				+		&__text--warning--light,
			
 
				+		&__text--warning--light {
			
 
				+			color: $u-warning;
			
 
				+		}
			
 
				+
			
 
				+		&__text--error--light,
			
 
				+		&__text--error--light {
			
 
				+			color: $u-error;
			
 
				+		}
			
 
				+
			
 
				+		&__text--info--light,
			
 
				+		&__text--info--light {
			
 
				+			color: $u-info;
			
 
				+		}
			
 
				+
			
 
				+		&__close {
			
 
				+			position: absolute;
			
 
				+			top: 11px;
			
 
				+			right: 10px;
			
 
				+		}
			
 
				+	}
			
 
				+</style>
			
--- a/uni_modules/uview-ui/components/u-avatar-group/props.js
+++ b/uni_modules/uview-ui/components/u-avatar-group/props.js
@@ -0,0 +1,52 @@
 
				+export default {
			
 
				+    props: {
			
 
				+        // 头像图片组
			
 
				+        urls: {
			
 
				+            type: Array,
			
 
				+            default: uni.$u.props.avatarGroup.urls
			
 
				+        },
			
 
				+        // 最多展示的头像数量
			
 
				+        maxCount: {
			
 
				+            type: [String, Number],
			
 
				+            default: uni.$u.props.avatarGroup.maxCount
			
 
				+        },
			
 
				+        // 头像形状
			
 
				+        shape: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.avatarGroup.shape
			
 
				+        },
			
 
				+        // 图片裁剪模式
			
 
				+        mode: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.avatarGroup.mode
			
 
				+        },
			
 
				+        // 超出maxCount时是否显示查看更多的提示
			
 
				+        showMore: {
			
 
				+            type: Boolean,
			
 
				+            default: uni.$u.props.avatarGroup.showMore
			
 
				+        },
			
 
				+        // 头像大小
			
 
				+        size: {
			
 
				+            type: [String, Number],
			
 
				+            default: uni.$u.props.avatarGroup.size
			
 
				+        },
			
 
				+        // 指定从数组的对象元素中读取哪个属性作为图片地址
			
 
				+        keyName: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.avatarGroup.keyName
			
 
				+        },
			
 
				+		// 头像之间的遮挡比例
			
 
				+        gap: {
			
 
				+            type: [String, Number],
			
 
				+            validator(value) {
			
 
				+                return value >= 0 && value <= 1
			
 
				+            },
			
 
				+            default: uni.$u.props.avatarGroup.gap
			
 
				+        },
			
 
				+		// 需额外显示的值
			
 
				+		extraValue: {
			
 
				+			type: [Number, String],
			
 
				+			default: uni.$u.props.avatarGroup.extraValue
			
 
				+		}
			
 
				+    }
			
 
				+}
			
--- a/uni_modules/uview-ui/components/u-avatar-group/u-avatar-group.vue
+++ b/uni_modules/uview-ui/components/u-avatar-group/u-avatar-group.vue
@@ -0,0 +1,103 @@
 
				+<template>
			
 
				+	<view class="u-avatar-group">
			
 
				+		<view
			
 
				+		    class="u-avatar-group__item"
			
 
				+		    v-for="(item, index) in showUrl"
			
 
				+		    :key="index"
			
 
				+		    :style="{
			
 
				+				marginLeft: index === 0 ? 0 : $u.addUnit(-size * gap)
			
 
				+			}"
			
 
				+		>
			
 
				+			<u-avatar
			
 
				+			    :size="size"
			
 
				+			    :shape="shape"
			
 
				+			    :mode="mode"
			
 
				+			    :src="$u.test.object(item) ? keyName && item[keyName] || item.url : item"
			
 
				+			></u-avatar>
			
 
				+			<view
			
 
				+			    class="u-avatar-group__item__show-more"
			
 
				+			    v-if="showMore && index === showUrl.length - 1 && (urls.length > maxCount || extraValue > 0)"
			
 
				+				@tap="clickHandler"
			
 
				+			>
			
 
				+				<u--text
			
 
				+				    color="#ffffff"
			
 
				+				    :size="size * 0.4"
			
 
				+				    :text="`+${extraValue || urls.length - showUrl.length}`"
			
 
				+					align="center"
			
 
				+					customStyle="justify-content: center"
			
 
				+				></u--text>
			
 
				+			</view>
			
 
				+		</view>
			
 
				+	</view>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+	import props from './props.js';
			
 
				+	/**
			
 
				+	 * AvatarGroup  头像组
			
 
				+	 * @description 本组件一般用于展示头像的地方，如个人中心，或者评论列表页的用户头像展示等场所。
			
 
				+	 * @tutorial https://www.uviewui.com/components/avatar.html
			
 
				+	 * 
			
 
				+	 * @property {Array}           urls     头像图片组 （默认 [] ）
			
 
				+	 * @property {String | Number} maxCount 最多展示的头像数量 （ 默认 5 ）
			
 
				+	 * @property {String}          shape    头像形状（ 'circle' (默认) | 'square' ）
			
 
				+	 * @property {String}          mode     图片裁剪模式（默认 'scaleToFill' ）
			
 
				+	 * @property {Boolean}         showMore 超出maxCount时是否显示查看更多的提示 （默认 true ）
			
 
				+	 * @property {String | Number} size      头像大小 （默认 40 ）
			
 
				+	 * @property {String}          keyName  指定从数组的对象元素中读取哪个属性作为图片地址 
			
 
				+	 * @property {String | Number} gap      头像之间的遮挡比例（0.4代表遮挡40%）  （默认 0.5 ）
			
 
				+	 * @property {String | Number} extraValue  需额外显示的值
			
 
				+	 * @event    {Function}        showMore 头像组更多点击
			
 
				+	 * @example  <u-avatar-group:urls="urls" size="35" gap="0.4" ></u-avatar-group:urls=>
			
 
				+	 */
			
 
				+	export default {
			
 
				+		name: 'u-avatar-group',
			
 
				+		mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
			
 
				+		data() {
			
 
				+			return {
			
 
				+
			
 
				+			}
			
 
				+		},
			
 
				+		computed: {
			
 
				+			showUrl() {
			
 
				+				return this.urls.slice(0, this.maxCount)
			
 
				+			}
			
 
				+		},
			
 
				+		methods: {
			
 
				+			clickHandler() {
			
 
				+				this.$emit('showMore')
			
 
				+			}
			
 
				+		},
			
 
				+	}
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+	@import "../../libs/css/components.scss";
			
 
				+
			
 
				+	.u-avatar-group {
			
 
				+		@include flex;
			
 
				+
			
 
				+		&__item {
			
 
				+			margin-left: -10px;
			
 
				+			position: relative;
			
 
				+
			
 
				+			&--no-indent {
			
 
				+				// 如果你想质疑作者不会使用:first-child，说明你太年轻，因为nvue不支持
			
 
				+				margin-left: 0;
			
 
				+			}
			
 
				+
			
 
				+			&__show-more {
			
 
				+				position: absolute;
			
 
				+				top: 0;
			
 
				+				bottom: 0;
			
 
				+				left: 0;
			
 
				+				right: 0;
			
 
				+				background-color: rgba(0, 0, 0, 0.3);
			
 
				+				@include flex;
			
 
				+				align-items: center;
			
 
				+				justify-content: center;
			
 
				+				border-radius: 100px;
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+</style>
			
--- a/uni_modules/uview-ui/components/u-avatar/props.js
+++ b/uni_modules/uview-ui/components/u-avatar/props.js
@@ -0,0 +1,78 @@
 
				+export default {
			
 
				+    props: {
			
 
				+        // 头像图片路径(不能为相对路径)
			
 
				+        src: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.avatar.src
			
 
				+        },
			
 
				+        // 头像形状，circle-圆形，square-方形
			
 
				+        shape: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.avatar.shape
			
 
				+        },
			
 
				+        // 头像尺寸
			
 
				+        size: {
			
 
				+            type: [String, Number],
			
 
				+            default: uni.$u.props.avatar.size
			
 
				+        },
			
 
				+        // 裁剪模式
			
 
				+        mode: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.avatar.mode
			
 
				+        },
			
 
				+        // 显示的文字
			
 
				+        text: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.avatar.text
			
 
				+        },
			
 
				+        // 背景色
			
 
				+        bgColor: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.avatar.bgColor
			
 
				+        },
			
 
				+        // 文字颜色
			
 
				+        color: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.avatar.color
			
 
				+        },
			
 
				+        // 文字大小
			
 
				+        fontSize: {
			
 
				+            type: [String, Number],
			
 
				+            default: uni.$u.props.avatar.fontSize
			
 
				+        },
			
 
				+        // 显示的图标
			
 
				+        icon: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.avatar.icon
			
 
				+        },
			
 
				+        // 显示小程序头像，只对百度，微信，QQ小程序有效
			
 
				+        mpAvatar: {
			
 
				+            type: Boolean,
			
 
				+            default: uni.$u.props.avatar.mpAvatar
			
 
				+        },
			
 
				+        // 是否使用随机背景色
			
 
				+        randomBgColor: {
			
 
				+            type: Boolean,
			
 
				+            default: uni.$u.props.avatar.randomBgColor
			
 
				+        },
			
 
				+        // 加载失败的默认头像(组件有内置默认图片)
			
 
				+        defaultUrl: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.avatar.defaultUrl
			
 
				+        },
			
 
				+        // 如果配置了randomBgColor为true，且配置了此值，则从默认的背景色数组中取出对应索引的颜色值，取值0-19之间
			
 
				+        colorIndex: {
			
 
				+            type: [String, Number],
			
 
				+            // 校验参数规则，索引在0-19之间
			
 
				+            validator(n) {
			
 
				+                return uni.$u.test.range(n, [0, 19]) || n === ''
			
 
				+            },
			
 
				+            default: uni.$u.props.avatar.colorIndex
			
 
				+        },
			
 
				+        // 组件标识符
			
 
				+        name: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.avatar.name
			
 
				+        }
			
 
				+    }
			
 
				+}
			
--- a/uni_modules/uview-ui/components/u-avatar/u-avatar.vue
+++ b/uni_modules/uview-ui/components/u-avatar/u-avatar.vue
--- a/uni_modules/uview-ui/components/u-back-top/props.js
+++ b/uni_modules/uview-ui/components/u-back-top/props.js
@@ -0,0 +1,54 @@
 
				+export default {
			
 
				+    props: {
			
 
				+        // 返回顶部的形状，circle-圆形，square-方形
			
 
				+        mode: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.backtop.mode
			
 
				+        },
			
 
				+        // 自定义图标
			
 
				+        icon: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.backtop.icon
			
 
				+        },
			
 
				+        // 提示文字
			
 
				+        text: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.backtop.text
			
 
				+        },
			
 
				+        // 返回顶部滚动时间
			
 
				+        duration: {
			
 
				+            type: [String, Number],
			
 
				+            default: uni.$u.props.backtop.duration
			
 
				+        },
			
 
				+        // 滚动距离
			
 
				+        scrollTop: {
			
 
				+            type: [String, Number],
			
 
				+            default: uni.$u.props.backtop.scrollTop
			
 
				+        },
			
 
				+        // 距离顶部多少距离显示，单位px
			
 
				+        top: {
			
 
				+            type: [String, Number],
			
 
				+            default: uni.$u.props.backtop.top
			
 
				+        },
			
 
				+        // 返回顶部按钮到底部的距离，单位px
			
 
				+        bottom: {
			
 
				+            type: [String, Number],
			
 
				+            default: uni.$u.props.backtop.bottom
			
 
				+        },
			
 
				+        // 返回顶部按钮到右边的距离，单位px
			
 
				+        right: {
			
 
				+            type: [String, Number],
			
 
				+            default: uni.$u.props.backtop.right
			
 
				+        },
			
 
				+        // 层级
			
 
				+        zIndex: {
			
 
				+            type: [String, Number],
			
 
				+            default: uni.$u.props.backtop.zIndex
			
 
				+        },
			
 
				+        // 图标的样式，对象形式
			
 
				+        iconStyle: {
			
 
				+            type: Object,
			
 
				+            default: uni.$u.props.backtop.iconStyle
			
 
				+        }
			
 
				+    }
			
 
				+}
			
--- a/uni_modules/uview-ui/components/u-back-top/u-back-top.vue
+++ b/uni_modules/uview-ui/components/u-back-top/u-back-top.vue
@@ -0,0 +1,129 @@
 
				+<template>
			
 
				+	<u-transition
			
 
				+	    mode="fade"
			
 
				+	    :customStyle="backTopStyle"
			
 
				+	    :show="show"
			
 
				+	>
			
 
				+		<view
			
 
				+		    class="u-back-top"
			
 
				+			:style="[contentStyle]"
			
 
				+		    v-if="!$slots.default && !$slots.$default"
			
 
				+			@click="backToTop"
			
 
				+		>
			
 
				+			<u-icon
			
 
				+			    :name="icon"
			
 
				+			    :custom-style="iconStyle"
			
 
				+			></u-icon>
			
 
				+			<text
			
 
				+			    v-if="text"
			
 
				+			    class="u-back-top__text"
			
 
				+			>{{text}}</text>
			
 
				+		</view>
			
 
				+		<slot v-else />
			
 
				+	</u-transition>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+	import props from './props.js';
			
 
				+	// #ifdef APP-NVUE
			
 
				+	const dom = weex.requireModule('dom')
			
 
				+	// #endif
			
 
				+	/**
			
 
				+	 * backTop 返回顶部
			
 
				+	 * @description 本组件一个用于长页面，滑动一定距离后，出现返回顶部按钮，方便快速返回顶部的场景。
			
 
				+	 * @tutorial https://uviewui.com/components/backTop.html
			
 
				+	 * 
			
 
				+	 * @property {String}			mode  		返回顶部的形状，circle-圆形，square-方形 （默认 'circle' ）
			
 
				+	 * @property {String} 			icon 		自定义图标 （默认 'arrow-upward' ） 见官方文档示例
			
 
				+	 * @property {String} 			text 		提示文字 
			
 
				+	 * @property {String | Number}  duration	返回顶部滚动时间 （默认 100）
			
 
				+	 * @property {String | Number}  scrollTop	滚动距离 （默认 0 ）
			
 
				+	 * @property {String | Number}  top  		距离顶部多少距离显示，单位px （默认 400 ）
			
 
				+	 * @property {String | Number}  bottom  	返回顶部按钮到底部的距离，单位px （默认 100 ）
			
 
				+	 * @property {String | Number}  right  		返回顶部按钮到右边的距离，单位px （默认 20 ）
			
 
				+	 * @property {String | Number}  zIndex 		层级   （默认 9 ）
			
 
				+	 * @property {Object<Object>}  	iconStyle 	图标的样式，对象形式   （默认 {color: '#909399',fontSize: '19px'}）
			
 
				+	 * @property {Object}			customStyle	定义需要用到的外部样式
			
 
				+	 * 
			
 
				+	 * @example <u-back-top :scrollTop="scrollTop"></u-back-top>
			
 
				+	 */
			
 
				+	export default {
			
 
				+		name: 'u-back-top',
			
 
				+		mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
			
 
				+		computed: {
			
 
				+			backTopStyle() {
			
 
				+				// 动画组件样式
			
 
				+				const style = {
			
 
				+					bottom: uni.$u.addUnit(this.bottom),
			
 
				+					right: uni.$u.addUnit(this.right),
			
 
				+					width: '40px',
			
 
				+					height: '40px',
			
 
				+					position: 'fixed',
			
 
				+					zIndex: 10,
			
 
				+				}
			
 
				+				return style
			
 
				+			},
			
 
				+			show() {
			
 
				+				return uni.$u.getPx(this.scrollTop) > uni.$u.getPx(this.top)
			
 
				+			},
			
 
				+			contentStyle() {
			
 
				+				const style = {}
			
 
				+				let radius = 0
			
 
				+				// 是否圆形
			
 
				+				if(this.mode === 'circle') {
			
 
				+					radius = '100px'
			
 
				+				} else {
			
 
				+					radius = '4px'
			
 
				+				}
			
 
				+				// 为了兼容安卓nvue，只能这么分开写
			
 
				+				style.borderTopLeftRadius = radius
			
 
				+				style.borderTopRightRadius = radius
			
 
				+				style.borderBottomLeftRadius = radius
			
 
				+				style.borderBottomRightRadius = radius
			
 
				+				return uni.$u.deepMerge(style, uni.$u.addStyle(this.customStyle))
			
 
				+			}
			
 
				+		},
			
 
				+		methods: {
			
 
				+			backToTop() {
			
 
				+				// #ifdef APP-NVUE
			
 
				+				if (!this.$parent.$refs['u-back-top']) {
			
 
				+					uni.$u.error(`nvue页面需要给页面最外层元素设置"ref='u-back-top'`)
			
 
				+				}
			
 
				+				dom.scrollToElement(this.$parent.$refs['u-back-top'], {
			
 
				+					offset: 0
			
 
				+				})
			
 
				+				// #endif
			
 
				+				
			
 
				+				// #ifndef APP-NVUE
			
 
				+				uni.pageScrollTo({
			
 
				+					scrollTop: 0,
			
 
				+					duration: this.duration
			
 
				+				});
			
 
				+				// #endif
			
 
				+				this.$emit('click')
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+	@import '../../libs/css/components.scss';
			
 
				+     $u-back-top-flex:1 !default;
			
 
				+     $u-back-top-height:100% !default;
			
 
				+     $u-back-top-background-color:#E1E1E1 !default;
			
 
				+     $u-back-top-tips-font-size:12px !default;
			
 
				+	.u-back-top {
			
 
				+		@include flex;
			
 
				+		flex-direction: column;
			
 
				+		align-items: center;
			
 
				+		flex:$u-back-top-flex;
			
 
				+		height: $u-back-top-height;
			
 
				+		justify-content: center;
			
 
				+		background-color: $u-back-top-background-color;
			
 
				+
			
 
				+		&__tips {
			
 
				+			font-size:$u-back-top-tips-font-size;
			
 
				+			transform: scale(0.8);
			
 
				+		}
			
 
				+	}
			
 
				+</style>
			
--- a/uni_modules/uview-ui/components/u-badge/props.js
+++ b/uni_modules/uview-ui/components/u-badge/props.js
@@ -0,0 +1,72 @@
 
				+export default {
			
 
				+    props: {
			
 
				+        // 是否显示圆点
			
 
				+        isDot: {
			
 
				+            type: Boolean,
			
 
				+            default: uni.$u.props.badge.isDot
			
 
				+        },
			
 
				+        // 显示的内容
			
 
				+        value: {
			
 
				+            type: [Number, String],
			
 
				+            default: uni.$u.props.badge.value
			
 
				+        },
			
 
				+        // 是否显示
			
 
				+        show: {
			
 
				+            type: Boolean,
			
 
				+            default: uni.$u.props.badge.show
			
 
				+        },
			
 
				+        // 最大值，超过最大值会显示 '{max}+'
			
 
				+        max: {
			
 
				+            type: [Number, String],
			
 
				+            default: uni.$u.props.badge.max
			
 
				+        },
			
 
				+        // 主题类型，error|warning|success|primary
			
 
				+        type: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.badge.type
			
 
				+        },
			
 
				+        // 当数值为 0 时，是否展示 Badge
			
 
				+        showZero: {
			
 
				+            type: Boolean,
			
 
				+            default: uni.$u.props.badge.showZero
			
 
				+        },
			
 
				+        // 背景颜色，优先级比type高，如设置，type参数会失效
			
 
				+        bgColor: {
			
 
				+            type: [String, null],
			
 
				+            default: uni.$u.props.badge.bgColor
			
 
				+        },
			
 
				+        // 字体颜色
			
 
				+        color: {
			
 
				+            type: [String, null],
			
 
				+            default: uni.$u.props.badge.color
			
 
				+        },
			
 
				+        // 徽标形状，circle-四角均为圆角，horn-左下角为直角
			
 
				+        shape: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.badge.shape
			
 
				+        },
			
 
				+        // 设置数字的显示方式，overflow|ellipsis|limit
			
 
				+        // overflow会根据max字段判断，超出显示`${max}+`
			
 
				+        // ellipsis会根据max判断，超出显示`${max}...`
			
 
				+        // limit会依据1000作为判断条件，超出1000，显示`${value/1000}K`，比如2.2k、3.34w，最多保留2位小数
			
 
				+        numberType: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.badge.numberType
			
 
				+        },
			
 
				+        // 设置badge的位置偏移，格式为 [x, y]，也即设置的为top和right的值，absolute为true时有效
			
 
				+        offset: {
			
 
				+            type: Array,
			
 
				+            default: uni.$u.props.badge.offset
			
 
				+        },
			
 
				+        // 是否反转背景和字体颜色
			
 
				+        inverted: {
			
 
				+            type: Boolean,
			
 
				+            default: uni.$u.props.badge.inverted
			
 
				+        },
			
 
				+        // 是否绝对定位
			
 
				+        absolute: {
			
 
				+            type: Boolean,
			
 
				+            default: uni.$u.props.badge.absolute
			
 
				+        }
			
 
				+    }
			
 
				+}
			
--- a/uni_modules/uview-ui/components/u-badge/u-badge.vue
+++ b/uni_modules/uview-ui/components/u-badge/u-badge.vue
@@ -0,0 +1,171 @@
 
				+<template>
			
 
				+	<text
			
 
				+		v-if="show && ((Number(value) === 0 ? showZero : true) || isDot)"
			
 
				+		:class="[isDot ? 'u-badge--dot' : 'u-badge--not-dot', inverted && 'u-badge--inverted', shape === 'horn' && 'u-badge--horn', `u-badge--${type}${inverted ? '--inverted' : ''}`]"
			
 
				+		:style="[$u.addStyle(customStyle), badgeStyle]"
			
 
				+		class="u-badge"
			
 
				+	>{{ isDot ? '' :showValue }}</text>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+	import props from './props.js';
			
 
				+	/**
			
 
				+	 * badge 徽标数
			
 
				+	 * @description 该组件一般用于图标右上角显示未读的消息数量，提示用户点击，有圆点和圆包含文字两种形式。
			
 
				+	 * @tutorial https://uviewui.com/components/badge.html
			
 
				+	 * 
			
 
				+	 * @property {Boolean} 			isDot 		是否显示圆点 （默认 false ）
			
 
				+	 * @property {String | Number} 	value 		显示的内容
			
 
				+	 * @property {Boolean} 			show 		是否显示 （默认 true ）
			
 
				+	 * @property {String | Number} 	max 		最大值，超过最大值会显示 '{max}+'  （默认999）
			
 
				+	 * @property {String} 			type 		主题类型，error|warning|success|primary （默认 'error' ）
			
 
				+	 * @property {Boolean} 			showZero	当数值为 0 时，是否展示 Badge （默认 false ）
			
 
				+	 * @property {String} 			bgColor 	背景颜色，优先级比type高，如设置，type参数会失效
			
 
				+	 * @property {String} 			color 		字体颜色 （默认 '#ffffff' ）
			
 
				+	 * @property {String} 			shape 		徽标形状，circle-四角均为圆角，horn-左下角为直角 （默认 'circle' ）
			
 
				+	 * @property {String} 			numberType	设置数字的显示方式，overflow|ellipsis|limit  （默认 'overflow' ）
			
 
				+	 * @property {Array}} 			offset		设置badge的位置偏移，格式为 [x, y]，也即设置的为top和right的值，absolute为true时有效
			
 
				+	 * @property {Boolean} 			inverted	是否反转背景和字体颜色（默认 false ）
			
 
				+	 * @property {Boolean} 			absolute	是否绝对定位（默认 false ）
			
 
				+	 * @property {Object}			customStyle	定义需要用到的外部样式
			
 
				+	 * @example <u-badge :type="type" :count="count"></u-badge>
			
 
				+	 */
			
 
				+	export default {
			
 
				+		name: 'u-badge',
			
 
				+		mixins: [uni.$u.mpMixin, props, uni.$u.mixin],
			
 
				+		computed: {
			
 
				+			// 是否将badge中心与父组件右上角重合
			
 
				+			boxStyle() {
			
 
				+				let style = {};
			
 
				+				return style;
			
 
				+			},
			
 
				+			// 整个组件的样式
			
 
				+			badgeStyle() {
			
 
				+				const style = {}
			
 
				+				if(this.color) {
			
 
				+					style.color = this.color
			
 
				+				}
			
 
				+				if (this.bgColor && !this.inverted) {
			
 
				+					style.backgroundColor = this.bgColor
			
 
				+				}
			
 
				+				if (this.absolute) {
			
 
				+					style.position = 'absolute'
			
 
				+					// 如果有设置offset参数
			
 
				+					if(this.offset.length) {
			
 
				+						// top和right分为为offset的第一个和第二个值，如果没有第二个值，则right等于top
			
 
				+						const top = this.offset[0]
			
 
				+						const right = this.offset[1] || top
			
 
				+						style.top = uni.$u.addUnit(top)
			
 
				+						style.right = uni.$u.addUnit(right)
			
 
				+					}
			
 
				+				}
			
 
				+				return style
			
 
				+			},
			
 
				+			showValue() {
			
 
				+				switch (this.numberType) {
			
 
				+					case "overflow":
			
 
				+						return Number(this.value) > Number(this.max) ? this.max + "+" : this.value
			
 
				+						break;
			
 
				+					case "ellipsis":
			
 
				+						return Number(this.value) > Number(this.max) ? "..." : this.value
			
 
				+						break;
			
 
				+					case "limit":
			
 
				+						return Number(this.value) > 999 ? Number(this.value) >= 9999 ?
			
 
				+							Math.floor(this.value / 1e4 * 100) / 100 + "w" : Math.floor(this.value /
			
 
				+								1e3 * 100) / 100 + "k" : this.value
			
 
				+						break;
			
 
				+					default:
			
 
				+						return Number(this.value)
			
 
				+				}
			
 
				+			},
			
 
				+		}
			
 
				+	}
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+	@import "../../libs/css/components.scss";
			
 
				+
			
 
				+	$u-badge-primary: $u-primary !default;
			
 
				+	$u-badge-error: $u-error !default;
			
 
				+	$u-badge-success: $u-success !default;
			
 
				+	$u-badge-info: $u-info !default;
			
 
				+	$u-badge-warning: $u-warning !default;
			
 
				+	$u-badge-dot-radius: 100px !default;
			
 
				+	$u-badge-dot-size: 8px !default;
			
 
				+	$u-badge-dot-right: 4px !default;
			
 
				+	$u-badge-dot-top: 0 !default;
			
 
				+	$u-badge-text-font-size: 11px !default;
			
 
				+	$u-badge-text-right: 10px !default;
			
 
				+	$u-badge-text-padding: 2px 5px !default;
			
 
				+	$u-badge-text-align: center !default;
			
 
				+	$u-badge-text-color: #FFFFFF !default;
			
 
				+
			
 
				+	.u-badge {
			
 
				+		border-top-right-radius: $u-badge-dot-radius;
			
 
				+		border-top-left-radius: $u-badge-dot-radius;
			
 
				+		border-bottom-left-radius: $u-badge-dot-radius;
			
 
				+		border-bottom-right-radius: $u-badge-dot-radius;
			
 
				+		@include flex;
			
 
				+		line-height: $u-badge-text-font-size;
			
 
				+		text-align: $u-badge-text-align;
			
 
				+		font-size: $u-badge-text-font-size;
			
 
				+		color: $u-badge-text-color;
			
 
				+
			
 
				+		&--dot {
			
 
				+			height: $u-badge-dot-size;
			
 
				+			width: $u-badge-dot-size;
			
 
				+		}
			
 
				+		
			
 
				+		&--inverted {
			
 
				+			font-size: 13px;
			
 
				+		}
			
 
				+		
			
 
				+		&--not-dot {
			
 
				+			padding: $u-badge-text-padding;
			
 
				+		}
			
 
				+
			
 
				+		&--horn {
			
 
				+			border-bottom-left-radius: 0;
			
 
				+		}
			
 
				+
			
 
				+		&--primary {
			
 
				+			background-color: $u-badge-primary;
			
 
				+		}
			
 
				+		
			
 
				+		&--primary--inverted {
			
 
				+			color: $u-badge-primary;
			
 
				+		}
			
 
				+
			
 
				+		&--error {
			
 
				+			background-color: $u-badge-error;
			
 
				+		}
			
 
				+		
			
 
				+		&--error--inverted {
			
 
				+			color: $u-badge-error;
			
 
				+		}
			
 
				+
			
 
				+		&--success {
			
 
				+			background-color: $u-badge-success;
			
 
				+		}
			
 
				+		
			
 
				+		&--success--inverted {
			
 
				+			color: $u-badge-success;
			
 
				+		}
			
 
				+
			
 
				+		&--info {
			
 
				+			background-color: $u-badge-info;
			
 
				+		}
			
 
				+		
			
 
				+		&--info--inverted {
			
 
				+			color: $u-badge-info;
			
 
				+		}
			
 
				+
			
 
				+		&--warning {
			
 
				+			background-color: $u-badge-warning;
			
 
				+		}
			
 
				+		
			
 
				+		&--warning--inverted {
			
 
				+			color: $u-badge-warning;
			
 
				+		}
			
 
				+	}
			
 
				+</style>
			
--- a/uni_modules/uview-ui/components/u-button/nvue.scss
+++ b/uni_modules/uview-ui/components/u-button/nvue.scss
@@ -0,0 +1,46 @@
 
				+$u-button-active-opacity:0.75 !default;

			
 
				+$u-button-loading-text-margin-left:4px !default;

			
 
				+$u-button-text-color: #FFFFFF !default;

			
 
				+$u-button-text-plain-error-color:$u-error !default;

			
 
				+$u-button-text-plain-warning-color:$u-warning !default;

			
 
				+$u-button-text-plain-success-color:$u-success !default;

			
 
				+$u-button-text-plain-info-color:$u-info !default;

			
 
				+$u-button-text-plain-primary-color:$u-primary !default;

			
 
				+.u-button {

			
 
				+	&--active {

			
 
				+		opacity: $u-button-active-opacity;

			
 
				+	}

			
 
				+	

			
 
				+	&--active--plain {

			
 
				+		background-color: rgb(217, 217, 217);

			
 
				+	}

			
 
				+	

			
 
				+	&__loading-text {

			
 
				+		margin-left:$u-button-loading-text-margin-left;

			
 
				+	}

			
 
				+	

			
 
				+	&__text,

			
 
				+	&__loading-text {

			
 
				+		color:$u-button-text-color;

			
 
				+	}

			
 
				+	

			
 
				+	&__text--plain--error {

			
 
				+		color:$u-button-text-plain-error-color;

			
 
				+	}

			
 
				+	

			
 
				+	&__text--plain--warning {

			
 
				+		color:$u-button-text-plain-warning-color;

			
 
				+	}

			
 
				+	

			
 
				+	&__text--plain--success{

			
 
				+		color:$u-button-text-plain-success-color;

			
 
				+	}

			
 
				+	

			
 
				+	&__text--plain--info {

			
 
				+		color:$u-button-text-plain-info-color;

			
 
				+	}

			
 
				+	

			
 
				+	&__text--plain--primary {

			
 
				+		color:$u-button-text-plain-primary-color;

			
 
				+	}

			
 
				+}
			
--- a/uni_modules/uview-ui/components/u-button/props.js
+++ b/uni_modules/uview-ui/components/u-button/props.js
@@ -0,0 +1,161 @@
 
				+/*
			
 
				+ * @Author       : LQ
			
 
				+ * @Description  :
			
 
				+ * @version      : 1.0
			
 
				+ * @Date         : 2021-08-16 10:04:04
			
 
				+ * @LastAuthor   : LQ
			
 
				+ * @lastTime     : 2021-08-16 10:04:24
			
 
				+ * @FilePath     : /u-view2.0/uview-ui/components/u-button/props.js
			
 
				+ */
			
 
				+export default {
			
 
				+    props: {
			
 
				+        // 是否细边框
			
 
				+        hairline: {
			
 
				+            type: Boolean,
			
 
				+            default: uni.$u.props.button.hairline
			
 
				+        },
			
 
				+        // 按钮的预置样式，info，primary，error，warning，success
			
 
				+        type: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.button.type
			
 
				+        },
			
 
				+        // 按钮尺寸，large，normal，small，mini
			
 
				+        size: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.button.size
			
 
				+        },
			
 
				+        // 按钮形状，circle（两边为半圆），square（带圆角）
			
 
				+        shape: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.button.shape
			
 
				+        },
			
 
				+        // 按钮是否镂空
			
 
				+        plain: {
			
 
				+            type: Boolean,
			
 
				+            default: uni.$u.props.button.plain
			
 
				+        },
			
 
				+        // 是否禁止状态
			
 
				+        disabled: {
			
 
				+            type: Boolean,
			
 
				+            default: uni.$u.props.button.disabled
			
 
				+        },
			
 
				+        // 是否加载中
			
 
				+        loading: {
			
 
				+            type: Boolean,
			
 
				+            default: uni.$u.props.button.loading
			
 
				+        },
			
 
				+        // 加载中提示文字
			
 
				+        loadingText: {
			
 
				+            type: [String, Number],
			
 
				+            default: uni.$u.props.button.loadingText
			
 
				+        },
			
 
				+        // 加载状态图标类型
			
 
				+        loadingMode: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.button.loadingMode
			
 
				+        },
			
 
				+        // 加载图标大小
			
 
				+        loadingSize: {
			
 
				+            type: [String, Number],
			
 
				+            default: uni.$u.props.button.loadingSize
			
 
				+        },
			
 
				+        // 开放能力，具体请看uniapp稳定关于button组件部分说明
			
 
				+        // https://uniapp.dcloud.io/component/button
			
 
				+        openType: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.button.openType
			
 
				+        },
			
 
				+        // 用于 <form> 组件，点击分别会触发 <form> 组件的 submit/reset 事件
			
 
				+        // 取值为submit（提交表单），reset（重置表单）
			
 
				+        formType: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.button.formType
			
 
				+        },
			
 
				+        // 打开 APP 时，向 APP 传递的参数，open-type=launchApp时有效
			
 
				+        // 只微信小程序、QQ小程序有效
			
 
				+        appParameter: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.button.appParameter
			
 
				+        },
			
 
				+        // 指定是否阻止本节点的祖先节点出现点击态，微信小程序有效
			
 
				+        hoverStopPropagation: {
			
 
				+            type: Boolean,
			
 
				+            default: uni.$u.props.button.hoverStopPropagation
			
 
				+        },
			
 
				+        // 指定返回用户信息的语言，zh_CN 简体中文，zh_TW 繁体中文，en 英文。只微信小程序有效
			
 
				+        lang: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.button.lang
			
 
				+        },
			
 
				+        // 会话来源，open-type="contact"时有效。只微信小程序有效
			
 
				+        sessionFrom: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.button.sessionFrom
			
 
				+        },
			
 
				+        // 会话内消息卡片标题，open-type="contact"时有效
			
 
				+        // 默认当前标题，只微信小程序有效
			
 
				+        sendMessageTitle: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.button.sendMessageTitle
			
 
				+        },
			
 
				+        // 会话内消息卡片点击跳转小程序路径，open-type="contact"时有效
			
 
				+        // 默认当前分享路径，只微信小程序有效
			
 
				+        sendMessagePath: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.button.sendMessagePath
			
 
				+        },
			
 
				+        // 会话内消息卡片图片，open-type="contact"时有效
			
 
				+        // 默认当前页面截图，只微信小程序有效
			
 
				+        sendMessageImg: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.button.sendMessageImg
			
 
				+        },
			
 
				+        // 是否显示会话内消息卡片，设置此参数为 true，用户进入客服会话会在右下角显示"可能要发送的小程序"提示，
			
 
				+        // 用户点击后可以快速发送小程序消息，open-type="contact"时有效
			
 
				+        showMessageCard: {
			
 
				+            type: Boolean,
			
 
				+            default: uni.$u.props.button.showMessageCard
			
 
				+        },
			
 
				+        // 额外传参参数，用于小程序的data-xxx属性，通过target.dataset.name获取
			
 
				+        dataName: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.button.dataName
			
 
				+        },
			
 
				+        // 节流，一定时间内只能触发一次
			
 
				+        throttleTime: {
			
 
				+            type: [String, Number],
			
 
				+            default: uni.$u.props.button.throttleTime
			
 
				+        },
			
 
				+        // 按住后多久出现点击态，单位毫秒
			
 
				+        hoverStartTime: {
			
 
				+            type: [String, Number],
			
 
				+            default: uni.$u.props.button.hoverStartTime
			
 
				+        },
			
 
				+        // 手指松开后点击态保留时间，单位毫秒
			
 
				+        hoverStayTime: {
			
 
				+            type: [String, Number],
			
 
				+            default: uni.$u.props.button.hoverStayTime
			
 
				+        },
			
 
				+        // 按钮文字，之所以通过props传入，是因为slot传入的话
			
 
				+        // nvue中无法控制文字的样式
			
 
				+        text: {
			
 
				+            type: [String, Number],
			
 
				+            default: uni.$u.props.button.text
			
 
				+        },
			
 
				+        // 按钮图标
			
 
				+        icon: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.button.icon
			
 
				+        },
			
 
				+        // 按钮图标
			
 
				+        iconColor: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.button.icon
			
 
				+        },
			
 
				+        // 按钮颜色，支持传入linear-gradient渐变色
			
 
				+        color: {
			
 
				+            type: String,
			
 
				+            default: uni.$u.props.button.color
			
 
				+        }
			
 
				+    }
			
 
				+}
			
--- a/uni_modules/uview-ui/components/u-button/u-button.vue
+++ b/uni_modules/uview-ui/components/u-button/u-button.vue
@@ -0,0 +1,495 @@
 
				+<template>
			
 
				+    <!-- #ifndef APP-NVUE -->
			
 
				+    <button
			
 
				+        :hover-start-time="Number(hoverStartTime)"
			
 
				+        :hover-stay-time="Number(hoverStayTime)"
			
 
				+        :form-type="formType"
			
 
				+        :open-type="openType"
			
 
				+        :app-parameter="appParameter"
			
 
				+        :hover-stop-propagation="hoverStopPropagation"
			
 
				+        :send-message-title="sendMessageTitle"
			
 
				+        :send-message-path="sendMessagePath"
			
 
				+        :lang="lang"
			
 
				+        :data-name="dataName"
			
 
				+        :session-from="sessionFrom"
			
 
				+        :send-message-img="sendMessageImg"
			
 
				+        :show-message-card="showMessageCard"
			
 
				+        @getphonenumber="getphonenumber"
			
 
				+        @getuserinfo="getuserinfo"
			
 
				+        @error="error"
			
 
				+        @opensetting="opensetting"
			
 
				+        @launchapp="launchapp"
			
 
				+        @agreeprivacyauthorization="agreeprivacyauthorization"
			
 
				+        :hover-class="!disabled && !loading ? 'u-button--active' : ''"
			
 
				+        class="u-button u-reset-button"
			
 
				+        :style="[baseColor, $u.addStyle(customStyle)]"
			
 
				+        @tap="clickHandler"
			
 
				+        :class="bemClass"
			
 
				+    >
			
 
				+        <template v-if="loading">
			
 
				+            <u-loading-icon
			
 
				+                :mode="loadingMode"
			
 
				+                :size="loadingSize * 1.15"
			
 
				+                :color="loadingColor"
			
 
				+            ></u-loading-icon>
			
 
				+            <text
			
 
				+                class="u-button__loading-text"
			
 
				+                :style="[{ fontSize: textSize + 'px' }]"
			
 
				+                >{{ loadingText || text }}</text
			
 
				+            >
			
 
				+        </template>
			
 
				+        <template v-else>
			
 
				+            <u-icon
			
 
				+                v-if="icon"
			
 
				+                :name="icon"
			
 
				+                :color="iconColorCom"
			
 
				+                :size="textSize * 1.35"
			
 
				+                :customStyle="{ marginRight: '2px' }"
			
 
				+            ></u-icon>
			
 
				+            <slot>
			
 
				+                <text
			
 
				+                    class="u-button__text"
			
 
				+                    :style="[{ fontSize: textSize + 'px' }]"
			
 
				+                    >{{ text }}</text
			
 
				+                >
			
 
				+            </slot>
			
 
				+        </template>
			
 
				+    </button>
			
 
				+    <!-- #endif -->
			
 
				+
			
 
				+    <!-- #ifdef APP-NVUE -->
			
 
				+    <view
			
 
				+        :hover-start-time="Number(hoverStartTime)"
			
 
				+        :hover-stay-time="Number(hoverStayTime)"
			
 
				+        class="u-button"
			
 
				+        :hover-class="
			
 
				+            !disabled && !loading && !color && (plain || type === 'info')
			
 
				+                ? 'u-button--active--plain'
			
 
				+                : !disabled && !loading && !plain
			
 
				+                ? 'u-button--active'
			
 
				+                : ''
			
 
				+        "
			
 
				+        @tap="clickHandler"
			
 
				+        :class="bemClass"
			
 
				+        :style="[baseColor, $u.addStyle(customStyle)]"
			
 
				+    >
			
 
				+        <template v-if="loading">
			
 
				+            <u-loading-icon
			
 
				+                :mode="loadingMode"
			
 
				+                :size="loadingSize * 1.15"
			
 
				+                :color="loadingColor"
			
 
				+            ></u-loading-icon>
			
 
				+            <text
			
 
				+                class="u-button__loading-text"
			
 
				+                :style="[nvueTextStyle]"
			
 
				+                :class="[plain && `u-button__text--plain--${type}`]"
			
 
				+                >{{ loadingText || text }}</text
			
 
				+            >
			
 
				+        </template>
			
 
				+        <template v-else>
			
 
				+            <u-icon
			
 
				+                v-if="icon"
			
 
				+                :name="icon"
			
 
				+                :color="iconColorCom"
			
 
				+                :size="textSize * 1.35"
			
 
				+            ></u-icon>
			
 
				+            <text
			
 
				+                class="u-button__text"
			
 
				+                :style="[
			
 
				+                    {
			
 
				+                        marginLeft: icon ? '2px' : 0,
			
 
				+                    },
			
 
				+                    nvueTextStyle,
			
 
				+                ]"
			
 
				+                :class="[plain && `u-button__text--plain--${type}`]"
			
 
				+                >{{ text }}</text
			
 
				+            >
			
 
				+        </template>
			
 
				+    </view>
			
 
				+    <!-- #endif -->
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+import button from "../../libs/mixin/button.js";
			
 
				+import openType from "../../libs/mixin/openType.js";
			
 
				+import props from "./props.js";
			
 
				+/**
			
 
				+ * button 按钮
			
 
				+ * @description Button 按钮
			
 
				+ * @tutorial https://www.uviewui.com/components/button.html
			
 
				+ *
			
 
				+ * @property {Boolean}			hairline				是否显示按钮的细边框 (默认 true )
			
 
				+ * @property {String}			type					按钮的预置样式，info，primary，error，warning，success (默认 'info' )
			
 
				+ * @property {String}			size					按钮尺寸，large，normal，mini （默认 normal）
			
 
				+ * @property {String}			shape					按钮形状，circle（两边为半圆），square（带圆角） （默认 'square' ）
			
 
				+ * @property {Boolean}			plain					按钮是否镂空，背景色透明 （默认 false）
			
 
				+ * @property {Boolean}			disabled				是否禁用 （默认 false）
			
 
				+ * @property {Boolean}			loading					按钮名称前是否带 loading 图标(App-nvue 平台，在 ios 上为雪花，Android上为圆圈) （默认 false）
			
 
				+ * @property {String | Number}	loadingText				加载中提示文字
			
 
				+ * @property {String}			loadingMode				加载状态图标类型 （默认 'spinner' ）
			
 
				+ * @property {String | Number}	loadingSize				加载图标大小 （默认 15 ）
			
 
				+ * @property {String}			openType				开放能力，具体请看uniapp稳定关于button组件部分说明
			
 
				+ * @property {String}			formType				用于 <form> 组件，点击分别会触发 <form> 组件的 submit/reset 事件
			
 
				+ * @property {String}			appParameter			打开 APP 时，向 APP 传递的参数，open-type=launchApp时有效 （注：只微信小程序、QQ小程序有效）
			
 
				+ * @property {Boolean}			hoverStopPropagation	指定是否阻止本节点的祖先节点出现点击态，微信小程序有效（默认 true ）
			
 
				+ * @property {String}			lang					指定返回用户信息的语言，zh_CN 简体中文，zh_TW 繁体中文，en 英文（默认 en ）
			
 
				+ * @property {String}			sessionFrom				会话来源，openType="contact"时有效
			
 
				+ * @property {String}			sendMessageTitle		会话内消息卡片标题，openType="contact"时有效
			
 
				+ * @property {String}			sendMessagePath			会话内消息卡片点击跳转小程序路径，openType="contact"时有效
			
 
				+ * @property {String}			sendMessageImg			会话内消息卡片图片，openType="contact"时有效
			
 
				+ * @property {Boolean}			showMessageCard			是否显示会话内消息卡片，设置此参数为 true，用户进入客服会话会在右下角显示"可能要发送的小程序"提示，用户点击后可以快速发送小程序消息，openType="contact"时有效（默认false）
			
 
				+ * @property {String}			dataName				额外传参参数，用于小程序的data-xxx属性，通过target.dataset.name获取
			
 
				+ * @property {String | Number}	throttleTime			节流，一定时间内只能触发一次 （默认 0 )
			
 
				+ * @property {String | Number}	hoverStartTime			按住后多久出现点击态，单位毫秒 （默认 0 )
			
 
				+ * @property {String | Number}	hoverStayTime			手指松开后点击态保留时间，单位毫秒 （默认 200 )
			
 
				+ * @property {String | Number}	text					按钮文字，之所以通过props传入，是因为slot传入的话（注：nvue中无法控制文字的样式）
			
 
				+ * @property {String}			icon					按钮图标
			
 
				+ * @property {String}			iconColor				按钮图标颜色
			
 
				+ * @property {String}			color					按钮颜色，支持传入linear-gradient渐变色
			
 
				+ * @property {Object}			customStyle				定义需要用到的外部样式
			
 
				+ *
			
 
				+ * @event {Function}	click			非禁止并且非加载中，才能点击
			
 
				+ * @event {Function}	getphonenumber	open-type="getPhoneNumber"时有效
			
 
				+ * @event {Function}	getuserinfo		用户点击该按钮时，会返回获取到的用户信息，从返回参数的detail中获取到的值同uni.getUserInfo
			
 
				+ * @event {Function}	error			当使用开放能力时，发生错误的回调
			
 
				+ * @event {Function}	opensetting		在打开授权设置页并关闭后回调
			
 
				+ * @event {Function}	launchapp		打开 APP 成功的回调
			
 
				+ * @event {Function}	agreeprivacyauthorization	用户同意隐私协议事件回调
			
 
				+ * @example <u-button>月落</u-button>
			
 
				+ */
			
 
				+export default {
			
 
				+    name: "u-button",
			
 
				+    // #ifdef MP
			
 
				+    mixins: [uni.$u.mpMixin, uni.$u.mixin, button, openType, props],
			
 
				+    // #endif
			
 
				+    // #ifndef MP
			
 
				+    mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
			
 
				+    // #endif
			
 
				+    data() {
			
 
				+        return {};
			
 
				+    },
			
 
				+    computed: {
			
 
				+        // 生成bem风格的类名
			
 
				+        bemClass() {
			
 
				+            // this.bem为一个computed变量，在mixin中
			
 
				+            if (!this.color) {
			
 
				+                return this.bem(
			
 
				+                    "button",
			
 
				+                    ["type", "shape", "size"],
			
 
				+                    ["disabled", "plain", "hairline"]
			
 
				+                );
			
 
				+            } else {
			
 
				+                // 由于nvue的原因，在有color参数时，不需要传入type，否则会生成type相关的类型，影响最终的样式
			
 
				+                return this.bem(
			
 
				+                    "button",
			
 
				+                    ["shape", "size"],
			
 
				+                    ["disabled", "plain", "hairline"]
			
 
				+                );
			
 
				+            }
			
 
				+        },
			
 
				+        loadingColor() {
			
 
				+            if (this.plain) {
			
 
				+                // 如果有设置color值，则用color值，否则使用type主题颜色
			
 
				+                return this.color
			
 
				+                    ? this.color
			
 
				+                    : uni.$u.config.color[`u-${this.type}`];
			
 
				+            }
			
 
				+            if (this.type === "info") {
			
 
				+                return "#c9c9c9";
			
 
				+            }
			
 
				+            return "rgb(200, 200, 200)";
			
 
				+        },
			
 
				+        iconColorCom() {
			
 
				+            // 如果是镂空状态，设置了color就用color值，否则使用主题颜色，
			
 
				+            // u-icon的color能接受一个主题颜色的值
			
 
				+			if (this.iconColor) return this.iconColor;
			
 
				+			if (this.plain) {
			
 
				+                return this.color ? this.color : this.type;
			
 
				+            } else {
			
 
				+                return this.type === "info" ? "#000000" : "#ffffff";
			
 
				+            }
			
 
				+        },
			
 
				+        baseColor() {
			
 
				+            let style = {};
			
 
				+            if (this.color) {
			
 
				+                // 针对自定义了color颜色的情况，镂空状态下，就是用自定义的颜色
			
 
				+                style.color = this.plain ? this.color : "white";
			
 
				+                if (!this.plain) {
			
 
				+                    // 非镂空，背景色使用自定义的颜色
			
 
				+                    style["background-color"] = this.color;
			
 
				+                }
			
 
				+                if (this.color.indexOf("gradient") !== -1) {
			
 
				+                    // 如果自定义的颜色为渐变色，不显示边框，以及通过backgroundImage设置渐变色
			
 
				+                    // weex文档说明可以写borderWidth的形式，为什么这里需要分开写？
			
 
				+                    // 因为weex是阿里巴巴为了部门业绩考核而做的你懂的东西，所以需要这么写才有效
			
 
				+                    style.borderTopWidth = 0;
			
 
				+                    style.borderRightWidth = 0;
			
 
				+                    style.borderBottomWidth = 0;
			
 
				+                    style.borderLeftWidth = 0;
			
 
				+                    if (!this.plain) {
			
 
				+                        style.backgroundImage = this.color;
			
 
				+                    }
			
 
				+                } else {
			
 
				+                    // 非渐变色，则设置边框相关的属性
			
 
				+                    style.borderColor = this.color;
			
 
				+                    style.borderWidth = "1px";
			
 
				+                    style.borderStyle = "solid";
			
 
				+                }
			
 
				+            }
			
 
				+            return style;
			
 
				+        },
			
 
				+        // nvue版本按钮的字体不会继承父组件的颜色，需要对每一个text组件进行单独的设置
			
 
				+        nvueTextStyle() {
			
 
				+            let style = {};
			
 
				+            // 针对自定义了color颜色的情况，镂空状态下，就是用自定义的颜色
			
 
				+            if (this.type === "info") {
			
 
				+                style.color = "#323233";
			
 
				+            }
			
 
				+            if (this.color) {
			
 
				+                style.color = this.plain ? this.color : "white";
			
 
				+            }
			
 
				+            style.fontSize = this.textSize + "px";
			
 
				+            return style;
			
 
				+        },
			
 
				+        // 字体大小
			
 
				+        textSize() {
			
 
				+            let fontSize = 14,
			
 
				+                { size } = this;
			
 
				+            if (size === "large") fontSize = 16;
			
 
				+            if (size === "normal") fontSize = 14;
			
 
				+            if (size === "small") fontSize = 12;
			
 
				+            if (size === "mini") fontSize = 10;
			
 
				+            return fontSize;
			
 
				+        },
			
 
				+    },
			
 
				+    methods: {
			
 
				+        clickHandler() {
			
 
				+            // 非禁止并且非加载中，才能点击
			
 
				+            if (!this.disabled && !this.loading) {
			
 
				+				// 进行节流控制，每this.throttle毫秒内，只在开始处执行
			
 
				+				uni.$u.throttle(() => {
			
 
				+					this.$emit("click");
			
 
				+				}, this.throttleTime);
			
 
				+            }
			
 
				+        },
			
 
				+        // 下面为对接uniapp官方按钮开放能力事件回调的对接
			
 
				+        getphonenumber(res) {
			
 
				+            this.$emit("getphonenumber", res);
			
 
				+        },
			
 
				+        getuserinfo(res) {
			
 
				+            this.$emit("getuserinfo", res);
			
 
				+        },
			
 
				+        error(res) {
			
 
				+            this.$emit("error", res);
			
 
				+        },
			
 
				+        opensetting(res) {
			
 
				+            this.$emit("opensetting", res);
			
 
				+        },
			
 
				+        launchapp(res) {
			
 
				+            this.$emit("launchapp", res);
			
 
				+        },
			
 
				+        agreeprivacyauthorization(res) {
			
 
				+            this.$emit("agreeprivacyauthorization", res);
			
 
				+        },
			
 
				+    },
			
 
				+};
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+@import "../../libs/css/components.scss";
			
 
				+
			
 
				+/* #ifndef APP-NVUE */
			
 
				+@import "./vue.scss";
			
 
				+/* #endif */
			
 
				+
			
 
				+/* #ifdef APP-NVUE */
			
 
				+@import "./nvue.scss";
			
 
				+/* #endif */
			
 
				+
			
 
				+$u-button-u-button-height: 40px !default;
			
 
				+$u-button-text-font-size: 15px !default;
			
 
				+$u-button-loading-text-font-size: 15px !default;
			
 
				+$u-button-loading-text-margin-left: 4px !default;
			
 
				+$u-button-large-width: 100% !default;
			
 
				+$u-button-large-height: 50px !default;
			
 
				+$u-button-normal-padding: 0 12px !default;
			
 
				+$u-button-large-padding: 0 15px !default;
			
 
				+$u-button-normal-font-size: 14px !default;
			
 
				+$u-button-small-min-width: 60px !default;
			
 
				+$u-button-small-height: 30px !default;
			
 
				+$u-button-small-padding: 0px 8px !default;
			
 
				+$u-button-mini-padding: 0px 8px !default;
			
 
				+$u-button-small-font-size: 12px !default;
			
 
				+$u-button-mini-height: 22px !default;
			
 
				+$u-button-mini-font-size: 10px !default;
			
 
				+$u-button-mini-min-width: 50px !default;
			
 
				+$u-button-disabled-opacity: 0.5 !default;
			
 
				+$u-button-info-color: #323233 !default;
			
 
				+$u-button-info-background-color: #fff !default;
			
 
				+$u-button-info-border-color: #ebedf0 !default;
			
 
				+$u-button-info-border-width: 1px !default;
			
 
				+$u-button-info-border-style: solid !default;
			
 
				+$u-button-success-color: #fff !default;
			
 
				+$u-button-success-background-color: $u-success !default;
			
 
				+$u-button-success-border-color: $u-button-success-background-color !default;
			
 
				+$u-button-success-border-width: 1px !default;
			
 
				+$u-button-success-border-style: solid !default;
			
 
				+$u-button-primary-color: #fff !default;
			
 
				+$u-button-primary-background-color: $u-primary !default;
			
 
				+$u-button-primary-border-color: $u-button-primary-background-color !default;
			
 
				+$u-button-primary-border-width: 1px !default;
			
 
				+$u-button-primary-border-style: solid !default;
			
 
				+$u-button-error-color: #fff !default;
			
 
				+$u-button-error-background-color: $u-error !default;
			
 
				+$u-button-error-border-color: $u-button-error-background-color !default;
			
 
				+$u-button-error-border-width: 1px !default;
			
 
				+$u-button-error-border-style: solid !default;
			
 
				+$u-button-warning-color: #fff !default;
			
 
				+$u-button-warning-background-color: $u-warning !default;
			
 
				+$u-button-warning-border-color: $u-button-warning-background-color !default;
			
 
				+$u-button-warning-border-width: 1px !default;
			
 
				+$u-button-warning-border-style: solid !default;
			
 
				+$u-button-block-width: 100% !default;
			
 
				+$u-button-circle-border-top-right-radius: 100px !default;
			
 
				+$u-button-circle-border-top-left-radius: 100px !default;
			
 
				+$u-button-circle-border-bottom-left-radius: 100px !default;
			
 
				+$u-button-circle-border-bottom-right-radius: 100px !default;
			
 
				+$u-button-square-border-top-right-radius: 3px !default;
			
 
				+$u-button-square-border-top-left-radius: 3px !default;
			
 
				+$u-button-square-border-bottom-left-radius: 3px !default;
			
 
				+$u-button-square-border-bottom-right-radius: 3px !default;
			
 
				+$u-button-icon-min-width: 1em !default;
			
 
				+$u-button-plain-background-color: #fff !default;
			
 
				+$u-button-hairline-border-width: 0.5px !default;
			
 
				+
			
 
				+.u-button {
			
 
				+    height: $u-button-u-button-height;
			
 
				+    position: relative;
			
 
				+    align-items: center;
			
 
				+    justify-content: center;
			
 
				+    @include flex;
			
 
				+    /* #ifndef APP-NVUE */
			
 
				+    box-sizing: border-box;
			
 
				+    /* #endif */
			
 
				+    flex-direction: row;
			
 
				+
			
 
				+    &__text {
			
 
				+        font-size: $u-button-text-font-size;
			
 
				+    }
			
 
				+
			
 
				+    &__loading-text {
			
 
				+        font-size: $u-button-loading-text-font-size;
			
 
				+        margin-left: $u-button-loading-text-margin-left;
			
 
				+    }
			
 
				+
			
 
				+    &--large {
			
 
				+        /* #ifndef APP-NVUE */
			
 
				+        width: $u-button-large-width;
			
 
				+        /* #endif */
			
 
				+        height: $u-button-large-height;
			
 
				+        padding: $u-button-large-padding;
			
 
				+    }
			
 
				+
			
 
				+    &--normal {
			
 
				+        padding: $u-button-normal-padding;
			
 
				+        font-size: $u-button-normal-font-size;
			
 
				+    }
			
 
				+
			
 
				+    &--small {
			
 
				+        /* #ifndef APP-NVUE */
			
 
				+        min-width: $u-button-small-min-width;
			
 
				+        /* #endif */
			
 
				+        height: $u-button-small-height;
			
 
				+        padding: $u-button-small-padding;
			
 
				+        font-size: $u-button-small-font-size;
			
 
				+    }
			
 
				+
			
 
				+    &--mini {
			
 
				+        height: $u-button-mini-height;
			
 
				+        font-size: $u-button-mini-font-size;
			
 
				+        /* #ifndef APP-NVUE */
			
 
				+        min-width: $u-button-mini-min-width;
			
 
				+        /* #endif */
			
 
				+        padding: $u-button-mini-padding;
			
 
				+    }
			
 
				+
			
 
				+    &--disabled {
			
 
				+        opacity: $u-button-disabled-opacity;
			
 
				+    }
			
 
				+
			
 
				+    &--info {
			
 
				+        color: $u-button-info-color;
			
 
				+        background-color: $u-button-info-background-color;
			
 
				+        border-color: $u-button-info-border-color;
			
 
				+        border-width: $u-button-info-border-width;
			
 
				+        border-style: $u-button-info-border-style;
			
 
				+    }
			
 
				+
			
 
				+    &--success {
			
 
				+        color: $u-button-success-color;
			
 
				+        background-color: $u-button-success-background-color;
			
 
				+        border-color: $u-button-success-border-color;
			
 
				+        border-width: $u-button-success-border-width;
			
 
				+        border-style: $u-button-success-border-style;
			
 
				+    }
			
 
				+
			
 
				+    &--primary {
			
 
				+        color: $u-button-primary-color;
			
 
				+        background-color: $u-button-primary-background-color;
			
 
				+        border-color: $u-button-primary-border-color;
			
 
				+        border-width: $u-button-primary-border-width;
			
 
				+        border-style: $u-button-primary-border-style;
			
 
				+    }
			
 
				+
			
 
				+    &--error {
			
 
				+        color: $u-button-error-color;
			
 
				+        background-color: $u-button-error-background-color;
			
 
				+        border-color: $u-button-error-border-color;
			
 
				+        border-width: $u-button-error-border-width;
			
 
				+        border-style: $u-button-error-border-style;
			
 
				+    }
			
 
				+
			
 
				+    &--warning {
			
 
				+        color: $u-button-warning-color;
			
 
				+        background-color: $u-button-warning-background-color;
			
 
				+        border-color: $u-button-warning-border-color;
			
 
				+        border-width: $u-button-warning-border-width;
			
 
				+        border-style: $u-button-warning-border-style;
			
 
				+    }
			
 
				+
			
 
				+    &--block {
			
 
				+        @include flex;
			
 
				+        width: $u-button-block-width;
			
 
				+    }
			
 
				+
			
 
				+    &--circle {
			
 
				+        border-top-right-radius: $u-button-circle-border-top-right-radius;
			
 
				+        border-top-left-radius: $u-button-circle-border-top-left-radius;
			
 
				+        border-bottom-left-radius: $u-button-circle-border-bottom-left-radius;
			
 
				+        border-bottom-right-radius: $u-button-circle-border-bottom-right-radius;
			
 
				+    }
			
 
				+
			
 
				+    &--square {
			
 
				+        border-bottom-left-radius: $u-button-square-border-top-right-radius;
			
 
				+        border-bottom-right-radius: $u-button-square-border-top-left-radius;
			
 
				+        border-top-left-radius: $u-button-square-border-bottom-left-radius;
			
 
				+        border-top-right-radius: $u-button-square-border-bottom-right-radius;
			
 
				+    }
			
 
				+
			
 
				+    &__icon {
			
 
				+        /* #ifndef APP-NVUE */
			
 
				+        min-width: $u-button-icon-min-width;
			
 
				+        line-height: inherit !important;
			
 
				+        vertical-align: top;
			
 
				+        /* #endif */
			
 
				+    }
			
 
				+
			
 
				+    &--plain {
			
 
				+        background-color: $u-button-plain-background-color;
			
 
				+    }
			
 
				+
			
 
				+    &--hairline {
			
 
				+        border-width: $u-button-hairline-border-width !important;
			
 
				+    }
			
 
				+}
			
 
				+</style>