From bb5f128c8722cfe8d29520f5fda73f554fa7f7ab Mon Sep 17 00:00:00 2001
From: THK3121 <thk121969318@163.com>
Date: Mon, 19 Jun 2023 17:33:18 +0800
Subject: [PATCH] =?UTF-8?q?app=E7=9A=84=E8=A7=86=E9=A2=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/app.js                                 |    4 +-
 manifest.json                                 |    4 +-
 pages/admin/order/index.vue                   | 1033 ++++++++++++-----
 pages/columnGoods/goods_search_con/index.vue  |    2 +-
 pages/nongKe/supply_chain/supplier.vue        |    2 +-
 pages/product/addGoods/index.vue              |   29 +-
 pages/short_video/appSwiper/index.nvue        |   33 +-
 pages/short_video/nvueSwiper/index.nvue       |    1 -
 pages/users/login/login_copy.vue              |    6 +-
 pages/users/user_invoice_order_list/index.vue |  172 +++
 static/images/dingdan.png                     |  Bin 0 -> 11055 bytes
 static/images/tishi.png                       |  Bin 0 -> 1858 bytes
 static/images/yanjing.png                     |  Bin 0 -> 358 bytes
 uni_modules/uni-calendar/changelog.md         |   26 +
 .../components/uni-calendar/calendar.js       |  546 +++++++++
 .../components/uni-calendar/i18n/en.json      |   12 +
 .../components/uni-calendar/i18n/index.js     |    8 +
 .../components/uni-calendar/i18n/zh-Hans.json |   12 +
 .../components/uni-calendar/i18n/zh-Hant.json |   12 +
 .../uni-calendar/uni-calendar-item.vue        |  187 +++
 .../components/uni-calendar/uni-calendar.vue  |  566 +++++++++
 .../components/uni-calendar/util.js           |  360 ++++++
 uni_modules/uni-calendar/package.json         |   85 ++
 uni_modules/uni-calendar/readme.md            |  103 ++
 24 files changed, 2860 insertions(+), 343 deletions(-)
 create mode 100644 pages/users/user_invoice_order_list/index.vue
 create mode 100644 static/images/dingdan.png
 create mode 100644 static/images/tishi.png
 create mode 100644 static/images/yanjing.png
 create mode 100644 uni_modules/uni-calendar/changelog.md
 create mode 100644 uni_modules/uni-calendar/components/uni-calendar/calendar.js
 create mode 100644 uni_modules/uni-calendar/components/uni-calendar/i18n/en.json
 create mode 100644 uni_modules/uni-calendar/components/uni-calendar/i18n/index.js
 create mode 100644 uni_modules/uni-calendar/components/uni-calendar/i18n/zh-Hans.json
 create mode 100644 uni_modules/uni-calendar/components/uni-calendar/i18n/zh-Hant.json
 create mode 100644 uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue
 create mode 100644 uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
 create mode 100644 uni_modules/uni-calendar/components/uni-calendar/util.js
 create mode 100644 uni_modules/uni-calendar/package.json
 create mode 100644 uni_modules/uni-calendar/readme.md

diff --git a/config/app.js b/config/app.js
index 92f9f2d..3c22e78 100644
--- a/config/app.js
+++ b/config/app.js
@@ -9,6 +9,7 @@ let httpApiThree
 // 网络接口修改此字符 小程序域名要求https
 // let httpApi = 'http://192.168.31.110:8324' // 测试
 if (process.env.NODE_ENV === "development") {
+	  // httpApi = 'https://shop.lihaink.cn' // 生产
   httpApi = "https://crmeb-test.shop.lihaink.cn"
   // httpApi = "http://192.168.0.222"
   // #ifdef MP-WEIXIN
@@ -21,7 +22,8 @@ if (process.env.NODE_ENV === "development") {
   // httpApiThree = 'baseUrlTest' // h5跨域配置
   // #endif
 } else if (process.env.NODE_ENV === 'production') {
-  httpApi = 'https://shop.lihaink.cn' // 生产
+  // httpApi = 'https://shop.lihaink.cn' // 生产
+  httpApi = "https://crmeb-test.shop.lihaink.cn"
   httpApiTwo = 'https://nk.lihaink.cn' // 生产
   httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
 }
diff --git a/manifest.json b/manifest.json
index 7d2f7f5..fe3cdfb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "CRMEB",
     "appid" : "__UNI__039BCFE",
     "description" : "",
-    "versionName" : "1.0.4",
-    "versionCode" : 127,
+    "versionName" : "1.0.5",
+    "versionCode" : 128,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/admin/order/index.vue b/pages/admin/order/index.vue
index f249337..c44a0b9 100644
--- a/pages/admin/order/index.vue
+++ b/pages/admin/order/index.vue
@@ -1,348 +1,747 @@
 <template>
-  <view>
-    <view class="order-index" ref="container">
-      <view class="header acea-row">
-        <navigator class="item" :url="`/pages/admin/orderList/index?types=1&merId=${mer_id}`" hover-class="none">
-          <view class="num">{{ census.unpaid }}</view>
-          <view>待付款</view>
-        </navigator>
-        <navigator class="item" :url="`/pages/admin/orderList/index?types=2&merId=${mer_id}`" hover-class="none">
-          <view class="num">{{ census.unshipped }}</view>
-          <view>待发货</view>
-        </navigator>
-        <navigator class="item" :url="`/pages/admin/orderList/index?types=3&merId=${mer_id}`" hover-class="none">
-          <view class="num">{{ census.untake }}</view>
-          <view>待收货</view>
-        </navigator>
-        <navigator class="item" :url="`/pages/admin/orderList/index?types=4&merId=${mer_id}`" hover-class="none">
-          <view class="num">{{ census.unevaluate }}</view>
-          <view>待评价</view>
-        </navigator>
-        <navigator class="item" :url="`/pages/admin/orderList/index?types=6&merId=${mer_id}`" hover-class="none">
-          <view class="num">{{ census.refund }}</view>
-          <view>退款</view>
-        </navigator>
-      </view>
-      <view class="wrapper">
-        <view class="title">
-          <span class="iconfont icon-shujutongji"></span>数据统计
-        </view>
-        <view class="list acea-row" v-if="orderData">
-          <navigator class="item" :url="`/pages/admin/statistics/index?type=price&time=today&merId=${mer_id}`"
-            hover-class="none">
-            <view class="num">{{ orderData.today.payPrice }}</view>
-            <view>今日成交额</view>
-          </navigator>
-          <navigator class="item" :url="`/pages/admin/statistics/index?type=price&time=yesterday&merId=${mer_id}`"
-            hover-class="none">
-            <view class="num">{{ orderData.yesterday.payPrice }}</view>
-            <view>昨日成交额</view>
-          </navigator>
-          <navigator class="item" :url="`/pages/admin/statistics/index?type=price&time=month&merId=${mer_id}`"
-            hover-class="none">
-            <view class="num">{{ orderData.month.payPrice  }}</view>
-            <view>本月成交额</view>
-          </navigator>
-          <navigator class="item" :url="`/pages/admin/statistics/index?type=order&time=today&merId=${mer_id}`"
-            hover-class="none">
-            <view class="num">{{ orderData.today.orderNum}}</view>
-            <view>今日订单数</view>
-          </navigator>
-          <navigator class="item" :url="`/pages/admin/statistics/index?type=order&time=yesterday&merId=${mer_id}`"
-            hover-class="none">
-            <view class="num">{{ orderData.yesterday.orderNum }}</view>
-            <view>昨日订单数</view>
-          </navigator>
-          <navigator class="item" :url="`/pages/admin/statistics/index?type=order&time=month&merId=${mer_id}`"
-            hover-class="none">
-            <view class="num">{{ orderData.month.orderNum}}</view>
-            <view>本月订单数</view>
-          </navigator>
-        </view>
-      </view>
-      <view class="public-wrapper">
-        <view class="title">
-          <span class="iconfont icon-xiangxishuju"></span>详细数据
-        </view>
-        <view class="nav acea-row row-between-wrapper">
-          <view class="data">日期</view>
-          <view class="browse">订单数</view>
-          <view class="turnover">成交额</view>
-        </view>
-        <view class="conter">
-          <view class="item acea-row row-between-wrapper" v-for="(item, index) in list" :key="index">
-            <view class="data">{{ item.day }}</view>
-            <view class="browse">{{ item.total }}</view>
-            <view class="turnover">{{ item.pay_price }}</view>
-          </view>
-        </view>
-      </view>
-      <Loading :loaded="loaded" :loading="loading"></Loading>
-    </view>
-  </view>
+	<view class="box">
+		<view class="bg">
+			<view class="head">
+				<view class="head_top">
+					账户余额(元)
+					<image src="@/static/images/yanjing.png" class="yanjing" mode=""></image>
+				</view>
+				<view class="pirc">666666666666</view>
+				<view class="tubiao">
+					<!-- <image src="@/static/images/tishi.png" mode="widthFix"></image> -->
+					<view class="zhi">
+						可提现金额 <span>115.00</span> 元
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="conet">
+			<ul>
+				<li>
+					<span>商户收入(元)</span>
+					<view class="pic">100.00</view>
+				</li>
+				<li class="kuang"><span>冻结金额(元)</span>
+					<view class="pic">100.00</view>
+				</li>
+				<li><span>优惠券补贴(元)</span>
+					<view class="pic">100.00</view>
+				</li>
+				<li><span>退款支出(元)</span>
+					<view class="pic">100.00</view>
+				</li>
+				<li class="kuang"><span>佣金支出(元)</span>
+					<view class="pic">100.00</view>
+				</li>
+				<li><span>平台手续费(元)</span>
+					<view class="pic">100.00</view>
+				</li>
+			</ul>
+		</view>
+		<view class="footer">
+			<view class="footer_top">
+				<view class="top_left">
+					账单数据
+				</view>
+				<view class="top_reight" @click="riqipop">
+					日期选择
+					<u-icon name="arrow-down-fill" color="#999999" size="12" style="margin-left: 3px;"></u-icon>
+				</view>
+			</view>
+			<view class="footer_b">
+				<view class="bon_top">
+					<!-- #ifdef MP-WEIXIN -->
+					<view :class="left" @click="riqi(1)">
+						日账单
+					</view>
+					<view :class="reight" @click="riqi(2)">
+						月账单
+					</view>
+					<!-- #endif -->
+					<!-- #ifdef H5 -->
+					<view :class="this.left" @click.stop="riqi(1)">
+						日账单
+					</view>
+					<view :class="this.reight" @click.stop="riqi(2)">
+						月账单
+					</view>
+					<!-- #endif -->
+					<!-- #ifdef APP-PLUS -->
+					<view :class="this.left" @click.stop="riqi(1)">
+						日账单
+					</view>
+					<view :class="this.reight" @click.stop="riqi(2)">
+						月账单
+					</view>
+					<!-- #endif -->
+				</view>
+				<view v-if="Riqi == 1" class="bon_bon">
+					<scroll-view scroll-y="true" class="scroll-Y">
+						<view class="bon_shuju">
+							<view class="top">
+								<view class="xiangqin" @click="todetails">
+									账单详情
+								</view>
+								<view class="riqi">
+									账单日期:
+									<span>2020.20.22</span>
+								</view>
+							</view>
+							<view class="bottom">
+								<view class="left">
+									收入金额(元)
+									<view>100.00</view>
+								</view>
+								<view class="reight">
+									<p>
+										支出金额: <span>0.00</span> 元
+									</p>
+									<p>
+										入账金额: <span>100.00</span> 元
+									</p>
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+				<view v-else class="bon_bon">
+					<scroll-view scroll-y="true" class="scroll-Y">
+						<view class="bon_shuju">
+							<view class="top">
+								<view class="xiangqin" @click="todetails">
+									账单详情
+								</view>
+								<view class="riqi">
+									账单月份:
+									<span>2020.20</span>
+								</view>
+							</view>
+							<view class="bottom">
+								<view class="left">
+									收入金额(元)
+									<view>100.00</view>
+								</view>
+								<view class="reight">
+									<p>
+										支出金额: <span>0.00</span> 元
+									</p>
+									<p>
+										入账金额: <span>100.00</span> 元
+									</p>
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+		<uni-calendar ref="calendar" :insert="false" @confirm="confirm" />
+	</view>
 </template>
 
 <script>
-  import { getStatisticsInfo, getStatisticsMonth, orderStatistics, orderPrice } from "@/api/admin";
-  import Loading from '@/components/Loading/index.vue'
-  export default {
-    name: 'adminOrder',
-    components: {
-      Loading
-    },
-    data() {
-      return {
-        census: {},
-        orderData: {
-          today: {},
-          yesterday: {},
-          month: {}
-        },
-        list: [],
-        where: {
-          page: 1,
-          limit: 15,
-          product_type: ''
-        },
-        loaded: false,
-        loading: false,
-        mer_id: '',
-      }
-    },
-    onLoad(options) {
-      this.where.product_type = options.product_type ?? 0
-      this.mer_id = options.mer_id
-      options.product_type ? uni.setStorageSync("PRODUCT_TYPE", 98) : uni.removeStorageSync("PRODUCT_TYPE");
-      this.getOrderStatistics(this.mer_id);
-      this.getList(this.mer_id)
-    },
-    methods: {
-      getIndex: function() {
-        var that = this;
-        getStatisticsInfo().then(
-          res => {
-            that.census = res.data;
-          },
-          err => {
-            that.$util.Tips({
-              title: err.msg
-            })
-          }
-        );
-      },
-      getList: function(mer_id) {
-        var that = this;
-        if (that.loading || that.loaded) return;
-        that.loading = true;
-        orderPrice(that.where, mer_id).then(
-          res => {
-            that.loading = false;
-            that.loaded = res.data.length < that.where.limit;
-            that.list.push.apply(that.list, res.data);
-            that.where.page = that.where.page + 1;
-          },
-          error => {
-            that.$util.Tips({
-              title: error.msg
-            })
-          },
-          300
-        );
-      },
-      getOrderStatistics: function(mer_id) {
-        let that = this;
-        const data = { product_type: this.where.product_type }
-        // console.log('data', data);
-        orderStatistics(mer_id, data).then(
-          res => {
-            that.census = res.data.order;
-            that.orderData = res.data.data;
-          },
-          err => {
-            that.$util.Tips({
-              title: err.msg
-            })
-          }
-        );
-      }
-    },
-    onReachBottom() {
-      this.getList(this.mer_id)
-    }
-  }
+	// import {
+	// 	finaHeaderDataApi
+	// } from "@/api/admin";
+	export default {
+		data() {
+			return {
+				mer_id: '',
+				//日期
+				Riqi: 1,
+				left: 'haver',
+				reight: 'reight',
+			}
+		},
+		onLoad(options) {
+			this.mer_id = options.mer_id
+			// this.getHeaderData()
+		},
+		methods: {
+			//跳转详情
+			todetails() {
+				uni.navigateTo({
+					url: `/pages/users/user_invoice_order_list/index?mer_id=${this.mer_id}`
+				})
+			},
+			//日期菜单
+			riqi(e) {
+				this.Riqi = e
+				if (e == 1) {
+					this.left = 'haver'
+					this.reight = 'reight'
+				} else {
+					this.left = 'left'
+					this.reight = 'havers'
+				}
+			},
+			riqipop() {
+				this.$refs.calendar.open();
+			},
+			//日期
+			confirm(e) {
+				console.log(e);
+			},
+			//账单数据
+			// getHeaderData() {
+			// 	finaHeaderDataApi({
+			// 		date: this.tableForm.date
+			// 	}).then(res =>{
+			// 		console.log(res);
+			// 	}).catch(err => {
+			// 	})
+			// },
+		},
+	}
 </script>
 
-<style lang="scss">
-  .popupn {
-    position: fixed;
-    width: 100%;
-    text-align: center;
-    top: 0;
-    left: 0;
-    background: transparent;
-    height: 90rpx;
-    line-height: 90rpx;
-    z-index: 100;
+<style lang="scss" scoped>
+	* {
+		padding: 0;
+		margin: 0;
+	}
 
-    .spin {
-      display: block;
-      transform: rotate(180deg);
-      font-size: 36rpx;
-    }
+	.box {
+		height: 60vh;
+		background-color: #fff;
+	}
 
-    .title {
-      max-width: 560rpx;
-      margin: 0 auto;
-      position: relative;
-      display: inline;
-      padding: 10rpx 30rpx 10rpx 50rpx;
-      background-color: rgba(0, 0, 0, 0.15);
-      border-radius: 30rpx;
-      color: #fff;
-    }
+	/* #ifdef MP-WEIXIN */
+	.box {
+		height: 60vh;
+		background-color: #fff;
+	}
 
-    .iconfont {
-      display: inline-block;
-      position: relative;
-      top: 4rpx;
-      right: 0;
-    }
+	/* #endif */
+	.bg {
+		width: 100%;
+		height: 504rpx;
+		background: url(@/static/images/dingdan.png);
 
-    .mer_logo {
-      width: 34rpx;
-      height: 34rpx;
-      position: relative;
-      top: 6rpx;
-      right: 10px;
-    }
+		.head {
+			color: white;
+			padding-top: 30px;
 
-    .mer_name {
-      display: inline-block;
-      max-width: 650rpx;
-    }
+			.head_top {
+				width: 100%;
+				height: 40px;
+				display: flex;
+				justify-content: center;
+				align-items: center;
 
-    .invoice-content {
-      background-color: #ffffff;
-    }
-  }
+				.yanjing {
+					margin-left: 10px;
+					width: 35rpx;
+					height: 35rpx;
 
-  /*订单首页*/
-  .order-index .header {
-    background-image: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/beijing2.png");
-    background-size: 100% 100%;
-    width: 100%;
-    height: 280upx;
-    padding: 40upx 3upx 0 3upx;
-    box-sizing: border-box;
-  }
+				}
+			}
 
-  .order-index .header .item {
-    flex: 1;
-    -webkit-flex: 1;
-    -o-flex: 1;
-    -ms-flex: 1;
-    text-align: center;
-    font-size: 24upx;
-    color: #fff;
-  }
+			.pirc {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 60rpx;
+				margin-top: 30rpx;
+			}
 
-  .order-index .header .item .num {
-    font-size: 40upx;
-    margin-bottom: 7upx;
-    height: 60rpx;
-  }
+			.tubiao {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: relative;
+				margin: auto;
+				margin-top: 16px;
+				width: 290rpx;
+				height: 75rpx;
+				background: url(@/static/images/tishi.png);
 
-  .order-index .wrapper {
-    width: 690upx;
-    background-color: #fff;
-    border-radius: 10upx;
-    margin: -115upx auto 0 auto;
-    padding-top: 25upx;
-  }
+				.zhi {
+					position: absolute;
+					font-size: 25rpx;
 
-  .order-index .wrapper .title {
-    font-size: 30upx;
-    color: #282828;
-    padding: 0 30upx;
-    margin-bottom: 40upx;
-  }
+					span {
+						margin-left: 5px;
+						margin-right: 5px;
+					}
+				}
 
-  .order-index .wrapper .title .iconfont {
-    color: #2291f8;
-    font-size: 40upx;
-    margin-right: 13upx;
-    vertical-align: middle;
-  }
 
-  .order-index .wrapper .list .item {
-    width: 33.33%;
-    text-align: center;
-    font-size: 24upx;
-    color: #999;
-    margin-bottom: 45upx;
-  }
+			}
 
-  .order-index .wrapper .list .item .num {
-    font-size: 40upx;
-    color: #333;
-  }
+			/* #ifdef MP-WEIXIN */
+			.tubiao {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: relative;
+				margin: auto;
+				margin-top: 16px;
+				width: 320rpx;
+				height: 80rpx;
+				background: url(@/static/images/tishi.png);
 
-  .public-wrapper .title {
-    font-size: 30upx;
-    color: #282828;
-    padding: 0 30upx;
-    margin-bottom: 20upx;
-  }
+				.zhi {
+					position: absolute;
+					font-size: 25rpx;
 
-  .public-wrapper .title .iconfont {
-    color: #2291f8;
-    font-size: 40upx;
-    margin-right: 13upx;
-    vertical-align: middle;
-  }
+					span {
+						margin-left: 5px;
+						margin-right: 5px;
+					}
+				}
 
-  .public-wrapper {
-    margin: 18upx auto 0 auto;
-    width: 690upx;
-    background-color: #fff;
-    border-radius: 10upx;
-    padding-top: 25upx;
-  }
 
-  .public-wrapper .nav {
-    padding: 0 30upx;
-    height: 70upx;
-    line-height: 70upx;
-    font-size: 24upx;
-    color: #999;
-  }
+			}
 
-  .public-wrapper .data {
-    width: 210upx;
-    text-align: left;
-  }
+			/* #endif */
+			/* #ifdef APP-PLUS */
+			.tubiao {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: relative;
+				margin: auto;
+				margin-top: 15px;
+				width: 307rpx;
+				height: 78rpx;
+				background: url(@/static/images/tishi.png);
 
-  .public-wrapper .browse {
-    width: 192upx;
-    text-align: right;
-  }
+				.zhi {
+					position: absolute;
+					font-size: 25rpx;
 
-  .public-wrapper .turnover {
-    width: 227upx;
-    text-align: right;
-  }
+					span {
+						margin-left: 5px;
+						margin-right: 5px;
+					}
+				}
 
-  .public-wrapper .conter {
-    padding: 0 30upx;
-  }
 
-  .public-wrapper .conter .item {
-    border-bottom: 1px solid #f7f7f7;
-    height: 70upx;
-    font-size: 24upx;
-  }
+			}
 
-  .public-wrapper .conter .item .turnover {
-    color: #d84242;
-  }
+			/* #endif */
+		}
+
+	}
+
+	.conet {
+		width: 694rpx;
+		height: 252rpx;
+		background-color: white;
+		position: absolute;
+		top: 190px;
+		left: 15px;
+		border-radius: 15px;
+		box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(203, 30, 20, 0.1);
+
+		ul {
+			display: flex;
+			flex-wrap: wrap;
+			list-style: none;
+
+			li {
+				text-align: center;
+				margin-left: 6px;
+				margin-top: 19px;
+				width: 120px;
+
+				span {
+					font-size: 25rpx;
+
+				}
+
+				.pic {
+					font-size: 32rpx;
+					color: #F84221;
+					margin-top: 3px;
+				}
+			}
+
+			.kuang {
+				border-left: 1px solid #999999;
+				border-right: 1px solid #999999;
+			}
+		}
+
+		/* #ifdef MP-WEIXIN */
+		ul {
+			display: flex;
+			flex-wrap: wrap;
+			list-style: none;
+
+			li {
+				text-align: center;
+				margin-left: 6px;
+				margin-top: 15px;
+				width: 105px;
+
+				span {
+					font-size: 25rpx;
+
+				}
+
+				.pic {
+					font-size: 32rpx;
+					color: #F84221;
+					margin-top: 3px;
+				}
+			}
+
+			.kuang {
+				border-left: 1px solid #999999;
+				border-right: 1px solid #999999;
+			}
+		}
+
+		/* #endif */
+		/* #ifdef APP-PLUS */
+		ul {
+			display: flex;
+			flex-wrap: wrap;
+			list-style: none;
+
+			li {
+				text-align: center;
+				margin-left: 6px;
+				margin-top: 15px;
+				width: 115px;
+
+				span {
+					font-size: 25rpx;
+
+				}
+
+				.pic {
+					font-size: 32rpx;
+					color: #F84221;
+					margin-top: 3px;
+				}
+			}
+
+			.kuang {
+				border-left: 1px solid #999999;
+				border-right: 1px solid #999999;
+			}
+		}
+
+		/* #endif */
+	}
+
+	.footer {
+		width: 100%;
+		position: absolute;
+		top: 370px;
+
+		.footer_top {
+			width: 694rpx;
+			display: flex;
+			justify-content: space-between;
+			box-sizing: border-box;
+
+
+			.top_left {
+				font-size: 32rpx;
+				font-weight: bold;
+				margin-left: 20px;
+				padding-left: 5px;
+				border-left: 3px solid #F84221;
+			}
+
+			.top_reight {
+				width: 100px;
+				color: #999999;
+				background-color: #F5F5F5;
+				border-radius: 10px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+			}
+		}
+
+		.footer_b {
+			width: 100%;
+			margin-top: 20px;
+
+			.bon_top {
+				color: #F84221;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.left {
+					width: 85px;
+					height: 30px;
+					text-align: center;
+					line-height: 30px;
+					font-size: 28rpx;
+					border: 1px solid #F45346;
+					border-radius: 15px 0 0 15px;
+				}
+
+				.reight {
+					width: 85px;
+					height: 30px;
+					text-align: center;
+					line-height: 30px;
+					font-size: 28rpx;
+					border: 1px solid #F45346;
+					border-radius: 0 15px 15px 0;
+				}
+
+				.haver {
+					width: 85px;
+					height: 30px;
+					text-align: center;
+					line-height: 30px;
+					font-size: 28rpx;
+					border: 1px solid #F45346;
+					border-radius: 15px 0 0 15px;
+					color: #fff;
+					background-image: linear-gradient(90deg, #F98649 0%, #F34E45 100%);
+				}
+
+				.havers {
+					width: 85px;
+					height: 30px;
+					text-align: center;
+					line-height: 30px;
+					font-size: 28rpx;
+					border: 1px solid #F45346;
+					border-radius: 0 15px 15px 0;
+					color: #fff;
+					background-image: linear-gradient(90deg, #F34E45 0%, #F98649 100%);
+				}
+			}
+
+		}
+
+		.bon_bon {
+			width: 100%;
+			height: 20px;
+			background-color: #fff;
+			margin-top: 15px;
+
+			.scroll-Y {
+				max-height: 50vh;
+
+				.bon_shuju {
+					padding-top: 10px;
+					padding-bottom: 10px;
+					background-color: #fff;
+					margin-bottom: 20px;
+
+					.top {
+						margin-left: 20px;
+						display: flex;
+						justify-content: flex-start;
+
+						.xiangqin {
+							color: #fff;
+							width: 137rpx;
+							height: 49rpx;
+							text-align: center;
+							line-height: 49rpx;
+							margin-right: 15px;
+							background: linear-gradient(95deg, #F98649 0%, #F34E45 100%);
+							border-radius: 26rpx 26rpx 26rpx 26rpx;
+						}
+
+						.riqi {
+							height: 49rpx;
+							text-align: center;
+							line-height: 49rpx;
+							font-size: 25rpx;
+
+							span {
+								margin-left: 10px;
+							}
+						}
+					}
+
+					.bottom {
+						display: flex;
+						justify-content: space-evenly;
+						margin-top: 20px;
+
+						.left {
+							font-size: 25rpx;
+							color: #666666;
+
+							view {
+								font-size: 42rpx;
+								color: #F84221;
+								font-weight: 500;
+							}
+						}
+
+						.reight {
+							p {
+								margin-bottom: 7px;
+
+								span {
+									margin-left: 6px;
+								}
+							}
+
+						}
+					}
+				}
+			}
+
+
+
+		}
+	}
+
+	/* #ifdef MP-WEIXIN */
+	.footer {
+		width: 100%;
+		position: absolute;
+		top: 340px;
+
+		.footer_top {
+			width: 694rpx;
+			display: flex;
+			justify-content: space-between;
+			box-sizing: border-box;
+
+
+			.top_left {
+				font-size: 32rpx;
+				font-weight: bold;
+				margin-left: 20px;
+				border-left: 3px solid #F84221;
+			}
+
+			.top_reight {
+				width: 100px;
+				color: #999999;
+				background-color: #F5F5F5;
+				border-radius: 10px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+			}
+		}
+
+		.footer_b {
+			width: 100%;
+			margin-top: 20px;
+
+			.bon_top {
+				color: #F84221;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.left {
+					width: 85px;
+					height: 30px;
+					text-align: center;
+					line-height: 30px;
+					font-size: 28rpx;
+					border: 1px solid #F45346;
+					border-radius: 15px 0 0 15px;
+				}
+
+				.reight {
+					width: 85px;
+					height: 30px;
+					text-align: center;
+					line-height: 30px;
+					font-size: 28rpx;
+					border: 1px solid #F45346;
+					border-radius: 0 15px 15px 0;
+				}
+
+				.haver {
+					color: #fff;
+					background-image: linear-gradient(90deg, #F98649 0%, #F34E45 100%);
+				}
+
+				.havers {
+					color: #fff;
+					background-image: linear-gradient(90deg, #F34E45 0%, #F98649 100%);
+				}
+			}
+		}
+
+		.bon_bon {
+			width: 100%;
+			height: 20px;
+			background-color: #fff;
+			margin-top: 15px;
+
+			.scroll-Y {
+				max-height: 50vh;
+
+				.bon_shuju {
+					padding-top: 10px;
+					padding-bottom: 10px;
+					background-color: #fff;
+					margin-bottom: 20px;
+
+					.top {
+						margin-left: 20px;
+						display: flex;
+						justify-content: flex-start;
+
+						.xiangqin {
+							color: #fff;
+							width: 137rpx;
+							height: 49rpx;
+							text-align: center;
+							line-height: 49rpx;
+							margin-right: 15px;
+							background: linear-gradient(95deg, #F98649 0%, #F34E45 100%);
+							border-radius: 26rpx 26rpx 26rpx 26rpx;
+						}
+
+						.riqi {
+							height: 49rpx;
+							text-align: center;
+							line-height: 49rpx;
+							font-size: 25rpx;
+						}
+					}
+
+					.bottom {
+						display: flex;
+						justify-content: space-evenly;
+						margin-top: 20px;
+
+						.left {
+							font-size: 25rpx;
+							color: #666666;
+
+							view {
+								font-size: 42rpx;
+								color: #F84221;
+								font-weight: 500;
+							}
+						}
+
+						.reight {
+							p {
+								margin-bottom: 7px;
+
+								span {
+									margin-left: 6px;
+								}
+							}
+
+						}
+					}
+				}
+			}
+
+
+
+		}
+	}
+
+	/* #endif */
 </style>
\ No newline at end of file
diff --git a/pages/columnGoods/goods_search_con/index.vue b/pages/columnGoods/goods_search_con/index.vue
index b508402..3217380 100644
--- a/pages/columnGoods/goods_search_con/index.vue
+++ b/pages/columnGoods/goods_search_con/index.vue
@@ -142,7 +142,7 @@
 				<view v-if="storeList.length" class="store-wrapper">
 					<view class="store-item" v-for="(item,index) in storeList" :key="index">
 						<view class="head">
-							<view class="bgc_img" :style="{ backgroundImage: `url(${item.mer_banner})`}">
+							<view class="bgc_img" :style="{ backgroundImage: `url(${item.mini_banner})`}">
 								<view class="head_conent">
 									<view class="head_conent_l" @click="goStore(item.mer_id)">
 										<view class="conent_l_top">
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 06561bf..dbf2776 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -44,7 +44,7 @@
 				<view class="store-wrapper">
 					<view class="store-item" v-for="(item,index) in storeList" :key="index">
 						<view class="head">
-							<view class="bgc_img" :style="{ backgroundImage: `url(${item.mer_banner})`}">
+							<view class="bgc_img" :style="{ backgroundImage: `url(${item.mini_banner})`}">
 								<view class="head_conent">
 									<view class="head_conent_l" @click="goStore(item.mer_id)">
 										<view class="conent_l_top">
diff --git a/pages/product/addGoods/index.vue b/pages/product/addGoods/index.vue
index af0c7da..59fb8cd 100644
--- a/pages/product/addGoods/index.vue
+++ b/pages/product/addGoods/index.vue
@@ -22,7 +22,7 @@
 					<view class="input_content_photo">
 						<view class="input_content_photo_adPh" v-for="(item, index) in setFormData.imageList"
 							:key="index">
-							<image :src="item" class="myimg2 photos"></image>
+							<image :src="item" class="myimg2 photos" @click="pop(item)"></image>
 							<view class="input_content_photo_adPh_jiao" @click="deleteImage(index)">
 								<image src="../static/images/close.png" mode=""></image>
 							</view>
@@ -36,7 +36,10 @@
 						</view>
 					</view>
 				</view>
-
+				<u-popup class="pop" :show="show" @close="close" mode="center" bgColor='transparent'>
+					<image :src="image"></image>
+					<image src="@/static/images/guanbi.png" class="guanbi" @click="close"></image>
+				</u-popup>
 				<view class="input_content_describe">
 					<view class="input_content_describe_title">
 						<view class="input_content_describe_title_msg">商品简介</view>
@@ -84,7 +87,7 @@
 					</view>
 				</view>
 
-		<!-- 		<view class="popup_group_item" @click="selectBrand">
+				<!-- 		<view class="popup_group_item" @click="selectBrand">
 					<view class="popup_group_item_label">商品品牌</view>
 					<view class="popup_group_item_value">
 						<view class="popup_group_item_message">
@@ -389,7 +392,9 @@
 				secoundModel: false,
 				resetKey: false,
 				imgName: "",
-				code: ''
+				code: '',
+				show: false, //质资弹出层
+				image: '' //图片
 			};
 		},
 		onLoad(opt) {
@@ -448,6 +453,11 @@
 			}
 		},
 		methods: {
+			//图片预览
+			pop(e) {
+				this.show = true
+				this.image = e
+			},
 			// 获取数据
 			async initClasiffy() {
 				//获取商户分类
@@ -673,6 +683,7 @@
 			// 关闭弹框
 			close() {
 				this.$refs.select_popup.close();
+				this.show = false
 			},
 			// 拼接字符串
 			getLinkDataOfRecursion(arr, child = 'children', key = 'value') {
@@ -867,4 +878,14 @@
 
 <style lang="scss" scoped>
 	@import './scss/index.scss';
+
+	.pop {
+		z-index: 1;
+	}
+	.guanbi {
+		width: 20px;
+		height: 20px;
+		margin: 30px auto;
+	}
+	
 </style>
\ No newline at end of file
diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue
index 8da9de7..869e5f5 100644
--- a/pages/short_video/appSwiper/index.nvue
+++ b/pages/short_video/appSwiper/index.nvue
@@ -241,10 +241,10 @@
       </list>
     </view>
 
-    <waterfall class="video-list" v-if="currentNav == 3" column-gap="6" column-count="2" :show-scrollbar="false"
-      column-width="195px" :style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;'">
-      <cell class="goods_item" style="margin-bottom: 10px;" v-for="item in cateGoods" :key="item.uid"
-        @click="gogogo(item)">
+    <waterfall class="video-list" v-if="currentNav === 3" column-gap="6" column-count="2" :show-scrollbar="false" @loadmore="getGoods()"
+      column-width="195px" :style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;'" >
+      <cell class="goods_item" style="margin-bottom: 10px;" v-for="(item,index) in cateGoods" :key="item.uid"
+        @click="gogogo(item)" >
         <image class="goods_img" :src="item.image[0]" mode="aspectFill"></image>
         <view class="botm">
           <text class="title">{{item.title}}</text>
@@ -261,6 +261,7 @@
           </view>
         </view>
       </cell>
+	
     </waterfall>
 
     <!-- <waterfall class="video-list" v-if="currentNav == 3" column-gap="6" column-count="2" column-width="auto"
@@ -400,7 +401,7 @@
         where: {
           category_id: -1,
           page: 1,
-          limit: 10
+          limit: 5
         },
       }
     },
@@ -451,6 +452,7 @@
       // console.log('到后台');
     },
     onLoad(options) {
+		console.log(options);
       this.videoID = options.id || 0;
       this.isUser = options.user == 1 ? true : false;
       this.userUid = options.uid ? options.uid : 0;
@@ -486,10 +488,15 @@
         this.videoID = item.community_id
         this.navTap(1)
       },
-      async getGoods() {
-        const { data } = await graphicLstApi(this.where)
-        data.list.length > 0 ? this.loadVideo = true : this.loadVideo = false
-        this.cateGoods = data.list
+      async getGoods(index) {
+		  console.log(index);
+       const {
+       	data
+       } = await graphicLstApi(this.where)
+       this.cateGoods.push(...data.list)
+       this.where.page++
+	   console.log(this.where.page);
+   
       },
       goBack: function() {
         uni.navigateBack();
@@ -660,10 +667,10 @@
               duration: 2000
             });
           }) :
-          videoList({
+          graphicLstApi({
             page: that.page,
             limit: that.limit,
-            id: that.videoID
+            category_id: -1
           }).then(res => {
             that.getVideoData(res.data.list);
           }).catch(err => {
@@ -854,10 +861,10 @@
               duration: 2000
             });
           }) :
-          videoList({
+          graphicLstApi({
             page: this.page,
             limit: this.limit,
-            id: this.videoID
+            category_id: -1
           }).then(async (res) => {
             this.page = this.page + 1;
             var msg = res.data.list;
diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue
index 3dad7cb..ae8aa4a 100644
--- a/pages/short_video/nvueSwiper/index.nvue
+++ b/pages/short_video/nvueSwiper/index.nvue
@@ -428,7 +428,6 @@
 			}
 		},
 		onLoad(options) {
-			// console.log(options);
 			this.getOptions(options);
 			this.videoID = options.id;
 			this.isUser = options.user == 1 ? true : false;
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index 132b7b1..469e228 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -47,7 +47,7 @@
 						<div class="acea-row row-middle">
 							<image src="/static/images/code_2.png"></image>
 							<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="captcha" />
-							<button v-debounce class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
+							<button  class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
 								{{ text }}
 							</button>
 						</div>
@@ -61,8 +61,8 @@
 					</div>
 				</div>
 		
-				<div class="logon" v-debounce @click="loginMobile" :hidden="current !== 1">登录</div>
-				<div class="logon" v-debounce @click="submit" :hidden="current === 1">登录</div>
+				<div class="logon" @click="loginMobile" :hidden="current !== 1">登录</div>
+				<div class="logon"  @click="submit" :hidden="current === 1">登录</div>
 				<div class="protocol acea-row row-between-wrapper">
 					<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
 						<checkbox class="checkbox" :checked="isAgree ? true : false" />
diff --git a/pages/users/user_invoice_order_list/index.vue b/pages/users/user_invoice_order_list/index.vue
new file mode 100644
index 0000000..974d36e
--- /dev/null
+++ b/pages/users/user_invoice_order_list/index.vue
@@ -0,0 +1,172 @@
+<template>
+	<view class="head">
+		<view class="head_top">
+			<view class="top_left">
+				账单明细
+				<span>
+					2023-06-15
+				</span>
+			</view>
+
+			<view class="top_reight" @click="riqipop">
+				日期选择
+				<u-icon name="arrow-down-fill" color="#999999" size="12" style="margin-left: 3px;"></u-icon>
+			</view>
+		</view>
+		<view class="conent">
+			<view class="c_top">
+				<h3>收入总金额(元)<span>{{100.00}}</span></h3>
+				<p>订单支付: {{100.00}} 元 ({{1}}笔)</p>
+				<p>优惠券补贴：{{0.00}} 元（{{0}}笔）</p>
+				<p>会员优惠券补贴：{{0.00}} 元（{{0}}笔）</p>
+			</view>
+			<view class="c_bottom">
+				<h3>支出总金额(元)<span>{{100.00}}</span></h3>
+				<p>平台手续费: {{100.00}} 元 ({{1}}笔)</p>
+				<p>佣金：{{0.00}} 元（{{0}}笔）</p>
+				<p>商户退款：{{0.00}} 元（{{0}}笔）</p>
+				<p>退还优惠券补贴：{{0.00}} 元（{{0}}笔）</p>
+			</view>
+			<view class="c_footer">
+				应入账总金额(元): <span>{{100.00}}</span>
+			</view>
+		</view>
+			<uni-calendar 
+			ref="calendar"
+			:insert="false"
+			@confirm="confirm"
+			 />
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		onLoad(option) {
+			
+		},
+		methods: {
+			riqipop() {
+
+				this.$refs.calendar.open();
+
+			},
+			//日期
+			confirm(e) {
+				console.log(e);
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	* {
+		padding: 0;
+		margin: 0;
+	}
+
+	.head {
+		width: 100%;
+		height: 100vh;
+
+		.head_top {
+			width: 90%;
+			height: 50px;
+			margin: auto;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.top_left {
+				padding-left: 5px;
+				border-left: 3px solid #F84221;
+
+				span {
+					margin-left: 10px;
+				}
+			}
+
+			.top_reight {
+				width: 100px;
+				color: #999999;
+				background-color: #ffffff;
+				border-radius: 10px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+			}
+		}
+
+		.conent {
+			width: 90%;
+			height: 320px;
+			margin: auto;
+			background-color: #ffffff;
+			border-radius: 14rpx;
+
+			.c_top {
+				padding-top: 10px;
+				padding-left: 10px;
+
+				h3 {
+					font-size: 28rpx;
+					font-weight: 400;
+					margin-bottom: 10px;
+
+					span {
+						margin-left: 10px;
+						font-size: 35rpx;
+						color: #FE9A10;
+					}
+				}
+
+				p {
+					margin-bottom: 4px;
+				}
+			}
+
+			.c_bottom {
+				padding-top: 20px;
+				padding-left: 10px;
+
+				h3 {
+					font-size: 28rpx;
+					font-weight: 400;
+					margin-bottom: 10px;
+
+					span {
+						margin-left: 10px;
+						font-size: 35rpx;
+						color: #FE9A10;
+					}
+				}
+
+				p {
+					margin-bottom: 4px;
+				}
+			}
+
+			.c_footer {
+				display: flex;
+				justify-content: flex-end;
+				padding-right: 20px;
+				align-items: center;
+				margin-top: 15px;
+
+				span {
+					margin-left: 7px;
+					font-size: 42rpx;
+					color: #F84221;
+					font-weight: 500;
+				}
+
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/static/images/dingdan.png b/static/images/dingdan.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd194bb9672e1d644662e7c2c494b08db3d37f05
GIT binary patch
literal 11055
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

literal 0
HcmV?d00001

diff --git a/static/images/tishi.png b/static/images/tishi.png
new file mode 100644
index 0000000000000000000000000000000000000000..2517d0407cd0e69f471166e2aa83282afd45347b
GIT binary patch
literal 1858
zcmV-I2fg@-P)<h;3K|Lk000e1NJLTq005u>001Wl1^@s6h<Za!00001b5ch_0Itp)
z=>Px*{7FPXRCr$PoXd|CRTRd*)6)Y3Xe3e5t%(Q(7NQG7*yzG!T$(7dFlscCC<Gat
z9vNY<6Gmb%iV8|lVT4hL@CPVvG-{&3AR2XHqDZ2Vhan-#Yhb#M>FTcPN4?Iey0@z*
zJ-q>%s(b64`@7$F?(M1~On(w*fC0kW8{fj}m)8=&i5u$T6RC@1PaQh%9C;FiJzzXV
zYqso7-C!3sFb!bBLFetoxtLk{70mMhI*Y443uvHtK4EiRd)hRB35T9{ZF&QY=fG|X
z`Au3qx-MaJU3=OzfC+}4cfGg-<=k-)^3}@EsQ@R@Q(8*TZ2dVwlU;ktG=K?)p5NK@
zIe>eeQ#}Q&{GGp`HKX?>XtHZhnFdff^t^Lq1#<kccbcn!?iY+lXw8;G%4WOva4~?q
zd(~{rnA?vW`ccN+$l*3Ht^?3pAB>RZd>a(C<H9yByzg7ui#$G{@4(|T?mIT-nx!`)
zX)11Q-?7I#xx5D80>CH0xnm%Fii?v+s93xtnN_g>^7{j~Bj39Lgp~m1MDBJq+EHWz
z4MR|^!Gb@D;co$<(;#r{KLA$m`_^>W$Wh3o=L(QGh;r!_8ZMrQ0x=Xo9xL`Cckv~F
z)&rQ))JW)Hm{!1)5Cjf}Vfal!;Jem_Ty`4#Vuzv$p!_QO{u!mUJ0^la3?zmRJiic=
zxx-*Ash%XYLel_BZM9`FU_^aW!XIY;BBhq*TcdymbEH*YrXSJU^AN2c{w+Y4o4?|{
zg}ac)5db&oB;H_vO@ky*0w*D+;kN`}s71P#>W+sXZd2;3EmO1rR!gKa;PU;nVe?Oo
z#5Ii??-^QvUj7Qe&CWq$sjW3>3IcV28USlxX_d&f4JOLBAq8xQ{a5=qg&Z%Z!pI-K
zX~u^JX5n)FI}jFogk}X`m;y$sM~5k3=(S2010A4%v1+X-k?LjK_qa5<jEcppP1A?>
z4Za3)7991DZ2)5f44C1m7eE;+peSY=_TK?<*U1{Cp-m%Rl(j`i#hdf(0Wc;RiR>sN
z1$3@e+IN-^L|mtJ3-$@g1WJ<&X}EaO$sCUlj)UpZCiqN3kT^h%0tOtLr40u5E!_gr
zC}4-h9ku!2tZut#XyjSqv2}Bi?>z-ZpEUs6@{5FJ6^gV@%Y7SJ0NGGqg+R1!<pKX9
zf9_V|@xo(Z?DN5wL;=OWNJtB8MSxbeBm~!)r3HIqBwY+-wEzlJX?~D+eDDJ>J#GZR
zFbGoFk#tkmkP0Q4cv-=(%6G>pV5RumQBlC-VBDz!Fm-L!Fe763<D>vuu7%oe!J0a7
z$|~TO6#&nJaf1rLFlbbEBrV7-0T>CCn+;2S$4)vSe3@IYqD1o7fR&T~tN?fo+_L@B
zNTU^d(I}vBFic%%A`7-*|80(2`}3!Ek2nZG=1au;3s(TlR4JelJ8F{xrm8<X1cF$#
zHf_Ngfl&1AhisyvfM)>Ai@u*u+KFaURtlgc2x13SVJ}+s74>Z?Zd3NJR=~h~o~Z!%
zEg1I%Dxg(6k^(5K!>rVwZHB-HreGUL3%>|JfdVF}KYft#H^ln~-v!ar?N`8BkfMa7
z7>HCBEQCMv?GUL$ncfEsP_-y^_tk;Cy8_@!5FL!arCmB0(t=#7fEp{b+_#ZmBofAL
zr0)bJQf#@PfZuPkD~R_DU5^=j8jRWD3lV82ng9(eV3roF>f3PKQ^taQLUIu_^A?9J
z{;)8HGM)$rFas5`T7R|)f>iczqyFrmJ7SpMqZdY2RRR2{FdrrS()5U>OQUwRW9rr<
zs{kgnL6df5yY>yc0YucV27ZM&)oZ{B5HG6S8SQy1j}LAGQ^CJbalc7f1Ex}glzpcf
z48a0u%2;rllt1*BGB=mytu(ZGV-vd0E%{e^jsjGB60QcGS^+gHBdHRZ1~8`IMCz-I
zTckt+_*FHa4GUH(AoFqjb#@u;s6M9IG_t&J{T-m5uf2zok_?3SmaK;EV+TVDpk)Xm
zEm*n&x1mCo<2JPd2Tr3@THg4ux-V-@k7XtSP_-wPl>$yd_>Dmz-3v6FBj>S9j(#lD
zTX*aqS_JT60E<H(%?wq8i~{toN4jMc^HN>grAMsl3l{<=<F<A~0{wu}<ij*vjDIlQ
zgYfl%S-7#seKkkz1w?|HL{*TtNdZ$WfP^5ZYBA{~735pxI2!v;p@8*#Pk^xvmrJAW
zW0)>q?w=urOZ_k&E6hiZh5@W_UQX2b37y5#ddM_@%33J0rVB}t5i67eI2GUz%=v#{
z96-r=Inl{h=o<eW3t-)r2j_sOA0>JKz*11a>)E`6GXl_x`gRBev6IC>>EWAPlHCHT
w+)sJ|gx|q92BJ^!_qoq#`}WIG;JN?zKcCMn5J4#@d;kCd07*qoM6N<$g0F#CSpWb4

literal 0
HcmV?d00001

diff --git a/static/images/yanjing.png b/static/images/yanjing.png
new file mode 100644
index 0000000000000000000000000000000000000000..a81d62d366327b1948f1e177214ddc6055a451cb
GIT binary patch
literal 358
zcmV-s0h#`ZP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px$AW1|)R5(x7)Xge|Q544U-<p^kxB@bhVkBayd?ZG$fbubtxCD|JiYqWuLW&V3
z12H&5<q9ZsldZSjqwP436KCR`t>;<&-?i3WdxsW((PEx|3`{9?U=dU3E=Ti-W9&r4
zOTBT`Z8@bhi#@b|Gvik*M8sjO{{@&*TEj+`c!kq4p1?@vtw+RW4*dj7Da~O&OIRt|
z!+5EkVF}w=&U{21RO1g|N~sUGXe-U4vQgZiztrwAhzkst+8YKU;-QFhU<EzdpI7mO
zqnbI*pc7k}UWtg_-vX!6)eNwimhUix%O6`V%Khe0b}?4iILC5Lb@dOWI*&SQbB&YI
zpUf&Nq{eHLL0h-j8MM*W+l`3lrmx;#p0t1beEqiVcL>g16__{wlK=n!07*qoM6N<$
Ef_NOAb^rhX

literal 0
HcmV?d00001

diff --git a/uni_modules/uni-calendar/changelog.md b/uni_modules/uni-calendar/changelog.md
new file mode 100644
index 0000000..f291eec
--- /dev/null
+++ b/uni_modules/uni-calendar/changelog.md
@@ -0,0 +1,26 @@
+## 1.4.10（2023-04-10）
+- 修复 某些情况 monthSwitch 未触发的Bug
+## 1.4.9（2023-02-02）
+- 修复 某些情况切换月份错误的Bug
+## 1.4.8（2023-01-30）
+- 修复 某些情况切换月份错误的Bug [详情](https://ask.dcloud.net.cn/question/161964)
+## 1.4.7（2022-09-16）
+- 优化 支持使用 uni-scss 控制主题色
+## 1.4.6（2022-09-08）
+- 修复 表头年月切换，导致改变当前日期为选择月1号，且未触发change事件的Bug
+## 1.4.5（2022-02-25）
+- 修复 条件编译 nvue 不支持的 css 样式的Bug
+## 1.4.4（2022-02-25）
+- 修复 条件编译 nvue 不支持的 css 样式的Bug
+## 1.4.3（2021-09-22）
+- 修复 startDate、 endDate 属性失效的Bug
+## 1.4.2（2021-08-24）
+- 新增 支持国际化
+## 1.4.1（2021-08-05）
+- 修复 弹出层被 tabbar 遮盖的Bug
+## 1.4.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.3.16（2021-05-12）
+- 新增 组件示例地址
+## 1.3.15（2021-02-04）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-calendar/components/uni-calendar/calendar.js b/uni_modules/uni-calendar/components/uni-calendar/calendar.js
new file mode 100644
index 0000000..b8d7d6f
--- /dev/null
+++ b/uni_modules/uni-calendar/components/uni-calendar/calendar.js
@@ -0,0 +1,546 @@
+/**
+* @1900-2100区间内的公历、农历互转
+* @charset UTF-8
+* @github  https://github.com/jjonline/calendar.js
+* @Author  Jea杨(JJonline@JJonline.Cn)
+* @Time    2014-7-21
+* @Time    2016-8-13 Fixed 2033hex、Attribution Annals
+* @Time    2016-9-25 Fixed lunar LeapMonth Param Bug
+* @Time    2017-7-24 Fixed use getTerm Func Param Error.use solar year,NOT lunar year
+* @Version 1.0.3
+* @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0]
+* @农历转公历：calendar.lunar2solar(1987,09,10); //[you can ignore params of prefix 0]
+*/
+/* eslint-disable */
+var calendar = {
+
+  /**
+      * 农历1900-2100的润大小信息表
+      * @Array Of Property
+      * @return Hex
+      */
+  lunarInfo: [0x04bd8, 0x04ae0, 0x0a570, 0x054d5, 0x0d260, 0x0d950, 0x16554, 0x056a0, 0x09ad0, 0x055d2, // 1900-1909
+    0x04ae0, 0x0a5b6, 0x0a4d0, 0x0d250, 0x1d255, 0x0b540, 0x0d6a0, 0x0ada2, 0x095b0, 0x14977, // 1910-1919
+    0x04970, 0x0a4b0, 0x0b4b5, 0x06a50, 0x06d40, 0x1ab54, 0x02b60, 0x09570, 0x052f2, 0x04970, // 1920-1929
+    0x06566, 0x0d4a0, 0x0ea50, 0x06e95, 0x05ad0, 0x02b60, 0x186e3, 0x092e0, 0x1c8d7, 0x0c950, // 1930-1939
+    0x0d4a0, 0x1d8a6, 0x0b550, 0x056a0, 0x1a5b4, 0x025d0, 0x092d0, 0x0d2b2, 0x0a950, 0x0b557, // 1940-1949
+    0x06ca0, 0x0b550, 0x15355, 0x04da0, 0x0a5b0, 0x14573, 0x052b0, 0x0a9a8, 0x0e950, 0x06aa0, // 1950-1959
+    0x0aea6, 0x0ab50, 0x04b60, 0x0aae4, 0x0a570, 0x05260, 0x0f263, 0x0d950, 0x05b57, 0x056a0, // 1960-1969
+    0x096d0, 0x04dd5, 0x04ad0, 0x0a4d0, 0x0d4d4, 0x0d250, 0x0d558, 0x0b540, 0x0b6a0, 0x195a6, // 1970-1979
+    0x095b0, 0x049b0, 0x0a974, 0x0a4b0, 0x0b27a, 0x06a50, 0x06d40, 0x0af46, 0x0ab60, 0x09570, // 1980-1989
+    0x04af5, 0x04970, 0x064b0, 0x074a3, 0x0ea50, 0x06b58, 0x05ac0, 0x0ab60, 0x096d5, 0x092e0, // 1990-1999
+    0x0c960, 0x0d954, 0x0d4a0, 0x0da50, 0x07552, 0x056a0, 0x0abb7, 0x025d0, 0x092d0, 0x0cab5, // 2000-2009
+    0x0a950, 0x0b4a0, 0x0baa4, 0x0ad50, 0x055d9, 0x04ba0, 0x0a5b0, 0x15176, 0x052b0, 0x0a930, // 2010-2019
+    0x07954, 0x06aa0, 0x0ad50, 0x05b52, 0x04b60, 0x0a6e6, 0x0a4e0, 0x0d260, 0x0ea65, 0x0d530, // 2020-2029
+    0x05aa0, 0x076a3, 0x096d0, 0x04afb, 0x04ad0, 0x0a4d0, 0x1d0b6, 0x0d250, 0x0d520, 0x0dd45, // 2030-2039
+    0x0b5a0, 0x056d0, 0x055b2, 0x049b0, 0x0a577, 0x0a4b0, 0x0aa50, 0x1b255, 0x06d20, 0x0ada0, // 2040-2049
+    /** Add By JJonline@JJonline.Cn**/
+    0x14b63, 0x09370, 0x049f8, 0x04970, 0x064b0, 0x168a6, 0x0ea50, 0x06b20, 0x1a6c4, 0x0aae0, // 2050-2059
+    0x0a2e0, 0x0d2e3, 0x0c960, 0x0d557, 0x0d4a0, 0x0da50, 0x05d55, 0x056a0, 0x0a6d0, 0x055d4, // 2060-2069
+    0x052d0, 0x0a9b8, 0x0a950, 0x0b4a0, 0x0b6a6, 0x0ad50, 0x055a0, 0x0aba4, 0x0a5b0, 0x052b0, // 2070-2079
+    0x0b273, 0x06930, 0x07337, 0x06aa0, 0x0ad50, 0x14b55, 0x04b60, 0x0a570, 0x054e4, 0x0d160, // 2080-2089
+    0x0e968, 0x0d520, 0x0daa0, 0x16aa6, 0x056d0, 0x04ae0, 0x0a9d4, 0x0a2d0, 0x0d150, 0x0f252, // 2090-2099
+    0x0d520], // 2100
+
+  /**
+      * 公历每个月份的天数普通表
+      * @Array Of Property
+      * @return Number
+      */
+  solarMonth: [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
+
+  /**
+      * 天干地支之天干速查表
+      * @Array Of Property trans["甲","乙","丙","丁","戊","己","庚","辛","壬","癸"]
+      * @return Cn string
+      */
+  Gan: ['\u7532', '\u4e59', '\u4e19', '\u4e01', '\u620a', '\u5df1', '\u5e9a', '\u8f9b', '\u58ec', '\u7678'],
+
+  /**
+      * 天干地支之地支速查表
+      * @Array Of Property
+      * @trans["子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"]
+      * @return Cn string
+      */
+  Zhi: ['\u5b50', '\u4e11', '\u5bc5', '\u536f', '\u8fb0', '\u5df3', '\u5348', '\u672a', '\u7533', '\u9149', '\u620c', '\u4ea5'],
+
+  /**
+      * 天干地支之地支速查表<=>生肖
+      * @Array Of Property
+      * @trans["鼠","牛","虎","兔","龙","蛇","马","羊","猴","鸡","狗","猪"]
+      * @return Cn string
+      */
+  Animals: ['\u9f20', '\u725b', '\u864e', '\u5154', '\u9f99', '\u86c7', '\u9a6c', '\u7f8a', '\u7334', '\u9e21', '\u72d7', '\u732a'],
+
+  /**
+      * 24节气速查表
+      * @Array Of Property
+      * @trans["小寒","大寒","立春","雨水","惊蛰","春分","清明","谷雨","立夏","小满","芒种","夏至","小暑","大暑","立秋","处暑","白露","秋分","寒露","霜降","立冬","小雪","大雪","冬至"]
+      * @return Cn string
+      */
+  solarTerm: ['\u5c0f\u5bd2', '\u5927\u5bd2', '\u7acb\u6625', '\u96e8\u6c34', '\u60ca\u86f0', '\u6625\u5206', '\u6e05\u660e', '\u8c37\u96e8', '\u7acb\u590f', '\u5c0f\u6ee1', '\u8292\u79cd', '\u590f\u81f3', '\u5c0f\u6691', '\u5927\u6691', '\u7acb\u79cb', '\u5904\u6691', '\u767d\u9732', '\u79cb\u5206', '\u5bd2\u9732', '\u971c\u964d', '\u7acb\u51ac', '\u5c0f\u96ea', '\u5927\u96ea', '\u51ac\u81f3'],
+
+  /**
+      * 1900-2100各年的24节气日期速查表
+      * @Array Of Property
+      * @return 0x string For splice
+      */
+  sTermInfo: ['9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f',
+    '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f',
+    'b027097bd097c36b0b6fc9274c91aa', '9778397bd19801ec9210c965cc920e', '97b6b97bd19801ec95f8c965cc920f',
+    '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd197c36c9210c9274c91aa',
+    '97b6b97bd19801ec95f8c965cc920e', '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec95f8c965cc920e', '97bcf97c3598082c95f8e1cfcc920f',
+    '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f',
+    '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd097bd07f595b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9210c8dc2', '9778397bd19801ec9210c9274c920e', '97b6b97bd19801ec95f8c965cc920f',
+    '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+    '97b6b97bd19801ec95f8c965cc920f', '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bd07f1487f595b0b0bc920fb0722',
+    '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b97bd197c36c9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+    '97b6b7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36b0b70c9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '977837f0e37f149b0723b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c35b0b6fc9210c8dc2',
+    '977837f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '977837f0e37f14998082b0723b06bd', '7f07e7f0e37f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f595b0b0bb0b6fb0722', '7f0e37f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e37f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35',
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f149b0723b0787b0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0723b06bd',
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722', '7f0e37f0e366aa89801eb072297c35',
+    '7ec967f0e37f14998082b0723b06bd', '7f07e7f0e37f14998083b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14898082b0723b02d5', '7f07e7f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66aa89801e9808297c35', '665f67f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66a449801e9808297c35',
+    '665f67f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e36665b66a449801e9808297c35', '665f67f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e26665b66a449801e9808297c35', '665f67f0e37f1489801eb072297c35',
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722'],
+
+  /**
+      * 数字转中文速查表
+      * @Array Of Property
+      * @trans ['日','一','二','三','四','五','六','七','八','九','十']
+      * @return Cn string
+      */
+  nStr1: ['\u65e5', '\u4e00', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341'],
+
+  /**
+      * 日期转农历称呼速查表
+      * @Array Of Property
+      * @trans ['初','十','廿','卅']
+      * @return Cn string
+      */
+  nStr2: ['\u521d', '\u5341', '\u5eff', '\u5345'],
+
+  /**
+      * 月份转农历称呼速查表
+      * @Array Of Property
+      * @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊']
+      * @return Cn string
+      */
+  nStr3: ['\u6b63', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341', '\u51ac', '\u814a'],
+
+  /**
+      * 返回农历y年一整年的总天数
+      * @param lunar Year
+      * @return Number
+      * @eg:var count = calendar.lYearDays(1987) ;//count=387
+      */
+  lYearDays: function (y) {
+    var i; var sum = 348
+    for (i = 0x8000; i > 0x8; i >>= 1) { sum += (this.lunarInfo[y - 1900] & i) ? 1 : 0 }
+    return (sum + this.leapDays(y))
+  },
+
+  /**
+      * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
+      * @param lunar Year
+      * @return Number (0-12)
+      * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
+      */
+  leapMonth: function (y) { // 闰字编码 \u95f0
+    return (this.lunarInfo[y - 1900] & 0xf)
+  },
+
+  /**
+      * 返回农历y年闰月的天数 若该年没有闰月则返回0
+      * @param lunar Year
+      * @return Number (0、29、30)
+      * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
+      */
+  leapDays: function (y) {
+    if (this.leapMonth(y)) {
+      return ((this.lunarInfo[y - 1900] & 0x10000) ? 30 : 29)
+    }
+    return (0)
+  },
+
+  /**
+      * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法
+      * @param lunar Year
+      * @return Number (-1、29、30)
+      * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
+      */
+  monthDays: function (y, m) {
+    if (m > 12 || m < 1) { return -1 }// 月份参数从1至12，参数错误返回-1
+    return ((this.lunarInfo[y - 1900] & (0x10000 >> m)) ? 30 : 29)
+  },
+
+  /**
+      * 返回公历(!)y年m月的天数
+      * @param solar Year
+      * @return Number (-1、28、29、30、31)
+      * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
+      */
+  solarDays: function (y, m) {
+    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
+    var ms = m - 1
+    if (ms == 1) { // 2月份的闰平规律测算后确认返回28或29
+      return (((y % 4 == 0) && (y % 100 != 0) || (y % 400 == 0)) ? 29 : 28)
+    } else {
+      return (this.solarMonth[ms])
+    }
+  },
+
+  /**
+     * 农历年份转换为干支纪年
+     * @param  lYear 农历年的年份数
+     * @return Cn string
+     */
+  toGanZhiYear: function (lYear) {
+    var ganKey = (lYear - 3) % 10
+    var zhiKey = (lYear - 3) % 12
+    if (ganKey == 0) ganKey = 10// 如果余数为0则为最后一个天干
+    if (zhiKey == 0) zhiKey = 12// 如果余数为0则为最后一个地支
+    return this.Gan[ganKey - 1] + this.Zhi[zhiKey - 1]
+  },
+
+  /**
+     * 公历月、日判断所属星座
+     * @param  cMonth [description]
+     * @param  cDay [description]
+     * @return Cn string
+     */
+  toAstro: function (cMonth, cDay) {
+    var s = '\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf'
+    var arr = [20, 19, 21, 21, 21, 22, 23, 23, 23, 23, 22, 22]
+    return s.substr(cMonth * 2 - (cDay < arr[cMonth - 1] ? 2 : 0), 2) + '\u5ea7'// 座
+  },
+
+  /**
+      * 传入offset偏移量返回干支
+      * @param offset 相对甲子的偏移量
+      * @return Cn string
+      */
+  toGanZhi: function (offset) {
+    return this.Gan[offset % 10] + this.Zhi[offset % 12]
+  },
+
+  /**
+      * 传入公历(!)y年获得该年第n个节气的公历日期
+      * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起
+      * @return day Number
+      * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
+      */
+  getTerm: function (y, n) {
+    if (y < 1900 || y > 2100) { return -1 }
+    if (n < 1 || n > 24) { return -1 }
+    var _table = this.sTermInfo[y - 1900]
+    var _info = [
+      parseInt('0x' + _table.substr(0, 5)).toString(),
+      parseInt('0x' + _table.substr(5, 5)).toString(),
+      parseInt('0x' + _table.substr(10, 5)).toString(),
+      parseInt('0x' + _table.substr(15, 5)).toString(),
+      parseInt('0x' + _table.substr(20, 5)).toString(),
+      parseInt('0x' + _table.substr(25, 5)).toString()
+    ]
+    var _calday = [
+      _info[0].substr(0, 1),
+      _info[0].substr(1, 2),
+      _info[0].substr(3, 1),
+      _info[0].substr(4, 2),
+
+      _info[1].substr(0, 1),
+      _info[1].substr(1, 2),
+      _info[1].substr(3, 1),
+      _info[1].substr(4, 2),
+
+      _info[2].substr(0, 1),
+      _info[2].substr(1, 2),
+      _info[2].substr(3, 1),
+      _info[2].substr(4, 2),
+
+      _info[3].substr(0, 1),
+      _info[3].substr(1, 2),
+      _info[3].substr(3, 1),
+      _info[3].substr(4, 2),
+
+      _info[4].substr(0, 1),
+      _info[4].substr(1, 2),
+      _info[4].substr(3, 1),
+      _info[4].substr(4, 2),
+
+      _info[5].substr(0, 1),
+      _info[5].substr(1, 2),
+      _info[5].substr(3, 1),
+      _info[5].substr(4, 2)
+    ]
+    return parseInt(_calday[n - 1])
+  },
+
+  /**
+      * 传入农历数字月份返回汉语通俗表示法
+      * @param lunar month
+      * @return Cn string
+      * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
+      */
+  toChinaMonth: function (m) { // 月 => \u6708
+    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
+    var s = this.nStr3[m - 1]
+    s += '\u6708'// 加上月字
+    return s
+  },
+
+  /**
+      * 传入农历日期数字返回汉字表示法
+      * @param lunar day
+      * @return Cn string
+      * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
+      */
+  toChinaDay: function (d) { // 日 => \u65e5
+    var s
+    switch (d) {
+      case 10:
+        s = '\u521d\u5341'; break
+      case 20:
+        s = '\u4e8c\u5341'; break
+        break
+      case 30:
+        s = '\u4e09\u5341'; break
+        break
+      default :
+        s = this.nStr2[Math.floor(d / 10)]
+        s += this.nStr1[d % 10]
+    }
+    return (s)
+  },
+
+  /**
+      * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
+      * @param y year
+      * @return Cn string
+      * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
+      */
+  getAnimal: function (y) {
+    return this.Animals[(y - 4) % 12]
+  },
+
+  /**
+      * 传入阳历年月日获得详细的公历、农历object信息 <=>JSON
+      * @param y  solar year
+      * @param m  solar month
+      * @param d  solar day
+      * @return JSON object
+      * @eg:console.log(calendar.solar2lunar(1987,11,01));
+      */
+  solar2lunar: function (y, m, d) { // 参数区间1900.1.31~2100.12.31
+    // 年份限定、上限
+    if (y < 1900 || y > 2100) {
+      return -1// undefined转换为数字变为NaN
+    }
+    // 公历传参最下限
+    if (y == 1900 && m == 1 && d < 31) {
+      return -1
+    }
+    // 未传参  获得当天
+    if (!y) {
+      var objDate = new Date()
+    } else {
+      var objDate = new Date(y, parseInt(m) - 1, d)
+    }
+    var i; var leap = 0; var temp = 0
+    // 修正ymd参数
+    var y = objDate.getFullYear()
+    var m = objDate.getMonth() + 1
+    var d = objDate.getDate()
+    var offset = (Date.UTC(objDate.getFullYear(), objDate.getMonth(), objDate.getDate()) - Date.UTC(1900, 0, 31)) / 86400000
+    for (i = 1900; i < 2101 && offset > 0; i++) {
+      temp = this.lYearDays(i)
+      offset -= temp
+    }
+    if (offset < 0) {
+      offset += temp; i--
+    }
+
+    // 是否今天
+    var isTodayObj = new Date()
+    var isToday = false
+    if (isTodayObj.getFullYear() == y && isTodayObj.getMonth() + 1 == m && isTodayObj.getDate() == d) {
+      isToday = true
+    }
+    // 星期几
+    var nWeek = objDate.getDay()
+    var cWeek = this.nStr1[nWeek]
+    // 数字表示周几顺应天朝周一开始的惯例
+    if (nWeek == 0) {
+      nWeek = 7
+    }
+    // 农历年
+    var year = i
+    var leap = this.leapMonth(i) // 闰哪个月
+    var isLeap = false
+
+    // 效验闰月
+    for (i = 1; i < 13 && offset > 0; i++) {
+      // 闰月
+      if (leap > 0 && i == (leap + 1) && isLeap == false) {
+        --i
+        isLeap = true; temp = this.leapDays(year) // 计算农历闰月天数
+      } else {
+        temp = this.monthDays(year, i)// 计算农历普通月天数
+      }
+      // 解除闰月
+      if (isLeap == true && i == (leap + 1)) { isLeap = false }
+      offset -= temp
+    }
+    // 闰月导致数组下标重叠取反
+    if (offset == 0 && leap > 0 && i == leap + 1) {
+      if (isLeap) {
+        isLeap = false
+      } else {
+        isLeap = true; --i
+      }
+    }
+    if (offset < 0) {
+      offset += temp; --i
+    }
+    // 农历月
+    var month = i
+    // 农历日
+    var day = offset + 1
+    // 天干地支处理
+    var sm = m - 1
+    var gzY = this.toGanZhiYear(year)
+
+    // 当月的两个节气
+    // bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
+    var firstNode = this.getTerm(y, (m * 2 - 1))// 返回当月「节」为几日开始
+    var secondNode = this.getTerm(y, (m * 2))// 返回当月「节」为几日开始
+
+    // 依据12节气修正干支月
+    var gzM = this.toGanZhi((y - 1900) * 12 + m + 11)
+    if (d >= firstNode) {
+      gzM = this.toGanZhi((y - 1900) * 12 + m + 12)
+    }
+
+    // 传入的日期的节气与否
+    var isTerm = false
+    var Term = null
+    if (firstNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 2]
+    }
+    if (secondNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 1]
+    }
+    // 日柱 当月一日与 1900/1/1 相差天数
+    var dayCyclical = Date.UTC(y, sm, 1, 0, 0, 0, 0) / 86400000 + 25567 + 10
+    var gzD = this.toGanZhi(dayCyclical + d - 1)
+    // 该日期所属的星座
+    var astro = this.toAstro(m, d)
+
+    return { 'lYear': year, 'lMonth': month, 'lDay': day, 'Animal': this.getAnimal(year), 'IMonthCn': (isLeap ? '\u95f0' : '') + this.toChinaMonth(month), 'IDayCn': this.toChinaDay(day), 'cYear': y, 'cMonth': m, 'cDay': d, 'gzYear': gzY, 'gzMonth': gzM, 'gzDay': gzD, 'isToday': isToday, 'isLeap': isLeap, 'nWeek': nWeek, 'ncWeek': '\u661f\u671f' + cWeek, 'isTerm': isTerm, 'Term': Term, 'astro': astro }
+  },
+
+  /**
+      * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历object信息 <=>JSON
+      * @param y  lunar year
+      * @param m  lunar month
+      * @param d  lunar day
+      * @param isLeapMonth  lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可]
+      * @return JSON object
+      * @eg:console.log(calendar.lunar2solar(1987,9,10));
+      */
+  lunar2solar: function (y, m, d, isLeapMonth) { // 参数区间1900.1.31~2100.12.1
+    var isLeapMonth = !!isLeapMonth
+    var leapOffset = 0
+    var leapMonth = this.leapMonth(y)
+    var leapDay = this.leapDays(y)
+    if (isLeapMonth && (leapMonth != m)) { return -1 }// 传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
+    if (y == 2100 && m == 12 && d > 1 || y == 1900 && m == 1 && d < 31) { return -1 }// 超出了最大极限值
+    var day = this.monthDays(y, m)
+    var _day = day
+    // bugFix 2016-9-25
+    // if month is leap, _day use leapDays method
+    if (isLeapMonth) {
+      _day = this.leapDays(y, m)
+    }
+    if (y < 1900 || y > 2100 || d > _day) { return -1 }// 参数合法性效验
+
+    // 计算农历的时间差
+    var offset = 0
+    for (var i = 1900; i < y; i++) {
+      offset += this.lYearDays(i)
+    }
+    var leap = 0; var isAdd = false
+    for (var i = 1; i < m; i++) {
+      leap = this.leapMonth(y)
+      if (!isAdd) { // 处理闰月
+        if (leap <= i && leap > 0) {
+          offset += this.leapDays(y); isAdd = true
+        }
+      }
+      offset += this.monthDays(y, i)
+    }
+    // 转换闰月农历 需补充该年闰月的前一个月的时差
+    if (isLeapMonth) { offset += day }
+    // 1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点)
+    var stmap = Date.UTC(1900, 1, 30, 0, 0, 0)
+    var calObj = new Date((offset + d - 31) * 86400000 + stmap)
+    var cY = calObj.getUTCFullYear()
+    var cM = calObj.getUTCMonth() + 1
+    var cD = calObj.getUTCDate()
+
+    return this.solar2lunar(cY, cM, cD)
+  }
+}
+
+export default calendar
diff --git a/uni_modules/uni-calendar/components/uni-calendar/i18n/en.json b/uni_modules/uni-calendar/components/uni-calendar/i18n/en.json
new file mode 100644
index 0000000..fcbd13c
--- /dev/null
+++ b/uni_modules/uni-calendar/components/uni-calendar/i18n/en.json
@@ -0,0 +1,12 @@
+{
+	"uni-calender.ok": "ok",
+	"uni-calender.cancel": "cancel",
+	"uni-calender.today": "today",
+	"uni-calender.MON": "MON",
+	"uni-calender.TUE": "TUE",
+	"uni-calender.WED": "WED",
+	"uni-calender.THU": "THU",
+	"uni-calender.FRI": "FRI",
+	"uni-calender.SAT": "SAT",
+	"uni-calender.SUN": "SUN"
+}
diff --git a/uni_modules/uni-calendar/components/uni-calendar/i18n/index.js b/uni_modules/uni-calendar/components/uni-calendar/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-calendar/components/uni-calendar/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/uni_modules/uni-calendar/components/uni-calendar/i18n/zh-Hans.json b/uni_modules/uni-calendar/components/uni-calendar/i18n/zh-Hans.json
new file mode 100644
index 0000000..1ca43de
--- /dev/null
+++ b/uni_modules/uni-calendar/components/uni-calendar/i18n/zh-Hans.json
@@ -0,0 +1,12 @@
+{
+	"uni-calender.ok": "确定",
+	"uni-calender.cancel": "取消",
+	"uni-calender.today": "今日",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六"
+}
diff --git a/uni_modules/uni-calendar/components/uni-calendar/i18n/zh-Hant.json b/uni_modules/uni-calendar/components/uni-calendar/i18n/zh-Hant.json
new file mode 100644
index 0000000..e0fe33b
--- /dev/null
+++ b/uni_modules/uni-calendar/components/uni-calendar/i18n/zh-Hant.json
@@ -0,0 +1,12 @@
+{
+	"uni-calender.ok": "確定",
+	"uni-calender.cancel": "取消",
+	"uni-calender.today": "今日",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六"
+}
diff --git a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue
new file mode 100644
index 0000000..a54135e
--- /dev/null
+++ b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue
@@ -0,0 +1,187 @@
+<template>
+	<view class="uni-calendar-item__weeks-box" :class="{
+		'uni-calendar-item--disable':weeks.disable,
+		'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+		'uni-calendar-item--checked':(calendar.fullDate === weeks.fullDate && !weeks.isDay) ,
+		'uni-calendar-item--before-checked':weeks.beforeMultiple,
+		'uni-calendar-item--multiple': weeks.multiple,
+		'uni-calendar-item--after-checked':weeks.afterMultiple,
+		}"
+	 @click="choiceDate(weeks)">
+		<view class="uni-calendar-item__weeks-box-item">
+			<text v-if="selected&&weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
+			<text class="uni-calendar-item__weeks-box-text" :class="{
+				'uni-calendar-item--isDay-text': weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">{{weeks.date}}</text>
+			<text v-if="!lunar&&!weeks.extraInfo && weeks.isDay" class="uni-calendar-item__weeks-lunar-text" :class="{
+				'uni-calendar-item--isDay-text':weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				}">{{todayText}}</text>
+			<text v-if="lunar&&!weeks.extraInfo" class="uni-calendar-item__weeks-lunar-text" :class="{
+				'uni-calendar-item--isDay-text':weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">{{weeks.isDay ? todayText : (weeks.lunar.IDayCn === '初一'?weeks.lunar.IMonthCn:weeks.lunar.IDayCn)}}</text>
+			<text v-if="weeks.extraInfo&&weeks.extraInfo.info" class="uni-calendar-item__weeks-lunar-text" :class="{
+				'uni-calendar-item--extra':weeks.extraInfo.info,
+				'uni-calendar-item--isDay-text':weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">{{weeks.extraInfo.info}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { initVueI18n } from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	const {	t	} = initVueI18n(i18nMessages)
+
+	export default {
+		emits:['change'],
+		props: {
+			weeks: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			calendar: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			}
+		},
+		computed: {
+			todayText() {
+				return t("uni-calender.today")
+			},
+		},
+		methods: {
+			choiceDate(weeks) {
+				this.$emit('change', weeks)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$uni-font-size-base:14px;
+	$uni-text-color:#333;
+	$uni-font-size-sm:12px;
+	$uni-color-error: #e43d33;
+	$uni-opacity-disabled: 0.3;
+	$uni-text-color-disable:#c0c0c0;
+	$uni-primary: #2979ff !default;
+	.uni-calendar-item__weeks-box {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.uni-calendar-item__weeks-box-text {
+		font-size: $uni-font-size-base;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar-item__weeks-lunar-text {
+		font-size: $uni-font-size-sm;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar-item__weeks-box-item {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 100rpx;
+		height: 100rpx;
+	}
+
+	.uni-calendar-item__weeks-box-circle {
+		position: absolute;
+		top: 5px;
+		right: 5px;
+		width: 8px;
+		height: 8px;
+		border-radius: 8px;
+		background-color: $uni-color-error;
+
+	}
+
+	.uni-calendar-item--disable {
+		background-color: rgba(249, 249, 249, $uni-opacity-disabled);
+		color: $uni-text-color-disable;
+	}
+
+	.uni-calendar-item--isDay-text {
+		color: $uni-primary;
+	}
+
+	.uni-calendar-item--isDay {
+		background-color: $uni-primary;
+		opacity: 0.8;
+		color: #fff;
+	}
+
+	.uni-calendar-item--extra {
+		color: $uni-color-error;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item--checked {
+		background-color: $uni-primary;
+		color: #fff;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item--multiple {
+		background-color: $uni-primary;
+		color: #fff;
+		opacity: 0.8;
+	}
+	.uni-calendar-item--before-checked {
+		background-color: #ff5a5f;
+		color: #fff;
+	}
+	.uni-calendar-item--after-checked {
+		background-color: #ff5a5f;
+		color: #fff;
+	}
+</style>
diff --git a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
new file mode 100644
index 0000000..17c958d
--- /dev/null
+++ b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
@@ -0,0 +1,566 @@
+<template>
+	<view class="uni-calendar">
+		<view v-if="!insert&&show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}" @click="clean"></view>
+		<view v-if="insert || show" class="uni-calendar__content" :class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow}">
+			<view v-if="!insert" class="uni-calendar__header uni-calendar--fixed-top">
+				<view class="uni-calendar__header-btn-box" @click="close">
+					<text class="uni-calendar__header-text uni-calendar--fixed-width">{{cancelText}}</text>
+				</view>
+				<view class="uni-calendar__header-btn-box" @click="confirm">
+					<text class="uni-calendar__header-text uni-calendar--fixed-width">{{okText}}</text>
+				</view>
+			</view>
+			<view class="uni-calendar__header">
+				<view class="uni-calendar__header-btn-box" @click.stop="pre">
+					<view class="uni-calendar__header-btn uni-calendar--left"></view>
+				</view>
+				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
+					<text class="uni-calendar__header-text">{{ (nowDate.year||'') +' / '+( nowDate.month||'')}}</text>
+				</picker>
+				<view class="uni-calendar__header-btn-box" @click.stop="next">
+					<view class="uni-calendar__header-btn uni-calendar--right"></view>
+				</view>
+				<text class="uni-calendar__backtoday" @click="backToday">{{todayText}}</text>
+
+			</view>
+			<view class="uni-calendar__box">
+				<view v-if="showMonth" class="uni-calendar__box-bg">
+					<text class="uni-calendar__box-bg-text">{{nowDate.month}}</text>
+				</view>
+				<view class="uni-calendar__weeks">
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SUNText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{monText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{TUEText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{WEDText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{THUText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{FRIText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SATText}}</text>
+					</view>
+				</view>
+				<view class="uni-calendar__weeks" v-for="(item,weekIndex) in weeks" :key="weekIndex">
+					<view class="uni-calendar__weeks-item" v-for="(weeks,weeksIndex) in item" :key="weeksIndex">
+						<calendar-item class="uni-calendar-item--hook" :weeks="weeks" :calendar="calendar" :selected="selected" :lunar="lunar" @change="choiceDate"></calendar-item>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import Calendar from './util.js';
+	import CalendarItem from './uni-calendar-item.vue'
+
+	import { initVueI18n } from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	const {	t	} = initVueI18n(i18nMessages)
+
+	/**
+	 * Calendar 日历
+	 * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=56
+	 * @property {String} date 自定义当前时间，默认为今天
+	 * @property {Boolean} lunar 显示农历
+	 * @property {String} startDate 日期选择范围-开始日期
+	 * @property {String} endDate 日期选择范围-结束日期
+	 * @property {Boolean} range 范围选择
+	 * @property {Boolean} insert = [true|false] 插入模式,默认为false
+	 * 	@value true 弹窗模式
+	 * 	@value false 插入模式
+	 * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+	 * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
+	 * @property {Boolean} showMonth 是否选择月份为背景
+	 * @event {Function} change 日期改变，`insert :ture` 时生效
+	 * @event {Function} confirm 确认选择`insert :false` 时生效
+	 * @event {Function} monthSwitch 切换月份时触发
+	 * @example <uni-calendar :insert="true":lunar="true" :start-date="'2019-3-2'":end-date="'2019-5-20'"@change="change" />
+	 */
+	export default {
+		components: {
+			CalendarItem
+		},
+		emits:['close','confirm','change','monthSwitch'],
+		props: {
+			date: {
+				type: String,
+				default: ''
+			},
+			selected: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			},
+			startDate: {
+				type: String,
+				default: ''
+			},
+			endDate: {
+				type: String,
+				default: ''
+			},
+			range: {
+				type: Boolean,
+				default: false
+			},
+			insert: {
+				type: Boolean,
+				default: true
+			},
+			showMonth: {
+				type: Boolean,
+				default: true
+			},
+			clearDate: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				show: false,
+				weeks: [],
+				calendar: {},
+				nowDate: '',
+				aniMaskShow: false
+			}
+		},
+		computed:{
+			/**
+			 * for i18n
+			 */
+
+			okText() {
+				return t("uni-calender.ok")
+			},
+			cancelText() {
+				return t("uni-calender.cancel")
+			},
+			todayText() {
+				return t("uni-calender.today")
+			},
+			monText() {
+				return t("uni-calender.MON")
+			},
+			TUEText() {
+				return t("uni-calender.TUE")
+			},
+			WEDText() {
+				return t("uni-calender.WED")
+			},
+			THUText() {
+				return t("uni-calender.THU")
+			},
+			FRIText() {
+				return t("uni-calender.FRI")
+			},
+			SATText() {
+				return t("uni-calender.SAT")
+			},
+			SUNText() {
+				return t("uni-calender.SUN")
+			},
+		},
+		watch: {
+			date(newVal) {
+				// this.cale.setDate(newVal)
+				this.init(newVal)
+			},
+			startDate(val){
+				this.cale.resetSatrtDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			endDate(val){
+				this.cale.resetEndDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			selected(newVal) {
+				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
+				this.weeks = this.cale.weeks
+			}
+		},
+		created() {
+			this.cale = new Calendar({
+				selected: this.selected,
+				startDate: this.startDate,
+				endDate: this.endDate,
+				range: this.range,
+			})
+			this.init(this.date)
+		},
+		methods: {
+			// 取消穿透
+			clean() {},
+			bindDateChange(e) {
+				const value = e.detail.value + '-1'
+				this.setDate(value)
+
+				const { year,month } = this.cale.getDate(value)
+        this.$emit('monthSwitch', {
+            year,
+            month
+        })
+			},
+			/**
+			 * 初始化日期显示
+			 * @param {Object} date
+			 */
+			init(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.calendar = this.cale.getInfo(date)
+			},
+			/**
+			 * 打开日历弹窗
+			 */
+			open() {
+				// 弹窗模式并且清理数据
+				if (this.clearDate && !this.insert) {
+					this.cale.cleanMultipleStatus()
+					// this.cale.setDate(this.date)
+					this.init(this.date)
+				}
+				this.show = true
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.aniMaskShow = true
+					}, 50)
+				})
+			},
+			/**
+			 * 关闭日历弹窗
+			 */
+			close() {
+				this.aniMaskShow = false
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.show = false
+						this.$emit('close')
+					}, 300)
+				})
+			},
+			/**
+			 * 确认按钮
+			 */
+			confirm() {
+				this.setEmit('confirm')
+				this.close()
+			},
+			/**
+			 * 变化触发
+			 */
+			change() {
+				if (!this.insert) return
+				this.setEmit('change')
+			},
+			/**
+			 * 选择月份触发
+			 */
+			monthSwitch() {
+				let {
+					year,
+					month
+				} = this.nowDate
+				this.$emit('monthSwitch', {
+					year,
+					month: Number(month)
+				})
+			},
+			/**
+			 * 派发事件
+			 * @param {Object} name
+			 */
+			setEmit(name) {
+				let {
+					year,
+					month,
+					date,
+					fullDate,
+					lunar,
+					extraInfo
+				} = this.calendar
+				this.$emit(name, {
+					range: this.cale.multipleStatus,
+					year,
+					month,
+					date,
+					fulldate: fullDate,
+					lunar,
+					extraInfo: extraInfo || {}
+				})
+			},
+			/**
+			 * 选择天触发
+			 * @param {Object} weeks
+			 */
+			choiceDate(weeks) {
+				if (weeks.disable) return
+				this.calendar = weeks
+				// 设置多选
+				this.cale.setMultiple(this.calendar.fullDate)
+				this.weeks = this.cale.weeks
+				this.change()
+			},
+			/**
+			 * 回到今天
+			 */
+			backToday() {
+				const nowYearMonth = `${this.nowDate.year}-${this.nowDate.month}`
+				const date = this.cale.getDate(new Date())
+        const todayYearMonth = `${date.year}-${date.month}`
+
+        if(nowYearMonth !== todayYearMonth) {
+          this.monthSwitch()
+        }
+
+				this.init(date.fullDate)
+				this.change()
+			},
+			/**
+			 * 上个月
+			 */
+			pre() {
+				const preDate = this.cale.getDate(this.nowDate.fullDate, -1, 'month').fullDate
+				this.setDate(preDate)
+				this.monthSwitch()
+
+			},
+			/**
+			 * 下个月
+			 */
+			next() {
+				const nextDate = this.cale.getDate(this.nowDate.fullDate, +1, 'month').fullDate
+				this.setDate(nextDate)
+				this.monthSwitch()
+			},
+			/**
+			 * 设置日期
+			 * @param {Object} date
+			 */
+			setDate(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$uni-bg-color-mask: rgba($color: #000000, $alpha: 0.4);
+	$uni-border-color: #EDEDED;
+	$uni-text-color: #333;
+	$uni-bg-color-hover:#f1f1f1;
+	$uni-font-size-base:14px;
+	$uni-text-color-placeholder: #808080;
+	$uni-color-subtitle: #555555;
+	$uni-text-color-grey:#999;
+	.uni-calendar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-calendar__mask {
+		position: fixed;
+		bottom: 0;
+		top: 0;
+		left: 0;
+		right: 0;
+		background-color: $uni-bg-color-mask;
+		transition-property: opacity;
+		transition-duration: 0.3s;
+		opacity: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--mask-show {
+		opacity: 1
+	}
+
+	.uni-calendar--fixed {
+		position: fixed;
+		/* #ifdef APP-NVUE */
+		bottom: 0;
+		/* #endif */
+		left: 0;
+		right: 0;
+		transition-property: transform;
+		transition-duration: 0.3s;
+		transform: translateY(460px);
+		/* #ifndef APP-NVUE */
+		bottom: calc(var(--window-bottom));
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--ani-show {
+		transform: translateY(0);
+	}
+
+	.uni-calendar__content {
+		background-color: #fff;
+	}
+
+	.uni-calendar__header {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 50px;
+		border-bottom-color: $uni-border-color;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar--fixed-top {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		border-top-color: $uni-border-color;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--fixed-width {
+		width: 50px;
+	}
+
+	.uni-calendar__backtoday {
+		position: absolute;
+		right: 0;
+		top: 25rpx;
+		padding: 0 5px;
+		padding-left: 10px;
+		height: 25px;
+		line-height: 25px;
+		font-size: 12px;
+		border-top-left-radius: 25px;
+		border-bottom-left-radius: 25px;
+		color: $uni-text-color;
+		background-color: $uni-bg-color-hover;
+	}
+
+	.uni-calendar__header-text {
+		text-align: center;
+		width: 100px;
+		font-size: $uni-font-size-base;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar__header-btn-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		width: 50px;
+		height: 50px;
+	}
+
+	.uni-calendar__header-btn {
+		width: 10px;
+		height: 10px;
+		border-left-color: $uni-text-color-placeholder;
+		border-left-style: solid;
+		border-left-width: 2px;
+		border-top-color: $uni-color-subtitle;
+		border-top-style: solid;
+		border-top-width: 2px;
+	}
+
+	.uni-calendar--left {
+		transform: rotate(-45deg);
+	}
+
+	.uni-calendar--right {
+		transform: rotate(135deg);
+	}
+
+
+	.uni-calendar__weeks {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-calendar__weeks-item {
+		flex: 1;
+	}
+
+	.uni-calendar__weeks-day {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 45px;
+		border-bottom-color: #F5F5F5;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar__weeks-day-text {
+		font-size: 14px;
+	}
+
+	.uni-calendar__box {
+		position: relative;
+	}
+
+	.uni-calendar__box-bg {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.uni-calendar__box-bg-text {
+		font-size: 200px;
+		font-weight: bold;
+		color: $uni-text-color-grey;
+		opacity: 0.1;
+		text-align: center;
+		/* #ifndef APP-NVUE */
+		line-height: 1;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/uni-calendar/components/uni-calendar/util.js b/uni_modules/uni-calendar/components/uni-calendar/util.js
new file mode 100644
index 0000000..5ec8a92
--- /dev/null
+++ b/uni_modules/uni-calendar/components/uni-calendar/util.js
@@ -0,0 +1,360 @@
+import CALENDAR from './calendar.js'
+
+class Calendar {
+	constructor({
+		date,
+		selected,
+		startDate,
+		endDate,
+		range
+	} = {}) {
+		// 当前日期
+		this.date = this.getDate(new Date()) // 当前初入日期
+		// 打点信息
+		this.selected = selected || [];
+		// 范围开始
+		this.startDate = startDate
+		// 范围结束
+		this.endDate = endDate
+		this.range = range
+		// 多选状态
+		this.cleanMultipleStatus()
+		// 每周日期
+		this.weeks = {}
+		// this._getWeek(this.date.fullDate)
+	}
+	/**
+	 * 设置日期
+	 * @param {Object} date
+	 */
+	setDate(date) {
+		this.selectDate = this.getDate(date)
+		this._getWeek(this.selectDate.fullDate)
+	}
+
+	/**
+	 * 清理多选状态
+	 */
+	cleanMultipleStatus() {
+		this.multipleStatus = {
+			before: '',
+			after: '',
+			data: []
+		}
+	}
+
+	/**
+	 * 重置开始日期
+	 */
+	resetSatrtDate(startDate) {
+		// 范围开始
+		this.startDate = startDate
+
+	}
+
+	/**
+	 * 重置结束日期
+	 */
+	resetEndDate(endDate) {
+		// 范围结束
+		this.endDate = endDate
+	}
+
+	/**
+	 * 获取任意时间
+	 */
+	getDate(date, AddDayCount = 0, str = 'day') {
+		if (!date) {
+			date = new Date()
+		}
+		if (typeof date !== 'object') {
+			date = date.replace(/-/g, '/')
+		}
+		const dd = new Date(date)
+		switch (str) {
+			case 'day':
+				dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+			case 'month':
+				if (dd.getDate() === 31 && AddDayCount>0) {
+					dd.setDate(dd.getDate() + AddDayCount)
+				} else {
+					const preMonth = dd.getMonth()
+					dd.setMonth(preMonth + AddDayCount) // 获取AddDayCount天后的日期
+					const nextMonth = dd.getMonth()
+					// 处理 pre 切换月份目标月份为2月没有当前日(30 31) 切换错误问题
+					if(AddDayCount<0 && preMonth!==0 && nextMonth-preMonth>AddDayCount){
+						dd.setMonth(nextMonth+(nextMonth-preMonth+AddDayCount))
+					}
+					// 处理 next 切换月份目标月份为2月没有当前日(30 31) 切换错误问题
+					if(AddDayCount>0 && nextMonth-preMonth>AddDayCount){
+						dd.setMonth(nextMonth-(nextMonth-preMonth-AddDayCount))
+					}
+				}
+				break
+			case 'year':
+				dd.setFullYear(dd.getFullYear() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+		}
+		const y = dd.getFullYear()
+		const m = dd.getMonth() + 1 < 10 ? '0' + (dd.getMonth() + 1) : dd.getMonth() + 1 // 获取当前月份的日期，不足10补0
+		const d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0
+		return {
+			fullDate: y + '-' + m + '-' + d,
+			year: y,
+			month: m,
+			date: d,
+			day: dd.getDay()
+		}
+	}
+
+
+	/**
+	 * 获取上月剩余天数
+	 */
+	_getLastMonthDays(firstDay, full) {
+		let dateArr = []
+		for (let i = firstDay; i > 0; i--) {
+			const beforeDate = new Date(full.year, full.month - 1, -i + 1).getDate()
+			dateArr.push({
+				date: beforeDate,
+				month: full.month - 1,
+				lunar: this.getlunar(full.year, full.month - 1, beforeDate),
+				disable: true
+			})
+		}
+		return dateArr
+	}
+	/**
+	 * 获取本月天数
+	 */
+	_currentMonthDys(dateData, full) {
+		let dateArr = []
+		let fullDate = this.date.fullDate
+		for (let i = 1; i <= dateData; i++) {
+			let nowDate = full.year + '-' + (full.month < 10 ?
+				full.month : full.month) + '-' + (i < 10 ?
+				'0' + i : i)
+			// 是否今天
+			let isDay = fullDate === nowDate
+			// 获取打点信息
+			let info = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(nowDate, item.date)) {
+					return item
+				}
+			})
+
+			// 日期禁用
+			let disableBefore = true
+			let disableAfter = true
+			if (this.startDate) {
+				// let dateCompBefore = this.dateCompare(this.startDate, fullDate)
+				// disableBefore = this.dateCompare(dateCompBefore ? this.startDate : fullDate, nowDate)
+				disableBefore = this.dateCompare(this.startDate, nowDate)
+			}
+
+			if (this.endDate) {
+				// let dateCompAfter = this.dateCompare(fullDate, this.endDate)
+				// disableAfter = this.dateCompare(nowDate, dateCompAfter ? this.endDate : fullDate)
+				disableAfter = this.dateCompare(nowDate, this.endDate)
+			}
+			let multiples = this.multipleStatus.data
+			let checked = false
+			let multiplesStatus = -1
+			if (this.range) {
+				if (multiples) {
+					multiplesStatus = multiples.findIndex((item) => {
+						return this.dateEqual(item, nowDate)
+					})
+				}
+				if (multiplesStatus !== -1) {
+					checked = true
+				}
+			}
+			let data = {
+				fullDate: nowDate,
+				year: full.year,
+				date: i,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.dateEqual(this.multipleStatus.before, nowDate),
+				afterMultiple: this.dateEqual(this.multipleStatus.after, nowDate),
+				month: full.month,
+				lunar: this.getlunar(full.year, full.month, i),
+				disable: !(disableBefore && disableAfter),
+				isDay
+			}
+			if (info) {
+				data.extraInfo = info
+			}
+
+			dateArr.push(data)
+		}
+		return dateArr
+	}
+	/**
+	 * 获取下月天数
+	 */
+	_getNextMonthDays(surplus, full) {
+		let dateArr = []
+		for (let i = 1; i < surplus + 1; i++) {
+			dateArr.push({
+				date: i,
+				month: Number(full.month) + 1,
+				lunar: this.getlunar(full.year, Number(full.month) + 1, i),
+				disable: true
+			})
+		}
+		return dateArr
+	}
+
+	/**
+	 * 获取当前日期详情
+	 * @param {Object} date
+	 */
+	getInfo(date) {
+		if (!date) {
+			date = new Date()
+		}
+		const dateInfo = this.canlender.find(item => item.fullDate === this.getDate(date).fullDate)
+		return dateInfo
+	}
+
+	/**
+	 * 比较时间大小
+	 */
+	dateCompare(startDate, endDate) {
+		// 计算截止时间
+		startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+		if (startDate <= endDate) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+	/**
+	 * 比较时间是否相等
+	 */
+	dateEqual(before, after) {
+		// 计算截止时间
+		before = new Date(before.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		after = new Date(after.replace('-', '/').replace('-', '/'))
+		if (before.getTime() - after.getTime() === 0) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+
+	/**
+	 * 获取日期范围内所有日期
+	 * @param {Object} begin
+	 * @param {Object} end
+	 */
+	geDateAll(begin, end) {
+		var arr = []
+		var ab = begin.split('-')
+		var ae = end.split('-')
+		var db = new Date()
+		db.setFullYear(ab[0], ab[1] - 1, ab[2])
+		var de = new Date()
+		de.setFullYear(ae[0], ae[1] - 1, ae[2])
+		var unixDb = db.getTime() - 24 * 60 * 60 * 1000
+		var unixDe = de.getTime() - 24 * 60 * 60 * 1000
+		for (var k = unixDb; k <= unixDe;) {
+			k = k + 24 * 60 * 60 * 1000
+			arr.push(this.getDate(new Date(parseInt(k))).fullDate)
+		}
+		return arr
+	}
+	/**
+	 * 计算阴历日期显示
+	 */
+	getlunar(year, month, date) {
+		return CALENDAR.solar2lunar(year, month, date)
+	}
+	/**
+	 * 设置打点
+	 */
+	setSelectInfo(data, value) {
+		this.selected = value
+		this._getWeek(data)
+	}
+
+	/**
+	 *  获取多选状态
+	 */
+	setMultiple(fullDate) {
+		let {
+			before,
+			after
+		} = this.multipleStatus
+
+		if (!this.range) return
+		if (before && after) {
+			this.multipleStatus.before = ''
+			this.multipleStatus.after = ''
+			this.multipleStatus.data = []
+		} else {
+			if (!before) {
+				this.multipleStatus.before = fullDate
+			} else {
+				this.multipleStatus.after = fullDate
+				if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus.after);
+				} else {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus.before);
+				}
+			}
+		}
+		this._getWeek(fullDate)
+	}
+
+	/**
+	 * 获取每周数据
+	 * @param {Object} dateData
+	 */
+	_getWeek(dateData) {
+		const {
+			year,
+			month
+		} = this.getDate(dateData)
+		let firstDay = new Date(year, month - 1, 1).getDay()
+		let currentDay = new Date(year, month, 0).getDate()
+		let dates = {
+			lastMonthDays: this._getLastMonthDays(firstDay, this.getDate(dateData)), // 上个月末尾几天
+			currentMonthDys: this._currentMonthDys(currentDay, this.getDate(dateData)), // 本月天数
+			nextMonthDays: [], // 下个月开始几天
+			weeks: []
+		}
+		let canlender = []
+		const surplus = 42 - (dates.lastMonthDays.length + dates.currentMonthDys.length)
+		dates.nextMonthDays = this._getNextMonthDays(surplus, this.getDate(dateData))
+		canlender = canlender.concat(dates.lastMonthDays, dates.currentMonthDys, dates.nextMonthDays)
+		let weeks = {}
+		// 拼接数组  上个月开始几天 + 本月天数+ 下个月开始几天
+		for (let i = 0; i < canlender.length; i++) {
+			if (i % 7 === 0) {
+				weeks[parseInt(i / 7)] = new Array(7)
+			}
+			weeks[parseInt(i / 7)][i % 7] = canlender[i]
+		}
+		this.canlender = canlender
+		this.weeks = weeks
+	}
+
+	//静态方法
+	// static init(date) {
+	// 	if (!this.instance) {
+	// 		this.instance = new Calendar(date);
+	// 	}
+	// 	return this.instance;
+	// }
+}
+
+
+export default Calendar
diff --git a/uni_modules/uni-calendar/package.json b/uni_modules/uni-calendar/package.json
new file mode 100644
index 0000000..fad841f
--- /dev/null
+++ b/uni_modules/uni-calendar/package.json
@@ -0,0 +1,85 @@
+{
+  "id": "uni-calendar",
+  "displayName": "uni-calendar 日历",
+  "version": "1.4.10",
+  "description": "日历组件",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "日历",
+    "",
+    "打卡",
+    "日历选择"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-calendar/readme.md b/uni_modules/uni-calendar/readme.md
new file mode 100644
index 0000000..4e1748c
--- /dev/null
+++ b/uni_modules/uni-calendar/readme.md
@@ -0,0 +1,103 @@
+
+
+## Calendar 日历
+> **组件名：uni-calendar**
+> 代码块： `uCalendar`
+
+
+日历组件
+
+> **注意事项**
+> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
+> - 本组件农历转换使用的js是 [@1900-2100区间内的公历、农历互转](https://github.com/jjonline/calendar.js)  
+> - 仅支持自定义组件模式
+> - `date`属性传入的应该是一个 String ，如： 2019-06-27 ，而不是 new Date()
+> - 通过 `insert` 属性来确定当前的事件是 @change 还是 @confirm 。理应合并为一个事件，但是为了区分模式，现使用两个事件，这里需要注意
+> - 弹窗模式下无法阻止后面的元素滚动，如有需要阻止，请在弹窗弹出后，手动设置滚动元素为不可滚动
+
+
+### 安装方式
+
+本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
+
+如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
+
+### 基本用法
+
+在 ``template`` 中使用组件
+
+```html
+<view>
+	<uni-calendar 
+	:insert="true"
+	:lunar="true" 
+	:start-date="'2019-3-2'"
+	:end-date="'2019-5-20'"
+	@change="change"
+	 />
+</view>
+```
+
+### 通过方法打开日历
+
+需要设置 `insert` 为 `false`
+
+```html
+<view>
+	<uni-calendar 
+	ref="calendar"
+	:insert="false"
+	@confirm="confirm"
+	 />
+	 <button @click="open">打开日历</button>
+</view>
+```
+
+```javascript
+
+export default {
+	data() {
+		return {};
+	},
+	methods: {
+		open(){
+			this.$refs.calendar.open();
+		},
+		confirm(e) {
+			console.log(e);
+		}
+	}
+};
+
+```
+
+
+## API
+
+### Calendar Props
+
+|  属性名	|    类型	| 默认值| 说明																													|
+| -	| -	| - | - |
+| date		| String	|-		| 自定义当前时间，默认为今天																							|
+| lunar		| Boolean	| false	| 显示农历																												|
+| startDate	| String	|-		| 日期选择范围-开始日期																									|
+| endDate	| String	|-		| 日期选择范围-结束日期																									|
+| range		| Boolean	| false	| 范围选择																												|
+| insert	| Boolean	| false	| 插入模式,可选值，ture：插入模式；false：弹窗模式；默认为插入模式														|
+|clearDate	|Boolean	|true	|弹窗模式是否清空上次选择内容	|
+| selected	| Array		|-		| 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]	|
+|showMonth	| Boolean	| true	| 是否显示月份为背景																									|
+
+### Calendar Events
+
+|  事件名		| 说明								|返回值|
+| -	|	-	| -	|
+| open	| 弹出日历组件，`insert :false` 时生效|- 	|
+
+
+
+
+
+## 组件示例
+
+点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/calendar/calendar](https://hellouniapp.dcloud.net.cn/pages/extUI/calendar/calendar)