diff --git a/.vscode/settings.json b/.vscode/settings.json
index bff2e79..b2b3905 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,5 +2,5 @@
     "workbench.tree.indent": 2,
     "editor.indentSize": "tabSize",
     "editor.tabSize": 2,
-    "vue3snippets.enable-compile-vue-file-on-did-save-code": false
+    "vue3snippets.enable-compile-vue-file-on-did-save-code": true
 }
\ No newline at end of file
diff --git a/App.vue b/App.vue
index d7e3d2d..f131691 100644
--- a/App.vue
+++ b/App.vue
@@ -11,11 +11,11 @@ import store from "@/store";
 			store.commit('setCacheData');
 
 			//检查缓存中userid的存储格式
-			var userStorageSync = aes.aesDecrypt(decodeURIComponent(uni.getStorageSync("userid")))
-			if(userStorageSync.indexOf("data")){
-				var json = JSON.parse(userStorageSync);
-				uni.setStorageSync("userid",aes.aesMinEncrypt(json.data));
-			}
+			// var userStorageSync = aes.aesDecrypt(decodeURIComponent(uni.getStorageSync("userid")))
+			// if(userStorageSync.indexOf("data")){
+			// 	var json = JSON.parse(userStorageSync);
+			// 	uni.setStorageSync("userid",aes.aesMinEncrypt(json.data));
+			// }
 			// uni.getLocation({
 			// 	type: 'gcj02',
 			// 	success: function (res) {
diff --git a/common/config.js b/common/config.js
index 8ec1744..6f53b2d 100644
--- a/common/config.js
+++ b/common/config.js
@@ -143,6 +143,11 @@ module.exports = {
 	//票务这边的
 	pageComplaintinfo:PWPATH+"/wechatshop/complaintinfo/pageComplaintinfo",//获得投诉建议分页
 	createComplaintinfo: PWPATH +"/wechatshop/complaintinfo/createComplaintinfo",//创建投诉建议
+	getTicketSortList: PWPATH + "/wechatshop/ticket/getTicketSortList",//获取门票分类
+	getTicketList: PWPATH + "/wechatshop/ticket/getTicketList",//获取门票列表分页
+	isQuota: PWPATH + "/wechatshop/ticket/isQuota",//查询是否限购
+	getScencAndTicketInfo: PWPATH + "/wechatshop/ticket/getScencAndTicketInfo",//获取景区门票相关信息
+	getTicketDateInventory: PWPATH + "/wechatshop/ticket/getTicketDateInventory",//获得门票日期库存
 
 
 	getPhone: PWPATH+"/wechatshop/auth/getWeChatUserMobile",//获取手机号
diff --git a/common/httpRequest.js b/common/httpRequest.js
index 80122ec..d573651 100644
--- a/common/httpRequest.js
+++ b/common/httpRequest.js
@@ -1,6 +1,7 @@
 import configdata from './config'
 import cache from './cache'
 import aes from "@/common/aes.js";
+import store from "@/store/index.js";
 module.exports = {
 	config: function (name) {
 		var info = null;
diff --git a/common/login.js b/common/login.js
index 08441d8..0accebe 100644
--- a/common/login.js
+++ b/common/login.js
@@ -171,7 +171,7 @@ var throttleLogin = true
 export const judgeLogin = (callback) => {
     let storeUserInfo = store.state.userInfo;
     if (!storeUserInfo.userId){ // nvue页面读取不到vuex里面数据，将取缓存
-		// #ifdef APP-APP-NVUE
+		// #ifdef MP-WEIXIN
 		 storeUserInfo = uni.getStorageSync('userInfo')
 		// #endif
     }
diff --git a/components/f-loading/loading.vue b/components/f-loading/loading.vue
new file mode 100644
index 0000000..b166fc2
--- /dev/null
+++ b/components/f-loading/loading.vue
@@ -0,0 +1,165 @@
+<template>
+	<view class="mask mask-show u_loading" :data-theme="isDark?'dark':'light'" v-if="loadingShow" @touchmove.stop.prevent="preventTouchMove">
+		<!-- 加载动画开始 -->
+		<view class="preloader u-flex u-flex-column u-flex-center">
+		  <view class="loader">
+              <view></view>
+              <view></view>
+              <view></view>
+              <view></view>
+              <view></view>
+          </view>
+		  <!-- <view class="title">加载中...</view> -->
+		</view>
+		<!-- 加载动画结束 -->
+		
+	</view>
+</template>
+
+<script scoped="true">
+import { mapState, mapMutations } from 'vuex';
+export default {
+	computed: {
+		...mapState(['loadingShow','isDark'])
+	},
+	methods:{
+		preventTouchMove(){
+			console.log('stop user scroll it!');
+			return;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.u_loading{
+    &.mask {
+        /* pointer-events: none; */
+        position: fixed;
+        z-index: 99999;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        height: 100vh;
+        width: 100vw;
+        /* #ifndef APP-NVUE */
+        display: flex;
+        /* #endif */
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        flex-wrap: wrap;
+    }
+    &.mask-show {
+        background: rgba(255,255,255, 0);
+    }
+    .title {
+    	color: #666;
+    	font-size: 28rpx;
+    	margin-top: 40rpx;
+    }
+	.preloader{
+		width: 220rpx;
+		height: 170rpx;
+		background-color: transparent;
+		border-radius: 18rpx;
+	}
+    .loader {
+      width: 36px;
+      position: relative;
+    }
+    .loader view {
+      display: block;
+      position: absolute;
+      bottom: 0px;
+      width: 4px;
+      height: 5px;
+      background: coral;
+      -webkit-animation: loader 1.5s infinite ease-in-out;
+      animation: loader 1.5s infinite ease-in-out;
+    }
+    .loader view:nth-child(2) {
+      left: 8px;
+      -webkit-animation-delay: 0.2s;
+      animation-delay: 0.2s;
+    }
+    .loader view:nth-child(3) {
+      left: 16px;
+      -webkit-animation-delay: 0.4s;
+      animation-delay: 0.4s;
+    }
+    .loader view:nth-child(4) {
+      left: 24px;
+      -webkit-animation-delay: 0.6s;
+      animation-delay: 0.6s;
+    }
+    .loader view:nth-child(5) {
+      left: 32px;
+      -webkit-animation-delay: 0.8s;
+      animation-delay: 0.8s;
+    }
+    
+    @-webkit-keyframes loader {
+      0% {
+        height: 5px;
+        -webkit-transform: translateY(0px);
+        transform: translateY(0px);
+        background: coral;
+      }
+      25% {
+        height: 30px;
+        -webkit-transform: translateY(15px);
+        transform: translateY(15px);
+        background: cornflowerblue;
+      }
+      50% {
+        height: 5px;
+        -webkit-transform: translateY(0px);
+        transform: translateY(0px);
+        background: cornflowerblue;
+      }
+      100% {
+        height: 5px;
+        -webkit-transform: translateY(0px);
+        transform: translateY(0px);
+        background: coral;
+      }
+    }
+    
+    @keyframes loader {
+      0% {
+        height: 5px;
+        -webkit-transform: translateY(0px);
+        transform: translateY(0px);
+        background: coral;
+      }
+      25% {
+        height: 30px;
+        -webkit-transform: translateY(15px);
+        transform: translateY(15px);
+        background: cornflowerblue;
+      }
+      50% {
+        height: 5px;
+        -webkit-transform: translateY(0px);
+        transform: translateY(0px);
+        background: cornflowerblue;
+      }
+      100% {
+        height: 5px;
+        -webkit-transform: translateY(0px);
+        transform: translateY(0px);
+        background: coral;
+      }
+    }
+    
+}
+[data-theme=dark] {
+	.u_loading{
+	    &.mask-show {
+	        background: rgba(0,0,0, 0.3);
+	    }
+	}
+}
+</style>
diff --git a/components/f-login/f-login.vue b/components/f-login/f-login.vue
index fdc592e..69daea1 100644
--- a/components/f-login/f-login.vue
+++ b/components/f-login/f-login.vue
@@ -21,10 +21,11 @@
 
             </view>
         </u-popup>
-
+        <f-loading></f-loading>
     </view>
 </template>
 <script>
+import fLoading from "@/components/f-loading/loading.vue"
 import uPopup from "@/uni_modules/uview-ui/components/u-popup/u-popup.vue";
 import uLoadmore from "@/uni_modules/uview-ui/components/u-loadmore/u-loadmore.vue";
 import { mapState, mapMutations } from 'vuex';
@@ -41,7 +42,8 @@ var clear;
 export default {
     components: {
         uPopup,
-        uLoadmore
+        uLoadmore,
+        fLoading
     },
     name: 'f-login',
     computed: {
@@ -83,13 +85,14 @@ export default {
         //授权手机号登录
         decryptPhoneNumber(e) {
             console.log(e, '授权手机号')
+            store.commit("setLoadingShow", true);
             var that = this
             // #ifdef MP-WEIXIN
             if (e.detail.errMsg == 'getPhoneNumber:ok') {
                 if (e.detail.iv) {
                     var userInfo = e.detail;
                     // userInfo.code = that.code
-                    this.closeLogin();
+                    // this.closeLogin();
                     //请去getPhoneInfo方法中使用您的接口绑定信息
                     getPhoneInfo(userInfo, res => {
                         console.log("-------------", res)
@@ -130,17 +133,20 @@ export default {
 
                         //生成token
                         this.setUserInfo(userInfo)
-
+                        store.commit("setLoadingShow", false);
                         setTimeout(() => {
-                            // uni.showToast({
-                            //     title: '登录成功',
-                            //     icon: 'none'
-                            // });
+                            uni.showToast({
+                                title: '登录成功',
+                                icon: 'none'
+                            });
+
                             this.closeLogin();
                         }, 100)
                     });
                 } else {
                     // 授权失败请使用验证码登录
+                    store.commit("setLoadingShow", false);
+
                     this.isPhoneLogin = true
                     uni.showToast({
                         title: '请使用手机号登录',
diff --git a/components/gaoyia-parse/components/wxParseTemplate0.vue b/components/gaoyia-parse/components/wxParseTemplate0.vue
index 5d45644..d753b29 100644
--- a/components/gaoyia-parse/components/wxParseTemplate0.vue
+++ b/components/gaoyia-parse/components/wxParseTemplate0.vue
@@ -42,7 +42,7 @@
 	
 		<!--其他标签-->
 		<view v-else :class="node.classStr" :style="node.styleStr">
-			<block v-for="(node, index) of node.nodes" :key="index">
+			<block v-for="(node, index) in node.nodes" :key="index">
 				<wx-parse-template :node="node"/>
 			</block>
 		</view>
@@ -53,24 +53,18 @@
 </template>
 
 <script>
-	// #ifdef APP-PLUS | H5
+
 	import wxParseTemplate from './wxParseTemplate0';
-	// #endif
-	// #ifdef MP
-	import wxParseTemplate from './wxParseTemplate1';
-	// #endif
+	
 	import wxParseImg from './wxParseImg';
 	import wxParseVideo from './wxParseVideo';
 	import wxParseAudio from './wxParseAudio';
 	import wxParseTable from './wxParseTable';
 
 	export default {
-		// #ifdef APP-PLUS | H5
+		
 		name: 'wxParseTemplate',
-		// #endif
-		// #ifdef MP
-		name: 'wxParseTemplate0',
-		// #endif
+		
 		props: {
 			node: {},
 		},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 701d17e..2428cd3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -105,7 +105,7 @@
           <view class="amt_30">
             <view class="an_pbl dy_fx_row" style="flex-wrap: wrap;">
               <view class="w_two" v-for="(item, index) in scenicList" :key="index"
-                @tap="goToDetail('xiadan', item.guid)">
+                @tap="goToDetail('scenic', item.guid)">
                 <view class="">
                   <image :src="item.slogo" mode="aspectFill" class="pbl_1_img"></image>
                   <view class="h-name">{{ item.sname }}</view>
@@ -147,7 +147,7 @@
           <view class="amt_30">
             <view class="an_pbl dy_fx_row" style="flex-wrap: wrap;">
               <view class="w_two" v-for="(item, index) in foodList" :key="index"
-                @tap="goToDetail('xiadan', item.guid, '')">
+                @tap="goToDetail('food', item.guid, '')">
                 <view class="">
                   <image :src="item.logo" mode="aspectFill" class="pbl_1_img"></image>
                   <view class="h-name">{{ item.title }}</view>
@@ -713,7 +713,9 @@ export default {
     },
     goToDetail: function (type, guid, region) {
       if (type == "scenic") {
+        const list = encodeURIComponent(JSON.stringify(this.scenicList))
         uni.navigateTo({
+          // url: "/subPageA/scenic/scenicdetial/scenicdetial?guid=" + guid + `&listA=` + list,
           url: "/subPageA/scenic/scenicdetial/scenicdetial?guid=" + guid,
         });
       } else if (type == "food") {
diff --git a/store/modules/common.js b/store/modules/common.js
index 3ad3ffa..f00ee94 100644
--- a/store/modules/common.js
+++ b/store/modules/common.js
@@ -4,7 +4,7 @@ export const state = {
 	PrimaryColor: '#2979ff', //主题色
     loginPopupShow:false,//控制是否打开登录弹窗
 	showWxLogin:false,//微信授权登录弹窗-新2022-10
-    loadingShow:true,//加载动画
+    loadingShow:false,//加载动画
     chatScenesInfo:{},//扫码参数
     locateInformation:{},//定位信息
 	currentRouter:'',//当前路径
@@ -29,9 +29,9 @@ export const mutations = {
                 } catch (e) {}
                 // #endif
                 state[name] = data;
-                if (name == "userInfo"){
-                    param.userkey = data.openid
-                }
+                // if (name == "userInfo"){
+                //     param.userkey = data.openid
+                // }
             }
         }
     },
diff --git a/subPageA/food/fooddetial/fooddetial.vue b/subPageA/food/fooddetial/fooddetial.vue
index 03fcd3f..a382823 100644
--- a/subPageA/food/fooddetial/fooddetial.vue
+++ b/subPageA/food/fooddetial/fooddetial.vue
@@ -1,16 +1,19 @@
 <template>
 	<view>
 		<view class="box_1">
-			<view class="fod_det_pic"><image :src="rootPath+foodDetail.imagelist[0]" mode="aspectFill" class="ms_top_img"></image></view>
+			<view class="fod_det_pic">
+				<image :src="rootPath + foodDetail.imagelist[0]" mode="aspectFill" class="ms_top_img"></image>
+			</view>
 			<view class="an_box_3">
 				<view class="an_t_1">{{ foodDetail.title }}</view>
 				<view class="amt_60 wc_cont">
 					<view :class="[zhankai > shouqi ? 'fod_det_inf' : 'fod_det_inf h_define_cont']">
-						<view class="lst_tit"><u-parse :content="foodDetail.content" :loading="loading" @preview="preview" @navigate="navigate" /></view>
-						<view @tap="opens()" :class="[zhankai > shouqi ? 'hide' : 'nr_hide']">
+						<view class="lst_tit"><u-parse :content="foodDetail.content" :loading="loading" @preview="preview"
+								@navigate="navigate" /></view>
+						<!-- <view @tap="opens()" :class="[zhankai > shouqi ? 'hide' : 'nr_hide']">
 							+ 查看详细
-							<image src="../../subPageA/images/btn_more.png" class="data-is-bottom"></image>
-						</view>
+							<image src="/static/animg/index/btn_more.png" class="data-is-bottom"></image>
+						</view> -->
 						<!-- 内容显示完全出现 THE END-->
 						<!-- <view class="amt_30"><view class="cont_end">-THE END-</view></view> -->
 					</view>
@@ -20,17 +23,21 @@
 		<view class="an_box_3">
 			<view v-if="isShowBusiness == 'YES' && (restaurantList != null && restaurantList.length > 0)">
 				<view class="wc_tit_wp">
-					<view class="an_t"><view class="an_t_1">附近商家推荐</view></view>
+					<view class="an_t">
+						<view class="an_t_1">附近商家推荐</view>
+					</view>
 				</view>
 
-				<view @tap="goToRetaurant(item.guid)" class="amt_30" v-for="(item, index) in restaurantList" :key="index" :item-id="index" :data-year="index">
+				<view @tap="goToRetaurant(item.guid)" class="amt_30" v-for="(item, index) in restaurantList" :key="index"
+					:item-id="index" :data-year="index">
 					<view class="dy_fx ls_inf_box">
 						<image :src="item.logo" class="an_ls_img2" mode="aspectFill"></image>
 
 						<view class="fx_1 ls_txt">
 							<text class="lst_tit word_1">{{ item.title }}</text>
 							<text class="lsinf word_1">{{ item.address }}</text>
-							<text @click="goToNavigation(item.lng, item.lat, item.address, item.title)" class="lsinf">{{ item.distance }}</text>
+							<text @click="goToNavigation(item.lng, item.lat, item.address, item.title)" class="lsinf">{{ item.distance
+								}}</text>
 						</view>
 					</view>
 
@@ -59,32 +66,32 @@ export default {
 			lon: '',
 			lat: '',
 			isShowBusiness: 'NO',
-			rootPath:this.$config.ROOTPATH,
-			netType:true
+			rootPath: this.$config.ROOTPATH,
+			netType: true
 		};
 	},
-	onLoad: function(option) {
+	onLoad: function (option) {
 		var that = this;
 		this.$util.getNetworkType(
-			function(res){
-				if(res.networkType === 'none'){
+			function (res) {
+				if (res.networkType === 'none') {
 					uni.showToast({
-						title:that.$param.netMsg,
-						icon:"none",
-						duration:2000
+						title: that.$param.netMsg,
+						icon: "none",
+						duration: 2000
 					})
 					that.netType = false;
 				}
-			},function(){
+			}, function () {
 				uni.showToast({
-					title:that.$param.netMsg,
-					icon:"none",
-					duration:2000
+					title: that.$param.netMsg,
+					icon: "none",
+					duration: 2000
 				})
 				that.netType = false;
 			}
 		)
-		if(!that.netType){
+		if (!that.netType) {
 			return;
 		}
 		this.$util.hideLoadingByTime();
@@ -96,7 +103,7 @@ export default {
 		that.$util.saveOperatorLog(that, 'FOOD', option.fid);
 	},
 	methods: {
-		getIsShow: function() {
+		getIsShow: function () {
 			var that = this;
 			this.$Request
 				.post(this.$config.getSysParamFormRegion, {
@@ -117,7 +124,7 @@ export default {
 		navigate(href, e) {
 			// do something
 		},
-		getFoodDetail: function(guid, region) {
+		getFoodDetail: function (guid, region) {
 			var that = this;
 			var data = {
 				userkey: this.$param.userkey,
@@ -141,10 +148,10 @@ export default {
 				this.foodDetail = data;
 			});
 		},
-		opens: function() {
+		opens: function () {
 			(this.zhankai = 1), (this.shouqi = 0);
 		},
-		goToNavigation: function(lon, lat, address, businessname) {
+		goToNavigation: function (lon, lat, address, businessname) {
 			// #ifdef H5
 
 			if (this.$wechat.isWechat()) {
@@ -193,7 +200,7 @@ export default {
 								}
 							]
 						},
-						function(e) {
+						function (e) {
 							switch (e.index) {
 								case 1:
 									plus.runtime.openURL(urlBaiduMap);
@@ -212,7 +219,7 @@ export default {
 			}
 			// #endif
 		},
-		goToRetaurant: function(guid) {
+		goToRetaurant: function (guid) {
 			uni.navigateTo({
 				url: '/subPageA/store/storedetail/storedetail?id=' + guid
 			});
@@ -233,8 +240,20 @@ export default {
 	
 	.fod_det_bt:after{ display: block; content: ''; width: 524rpx;  margin: 0 auto; margin-top:30rpx;height: 16rpx; background:url(/subPageA/images/bg_ms.png) no-repeat center;  }
 	.mssj_jul:before{ content: '';display: inline-block; width: 38rpx; height: 38rpx; background:url(/subPageA/images/icn_mi.png) no-repeat; background-size: 100%; margin-right: 5rpx; position: relative; top:6rpx} */
-	
-	
-	.nr_hide{ height:76rpx ;}
-	
+
+
+.nr_hide {
+	height: 76rpx;
+	position: relative;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.data-is-bottom {
+	width: 30rpx;
+	height: 30rpx;
+	padding: 0;
+	margin-left: 15rpx;
+}
 </style>
diff --git a/subPageA/personcenter/aboutus.vue b/subPageA/personcenter/aboutus.vue
index c8c6b4b..8b8ce5c 100644
--- a/subPageA/personcenter/aboutus.vue
+++ b/subPageA/personcenter/aboutus.vue
@@ -10,12 +10,10 @@
 						<!-- {{ name }}文旅APP -->
 					</view>
 					<view class="nr_cot">
-						"鹿泉E码游"平台是利用物联网、云计算、大数据、人工智能技术打造的“中国第一，世界一流"的全域旅游数字化平台。为游客提供"吃、住、行、游、购、娱、养"的智慧旅行服务，打造诚信消费的环境与快捷投诉的管理体系，实现"游客体验自由自在，政府服务无处不在”。全面助推鹿泉旅游产业转型升级、数字经济创新与实践，建设一个智能、健康、便利的云南全域旅游生态。
+						鹿泉E码游平台是专为鹿泉区旅游打造的综合性服务平台，通过整合当地旅游资源，提供在线预订、智能导览、信息查询等功能。游客只需扫描一个二维码，即可轻松获取吃、住、行、游、购、娱等全方位服务，实现一码在手，畅游鹿泉的目的。
 					</view>
 				</view>
-				<view class="tips">
-					©技术由鹿泉单位提供
-				</view>
+				
 				<!-- <view class="bot_about_k an_t_2">
 					查看
 					<view @tap="goToPage('xieyi')" class="t_col_1">《用户协议》</view>
diff --git a/subPageA/scenic/scenicdetial/scenicdetial.vue b/subPageA/scenic/scenicdetial/scenicdetial.vue
index b92dc85..19b59ee 100644
--- a/subPageA/scenic/scenicdetial/scenicdetial.vue
+++ b/subPageA/scenic/scenicdetial/scenicdetial.vue
@@ -23,9 +23,9 @@
           :duration="duration_sce"
         >
           <swiper-item v-for="(item, index) in pic_list" :key="index">
-            <view class=""
-              ><image :src="item" mode="aspectFill" class="swiper_tup br_radius"></image
-            ></view>
+            <view class="">
+              <image :src="item" mode="aspectFill" class="swiper_tup br_radius"></image>
+            </view>
           </swiper-item>
         </swiper>
       </view>
@@ -74,9 +74,38 @@
         >
       </view>
     </view>
-
+    <!-- 门票 -->
+    <view class="ticket-list-box mode_com mt_1">
+      <view
+        class="m-ticket-sort"
+        v-for="items in ticketList"
+        v-show="items.ticketList.length > 0"
+      >
+        <view class="m-sort-name">{{ items.sortName }}</view>
+        <view class="ticket-item" v-for="item in items.ticketList">
+          <view class="ticket-name">
+            <span>{{ item.ticketname }}</span>
+            <!-- <span class="ticket-type"></span> -->
+          </view>
+          <!-- <view class="ticket-tag"></view> -->
+          <view class="ticket-tips">
+            <view class="left">
+              查看购买须知<uni-icons color="#FF7F00" type="right" size="12"></uni-icons>
+            </view>
+            <view class="ticket-price"
+              >{{ item.settlementPrice | money }} <span class="m-danwei">元</span></view
+            >
+          </view>
+          <view class="btn-box">
+            <view class="m-btn" hover-class="m-btn-hover" @click="bookIt(item)"
+              >立即预定</view
+            >
+          </view>
+        </view>
+      </view>
+    </view>
     <!-- 攻略 -->
-    <view class="mode_com mt_1 gl">
+    <view class="mode_com mt_1 gl" v-if="wanleList.length > 0 && wanleList != undefined">
       <text class="tit_com">附近玩乐</text>
       <text v-if="wanleList.length == 0 || wanleList == undefined" class="mssj_adr"
         >暂无数据</text
@@ -94,10 +123,12 @@
         </view>
       </view>
     </view>
+    <f-login></f-login>
   </view>
 </template>
 
 <script>
+import { mapState, mapMutations } from "vuex";
 import uniIcons from "@/uni_modules/uni-icons/components/uni-icons/uni-icons.vue";
 import uniRate from "@/components/uni-rate/uni-rate2.vue";
 import uParse from "@/components/gaoyia-parse/parse.vue";
@@ -147,59 +178,34 @@ export default {
       console.log("Running in WeChat Mini Program environment");
     }
 
-    // this.requestLocation();
     that.$util.saveOperatorLog(that, "SCENIC", options.guid);
     //正常进入详情
-    if (
-      options.unionid == undefined ||
-      options.unionid == null ||
-      options.unionid == ""
-    ) {
-      uni.showLoading({
-        title: "加载中",
-        mask: true,
-      });
-      this.guid = options.guid;
-      if (options.list != "" && options.list != null){
-        const arr = JSON.parse(options.list).filter((item) => item.cid != this.guid);
-        if (arr.length <= 2) {
-          this.wanleList = arr;
-        } else {
-          this.wanleList = arr.slice(0, 2);
-        }
-      }
-      this.detailInfo(options.guid);
-      this.getIsShow();
-      // #ifdef H5
 
-      if (this.$wechat.isWechat()) {
-        this.isZb = false;
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    this.guid = options.guid;
+    if (options.list != "" && options.list != null) {
+      const arr = JSON.parse(options.list).filter((item) => item.cid != this.guid);
+      if (arr.length <= 2) {
+        this.wanleList = arr;
+      } else {
+        this.wanleList = arr.slice(0, 2);
       }
-      // #endif
-    } else {
-      //授权重定向回来的页面
-      this.guid = options.guid;
-      this.detailInfo(options.guid);
-      uni.setStorageSync("oauthTime", new Date().getTime());
-      uni.setStorageSync("nickname", aes.aesMinEncrypt(options.nickname));
-      uni.setStorageSync("openid", aes.aesMinEncrypt(options.openid));
-      uni.setStorageSync("unionid", aes.aesMinEncrypt(options.unionid));
-      uni.setStorageSync("headimgurl", aes.aesMinEncrypt(options.headimgurl));
-      this.suitid = options.suitid;
-      this.$util.getUserInfo(that, options.unionid, function () {
-        that.paybtn();
-      });
     }
+    this.detailInfo(options.guid);
+    this.getIsShow();
+    // #ifdef H5
+
+    if (this.$wechat.isWechat()) {
+      this.isZb = false;
+    }
+    // #endif
   },
-  onUnload() {
-    this.stops(this.info.soundpath);
-  },
+  onUnload() {},
   onShow() {
     this.param.page = 1;
-    // this.getComment();
-    if (this.isToDingDanType) {
-      this.goDingDan();
-    }
   },
   onReady() {
     // setTimeout(function() {
@@ -230,7 +236,8 @@ export default {
       info: {},
       weather: {},
       listDatas: [],
-      tickeTlist: [],
+      ticketList: [],
+      ticketSortList: [],
       param: {
         page: 1,
         noData: !1,
@@ -286,43 +293,97 @@ export default {
       deep: true,
     },
   },
+  computed: {
+    ...mapState(["PrimaryColor", "userInfo"]),
+    freeSpecsButtonBackground() {
+      return this.$u.colorToRgba(this.$u.rgbToHex(this.PrimaryColor), 0.75);
+    },
+  },
   methods: {
+    bookIt(val) {
+      this.judgeLogin((resa) => {
+        const obj = {
+          mobile: this.userInfo.phone,
+          ticketId: val.id,
+          tenantId: this.info.controlInfo.cyjcScenicId,
+        };
+        const tenantId = this.info.controlInfo.cyjcScenicId;
+        console.log(
+          this.info.controlInfo.cyjcScenicId,
+          "this.info.controlInfo.cyjcScenicId"
+        );
+        if (val.buyticketlimit == 1) {
+          const ticket = encodeURIComponent(JSON.stringify(val));
+          uni.navigateTo({
+            url:
+              "/subPageC/bookTicket/bookTicket?ticket=" + ticket + "&tentId=" + tenantId,
+          });
+        } else {
+          this.$Request
+            .get(this.$config.isQuota, obj, null, null, false, false)
+            .then((res) => {
+              console.log(res, "是否有余票");
+              if (res.data > 0) {
+                const ticket = encodeURIComponent(JSON.stringify(val));
+                uni.navigateTo({
+                  url:
+                    "/subPageC/bookTicket/bookTicket?ticket=" +
+                    ticket +
+                    "&maxNum=" +
+                    res.data +
+                    "&tentId=" +
+                    tenantId,
+                });
+              } else {
+                uni.showToast({
+                  title: "超过购买上限",
+                  icon: "none",
+                });
+              }
+            });
+        }
+      });
+    },
+    //门票分类
+    getTicketSortList(val) {
+      this.$Request
+        .get(this.$config.getTicketSortList, { tenantId: val }, null, null, false, false)
+        .then((res) => {
+          console.log(res, "门票分类");
+          this.ticketSortList = res.data;
+          this.getTicketList(val);
+        });
+    },
+    //门票列表
+    getTicketList(val) {
+      this.$Request
+        .get(
+          this.$config.getTicketList,
+          {
+            tenantId: val,
+          },
+          null,
+          null,
+          false,
+          false
+        )
+        .then((res) => {
+          console.log(res, "门票");
+          this.ticketList = res.data;
+        });
+    },
     //攻略简介
-    goJianJie(){
+    goJianJie() {
       const obj = {
-        playtime:this.info.playtime,
-        smobile:this.info.smobile,
-        tips:this.info.tips,
-        sdescribe:this.info.sdescribe,
-      }
-      const str = JSON.stringify(obj)
+        playtime: this.info.playtime,
+        smobile: this.info.smobile,
+        tips: this.info.tips,
+        sdescribe: this.info.sdescribe,
+      };
+      const str = JSON.stringify(obj);
       uni.navigateTo({
-        url: '/subPageA/scenic/gonglve/gonglve?data=' + encodeURIComponent(str),
-      })
-    },
-    requestLocation: function () {
-      var that = this;
-      this.$util.bindGpsObj(that);
-      this.$util.getLocation(
-        function (res) {
-          // #ifdef H5
-
-          if (that.$wechat.isWechat()) {
-            that.$param.clat = res.latitude;
-            that.$param.clng = res.longitude;
-            uni.hideLoading();
-          }
-          // #endif
-        },
-        function () {
-          console.log("location error---");
-        }
-      );
-    },
-    callGpsSuccess: function (lat, lng) {},
-    callGpsFail: function () {},
-    preventHandler() {
-      return;
+        url: "/subPageA/scenic/gonglve/gonglve?data=" + encodeURIComponent(str),
+      });
     },
 
     getIsShow: function () {
@@ -331,30 +392,21 @@ export default {
         this.isShowBuy = d.is_show_buy;
       });
     },
-    getScenicListGuids: function () {
-      var data = {
-        guids: this.$param.hotScenicGuid,
-      };
-      this.$Request.post(this.$config.getScenicListByGuids, data).then((res) => {
-        console.log(res);
-        this.scenicList = res.data;
-      });
-    },
     detailInfo: function (guid) {
       /* var that = this;
-				var data = {
-					key: this.$param.userkey+'_scenic_' + guid
-				};
-				this.$Request.post(this.$config.getRedisData, data).then(res => {
-					console.log("Redis景区")
-					console.log(res);
-					if(res.status == 200){
-						//所有的数据
-						var initData = res.data;
-					}else{ */
+        var data = {
+          key: this.$param.userkey+'_scenic_' + guid
+        };
+        this.$Request.post(this.$config.getRedisData, data).then(res => {
+          console.log("Redis景区")
+          console.log(res);
+          if(res.status == 200){
+            //所有的数据
+            var initData = res.data;
+          }else{ */
       this.getScDetail(guid);
       /* 	}
-				}); */
+        }); */
     },
     getScDetail: function (guid) {
       var data = {
@@ -363,7 +415,7 @@ export default {
       };
       this.$Request.post(this.$config.scenicDetial, data).then((res) => {
         this.info = res.data;
-        this.tickeTlist = res.data.ticketlist;
+        // this.tickeTlist = res.data.ticketlist;
         this.logo = this.$config.ROOTPATH + res.data.slogo;
         var pic_list = res.data.imgList;
         var videolist = res.data.videolist;
@@ -390,7 +442,6 @@ export default {
           //this.comment(res.data.controlInfo.cyjcScenicUuid);
           if (res.data.controlInfo.isPeopleFlow == "YES") {
             this.isShowFlow = true;
-            
           }
         } else {
           this.isShow = false;
@@ -406,286 +457,12 @@ export default {
           this.info.charac = null;
         }
         this.getDuration(this.info.soundpath, res.data.sfunc);
-        // this.getWeather(res.data.region);
-        // this.getMethod(res.data.region);
+
+        this.getTicketList(this.info.controlInfo.cyjcScenicId);
         uni.hideLoading();
       });
     },
-    getWeather: function (region) {
-      var data = {
-        region: region,
-      };
-      this.$Request.post(this.$config.getWeather, data).then((res) => {
-        this.weather = res.data;
-        if (this.weather.cond_txt_d.indexOf("雷") != -1) {
-          this.weatherImgUrl = "/subPageA/images/whe_lei.png";
-        } else if (this.weather.cond_txt_d.indexOf("雨") != -1) {
-          this.weatherImgUrl = "/subPageA/images/whe_yu.png";
-        } else if (this.weather.cond_txt_d.indexOf("雾") != -1) {
-          this.weatherImgUrl = "/subPageA/images/whe_wu.png";
-        } else if (this.weather.cond_txt_d.indexOf("阴") != -1) {
-          this.weatherImgUrl = "/subPageA/images/whe_yin.png";
-        } else if (this.weather.cond_txt_d.indexOf("雪") != -1) {
-          this.weatherImgUrl = "/subPageA/images/whe_xu.png";
-        } else if (this.weather.cond_txt_d.indexOf("晴") != -1) {
-          this.weatherImgUrl = "/subPageA/images/whe_sun.png";
-        } else {
-          this.weatherImgUrl = "/subPageA/images/whe_cloudy.png";
-        }
-      });
-    },
-    getComment: function () {
-      var that = this;
-      var data = {
-        dataid: this.guid,
-        type: "SCENIC",
-        userkey: this.$param.userkey,
-        pageno: this.param.page,
-        pagesize: 5,
-      };
-      this.$Request.post(this.$config.getCommentFromMobile, data).then((res) => {
-        var commentList = res.data.commentList;
-        this.peoplesnum = res.data.commentCountMap;
-        if (commentList == null || commentList.length <= 0) {
-          that.isShow = false;
-        } else {
-          var dataListLen = commentList.length;
-          if (dataListLen > 0) {
-            for (var i = 0; i < dataListLen; i++) {
-              var date = that.getMyDate(commentList[i].createtime);
-              commentList[i].createtime = date;
-              that.comments.push(commentList[i]);
-            }
-            that.isShow = true;
-          }
-          if (that.param.page == 1) {
-            that.comments = commentList;
-          }
-        }
-      });
-    },
-    //攻略
-    getMethod: function (region) {
-      var requestData = {
-        pageno: "1",
-        pageSize: "5",
-        sort: "2",
-        region: region,
-        type: this.$param.methodType,
-        userkey: this.$param.userkey,
-        scenicid: this.guid,
-      };
-      this.$Request
-        .post(this.$config.getMessageInfoFormFilter, requestData)
-        .then((res) => {
-          var listDatas = this.listDatas,
-            dataListLen = res.data.length;
-          for (var i = 0; i < dataListLen; i++) {
-            var item = {
-              guid: res.data[i].guid,
-              logo: this.rootPaht + res.data[i].logo,
-              mtitle: res.data[i].title,
-              sendtime: res.data[i].sendtime,
-              browsenum: res.data[i].browsenum,
-              mcontent: this.delHtmlTag(res.data[i].content),
-            };
-            this.listDatas.push(item);
-          }
-        });
-    },
-    opens: function () {
-      (this.zhankai = 1), (this.shouqi = 0), (this.flag = false);
-    },
-    retract: function () {
-      (this.zhankai = 0), (this.shouqi = 1), (this.flag = true);
-    },
-    // comment: function(uuid) {
-    // 	var data = {
-    // 		pageno: this.param.page,
-    // 		sceniccode: uuid,
-    // 		pagesize: 5
-    // 	};
-    // 	if (data.sceniccode == '') {
-    // 		this.isShow = false;
-    // 	}
-    // 	this.$Request.post(this.$config.scenicgoodlist, data).then(res => {
-    // 		if (res.data == null || res.data.length <= 0) {
-    // 			this.isShow = false;
-    // 		} else {
-    // 			var dataListLen = res.data.length;
-    // 			if (
-    // 				(dataListLen == data.pagesize
-    // 					? (this.param.page += 1)
-    // 					: (this.param.page = 1 && 0 == dataListLen ? (this.param.noData = true) : (this.param.finished = true)),
-    // 				(this.param.loading = false),
-    // 				dataListLen > 0)
-    // 			) {
-    // 				for (var i = 0; i < dataListLen; i++) {
-    // 					var item = {
-    // 						criticism_user: res.data[i].criticism_user,
-    // 						criticism_content: res.data[i].criticism_content,
-    // 						criticism_time: res.data[i].criticism_time,
-    // 						grade: res.data[i].grade
-    // 					};
-    // 					if (item.grade.toString().indexOf('.') == -1) {
-    // 						item.grade = item.grade + '.0';
-    // 					}
-    // 					this.comments.push(item);
-    // 				}
-    // 			}
-    // 		}
-    // 	});
-    // 	this.peopleNum(uuid);
-    // },
-    /* peopleNum: function(sceniccode) {
-			var data = {
-				sceniccode: sceniccode
-			};
-			this.$Request.post(this.$config.totalnumAndPj, data).then(res => {
-				if (res.data.length > 0) {
-					this.peoplesnum = res.data[0];
-				}
-			});
-		}, */
-    qierlingurl: function (url) {
-      if (url.length > 10 && url != "") {
-        // if(url.indexOf("https") != -1){
-        var r = this.$base64.encode(url);
-        uni.navigateTo({
-          url: "/subPageA/scenic/scenicdetial/url720/url720?url=" + r,
-        });
-        /* }else{
-					window.location.href = url;
-				} */
-      } else {
-        uni.showModal({
-          title: "提示",
-          content: "敬请期待",
-          success: function (res) {
-            if (res.confirm) {
-              console.log("用户点击确定");
-            } else if (res.cancel) {
-              console.log("用户点击取消");
-            }
-          },
-        });
-      }
-      // window.location.href =url;
-    },
-    wisdomGuide: function (linkDaoLanId) {
-      if (linkDaoLanId != null && linkDaoLanId != "") {
-        uni.navigateTo({
-          url: "/subPageA/daolan/daolan?scenicId=" + linkDaoLanId,
-        });
-      } else {
-        uni.showModal({
-          title: "提示",
-          content: "敬请期待",
-          success: function (res) {
-            if (res.confirm) {
-              console.log("用户点击确定");
-            } else if (res.cancel) {
-              console.log("用户点击取消");
-            }
-          },
-        });
-      }
-      // window.location.href =this.$config.wisdomGuide+'?scenicId='+guid;
-    },
-    /* gotoTicket: function() {
-				if (this.info.chanjian.link_st == "YES" && this.info.chanjian.st_scenic_id != 0 &&
-					this.info.chanjian.st_scenic_id != "") {
-					uni.navigateTo({
-						url: '/subPageA/pay/scenicdetail?sid=' + this.info.chanjian.st_scenic_id
-					});
-				} else {
-					uni.showModal({
-						title: '提示',
-						content: '暂未开通订票服务',
-						success: function(res) {
-							if (res.confirm) {
-								console.log('用户点击确定');
-							} else if (res.cancel) {
-								console.log('用户点击取消');
-							}
-						}
-					});
-				}
-			}, */
-    liveBeauty: function (guid) {
-      if (this.info.controlInfo.isLive == "YES") {
-        Android.gotoDetial("LIVEVIDEO", guid + "");
-      } else {
-        uni.showModal({
-          title: "提示",
-          content: "暂无直播",
-          success: function (res) {
-            if (res.confirm) {
-              console.log("用户点击确定");
-            } else if (res.cancel) {
-              console.log("用户点击取消");
-            }
-          },
-        });
-      }
-    },
-    goToScenicDetail: function (guid) {
-      //Android.gotoDetial("SCENIC", guid + "");
-      uni.navigateTo({
-        url: "/subPageA/scenic/scenicdetial/scenicdetial?guid=" + guid,
-      });
-    },
-    play: function (soundpath) {
-      if (soundpath == "" || soundpath == null) {
-        this.total = "--";
-        uni.showModal({
-          title: "提示",
-          content: "本景区暂无音频",
-          showCancel: false,
-          success: function (res) {
-            if (res.confirm) {
-              console.log("用户点击确定");
-            } else if (res.cancel) {
-              console.log("用户点击取消");
-            }
-          },
-        });
-      } else {
-        var that = this;
-        this.open = 1;
-        this.stop = 0;
-        this.AudioContext.autoplay = true;
-        this.AudioContext.src = this.$config.ROOTPATH + soundpath;
-        this.AudioContext.play();
-        var i = 1;
-        this.AudioContext.onTimeUpdate(() => {
-          /* 				console.log('进度更新了总进度为：'+parseInt(that.AudioContext.duration)+'当前进度为：'+parseInt(that.AudioContext.currentTime));
-           */
-          setTimeout(() => {
-            this.getParseInt(that.AudioContext.currentTime);
-          }, 1000);
-        });
-        if (this.seektime > 0 && this.seektime != null && this.seektime != "") {
-          this.AudioContext.seek(this.seektime);
-        }
-      }
-    },
-    getParseInt: function (current) {
-      /* console.log('总:'+parseInt(this.AudioContext.duration)+'当前:'+this.current); */
-      if (parseInt(current) == parseInt(this.AudioContext.duration)) {
-        this.stops(this.info.soundpath);
-        this.audioTime = 0;
-        this.AudioContext.stop();
-      } else {
-        this.audioTime = parseInt((current / this.AudioContext.duration) * 100);
-        //this.current = parseInt(current);
-        this.seektime = parseInt(current);
-        var b = this.$util.secsToStr(parseInt(current));
-        this.current = b;
-      }
 
-      /* this.current=parseInt(this.AudioContext.duration);*/
-    },
     getDuration: function (soundpath, dur) {
       if (soundpath == "" || soundpath == null) {
         this.total = "--";
@@ -694,43 +471,6 @@ export default {
         this.AudioContext.autoplay = false;
         this.AudioContext.src = this.$config.ROOTPATH + soundpath;
         /* this.AudioContext.duration=Number(dur); */
-        /* this.getTimeOut(); */
-      }
-    },
-    getTimeOut: function () {
-      setTimeout(() => {
-        /* console.log(this.AudioContext.duration); */
-        var total = parseInt(this.AudioContext.duration);
-        if (isNaN(total)) {
-          this.total = "--";
-          this.current = "--";
-          this.getTimeOut();
-        } else {
-          var a = this.$util.secsToStr(total);
-          /* 	console.log(a); */
-          this.total = a;
-        }
-      }, 1000);
-    },
-    sliderChange: function (e) {
-      var a = parseInt(((e.detail.value - 1) / 100) * this.AudioContext.duration);
-      this.AudioContext.seek(a);
-    },
-    stops: function (soundpath) {
-      this.open = 0;
-      this.stop = 1;
-      this.AudioContext.pause();
-    },
-    gotomethod: function (guid) {
-      uni.navigateTo({
-        url: `/subPageA/method/methoddetail/methoddetail?guid=` + guid + ``,
-      });
-    },
-    delHtmlTag: function (str) {
-      if (str != undefined && str != null) {
-        var temp = str.replace(/<\/?.+?>/g, "");
-        var result = temp.replace(/ /g, "");
-        return result.replace(/&nbsp;/gi, "");
       }
     },
     daohang() {
@@ -770,197 +510,19 @@ export default {
         "&mode=walk&src=sjz_uniapp&callnative=1";
       // #endif
     },
-    viewMore: function () {
-      //console.log(this.param.page);
-      this.param.page++;
-      /* this.comment(	this.info.controlInfo.cyjcScenicUuid); */
-      //this.comment(uuid);
-      this.getComment();
-    },
     tel: function (tels) {
       uni.makePhoneCall({
         phoneNumber: tels, //仅为示例
       });
     },
-    getScenicDetail: function (sid) {
-      var api_token = this.$MD5.hexMD5("APIgetSpotInfolvyou");
-      var sendData = {
-        api_token: api_token,
-        productaid: sid,
-      };
-      var data = {
-        data: JSON.stringify(sendData),
-        url: this.$config.getSpotInfo,
-      };
-      this.$Request.post(this.$config.getAittoData, data).then((res) => {
-        this.scenicDetail = res.data;
-        /* var item = {
-						latitude: this.scenicDetail.lat,
-						longitude: this.scenicDetail.lng,
-					}
-					this.markers.push(item);
-					this.score=res.data.comment.score / res.data.comment.num;
-					this.latitude=res.data.lat; //要去的纬度-地址
-					this.longitude=res.data.lng; //要去的经度-地址
-					this.address= res.data.address;
-					this.title= res.data.title;
-					this.noticeData=res.data.ticketinfo;
-					this.couponData=res.data.discountInfo ? res.data.discountInfo : [];
-					this.showCoupon=res.data.userDiscount ? true : false; */
-      });
-    },
-    callBackMethod: function () {
-      this.paybtn();
-      uni.hideLoading();
-    },
-    // 门票详情
-    paybtn: function () {
-      var that = this;
-      if (
-        aes.aesDecrypt(uni.getStorageSync("unionid")) == undefined ||
-        aes.aesDecrypt(uni.getStorageSync("unionid")) == null ||
-        aes.aesDecrypt(uni.getStorageSync("unionid")) == ""
-      ) {
-        // #ifdef H5
-
-        if (this.$wechat.isWechat()) {
-          //weixin 调用授权
-          this.$util.getUser(that, "scenicdetail", that.suitid, that.guid);
-        } else {
-          switch (uni.getSystemInfoSync().platform) {
-            case "android":
-              //Android
-              //安卓授权
-              var that = this;
-              this.$util.bindGpsObj(that);
-              Android.gotoDetial("WxUserInfo", "");
-              break;
-            case "ios":
-              //ios授权
-              break;
-          }
-        }
-        return;
-        // #endif
-      } else {
-        if (this.$util.isBlack(aes.aesDecrypt(uni.getStorageSync("user_token")))) {
-          this.$util.getUserInfo(
-            that,
-            aes.aesDecrypt(uni.getStorageSync("unionid")),
-            function () {}
-          );
-        }
-      }
-      that.showNotice = false;
-      var api_token = that.$MD5.hexMD5("APIgetSpotSuitVilTimelvyou");
-      var sendData = {
-        api_token: api_token,
-        suitid: that.suitid, //套餐id
-      };
-      var data = {
-        data: JSON.stringify(sendData),
-        url: that.$config.getSpotSuitVilTime,
-      };
-      that.$Request.post(that.$config.getAittoData, data).then((re) => {
-        if (re.code == 0 && re.msg == "Success") {
-          uni.navigateTo({
-            url: "/subPageA/pay/calendar/index?date2=" + re.data[0].maxday,
-          });
-        }
-      });
-    },
-    showNoticeBtn: function (e) {
-      this.showNotice = true;
-      var view = e.currentTarget.dataset;
-      //this.notice = view.notice;
-      var regex = /style="[^=>]*"([(\s+\w+=)|>])/g;
-      this.notice = view.notice.replace(regex, "$1"); //使用正则去掉富文本中的所有style样式
-      (this.ticketSellprice = view.sellprice),
-        (this.ticketPrice = view.price),
-        (this.suitid = view.suitid),
-        (this.isspecial = view.isspecial);
-    },
-    closeNoticeBtn: function () {
-      this.showNotice = false;
-    },
-    showSeverBtn: function () {
-      this.showSever = true;
-    },
-    closeSeverBtn: function () {
-      this.showSever = false;
-    },
-    showContactBtn: function () {
-      this.showContact = true;
-    },
-    closeContactBtn: function () {
-      this.showContact = false;
-    },
     /**
      * 拨打客服电话 函数
      */
-    getMobile: function () {
-      uni.makePhoneCall({
-        phoneNumber: "0311-83886677",
-      });
-    },
     getTel: function () {
       uni.makePhoneCall({
         phoneNumber: "0311-83886677",
       });
     },
-    goDingDan: function () {
-      uni.showLoading({
-        mask: true,
-        title: "加载中",
-      });
-      let productid = this.scenicDetail.id;
-      let suitid = this.suitid;
-      let dismid = 0;
-      let substation = 0;
-      var sendData = {
-        productid: productid,
-        day: this.tapDate,
-        suitid: suitid,
-        dismid: dismid,
-        substation: substation,
-      };
-      this.isToDingDanType = false;
-      uni.navigateTo({
-        url:
-          "/subPageA/pay/book/book?sendData=" +
-          encodeURIComponent(JSON.stringify(sendData)),
-      });
-    },
-    
-    getMyDate: function (str) {
-      var oDate = new Date(str),
-        oYear = oDate.getFullYear(),
-        oMonth = oDate.getMonth() + 1,
-        oDay = oDate.getDate(),
-        oHour = oDate.getHours(),
-        oMin = oDate.getMinutes(),
-        oSen = oDate.getSeconds(),
-        oTime =
-          oYear +
-          "-" +
-          this.addZero(oMonth) +
-          "-" +
-          this.addZero(oDay) +
-          " " +
-          this.addZero(oHour) +
-          ":" +
-          this.addZero(oMin) +
-          ":" +
-          this.addZero(oSen);
-      return oTime;
-    },
-    //补零操作
-    addZero: function (num) {
-      if (parseInt(num) < 10) {
-        num = "0" + num;
-      }
-      return num;
-    }
   },
 };
 </script>
@@ -980,9 +542,11 @@ body {
 .liu_hui {
   color: #cbcbcb !important;
 }
+
 .liu_green {
   color: #07b800 !important;
 }
+
 .liu_red {
   color: #ef0a0a !important;
 }
@@ -1026,6 +590,7 @@ body {
   .dl_1 {
     color: #333;
   }
+
   /* This was made with GlassGenerator.netlify.app */
 
   .glass-container {
@@ -1047,6 +612,7 @@ body {
     border-bottom: 0px rgba(40, 40, 40, 0.35) solid;
     border-right: 0px rgba(40, 40, 40, 0.35) solid;
   }
+
   .mmd_scol {
     position: relative;
 
@@ -1139,6 +705,7 @@ body {
 
       .agn_right {
         width: fit-content;
+
         .btn_daoh {
           background: #f8f9fd;
           border-radius: 28rpx;
@@ -1163,6 +730,7 @@ body {
       }
     }
   }
+
   .uni-margin-wrap {
     .swiper_jqu {
       height: 540rpx;
@@ -1174,6 +742,7 @@ body {
     }
   }
 }
+
 .uni-margin-wrap {
   width: 100%;
 }
@@ -1194,6 +763,7 @@ body {
 .category-content .product-item:nth-child(4n + 3) .product-img {
   background-color: #e9dcf2 !important;
 }
+
 .category-content {
   display: flex;
   flex-direction: row;
@@ -1202,6 +772,7 @@ body {
   margin: 0 20rpx;
 
   justify-content: space-between;
+
   .product-item {
     width: 100%;
     display: flex;
@@ -1220,11 +791,13 @@ body {
       margin-left: 15rpx;
       display: flex;
       flex-direction: column;
+
       .product-title1 {
         font-size: 32rpx;
         padding-bottom: 12rpx;
         padding-top: 10rpx;
       }
+
       .product-title {
         width: fit-content;
         font-size: 24rpx;
@@ -1235,8 +808,122 @@ body {
   }
 }
 
-.gl{
+.gl {
   margin-top: -50rpx;
   background-color: #fff;
 }
+
+.senice-charac {
+  display: flex;
+  flex-wrap: wrap;
+
+  .border {
+    margin-right: 10rpx;
+  }
+}
+
+.ticket-list-box {
+  margin-top: -80rpx;
+  padding-top: 40rpx;
+  padding: 50rpx 0;
+
+  .m-ticket-sort {
+    padding: 0 25rpx;
+    margin-bottom: 30rpx;
+    background-color: #fff;
+    padding-bottom: 30rpx;
+
+    .m-sort-name {
+      font-family: Source Han Sans SC;
+      font-weight: bold;
+      font-size: 40rpx;
+      color: #1b1b1b;
+      margin-bottom: 35rpx;
+      padding: 50rpx 20rpx 0;
+    }
+
+    .ticket-item {
+      background: #f8f9fd;
+      border-radius: 20rpx;
+      padding: 40rpx;
+      margin-bottom: 25rpx;
+
+      .ticket-name {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 20rpx;
+        font-family: Source Han Sans SC;
+        font-weight: 500;
+        font-size: 32rpx;
+        color: #1b1b1b;
+
+        .ticket-type {
+          font-family: Source Han Sans SC;
+          font-weight: 400;
+          font-size: 20rpx;
+          color: #666666;
+          padding: 3rpx 5rpx;
+          border-radius: 8rpx;
+          border: 1px solid #e9e9e9;
+        }
+      }
+
+      .ticket-tag {
+        font-family: Source Han Sans SC;
+        font-weight: 500;
+        font-size: 24rpx;
+        color: #0983ff;
+        margin-bottom: 20rpx;
+      }
+
+      .ticket-tips {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 15rpx;
+
+        .left {
+          font-family: Source Han Sans SC;
+          font-weight: 500;
+          font-size: 24rpx;
+          color: #ff7f00;
+        }
+
+        .ticket-price {
+          font-family: Source Han Sans SC;
+          font-weight: bold;
+          font-size: 38rpx;
+          color: #ff404c;
+
+          .m-danwei {
+            font-size: 32rpx;
+          }
+        }
+      }
+
+      .btn-box {
+        display: flex;
+        justify-content: flex-end;
+
+        .m-btn {
+          width: 160rpx;
+          height: 64rpx;
+          background: linear-gradient(-90deg, #0983ff, #57abff);
+          border-radius: 32rpx;
+          text-align: center;
+          line-height: 64rpx;
+          font-family: Source Han Sans SC;
+          font-weight: 500;
+          font-size: 26rpx;
+          color: #ffffff;
+        }
+
+        .m-btn-hover {
+          background: linear-gradient(-90deg, #57abff, #0983ff);
+        }
+      }
+    }
+  }
+}
 </style>
diff --git a/subPageA/wenchuang/wenlist/wenlist.vue b/subPageA/wenchuang/wenlist/wenlist.vue
index 1c1af0a..fa5ea01 100644
--- a/subPageA/wenchuang/wenlist/wenlist.vue
+++ b/subPageA/wenchuang/wenlist/wenlist.vue
@@ -47,7 +47,7 @@
 			<view class="an_box_3">
 				<view class="wc_tit_wp">
 					<view :style="chaType" class="an_t">
-						<view class="an_t_1">精品推荐</view>
+						<!-- <view class="an_t_1">精品推荐</view> -->
 					</view>
 				</view>
 
diff --git a/subPageB/cate/destination.vue b/subPageB/cate/destination.vue
index de2b4ed..ab145a2 100644
--- a/subPageB/cate/destination.vue
+++ b/subPageB/cate/destination.vue
@@ -343,7 +343,6 @@
 				that.guid = guid;
 				that.region = region;
 				that.getRedisData();
-				that.getWeather();
 				that.getMsgList(guid);
 			},function(){
 				uni.showToast({
@@ -398,7 +397,6 @@
 				this.region = data.bm;
 				this.getRedisData();  //缓存
 				this.getMsgList(data.guid); //缓存
-				this.getWeather();
 				// this.getVideoUrl(data.bm);
 			},
 			bindDateChange: function(e) {
@@ -475,36 +473,6 @@
 					}
 				})
 			},
-			getWeather: function() {
-				var that = this;
-				var data = {
-					"region": this.region
-				}
-				this.$Request.post(this.$config.getWeather, data).then(res => {
-					var flag = that.$util.isSuccess(res);
-					if(!flag){
-						return;
-					}
-					this.weather = res.data.cond_txt_d;
-					this.tmpmin = res.data.tmp_min
-					this.tmpmax = res.data.tmp_max
-					if (this.weather.indexOf("雷") != -1) {
-						this.weatherImgUrl = "/subPageB/static/img/whe_lei.png";
-					} else if (this.weather.indexOf("雨") != -1) {
-						this.weatherImgUrl = "/subPageB/static/img/whe_yu.png";
-					} else if (this.weather.indexOf("雾") != -1) {
-						this.weatherImgUrl = "/subPageB/static/img/whe_wu.png";
-					} else if (this.weather.indexOf("阴") != -1) {
-						this.weatherImgUrl = "/subPageB/static/img/whe_yin.png";
-					} else if (this.weather.indexOf("雪") != -1) {
-						this.weatherImgUrl = "/subPageB/static/img/whe_xue.png";
-					} else if (this.weather.indexOf("晴") != -1) {
-						this.weatherImgUrl = "/subPageB/static/img/whe_sun.png";
-					} else {
-						this.weatherImgUrl = "/subPageB/static/img/whe_cloudy.png";
-					}
-				})
-			},
 			getDate(type) {
 				const date = new Date();
 				let year = date.getFullYear();
diff --git a/subPageB/jiqiren/jiqiren/zhinengjiqiren.vue b/subPageB/jiqiren/jiqiren/zhinengjiqiren.vue
index c165e11..c64c330 100644
--- a/subPageB/jiqiren/jiqiren/zhinengjiqiren.vue
+++ b/subPageB/jiqiren/jiqiren/zhinengjiqiren.vue
@@ -4,7 +4,7 @@
 			 title="智能客服" @clickLeft="back" />
 
 		<!--  -->
-		<scroll-view id="scrollview" scroll-y="true" :style="{height:style.contentViewHeight+'px'}"
+		<scroll-view id="scrollview" class="jqr_dig_scroll" scroll-y="true" :style="{height:style.contentViewHeight+'px'}"
 			:scroll-with-animation="true" :scroll-top="scrollTop">
 			<view id="msgview" class="user-box" :class="item.typestyle" v-for="(item,index) in messages" :key="index">
 				<view class="quanbao">
@@ -408,7 +408,7 @@ innerAudioContext.autoplay = true;
 	}
 
 	.me{
-		align-items: end;
+		align-items: flex-end;
 	}
 
 	.b_tol_ipt{
@@ -426,7 +426,7 @@ innerAudioContext.autoplay = true;
 	}
 	.jqr_tol{
 		height: fit-content;
-		padding: 50rpx 0 ;
+		padding:20rpx 0 50rpx 0 ;
 	}
 	.jpan_mode{
 		display: flex;
@@ -442,4 +442,12 @@ innerAudioContext.autoplay = true;
 				height: fit-content;
 		}
 	}
+
+	.jqr_dig_scroll{
+		padding-bottom: 150rpx;
+	}
+
+	.jqr_tol_box{
+		height: fit-content;
+	}
 </style>
diff --git a/subPageB/static/img/whe_cloudy.png b/subPageB/static/img/whe_cloudy.png
deleted file mode 100755
index 890837d..0000000
Binary files a/subPageB/static/img/whe_cloudy.png and /dev/null differ
diff --git a/subPageB/static/img/whe_lei.png b/subPageB/static/img/whe_lei.png
deleted file mode 100755
index bc71e55..0000000
Binary files a/subPageB/static/img/whe_lei.png and /dev/null differ
diff --git a/subPageB/static/img/whe_sun.png b/subPageB/static/img/whe_sun.png
deleted file mode 100755
index ed9ca2c..0000000
Binary files a/subPageB/static/img/whe_sun.png and /dev/null differ
diff --git a/subPageB/static/img/whe_wu.png b/subPageB/static/img/whe_wu.png
deleted file mode 100755
index e9cb4ad..0000000
Binary files a/subPageB/static/img/whe_wu.png and /dev/null differ
diff --git a/subPageB/static/img/whe_xue.png b/subPageB/static/img/whe_xue.png
deleted file mode 100755
index fa5b438..0000000
Binary files a/subPageB/static/img/whe_xue.png and /dev/null differ
diff --git a/subPageB/static/img/whe_yin.png b/subPageB/static/img/whe_yin.png
deleted file mode 100755
index 8df8c8e..0000000
Binary files a/subPageB/static/img/whe_yin.png and /dev/null differ
diff --git a/subPageB/static/img/whe_yu.png b/subPageB/static/img/whe_yu.png
deleted file mode 100755
index 34c45b1..0000000
Binary files a/subPageB/static/img/whe_yu.png and /dev/null differ
diff --git a/subPageB/suggest/sug_list.vue b/subPageB/suggest/sug_list.vue
index 5046fcb..fcfab56 100644
--- a/subPageB/suggest/sug_list.vue
+++ b/subPageB/suggest/sug_list.vue
@@ -188,7 +188,7 @@ export default {
 				"appid": uni.getStorageSync("userInfo").openid,
 				"dataType": that.type
 			}
-			this.$Request.get(this.$config.pageComplaintinfo, data).then(res => {
+			this.$Request.get(this.$config.pageComplaintinfo, data, null, null, false, false).then(res => {
 
 				var data = res.data.list;
 				if (data != null && data.length > 0) {
diff --git a/subPageC/bookTicket/bookTicket.vue b/subPageC/bookTicket/bookTicket.vue
index a423ed6..c7b0776 100644
--- a/subPageC/bookTicket/bookTicket.vue
+++ b/subPageC/bookTicket/bookTicket.vue
@@ -1,1282 +1,1554 @@
 <template>
-	<view class="m-content">
-		<view class="m-card m-card-one">
-			<view class="m-one-first-row">
-				<view class="m-ticket-name">{{ ticket.ticketname }}</view>
-				<view class="m-ticket-use-time" v-if="ticket && ticket.datesettings == 1">
-					<view class="m-ticket-use-time-label">
-						<img class="m-img" src="/static/animg/index/predetermine_time1.svg" alt="" />
-						使用有效期：
-					</view>
-					<view class="m-ticket-use-time-value">{{ parseArrTime(ticket.usevalidityStart) }}至{{
-						parseArrTime(ticket.usevalidityEnd) }}</view>
-				</view>
-				<view class="m-ticket-use-time" v-if="ticket && ticket.datesettings == 1">
-					<view class="m-ticket-use-time-label">
-						<img class="m-img" src="/static/animg/index/predetermine_time2.svg" alt="" />
-						使用时间段：
-					</view>
-					<view class="m-ticket-use-time-value">全天</view>
-				</view>
-				<view class="m-ticket-use-time" v-if="ticket && ticket.datesettings == 3">
-					<view class="m-ticket-use-time-label">
-						<img class="m-img" src="/static/animg/index/predetermine_time2.svg" alt="" />
-						使用时间段：
-					</view>
-					<view class="m-ticket-use-time-value">{{ ticket.usertimeslotStart }}-{{ ticket.usertimeslotEnd }}
-					</view>
-				</view>
-			</view>
-			<view class="m-one-second-row">
-				<view class="m-row-title">选择日期</view>
-				<view class="m-date-pick-box">
-					<view class="scroll-view">
-						<view v-for="(date, index) in dates" :key="index" class="date-item"
-							@click="chooseDate(index, date.fullData)">
-							<view :class="['date-box', { active: index === nowIndex }]">
-								<text class="date-label">{{ date.label }}</text>
-								<text class="date-date">{{ date.date }}</text>
-								<text class="date-price">{{ date.price }}</text>
-							</view>
-						</view>
-					</view>
-					<view class="m-more-date" @click.stop="openCalendar">
-						<span>更多日期</span>
-						<uni-icons type="right" size="18"></uni-icons>
-					</view>
-				</view>
-			</view>
-			<view class="m-one-third-row">
-				<view class="m-ticket-count">
-					<view class="m-ticket-count-label">购票数量</view>
-					<view class="m-ticket-count-value">
-						<uni-number-box :min="1" v-model="ticket.num" @change="changeCount($event, ticket)" />
-					</view>
-				</view>
-			</view>
-			<view class="m-one-fourth-row">
-				<view class="m-ticket-count">
-					<view class="m-ticket-count-label">成人票</view>
-					<view class="m-ticket-count-value" @click.stop="openPop(1)">
-						<span>购买须知</span>
-						<uni-icons type="right" size="16"></uni-icons>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="m-card m-card-two" v-if="ticket && ticket.touristInformation != 1">
-			<view class="m-card-title">
-				<view class="m-title">游客信息</view>
-				<view class="m-title-tips">需填 {{ ticket.touristInformation == 2 ? 1 : peopleNums() }} 位</view>
-			</view>
-			<view class="m-two-first-row">
-				<view class="m-user-list" :class="item.selected ? 'active' : ''" v-for="item in navUserList"
-					@click="selectUser(item)">
-					{{ item.name }}
-				</view>
-				<view class="m-user-list m-more-user" @click="openAddress">
-					<span class="m-span">
-						新增
-						<br />
-						更改
-					</span>
-					<uni-icons type="right" size="18"></uni-icons>
-				</view>
-			</view>
-			<view class="m-two-second-row">
-				<view class="m-user-list">
-					<view class="m-user-list-item" v-for="(item, index) in selectUserList">
-						<view class="m-list-left">
-							<img class="m-img" src="/static/animg/index/predetermine_tourist.svg" alt="" />
-							<span class="m-span">游客{{ index + 1 }}</span>
-						</view>
-						<view class="m-list-middle">
-							<view class="m-middle-user-name">
-								{{ item.name }}
-							</view>
-							<view class="m-middle-user-idCode m-gray m-m-font">身份证 {{ item.idCard }}</view>
-							<!-- <view class="m-middle-user-tel m-gray m-m-font">手机号 {{ item.tel }}</view> -->
-						</view>
-						<!-- <view class="m-list-right">
+  <view class="m-content">
+    <view class="m-card m-card-one">
+      <view class="m-one-first-row">
+        <view class="m-ticket-name">{{ ticket.ticketname }}</view>
+        <view class="m-ticket-use-time" v-if="ticket && ticket.datesettings == 1">
+          <view class="m-ticket-use-time-label">
+            <img class="m-img" src="/static/animg/index/predetermine_time1.svg" alt="" />
+            使用有效期：
+          </view>
+          <view class="m-ticket-use-time-value"
+            >{{ parseArrTime(ticket.usevalidityStart) }}至{{
+              parseArrTime(ticket.usevalidityEnd)
+            }}</view
+          >
+        </view>
+        <view class="m-ticket-use-time" v-if="ticket && ticket.datesettings == 1">
+          <view class="m-ticket-use-time-label">
+            <img class="m-img" src="/static/animg/index/predetermine_time2.svg" alt="" />
+            使用时间段：
+          </view>
+          <view class="m-ticket-use-time-value">全天</view>
+        </view>
+        <view class="m-ticket-use-time" v-if="ticket && ticket.datesettings == 3">
+          <view class="m-ticket-use-time-label">
+            <img class="m-img" src="/static/animg/index/predetermine_time2.svg" alt="" />
+            使用时间段：
+          </view>
+          <view class="m-ticket-use-time-value"
+            >{{ ticket.usertimeslotStart }}-{{ ticket.usertimeslotEnd }}
+          </view>
+        </view>
+      </view>
+      <view class="m-one-second-row">
+        <view class="m-row-title">选择日期</view>
+        <view class="m-date-pick-box">
+          <view class="scroll-view1">
+            <view
+              v-for="(date, index) in dates"
+              :key="index"
+              class="date-item"
+              @click="chooseDate(index, date.fullData)"
+            >
+              <view :class="['date-box', { active: index === nowIndex }]">
+                <text class="date-label">{{ date.label }}</text>
+                <text class="date-date">{{ date.date }}</text>
+                <text class="date-price">{{ date.price }}</text>
+              </view>
+            </view>
+          </view>
+          <view class="m-more-date" @click.stop="openCalendar">
+            <span>更多日期</span>
+            <uni-icons type="right" size="18"></uni-icons>
+          </view>
+        </view>
+      </view>
+      <view class="m-one-third-row">
+        <view class="m-ticket-count">
+          <view class="m-ticket-count-label">购票数量</view>
+          <view class="m-ticket-count-value">
+            <uni-number-box
+              v-if="maxNum == -1"
+              :min="1"
+              v-model="ticket.num"
+              @change="changeCount($event, ticket)"
+            />
+            <uni-number-box
+              v-else
+              :min="1"
+              :max="maxNum"
+              v-model="ticket.num"
+              @change="changeCount($event, ticket)"
+            />
+          </view>
+        </view>
+      </view>
+      <view class="m-one-fourth-row">
+        <view class="m-ticket-count">
+          <view class="m-ticket-count-label">成人票</view>
+          <view class="m-ticket-count-value" @click.stop="openPop(1)">
+            <span>购买须知</span>
+            <uni-icons type="right" size="16"></uni-icons>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="m-card m-card-two" v-if="ticket && ticket.touristInformation != 1">
+      <view class="m-card-title">
+        <view class="m-title">游客信息</view>
+        <view class="m-title-tips"
+          >需填 {{ ticket.touristInformation == 2 ? 1 : peopleNums() }} 位</view
+        >
+      </view>
+      <view class="m-two-first-row">
+        <view
+          class="m-user-list"
+          :class="item.selected ? 'active' : ''"
+          v-for="item in navUserList"
+          @click="selectUser(item)"
+        >
+          {{ item.name }}
+        </view>
+        <view class="m-user-list m-more-user" @click="openAddress">
+          <span class="m-span">
+            新增
+            <br />
+            更改
+          </span>
+          <uni-icons type="right" size="18"></uni-icons>
+        </view>
+      </view>
+      <view class="m-two-second-row">
+        <view class="m-user-list">
+          <view class="m-user-list-item" v-for="(item, index) in selectUserList">
+            <view class="m-list-left">
+              <img
+                class="m-img"
+                src="/static/animg/index/predetermine_tourist.svg"
+                alt=""
+              />
+              <span class="m-span">游客{{ index + 1 }}</span>
+            </view>
+            <view class="m-list-middle">
+              <view class="m-middle-user-name">
+                {{ item.name }}
+              </view>
+              <view class="m-middle-user-idCode m-gray m-m-font"
+                >身份证 {{ item.idCard }}</view
+              >
+              <!-- <view class="m-middle-user-tel m-gray m-m-font">手机号 {{ item.tel }}</view> -->
+            </view>
+            <!-- <view class="m-list-right">
 							<uni-icons type="compose" size="24"></uni-icons>
 							<uni-icons type="trash" size="24"></uni-icons>
 						</view> -->
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="m-feet-box">
-			<view class="m-feet-left">
-				<view class="m-price">
-					总价
-					<span class="m-red">
-						¥
-						<span class="m-red m-xxl-font">{{ sumPrice }}</span>
-					</span>
-				</view>
-				<view class="m-nums">
-					共
-					<span class="m-red">{{ ticket.num ? ticket.num : 0 }}</span>
-					张门票
-				</view>
-			</view>
-			<view class="m-feet-right">
-				<!-- <button class="m-prime-red" @click.stop="isPayPopup = true">支付</button> -->
-				<button class="m-prime-red" @click.stop="checkOrder">支付</button>
-			</view>
-		</view>
-		<!-- 人员 -->
-		<liu-select :multiple="fasle" ref="scroll" :list="dataList" @change="chooseSuccess" @edit="edit"
-			@add="addPerson"></liu-select>
-		<!-- 日历 -->
-		<wu-calendar ref="calendar" @confirm="calendarConfirm" :insert="false"></wu-calendar>
-		<!-- 重复订单提醒 -->
-		<uni-popup class="m-pop-bg" ref="warningPop" type="center" border-radius="20rpx">
-			<view class="m-green-bg"></view>
-			<view class="m-red-bg"></view>
-			<view class="m-notice-popuo">
-				<view class="m-notice-ico">
-					<img class="m-img" src="" alt="" />
-				</view>
-				<view class="m-notice-text">您有一笔相同门票的待支付订单，请优 先处理！</view>
-				<view class="m-pop-feet">
-					<button class="m-prime-line-unset m-size-middle" @click="continueOrder" size="mini">继续下单</button>
-					<button class="m-prime m-size-middle" size="mini" @click="goOrderList">前往处理</button>
-				</view>
-			</view>
-		</uni-popup>
-		<!-- 支付 -->
-		<u-popup :show="isPayPopup" mode="bottom" @close="isPayPopup = false" round="10">
-			<f-pay :show-title="false" :show="isPayPopup" :payMoney="orderInfo.orderInfo.orderAmount"
-				:tradeNo="orderInfo.orderInfo.orderNumber" :order="orderInfo" @payResult="payResult"></f-pay>
-		</u-popup>
-		<!-- 须知 -->
-		<uni-popup ref="mPurchaseNotice" type="bottom" border-radius="10px 10px 0 0" :safe-area="false">
-			<view class="m-purchase-notice m-pop-bg">
-				<view class="m-green-bg"></view>
-				<view class="m-red-bg"></view>
-				<view class="m-pop-title">预定须知</view>
-				<view class="m-contents">
-					<view class="m-title">购买须知</view>
-					<view class="m-notice-box">
-						<view class="m-notice-row">
-							<view class="m-tag m-tag-blue">退票规则</view>
-							<view class="m-notice-row-content">门票未过期且未使用时可退</view>
-						</view>
-						<view class="m-notice-row">
-							<view class="m-tag m-tag-blue">使用次数</view>
-							<view class="m-notice-row-content">在使用有效期内不限次检票入园</view>
-						</view>
-						<view class="m-notice-row">
-							<view class="m-tag m-tag-red">购票限制</view>
-							<view class="m-notice-row-content">每个手机号限购1张</view>
-						</view>
-						<view class="m-notice-row">
-							<view class="m-tag m-tag-blue">使用时段</view>
-							<view class="m-notice-row-content">全天</view>
-						</view>
-					</view>
-					<view class="m-driver"></view>
-					<view class="m-title">费用说明</view>
-					<view class="m-notice-table">
-						<view class="m-table-head">费用包含</view>
-						<view class="m-table-th">
-							<view class="m-table-td">门票</view>
-							<view class="m-table-td">2024皮影冰雪欢乐平日单人票</view>
-						</view>
-					</view>
-					<view class="m-driver"></view>
-					<view class="m-title">使用说明</view>
-					<view class="m-notice-table no-border">
-						<view class="m-table-th">
-							<view class="m-table-td">
-								<img class="m-table-inside-ico" src="/static/animg/index/notice_time.svg" alt="" />
-								开放时间
-							</view>
-							<view class="m-table-td">
-								<view class="m-ul">
-									<view class="m-li">节假日9:30-20:30</view>
-									<view class="m-li">工作日9:30-16:30</view>
-								</view>
-							</view>
-						</view>
-						<view class="m-table-th">
-							<view class="m-table-td">
-								<img class="m-table-inside-ico" src="/static/animg/index/notice_notice.svg" alt="" />
-								购票须知
-							</view>
-							<view class="m-table-td">
-								<view class="m-ul">
-									<view class="m-li">每位成年人最多携带一名120cm（不含）以下的儿童（免费）</view>
-								</view>
-							</view>
-						</view>
-						<view class="m-table-th">
-							<view class="m-table-td">
-								<img class="m-table-inside-ico" src="/static/animg/index/notice_address.svg" alt="" />
-								景区地址
-							</view>
-							<view class="m-table-td">
-								<view class="m-ul">
-									<view class="m-li">冰雪欢乐平度假区检票口</view>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="m-driver"></view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="m-feet-box">
+      <view class="m-feet-left">
+        <view class="m-price">
+          总价
+          <span class="m-red">
+            ¥
+            <span class="m-red m-xxl-font">{{ sumPrice }}</span>
+          </span>
+        </view>
+        <view class="m-nums">
+          共
+          <span class="m-red">{{ ticket.num ? ticket.num : 0 }}</span>
+          张门票
+        </view>
+      </view>
+      <view class="m-feet-right">
+        <!-- <button class="m-prime-red" @click.stop="isPayPopup = true">支付</button> -->
+        <button class="m-prime-red" @click.stop="checkOrder">支付</button>
+      </view>
+    </view>
+    <!-- 人员 -->
+    <liu-select
+      :multiple="fasle"
+      ref="scroll"
+      :list="dataList"
+      @change="chooseSuccess"
+      @edit="edit"
+      @add="addPerson"
+    ></liu-select>
+    <!-- 日历 -->
+    <wu-calendar
+      ref="calendar"
+      @monthSwitch="changeMonth"
+      :startDate="startDate"
+      :selected="selected"
+      :confirmFullDate="true"
+      @confirm="calendarConfirm"
+      :insert="false"
+    ></wu-calendar>
+    <!-- 重复订单提醒 -->
+    <uni-popup class="m-pop-bg" ref="warningPop" type="center" border-radius="20rpx">
+      <view class="m-green-bg"></view>
+      <view class="m-red-bg"></view>
+      <view class="m-notice-popuo">
+        <view class="m-notice-ico">
+          <img class="m-img" src="" alt="" />
+        </view>
+        <view class="m-notice-text">您有一笔相同门票的待支付订单，请优 先处理！</view>
+        <view class="m-pop-feet">
+          <button
+            class="m-prime-line-unset m-size-middle"
+            @click="continueOrder"
+            size="mini"
+          >
+            继续下单
+          </button>
+          <button class="m-prime m-size-middle" size="mini" @click="goOrderList">
+            前往处理
+          </button>
+        </view>
+      </view>
+    </uni-popup>
+    <!-- 支付 -->
+    <u-popup :show="isPayPopup" mode="bottom" @close="isPayPopup = false" round="10">
+      <f-pay
+        :show-title="false"
+        :show="isPayPopup"
+        :payMoney="orderInfo.orderInfo.orderAmount"
+        :tradeNo="orderInfo.orderInfo.orderNumber"
+        :order="orderInfo"
+        @payResult="payResult"
+      ></f-pay>
+    </u-popup>
+    <!-- 须知 -->
+    <uni-popup ref="mPurchaseNotice" border-radius="10px 10px 0 0" :safe-area="true">
+      <view class="m-purchase-notice m-pop-bg">
+        <view class="m-green-bg"></view>
+        <view class="m-red-bg"></view>
+        <view class="m-pop-title">预定须知</view>
+        <view class="m-contents">
+          <view class="m-title">购买须知</view>
+          <view class="m-notice-box">
+            <view class="m-notice-row">
+              <view class="m-tag m-tag-blue">退票规则</view>
+              <view class="m-notice-row-content">{{ ticketInfos.refundRules }}</view>
+            </view>
+            <view class="m-notice-row">
+              <view class="m-tag m-tag-blue">使用次数</view>
+              <view class="m-notice-row-content">{{ ticketInfos.ticketchecksNum }}</view>
+            </view>
+            <view class="m-notice-row">
+              <view class="m-tag m-tag-red">购票限制</view>
+              <view class="m-notice-row-content">{{
+                ticketInfos.ticketlimitnum == null
+                  ? ticketInfos.buyticketlimit
+                  : "每人限购" + ticketInfos.ticketlimitnum + "张"
+              }}</view>
+            </view>
+            <view class="m-notice-row">
+              <view class="m-tag m-tag-blue">使用时段</view>
+              <view class="m-notice-row-content">{{
+                ticketInfos.usertimeslotStart == ticketInfos.usertimeslotEnd
+                  ? "全天"
+                  : ticketInfos.usertimeslotStart + "至" + ticketInfos.usertimeslotEnd
+              }}</view>
+            </view>
+          </view>
+          <view class="m-driver"></view>
+          <view class="m-title">费用说明</view>
+          <view class="m-notice-table">
+            <view class="m-table-head">费用包含</view>
+            <view class="m-table-th">
+              <view class="m-table-td">门票</view>
+              <view class="m-table-td">{{ ticketInfos.ticketname }}</view>
+            </view>
+          </view>
+          <view class="m-driver"></view>
+          <view class="m-title">使用说明</view>
+          <view class="m-notice-table no-border">
+            <view class="m-table-th">
+              <view class="m-table-td">
+                <img
+                  class="m-table-inside-ico"
+                  src="/static/animg/index/notice_time.svg"
+                  alt=""
+                />
+                开放时间
+              </view>
+              <view class="m-table-td">
+                <view class="m-ul">
+                  <view class="m-li">{{ ticketInfos.openTime }}</view>
+                </view>
+              </view>
+            </view>
+            <view class="m-table-th">
+              <view class="m-table-td">
+                <img
+                  class="m-table-inside-ico"
+                  src="/static/animg/index/notice_notice.svg"
+                  alt=""
+                />
+                购票须知
+              </view>
+              <view class="m-table-td">
+                <view class="m-ul">
+                  <view class="m-li">{{ ticketInfos.ticketInfo }}</view>
+                </view>
+              </view>
+            </view>
+            <view class="m-table-th">
+              <view class="m-table-td">
+                <img
+                  class="m-table-inside-ico"
+                  src="/static/animg/index/notice_address.svg"
+                  alt=""
+                />
+                景区地址
+              </view>
+              <view class="m-table-td">
+                <view class="m-ul">
+                  <view class="m-li">{{ ticketInfos.addressInfo }}</view>
+                </view>
+              </view>
+            </view>
+          </view>
+          <!-- <view class="m-driver"></view>
 					<view class="m-title">其他说明</view>
 					<view class="m-notice-table no-border">
 						<view class="m-table-th">
 							<view class="m-table-td m-no-bg">发票说明</view>
 							<view class="m-table-td m-no-bg">如需发票、请在付款完成后，在已核订 单中，申请电子发票。</view>
 						</view>
-					</view>
-				</view>
-			</view>
-		</uni-popup>
-		<!-- 新增 -->
-		<uni-popup ref="mAddPerson" type="bottom" border-radius="10px 10px 0 0" :safe-area="false">
-			<view class="m-purchase-notice m-pop-bg">
-				<view class="m-green-bg"></view>
-				<view class="m-red-bg"></view>
-				<view class="m-pop-title">{{ titleName }}游客</view>
-				<view class="m-form-box">
-					<uni-forms class="m-form" ref="peopleForm" :modelValue="baseFormData">
-						<uni-row class="m-row">
-							<uni-col class="m-col" :span="ticket.ischeckedIdcard == 1 ? 18 : 24">
-								<uni-forms-item class="m-form-item" label="姓   名" required name="name">
-									<uni-easyinput :inputBorder="false" v-model="baseFormData.name"
-										placeholder="请输入姓名" />
-								</uni-forms-item>
-								<uni-forms-item v-if="ticket.ischeckedIdcard == 1" class="m-form-item" label="身份证"
-									required name="idCard">
-									<uni-easyinput :inputBorder="false" v-model="baseFormData.idCard"
-										placeholder="请输入身份证号" />
-								</uni-forms-item>
-							</uni-col>
-							<uni-col v-if="ticket.ischeckedIdcard == 1" class="m-col" span="5" offset="1">
-								<!-- ocr -->
-								<lzcOCR :dataObj="dataObj" @start="start" @end="end" />
-							</uni-col>
-						</uni-row>
-						<uni-forms-item v-if="ticket.ischeckedMobile == 1" class="m-form-item" label="手机号" required
-							name="tel">
-							<uni-easyinput :inputBorder="false" v-model="baseFormData.tel" placeholder="请输入手机号" />
-						</uni-forms-item>
-					</uni-forms>
-				</view>
-				<button class="m-prime m-size-middle m-custom-margin" @click="finishPeople">完成</button>
-			</view>
-		</uni-popup>
-	</view>
+					</view> -->
+        </view>
+      </view>
+    </uni-popup>
+    <!-- 新增 -->
+    <uni-popup
+      ref="mAddPerson"
+      type="bottom"
+      border-radius="10px 10px 0 0"
+      :safe-area="false"
+    >
+      <view class="m-purchase-notice m-pop-bg">
+        <view class="m-green-bg"></view>
+        <view class="m-red-bg"></view>
+        <view class="m-pop-title">{{ titleName }}游客</view>
+        <view class="m-form-box">
+          <uni-forms class="m-form" ref="peopleForm" :modelValue="baseFormData">
+            <uni-row class="m-row">
+              <uni-col class="m-col" :span="ticket.ischeckedIdcard == 1 ? 18 : 24">
+                <uni-forms-item class="m-form-item" label="姓   名" required name="name">
+                  <uni-easyinput
+                    :inputBorder="false"
+                    v-model="baseFormData.name"
+                    placeholder="请输入姓名"
+                  />
+                </uni-forms-item>
+                <uni-forms-item
+                  v-if="ticket.ischeckedIdcard == 1"
+                  class="m-form-item"
+                  label="身份证"
+                  required
+                  name="idCard"
+                >
+                  <uni-easyinput
+                    :inputBorder="false"
+                    v-model="baseFormData.idCard"
+                    placeholder="请输入身份证号"
+                  />
+                </uni-forms-item>
+              </uni-col>
+              <uni-col
+                v-if="ticket.ischeckedIdcard == 1"
+                class="m-col"
+                span="5"
+                offset="1"
+              >
+                <!-- ocr -->
+                <lzcOCR :dataObj="dataObj" @start="start" @end="end" />
+              </uni-col>
+            </uni-row>
+            <uni-forms-item
+              v-if="ticket.ischeckedMobile == 1"
+              class="m-form-item"
+              label="手机号"
+              required
+              name="tel"
+            >
+              <uni-easyinput
+                :inputBorder="false"
+                v-model="baseFormData.tel"
+                placeholder="请输入手机号"
+              />
+            </uni-forms-item>
+          </uni-forms>
+        </view>
+        <button class="m-prime m-size-middle m-custom-margin" @click="finishPeople">
+          完成
+        </button>
+      </view>
+    </uni-popup>
+  </view>
 </template>
 
 <script>
-import fPay from '../components/f-pay/f-pay';
-import lzcOCR from '../components/lzc-OCR/lzc-OCR.vue';
+import fPay from "../components/f-pay/f-pay";
+import lzcOCR from "../components/lzc-OCR/lzc-OCR.vue";
 import { parseTime } from "@/common/util";
 import uniPopup from "@/uni_modules/uni-popup/components/uni-popup/uni-popup.vue";
 import uPopup from "@/uni_modules/uview-ui/components/u-popup/u-popup.vue";
 
-
 export default {
-	components: {
-		fPay,
-		lzcOCR,
-		uniPopup,
-		uPopup
-	},
-	data() {
-		return {
-			//生成订单信息
-			orderInfo: null,
-			//总价
-			sumPrice: 0,
-			ticket: null,
-			ticketInfo: null,
-			nowIndex: 0,
-			titleName: '新增',
-			isPayPopup: false,
-			dates: [],
-			numberValue: 1,
-			tradeNo: '16fw61cqew6464wdc', //支付单号
-			dataObj: {
-				client_id: 'qs5EQSE0neZZDh5sA7FmHnUL',
-				client_secret: 'w92jiLCNSVecfRdyBbjhcOGEQoezaC1B'
-			},
-			baseFormData: {
-				name: null,
-				idCard: null,
-				tel: null,
-				id: null,
-				selected: false
-			},
-			dataList: [
-
-			], //数据源
-			navUserList: [
-
-			],
-			selectUserList: [],
-			rules: {
-				name: {
-					rules: [
-						{
-							required: true,
-							errorMessage: '请输入姓名'
-						}
-					]
-				},
-				idCard: {
-					rules: [
-						{
-							required: true,
-							errorMessage: '请输入身份证号'
-						},
-						{
-							validateFunction: function (rule, value, data, callback) {
-								const reg = /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/;
-								if (!value) {
-									callback('身份证号码不能为空');
-								} else if (!reg.test(value)) {
-									callback('请输入正确的身份证号码');
-								} else {
-									callback();
-								}
-							}
-						}
-					]
-				},
-				tel: {
-					rules: [
-						{
-							required: true,
-							errorMessage: '请输入手机号'
-						},
-						{
-							validateFunction: function (rule, value, data, callback) {
-								const reg = /^1[3|4|5|6|7|8|9][0-9]\d{8}$/;
-								if (!value) {
-									callback('手机号码不能为空');
-								} else if (!reg.test(value)) {
-									callback('请输入正确的手机号码');
-								} else {
-									callback();
-								}
-							}
-						}
-					]
-				}
-			}
-
-		};
-	},
-	watch: {
-		ticket: {
-			handler(val) {
-				console.log(val, '-----')
-				if (!val.num) {
-					val.num = 1
-				}
-				this.sumPrice = val.settlementPrice * val.num
-			},
-			deep: true
-		}
-	},
-	onReady() {
-		this.$refs.peopleForm.setRules(this.rules);
-	},
-	onLoad(options) {
-		console.log(options);
-		this.ticket = JSON.parse(options.ticket);
-		this.getTicketInfo(this.ticket.id);
-	},
-	mounted() {
-		for (let i = 0; i < 7; i++) {
-			this.dates.push({
-				label: this.getLabel(i),
-				date: this.getFormattedDate(i),
-				fullData: this.getFullDate(i),
-				price: '￥' + this.ticket.settlementPrice
-			});
-		}
-
-		this.ticket.date = this.dates[0].fullData
-	},
-	methods: {
-		peopleNums() {
-			return Number(this.ticket.usersNumber) * Number(this.ticket.num)
-		},
-		payResult(data) {
-			console.log(data);
-			if (data.payStatus == 1) {
-				uni.showToast({ title: '支付成功', icon: 'none' });
-				this.isPayPopup = false
-				setTimeout(() => {
-					uni.switchTab({ url: '/pages/order/order' });
-
-				}, 1000)
-			} else {
-				uni.showToast({ title: '支付失败', icon: 'none' });
-			}
-			//uni.showToast({title: data.detail.errMsg,icon:'none'});
-		},
-		//继续下单
-		continueOrder() {
-			this.$refs.warningPop.close();
-
-			let that = this
-			const userInfo = uni.getStorageSync('userInfo')
-			const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {};
-			let appId = extConfig.app_id
-			if (that.ticket.touristInformation == 1) {
-				const httpData = {
-					openid: userInfo.openid,
-					appid: appId,
-					mobile: userInfo.phone,
-					settlementAmount: that.sumPrice,
-					orderPrice: that.sumPrice,
-					ticketInfo: {
-						ticketId: that.ticket.id,
-						ticketName: that.ticket.ticketname,
-						num: that.ticket.num,
-						ticketPrice: that.ticket.settlementPrice,
-						date: that.ticket.date,
-						visitorInfoList: []
-					}
-				}
-				uni.$u.http.post(URL.addOrder, httpData).then(res => {
-					that.orderInfo = res.data
-					that.isPayPopup = true
-				}).catch(err => {
-					console.log(err)
-				})
-			} else {
-				const httpData = {
-					openid: userInfo.openid,
-					appid: appId,
-					mobile: userInfo.phone,
-					settlementAmount: that.sumPrice,
-					orderPrice: that.sumPrice,
-					ticketInfo: {
-						ticketId: that.ticket.id,
-						ticketName: that.ticket.ticketname,
-						num: that.ticket.num,
-						ticketPrice: that.ticket.settlementPrice,
-						date: that.ticket.date,
-						visitorInfoList: that.ticket.touristInformation == 1 ? [] : [
-							{ name: '田华', idCardNumber: '13062619890707166X' }
-
-						]
-					}
-				}
-				uni.$u.http.post(URL.addOrder, httpData).then(res => {
-					that.orderInfo = res.data
-					that.isPayPopup = true
-				}).catch(err => {
-					console.log(err)
-				})
-			}
-
-		},
-		//重复订单跳订单页面
-		goOrderList() {
-			uni.switchTab({ url: '/pages/order/order' })
-		},
-		//门票信息
-		getTicketInfo(id) {
-			const params = {
-				ticketId: id
-			}
-			uni.$u.http.get(URL.getTicketInfo, {
-				params: params,
-				custom: {
-					load: false,
-					auth: true
-				}
-			}).then(res => {
-				console.log(res)
-			}).catch(err => {
-				console.log(err)
-			})
-		},
-		parseArrTime(val) {
-			return val.join('-')
-		},
-		parseTime(val) {
-			return parseTime(val, '{y}-{m}-{d}')
-		},
-		chooseDate(index, date) {
-			this.nowIndex = index
-			console.log(date)
-			this.ticket.date = date
-		},
-		//修改编辑游客信息
-		finishPeople(form) {
-			debugger
-			let that = this
-			this.$refs.peopleForm
-				.validate()
-				.then((res) => {
-					debugger
-					that.baseFormData.id = that.dataList.length + 1;
-					that.baseFormData.selected = false;
-					this.$nextTick(() => {
-						if (that.dataList.length > 0) {
-							const index = that.dataList.findIndex(item => item.id == that.baseFormData.id)
-							if (index != -1) {
-								that.$set(that.dataList, index, that.baseFormData);
-
-							} else {
-								that.dataList.push(that.baseFormData)
-							}
-						} else {
-							that.dataList.push(that.baseFormData)
-						}
-					})
-					that.selectUserList = that.dataList
-					this.$forceUpdate();
-					console.log('表单数据信息：', that.dataList);
-					that.$refs.mAddPerson.close();
-				})
-				.catch((err) => {
-					console.log('表单错误信息：', err);
-				});
-		},
-		//ocr开始
-		start(e) {
-			console.log(e);
-		},
-		end(e) {
-			console.log(e);
-		},
-		//ocr结束
-		//新增
-		addPerson() {
-			this.$refs.mAddPerson.open();
-			this.$refs.scroll.close();
-
-			this.titleName = '新增';
-		},
-		//编辑游客信息
-		edit(val) {
-			console.log(val);
-			this.$refs.scroll.close();
-			this.$refs.mAddPerson.open();
-			this.titleName = '编辑';
-			this.baseFormData = val;
-		},
-		//打开选择器
-		openAddress() {
-			this.$refs.scroll.open();
-		},
-		//选择成功
-		chooseSuccess(e) {
-			console.log('所选择的信息:', e);
-		},
-		//提示已有订单
-		checkOrder() {
-			// if (this.ticket.touristInformation == 2) {
-			// 	if (!this.ticket.visitorInfoList || this.ticket.visitorInfoList.length < 1) {
-			// 		uni.showToast({ title: '暂无游客信息', icon: 'none' });
-			// 		return
-			// 	}
-			// }
-			// if (this.ticket.touristInformation == 3) {
-			// 	if (!this.ticket.visitorInfoList || this.ticket.visitorInfoList.length < Number(this.ticket.usersNumber) * Number(this.ticket.num)) {
-			// 		uni.showToast({ title: '请填写全部游客信息', icon: 'none' });
-			// 		return
-			// 	}
-			// }
-			let that = this
-			const userInfo = uni.getStorageSync('userInfo')
-			const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {};
-			let appId = extConfig.app_id
-			const params = {
-				openid: userInfo.openid,
-				appid: appId
-			}
-			uni.$u.http.get(URL.searchWaitOrder, { params: params, custom: { load: false } }).then(res => {
-				console.log(res)
-				if (res.data != 0) {
-					this.$refs.warningPop.open();
-				} else {
-					if (that.ticket.touristInformation == 1) {
-						const httpData = {
-							openid: userInfo.openid,
-							appid: appId,
-							mobile: userInfo.phone,
-							settlementAmount: that.sumPrice,
-							orderPrice: that.sumPrice,
-							ticketInfo: {
-								ticketId: that.ticket.id,
-								ticketName: that.ticket.ticketname,
-								num: that.ticket.num,
-								ticketPrice: that.ticket.settlementPrice,
-								date: that.ticket.date,
-								visitorInfoList: []
-							}
-						}
-						uni.$u.http.post(URL.addOrder, httpData).then(res => {
-							that.orderInfo = res.data
-							that.isPayPopup = true
-						}).catch(err => {
-							console.log(err)
-						})
-					} else {
-						const httpData = {
-							openid: userInfo.openid,
-							appid: appId,
-							mobile: userInfo.phone,
-							settlementAmount: that.sumPrice,
-							orderPrice: that.sumPrice,
-							ticketInfo: {
-								ticketId: that.ticket.id,
-								ticketName: that.ticket.ticketname,
-								num: that.ticket.num,
-								ticketPrice: that.ticket.settlementPrice,
-								date: that.ticket.date,
-								visitorInfoList: that.ticket.touristInformation == 1 ? [] : [
-									{ name: '田华', idCardNumber: '13062619890707166X' }
-
-								]
-							}
-						}
-						uni.$u.http.post(URL.addOrder, httpData).then(res => {
-							that.orderInfo = res.data
-							that.isPayPopup = true
-						}).catch(err => {
-							console.log(err)
-						})
-					}
-				}
-			}).catch(err => {
-				console.log(err)
-			})
-		},
-		// 打开日历
-		openCalendar() {
-			this.$refs.calendar.open();
-		},
-		//选择日历
-		calendarConfirm(e) {
-			console.log(e);
-			this.ticket.date = e.fullData;
-		},
-		//须知
-		openPop(val) {
-			switch (val) {
-				case 1:
-					this.$refs.mPurchaseNotice.open();
-					break;
-				default:
-					break;
-			}
-		},
-		//购票数量
-		changeCount(val, ticket) {
-			console.log(val);
-			this.ticket.num = val;
-			this.sumPrice = ticket.settlementPrice * val;
-
-		},
-		//选择游客
-		selectUser(val) {
-			let this_ = this;
-			if (val.selected == false) {
-				val.selected = true;
-				this_.selectUserList.push(val);
-			} else {
-				val.selected = false;
-				this_.selectUserList = this_.selectUserList.filter((user) => !user.selected);
-			}
-		},
-		change(value) {
-			this.numberValue = value;
-		},
-		// 日历
-		getFormattedDate(offset) {
-			const date = new Date();
-			date.setDate(date.getDate() + offset);
-			const month = (date.getMonth() + 1).toString().padStart(2, '0');
-			const day = date.getDate().toString().padStart(2, '0');
-			return `${month}-${day}`;
-		},
-		getFullDate(offset) {
-			const date = new Date();
-			date.setDate(date.getDate() + offset);
-			const year = date.getFullYear();
-			const month = (date.getMonth() + 1).toString().padStart(2, '0');
-			const day = date.getDate().toString().padStart(2, '0');
-			return `${year}-${month}-${day}`;
-		},
-		getLabel(offset) {
-			const dayIndex = (new Date().getDay() + offset) % 7;
-			switch (offset) {
-				case 0:
-					return '今天';
-				case 1:
-					return '明天';
-				case 2:
-					return '后天';
-				default:
-					return `周${'日一二三四五六'[dayIndex]}`;
-			}
-		}
-	}
+  components: {
+    fPay,
+    lzcOCR,
+    uniPopup,
+    uPopup,
+  },
+  data() {
+    return {
+      maxNum: -1,
+      tentId: null,
+      selected: null, //门票日历
+      startDate: parseTime(new Date()),
+      //门票须知
+      ticketInfos: null,
+      //生成订单信息
+      orderInfo: null,
+      //总价
+      sumPrice: 0,
+      ticket: null,
+      ticketInfo: null,
+      nowIndex: 0,
+      titleName: "新增",
+      isPayPopup: false,
+      dates: [],
+      numberValue: 1,
+      tradeNo: "16fw61cqew6464wdc", //支付单号
+      dataObj: {
+        client_id: "qs5EQSE0neZZDh5sA7FmHnUL",
+        client_secret: "w92jiLCNSVecfRdyBbjhcOGEQoezaC1B",
+      },
+      baseFormData: {
+        name: null,
+        idCard: null,
+        tel: null,
+        id: null,
+        selected: false,
+      },
+      dataList: [], //数据源
+      navUserList: [],
+      selectUserList: [],
+      rules: {
+        name: {
+          rules: [
+            {
+              required: true,
+              errorMessage: "请输入姓名",
+            },
+          ],
+        },
+        idCard: {
+          rules: [
+            {
+              required: true,
+              errorMessage: "请输入身份证号",
+            },
+            {
+              validateFunction: function (rule, value, data, callback) {
+                const reg = /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/;
+                if (!value) {
+                  callback("身份证号码不能为空");
+                } else if (!reg.test(value)) {
+                  callback("请输入正确的身份证号码");
+                } else {
+                  callback();
+                }
+              },
+            },
+          ],
+        },
+        tel: {
+          rules: [
+            {
+              required: true,
+              errorMessage: "请输入手机号",
+            },
+            {
+              validateFunction: function (rule, value, data, callback) {
+                const reg = /^1[3|4|5|6|7|8|9][0-9]\d{8}$/;
+                if (!value) {
+                  callback("手机号码不能为空");
+                } else if (!reg.test(value)) {
+                  callback("请输入正确的手机号码");
+                } else {
+                  callback();
+                }
+              },
+            },
+          ],
+        },
+      },
+    };
+  },
+  watch: {
+    ticket: {
+      handler(val) {
+        console.log(val, "-----");
+        if (!val.num) {
+          val.num = 1;
+        }
+        this.sumPrice = val.settlementPrice * val.num;
+      },
+      deep: true,
+    },
+  },
+  onReady() {
+    this.$refs.peopleForm.setRules(this.rules);
+  },
+  onLoad(options) {
+    console.log(options);
+    this.ticket = JSON.parse(decodeURIComponent(options.ticket));
+    if (options.maxNum) {
+      this.maxNum = options.maxNum;
+    } else {
+      this.maxNum = -1;
+    }
+    this.tentId = options.tentId;
+    this.getTicketInfo(this.ticket.id);
+  },
+  mounted() {
+    for (let i = 0; i < 7; i++) {
+      this.dates.push({
+        label: this.getLabel(i),
+        date: this.getFormattedDate(i),
+        fullData: this.getFullDate(i),
+        price: "￥" + this.ticket.settlementPrice,
+      });
+    }
+
+    this.ticket.date = this.dates[0].fullData;
+    let that = this;
+    if (this.ticket.datesettings == 2 || this.ticket.datesettings == 3) {
+      //使用日期和使用小时模式：单日,这里使用日期设置不论星期还是多日都不影响返回的日期了
+      //不限库存/总库存
+      if (this.ticket.inventorySettings == 1 || this.ticket.inventorySettings == 2) {
+        const params = {
+          ticketId: that.ticket.id,
+          date: that.parseTime(new Date()),
+        };
+        that.$Request
+          .get(that.$config.getTicketDateInventory, params, null, null, false, true)
+          .then((res) => {
+            that.selected = [];
+            res.data.forEach((items) => {
+              const obj = {
+                date: items.date,
+                info: "库存:" + that.ticket.currentinventory,
+                infoColor: "#666",
+                topInfo: "",
+                topInfoColor: "",
+                badgeColor: "",
+                disable: !items.isAvailable, // 禁用
+              };
+              that.selected.push(obj);
+            });
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      }
+      //日库存
+      if (that.ticket.inventorySettings == 3) {
+        const params = {
+          ticketId: that.ticket.id,
+          date: that.parseTime(new Date()),
+        };
+        that.$Request
+          .get(that.$config.getTicketDateInventory, params, null, null, false, true)
+          .then((res) => {
+            that.selected = [];
+            res.data.forEach((items) => {
+              const obj = {
+                date: items.date,
+                info: "库存:" + items.inventory,
+                infoColor: "#666",
+                topInfo: "",
+                topInfoColor: "",
+                badgeColor: "",
+                disable: !items.isAvailable || items.inventory == 0, // 禁用
+              };
+              that.selected.push(obj);
+            });
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      }
+    }
+  },
+  methods: {
+    //切换月份
+    changeMonth(e) {
+      console.log(e);
+      let that = this;
+      let fullDate = e.fullDate + "-01";
+      if (fullDate < that.parseTime(new Date())) {
+        fullDate = that.parseTime(new Date());
+      }
+      if (that.ticket.inventorySettings == 1 || that.ticket.inventorySettings == 2) {
+        const params = {
+          ticketId: that.ticket.id,
+          date: fullDate,
+        };
+        that.$Request
+          .get(that.$config.getTicketDateInventory, params, null, null, false, true)
+          .then((res) => {
+            that.selected = [];
+            res.data.forEach((items) => {
+              const obj = {
+                date: items.date,
+                info: "库存:" + that.ticket.currentinventory,
+                infoColor: "#666",
+                topInfo: "",
+                topInfoColor: "",
+                badgeColor: "",
+                disable: !items.isAvailable, // 禁用
+              };
+              that.selected.push(obj);
+            });
+            that.$forceUpdate();
+            console.log(that.selected);
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      }
+      //日库存
+      if (that.ticket.inventorySettings == 3) {
+        const params = {
+          ticketId: that.ticket.id,
+          date: fullDate,
+        };
+        that.$Request
+          .get(that.$config.getTicketDateInventory, params, null, null, false, true)
+          .then((res) => {
+            that.selected = [];
+            res.data.forEach((items) => {
+              const obj = {
+                date: items.date,
+                info: "库存:" + items.inventory,
+                infoColor: "#666",
+                topInfo: "",
+                topInfoColor: "",
+                badgeColor: "",
+                disable: !items.isAvailable || items.inventory == 0, // 禁用
+              };
+              that.selected.push(obj);
+            });
+            that.$forceUpdate();
+            console.log(that.selected);
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      }
+    },
+    peopleNums() {
+      return Number(this.ticket.usersNumber) * Number(this.ticket.num);
+    },
+    payResult(data) {
+      console.log(data);
+      if (data.payStatus == 1) {
+        uni.showToast({ title: "支付成功", icon: "none" });
+        this.isPayPopup = false;
+        setTimeout(() => {
+          uni.switchTab({ url: "/pages/order/order" });
+        }, 1000);
+      } else {
+        uni.showToast({ title: "支付失败", icon: "none" });
+      }
+      //uni.showToast({title: data.detail.errMsg,icon:'none'});
+    },
+    //继续下单
+    continueOrder() {
+      this.$refs.warningPop.close();
+
+      let that = this;
+      const userInfo = uni.getStorageSync("userInfo");
+      const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {};
+      let appId = extConfig.app_id;
+      if (that.ticket.touristInformation == 1) {
+        const httpData = {
+          openid: userInfo.openid,
+          appid: appId,
+          mobile: userInfo.phone,
+          settlementAmount: that.sumPrice,
+          orderPrice: that.sumPrice,
+          ticketInfo: {
+            ticketId: that.ticket.id,
+            ticketName: that.ticket.ticketname,
+            num: that.ticket.num,
+            ticketPrice: that.ticket.settlementPrice,
+            date: that.ticket.date,
+            visitorInfoList: [],
+          },
+        };
+        uni.$u.http
+          .post(URL.addOrder, httpData)
+          .then((res) => {
+            that.orderInfo = res.data;
+            that.isPayPopup = true;
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      } else {
+        const httpData = {
+          openid: userInfo.openid,
+          appid: appId,
+          mobile: userInfo.phone,
+          settlementAmount: that.sumPrice,
+          orderPrice: that.sumPrice,
+          ticketInfo: {
+            ticketId: that.ticket.id,
+            ticketName: that.ticket.ticketname,
+            num: that.ticket.num,
+            ticketPrice: that.ticket.settlementPrice,
+            date: that.ticket.date,
+            visitorInfoList:
+              that.ticket.touristInformation == 1
+                ? []
+                : [{ name: "田华", idCardNumber: "13062619890707166X" }],
+          },
+        };
+        uni.$u.http
+          .post(URL.addOrder, httpData)
+          .then((res) => {
+            that.orderInfo = res.data;
+            that.isPayPopup = true;
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      }
+    },
+    //重复订单跳订单页面
+    goOrderList() {
+      uni.switchTab({ url: "/pages/order/order" });
+    },
+    //门票信息
+    getTicketInfo(id) {
+      this.$Request
+        .get(
+          this.$config.getScencAndTicketInfo,
+          { ticketId: id, tenantId: this.tentId },
+          null,
+          null,
+          false,
+          true
+        )
+        .then((res) => {
+          console.log(res);
+          this.ticketInfos = res.data;
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+    parseArrTime(val) {
+      return val.join("-");
+    },
+    parseTime(val) {
+      return parseTime(val, "{y}-{m}-{d}");
+    },
+    chooseDate(index, date) {
+      this.nowIndex = index;
+      console.log(date);
+      this.ticket.date = date;
+    },
+    //修改编辑游客信息
+    finishPeople(form) {
+      debugger;
+      let that = this;
+      this.$refs.peopleForm
+        .validate()
+        .then((res) => {
+          debugger;
+          that.baseFormData.id = that.dataList.length + 1;
+          that.baseFormData.selected = false;
+          this.$nextTick(() => {
+            if (that.dataList.length > 0) {
+              const index = that.dataList.findIndex(
+                (item) => item.id == that.baseFormData.id
+              );
+              if (index != -1) {
+                that.$set(that.dataList, index, that.baseFormData);
+              } else {
+                that.dataList.push(that.baseFormData);
+              }
+            } else {
+              that.dataList.push(that.baseFormData);
+            }
+          });
+          that.selectUserList = that.dataList;
+          this.$forceUpdate();
+          console.log("表单数据信息：", that.dataList);
+          that.$refs.mAddPerson.close();
+        })
+        .catch((err) => {
+          console.log("表单错误信息：", err);
+        });
+    },
+    //ocr开始
+    start(e) {
+      console.log(e);
+    },
+    end(e) {
+      console.log(e);
+    },
+    //ocr结束
+    //新增
+    addPerson() {
+      this.$refs.mAddPerson.open();
+      this.$refs.scroll.close();
+
+      this.titleName = "新增";
+    },
+    //编辑游客信息
+    edit(val) {
+      console.log(val);
+      this.$refs.scroll.close();
+      this.$refs.mAddPerson.open();
+      this.titleName = "编辑";
+      this.baseFormData = val;
+    },
+    //打开选择器
+    openAddress() {
+      this.$refs.scroll.open();
+    },
+    //选择成功
+    chooseSuccess(e) {
+      console.log("所选择的信息:", e);
+    },
+    //提示已有订单
+    checkOrder() {
+      // if (this.ticket.touristInformation == 2) {
+      // 	if (!this.ticket.visitorInfoList || this.ticket.visitorInfoList.length < 1) {
+      // 		uni.showToast({ title: '暂无游客信息', icon: 'none' });
+      // 		return
+      // 	}
+      // }
+      // if (this.ticket.touristInformation == 3) {
+      // 	if (!this.ticket.visitorInfoList || this.ticket.visitorInfoList.length < Number(this.ticket.usersNumber) * Number(this.ticket.num)) {
+      // 		uni.showToast({ title: '请填写全部游客信息', icon: 'none' });
+      // 		return
+      // 	}
+      // }
+      let that = this;
+      const userInfo = uni.getStorageSync("userInfo");
+      const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {};
+      let appId = extConfig.app_id;
+      const params = {
+        openid: userInfo.openid,
+        appid: appId,
+      };
+      uni.$u.http
+        .get(URL.searchWaitOrder, { params: params, custom: { load: false } })
+        .then((res) => {
+          console.log(res);
+          if (res.data != 0) {
+            this.$refs.warningPop.open();
+          } else {
+            if (that.ticket.touristInformation == 1) {
+              const httpData = {
+                openid: userInfo.openid,
+                appid: appId,
+                mobile: userInfo.phone,
+                settlementAmount: that.sumPrice,
+                orderPrice: that.sumPrice,
+                ticketInfo: {
+                  ticketId: that.ticket.id,
+                  ticketName: that.ticket.ticketname,
+                  num: that.ticket.num,
+                  ticketPrice: that.ticket.settlementPrice,
+                  date: that.ticket.date,
+                  visitorInfoList: [],
+                },
+              };
+              uni.$u.http
+                .post(URL.addOrder, httpData)
+                .then((res) => {
+                  that.orderInfo = res.data;
+                  that.isPayPopup = true;
+                })
+                .catch((err) => {
+                  console.log(err);
+                });
+            } else {
+              const httpData = {
+                openid: userInfo.openid,
+                appid: appId,
+                mobile: userInfo.phone,
+                settlementAmount: that.sumPrice,
+                orderPrice: that.sumPrice,
+                ticketInfo: {
+                  ticketId: that.ticket.id,
+                  ticketName: that.ticket.ticketname,
+                  num: that.ticket.num,
+                  ticketPrice: that.ticket.settlementPrice,
+                  date: that.ticket.date,
+                  visitorInfoList:
+                    that.ticket.touristInformation == 1
+                      ? []
+                      : [{ name: "田华", idCardNumber: "13062619890707166X" }],
+                },
+              };
+              uni.$u.http
+                .post(URL.addOrder, httpData)
+                .then((res) => {
+                  that.orderInfo = res.data;
+                  that.isPayPopup = true;
+                })
+                .catch((err) => {
+                  console.log(err);
+                });
+            }
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+    // 打开日历
+    openCalendar() {
+      this.$refs.calendar.open();
+    },
+    //选择日历
+    calendarConfirm(e) {
+      console.log(e);
+      this.ticket.date = e.fullData;
+    },
+    //须知
+    openPop(val) {
+      switch (val) {
+        case 1:
+          this.$refs.mPurchaseNotice.open("top");
+          break;
+        default:
+          break;
+      }
+    },
+    //购票数量
+    changeCount(val, ticket) {
+      console.log(val);
+      this.ticket.num = val;
+      this.sumPrice = ticket.settlementPrice * val;
+    },
+    //选择游客
+    selectUser(val) {
+      let this_ = this;
+      if (val.selected == false) {
+        val.selected = true;
+        this_.selectUserList.push(val);
+      } else {
+        val.selected = false;
+        this_.selectUserList = this_.selectUserList.filter((user) => !user.selected);
+      }
+    },
+    change(value) {
+      this.numberValue = value;
+    },
+    // 日历
+    getFormattedDate(offset) {
+      const date = new Date();
+      date.setDate(date.getDate() + offset);
+      const month = (date.getMonth() + 1).toString().padStart(2, "0");
+      const day = date.getDate().toString().padStart(2, "0");
+      return `${month}-${day}`;
+    },
+    getFullDate(offset) {
+      const date = new Date();
+      date.setDate(date.getDate() + offset);
+      const year = date.getFullYear();
+      const month = (date.getMonth() + 1).toString().padStart(2, "0");
+      const day = date.getDate().toString().padStart(2, "0");
+      return `${year}-${month}-${day}`;
+    },
+    getLabel(offset) {
+      const dayIndex = (new Date().getDay() + offset) % 7;
+      switch (offset) {
+        case 0:
+          return "今天";
+        case 1:
+          return "明天";
+        case 2:
+          return "后天";
+        default:
+          return `周${"日一二三四五六"[dayIndex]}`;
+      }
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 .m-content {
-	background: linear-gradient(180deg, rgba(9, 131, 255, 0.8) 0%, rgba(9, 131, 255, 0) 100%);
-	overflow: scroll;
-	padding-bottom: 200rpx;
-
-	.m-card {
-		background: #ffffff;
-		border-radius: 20rpx;
-		margin: 25rpx;
-		overflow: hidden;
-		padding: 25rpx;
-	}
-
-	.m-card-one {
-		.m-one-first-row {
-			padding-bottom: 20rpx;
-			border-bottom: solid 1rpx #ddd;
-
-			.m-ticket-name {
-				font-family: PingFang SC;
-				font-weight: bold;
-				font-size: 32rpx;
-				color: #1b1b1b;
-				margin-top: 10rpx;
-				margin-bottom: 15rpx;
-			}
-
-			.m-ticket-use-time {
-				display: flex;
-				justify-content: start;
-
-				.m-ticket-use-time-label {
-					display: flex;
-					align-items: center;
-					color: #666666;
-
-					.m-img {
-						width: 25rpx;
-						height: 25rpx;
-						margin-right: 10rpx;
-					}
-				}
-			}
-		}
-
-		.m-one-second-row {
-			padding: 20rpx 0;
-			border-bottom: solid 1rpx #ddd;
-
-			.m-row-title {
-				font-family: PingFang SC;
-				font-weight: bold;
-				font-size: 32rpx;
-				color: #1b1b1b;
-				margin-bottom: 20rpx;
-			}
-
-			.m-more-date {
-				display: flex;
-				margin-left: 20rpx;
-				align-items: center;
-				box-shadow: -6px 0px 8px 0px #e8e8e8;
-				padding: 8rpx 0 8rpx 14rpx;
-				border-radius: 10rpx;
-			}
-		}
-
-		.m-one-third-row {
-			.m-ticket-count {
-				display: flex;
-				width: 100%;
-				justify-content: space-between;
-				border-bottom: solid 1rpx #ddd;
-				padding: 20rpx 0;
-
-				.m-ticket-count-label {
-					font-family: PingFang SC;
-					font-weight: bold;
-					font-size: 32rpx;
-					color: #1b1b1b;
-				}
-
-				::v-deep .m-ticket-count-value {
-					.uni-numbox-btns {
-						border-radius: 50%;
-
-						.uni-numbox--text {
-							background: #ebf5ff;
-							color: #0983ff !important;
-						}
-
-						.uni-numbox--disabled {
-							color: #333 !important;
-						}
-					}
-
-					.uni-numbox__value {
-						background-color: #fff !important;
-						font-size: 32rpx !important;
-					}
-				}
-			}
-		}
-
-		.m-one-fourth-row {
-			.m-ticket-count {
-				display: flex;
-				justify-content: space-between;
-				padding: 20rpx 0;
-
-				::v-deep .m-ticket-count-value {
-					color: #0983ff;
-
-					.uni-icons {
-						color: #0983ff !important;
-					}
-				}
-			}
-		}
-	}
-
-	.m-card-two {
-		.m-card-title {
-			display: flex;
-			padding: 10rpx 0 10rpx;
-			align-items: baseline;
-
-			.m-title {
-				font-family: PingFang SC;
-				font-weight: bold;
-				font-size: 32rpx;
-				color: #1b1b1b;
-			}
-
-			.m-title-tips {
-				font-family: PingFang SC;
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #0983ff;
-				margin-left: 20rpx;
-			}
-		}
-
-		.m-two-first-row {
-			display: flex;
-			align-items: center;
-			justify-content: space-around;
-			margin: 20rpx 0;
-
-			.m-user-list {
-				padding: 20rpx 40rpx;
-				border-radius: 12rpx;
-				border: solid 1rpx #ddd;
-				position: relative;
-			}
-
-			.m-user-list.active {
-				background: #ebf5ff;
-				border-radius: 12rpx;
-				border: 1px solid #0983ff;
-			}
-
-			.m-user-list.active::after {
-				content: '';
-				width: 22rpx;
-				height: 22rpx;
-				position: absolute;
-				right: 0;
-				bottom: 0;
-				background-color: #0983ff;
-				background-image: url('/static/animg/index/duigou.png');
-				background-repeat: no-repeat;
-				background-size: 70%;
-				background-position: center;
-				border-radius: 12rpx 0rpx 12rpx 0rpx;
-			}
-
-			.m-more-user {
-				padding: 20rpx 10rpx 20rpx 20rpx;
-				display: flex;
-				align-items: center;
-				margin-left: auto;
-
-				.m-span {
-					margin-right: 10rpx;
-				}
-			}
-		}
-
-		.m-two-second-row {
-			.m-user-list {
-				.m-user-list-item {
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					margin-bottom: 20rpx;
-
-					.m-list-left {
-						width: 100rpx;
-						display: flex;
-						flex-direction: column;
-						align-items: center;
-
-						.m-img {
-							width: 50rpx;
-							height: 50rpx;
-							margin-bottom: 5rpx;
-						}
-
-						.m-span {
-							font-family: PingFang SC;
-							font-weight: 500;
-							font-size: 28rpx;
-							color: #333333;
-						}
-					}
-
-					.m-list-middle {
-						flex: 1;
-						margin: 0 25rpx;
-
-						.m-middle-user-name {
-							font-size: 32rpx;
-							font-weight: 500;
-						}
-					}
-
-					.m-list-right {
-						width: 100rpx;
-						display: flex;
-						justify-content: space-around;
-					}
-				}
-			}
-		}
-	}
-
-	.m-feet-box {
-		position: fixed;
-		width: 100%;
-		display: flex;
-		justify-content: space-between;
-		padding: 20rpx 40rpx 60rpx;
-		background: #fff;
-		bottom: 0;
-		align-items: center;
-
-		.m-feet-left {}
-
-		.m-feet-right {
-			width: 200rpx;
-			background-color: #fe2b54;
-			border-radius: 20rpx;
-			height: fit-content;
-		}
-	}
-}
-
-.m-date-pick-box {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-
-.scroll-view {
-	display: flex;
-	flex-direction: row;
-	width: 100%;
-	height: 200rpx;
-	overflow-x: scroll;
-}
-
-.date-item {
-	flex-shrink: 0;
-	width: 160rpx;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	margin: 0 10rpx;
-}
-
-.date-box {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	width: 100%;
-	height: 100%;
-	background-color: #f5f5f5;
-	border-radius: 12rpx;
-	padding: 20rpx;
-	position: relative;
-}
-
-.date-box.active {
-	background: #ebf5ff;
-	border: 2rpx solid #0983ff;
-}
-
-.date-box.active::after {
-	content: '';
-	width: 22rpx;
-	height: 22rpx;
-	position: absolute;
-	right: 0;
-	bottom: 0;
-	background-color: #0983ff;
-	background-image: url('/static/animg/index/duigou.png');
-	background-repeat: no-repeat;
-	background-size: 70%;
-	background-position: center;
-	border-radius: 12rpx 0rpx 12rpx 0rpx;
+  background: linear-gradient(
+    180deg,
+    rgba(9, 131, 255, 0.8) 0%,
+    rgba(9, 131, 255, 0) 100%
+  );
+  overflow: scroll;
+  padding-bottom: 200rpx;
+
+  .m-card {
+    background: #ffffff;
+    border-radius: 20rpx;
+    margin: 25rpx;
+    overflow: hidden;
+    padding: 25rpx;
+  }
+
+  .m-card-one {
+    .m-one-first-row {
+      padding-bottom: 20rpx;
+      border-bottom: solid 1rpx #ddd;
+
+      .m-ticket-name {
+        font-family: PingFang SC;
+        font-weight: bold;
+        font-size: 32rpx;
+        color: #1b1b1b;
+        margin-top: 10rpx;
+        margin-bottom: 15rpx;
+      }
+
+      .m-ticket-use-time {
+        display: flex;
+        justify-content: start;
+
+        .m-ticket-use-time-label {
+          display: flex;
+          align-items: center;
+          color: #666666;
+
+          .m-img {
+            width: 25rpx;
+            height: 25rpx;
+            margin-right: 10rpx;
+          }
+        }
+      }
+    }
+
+    .m-one-second-row {
+      padding: 20rpx 0;
+      border-bottom: solid 1rpx #ddd;
+
+      .m-row-title {
+        font-family: PingFang SC;
+        font-weight: bold;
+        font-size: 32rpx;
+        color: #1b1b1b;
+        margin-bottom: 20rpx;
+      }
+
+      .m-date-pick-box {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        .scroll-view1 {
+          display: flex;
+          flex-direction: row;
+          width: 100%;
+          height: 200rpx;
+          overflow-x: scroll;
+
+          .date-item {
+            flex-shrink: 0;
+            width: 160rpx;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin: 0 10rpx;
+
+            .date-box {
+              display: flex;
+              flex-direction: column;
+              align-items: center;
+              justify-content: center;
+              width: 100%;
+              height: 100%;
+              background-color: #f5f5f5;
+              border-radius: 12rpx;
+              // padding: 20rpx;
+              position: relative;
+            }
+
+            .date-box.active {
+              background: #ebf5ff;
+            }
+
+            .date-box.active::after {
+              content: "";
+              width: 22rpx;
+              height: 22rpx;
+              position: absolute;
+              right: 0;
+              bottom: 0;
+              background-color: #0983ff;
+              background-image: url("/static/animg/index/duigou.png");
+              background-repeat: no-repeat;
+              background-size: 70%;
+              background-position: center;
+              border-radius: 12rpx 0rpx 12rpx 0rpx;
+            }
+          }
+        }
+      }
+
+      .m-more-date {
+        display: flex;
+        margin-left: 20rpx;
+        align-items: center;
+        box-shadow: -6px 0px 8px 0px #e8e8e8;
+        padding: 8rpx 0 8rpx 14rpx;
+        border-radius: 10rpx;
+      }
+    }
+
+    .m-one-third-row {
+      .m-ticket-count {
+        display: flex;
+        width: 100%;
+        justify-content: space-between;
+        border-bottom: solid 1rpx #ddd;
+        padding: 20rpx 0;
+
+        .m-ticket-count-label {
+          font-family: PingFang SC;
+          font-weight: bold;
+          font-size: 32rpx;
+          color: #1b1b1b;
+        }
+
+        ::v-deep .m-ticket-count-value {
+          .uni-numbox-btns {
+            border-radius: 50%;
+
+            .uni-numbox--text {
+              background: #ebf5ff;
+              color: #0983ff !important;
+            }
+
+            .uni-numbox--disabled {
+              color: #333 !important;
+            }
+          }
+
+          .uni-numbox__value {
+            background-color: #fff !important;
+            font-size: 32rpx !important;
+          }
+        }
+      }
+    }
+
+    .m-one-fourth-row {
+      .m-ticket-count {
+        display: flex;
+        justify-content: space-between;
+        padding: 20rpx 0;
+
+        ::v-deep .m-ticket-count-value {
+          color: #0983ff;
+
+          .uni-icons {
+            color: #0983ff !important;
+          }
+        }
+      }
+    }
+  }
+
+  .m-card-two {
+    .m-card-title {
+      display: flex;
+      padding: 10rpx 0 10rpx;
+      align-items: baseline;
+
+      .m-title {
+        font-family: PingFang SC;
+        font-weight: bold;
+        font-size: 32rpx;
+        color: #1b1b1b;
+      }
+
+      .m-title-tips {
+        font-family: PingFang SC;
+        font-weight: 500;
+        font-size: 24rpx;
+        color: #0983ff;
+        margin-left: 20rpx;
+      }
+    }
+
+    .m-two-first-row {
+      display: flex;
+      align-items: center;
+      justify-content: space-around;
+      margin: 20rpx 0;
+
+      .m-user-list {
+        padding: 20rpx 40rpx;
+        border-radius: 12rpx;
+        border: solid 1rpx #ddd;
+        position: relative;
+      }
+
+      .m-user-list.active {
+        background: #ebf5ff;
+        border-radius: 12rpx;
+        border: 1px solid #0983ff;
+      }
+
+      .m-user-list.active::after {
+        content: "";
+        width: 22rpx;
+        height: 22rpx;
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        background-color: #0983ff;
+        background-image: url("/static/animg/index/duigou.png");
+        background-repeat: no-repeat;
+        background-size: 70%;
+        background-position: center;
+        border-radius: 12rpx 0rpx 12rpx 0rpx;
+      }
+
+      .m-more-user {
+        padding: 20rpx 10rpx 20rpx 20rpx;
+        display: flex;
+        align-items: center;
+        margin-left: auto;
+
+        .m-span {
+          margin-right: 10rpx;
+        }
+      }
+    }
+
+    .m-two-second-row {
+      .m-user-list {
+        .m-user-list-item {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          margin-bottom: 20rpx;
+
+          .m-list-left {
+            width: 100rpx;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+
+            .m-img {
+              width: 50rpx;
+              height: 50rpx;
+              margin-bottom: 5rpx;
+            }
+
+            .m-span {
+              font-family: PingFang SC;
+              font-weight: 500;
+              font-size: 28rpx;
+              color: #333333;
+            }
+          }
+
+          .m-list-middle {
+            flex: 1;
+            margin: 0 25rpx;
+
+            .m-middle-user-name {
+              font-size: 32rpx;
+              font-weight: 500;
+            }
+          }
+
+          .m-list-right {
+            width: 100rpx;
+            display: flex;
+            justify-content: space-around;
+          }
+        }
+      }
+    }
+  }
+
+  .m-feet-box {
+    position: fixed;
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    padding: 20rpx 0 60rpx;
+    background: #fff;
+    bottom: 0;
+    align-items: center;
+
+    .m-feet-left {
+      margin-left: 40rpx;
+    }
+
+    .m-feet-right {
+      width: 200rpx;
+      background-color: #fe2b54;
+      border-radius: 20rpx;
+      height: fit-content;
+      margin-right: 40rpx;
+
+      .m-prime-red {
+        background-color: #fe2b54;
+        color: #fff;
+      }
+    }
+  }
 }
 
 .date-label,
 .date-date,
 .date-price {
-	// margin: 5px 0;
+  // margin: 5px 0;
 }
 
 .m-pop-bg {
-	position: relative;
-
-	.m-green-bg,
-	.m-red-bg {
-		position: absolute;
-		width: 50%;
-		height: 200rpx;
-	}
-
-	.m-green-bg {
-		left: 0;
-		top: 0;
-		background: radial-gradient(circle, #00ffa4 0%, rgba(0, 255, 164, 0) 100%);
-		border-radius: 20rpx 20rpx 0rpx 0rpx;
-		opacity: 0.1;
-	}
-
-	.m-red-bg {
-		right: 0;
-		top: 0;
-		background: radial-gradient(circle, #ff5500 0%, rgba(255, 85, 0, 0) 100%);
-		border-radius: 20rpx 20rpx 0rpx 0rpx;
-		opacity: 0.1;
-	}
+  position: relative;
+
+  .m-green-bg,
+  .m-red-bg {
+    position: absolute;
+    width: 50%;
+    height: 200rpx;
+  }
+
+  .m-green-bg {
+    left: 0;
+    top: 0;
+    background: radial-gradient(circle, #00ffa4 0%, rgba(0, 255, 164, 0) 100%);
+    border-radius: 20rpx 20rpx 0rpx 0rpx;
+    opacity: 0.1;
+  }
+
+  .m-red-bg {
+    right: 0;
+    top: 0;
+    background: radial-gradient(circle, #ff5500 0%, rgba(255, 85, 0, 0) 100%);
+    border-radius: 20rpx 20rpx 0rpx 0rpx;
+    opacity: 0.1;
+  }
 }
 
 .m-purchase-notice {
-	width: 100vw;
-	height: 90vh;
-	margin-top: 10vh;
-	background-color: #f5f6f8;
-	border-radius: 20rpx 20rpx 0 0;
-	position: relative;
-	overflow: scroll;
-
-	.m-green-bg,
-	.m-red-bg {
-		position: absolute;
-		width: 50%;
-		height: 200rpx;
-	}
-
-	.m-green-bg {
-		left: 0;
-		top: 0;
-		background: radial-gradient(circle, #00ffa4 0%, rgba(0, 255, 164, 0) 100%);
-		border-radius: 20rpx 20rpx 0rpx 0rpx;
-		opacity: 0.1;
-	}
-
-	.m-red-bg {
-		right: 0;
-		top: 0;
-		background: radial-gradient(circle, #ff5500 0%, rgba(255, 85, 0, 0) 100%);
-		border-radius: 20rpx 20rpx 0rpx 0rpx;
-		opacity: 0.1;
-	}
-
-	.m-pop-title {
-		font-family: PingFang SC;
-		font-weight: 500;
-		font-size: 34rpx;
-		color: #000000;
-		text-align: center;
-		position: relative;
-		margin: 35rpx 0;
-	}
-
-	.m-pop-title::after {
-		content: '';
-		width: 20%;
-		height: 16rpx;
-		background: linear-gradient(90deg, #0983ff 0%, rgba(9, 131, 255, 0) 100%);
-		border-radius: 8rpx;
-		opacity: 0.3;
-		position: absolute;
-		left: 50%;
-		bottom: 0;
-		transform: translateX(-50%);
-	}
-
-	.m-contents {
-		background-color: #fff;
-		margin: 0 24rpx;
-		border-radius: 20rpx;
-		height: fit-content;
-		position: relative;
-		padding: 25rpx;
-
-		.m-notice-box {
-			background: linear-gradient(-90deg, rgba(9, 131, 255, 0.07) 0%, rgba(9, 131, 255, 0.04) 100%);
-			border-radius: 12rpx;
-			padding: 20rpx;
-
-			.m-notice-row {
-				display: flex;
-				align-items: center;
-
-				&:not(:last-child) {
-					margin-bottom: 20rpx;
-				}
-
-				.m-tag {
-					margin-right: 20rpx;
-				}
-
-				.m-notice-row-content {
-					font-family: PingFang SC;
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #1b1b1b;
-				}
-			}
-		}
-
-		.m-notice-table {
-			margin: 25rpx 0;
-
-			.m-table-head {
-				background: #f7f8fc;
-				border-radius: 12rpx 12rpx 0rpx 0rpx;
-				border: 1px solid #e0e5eb;
-				line-height: 84rpx;
-				padding: 0 25rpx;
-			}
-
-			.m-table-th {
-				display: flex;
-				border-bottom: 1px solid #e0e5eb;
-				border-left: 1px solid #e0e5eb;
-				border-right: 1px solid #e0e5eb;
-
-				&:last-child {
-					border-radius: 0 0 12rpx 12rpx;
-				}
-
-				.m-table-td {
-					padding: 0 40rpx;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					justify-content: center;
-
-					&:last-child {
-						flex: 1;
-						border-left: 1px solid #e0e5eb;
-						// white-space: nowrap;
-						// overflow: hidden;
-						// text-overflow: ellipsis;
-						align-items: flex-start;
-					}
-
-					font-family: PingFang SC;
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #1b1b1b;
-					line-height: 84rpx;
-
-					.m-table-inside-ico {
-						width: 32rpx;
-						height: 32rpx;
-						margin-top: 20rpx;
-					}
-
-					.m-ul {
-						.m-li {}
-					}
-				}
-			}
-		}
-
-		.no-border {
-			.m-table-th {
-				border: none !important;
-
-				.m-table-td {
-					background: #f7f8fc;
-					border: none !important;
-					margin-bottom: 6rpx;
-
-					&:last-child {
-						margin-left: 6rpx;
-					}
-				}
-			}
-		}
-	}
+  width: 100vw;
+  height: 90vh;
+  margin-top: 10vh;
+  background-color: #f5f6f8;
+  border-radius: 20rpx 20rpx 0 0;
+  position: relative;
+  overflow: scroll;
+
+  .m-green-bg,
+  .m-red-bg {
+    position: absolute;
+    width: 50%;
+    height: 200rpx;
+  }
+
+  .m-green-bg {
+    left: 0;
+    top: 0;
+    background: radial-gradient(circle, #00ffa4 0%, rgba(0, 255, 164, 0) 100%);
+    border-radius: 20rpx 20rpx 0rpx 0rpx;
+    opacity: 0.1;
+  }
+
+  .m-red-bg {
+    right: 0;
+    top: 0;
+    background: radial-gradient(circle, #ff5500 0%, rgba(255, 85, 0, 0) 100%);
+    border-radius: 20rpx 20rpx 0rpx 0rpx;
+    opacity: 0.1;
+  }
+
+  .m-pop-title {
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 34rpx;
+    color: #000000;
+    text-align: center;
+    position: relative;
+    margin: 35rpx 0;
+  }
+
+  .m-pop-title::after {
+    content: "";
+    width: 20%;
+    height: 16rpx;
+    background: linear-gradient(90deg, #0983ff 0%, rgba(9, 131, 255, 0) 100%);
+    border-radius: 8rpx;
+    opacity: 0.3;
+    position: absolute;
+    left: 50%;
+    bottom: 0;
+    transform: translateX(-50%);
+  }
+
+  .m-contents {
+    background-color: #fff;
+    margin: 0 24rpx;
+    border-radius: 20rpx;
+    height: fit-content;
+    position: relative;
+    padding: 25rpx;
+
+    .m-notice-box {
+      background: linear-gradient(
+        -90deg,
+        rgba(9, 131, 255, 0.07) 0%,
+        rgba(9, 131, 255, 0.04) 100%
+      );
+      border-radius: 12rpx;
+      padding: 20rpx;
+
+      .m-notice-row {
+        display: flex;
+        align-items: center;
+
+        &:not(:last-child) {
+          margin-bottom: 20rpx;
+        }
+
+        .m-tag {
+          margin-right: 20rpx;
+        }
+
+        .m-notice-row-content {
+          font-family: PingFang SC;
+          font-weight: 400;
+          font-size: 28rpx;
+          color: #1b1b1b;
+        }
+      }
+    }
+
+    .m-notice-table {
+      margin: 25rpx 0;
+
+      .m-table-head {
+        background: #f7f8fc;
+        border-radius: 12rpx 12rpx 0rpx 0rpx;
+        border: 1px solid #e0e5eb;
+        line-height: 84rpx;
+        padding: 0 25rpx;
+      }
+
+      .m-table-th {
+        display: flex;
+        border-bottom: 1px solid #e0e5eb;
+        border-left: 1px solid #e0e5eb;
+        border-right: 1px solid #e0e5eb;
+
+        &:last-child {
+          border-radius: 0 0 12rpx 12rpx;
+        }
+
+        .m-table-td {
+          padding: 0 40rpx;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+
+          &:last-child {
+            flex: 1;
+            border-left: 1px solid #e0e5eb;
+            // white-space: nowrap;
+            // overflow: hidden;
+            // text-overflow: ellipsis;
+            align-items: flex-start;
+          }
+
+          font-family: PingFang SC;
+          font-weight: 400;
+          font-size: 28rpx;
+          color: #1b1b1b;
+          line-height: 84rpx;
+
+          .m-table-inside-ico {
+            width: 32rpx;
+            height: 32rpx;
+            margin-top: 20rpx;
+          }
+
+          .m-ul {
+            .m-li {
+            }
+          }
+        }
+      }
+    }
+
+    .no-border {
+      .m-table-th {
+        border: none !important;
+
+        .m-table-td {
+          background: #f7f8fc;
+          border: none !important;
+          margin-bottom: 6rpx;
+
+          &:last-child {
+            margin-left: 6rpx;
+          }
+        }
+      }
+    }
+  }
 }
 
 .m-notice-popuo {
-	position: relative;
-
-	.m-notice-ico {
-		width: 247rpx;
-		height: 181rpx;
-		margin: 0 auto;
-		// background-color: #00ffa4;
-		background-color: transparent;
-		position: absolute;
-		left: 50%;
-		transform: translateX(-50%);
-		top: -30%;
-
-		.m-img {
-			width: 100%;
-			height: auto;
-		}
-	}
-
-	.m-notice-text {
-		margin-top: 90rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		font-size: 26rpx;
-		color: #1b1b1b;
-		line-height: 39rpx;
-		padding: 0 20rpx;
-	}
-
-	.m-pop-feet {
-		display: flex;
-		width: 100%;
-		justify-content: space-around;
-		margin: 40rpx 0;
-	}
+  position: relative;
+
+  .m-notice-ico {
+    width: 247rpx;
+    height: 181rpx;
+    margin: 0 auto;
+    // background-color: #00ffa4;
+    background-color: transparent;
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%);
+    top: -30%;
+
+    .m-img {
+      width: 100%;
+      height: auto;
+    }
+  }
+
+  .m-notice-text {
+    margin-top: 90rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 26rpx;
+    color: #1b1b1b;
+    line-height: 39rpx;
+    padding: 0 20rpx;
+  }
+
+  .m-pop-feet {
+    display: flex;
+    width: 100%;
+    justify-content: space-around;
+    margin: 40rpx 0;
+  }
 }
 
 .m-form-box {
-	position: relative;
+  position: relative;
 }
 </style>
diff --git a/uni_modules/jr-weather/components/jr-weather/jr-weather.vue b/uni_modules/jr-weather/components/jr-weather/jr-weather.vue
index 1b28981..b285e10 100644
--- a/uni_modules/jr-weather/components/jr-weather/jr-weather.vue
+++ b/uni_modules/jr-weather/components/jr-weather/jr-weather.vue
@@ -39,10 +39,11 @@
 		},
 		data(){
 			return {
-				weatherSrc:'https://uhr-sit-1302914566.cos.ap-guangzhou.myqcloud.com/uhr/image/2021-12-03/4d2f843f-bc89-4ba4-b5eb-8da5f176703e.png',
-				weather:'多云',
-				city:'北京市',
-				temperature:'34'
+				// weatherSrc:'https://uhr-sit-1302914566.cos.ap-guangzhou.myqcloud.com/uhr/image/2021-12-03/4d2f843f-bc89-4ba4-b5eb-8da5f176703e.png',
+				weatherSrc:'https://plugin.tianqistatic.com/static/images/tqicon1big/b0.png',
+				weather:'晴朗',
+				city:'鹿泉区',
+				temperature:'25'
 			}
 		},
 		methods:{
diff --git a/uni_modules/wu-calendar/components/wu-calendar/wu-calendar.vue b/uni_modules/wu-calendar/components/wu-calendar/wu-calendar.vue
index 8162bd5..2063599 100644
--- a/uni_modules/wu-calendar/components/wu-calendar/wu-calendar.vue
+++ b/uni_modules/wu-calendar/components/wu-calendar/wu-calendar.vue
@@ -1,1042 +1,1159 @@
 <template>
-	<view class="wu-calendar" @click.stop>
-		<view v-if="!insert && show" class="wu-calendar__mask" :class="{'wu-calendar--mask-show': aniMaskShow}"
-			@click="clean"></view>
-		<view v-if="insert || show" class="wu-calendar__content"
-			:class="{'wu-calendar--fixed':!insert, 'wu-calendar--ani-show':aniMaskShow}">
-			<!-- 弹窗日历取消与确认按钮位置 -->
-			<slot name="operation" v-if="operationPosition == 'top'">
-				<view v-if="!insert" class="wu-calendar__header wu-calendar--fixed-top">
-					<view class="wu-calendar__header-btn-box" @click="cancel">
-						<text class="wu-calendar__header-text wu-calendar--fixed-width" :style="[{color: cancelColor}]">{{cancelText}}</text>
-					</view>
-					<view class="wu-calendar__header-btn-box" @click="confirm">
-						<text class="wu-calendar__header-text wu-calendar--fixed-width" :style="[{color: confirmColor}]">{{okText}}</text>
-					</view>
-				</view>
-			</slot>
-			<!-- 日历头部 -->
-			<slot name="header" :nowDate="nowDate">
-				<view class="wu-calendar__header">
-					<!-- 纵向滑动切换展示内容 -->
-					<template v-if="slideSwitchMode == 'vertical'">
-						<view class="wu-calendar__header-btn-box vertical">
-							<view class="wu-calendar__header-btn wu-calendar--top" @click.stop="pre"></view>
-							<picker mode="date" :value="nowDate.fullDate" fields="month" @change="bindDateChange">
-								<text
-									class="wu-calendar__header-text">{{ (nowDate.year||'') + YearText + ( nowDate.month||'') + MonthText }}</text>
-							</picker>
-							<view class="wu-calendar__header-btn wu-calendar--bottom" @click.stop="next"></view>
-						</view>
-						<text class="wu-calendar__backtoday vertical" @click="backToday">{{todayText}}</text>
-					</template>
-					<!-- 横向滑动与无滑动展示内容 -->
-					<template v-else>
-						<view class="wu-calendar__header-btn-box horizontal" @click.stop="pre">
-							<view class="wu-calendar__header-btn wu-calendar--left"></view>
-						</view>
-						<picker mode="date" :value="nowDate.fullDate" fields="month" @change="bindDateChange">
-							<text
-								class="wu-calendar__header-text">{{ (nowDate.year||'') + YearText + ( nowDate.month||'') + MonthText }}</text>
-						</picker>
-						<view class="wu-calendar__header-btn-box horizontal" @click.stop="next">
-							<view class="wu-calendar__header-btn wu-calendar--right"></view>
-						</view>
-						<text class="wu-calendar__backtoday" @click="backToday">{{todayText}}</text>
-					</template>
-				</view>
-			</slot>
-			<view class="wu-calendar__box">
-				<view class="wu-calendar__weeks">
-					<view class="wu-calendar__weeks-day" v-if="startWeek === 'sun'">
-						<text class="wu-calendar__weeks-day-text">{{SUNText}}</text>
-					</view>
-					<view class="wu-calendar__weeks-day">
-						<text class="wu-calendar__weeks-day-text">{{monText}}</text>
-					</view>
-					<view class="wu-calendar__weeks-day">
-						<text class="wu-calendar__weeks-day-text">{{TUEText}}</text>
-					</view>
-					<view class="wu-calendar__weeks-day">
-						<text class="wu-calendar__weeks-day-text">{{WEDText}}</text>
-					</view>
-					<view class="wu-calendar__weeks-day">
-						<text class="wu-calendar__weeks-day-text">{{THUText}}</text>
-					</view>
-					<view class="wu-calendar__weeks-day">
-						<text class="wu-calendar__weeks-day-text">{{FRIText}}</text>
-					</view>
-					<view class="wu-calendar__weeks-day">
-						<text class="wu-calendar__weeks-day-text">{{SATText}}</text>
-					</view>
-					<view class="wu-calendar__weeks-day" v-if="startWeek === 'mon'">
-						<text class="wu-calendar__weeks-day-text">{{SUNText}}</text>
-					</view>
-				</view>
-				<!-- 滑动切换 -->
-				<swiper v-if="slideSwitchMode !== 'none'" class="wu-calendar__weeks_container"
-					:style="[calendarContentStyle]" :duration="500" :vertical="slideSwitchMode == 'vertical'" circular
-					:current="swiperCurrent" @change="swiperChange" skip-hidden-item-layout>
-					<!-- 月或周日历 -->
-					<template v-if="type === 'month' || type === 'week'">
-						<swiper-item>
-							<wu-calendar-block :weeks="preWeeks" :calendar="calendar" :selected="selected"
-								:lunar="lunar" @change="choiceDate" :color="color" :actBadgeColor="actBadgeColor" :startText="startText"
-								:endText="endText" :month="preWeeksMonth" :FoldStatus="FoldStatus"
-								:monthShowCurrentMonth="monthShowCurrentMonth" :showMonth="showMonth"
-								:itemHeight="itemHeight"></wu-calendar-block>
-						</swiper-item>
-						<swiper-item>
-							<wu-calendar-block :weeks="weeks" :calendar="calendar" :selected="selected" :lunar="lunar"
-								@change="choiceDate" :color="color" :actBadgeColor="actBadgeColor" :startText="startText" :endText="endText"
-								:monthShowCurrentMonth="monthShowCurrentMonth" :month="weeksMonth"
-								:FoldStatus="FoldStatus" :showMonth="showMonth"
-								:itemHeight="itemHeight"></wu-calendar-block>
-						</swiper-item>
-						<swiper-item>
-							<wu-calendar-block :weeks="nextWeeks" :calendar="calendar" :selected="selected"
-								:lunar="lunar" @change="choiceDate" :color="color" :actBadgeColor="actBadgeColor" :startText="startText"
-								:endText="endText" :month="nextWeeksMonth" :FoldStatus="FoldStatus"
-								:monthShowCurrentMonth="monthShowCurrentMonth" :showMonth="showMonth"
-								:itemHeight="itemHeight"></wu-calendar-block>
-						</swiper-item>
-					</template>
-				</swiper>
-				<!-- 无滑动切换 -->
-				<template v-else>
-					<!-- 月或周日历 -->
-					<wu-calendar-block class="wu-calendar__weeks_container" :style="[calendarContentStyle]"
-						:weeks="weeks" :calendar="calendar" :selected="selected" :lunar="lunar" @change="choiceDate"
-						:color="color" :actBadgeColor="actBadgeColor" :startText="startText" :endText="endText" :month="nowDate.month"
-						:FoldStatus="FoldStatus" :monthShowCurrentMonth="monthShowCurrentMonth" :showMonth="showMonth"
-						:itemHeight="itemHeight"></wu-calendar-block>
-				</template>
-			</view>
-			<view class="wu-calendar__fold" v-if="type !== 'year' && Fold" @click="FoldClick">
-				<wu-icon v-if="FoldStatus == 'open'" name="arrow-up" bold size="18"></wu-icon>
-				<wu-icon v-else-if="FoldStatus == 'close'" name="arrow-down" bold size="18"></wu-icon>
-			</view>
-			<!-- 弹窗日历取消与确认按钮位置 -->
-			<slot name="operation" v-if="operationPosition == 'bottom'">
-				<view v-if="!insert" class="wu-calendar__header wu-calendar--fixed-top">
-					<view class="wu-calendar__header-btn-box" @click="cancel">
-						<text class="wu-calendar__header-text wu-calendar--fixed-width" :style="[{color: cancelColor}]">{{cancelText}}</text>
-					</view>
-					<view class="wu-calendar__header-btn-box" @click="confirm">
-						<text class="wu-calendar__header-text wu-calendar--fixed-width" :style="[{color: confirmColor}]">{{okText}}</text>
-					</view>
-				</view>
-			</slot>
-			<wu-safe-bottom v-if="!insert && show"></wu-safe-bottom>
-		</view>
-	</view>
+  <view class="wu-calendar" @click.stop>
+    <view
+      v-if="!insert && show"
+      class="wu-calendar__mask"
+      :class="{ 'wu-calendar--mask-show': aniMaskShow }"
+      @click="clean"
+    ></view>
+    <view
+      v-if="insert || show"
+      class="wu-calendar__content"
+      :class="{ 'wu-calendar--fixed': !insert, 'wu-calendar--ani-show': aniMaskShow }"
+    >
+      <!-- 弹窗日历取消与确认按钮位置 -->
+      <slot name="operation" v-if="operationPosition == 'top'">
+        <view v-if="!insert" class="wu-calendar__header wu-calendar--fixed-top">
+          <view class="wu-calendar__header-btn-box" @click="cancel">
+            <text
+              class="wu-calendar__header-text wu-calendar--fixed-width"
+              :style="[{ color: cancelColor }]"
+              >{{ cancelText }}</text
+            >
+          </view>
+          <view class="wu-calendar__header-btn-box" @click="confirm">
+            <text
+              class="wu-calendar__header-text wu-calendar--fixed-width"
+              :style="[{ color: confirmColor }]"
+              >{{ okText }}</text
+            >
+          </view>
+        </view>
+      </slot>
+      <!-- 日历头部 -->
+      <slot name="header" :nowDate="nowDate">
+        <view class="wu-calendar__header">
+          <!-- 纵向滑动切换展示内容 -->
+          <template v-if="slideSwitchMode == 'vertical'">
+            <view class="wu-calendar__header-btn-box vertical">
+              <view
+                class="wu-calendar__header-btn wu-calendar--top"
+                @click.stop="pre"
+              ></view>
+              <picker
+                mode="date"
+                :value="nowDate.fullDate"
+                fields="month"
+                @change="bindDateChange"
+              >
+                <text class="wu-calendar__header-text">{{
+                  (nowDate.year || "") + YearText + (nowDate.month || "") + MonthText
+                }}</text>
+              </picker>
+              <view
+                class="wu-calendar__header-btn wu-calendar--bottom"
+                @click.stop="next"
+              ></view>
+            </view>
+            <text class="wu-calendar__backtoday vertical" @click="backToday">{{
+              todayText
+            }}</text>
+          </template>
+          <!-- 横向滑动与无滑动展示内容 -->
+          <template v-else>
+            <view class="wu-calendar__header-btn-box horizontal" @click.stop="pre">
+              <view class="wu-calendar__header-btn wu-calendar--left"></view>
+            </view>
+            <picker
+              mode="date"
+              :value="nowDate.fullDate"
+              fields="month"
+              @change="bindDateChange"
+            >
+              <text class="wu-calendar__header-text">{{
+                (nowDate.year || "") + YearText + (nowDate.month || "") + MonthText
+              }}</text>
+            </picker>
+            <view class="wu-calendar__header-btn-box horizontal" @click.stop="next">
+              <view class="wu-calendar__header-btn wu-calendar--right"></view>
+            </view>
+            <text class="wu-calendar__backtoday" @click="backToday">{{ todayText }}</text>
+          </template>
+        </view>
+      </slot>
+      <view class="wu-calendar__box">
+        <view class="wu-calendar__weeks">
+          <view class="wu-calendar__weeks-day" v-if="startWeek === 'sun'">
+            <text class="wu-calendar__weeks-day-text">{{ SUNText }}</text>
+          </view>
+          <view class="wu-calendar__weeks-day">
+            <text class="wu-calendar__weeks-day-text">{{ monText }}</text>
+          </view>
+          <view class="wu-calendar__weeks-day">
+            <text class="wu-calendar__weeks-day-text">{{ TUEText }}</text>
+          </view>
+          <view class="wu-calendar__weeks-day">
+            <text class="wu-calendar__weeks-day-text">{{ WEDText }}</text>
+          </view>
+          <view class="wu-calendar__weeks-day">
+            <text class="wu-calendar__weeks-day-text">{{ THUText }}</text>
+          </view>
+          <view class="wu-calendar__weeks-day">
+            <text class="wu-calendar__weeks-day-text">{{ FRIText }}</text>
+          </view>
+          <view class="wu-calendar__weeks-day">
+            <text class="wu-calendar__weeks-day-text">{{ SATText }}</text>
+          </view>
+          <view class="wu-calendar__weeks-day" v-if="startWeek === 'mon'">
+            <text class="wu-calendar__weeks-day-text">{{ SUNText }}</text>
+          </view>
+        </view>
+        <!-- 滑动切换 -->
+        <swiper
+          v-if="slideSwitchMode !== 'none'"
+          class="wu-calendar__weeks_container"
+          :style="[calendarContentStyle]"
+          :duration="500"
+          :vertical="slideSwitchMode == 'vertical'"
+          circular
+          :current="swiperCurrent"
+          @change="swiperChange"
+          skip-hidden-item-layout
+        >
+          <!-- 月或周日历 -->
+          <template v-if="type === 'month' || type === 'week'">
+            <swiper-item>
+              <wu-calendar-block
+                :weeks="preWeeks"
+                :calendar="calendar"
+                :selected="selected"
+                :lunar="lunar"
+                @change="choiceDate"
+                :color="color"
+                :actBadgeColor="actBadgeColor"
+                :startText="startText"
+                :endText="endText"
+                :month="preWeeksMonth"
+                :FoldStatus="FoldStatus"
+                :monthShowCurrentMonth="monthShowCurrentMonth"
+                :showMonth="showMonth"
+                :itemHeight="itemHeight"
+              ></wu-calendar-block>
+            </swiper-item>
+            <swiper-item>
+              <wu-calendar-block
+                :weeks="weeks"
+                :calendar="calendar"
+                :selected="selected"
+                :lunar="lunar"
+                @change="choiceDate"
+                :color="color"
+                :actBadgeColor="actBadgeColor"
+                :startText="startText"
+                :endText="endText"
+                :monthShowCurrentMonth="monthShowCurrentMonth"
+                :month="weeksMonth"
+                :FoldStatus="FoldStatus"
+                :showMonth="showMonth"
+                :itemHeight="itemHeight"
+              ></wu-calendar-block>
+            </swiper-item>
+            <swiper-item>
+              <wu-calendar-block
+                :weeks="nextWeeks"
+                :calendar="calendar"
+                :selected="selected"
+                :lunar="lunar"
+                @change="choiceDate"
+                :color="color"
+                :actBadgeColor="actBadgeColor"
+                :startText="startText"
+                :endText="endText"
+                :month="nextWeeksMonth"
+                :FoldStatus="FoldStatus"
+                :monthShowCurrentMonth="monthShowCurrentMonth"
+                :showMonth="showMonth"
+                :itemHeight="itemHeight"
+              ></wu-calendar-block>
+            </swiper-item>
+          </template>
+        </swiper>
+        <!-- 无滑动切换 -->
+        <template v-else>
+          <!-- 月或周日历 -->
+          <wu-calendar-block
+            class="wu-calendar__weeks_container"
+            :style="[calendarContentStyle]"
+            :weeks="weeks"
+            :calendar="calendar"
+            :selected="selected"
+            :lunar="lunar"
+            @change="choiceDate"
+            :color="color"
+            :actBadgeColor="actBadgeColor"
+            :startText="startText"
+            :endText="endText"
+            :month="nowDate.month"
+            :FoldStatus="FoldStatus"
+            :monthShowCurrentMonth="monthShowCurrentMonth"
+            :showMonth="showMonth"
+            :itemHeight="itemHeight"
+          ></wu-calendar-block>
+        </template>
+      </view>
+      <view class="wu-calendar__fold" v-if="type !== 'year' && Fold" @click="FoldClick">
+        <wu-icon v-if="FoldStatus == 'open'" name="arrow-up" bold size="18"></wu-icon>
+        <wu-icon
+          v-else-if="FoldStatus == 'close'"
+          name="arrow-down"
+          bold
+          size="18"
+        ></wu-icon>
+      </view>
+      <!-- 弹窗日历取消与确认按钮位置 -->
+      <slot name="operation" v-if="operationPosition == 'bottom'">
+        <view v-if="!insert" class="wu-calendar__header wu-calendar--fixed-top">
+          <view class="wu-calendar__header-btn-box" @click="cancel">
+            <text
+              class="wu-calendar__header-text wu-calendar--fixed-width"
+              :style="[{ color: cancelColor }]"
+              >{{ cancelText }}</text
+            >
+          </view>
+          <view class="wu-calendar__header-btn-box" @click="confirm">
+            <text
+              class="wu-calendar__header-text wu-calendar--fixed-width"
+              :style="[{ color: confirmColor }]"
+              >{{ okText }}</text
+            >
+          </view>
+        </view>
+      </slot>
+      <wu-safe-bottom v-if="!insert && show"></wu-safe-bottom>
+    </view>
+  </view>
 </template>
 
 <script>
-	import Calendar from './util.js';
-	import mpMixin from '@/uni_modules/wu-ui-tools/libs/mixin/mpMixin.js';
-	import mixin from '@/uni_modules/wu-ui-tools/libs/mixin/mixin.js';
-	import props from './props.js';
+import Calendar from "./util.js";
+import mpMixin from "@/uni_modules/wu-ui-tools/libs/mixin/mpMixin.js";
+import mixin from "@/uni_modules/wu-ui-tools/libs/mixin/mixin.js";
+import props from "./props.js";
 
-	import {
-		initVueI18n
-	} from '@dcloudio/uni-i18n'
-	import i18nMessages from '../i18n/index.js'
-	const {
-		t
-	} = initVueI18n(i18nMessages)
+import { initVueI18n } from "@dcloudio/uni-i18n";
+import i18nMessages from "../i18n/index.js";
+const { t } = initVueI18n(i18nMessages);
 
-	/**
-	 * Calendar 日历
-	 * @description 日历组件，多模式选择（单日期、多日期、范围日期选择），多日历类型（周、月日历），动态计算滑动。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
-	 * @tutorial https://wuui.cn/zh-CN/components/calendar.html
-	 * @property {String} date 自定义当前时间，默认为今天
-	 * @property {String} type 日历类型(默认为month)
-	 *  @value month 月日历 
-	 *  @value week 周日历
-	 * @property {Boolean} fold 是否支持折叠(默认值 month: true, week: false)
-	 * @property {Boolean} useToday 是否使用默认日期(今天，默认为true)
-	 * @property {String} mode = [single|multiple|range] 日期选择类型(默认single(单日期选择))
-	 *  @value single 单日期选择
-	 *  @value multiple 多日期选择
-	 *  @value range 范围选择
-	 * @property {String} color 主题色(默认#3c9cff)
-	 * @property {Number} itemHeight 日历中每一项日期的高度(默认60),单位px
-	 * @property {String} cancelColor 取消文字的颜色(默认#333333)
-	 * @property {String} confirmColor 确认文字的颜色(默认#333333)
-	 * @property {String} startText mode=range时，第一个日期底部的提示文字
-	 * @property {String} endText mode=range时，最后一个日期底部的提示文字
-	 * @property {String} startWeek 日历以周几开始，默认为周日(sun)，`type: month | week`时生效
-	 *  @value sun 周日
-	 *  @value mon 周一
-	 * @property {Boolean} lunar 显示农历
-	 * @property {String} startDate 日期选择范围-开始日期
-	 * @property {String} endDate 日期选择范围-结束日期
-	 * @property {Boolean} rangeEndRepick 允许范围内重选结束日期(默认false)
-	 * @property {Boolean} rangeSameDay 允许日期选择范围起始日期为同一天(默认false)
-	 * @property {Boolean} rangeHaveDisableTruncation 允许日期选择范围内遇到打点禁用日期进行截断
-	 * @property {Boolean} monthShowCurrentMonth 当月是否仅展示当月数据
-	 * @property {Boolean} insert = [true|false] 插入模式,默认为true
-	 * 	@value true 插入模式
-	 * 	@value false 弹窗模式
-	 * @property {String} slideSwitchMode 滑动切换模式,默认为horizontal(横向滑动切换)
-	 *  @value horizontal 横向滑动切换
-	 *  @value vertical 纵向滑动切换
-	 *  @value none 不使用滑动切换
-	 * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
-	 * @property {Array[Object]} selected 自定义打点，期待格式 [{date: '2023-11-18', info: '￥888', infoColor: '#6ac695', topInfo: '机票打折', topInfoColor: '#6ac695', badge: true, badgePosition: 'top-right', disable: false}, ...]
-	 * @property {Boolean} showMonth 是否选择月份为背景(默认true)
-	 * @property {Boolean} maskClick 是否点击遮罩层关闭(默认false)
-	 * @property {Boolean} disabledChoice 是否禁止点击日历(默认false)
-	 * @property {String} actBadgeColor 当通过 `selected` 属性设置某个日期 `badgeColor`后，如果该日期被选择且主题色与 `badgeColor` 一致时，徽标会显示本颜色
-	 * @property {String} operationPosition 弹窗日历取消和确认按钮的显示位置
-	 * @property {Boolean} confirmFullDate 弹窗日历点击确认时是否需要选择完整日期
-	 * @event {Function} close 日历弹窗点击遮罩层关闭，`insert :false` 时生效
-	 * @event {Function} change 日期改变，`insert :ture` 时生效
-	 * @event {Function} confirm 确认选择，`insert :false` 时生效
-	 * @event {Function} cancel 点击取消按钮，`insert :false` 时生效
-	 * @event {Function} monthSwitch 切换月份时触发
-	 * @event {Function} foldSwitch 切换折叠状态时触发，`type: month | week` & `fold: true` 时生效
-	 * @example <wu-calendar :insert="true":lunar="true" start-date="2022-5-20" end-date="2023-5-20"@change="change" />
-	 */
-	export default {
-		mixins: [mpMixin, mixin, props],
-		emits: ['close', 'cancel', 'confirm', 'change', 'monthSwitch', 'foldSwitch'],
-		data() {
-			return {
-				show: false,
-				weeks: [],
-				preWeeks: [],
-				nextWeeks: [],
-				weeksMonth: null,
-				preWeeksMonth: null,
-				nextWeeksMonth: null,
-				calendar: {},
-				nowDate: '',
-				aniMaskShow: false,
-				swiperCurrent: 1,
-				swiperChangeDirection: '',
-				pickerDate: '',
-				Fold: null,
-				FoldStatus: null,
-				weekContentStyle: {},
-			}
-		},
-		computed: {
-			/**
-			 * for i18n
-			 */
-			okText() {
-				return t("wu-calender.ok")
-			},
-			cancelText() {
-				return t("wu-calender.cancel")
-			},
-			YearText() {
-				return t("wu-calender.year")
-			},
-			MonthText() {
-				return t("wu-calender.month")
-			},
-			todayText() {
-				return t("wu-calender.today")
-			},
-			monText() {
-				return t("wu-calender.MON")
-			},
-			TUEText() {
-				return t("wu-calender.TUE")
-			},
-			WEDText() {
-				return t("wu-calender.WED")
-			},
-			THUText() {
-				return t("wu-calender.THU")
-			},
-			FRIText() {
-				return t("wu-calender.FRI")
-			},
-			SATText() {
-				return t("wu-calender.SAT")
-			},
-			SUNText() {
-				return t("wu-calender.SUN")
-			},
-			calendarContentStyle() {
-				return {
-					height: (this.FoldStatus === 'open' ? this.itemHeight * 6 : this.itemHeight) + 'px'
-				}
-			},
-			getDateType() {
-				if (this.type === 'year') return this.type
-				return this.FoldStatus === 'open' ? 'month' : 'week'
-			}
-		},
-		watch: {
-			date(newVal) {
-				this.cale.cleanRange();
-				this.init(newVal)
-			},
-			mode(newVal) {
-				this.cale.cleanRange();
-				this.cale.resetMode(newVal)
-				this.init(this.date)
-			},
-			startDate(val) {
-				this.cale.resetSatrtDate(val)
-				this.cale.setDate(this.nowDate.fullDate)
-				this.assignmentWeeks();
-			},
-			endDate(val) {
-				this.cale.resetEndDate(val)
-				this.cale.setDate(this.nowDate.fullDate)
-				this.assignmentWeeks();
-			},
-			monthShowCurrentMonth(val) {
-				this.cale.resetMonthShowCurrentMonth(val)
-				this.setDate(this.nowDate.fullDate)
-			},
-			rangeEndRepick(val) {
-				this.cale.resetRangeEndRepick(val)
-			},
-			rangeSameDay(val) {
-				this.cale.resetRangeSameDay(val)
-			},
-			rangeHaveDisableTruncation(val) {
-				this.cale.resetRangeHaveDisableTruncation(val)
-				this.cale.cleanRange()
-				this.init(this.date)
-			},
-			selected: {
-				handler(newVal) {
-					this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
-					this.assignmentWeeks()
-					// 找出目前的信息weeks 并 将 this.calendar重新赋值
-					let nowDateInfo = this.cale.canlender.filter(item => item.fullDate && this.cale.dateEqual(item
-						.fullDate, this.calendar.fullDate))
-					if (nowDateInfo.length) this.calendar = nowDateInfo[0]
-				},
-				deep: true
-			},
-			fold(newVal) {
-				this.Fold = newVal
-			},
-			type(newVal) {
-				this.initFold();
-				this.cale.resetFoldStatus(this.FoldStatus);
-				this.init(this.date)
-			},
-			startWeek(newVal) {
-				this.cale.cleanRange();
-				this.cale.resetStartWeek(newVal)
-				this.init(this.date)
-			}
-		},
-		created() {
-			this.initFold();
-			this.cale = new Calendar({
-				selected: this.selected,
-				startDate: this.startDate,
-				endDate: this.endDate,
-				mode: this.mode,
-				type: this.type,
-				startWeek: this.startWeek,
-				foldStatus: this.FoldStatus,
-				monthShowCurrentMonth: this.monthShowCurrentMonth,
-				rangeEndRepick: this.rangeEndRepick,
-				rangeSameDay: this.rangeSameDay,
-				rangeHaveDisableTruncation: this.rangeHaveDisableTruncation
-			})
-			this.init(this.date)
-		},
-		methods: {
-			// 取消穿透
-			clean() {
-				if (this.maskClick) {
-					this.$emit('close')
-					this.close()
-				}
-			},
-			bindDateChange(e) {
-				const value = e.detail.value + '-1'
-				this.setDate(value)
-				this.swiperCurrentChangeWeeks();
-				
-				const {
-					year,
-					month
-				} = this.cale.getDate(value)
-				this.$emit('monthSwitch', {
-					year,
-					month: Number(month),
-					fullDate: `${year}-${`${month}`.padStart(2, '0')}`
-				})
-			},
-			/**
-			 * 初始化日期显示
-			 * @param {Object} date
-			 */
-			init(date) {
-				let firstDate = this.mode == 'single' ? date : date[0];
-				// 如果填写默认值
-				if (date) {
-					// 当前数据类型
-					let dateType = Object.prototype.toString.call(date);
-					// 验证类型
-					if (this.mode == 'single' && dateType != '[object String]') {
-						return console.error(`类型错误，mode=${this.mode}时，date=String`)
-					} else if (this.mode != 'single' && dateType != '[object Array]') {
-						return console.error(`类型错误，mode=${this.mode}时，date=Array`)
-					}
-					// 根据类型默认选中不同的值
-					if (this.mode == 'multiple') {
-						this.cale.multiple = date.map(item=>item);
-						this.cale._getWeek(this.cale.multiple[this.cale.multiple.length - 1]);
-					} else if (this.mode == 'range') {
-						date[0] ? this.cale.setRange(date[0]) : ''
-						date[1] ? this.cale.setRange(date[1]) : ''
-					}
-				}
-				// 如果不填写默认值 且 使用今日作为默认值 并且 还没有在打点中禁用今天的日期
-				else if (this.useToday && !this.selected.filter(item => item.disable && this.cale.dateEqual(item.date, this
-						.cale.date.fullDate)).length) {
-					if (this.mode == 'multiple') {
-						this.cale.multiple = [this.cale.date.fullDate];
-						this.cale._getWeek(this.cale.multiple[this.cale.multiple.length - 1]);
-					} else if (this.mode == 'range') {
-						this.cale.setRange(this.cale.date.fullDate)
-					}
-				}
+/**
+ * Calendar 日历
+ * @description 日历组件，多模式选择（单日期、多日期、范围日期选择），多日历类型（周、月日历），动态计算滑动。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+ * @tutorial https://wuui.cn/zh-CN/components/calendar.html
+ * @property {String} date 自定义当前时间，默认为今天
+ * @property {String} type 日历类型(默认为month)
+ *  @value month 月日历
+ *  @value week 周日历
+ * @property {Boolean} fold 是否支持折叠(默认值 month: true, week: false)
+ * @property {Boolean} useToday 是否使用默认日期(今天，默认为true)
+ * @property {String} mode = [single|multiple|range] 日期选择类型(默认single(单日期选择))
+ *  @value single 单日期选择
+ *  @value multiple 多日期选择
+ *  @value range 范围选择
+ * @property {String} color 主题色(默认#3c9cff)
+ * @property {Number} itemHeight 日历中每一项日期的高度(默认60),单位px
+ * @property {String} cancelColor 取消文字的颜色(默认#333333)
+ * @property {String} confirmColor 确认文字的颜色(默认#333333)
+ * @property {String} startText mode=range时，第一个日期底部的提示文字
+ * @property {String} endText mode=range时，最后一个日期底部的提示文字
+ * @property {String} startWeek 日历以周几开始，默认为周日(sun)，`type: month | week`时生效
+ *  @value sun 周日
+ *  @value mon 周一
+ * @property {Boolean} lunar 显示农历
+ * @property {String} startDate 日期选择范围-开始日期
+ * @property {String} endDate 日期选择范围-结束日期
+ * @property {Boolean} rangeEndRepick 允许范围内重选结束日期(默认false)
+ * @property {Boolean} rangeSameDay 允许日期选择范围起始日期为同一天(默认false)
+ * @property {Boolean} rangeHaveDisableTruncation 允许日期选择范围内遇到打点禁用日期进行截断
+ * @property {Boolean} monthShowCurrentMonth 当月是否仅展示当月数据
+ * @property {Boolean} insert = [true|false] 插入模式,默认为true
+ * 	@value true 插入模式
+ * 	@value false 弹窗模式
+ * @property {String} slideSwitchMode 滑动切换模式,默认为horizontal(横向滑动切换)
+ *  @value horizontal 横向滑动切换
+ *  @value vertical 纵向滑动切换
+ *  @value none 不使用滑动切换
+ * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+ * @property {Array[Object]} selected 自定义打点，期待格式 [{date: '2023-11-18', info: '￥888', infoColor: '#6ac695', topInfo: '机票打折', topInfoColor: '#6ac695', badge: true, badgePosition: 'top-right', disable: false}, ...]
+ * @property {Boolean} showMonth 是否选择月份为背景(默认true)
+ * @property {Boolean} maskClick 是否点击遮罩层关闭(默认false)
+ * @property {Boolean} disabledChoice 是否禁止点击日历(默认false)
+ * @property {String} actBadgeColor 当通过 `selected` 属性设置某个日期 `badgeColor`后，如果该日期被选择且主题色与 `badgeColor` 一致时，徽标会显示本颜色
+ * @property {String} operationPosition 弹窗日历取消和确认按钮的显示位置
+ * @property {Boolean} confirmFullDate 弹窗日历点击确认时是否需要选择完整日期
+ * @event {Function} close 日历弹窗点击遮罩层关闭，`insert :false` 时生效
+ * @event {Function} change 日期改变，`insert :ture` 时生效
+ * @event {Function} confirm 确认选择，`insert :false` 时生效
+ * @event {Function} cancel 点击取消按钮，`insert :false` 时生效
+ * @event {Function} monthSwitch 切换月份时触发
+ * @event {Function} foldSwitch 切换折叠状态时触发，`type: month | week` & `fold: true` 时生效
+ * @example <wu-calendar :insert="true":lunar="true" start-date="2022-5-20" end-date="2023-5-20"@change="change" />
+ */
+export default {
+  mixins: [mpMixin, mixin, props],
+  emits: ["close", "cancel", "confirm", "change", "monthSwitch", "foldSwitch"],
+  data() {
+    return {
+      show: false,
+      weeks: [],
+      preWeeks: [],
+      nextWeeks: [],
+      weeksMonth: null,
+      preWeeksMonth: null,
+      nextWeeksMonth: null,
+      calendar: {},
+      nowDate: "",
+      aniMaskShow: false,
+      swiperCurrent: 1,
+      swiperChangeDirection: "",
+      pickerDate: "",
+      Fold: null,
+      FoldStatus: null,
+      weekContentStyle: {},
+    };
+  },
+  computed: {
+    /**
+     * for i18n
+     */
+    okText() {
+      return t("wu-calender.ok");
+    },
+    cancelText() {
+      return t("wu-calender.cancel");
+    },
+    YearText() {
+      return t("wu-calender.year");
+    },
+    MonthText() {
+      return t("wu-calender.month");
+    },
+    todayText() {
+      return t("wu-calender.today");
+    },
+    monText() {
+      return t("wu-calender.MON");
+    },
+    TUEText() {
+      return t("wu-calender.TUE");
+    },
+    WEDText() {
+      return t("wu-calender.WED");
+    },
+    THUText() {
+      return t("wu-calender.THU");
+    },
+    FRIText() {
+      return t("wu-calender.FRI");
+    },
+    SATText() {
+      return t("wu-calender.SAT");
+    },
+    SUNText() {
+      return t("wu-calender.SUN");
+    },
+    calendarContentStyle() {
+      return {
+        height:
+          (this.FoldStatus === "open" ? this.itemHeight * 6 : this.itemHeight) + "px",
+      };
+    },
+    getDateType() {
+      if (this.type === "year") return this.type;
+      return this.FoldStatus === "open" ? "month" : "week";
+    },
+  },
+  watch: {
+    date(newVal) {
+      this.cale.cleanRange();
+      this.init(newVal);
+    },
+    mode(newVal) {
+      this.cale.cleanRange();
+      this.cale.resetMode(newVal);
+      this.init(this.date);
+    },
+    startDate(val) {
+      this.cale.resetSatrtDate(val);
+      this.cale.setDate(this.nowDate.fullDate);
+      this.assignmentWeeks();
+    },
+    endDate(val) {
+      this.cale.resetEndDate(val);
+      this.cale.setDate(this.nowDate.fullDate);
+      this.assignmentWeeks();
+    },
+    monthShowCurrentMonth(val) {
+      this.cale.resetMonthShowCurrentMonth(val);
+      this.setDate(this.nowDate.fullDate);
+    },
+    rangeEndRepick(val) {
+      this.cale.resetRangeEndRepick(val);
+    },
+    rangeSameDay(val) {
+      this.cale.resetRangeSameDay(val);
+    },
+    rangeHaveDisableTruncation(val) {
+      this.cale.resetRangeHaveDisableTruncation(val);
+      this.cale.cleanRange();
+      this.init(this.date);
+    },
+    selected: {
+      handler(newVal) {
+        this.cale.setSelectInfo(this.nowDate.fullDate, newVal);
+        this.assignmentWeeks();
+        // 找出目前的信息weeks 并 将 this.calendar重新赋值
+        let nowDateInfo = this.cale.canlender.filter(
+          (item) =>
+            item.fullDate && this.cale.dateEqual(item.fullDate, this.calendar.fullDate)
+        );
+        if (nowDateInfo.length) this.calendar = nowDateInfo[0];
+      },
+      deep: true,
+    },
+    fold(newVal) {
+      this.Fold = newVal;
+    },
+    type(newVal) {
+      this.initFold();
+      this.cale.resetFoldStatus(this.FoldStatus);
+      this.init(this.date);
+    },
+    startWeek(newVal) {
+      this.cale.cleanRange();
+      this.cale.resetStartWeek(newVal);
+      this.init(this.date);
+    },
+  },
+  created() {
+    this.initFold();
+    this.cale = new Calendar({
+      selected: this.selected,
+      startDate: this.startDate,
+      endDate: this.endDate,
+      mode: this.mode,
+      type: this.type,
+      startWeek: this.startWeek,
+      foldStatus: this.FoldStatus,
+      monthShowCurrentMonth: this.monthShowCurrentMonth,
+      rangeEndRepick: this.rangeEndRepick,
+      rangeSameDay: this.rangeSameDay,
+      rangeHaveDisableTruncation: this.rangeHaveDisableTruncation,
+    });
+    this.init(this.date);
+  },
+  methods: {
+    // 取消穿透
+    clean() {
+      if (this.maskClick) {
+        this.$emit("close");
+        this.close();
+      }
+    },
+    bindDateChange(e) {
+      const value = e.detail.value + "-1";
+      this.setDate(value);
+      this.swiperCurrentChangeWeeks();
 
-				// 设置日期
-				this.cale.setDate(firstDate);
-				// 现在的日期
-				this.nowDate = this.cale.getInfo(firstDate);
-				// 设置当前月份
-				this.weeksMonth = this.nowDate.month;
-				// 如果不填写默认值 且 使用今日作为默认值
-				if ((this.useToday && !this.date) || this.date) {
-					this.calendar = this.nowDate;
-				}
+      const { year, month } = this.cale.getDate(value);
+      this.$emit("monthSwitch", {
+        year,
+        month: Number(month),
+        fullDate: `${year}-${`${month}`.padStart(2, "0")}`,
+      });
+    },
+    /**
+     * 初始化日期显示
+     * @param {Object} date
+     */
+    init(date) {
+      let firstDate = this.mode == "single" ? date : date[0];
+      // 如果填写默认值
+      if (date) {
+        // 当前数据类型
+        let dateType = Object.prototype.toString.call(date);
+        // 验证类型
+        if (this.mode == "single" && dateType != "[object String]") {
+          return console.error(`类型错误，mode=${this.mode}时，date=String`);
+        } else if (this.mode != "single" && dateType != "[object Array]") {
+          return console.error(`类型错误，mode=${this.mode}时，date=Array`);
+        }
+        // 根据类型默认选中不同的值
+        if (this.mode == "multiple") {
+          this.cale.multiple = date.map((item) => item);
+          this.cale._getWeek(this.cale.multiple[this.cale.multiple.length - 1]);
+        } else if (this.mode == "range") {
+          date[0] ? this.cale.setRange(date[0]) : "";
+          date[1] ? this.cale.setRange(date[1]) : "";
+        }
+      }
+      // 如果不填写默认值 且 使用今日作为默认值 并且 还没有在打点中禁用今天的日期
+      else if (
+        this.useToday &&
+        !this.selected.filter(
+          (item) =>
+            item.disable && this.cale.dateEqual(item.date, this.cale.date.fullDate)
+        ).length
+      ) {
+        if (this.mode == "multiple") {
+          this.cale.multiple = [this.cale.date.fullDate];
+          this.cale._getWeek(this.cale.multiple[this.cale.multiple.length - 1]);
+        } else if (this.mode == "range") {
+          this.cale.setRange(this.cale.date.fullDate);
+        }
+      }
 
-				// 渲染
-				this.updateWeeks(false, true);
-			},
-			/**
-			 * 打开日历弹窗
-			 */
-			open() {
-				this.show = true
-				// #ifdef H5
-				if (!this.insert) document.body.style = 'overflow: hidden'
-				// #endif
-				this.$nextTick(() => {
-					setTimeout(() => {
-						this.aniMaskShow = true
-					}, 50)
-				})
-			},
-			/**
-			 * 关闭日历弹窗
-			 */
-			close() {
-				this.aniMaskShow = false
-				this.$nextTick(() => {
-					setTimeout(() => {
-						this.show = false
-						// #ifdef H5
-						if (!this.insert) document.body.style = 'overflow: visible'
-						// #endif
-						// 为弹窗模式且需要清理数据
-						if (this.clearDate && !this.insert) {
-							this.reset()
-						}
-					}, 300)
-				})
-			},
-			/**
-			 * 重置
-			 */
-			reset() {
-				this.cale.cleanRange()
-				this.cale.cleanMultiple()
-				this.swiperCurrent = 1;
-				this.init(this.date);
-			},
-			/**
-			 * 确认按钮
-			 */
-			confirm() {
-				if(this.confirmFullDate) {
-					if(this.mode == 'single' && !this.calendar.fullDate) {
-						return uni.showToast({
-							icon: 'none',
-							title: '请选择日期',
-							duration: 600
-						});
-					} else if(this.mode == 'multiple' && !this.cale.multiple.length) {
-						return uni.showToast({
-							icon: 'none',
-							title: '请至少选择一个日期',
-							duration: 600
-						});
-					} else if(this.mode == 'range') {
-						if(!this.cale.rangeStatus.before) {
-							return uni.showToast({
-								icon: 'none',
-								title: '请选择开始日期',
-								duration: 600
-							}); 
-						} else if(!this.cale.rangeStatus.after) {
-							return uni.showToast({
-								icon: 'none',
-								title: '请选择结束日期',
-								duration: 600
-							}); 
-						}
-					}
-				}
-				this.setEmit('confirm')
-				this.close()
-			},
-			/**
-			 * 取消按钮
-			 */
-			cancel() {
-				this.$emit('cancel')
-				this.close()
-			},
-			/**
-			 * 变化触发
-			 */
-			change() {
-				if (!this.insert) return
-				this.setEmit('change')
-			},
-			/**
-			 * 选择月份触发
-			 */
-			monthSwitch() {
-				let {
-					year,
-					month
-				} = this.nowDate;
-				this.$emit('monthSwitch', {
-					year,
-					month: Number(month),
-					fullDate: `${year}-${`${month}`.padStart(2, '0')}`
-				})
-			},
-			/**
-			 * 派发事件
-			 * @param {Object} name
-			 */
-			setEmit(name) {
-				let {
-					year,
-					month,
-					date,
-					fullDate,
-					lunar,
-					extraInfo,
-					type,
-					mode
-				} = this.calendar;
+      // 设置日期
+      this.cale.setDate(firstDate);
+      // 现在的日期
+      this.nowDate = this.cale.getInfo(firstDate);
+      // 设置当前月份
+      this.weeksMonth = this.nowDate.month;
+      // 如果不填写默认值 且 使用今日作为默认值
+      if ((this.useToday && !this.date) || this.date) {
+        this.calendar = this.nowDate;
+      }
 
-				let params = {
-					range: this.cale.rangeStatus,
-					multiple: this.cale.multiple,
-					mode,
-					type,
-					year,
-					month: Number(month),
-					date,
-					fulldate: fullDate,
-					lunar,
-					extraInfo: extraInfo || {}
-				}
+      // 渲染
+      this.updateWeeks(false, true);
+    },
+    /**
+     * 打开日历弹窗
+     */
+    open() {
+      this.show = true;
+      // #ifdef H5
+      if (!this.insert) document.body.style = "overflow: hidden";
+      // #endif
+      this.$nextTick(() => {
+        setTimeout(() => {
+          this.aniMaskShow = true;
+        }, 50);
+      });
+    },
+    /**
+     * 关闭日历弹窗
+     */
+    close() {
+      this.aniMaskShow = false;
+      this.$nextTick(() => {
+        setTimeout(() => {
+          this.show = false;
+          // #ifdef H5
+          if (!this.insert) document.body.style = "overflow: visible";
+          // #endif
+          // 为弹窗模式且需要清理数据
+          if (this.clearDate && !this.insert) {
+            this.reset();
+          }
+        }, 300);
+      });
+    },
+    /**
+     * 重置
+     */
+    reset() {
+      this.cale.cleanRange();
+      this.cale.cleanMultiple();
+      this.swiperCurrent = 1;
+      this.init(this.date);
+    },
+    /**
+     * 确认按钮
+     */
+    confirm() {
+      if (this.confirmFullDate) {
+        console.log(this.calendar.fullDate, "this.calendar.fullDate");
+        if (this.mode == "single" && !this.calendar.fullDate) {
+          return uni.showToast({
+            icon: "none",
+            title: "请选择日期",
+            duration: 600,
+          });
+        } else if (this.mode == "multiple" && !this.cale.multiple.length) {
+          return uni.showToast({
+            icon: "none",
+            title: "请至少选择一个日期",
+            duration: 600,
+          });
+        } else if (this.mode == "range") {
+          if (!this.cale.rangeStatus.before) {
+            return uni.showToast({
+              icon: "none",
+              title: "请选择开始日期",
+              duration: 600,
+            });
+          } else if (!this.cale.rangeStatus.after) {
+            return uni.showToast({
+              icon: "none",
+              title: "请选择结束日期",
+              duration: 600,
+            });
+          }
+        }
+      }
+      this.setEmit("confirm");
+      this.close();
+    },
+    /**
+     * 取消按钮
+     */
+    cancel() {
+      this.$emit("cancel");
+      this.close();
+    },
+    /**
+     * 变化触发
+     */
+    change() {
+      if (!this.insert) return;
+      this.setEmit("change");
+    },
+    /**
+     * 选择月份触发
+     */
+    monthSwitch() {
+      let { year, month } = this.nowDate;
+      this.$emit("monthSwitch", {
+        year,
+        month: Number(month),
+        fullDate: `${year}-${`${month}`.padStart(2, "0")}`,
+      });
+    },
+    /**
+     * 派发事件
+     * @param {Object} name
+     */
+    setEmit(name) {
+      let { year, month, date, fullDate, lunar, extraInfo, type, mode } = this.calendar;
 
-				if (this.type === 'month' || this.type === 'week') {
-					params.foldStatus = this.FoldStatus
-				}
+      let params = {
+        range: this.cale.rangeStatus,
+        multiple: this.cale.multiple,
+        mode,
+        type,
+        year,
+        month: Number(month),
+        date,
+        fulldate: fullDate,
+        lunar,
+        extraInfo: extraInfo || {},
+      };
 
-				this.$emit(name, params)
-			},
-			/**
-			 * 选择天触发
-			 * @param {Object} weeks
-			 */
-			choiceDate(weeks) {
-				// 如果为禁用 或者 空数据 或者 禁止点击日期
-				if (weeks.disable || weeks.empty || this.disabledChoice) return;
+      if (this.type === "month" || this.type === "week") {
+        params.foldStatus = this.FoldStatus;
+      }
 
-				this.calendar = weeks;
-				// 保存操作的日历信息
-				this.nowDate = this.calendar;
-				// 设置选择范围
-				this.cale.setRange(this.calendar.fullDate);
-				// 设置多选
-				this.cale.setMultiple(this.calendar.fullDate);
-				
-				// 如果启用滑动切换 且当前模式为范围选择时则重新计算上月与下月
-				if (this.slideSwitchMode !== 'none') {
-					let weekName = '';
-					switch (this.swiperCurrent) {
-						case 0:
-							weekName = 'preWeeks'
-							if (this.mode == 'range') {
-								this.weeks = this.cale._getWeek(this.weeks[0].find(item => item.fullDate).fullDate, false)
-								this.nextWeeks = this.cale._getWeek(this.nextWeeks[0].find(item => item.fullDate).fullDate,
-									false)
-							}
-							break;
-						case 1:
-							weekName = 'weeks'
-							if (this.mode == 'range') {
-								this.preWeeks = this.cale._getWeek(this.preWeeks[0].find(item => item.fullDate).fullDate,
-									false)
-								this.nextWeeks = this.cale._getWeek(this.nextWeeks[0].find(item => item.fullDate).fullDate,
-									false)
-							}
-							break;
-						case 2:
-							weekName = 'nextWeeks'
-							if (this.mode == 'range') {
-								this.weeks = this.cale._getWeek(this.weeks[0].find(item => item.fullDate).fullDate, false)
-								this.preWeeks = this.cale._getWeek(this.preWeeks[0].find(item => item.fullDate).fullDate,
-									false)
-							}
-							break;
-					}
-					this[weekName] = this.cale.weeks;
-				} else {
-					this.weeks = this.cale.weeks;
-				}
+      this.$emit(name, params);
+    },
+    /**
+     * 选择天触发
+     * @param {Object} weeks
+     */
+    choiceDate(weeks) {
+      // 如果为禁用 或者 空数据 或者 禁止点击日期
+      if (weeks.disable || weeks.empty || this.disabledChoice) return;
 
-				this.change();
-			},
-			/**
-			 * 回到今天
-			 */
-			backToday() {
-				// 获取目前的年月
-				const nowYearMonth = `${this.nowDate.year}-${this.nowDate.month}`
+      this.calendar = weeks;
+      // 保存操作的日历信息
+      this.nowDate = this.calendar;
+      // 设置选择范围
+      this.cale.setRange(this.calendar.fullDate);
+      // 设置多选
+      this.cale.setMultiple(this.calendar.fullDate);
 
-				if (this.cale.rangeStatus.before && !this.cale.rangeStatus.after) {
-					this.cale.rangeStatus.before = '';
-				}
+      // 如果启用滑动切换 且当前模式为范围选择时则重新计算上月与下月
+      if (this.slideSwitchMode !== "none") {
+        let weekName = "";
+        switch (this.swiperCurrent) {
+          case 0:
+            weekName = "preWeeks";
+            if (this.mode == "range") {
+              this.weeks = this.cale._getWeek(
+                this.weeks[0].find((item) => item.fullDate).fullDate,
+                false
+              );
+              this.nextWeeks = this.cale._getWeek(
+                this.nextWeeks[0].find((item) => item.fullDate).fullDate,
+                false
+              );
+            }
+            break;
+          case 1:
+            weekName = "weeks";
+            if (this.mode == "range") {
+              this.preWeeks = this.cale._getWeek(
+                this.preWeeks[0].find((item) => item.fullDate).fullDate,
+                false
+              );
+              this.nextWeeks = this.cale._getWeek(
+                this.nextWeeks[0].find((item) => item.fullDate).fullDate,
+                false
+              );
+            }
+            break;
+          case 2:
+            weekName = "nextWeeks";
+            if (this.mode == "range") {
+              this.weeks = this.cale._getWeek(
+                this.weeks[0].find((item) => item.fullDate).fullDate,
+                false
+              );
+              this.preWeeks = this.cale._getWeek(
+                this.preWeeks[0].find((item) => item.fullDate).fullDate,
+                false
+              );
+            }
+            break;
+        }
+        this[weekName] = this.cale.weeks;
+      } else {
+        this.weeks = this.cale.weeks;
+      }
 
-				// 设置日期
-				this.setDate(this.cale.date.fullDate);
-				let date = this.nowDate;
-				this.calendar = date;
-				// 设置选中的日期
-				this.cale.setRange(date.fullDate);
-				// 今天的日期
-				const todayYearMonth = `${date.year}-${date.month}`
+      this.change();
+    },
+    /**
+     * 回到今天
+     */
+    backToday() {
+      // 获取目前的年月
+      const nowYearMonth = `${this.nowDate.year}-${this.nowDate.month}`;
 
-				// 如果当前日期 与 今天的日期不符
-				if (nowYearMonth !== todayYearMonth) {
-					// 触发月份切换事件
-					this.monthSwitch()
-				}
+      if (this.cale.rangeStatus.before && !this.cale.rangeStatus.after) {
+        this.cale.rangeStatus.before = "";
+      }
 
-				// 设置日期
-				this.setDate(this.cale.date.fullDate);
-				// swiperCurrent改变需要改动的weeks 
-				this.swiperCurrentChangeWeeks();
-				// 改变事件
-				this.change()
-			},
-			/**
-			 * 上个月
-			 */
-			pre() {
-				this.swiperChangeDirection = 'pre'
-				this.updateWeeks();
-			},
-			/**
-			 * 下个月
-			 */
-			next() {
-				this.swiperChangeDirection = 'next'
-				this.updateWeeks();
-			},
-			/**
-			 * 设置日期
-			 * @param {Object} date
-			 */
-			setDate(date) {
-				this.cale.setDate(date)
-				this.nowDate = this.cale.getInfo(date)
-				this.assignmentWeeks()
-			},
-			/**
-			 * 用来将cale.weeks 赋值到 weeks
-			 */
-			assignmentWeeks() {
-				let weekName = '';
-				let weekMonthName = '';
-				switch (this.swiperCurrent) {
-					case 0:
-						weekName = 'preWeeks'
-						weekMonthName = 'preWeeksMonth'
-						break;
-					case 1:
-						weekName = 'weeks'
-						weekMonthName = 'weeksMonth'
-						break;
-					case 2:
-						weekName = 'nextWeeks'
-						weekMonthName = 'nextWeeksMonth'
-						break;
-				}
-				this[weekName] = this.cale.weeks;
-				this[weekMonthName] = this.cale.selectDate.month;
-			},
-			/**
-			 * 滑动切换日期
-			 */
-			swiperChange(e) {
-				// 非用户滑动不执行
-				if (e.detail.source !== 'touch') return;
-				let curr = e.detail.current;
-				if (curr - this.swiperCurrent == 1 || curr - this.swiperCurrent == -2) {
-					this.swiperChangeDirection = 'next'
-				} else {
-					this.swiperChangeDirection = 'pre'
-				}
-				this.swiperCurrent = curr;
-				this.updateWeeks();
-			},
-			/**
-			 * 更新weeks
-			 * @param {Boolean} isChange 是否使当前的weeks发生变化
-			 */
-			updateWeeks(isChange = true, isInt = false) {
-				let newFullDate = ''
-				// 是否变动日期信息
-				if (isChange) {
-					// 如果目前处于打开状态也就是月日历时，将记录月份改为一号(这样可以在用户切换到任意月份时并折叠自动选中1号)
-					let fullDate = this.FoldStatus === 'close' ? this.nowDate.fullDate : `${this.nowDate.year}-${this.nowDate.month}-${1}`
-					newFullDate = this.cale.getDate(fullDate, this.swiperChangeDirection === 'next' ? +1 : -1, this.getDateType).fullDate;
-				} else {
-					newFullDate = this.cale.getDate(this.nowDate.fullDate, 0, this.getDateType).fullDate;
-				}
-				this.setDate(newFullDate)
-				this.swiperCurrentChangeWeeks();
-				if(!isInt) {
-					this.monthSwitch();
-				}
-			},
-			/**
-			 * swiperCurrent改变需要改动的weeks
-			 */
-			swiperCurrentChangeWeeks() {
-				if (this.slideSwitchMode === 'none') return;
-				// 防止一次渲染过多数据，造成对nvue的卡顿
-				this.$nextTick(() => {
-					let nextDate = this.cale.getDate(this.nowDate.fullDate, +1, this.getDateType);
-					let nextWeeks = this.cale._getWeek(nextDate.fullDate, false);
-					let nextWeeksMonth = nextDate.month
-					let preDate = this.cale.getDate(this.nowDate.fullDate, -1, this.getDateType);
-					let preWeeks = this.cale._getWeek(preDate.fullDate, false);
-					let preWeeksMonth = preDate.month
+      // 设置日期
+      this.setDate(this.cale.date.fullDate);
+      let date = this.nowDate;
+      this.calendar = date;
+      // 设置选中的日期
+      this.cale.setRange(date.fullDate);
+      // 今天的日期
+      const todayYearMonth = `${date.year}-${date.month}`;
 
-					if (this.swiperCurrent == 0) {
-						this.weeks = nextWeeks;
-						this.weeksMonth = nextWeeksMonth;
-						this.nextWeeks = preWeeks;
-						this.nextWeeksMonth = preWeeksMonth;
-					} else if (this.swiperCurrent == 1) {
-						this.nextWeeks = nextWeeks;
-						this.nextWeeksMonth = nextWeeksMonth;
-						this.preWeeks = preWeeks;
-						this.preWeeksMonth = preWeeksMonth;
-					} else {
-						this.preWeeks = nextWeeks;
-						this.preWeeksMonth = nextWeeksMonth;
-						this.weeks = preWeeks;
-						this.weeksMonth = preWeeksMonth;
-					}
-				})
-			},
+      // 如果当前日期 与 今天的日期不符
+      if (nowYearMonth !== todayYearMonth) {
+        // 触发月份切换事件
+        this.monthSwitch();
+      }
 
-			// 点击折叠
-			FoldClick() {
-				this.FoldStatus = this.FoldStatus === 'open' ? 'close' : 'open';
-				this.cale.resetFoldStatus(this.FoldStatus);
-				// 重置当前weeks
-				this.setDate(this.nowDate.fullDate);
-				this.$nextTick(() => {
-					// 重置左右切换的上下weeks
-					if (this.slideSwitchMode !== 'none') {
-						let nextDate = this.cale.getDate(this.nowDate.fullDate, +1, this.getDateType);
-						let nextWeeks = this.cale._getWeek(nextDate.fullDate, false);
-						let nextWeeksMonth = nextDate.month;
+      // 设置日期
+      this.setDate(this.cale.date.fullDate);
+      // swiperCurrent改变需要改动的weeks
+      this.swiperCurrentChangeWeeks();
+      // 改变事件
+      this.change();
+    },
+    /**
+     * 上个月
+     */
+    pre() {
+      this.swiperChangeDirection = "pre";
+      this.updateWeeks();
+    },
+    /**
+     * 下个月
+     */
+    next() {
+      this.swiperChangeDirection = "next";
+      this.updateWeeks();
+    },
+    /**
+     * 设置日期
+     * @param {Object} date
+     */
+    setDate(date) {
+      this.cale.setDate(date);
+      this.nowDate = this.cale.getInfo(date);
+      this.assignmentWeeks();
+    },
+    /**
+     * 用来将cale.weeks 赋值到 weeks
+     */
+    assignmentWeeks() {
+      let weekName = "";
+      let weekMonthName = "";
+      switch (this.swiperCurrent) {
+        case 0:
+          weekName = "preWeeks";
+          weekMonthName = "preWeeksMonth";
+          break;
+        case 1:
+          weekName = "weeks";
+          weekMonthName = "weeksMonth";
+          break;
+        case 2:
+          weekName = "nextWeeks";
+          weekMonthName = "nextWeeksMonth";
+          break;
+      }
+      this[weekName] = this.cale.weeks;
+      this[weekMonthName] = this.cale.selectDate.month;
+    },
+    /**
+     * 滑动切换日期
+     */
+    swiperChange(e) {
+      // 非用户滑动不执行
+      if (e.detail.source !== "touch") return;
+      let curr = e.detail.current;
+      if (curr - this.swiperCurrent == 1 || curr - this.swiperCurrent == -2) {
+        this.swiperChangeDirection = "next";
+      } else {
+        this.swiperChangeDirection = "pre";
+      }
+      this.swiperCurrent = curr;
+      this.updateWeeks();
+    },
+    /**
+     * 更新weeks
+     * @param {Boolean} isChange 是否使当前的weeks发生变化
+     */
+    updateWeeks(isChange = true, isInt = false) {
+      let newFullDate = "";
+      // 是否变动日期信息
+      if (isChange) {
+        // 如果目前处于打开状态也就是月日历时，将记录月份改为一号(这样可以在用户切换到任意月份时并折叠自动选中1号)
+        let fullDate =
+          this.FoldStatus === "close"
+            ? this.nowDate.fullDate
+            : `${this.nowDate.year}-${this.nowDate.month}-${1}`;
+        newFullDate = this.cale.getDate(
+          fullDate,
+          this.swiperChangeDirection === "next" ? +1 : -1,
+          this.getDateType
+        ).fullDate;
+      } else {
+        newFullDate = this.cale.getDate(this.nowDate.fullDate, 0, this.getDateType)
+          .fullDate;
+      }
+      this.setDate(newFullDate);
+      this.swiperCurrentChangeWeeks();
+      if (!isInt) {
+        this.monthSwitch();
+      }
+    },
+    /**
+     * swiperCurrent改变需要改动的weeks
+     */
+    swiperCurrentChangeWeeks() {
+      if (this.slideSwitchMode === "none") return;
+      // 防止一次渲染过多数据，造成对nvue的卡顿
+      this.$nextTick(() => {
+        let nextDate = this.cale.getDate(this.nowDate.fullDate, +1, this.getDateType);
+        let nextWeeks = this.cale._getWeek(nextDate.fullDate, false);
+        let nextWeeksMonth = nextDate.month;
+        let preDate = this.cale.getDate(this.nowDate.fullDate, -1, this.getDateType);
+        let preWeeks = this.cale._getWeek(preDate.fullDate, false);
+        let preWeeksMonth = preDate.month;
 
-						let preDate = this.cale.getDate(this.nowDate.fullDate, -1, this.getDateType);
-						let preWeeks = this.cale._getWeek(preDate.fullDate, false);
-						let preWeeksMonth = preDate.month;
+        if (this.swiperCurrent == 0) {
+          this.weeks = nextWeeks;
+          this.weeksMonth = nextWeeksMonth;
+          this.nextWeeks = preWeeks;
+          this.nextWeeksMonth = preWeeksMonth;
+        } else if (this.swiperCurrent == 1) {
+          this.nextWeeks = nextWeeks;
+          this.nextWeeksMonth = nextWeeksMonth;
+          this.preWeeks = preWeeks;
+          this.preWeeksMonth = preWeeksMonth;
+        } else {
+          this.preWeeks = nextWeeks;
+          this.preWeeksMonth = nextWeeksMonth;
+          this.weeks = preWeeks;
+          this.weeksMonth = preWeeksMonth;
+        }
+      });
+    },
 
-						if (this.swiperChangeDirection == 'next') {
-							if (this.swiperCurrent == 0) {
-								this.weeks = nextWeeks;
-								this.weeksMonth = nextWeeksMonth;
-								this.nextWeeks = preWeeks;
-								this.nextWeeksMonth = preWeeksMonth;
-							} else if (this.swiperCurrent == 1) {
-								this.nextWeeks = nextWeeks;
-								this.nextWeeksMonth = nextWeeksMonth;
-								this.preWeeks = preWeeks;
-								this.preWeeksMonth = preWeeksMonth;
-							} else {
-								this.preWeeks = nextWeeks;
-								this.preWeeksMonth = nextWeeksMonth;
-								this.weeks = preWeeks;
-								this.weeksMonth = preWeeksMonth;
-							}
-						} else {
-							if (this.swiperCurrent == 0) {
-								this.nextWeeks = preWeeks;
-								this.nextWeeksMonth = preWeeksMonth;
-								this.weeks = nextWeeks;
-								this.weeksMonth = nextWeeksMonth;
-							} else if (this.swiperCurrent == 1) {
-								this.preWeeks = preWeeks;
-								this.preWeeksMonth = preWeeksMonth;
-								this.nextWeeks = nextWeeks;
-								this.nextWeeksMonth = nextWeeksMonth;
-							} else {
-								this.weeks = preWeeks;
-								this.weeksMonth = preWeeksMonth;
-								this.preWeeks = nextWeeks;
-								this.preWeeksMonth = nextWeeksMonth;
-							}
-						}
-					}
-				})
-				// fold切换事件
-				this.$emit('foldSwitch', {
-					type: this.type,
-					status: this.FoldStatus
-				})
-			},
-			// 初始化折叠
-			initFold() {
-				if (this.type === 'month' || this.type === 'week') {
-					this.Fold = this.fold === null ? this.type !== 'month' : this.fold;
-					this.FoldStatus = this.type !== 'month' ? 'close' : 'open';
-				}
-			}
-		}
-	}
+    // 点击折叠
+    FoldClick() {
+      this.FoldStatus = this.FoldStatus === "open" ? "close" : "open";
+      this.cale.resetFoldStatus(this.FoldStatus);
+      // 重置当前weeks
+      this.setDate(this.nowDate.fullDate);
+      this.$nextTick(() => {
+        // 重置左右切换的上下weeks
+        if (this.slideSwitchMode !== "none") {
+          let nextDate = this.cale.getDate(this.nowDate.fullDate, +1, this.getDateType);
+          let nextWeeks = this.cale._getWeek(nextDate.fullDate, false);
+          let nextWeeksMonth = nextDate.month;
+
+          let preDate = this.cale.getDate(this.nowDate.fullDate, -1, this.getDateType);
+          let preWeeks = this.cale._getWeek(preDate.fullDate, false);
+          let preWeeksMonth = preDate.month;
+
+          if (this.swiperChangeDirection == "next") {
+            if (this.swiperCurrent == 0) {
+              this.weeks = nextWeeks;
+              this.weeksMonth = nextWeeksMonth;
+              this.nextWeeks = preWeeks;
+              this.nextWeeksMonth = preWeeksMonth;
+            } else if (this.swiperCurrent == 1) {
+              this.nextWeeks = nextWeeks;
+              this.nextWeeksMonth = nextWeeksMonth;
+              this.preWeeks = preWeeks;
+              this.preWeeksMonth = preWeeksMonth;
+            } else {
+              this.preWeeks = nextWeeks;
+              this.preWeeksMonth = nextWeeksMonth;
+              this.weeks = preWeeks;
+              this.weeksMonth = preWeeksMonth;
+            }
+          } else {
+            if (this.swiperCurrent == 0) {
+              this.nextWeeks = preWeeks;
+              this.nextWeeksMonth = preWeeksMonth;
+              this.weeks = nextWeeks;
+              this.weeksMonth = nextWeeksMonth;
+            } else if (this.swiperCurrent == 1) {
+              this.preWeeks = preWeeks;
+              this.preWeeksMonth = preWeeksMonth;
+              this.nextWeeks = nextWeeks;
+              this.nextWeeksMonth = nextWeeksMonth;
+            } else {
+              this.weeks = preWeeks;
+              this.weeksMonth = preWeeksMonth;
+              this.preWeeks = nextWeeks;
+              this.preWeeksMonth = nextWeeksMonth;
+            }
+          }
+        }
+      });
+      // fold切换事件
+      this.$emit("foldSwitch", {
+        type: this.type,
+        status: this.FoldStatus,
+      });
+    },
+    // 初始化折叠
+    initFold() {
+      if (this.type === "month" || this.type === "week") {
+        this.Fold = this.fold === null ? this.type !== "month" : this.fold;
+        this.FoldStatus = this.type !== "month" ? "close" : "open";
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	$wu-bg-color-mask: rgba($color: #000000, $alpha: 0.4);
-	$wu-border-color: #EDEDED;
-	$wu-text-color: #333;
-	$wu-bg-color-hover: #f1f1f1;
-	$wu-font-size-base: 32rpx;
-	$wu-text-color-placeholder: #808080;
-	$wu-color-subtitle: #555555;
-	$wu-text-color-grey: #999;
+$wu-bg-color-mask: rgba(
+  $color: #000000,
+  $alpha: 0.4,
+);
+$wu-border-color: #ededed;
+$wu-text-color: #333;
+$wu-bg-color-hover: #f1f1f1;
+$wu-font-size-base: 32rpx;
+$wu-text-color-placeholder: #808080;
+$wu-color-subtitle: #555555;
+$wu-text-color-grey: #999;
 
-	.wu-calendar {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-	}
+.wu-calendar {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: column;
+}
 
-	.wu-calendar__mask {
-		position: fixed;
-		bottom: 0;
-		top: 0;
-		left: 0;
-		right: 0;
-		background-color: $wu-bg-color-mask;
-		transition-property: opacity;
-		transition-duration: 0.3s;
-		opacity: 0;
-		/* #ifndef APP-NVUE */
-		z-index: 99;
-		/* #endif */
-	}
+.wu-calendar__mask {
+  position: fixed;
+  bottom: 0;
+  top: 0;
+  left: 0;
+  right: 0;
+  background-color: $wu-bg-color-mask;
+  transition-property: opacity;
+  transition-duration: 0.3s;
+  opacity: 0;
+  /* #ifndef APP-NVUE */
+  z-index: 99;
+  /* #endif */
+}
 
-	.wu-calendar--mask-show {
-		opacity: 1
-	}
+.wu-calendar--mask-show {
+  opacity: 1;
+}
 
-	.wu-calendar--fixed {
-		position: fixed;
-		/* #ifdef APP-NVUE */
-		bottom: 0;
-		/* #endif */
-		left: 0;
-		right: 0;
-		transition-property: transform;
-		transition-duration: 0.3s;
-		transform: translateY(1080rpx);
-		/* #ifndef APP-NVUE */
-		bottom: calc(var(--window-bottom));
-		z-index: 99;
-		/* #endif */
-	}
+.wu-calendar--fixed {
+  position: fixed;
+  /* #ifdef APP-NVUE */
+  bottom: 0;
+  /* #endif */
+  left: 0;
+  right: 0;
+  transition-property: transform;
+  transition-duration: 0.3s;
+  transform: translateY(1080rpx);
+  /* #ifndef APP-NVUE */
+  bottom: calc(var(--window-bottom));
+  z-index: 99;
+  /* #endif */
+}
 
-	.wu-calendar--ani-show {
-		transform: translateY(0);
-	}
+.wu-calendar--ani-show {
+  transform: translateY(0);
+}
 
-	.wu-calendar__content {
-		background-color: #fff;
-	}
+.wu-calendar__content {
+  background-color: #fff;
+}
 
-	.wu-calendar__header {
-		position: relative;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		border-bottom-color: $wu-border-color;
-		border-bottom-style: solid;
-		border-bottom-width: 2rpx;
-	}
+.wu-calendar__header {
+  position: relative;
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  border-bottom-color: $wu-border-color;
+  border-bottom-style: solid;
+  border-bottom-width: 2rpx;
+}
 
-	.wu-calendar--fixed-top {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		height: 90rpx;
-		flex-direction: row;
-		justify-content: space-between;
-		border-top-color: $wu-border-color;
-		border-top-style: solid;
-		border-top-width: 2rpx;
-	}
+.wu-calendar--fixed-top {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  height: 90rpx;
+  flex-direction: row;
+  justify-content: space-between;
+  border-top-color: $wu-border-color;
+  border-top-style: solid;
+  border-top-width: 2rpx;
+}
 
-	.wu-calendar--fixed-width {
-		width: 100rpx;
-	}
+.wu-calendar--fixed-width {
+  width: 100rpx;
+}
 
-	.wu-calendar__backtoday {
-		position: absolute;
-		right: 0;
-		top: 25rpx;
-		padding: 0 10rpx;
-		padding-left: 20rpx;
-		height: 50rpx;
-		line-height: 50rpx;
-		font-size: 24rpx;
-		border-top-left-radius: 50rpx;
-		border-bottom-left-radius: 50rpx;
-		color: $wu-text-color;
-		background-color: $wu-bg-color-hover;
+.wu-calendar__backtoday {
+  position: absolute;
+  right: 0;
+  top: 25rpx;
+  padding: 0 10rpx;
+  padding-left: 20rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  font-size: 24rpx;
+  border-top-left-radius: 50rpx;
+  border-bottom-left-radius: 50rpx;
+  color: $wu-text-color;
+  background-color: $wu-bg-color-hover;
 
-		&.vertical {
-			top: 38rpx;
-		}
-	}
+  &.vertical {
+    top: 38rpx;
+  }
+}
 
-	.wu-calendar__header-text {
-		text-align: center;
-		width: 200rpx;
-		font-size: $wu-font-size-base;
-		color: $wu-text-color;
-	}
+.wu-calendar__header-text {
+  text-align: center;
+  width: 200rpx;
+  font-size: $wu-font-size-base;
+  color: $wu-text-color;
+}
 
-	.wu-calendar__header-btn-box {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
+.wu-calendar__header-btn-box {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
 
-		.wu-calendar__header-btn {
-			width: 20rpx;
-			height: 20rpx;
-		}
+  .wu-calendar__header-btn {
+    width: 20rpx;
+    height: 20rpx;
+  }
 
-		&.horizontal {
-			width: 100rpx;
-			height: 100rpx;
-		}
+  &.horizontal {
+    width: 100rpx;
+    height: 100rpx;
+  }
 
-		&.vertical {
-			flex-direction: column;
-			padding: 20rpx 0;
-		}
-	}
+  &.vertical {
+    flex-direction: column;
+    padding: 20rpx 0;
+  }
+}
 
-	.wu-calendar__header-btn {
-		border-left-color: $wu-text-color-placeholder;
-		border-left-style: solid;
-		border-left-width: 4rpx;
-		border-top-color: $wu-color-subtitle;
-		border-top-style: solid;
-		border-top-width: 4rpx;
-	}
+.wu-calendar__header-btn {
+  border-left-color: $wu-text-color-placeholder;
+  border-left-style: solid;
+  border-left-width: 4rpx;
+  border-top-color: $wu-color-subtitle;
+  border-top-style: solid;
+  border-top-width: 4rpx;
+}
 
-	.wu-calendar--left {
-		transform: rotate(-45deg);
-	}
+.wu-calendar--left {
+  transform: rotate(-45deg);
+}
 
-	.wu-calendar--right {
-		transform: rotate(135deg);
-	}
+.wu-calendar--right {
+  transform: rotate(135deg);
+}
 
-	.wu-calendar--top {
-		transform: rotate(45deg);
-	}
+.wu-calendar--top {
+  transform: rotate(45deg);
+}
 
-	.wu-calendar--bottom {
-		transform: rotate(225deg);
-	}
+.wu-calendar--bottom {
+  transform: rotate(225deg);
+}
 
-	.wu-calendar__weeks {
-		position: relative;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		padding: 0 8rpx;
-	}
+.wu-calendar__weeks {
+  position: relative;
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  padding: 0 8rpx;
+}
 
-	.wu-calendar__weeks-day {
-		flex: 1;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		height: 90rpx;
-		border-bottom-color: #F5F5F5;
-		border-bottom-style: solid;
-		border-bottom-width: 2rpx;
-	}
+.wu-calendar__weeks-day {
+  flex: 1;
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  height: 90rpx;
+  border-bottom-color: #f5f5f5;
+  border-bottom-style: solid;
+  border-bottom-width: 2rpx;
+}
 
-	.wu-calendar__weeks-day-text {
-		font-size: 28rpx;
-	}
+.wu-calendar__weeks-day-text {
+  font-size: 28rpx;
+}
 
-	.wu-calendar__box {
-		position: relative;
-	}
+.wu-calendar__box {
+  position: relative;
+}
 
-	.wu-calendar__weeks_container {
-		transition: height 0.2s linear;
-	}
+.wu-calendar__weeks_container {
+  transition: height 0.2s linear;
+}
 
-	.wu-calendar__fold {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		justify-content: center;
-	}
-</style>
\ No newline at end of file
+.wu-calendar__fold {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  justify-content: center;
+}
+</style>