优化页面 增加渠道包判断

App.vue

@@ -43,9 +43,52 @@ export default {
     avator: "",
     mobile: 0,
     user_id: 0,
+    needStatusCheck: true,
+    statusCheckTimer: null,
   },
   beforeDestroy() {},
   onLaunch: function (options) {
+    // 添加状态检查定时器
+    const checkStatus = () => {
+      if (!this.globalData.needStatusCheck) return;
+      
+      uni.request({
+        url: this.$apiHost + "/Index/getStatus",
+        data: {
+          uuid: this.globalData.uuid,
+          skey: this.globalData.skey,
+        },
+        header: {
+          "content-type": "application/json",
+          sign: this.globalData.headerSign,
+        },
+        success: (res) => {
+          console.log("状态检查结果", res.data);
+          if (res.data && res.data.success) {
+            // 请求成功，停止检查
+            this.globalData.needStatusCheck = false;
+            // 清除定时器
+            if (this.globalData.statusCheckTimer) {
+              clearInterval(this.globalData.statusCheckTimer);
+              this.globalData.statusCheckTimer = null;
+            }
+          }
+        },
+        fail: (e) => {
+          console.log("状态检查失败", e);
+        }
+      });
+    };
+
+    // 每10秒执行一次状态检查，并保存定时器引用
+    this.globalData.statusCheckTimer = setInterval(checkStatus, 10000);
+    
+
+
+
+
+
+    
     const intervalTime = 1000 * 30 * 60; // 30分钟的时间戳（毫秒）
     var timeoutId;
     var judgingTimer = async () => {
@@ -327,7 +370,7 @@ uni-modal {
   background-color: #1f1f1f;
 }
 .blick-btn-animation{
-  
+  position: relative;
   &:active {
 			transform: scale(0.98);
 			background-color: #333333;

common/channel.js

@@ -0,0 +1,114 @@
+/**
+ * 应用商店渠道检测工具
+ */
+
+// 应用商店渠道配置
+const STORE_CONFIG = {
+  vivo: {
+    channel: 'vivo',
+    name: 'VIVO',
+    package: 'com.vivo.appstore'
+  },
+  oppo: {
+    channel: 'oppo',
+    name: 'OPPO',
+    package: 'com.oppo.market'
+  },
+  huawei: {
+    channel: 'huawei',
+    name: '华为应用商店',
+    package: 'com.huawei.appmarket'
+  },
+  honor: {
+    channel: 'honor',
+    name: '荣耀',
+    package: 'com.hihonor.appmarket'
+  },
+  yyb: {
+    channel: 'yyb',
+    name: '应用宝',
+    package: 'com.tencent.android.qqdownloader'
+  }, 
+  appstore: {
+    channel: 'appstore',
+    name: 'App Store',
+    package: 'com.apple.AppStore'
+  },
+  
+  none: {
+    channel: 'none',
+    name: '无',
+    package: ''
+  },
+  googleplay: {
+    channel: 'googleplay',
+    name: 'Google Play(AAB)',
+    package: 'com.android.vending'
+  },
+  xiaomi: {
+    channel: 'xiaomi',
+    name: '小米应用商店',
+    package: 'com.xiaomi.market'
+  },
+  wandoujia: {
+    channel: 'wandoujia',
+    name: '豌豆荚',
+    package: 'com.wandoujia.phoenix2'
+  },
+  shichangbu: {
+    channel: 'shichangbu',
+    name: '市场部',
+    package: ''
+  },
+  _360: {
+    channel: '360',
+    name: '360应用市场',
+    package: 'com.qihoo.appstore'
+  },
+  default: {
+    channel: 'default',
+    name: '默认渠道',
+    package: ''
+  }
+};
+
+// 获取当前应用商店信息
+export function getCurrentStore() {
+  let store = STORE_CONFIG.default;
+  
+  // #ifdef APP-PLUS
+  const systemInfo = uni.getSystemInfoSync();
+  if (systemInfo.platform === 'ios') {
+    store = STORE_CONFIG.appstore;
+  } else {
+    const channel = plus.runtime.channel;
+    if (channel && STORE_CONFIG[channel]) {
+      store = STORE_CONFIG[channel];
+    }
+  }
+  // #endif
+  
+  return store;
+} 
+// 获取当前应用商店名称
+export function getCurrentStoreName() {
+  return getCurrentStore().name;
+}
+
+// 判断是否为特定应用商店
+export function isStore(targetStore) {
+  return getCurrentStore().channel === targetStore;
+}
+
+// 判断是否为应用商店渠道
+export function isAppStore() {
+  const currentStore = getCurrentStore();
+  return currentStore.channel !== 'default';
+}
+
+export default {
+  getCurrentStore,
+  getCurrentStoreName,
+  isStore,
+  isAppStore
+}; 

common/channelFlag.js

@@ -0,0 +1,22 @@
+// 通过条件编译区分渠道商店
+
+let CHANNEL_FLAG = 'unknown';
+
+// #ifdef APP-PLUS
+const systemInfo = uni.getSystemInfoSync();
+if (systemInfo.platform === 'ios') {
+  CHANNEL_FLAG = 'appstore';
+} else {
+  CHANNEL_FLAG = plus.runtime.channel || 'default';
+}
+// #endif
+
+// #ifdef H5
+CHANNEL_FLAG = 'h5';
+// #endif
+
+// #ifdef MP-WEIXIN
+CHANNEL_FLAG = 'weixin';
+// #endif
+
+export default CHANNEL_FLAG; 

common/util.js

@@ -166,6 +166,7 @@ uni.showModal = function(options) {
 	let optionsObj = Object.assign({
 		title: "提示",
 		content: "自定义内容",
+		paratext: "", //副文本内容
 		align: "center", // 对齐方式 left/center/right
 		cancelText: "取消", // 取消按钮的文字
 		cancelColor: "#8F8F8F", // 取消按钮颜色
@@ -185,6 +186,8 @@ uni.showModal = function(options) {
 	const viewContentWidth = parseInt(popupViewWidth - (viewContentPadding * 2));
 	// 描述的列表
 	const descriptionList = drawtext(optionsObj.content, viewContentWidth);
+	// 副文本列表
+	const paraTextList = optionsObj.paratext ? drawtext(optionsObj.paratext, viewContentWidth) : [];
 	// 弹窗高度
 	let popupViewHeight = 168;
 	// 弹窗遮罩层
@@ -241,6 +244,42 @@ uni.showModal = function(options) {
 			popupViewHeight += 10;
 		}
 	});
+
+	// 添加副文本
+	if (paraTextList.length > 0) {
+		contentTop += 25; // 增加与正文的间距
+		popupViewHeight += 25;
+		paraTextList.forEach((item, index) => {
+			if (index > 0) {
+				popupViewHeight += textHeight - 2;
+				contentTop += textHeight - 2;
+			}
+			popupViewContentList.push({
+				tag: 'font',
+				id: 'paratext' + index + 1,
+				text: item.content,
+				textStyles: {
+					size: '14px',
+					color: "#999",
+					lineSpacing: "50%",
+					align: optionsObj.align
+				},
+				position: {
+					top: contentTop + "px",
+					left: viewContentPadding + "px",
+					width: viewContentWidth + "px",
+					height: (textHeight - 2) + "px",
+				}
+			});
+			if (item.type == "break") {
+				contentTop += 10;
+				popupViewHeight += 10;
+			}
+		});
+		// 在副文本后增加额外间距
+		contentTop += 10;
+		popupViewHeight += 10;
+	}
 	popupViewContentList.push({
 		tag: 'rect',
 		id: 'lineTop',

components/WorkItem/WorkItem.vue

@@ -52,6 +52,14 @@ export default {
       position: relative;
       left: 0;
       top: 0;
+      transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+      box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+      border-radius: 16rpx;
+      &:active {
+        transform: scale(0.98);
+        box-shadow: 0 1rpx 4rpx rgba(0, 0, 0, 0.05);
+      }
+
       .secrecy {
         position: absolute;
         left: 14rpx;
@@ -64,8 +72,9 @@ export default {
         color: #fff;
         display: flex;
         align-items: center;
-		justify-content: center;
-		padding: 3rpx 12rpx;
+        justify-content: center;
+        padding: 3rpx 12rpx;
+        z-index: 1;
 
         image {
           width: 24rpx;
@@ -79,8 +88,15 @@ export default {
         box-sizing: border-box;
         background-color: #f8f9fa;
         margin-bottom: 12rpx;
-		border-radius: 16rpx;
+        border-radius: 16rpx;
+        transition: all 0.3s ease;
+
+        &:active {
+          opacity: 0.9;
+        }
+
         .icon {
+          transition: all 0.3s ease;
         }
         &.icon-box2 {
           > view {
@@ -102,6 +118,7 @@ export default {
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
+        transition: all 0.3s ease;
       }
     }
 

components/card/card.vue

@@ -212,6 +212,13 @@ export default {
   position: relative;
   border-radius: 16rpx;
   overflow: hidden;
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+  
+  &:active {
+    transform: scale(0.98);
+    box-shadow: 0 1rpx 4rpx rgba(0, 0, 0, 0.05);
+  }
 
   // #ifndef APP-NVUE
   .waterfall-item__image {
@@ -220,10 +227,16 @@ export default {
     height: auto;
     box-sizing: border-box;
     padding: 28rpx 20rpx;
+    transition: all 0.3s ease;
+
+    &:active {
+      opacity: 0.9;
+    }
 
     image {
       width: 100%;
       height: 100%;
+      transition: all 0.3s ease;
     }
   }
 

components/guide/GuideManager.vue

@@ -438,8 +438,8 @@ export default {
                     isMirror: true
                   },
                   {
-                    characterImage: '/static/island/building/1.png',
-                    characterName: '我',
+                    characterImage: _this.picture,
+                    characterName: _this.name,
                     text: '什么！移民费用388888铃钱，这也太贵了吧...',
                     position: 'right',
                     isMirror: false
@@ -491,8 +491,8 @@ export default {
                     isMirror: true
                   },
                   {
-                    characterImage: '/static/island/building/1.png',
-                    characterName: '我',
+                    characterImage: _this.picture,
+                    characterName: _this.name,
                     text: 'ah...原来如此，你刚才说的花田有没有被拦住？',
                     position: 'right',
                     isMirror: false

pages/AboutUs/xieyi.vue

@@ -41,6 +41,12 @@
 						'path': 'https://e.zhichao.art/web/yhxy.php',
 						'icon': '../../static/me/profile.png'
 					},
+					{
+						'name': '创作社区公约说明',
+						'desc': '',
+						'path': 'https://e.zhichao.art/web/sqgy.php',
+						'icon': '../../static/me/profile.png'
+					},
 					// {
 					// 	'name': '应用权限隐私清单',
 					// 	'desc': '',

pages/index/articleDetail copy.vue

@@ -20,7 +20,7 @@
 				</view>
 			</view>
 			<view class="navbar-right">
-				<text class="followTheAuthor followTheAuthor1" v-if="author.is_attention == 0"
+				<text class="followTheAuthor followTheAuthor1 " v-if="author.is_attention == 0"
 					@click="followTheAuthor(1)">+关注</text>
 				<text class="followTheAuthor followTheAuthor0" v-if="author.is_attention == 1"
 					@click="followTheAuthor(0)">已关注</text>

pages/index/articleDetail.scss

@@ -270,6 +270,14 @@ page {
       box-sizing: border-box;
       display: flex;
       flex-direction: flex-start;
+      transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+      box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+      
+      &:active {
+        transform: scale(0.98);
+        box-shadow: 0 1rpx 4rpx rgba(0, 0, 0, 0.05);
+      }
+
       image {
         width: auto;
         height: 100rpx;
@@ -277,17 +285,21 @@ page {
         flex-grow: 0;
         border-radius: 12rpx;
         margin-right: 12rpx;
+        transition: all 0.3s ease;
       }
       .content {
         height: 100%;
         display: flex;
         flex-direction: column;
         justify-content: space-between;
+        transition: all 0.3s ease;
+        
         .tit {
           font-family: "PingFang SC-Bold";
           font-family: PingFang SC, PingFang SC;
           font-weight: 400;
           font-size: 24rpx;
+          transition: all 0.3s ease;
         }
         .tex {
           font-family: "PingFang SC-Medium";
@@ -295,6 +307,7 @@ page {
           font-size: 20rpx;
           color: #999999;
           line-height: 28rpx;
+          transition: all 0.3s ease;
         }
       }
     }

pages/index/index.scss

@@ -1,5 +1,3 @@
- 
-
 	@font-face {
 	    font-family: 'CustomFont';
 	    src: url('@/static/fonts/alibaba.otf') format('opentype');
@@ -26,23 +24,35 @@
 			position: relative;
 			left: 0;
 			top: 0;
+			transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+			box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+			
+			&:active {
+				transform: scale(0.95);
+				box-shadow: 0 1rpx 4rpx rgba(0, 0, 0, 0.05);
+			}
+
 			.indicator-triangle {
-			    position: absolute;
-			    bottom: -10rpx;
-			    left: 50%;
-			    transform: translateX(-50%);
-			    width: 0;
-			    height: 0;
-			    border-left: 10rpx solid transparent;
-			    border-right: 10rpx solid transparent;
-			    border-top: 10rpx solid #ACF934;
+				position: absolute;
+				bottom: -10rpx;
+				left: 50%;
+				transform: translateX(-50%);
+				width: 0;
+				height: 0;
+				border-left: 10rpx solid transparent;
+				border-right: 10rpx solid transparent;
+				border-top: 10rpx solid #ACF934;
 				display: none;
+				transition: all 0.3s ease;
 			}
 			&.active {  
 				background: #ACF934;
 				font-family: "CustomFont" !important;
+				box-shadow: 0 4rpx 12rpx rgba(172, 249, 52, 0.3);
+				
 				.indicator-triangle {
-					display: block; 
+					display: block;
+					transform: translateX(-50%) scale(1.2);
 				}
 			}
 		}
@@ -76,18 +86,30 @@
 			height: 100%;
 			display: flex;
 			flex-direction: column;
-			justify-content: space-between;
-					}
+			justify-content: flex-start;
+			min-height: 220rpx;
+		}
 
 		.topic-item {
-			 
 			display: flex;
 			align-items: center;
-			padding: 5rpx 0;
+			padding: 10rpx 0;
 			justify-content: space-between;
-			flex: 1;
+			width: 100%;
+			min-height: 50rpx;
+			margin-bottom: 10rpx;
+			transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1); 
+			
+			&:active {
+				transform: scale(0.98); 
+			}
+			
+			&:last-child {
+				margin-bottom: 0;
+			}
 			.hot-topics-left{
 				display: flex;
+				transition: all 0.3s ease;
 				.topic-index{
 					width: 30rpx;
 					height: 30rpx;
@@ -100,6 +122,7 @@
 					border-radius: 5rpx;
 					margin-right: 18rpx; 
 					background: #CECECE;
+					transition: all 0.3s ease;
 					&.topic-index-img{
 						background: transparent;
 						color: transparent;
@@ -116,18 +139,21 @@
 					overflow: hidden;
 					text-overflow: ellipsis;
 					white-space: nowrap;
+					transition: all 0.3s ease;
 				}
 			}
-				.topic-participants{
-					font-size: 20rpx;
-					color: #999;
-				}
-		.hot-tag {
-			 width: 46rpx;
-			 height: 22rpx;
-			margin: auto;
-			margin-left: 10rpx;
-		}
+			.topic-participants{
+				font-size: 20rpx;
+				color: #999;
+				transition: all 0.3s ease;
+			}
+			.hot-tag {
+				width: 46rpx;
+				height: 22rpx;
+				margin: auto;
+				margin-left: 10rpx;
+				transition: all 0.3s ease;
+			}
 		}
 
 		.indicator-dots {
@@ -139,11 +165,11 @@
 				width: 12rpx;
 				height: 12rpx;
 				border-radius: 50%;
-				background: #808080;
+				background: #ffffff;
 				margin: 0 6rpx;
 
 				&.active {
-					background: #ffffff;
+					background: #808080;
 				}
 			}
 		}
@@ -303,6 +329,11 @@
 		::v-deep.uv-swiper{
 			border-radius: 20rpx !important;
 			overflow: hidden;
+			transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1); 
+			
+			&:active {
+				transform: scale(0.98); 
+			}
 		}
 		.classModel{
 			display: flex;

pages/index/index.vue

@@ -178,8 +178,8 @@
 									</swiper-item>
 								</swiper>
 								<view class="indicator-dots">
-									<view v-for="i in 2" :key="i"
-										:class="['dot', currentTopicPage === i - 1 ? 'active' : '']">
+									<view v-for="(page, index) in topicPages" :key="index"
+										:class="['dot', currentTopicPage === index ? 'active' : '']">
 									</view>
 								</view>
 							</view>

pages/index/workDetail.vue

@@ -85,7 +85,7 @@
       </view>
     </view>
 
-    <view class="goCreate" @click="goCreate()">去创作</view>
+    <view class="goCreate  blick-btn-animation" @click="goCreate()">去创作</view>
     <DialogBox ref="customConfirm"></DialogBox>
 
     <!-- 文章头图区域 -->
@@ -715,15 +715,15 @@ export default {
     },
     async checkCameraPermission() {
       const hasPermission = await permission.request(permission.PermissionType.CAMERA, {
-        title: '相机权限申请',
-        describe: '需要使用相机拍摄照片，用于帮助您完成图片制作、图片拍摄、图片上传等功能'
+       title: '“萌创星球”想访问你的相机',
+				describe: '萌创星球想访问您的摄像头，便于拍摄获取图片来替换原有作品封面图'
       });
       return hasPermission;
     },
     async checkPhotoLibraryPermission() {
       const hasPermission = await permission.request(permission.PermissionType.PHOTO_LIBRARY, {
-        title: '相册权限申请',
-        describe: '需要访问相册选择照片，用于帮助您完成图片制作、图片拍摄、图片上传等功能'
+       	title: '“萌创星球”想访问你的照片图库',
+				describe: '萌创星球想访问您本地照片图库，便于获取图片来替换原有作品封面图'
       });
       return hasPermission;
     },

pages/login/login.vue

@@ -22,7 +22,7 @@
 				</view>
 			</block>
 			<block v-if="type == 'pass' || type == 'mobile'">
-				<template v-if="false">
+				<template v-if="true">
 					<view class="name">手机号码：</view>
 					<view class="item">
 						<input type="number" class="input" v-model="mobile" placeholder="请输入手机号码" maxlength="11" />
@@ -114,7 +114,7 @@ export default {
 			lat: '',
 			lng: '',
 			univerifyStyle: {
-				"fullScreen": true, // 是否全屏显示，默认值： false
+				"fullScreen": false, // 是否全屏显示，默认值： false
 				"backgroundColor": "#ffffff",  // 授权页面背景颜色，默认值：#ffffff
 				"backgroundImage": "", // 全屏显示的背景图片，默认值："" （仅支持本地图片，只有全屏显示时支持）
 				"icon": {
@@ -123,7 +123,7 @@ export default {
 					"height": "60px"   //图标高度 默认值：60px
 				},
 				"closeIcon": {
-					"path": "/static/icon/whiteBackground.png", // 自定义显示在授权框中的取消图片，仅支持本地图片
+					// "path": "/static/icon/whiteBackground.png", // 自定义显示在授权框中的取消图片，仅支持本地图片
 					"width": "60px",  //图标宽度 默认值：60px (HBuilderX 4.0+ 仅iOS支持)
 					"height": "60px"   //图标高度 默认值：60px (HBuilderX 4.0+ 仅iOS支持)
 				},
@@ -375,6 +375,10 @@ export default {
 				success: (res) => {
 					console.log("----", res.data);
 					if (res.data.success == "yes") {
+						uni.showToast({
+							title: "登录成功",
+							icon: "none",
+						});
 						console.log("res.data", res.data);
 						if (res.data.uuid.length > 5) {
 							uni.setStorageSync("app_uuid", res.data.uuid);

pages/make/fabuArticle.vue

@@ -437,8 +437,8 @@ export default {
 				
 				if (sourceType === 'camera') {
 					hasPermission = await permission.request(permission.PermissionType.CAMERA, {
-						title: '相机权限申请',
-						describe: '需要使用相机拍摄照片，用于帮助您完成图片制作、图片拍摄、图片上传等功能'
+						title: '“萌创星球”想访问你的相机',
+						describe: '萌创星球想访问您的摄像头，便于拍摄获取图片来与其他用户进行交流'
 					});
 					
 					if (!hasPermission) {
@@ -450,8 +450,8 @@ export default {
 					}
 				} else {
 					hasPermission = await permission.request(permission.PermissionType.PHOTO_LIBRARY, {
-						title: '相册权限申请',
-						describe: '需要访问相册选择照片，用于帮助您完成图片制作、图片拍摄、图片上传等功能'
+						title: '“萌创星球”想访问你的照片图库',
+						describe: '萌创星球想访问您本地照片图库，便于获取图片来与其他用户进行交流'
 					});
 					
 					if (!hasPermission) {

pages/makedetail/makeDetail.vue

@@ -124,7 +124,7 @@
 			{ text: '删除作品', icon: '../../static/icon/sy_icon_shanchu.png', danger: true }
 		]" @select="handleActionSelect" @cancel="handleActionCancel" />
 		<NicknamePopup title="添加说明" subtitle="" class="openContentPopUpWindow" ref="openContentPopUpWindow">
-			<template slot="content">
+			<template v-slot:content>
 				<uv-textarea v-model="noteContent" maxlength="500" count placeholder="请描述你添加的内容"></uv-textarea>
 				<view class="btn-box" @click="confirmAddNote">确认</view>
 			</template>
@@ -911,15 +911,15 @@ export default {
 		},
 		async checkCameraPermission() {
 			const hasPermission = await permission.request(permission.PermissionType.CAMERA, {
-				title: '相机权限申请',
-				describe: '需要使用相机拍摄照片，用于帮助您完成图片制作、图片拍摄、图片上传等功能'
+				title: '“萌创星球”想访问你的相机',
+				describe: '萌创星球想访问您的摄像头，便于拍摄获取图片来替换原有作品封面图'
 			});
 			return hasPermission;
 		},
 		async checkPhotoLibraryPermission() {
 			const hasPermission = await permission.request(permission.PermissionType.PHOTO_LIBRARY, {
-				title: '相册权限申请',
-				describe: '需要访问相册选择照片，用于帮助您完成图片制作、图片拍摄、图片上传等功能'
+				title: '“萌创星球”想访问你的照片图库',
+				describe: '萌创星球想访问您本地照片图库，便于获取图片来替换原有作品封面图'
 			});
 			return hasPermission;
 		},

pages/makedetail/makeImgDetail.scss

@@ -248,23 +248,45 @@
       border-radius: 12rpx;
       font-size: 28rpx;
       color: #666;
-      transition: all 0.3s;
+      transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
       border: 1rpx solid transparent;
       box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.03);
       border: 2rpx solid #e6e6e6;
       background: #ffffff;
-      &:active {
-        // background: #e3f2fd;
-        // color: #2b85e4;
-        // border-color: #2b85e4;
-        background: #f7ffea;
+      position: relative;
+      overflow: hidden;
+      
+      &::after {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        background: rgba(126, 188, 0, 0.1);
+        transform: scale(0);
+        transition: transform 0.3s cubic-bezier(0.4, 0, 0.2, 1);
         border-radius: 12rpx;
-        border: 2rpx solid #7ebc00;
       }
+      
+      &:active {
+        transform: scale(0.95);
+        &::after {
+          transform: scale(1);
+        }
+      }
+      
       &.active {
         background: #f7ffea;
         border-radius: 12rpx;
         border: 2rpx solid #7ebc00;
+        color: #7ebc00;
+        font-weight: 500;
+        box-shadow: 0 4rpx 12rpx rgba(126, 188, 0, 0.15);
+        
+        &::after {
+          transform: scale(1);
+        }
       }
     }
   }
@@ -279,21 +301,25 @@
       text-align: center;
       flex-direction: column;
       transition: transform 0.3s;
-
+      
       &:active {
         transform: scale(0.97);
       }
 
-      image {
+      .image {
         width: 166rpx;
-        height: 166rpx;
-        border-radius: 16rpx;
+        height: 166rpx; 
         margin-bottom: 12rpx;
         padding: 4rpx;
-        border-radius: 24rpx;
+        border-radius:16rpx;
         // box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.1);
         transition: all 0.3s;
         border: 4rpx solid transparent;
+        image {
+          border-radius: 16rpx;
+          width:100%;
+          height:100%;
+        }
       }
 
       text {
@@ -422,12 +448,9 @@
 
   .style-item {
     &.active {
-      image {
-        // border: 4rpx solid #2b85e4;
-        // box-shadow: 0 0 0 2rpx rgba(43, 133, 228, 0.3);
-
+      .image { 
         border: 4rpx solid #acf934;
-        border-radius: 24rpx;
+        border-radius: 16rpx;
       }
       text {
         // color: #2b85e4;

pages/makedetail/makeImgDetail.vue

@@ -9,12 +9,12 @@
 				<image src="@/static/makedetail/cz_icon_lingganchuangzuo.png" class="edit"></image>
 			</view>
 			<view class="right">
-				<view class="coinM" @click="isRecharge ? goPage('/pages/vip/M_purchase')  : ''">
+				<view class="coinM" @click="isRecharge ? goPage('/pages/vip/M_purchase') : ''">
 					<image src="/static/icon/coin_m.png" mode="aspectFit"></image>
 					<text>{{ myinfo.num_gmm | formatNumberToK }}</text>
 					<view class="money-add" v-if="isRecharge">+</view>
 				</view>
-				<view class="coinC" @click="isRecharge ?goPage('/pages/my/job?type=recharge')  : ''">
+				<view class="coinC" @click="isRecharge ? goPage('/pages/my/job?type=recharge') : ''">
 					<image src="/static/icon/coin_cd.png" mode="aspectFit"></image>
 					<text>{{ myinfo.num_gmd | formatNumberToK }}</text>
 					<view class="money-add" v-if="isRecharge">+</view>
@@ -106,7 +106,9 @@
 					<view class="style-item" v-for="(item, index) in styleList" :key="index"
 						:class="{ 'active': selectedStyle === index }"
 						@click="doYouWantToEdit() ? state() : selectStyle(index)">
-						<image :src="item.image" mode="aspectFill"></image>
+						<view class="image">
+							<image  :src="item.image" mode="aspectFill"></image>
+						</view>
 						<text>{{ item.name }}</text>
 					</view>
 				</scroll-view>
@@ -168,7 +170,7 @@ export default {
 			{
 				name: '可爱甜蜜',
 				image: '../../static/makedetail/style-4.png'
-			} 
+			}
 			],
 			inQueue: false,//是否创作中
 			queuing: false,//是否排队中
@@ -226,7 +228,7 @@ export default {
 			this.getQueueDetail(e.id)
 		}
 	},
-	methods: { 
+	methods: {
 		doYouWantToEdit() {
 			return this.inQueue || this.queuing
 		},

pages/makedetail/makeMusicDetail.scss

@@ -387,6 +387,13 @@
           position: relative;
           left: 0;
           top: 0;
+          transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+          box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+          
+          &:active {
+            transform: scale(0.95);
+            box-shadow: 0 1rpx 4rpx rgba(0, 0, 0, 0.05);
+          }
 
           .indicator-triangle {
             position: absolute;
@@ -399,12 +406,17 @@
             border-right: 10rpx solid transparent;
             border-top: 10rpx solid #acf934;
             display: none;
+            transition: all 0.3s ease;
           }
+          
           &.active {
             background: #acf934;
             font-family: "CustomFont" !important;
+            box-shadow: 0 4rpx 12rpx rgba(172, 249, 52, 0.3);
+            
             .indicator-triangle {
               display: block;
+              transform: translateX(-50%) scale(1.2);
             }
           }
         }
@@ -413,7 +425,8 @@
       .tags {
         display: flex;
         flex-wrap: wrap;
-        gap: 15rpx;
+        gap: 10rpx;
+        margin-top: 20rpx;
 
         .tag {
           padding: 18rpx 35rpx 16rpx 35rpx;
@@ -421,24 +434,45 @@
           border-radius: 12rpx;
           font-size: 28rpx;
           color: #666;
-          transition: all 0.3s;
+          transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
           border: 1rpx solid transparent;
           box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.03);
           border: 2rpx solid #e6e6e6;
           background: #ffffff;
-
-          &:active {
-            // background: #e3f2fd;
-            // color: #2b85e4;
-            // border-color: #2b85e4;
-            background: #f7ffea;
+          position: relative;
+          overflow: hidden;
+          
+          &::after {
+            content: '';
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            background: rgba(126, 188, 0, 0.1);
+            transform: scale(0);
+            transition: transform 0.3s cubic-bezier(0.4, 0, 0.2, 1);
             border-radius: 12rpx;
-            border: 2rpx solid #7ebc00;
           }
+          
+          &:active {
+            transform: scale(0.95);
+            &::after {
+              transform: scale(1);
+            }
+          }
+          
           &.active {
             background: #f7ffea;
             border-radius: 12rpx;
             border: 2rpx solid #7ebc00;
+            color: #7ebc00;
+            font-weight: 500;
+            box-shadow: 0 4rpx 12rpx rgba(126, 188, 0, 0.15);
+            
+            &::after {
+              transform: scale(1);
+            }
           }
         }
       }

pages/my/adolescent.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<PageHeader title="" class="PageHeader">
-			<template slot="center">
+			<template v-slot:center>
 				青少年模式
 			</template>
 		</PageHeader>
@@ -96,7 +96,7 @@ page {
 .PageHeader {
 	background: url("../../static/me/wd_bg_bianjiziliao.png") center top / 100% auto no-repeat,
 		#f2f6f2;
-	background-position-y: var(--status-bar-height);
+	// background-position-y: var(--status-bar-height);
 }
 
 .content-box {

pages/my/editInfo.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<PageHeader title="" class="PageHeader">
-			<template slot="center">
+			<template v-slot:center>
 				基本资料
 			</template>
 		</PageHeader>
@@ -36,12 +36,14 @@
 
 				<view class="info_item">
 					<text class="label">生日</text>
-					<view class="content">
-						<picker mode="date" :value="birthday" :end="endDate" @change="onBirthdayChange">
-							<input type="text" placeholder="选择你的生日" v-model="birthday" disabled="true" />
-						</picker>
+					<view class="content" @click="open()">
+						<!-- <picker mode="date" :value="birthday" :end="endDate" @change="onBirthdayChange"> -->
+						<input type="text" placeholder="选择你的生日" v-model="birthday" disabled="true" />
+						<!-- </picker> -->
 						<image class="arrow" src="../../static/me/arrow_right_gray.png" mode="widthFix" />
 					</view>
+
+					<uni-calendar :date="birthday||'2000-01-01'" ref="calendar" :insert="false" @confirm="confirm" />
 				</view>
 
 				<view class="info_item">
@@ -71,13 +73,13 @@
 						{{ item }}
 						<image class="close" src="../../static/me/close.png" mode="widthFix" @click="delTag(item)" />
 					</view>
-					<view class="addNew" @click="showPop = true;">+ 添加</view>
+					<view class="addNew  blick-btn-animation" @click="showPop = true;">+ 添加</view>
 				</view>
 			</view>
 			<view class="blankHeight"></view>
 		</view>
 
-		<view class="btn_submit" @click="submitData(true)">保存</view>
+		<view class="btn_submit blick-btn-animation" @click="submitData(true)">保存</view>
 		<DialogBox ref="DialogBox"></DialogBox>
 
 		<view class="popSel" v-if="showPop" @tap.stop="onPreview">
@@ -100,24 +102,19 @@
 				<view class="desc">提示：最多选择5个兴趣爱好标签</view>
 				<view style="height: 700rpx; overflow-y: scroll; margin-top: 20rpx; padding-bottom: 100rpx;">
 					<view class="add-tag-box" style="color: #000;" v-if="showAddTag">
-						<input 
-							class="add-tag-input" 
-							v-model="newTag" 
-							placeholder="请输入标签名称" 
-							maxlength="10"
-							@confirm="addCustomTag"
-						/>
+						<input class="add-tag-input" v-model="newTag" placeholder="请输入标签名称" maxlength="10"
+							@confirm="addCustomTag" />
 						<view class="add-tag-btns">
 							<text class="cancel-btn" @tap="cancelAddTag">取消</text>
 							<text class="confirm-btn" @tap="addCustomTag">确定</text>
 						</view>
 					</view>
-					
+
 					<view class="item_tag">
 						<view class="tag add-tag" @tap="showAddTagInput">
 							<text>+ 自定义</text>
 						</view>
-						
+
 						<view @tap.stop="chkTag(item)" class="tag" :class="selTags(item) ? 'active' : ''"
 							v-for="(item, index) in list_tag" :key="index">
 							{{ item }}
@@ -125,7 +122,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="btn_submit" @click="showPop = false;">提交选择</view>
+			<view class="btn_submit  blick-btn-animation" @click="showPop = false;">提交选择</view>
 		</view>
 
 		<ToastW3 ref="ToastW3"></ToastW3>
@@ -139,7 +136,7 @@
 		</view> -->
 		<view>
 			<NicknamePopup title="编辑昵称" subtitle="" class="openNicknamePopUpWindow" ref="openNicknamePopUpWindow">
-				<template slot="content">
+				<template v-slot:content>
 					<view class="input-box">
 						<uv-input placeholder="请输入昵称" border="surround" v-model="nickname" maxlength="20"></uv-input>
 						<view class="length-indicator">{{ nickname.length }}/20</view>
@@ -150,589 +147,604 @@
 
 			<NicknamePopup title="专属于你的简介" subtitle="好的简介让你在社区更受关注" class="openContentPopUpWindow"
 				ref="openContentPopUpWindow">
-				<template slot="content">
-
+				<template v-slot:content>
 					<uv-textarea v-model="content" maxlength="50" count placeholder="请输入内容"></uv-textarea>
-
 					<view class="btn-box" @click="submitData">保存</view>
 				</template>
 			</NicknamePopup>
 		</view>
+
+
 	</view>
 </template>
 
 <script>
- 
-	import PageHeader from '@/components/PageHeader/PageHeader.vue';
-	import CircleAvatar from '@/components/CircleAvatar/CircleAvatar.vue';
-	import NicknamePopup from '@/components/NicknamePopup/NicknamePopup.vue';
-	import permission from '@/common/permission.js';
-	export default {
-		components: {
-			PageHeader,
-			CircleAvatar,
-			NicknamePopup
+
+import PageHeader from '@/components/PageHeader/PageHeader.vue';
+import CircleAvatar from '@/components/CircleAvatar/CircleAvatar.vue';
+import NicknamePopup from '@/components/NicknamePopup/NicknamePopup.vue';
+import permission from '@/common/permission.js';
+export default {
+	components: {
+		PageHeader,
+		CircleAvatar,
+		NicknamePopup
+	},
+	data() {
+		return {
+			showRights: false,
+			title: '',
+			sel: 1,
+			info: {},
+			showPop: false,
+			nickname: '',
+			content: '',
+			sex: 1,
+			age: 18,
+			height: 160,
+			weight: 50,
+			avator: '../../static/me/avator.png',
+			ziye: '',
+			qianmin: '',
+
+			xinzuo_sel: '',
+			xinzuo: ['水瓶座', '双鱼座', '白羊座', '金牛座', '双子座', '巨蟹座', '狮子座', '处女座', '天秤座', '天蝎座', '射手座', '摩羯座'],
+
+			list_tag: [],
+			sel_tags: [],
+			sexText: '',
+			birthday: '',
+			sexOptions: ['男', '女', '其他'],
+			endDate: new Date().toISOString().split('T')[0],
+			showAddTag: false,
+			newTag: '',
+		}
+	},
+	onLoad() {
+		let tagStr =
+			"老二次元了、coser、沉迷音乐、网游小达人、AJ控、白日梦想家、撸铁狂魔、古风汉服、爱画画、数码极客、盲盒玩家、三坑玩家、动漫达人、独立设计师、爱卡通、兜风去、爱夜跑、街头滑板、球类运动、lo娘、rapper、时尚达人、机甲狂潮、养宠物、风轻云淡、养多肉、热爱自然、赛博朋克、骨子里高冷、爱唠嗑、资深中二、天然呆、思想家、极度抽象、学院派、平平无奇、热情奔放、博古通今、labubu粉、玛特收藏家";
+		this.list_tag = tagStr.split("、");
+		this.getInfoData();
+	},
+	onShow() { },
+	methods: {
+		open() {
+			this.$refs.calendar.open();
+		},
+		confirm(e) {
+			console.log(e);
+			this.birthday = e.fulldate
+		},
+		openNicknamePopUpWindow() {
+			this.$refs.openNicknamePopUpWindow.open();
 		},
-		data() {
-			return {
-				showRights: false,
-				title: '',
-				sel: 1,
-				info: {},
-				showPop: false,
-				nickname: '',
-				content: '',
-				sex: 1,
-				age: 18,
-				height: 160,
-				weight: 50,
-				avator: '../../static/me/avator.png',
-				ziye: '',
-				qianmin: '',
-
-				xinzuo_sel: '',
-				xinzuo: ['水瓶座', '双鱼座', '白羊座', '金牛座', '双子座', '巨蟹座', '狮子座', '处女座', '天秤座', '天蝎座', '射手座', '摩羯座'],
-
-				list_tag: [],
-				sel_tags: [],
-				sexText: '',
-				birthday: '',
-				sexOptions: ['男', '女', '其他'],
-				endDate: new Date().toISOString().split('T')[0],
-				showAddTag: false,
-				newTag: '',
+		openContentPopUpWindow() {
+			this.$refs.openContentPopUpWindow.open();
+		},
+		closePropUp() {
+			this.$refs.openNicknamePopUpWindow.close();
+			this.$refs.openContentPopUpWindow.close();
+		},
+		onBack() { },
+		onPreview() { },
+		chkSel() {
+			if (this.sel == 1) {
+				this.sel = 0;
+			} else {
+				this.sel = 1;
 			}
 		},
-		onLoad() {
-			let tagStr =
-				"老二次元了、coser、沉迷音乐、网游小达人、AJ控、白日梦想家、撸铁狂魔、古风汉服、爱画画、数码极客、盲盒玩家、三坑玩家、动漫达人、独立设计师、爱卡通、兜风去、爱夜跑、街头滑板、球类运动、lo娘、rapper、时尚达人、机甲狂潮、养宠物、风轻云淡、养多肉、热爱自然、赛博朋克、骨子里高冷、爱唠嗑、资深中二、天然呆、思想家、极度抽象、学院派、平平无奇、热情奔放、博古通今、labubu粉、玛特收藏家";
-			this.list_tag = tagStr.split("、");
-			this.getInfoData();
+		chkSex(sex) {
+			this.sex = sex;
 		},
-		onShow() {},
-		methods: {
-			openNicknamePopUpWindow() {
-				this.$refs.openNicknamePopUpWindow.open();
-			},
-			openContentPopUpWindow() {
-				this.$refs.openContentPopUpWindow.open();
-			},
-			closePropUp() {
-				this.$refs.openNicknamePopUpWindow.close();
-				this.$refs.openContentPopUpWindow.close();
-			},
-			onBack() {},
-			onPreview() {},
-			chkSel() {
-				if (this.sel == 1) {
-					this.sel = 0;
-				} else {
-					this.sel = 1;
+		delTag(tg) {
+			let list_tag2 = [];
+			for (let i = 0; i < this.sel_tags.length; i++) {
+				if (this.sel_tags[i] != tg) {
+					list_tag2.push(this.sel_tags[i]);
 				}
-			},
-			chkSex(sex) {
-				this.sex = sex;
-			},
-			delTag(tg) {
-				let list_tag2 = [];
-				for (let i = 0; i < this.sel_tags.length; i++) {
-					if (this.sel_tags[i] != tg) {
-						list_tag2.push(this.sel_tags[i]);
-					}
+			}
+			this.sel_tags = list_tag2;
+		},
+		selTags(itm) {
+			let isIn = false;
+			for (let entry of this.sel_tags) {
+				if (entry == itm) {
+					isIn = true;
+					break;
 				}
-				this.sel_tags = list_tag2;
-			},
-			selTags(itm) {
-				let isIn = false;
+			}
+			return isIn;
+		},
+		chkTag(itm) {
+			if (this.selTags(itm)) {
+				let tmpTags = [];
 				for (let entry of this.sel_tags) {
-					if (entry == itm) {
-						isIn = true;
-						break;
+					if (entry != itm) {
+						tmpTags.push(entry);
 					}
 				}
-				return isIn;
-			},
-			chkTag(itm) {
-				if (this.selTags(itm)) {
-					let tmpTags = [];
-					for (let entry of this.sel_tags) {
-						if (entry != itm) {
-							tmpTags.push(entry);
-						}
-					}
-					this.sel_tags = tmpTags;
+				this.sel_tags = tmpTags;
+			} else {
+				if (this.sel_tags.length <= 4) {
+					this.sel_tags.push(itm);
 				} else {
-					if (this.sel_tags.length <= 4) {
-						this.sel_tags.push(itm);
-					} else {
-						uni.showToast({
-							title: "最多选择5个标签",
-							icon: "none"
-						});
-					}
+					uni.showToast({
+						title: "最多选择5个标签",
+						icon: "none"
+					});
 				}
-			},
-			sliderChange1(e) {
-				this.age = e.detail.value;
-			},
-			sliderChange2(e) {
-				this.height = e.detail.value;
-			},
-			sliderChange3(e) {
-				this.weight = e.detail.value;
-			},
-			SetSex() {
-				let that = this;
-				uni.showActionSheet({
-					itemColor: '#000000',
-					itemList: this.sexOptions,
-					success: function(res) {
-						that.sexText = that.sexOptions[res.tapIndex];
-						that.sex = res.tapIndex + 1;
-					},
-					fail: function(res) {
-						console.log(res.errMsg);
+			}
+		},
+		sliderChange1(e) {
+			this.age = e.detail.value;
+		},
+		sliderChange2(e) {
+			this.height = e.detail.value;
+		},
+		sliderChange3(e) {
+			this.weight = e.detail.value;
+		},
+		SetSex() {
+			let that = this;
+			uni.showActionSheet({
+				itemColor: '#000000',
+				itemList: this.sexOptions,
+				success: function (res) {
+					that.sexText = that.sexOptions[res.tapIndex];
+					that.sex = res.tapIndex + 1;
+				},
+				fail: function (res) {
+					console.log(res.errMsg);
+				}
+			});
+		},
+		getInfoData() {
+			uni.request({
+				url: this.$apiHost + '/Member/getinfoData',
+				data: {
+					uuid: getApp().globalData.uuid
+				},
+				header: {
+					'content-type': 'application/json'
+				},
+				success: (res) => {
+					console.log(res.data);
+					this.nickname = res.data.nickname;
+					this.wechat = res.data.wechat;
+					this.sex = res.data.sex;
+					this.sexText = this.sexOptions[res.data.sex - 1] || '';
+					this.birthday = res.data.birthday;
+					this.content = res.data.content;
+					this.xinzuo_sel = this.getConstellation(this.birthday);
+					if (res.data.avator != "") {
+						this.avator = res.data.avator;
 					}
-				});
-			},
-			getInfoData() {
-				uni.request({
-					url: this.$apiHost + '/Member/getinfoData',
-					data: {
-						uuid: getApp().globalData.uuid
-					},
-					header: {
-						'content-type': 'application/json'
-					},
-					success: (res) => {
-						console.log(res.data);
-						this.nickname = res.data.nickname;
-						this.wechat = res.data.wechat;
-						this.sex = res.data.sex;
-						this.sexText = this.sexOptions[res.data.sex - 1] || '';
-						this.birthday = res.data.birthday;
-						this.content = res.data.content;
-						this.xinzuo_sel = this.getConstellation(this.birthday);
-						if (res.data.avator != "") {
-							this.avator = res.data.avator;
-						}
-						if (res.data.aihao) {
-							this.sel_tags = res.data.aihao.split(",");
-						}
+					if (res.data.aihao) {
+						this.sel_tags = res.data.aihao.split(",");
 					}
-				});
-			},
-			submitData(isBack) {
-				let aihao = this.sel_tags.join(',')
-				let obj2 = {
-					uuid: getApp().globalData.uuid,
-					avator: this.avator,
-					nickname: this.nickname,
-					content: this.content,
-					sex: this.sex,
-					birthday: this.birthday,
-					xinzuo: this.xinzuo_sel,
-					ziye: this.ziye,
-					qianmin: this.qianmin,
-					aihao: aihao
 				}
-				uni.request({
-					url: this.$apiHost + '/Member/setinfoData',
-					data: obj2,
-					method: 'POST',
-					header: {
-						'Content-Type': 'application/x-www-form-urlencoded',
-						'sign': getApp().globalData.headerSign
-					},
-					dataType: 'json',
-					success: (res) => {
-						console.log("res", res.data)
-						uni.showToast({
-							title: res.data.str,
-							animation: 0,
-							icon: "none"
-						});
-						if ( res.data.success == 'yes' && isBack == true) {
-							if (this.nickname) {
-								getApp().globalData.nickname = this.nickname
-								uni.removeStorageSync("nickname");
-								uni.setStorageSync("nickname", this.nickname);
-							}
-
-							if (this.avator) {
-								getApp().globalData.avator = this.avator
-								uni.removeStorageSync("avator");
-								uni.setStorageSync("avator", this.avator);
-							}
-							setTimeout(function() {
-							 
-
-								uni.navigateBack()
-							}, 800)
-						} else {
-							this.closePropUp()
+			});
+		},
+		submitData(isBack) {
+			let aihao = this.sel_tags.join(',')
+			let obj2 = {
+				uuid: getApp().globalData.uuid,
+				avator: this.avator,
+				nickname: this.nickname,
+				content: this.content,
+				sex: this.sex,
+				birthday: this.birthday,
+				xinzuo: this.xinzuo_sel,
+				ziye: this.ziye,
+				qianmin: this.qianmin,
+				aihao: aihao
+			}
+			uni.request({
+				url: this.$apiHost + '/Member/setinfoData',
+				data: obj2,
+				method: 'POST',
+				header: {
+					'Content-Type': 'application/x-www-form-urlencoded',
+					'sign': getApp().globalData.headerSign
+				},
+				dataType: 'json',
+				success: (res) => {
+					console.log("res", res.data)
+					uni.showToast({
+						title: res.data.str,
+						animation: 0,
+						icon: "none"
+					});
+					if (res.data.success == 'yes' && isBack == true) {
+						if (this.nickname) {
+							getApp().globalData.nickname = this.nickname
+							uni.removeStorageSync("nickname");
+							uni.setStorageSync("nickname", this.nickname);
 						}
-						this.getInfoData()
-					}
-				});
-			},
-			chooseAvatar() {
-				uni.showActionSheet({
-					itemList: ['拍照', '从相册选择'],
-					success: (res) => {
-						const sourceType = res.tapIndex === 0 ? 'camera' : 'album';
-						this.chooseImage(sourceType);
-					}
-				});
-			},
-			async chooseImage(sourceType) {
-				try {
-					let hasPermission = false;
-					
-					if (sourceType === 'camera') {
-						hasPermission = await this.checkCameraPermission();
-					} else if (sourceType === 'album') {
-						hasPermission = await this.checkPhotoLibraryPermission();
-					}
 
-					if (!hasPermission) {
-						uni.showToast({
-							title: '未获得权限',
-							icon: 'none'
-						});
-						return;
+						if (this.avator) {
+							getApp().globalData.avator = this.avator
+							uni.removeStorageSync("avator");
+							uni.setStorageSync("avator", this.avator);
+						}
+						setTimeout(function () {
+
+
+							uni.navigateBack()
+						}, 800)
+					} else {
+						this.closePropUp()
 					}
+					this.getInfoData()
+				}
+			});
+		},
+		chooseAvatar() {
+			uni.showActionSheet({
+				itemList: ['拍照', '从相册选择'],
+				success: (res) => {
+					const sourceType = res.tapIndex === 0 ? 'camera' : 'album';
+					this.chooseImage(sourceType);
+				}
+			});
+		},
+		async chooseImage(sourceType) {
+			try {
+				let hasPermission = false;
+
+				if (sourceType === 'camera') {
+					hasPermission = await this.checkCameraPermission();
+				} else if (sourceType === 'album') {
+					hasPermission = await this.checkPhotoLibraryPermission();
+				}
 
-					uni.chooseImage({
-						count: 1,
-						sizeType: ['compressed'],
-						sourceType: [sourceType],
-						success: async (res) => {
-							console.log('res:', res)
-							if (res.tempFilePaths.length > 0) {
-								const tempFilePath = res.tempFilePaths[0];
-								console.log('tempFilePaths:', tempFilePath);
-								await this.uploadImage(tempFilePath);
-							}
-						},
-						fail: (err) => {
-							console.error('选择图片失败：', err);
-							uni.showToast({
-								title: '选择图片失败',
-								icon: 'none'
-							});
-						}
-					});
-				} catch (error) {
-					console.error('权限检查失败：', error);
+				if (!hasPermission) {
 					uni.showToast({
-						title: '权限检查失败',
+						title: '未获得权限',
 						icon: 'none'
 					});
-				} 
-			},
-			async checkCameraPermission() {
-				const hasPermission = await permission.request(permission.PermissionType.CAMERA, {
-					title: '相机权限申请',
-					describe: '需要使用相机拍摄照片，用于帮助您完成图片制作、图片拍摄、图片上传等功能'
-				});
-				return hasPermission;
-			},
-			async checkPhotoLibraryPermission() {
-				const hasPermission = await permission.request(permission.PermissionType.PHOTO_LIBRARY, {
-					title: '相册权限申请',
-					describe: '需要访问相册选择照片，用于帮助您完成图片制作、图片拍摄、图片上传等功能'
-				});
-				return hasPermission;
-			},
-			uploadImage(tempFilePath) {
-				var _self = this;
-				const uploadTask = uni.uploadFile({
-					url: _self.$apiHost + '/Xweb/upload_img?skey=' + _self.skey,
-					filePath: tempFilePath,
-					name: 'file',
-					success: function(uploadFileRes) {
-						let resdata = JSON.parse(uploadFileRes.data)
-						console.log('Success11:', uploadFileRes);
-						console.log('Success21:', resdata);
-						if (resdata.success == 'yes') {
-							_self.showRights = false;
-							_self.avator = resdata.url;
+					return;
+				}
+
+				uni.chooseImage({
+					count: 1,
+					sizeType: ['compressed'],
+					sourceType: [sourceType],
+					success: async (res) => {
+						console.log('res:', res)
+						if (res.tempFilePaths.length > 0) {
+							const tempFilePath = res.tempFilePaths[0];
+							console.log('tempFilePaths:', tempFilePath);
+							await this.uploadImage(tempFilePath);
 						}
 					},
-					fail: function(uploadFileFail) {
-						console.log('Error:', uploadFileFail.data);
-					},
-					complete: () => {
-						console.log('Complete:');
+					fail: (err) => {
+						console.error('选择图片失败：', err);
+						uni.showToast({
+							title: '选择图片失败',
+							icon: 'none'
+						});
 					}
 				});
-			},
-			onBirthdayChange(e) {
-				this.birthday = e.detail.value;
-				this.xinzuo_sel = this.getConstellation(this.birthday);
-			},
-			getConstellation(birthday) {
-				if (!birthday) return '';
-
-				const month = parseInt(birthday.split('-')[1]);
-				const day = parseInt(birthday.split('-')[2]);
-
-				// 星座日期数组
-				const constellationDates = [
-					[1, 20, "水瓶座"],
-					[2, 19, "双鱼座"],
-					[3, 21, "白羊座"],
-					[4, 20, "金牛座"],
-					[5, 21, "双子座"],
-					[6, 22, "巨蟹座"],
-					[7, 23, "狮子座"],
-					[8, 23, "处女座"],
-					[9, 23, "天秤座"],
-					[10, 24, "天蝎座"],
-					[11, 23, "射手座"],
-					[12, 22, "摩羯座"]
-				];
-
-				let constellation = "";
-				if (day < constellationDates[month - 1][1]) {
-					constellation = constellationDates[month - 1][2];
-				} else {
-					constellation = constellationDates[month % 12][2];
+			} catch (error) {
+				console.error('权限检查失败：', error);
+				uni.showToast({
+					title: '权限检查失败',
+					icon: 'none'
+				});
+			}
+		},
+		async checkCameraPermission() {
+			const hasPermission = await permission.request(permission.PermissionType.CAMERA, {
+				title: "“萌创星球”想访问你的相机",
+				describe: "萌创星球想访问您的摄像头，便于拍摄获取图片来替换头像图片"
+			});
+			return hasPermission;
+		},
+		async checkPhotoLibraryPermission() {
+			const hasPermission = await permission.request(permission.PermissionType.PHOTO_LIBRARY, {
+				title: "“萌创星球”想访问你的照片图库",
+				describe: "萌创星球想访问您本地照片图库，便于获取图片来替换头像图片"
+			});
+			return hasPermission;
+		},
+		uploadImage(tempFilePath) {
+			var _self = this;
+			const uploadTask = uni.uploadFile({
+				url: _self.$apiHost + '/Xweb/upload_img?skey=' + _self.skey,
+				filePath: tempFilePath,
+				name: 'file',
+				success: function (uploadFileRes) {
+					let resdata = JSON.parse(uploadFileRes.data)
+					console.log('Success11:', uploadFileRes);
+					console.log('Success21:', resdata);
+					if (resdata.success == 'yes') {
+						_self.showRights = false;
+						_self.avator = resdata.url;
+					}
+				},
+				fail: function (uploadFileFail) {
+					console.log('Error:', uploadFileFail.data);
+				},
+				complete: () => {
+					console.log('Complete:');
 				}
+			});
+		},
+		onBirthdayChange(e) {
+			this.birthday = e.detail.value;
+			this.xinzuo_sel = this.getConstellation(this.birthday);
+		},
+		getConstellation(birthday) {
+			if (!birthday) return '';
+
+			const month = parseInt(birthday.split('-')[1]);
+			const day = parseInt(birthday.split('-')[2]);
+
+			// 星座日期数组
+			const constellationDates = [
+				[1, 20, "水瓶座"],
+				[2, 19, "双鱼座"],
+				[3, 21, "白羊座"],
+				[4, 20, "金牛座"],
+				[5, 21, "双子座"],
+				[6, 22, "巨蟹座"],
+				[7, 23, "狮子座"],
+				[8, 23, "处女座"],
+				[9, 23, "天秤座"],
+				[10, 24, "天蝎座"],
+				[11, 23, "射手座"],
+				[12, 22, "摩羯座"]
+			];
+
+			let constellation = "";
+			if (day < constellationDates[month - 1][1]) {
+				constellation = constellationDates[month - 1][2];
+			} else {
+				constellation = constellationDates[month % 12][2];
+			}
 
-				return constellation;
-			},
-			showAddTagInput() {
-				this.showAddTag = true;
-				this.newTag = '';
-			},
-			cancelAddTag() {
-				this.showAddTag = false;
-				this.newTag = '';
-			},
-			addCustomTag() {
-				if (!this.newTag.trim()) {
-					uni.showToast({
-						title: '请输入标签名称',
-						icon: 'none'
-					});
-					return;
-				}
-				
-				if (this.list_tag.includes(this.newTag)) {
-					uni.showToast({
-						title: '该标签已存在',
-						icon: 'none'
-					});
-					return;
-				}
-				
-				this.list_tag.unshift(this.newTag);
-				this.showAddTag = false;
-				this.newTag = '';
-			},
-		}
-	}
-</script>
+			return constellation;
+		},
+		showAddTagInput() {
+			this.showAddTag = true;
+			this.newTag = '';
+		},
+		cancelAddTag() {
+			this.showAddTag = false;
+			this.newTag = '';
+		},
+		addCustomTag() {
+			if (!this.newTag.trim()) {
+				uni.showToast({
+					title: '请输入标签名称',
+					icon: 'none'
+				});
+				return;
+			}
 
-<style scoped lang="scss">
-	@import 'normal.scss';
+			if (this.list_tag.includes(this.newTag)) {
+				uni.showToast({
+					title: '该标签已存在',
+					icon: 'none'
+				});
+				return;
+			}
 
-	page {
-		font-family: PingFang SC-Medium;
+			this.list_tag.unshift(this.newTag);
+			this.showAddTag = false;
+			this.newTag = '';
+		},
 	}
+}
+</script>
 
-	.popSel {
-		position: fixed;
-		z-index: 101;
-		top: 0;
-		left: 0;
-		background-color: #f2f6f2;
-		width: 100vh;
-		min-height: 100vh;
-
-		.headLabel {
-			width: 686rpx;
-			margin: 28rpx 32rpx;
-			min-height: 222rpx;
-			background: #fff;
-			box-sizing: border-box;
-			padding: 30rpx 40rpx 46rpx 20rpx;
-			border-radius: 20rpx;
-
-			.avator-box {
-				display: flex;
-				align-items: center;
+<style scoped lang="scss">
+@import 'normal.scss';
+
+page {
+	font-family: PingFang SC-Medium;
+	// background: url("../../static/me/wd_bg_bianjiziliao.png") center top / 100%
+    //   auto no-repeat,
+    // #f2f6f2;
+}
+page{
+	background: #000 !important;
+}
+
+.popSel {
+	position: fixed;
+	z-index: 101;
+	top: 0;
+	left: 0;
+	background-color: #f2f6f2;
+	width: 100vh;
+	min-height: 100vh;
+
+	.headLabel {
+		width: 686rpx;
+		margin: 28rpx 32rpx;
+		min-height: 222rpx;
+		background: #fff;
+		box-sizing: border-box;
+		padding: 30rpx 40rpx 46rpx 20rpx;
+		border-radius: 20rpx;
 
-				.avator {
-					width: 80rpx;
-					height: 80rpx;
-					margin-right: 20rpx;
-				}
-			}
+		.avator-box {
+			display: flex;
+			align-items: center;
 
-			.tag-box {
-				display: flex;
-				flex-direction: row;
-				justify-content: flex-start;
-				align-items: center;
-				flex-wrap: wrap;
-				font-size: 24rpx;
-
-				.tag {
-					margin-right: 16rpx;
-					margin-top: 20rpx;
-					padding: 6rpx 10rpx;
-					border: 2rpx solid #DCE1DC;
-					color: #9E9E9E;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					border-radius: 42rpx;
-					line-height: 1;
-
-					.close {
-						width: 20rpx;
-						margin-left: 12rpx;
-						position: relative;
-					}
-				}
+			.avator {
+				width: 80rpx;
+				height: 80rpx;
+				margin-right: 20rpx;
 			}
 		}
-	}
-
-	.openNicknamePopUpWindow {
-		.length-indicator {
-			font-size: 24rpx;
-			color: #999;
-			text-align: right;
-			margin-top: 10rpx;
-			margin-right: 20rpx;
-			position: absolute;
-			right: 24rpx;
-			top: 24rpx;
-
-		}
-	}
 
-	.popSel {
-		.item_tag {
+		.tag-box {
 			display: flex;
 			flex-direction: row;
 			justify-content: flex-start;
 			align-items: center;
 			flex-wrap: wrap;
-			width: 690rpx;
-			padding: 20rpx;
+			font-size: 24rpx;
 
 			.tag {
-				border-radius: 94rpx;
-				margin-right: 10rpx;
-				margin-top: 10rpx;
-				padding: 8rpx 16rpx;
-				font-size: 28rpx;
-				color: #333;
+				margin-right: 16rpx;
+				margin-top: 20rpx;
+				padding: 6rpx 10rpx;
+				border: 2rpx solid #DCE1DC;
+				color: #9E9E9E;
 				display: flex;
-				flex-direction: row;
 				justify-content: center;
 				align-items: center;
-				background: #fff;
-				border-width: 0;
+				border-radius: 42rpx;
+				line-height: 1;
 
 				.close {
-					width: 28rpx;
-					margin-left: 2rpx;
+					width: 20rpx;
+					margin-left: 12rpx;
 					position: relative;
 				}
 			}
+		}
+	}
+}
+
+.openNicknamePopUpWindow {
+	.length-indicator {
+		font-size: 24rpx;
+		color: #999;
+		text-align: right;
+		margin-top: 10rpx;
+		margin-right: 20rpx;
+		position: absolute;
+		right: 24rpx;
+		top: 24rpx;
 
-			.active {
-				border-width: 0;
-				background: #ACF934;
-			}
+	}
+}
 
-			.addNew {
-				margin-right: 10rpx;
-				margin-top: 10rpx;
-				padding: 0rpx 20rpx;
-				height: 60rpx;
-				border-radius: 12rpx;
-				background: #1f1f1f;
-				color: #fff;
-				display: flex;
-				flex-direction: row;
-				justify-content: center;
-				align-items: center;
+.popSel {
+	.item_tag {
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		align-items: center;
+		flex-wrap: wrap;
+		width: 690rpx;
+		padding: 20rpx;
+
+		.tag {
+			border-radius: 94rpx;
+			margin-right: 10rpx;
+			margin-top: 10rpx;
+			padding: 8rpx 16rpx;
+			font-size: 28rpx;
+			color: #333;
+			display: flex;
+			flex-direction: row;
+			justify-content: center;
+			align-items: center;
+			background: #fff;
+			border-width: 0;
+
+			.close {
+				width: 28rpx;
+				margin-left: 2rpx;
+				position: relative;
 			}
 		}
 
-	}
+		.active {
+			border-width: 0;
+			background: #ACF934;
+		}
 
-	.reserveASeat {
-		width: 100%;
-		height: calc(var(--status-bar-height) + 50rpx);
+		.addNew {
+			margin-right: 10rpx;
+			margin-top: 10rpx;
+			padding: 0rpx 20rpx;
+			height: 60rpx;
+			border-radius: 12rpx;
+			background: #1f1f1f;
+			color: #fff;
+			display: flex;
+			flex-direction: row;
+			justify-content: center;
+			align-items: center;
+		}
 	}
 
-	.page {
-		background: url("../../static/me/wd_bg_bianjiziliao.png") top center/ 100% auto no-repeat,
-			#f2f6f2;
-	}
+}
+
+.reserveASeat {
+	width: 100%;
+	height: calc(var(--status-bar-height) + 50rpx);
+}
 
-	.PageHeader {
-		background: url("../../static/me/wd_bg_bianjiziliao.png") center top / 100% auto no-repeat,
-			#f2f6f2;
-		background-position-y: var(--status-bar-height);
+.page {
+	background: url("../../static/me/wd_bg_bianjiziliao.png") top center/ 100% auto no-repeat,
+		#f2f6f2;
+}
+
+.PageHeader {
+	background: url("../../static/me/wd_bg_bianjiziliao.png") center top / 100% auto no-repeat,
+		#f2f6f2;
+	// background-position-y: var(--status-bar-height);
+	z-index: 99 !important;
+}
+
+.add-tag-box {
+	background: #fff;
+	padding: 20rpx;
+	margin: 20rpx;
+	border-radius: 12rpx;
+
+	.add-tag-input {
+		width: 100%;
+		height: 80rpx;
+		background: #f5f5f5;
+		border-radius: 8rpx;
+		padding: 0 20rpx;
+		font-size: 28rpx;
+		margin-bottom: 20rpx;
 	}
 
-	.add-tag-box {
-		background: #fff;
-		padding: 20rpx;
-		margin: 20rpx;
-		border-radius: 12rpx;
-		
-		.add-tag-input {
-			width: 100%;
-			height: 80rpx;
-			background: #f5f5f5;
+	.add-tag-btns {
+		display: flex;
+		justify-content: flex-end;
+		gap: 20rpx;
+
+		.cancel-btn,
+		.confirm-btn {
+			padding: 10rpx 30rpx;
 			border-radius: 8rpx;
-			padding: 0 20rpx;
 			font-size: 28rpx;
-			margin-bottom: 20rpx;
-		}
-		
-		.add-tag-btns {
-			display: flex;
-			justify-content: flex-end;
-			gap: 20rpx;
-			
-			.cancel-btn, .confirm-btn {
-				padding: 10rpx 30rpx;
-				border-radius: 8rpx;
-				font-size: 28rpx;
-			}
-			
-			.cancel-btn {
-				background: #f5f5f5;
-				color: #666;
-			}
-			
-			.confirm-btn {
-				background: #1f1f1f;
-				color: #fff;
-			}
 		}
-	}
 
-	.item_tag {
-		.add-tag {
+		.cancel-btn {
 			background: #f5f5f5;
 			color: #666;
-			border: 2rpx dashed #ddd;
-			
-			&:active {
-				background: #e5e5e5;
-			}
+		}
+
+		.confirm-btn {
+			background: #1f1f1f;
+			color: #fff;
+		}
+	}
+}
+
+.item_tag {
+	.add-tag {
+		background: #f5f5f5;
+		color: #666;
+		border: 2rpx dashed #ddd;
+
+		&:active {
+			background: #e5e5e5;
 		}
 	}
+}
 </style>

pages/my/follow.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<PageHeader title="" style="border: 1px solid #F2F6F2;">
-			<template slot="center">
+			<template v-slot:center>
 				<view class="tabs">
 					<view class="tab" :class="{ active: activeTab === 'following' }" @click="switchTab('following')">关注
 					</view>

pages/my/job.scss

@@ -18,7 +18,7 @@ page {
   background: url("../../static/me/job/rw_bg_01.png") center top / 100% auto
       no-repeat,
     #f2f6f2;
-  background-position-y: var(--status-bar-height);
+  // background-position-y: var(--status-bar-height);
 }
 .occupyHigh {
   height: calc(var(--status-bar-height) + 150rpx);

pages/my/my.scss

@@ -419,19 +419,31 @@ page {
       display: flex;
       align-items: center;
       justify-content: space-between;
+      transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+      box-shadow: 0 -2rpx 8rpx rgba(0, 0, 0, 0.05);
+      
+      &:active {
+        transform: scale(0.98);
+        box-shadow: 0 -1rpx 4rpx rgba(0, 0, 0, 0.05);
+      }
+
       > image {
         width: 34rpx;
         height: 26rpx;
+        transition: all 0.3s ease;
       }
       .content-box {
         height: 100%;
         display: flex;
         align-items: center;
         color: #acf934;
+        transition: all 0.3s ease;
+        
         > image {
           width: 34rpx;
           height: 34rpx;
           margin-right: 8rpx;
+          transition: all 0.3s ease;
         }
       }
     }
@@ -479,7 +491,6 @@ page {
   .tablist {
     display: flex;
     justify-content: flex-start;
-    // padding: 20rpx 20rpx;
     box-sizing: border-box;
     background: #ffffff;
     .item {
@@ -492,6 +503,14 @@ page {
       position: relative;
       left: 0;
       top: 0;
+      transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+      box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+      
+      &:active {
+        transform: scale(0.95);
+        box-shadow: 0 1rpx 4rpx rgba(0, 0, 0, 0.05);
+      }
+
       .indicator-triangle {
         position: absolute;
         bottom: -10rpx;
@@ -503,25 +522,18 @@ page {
         border-right: 10rpx solid transparent;
         border-top: 10rpx solid #acf934;
         display: none;
+        transition: all 0.3s ease;
       }
       &.active {
         background: #acf934;
         font-family: "CustomFont" !important;
+        box-shadow: 0 4rpx 12rpx rgba(172, 249, 52, 0.3);
+        
         .indicator-triangle {
           display: block;
+          transform: translateX(-50%) scale(1.2);
         }
       }
-      // &:after {
-      //   content: "";
-      //   position: absolute;
-      //   bottom: 0;
-      //   left: 0;
-      //   width: 40rpx;
-      //   height: 6rpx;
-      //   background: #90d369;
-      //   border-radius: 3rpx;
-      // }
-      //   }
     }
   }
 
@@ -567,21 +579,38 @@ page {
       position: relative;
       left: 0;
       top: 0;
+      transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+      
+      &.clickable {
+        cursor: pointer;
+        box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+        
+        &:active {
+          transform: scale(0.98);
+          box-shadow: 0 1rpx 4rpx rgba(0, 0, 0, 0.05);
+        }
+      }
+
       .incomplete-bg {
         position: absolute;
         left: 0;
         top: 0;
         width: 346rpx;
         height: 520rpx;
+        transition: all 0.3s ease;
+         border-radius: 16rpx;
       }
+      
       .incomplete-bg2 {
         position: absolute;
         left: 0;
         top: 50%;
         width: 346rpx;
         transform: translateY(-50%);
-        // height: auto;
+        transition: all 0.3s ease;
+         border-radius: 16rpx;
       }
+      
       .maskLayer {
         background: rgba(0, 0, 0, 0.4);
         position: absolute;
@@ -589,7 +618,10 @@ page {
         top: 0;
         width: 346rpx;
         height: 520rpx;
+        transition: all 0.3s ease;
+         border-radius: 16rpx;
       }
+      
       .queue-status {
         position: absolute;
         left: 0;
@@ -597,6 +629,8 @@ page {
         width: 346rpx;
         height: 520rpx;
         color: #fff;
+        transition: all 0.3s ease;
+        
         .status-text {
           position: absolute;
           left: 0;
@@ -606,6 +640,7 @@ page {
           display: flex;
           justify-content: center;
           align-items: center;
+          transition: all 0.3s ease;
 
           .state-img {
             height: 104rpx;
@@ -614,15 +649,13 @@ page {
             left: 50%;
             top: 50%;
             transform: translate(-50%, -50%);
+            transition: all 0.3s ease;
           }
         }
       }
-      .task-type-tag {
-        position: absolute;
-        left: 0;
-        top: 0;
-        padding-top: 14rpx;
-        padding-left: 12rpx;
+      
+      .name {
+        transition: all 0.3s ease;
       }
     }
     .loading-more,

pages/my/my.vue

@@ -122,8 +122,8 @@
 						</view>
 					</view>
 					<view class="numlist2" v-if="activeTab === 1" style="margin-top: 30rpx">
-						<view class="item" v-for="(item, index) in worksList" :key="index" style="margin-bottom: 28rpx">
-							<view class="num" @click="goWork(item)">
+						<view class="item" v-for="(item, index) in worksList" :key="index" style="margin-bottom: 28rpx;">
+							<view class="num" @click="goWork(item)" :class="{'clickable': item.status !== 3 && item.status !== 4}">
 								<WorkItem :item="item" style="margin-bottom: 12rpx" />
 
 								<image class="incomplete-bg" v-if="item.status != 9"
@@ -181,7 +181,7 @@
 				<template v-else>
 					<view class="numlist2" style="margin-top: 30rpx">
 						<view class="item" v-for="(item, index) in worksList" :key="index" style="margin-bottom: 15rpx">
-							<view class="num" @click="goWork2(item)">
+							<view class="num" @click="goWork2(item)" :class="{'clickable': item.status !== 3 && item.status !== 4}">
 								<WorkItem :item="item" style="margin-bottom: 20rpx" />
 
 								<view class="incomplete-bg" style="background: #f8f9fa"></view>
@@ -195,8 +195,6 @@
 								<view class="queue-status">
 									<!-- 已发布 -->
 									<view v-if="item.status == 1" class="status-text">
-										<!-- <image class="state-img" src="@/static/me/wd_icon_paiduizhong.png"></image> -->
-										<!-- ({{ item.queue_position }}/{{ item.all_position }}) -->
 									</view>
 									<!-- 待审核 -->
 									<view v-if="item.status == 2 || item.status === 4" class="status-text">

pages/my/myStar.scss

@@ -142,7 +142,7 @@
     background: url("../../static/me/cz_bg_top.png") no-repeat top center / 100%
         auto,
       #f2f6f2;
-    background-position-y: var(--status-bar-height);
+    // background-position-y: var(--status-bar-height);
   }
 
   .form-group {
@@ -438,9 +438,6 @@
     box-shadow: 0 4rpx 12rpx rgba(156, 39, 176, 0.3);
     transition: all 0.2s ease;
 
-    &:active {
-      transform: scale(0.98);
-      opacity: 0.95;
-    }
+     
   }
 }

pages/my/myStar.vue

@@ -1,16 +1,16 @@
 <template>
 	<view class="star-container">
 		<PageHeader title="" class="PageHeader" v-if="state == 1">
-			<template slot="center"> </template>
+			<template v-slot:center> </template>
 		</PageHeader>
 		<!-- 星灵基因重组仓弹窗 -->
 		<view class="gender-popup" v-if="state == 0">
 			<NicknamePopup :closeOnClickOverlay="false" title="星灵基因重组仓" subtitle="" class="openContentPopUpWindow"
 				ref="openContentPopUpWindow" @close="goBack()">
-				<template slot="content">
+				<template v-slot:content>
 					<uv-textarea v-model="noteContent" maxlength="200" count autoHeight
 						placeholder="可描述你想要重新赋予Ta的形象、性别、性格、身份、兴趣爱好等（不会展示给其他人，仅你自己知道），示例：有一头波浪状的橙色头发，喜欢运动的阳光男孩..."></uv-textarea>
-					<view class="btn-box" @tap="confirmGender">创建星灵</view>
+					<view class="btn-box  blick-btn-animation" @tap="confirmGender">创建星灵</view>
 				</template>
 			</NicknamePopup>
 		</view>
@@ -34,7 +34,7 @@
 		<!-- 表单页面 -->
 		<view class="form-page" v-else-if="state == 4">
 			<PageHeader title="设置星灵简介" class="PageHeader">
-				<template slot="center"> </template>
+				<template v-slot:center> </template>
 			</PageHeader>
 			<view class="reserveASeat"></view>
 
@@ -173,8 +173,8 @@
 			</view>
 
 			<!-- 底部按钮 -->
-			<view class="join-button" @tap="handleJoin(1)" v-if="state == 5"> 入驻星球 </view>
-			<view class="join-button" @tap="handleJoin(0)" v-if="state == 6"> 已入驻星球(点击进入星球) </view>
+			<view class="join-button  blick-btn-animation" @tap="handleJoin(1)" v-if="state == 5"> 入驻星球 </view>
+			<view class="join-button  blick-btn-animation" @tap="handleJoin(0)" v-if="state == 6"> 已入驻星球(点击进入星球) </view>
 		</view>
 
 		<!-- 编辑弹窗 -->

pages/my/normal.scss

@@ -8,7 +8,7 @@ page {
   background: url("../../static/me/wd_bg_bianjiziliao.png") center top / 100%
       auto no-repeat,
     #f2f6f2;
-  background-position-y: var(--status-bar-height);
+  // background-position-y: var(--status-bar-height);
 }
 .topBody {
   width: 750rpx;

pages/my/setting.vue

@@ -38,7 +38,8 @@
 
     <!-- 版本信息 -->
     <view class="version-info">
-      <text>版本号 {{ version }}</text>
+      <text>版本号 {{ version }}</text></br>
+	  <text>杭州智潮创意科技有限公司</text>
     </view>
 
     <!-- 退出登录按钮 -->
@@ -220,7 +221,8 @@ export default {
 
          uni.showModal({
            title: "通知设置",
-           content: "您可以设置-通知中，去自行选择开启消息通知",
+           content: "可进行消息通知管理",
+           paratext: "通知可能包括：悬浮消息通知、锁屏通知、桌面角标提醒通知",
            cancelText: "取消",
            confirmText: "确定",
            success: (res) => {

pages/my/step.vue

@@ -59,19 +59,18 @@
       <!-- 生日选择 -->
       <view class="birthday-section">
         <view class="input-label">我的生日</view>
-        <view class="birthday-picker">
-          <picker style="height: auto" mode="date" :value="userInfo.birthday" :end="endDate" @change="bindDateChange">
-            <view class="uni-input">
-              <text :class="{ placeholder: !userInfo.birthday }">{{
-                userInfo.birthday || "选择生日"
-                }}</text>
-              <text v-if="userInfo.birthday" class="constellation">{{
-                userInfo.xinzuo
-                }}</text>
-            </view>
-          </picker>
+        <view class="birthday-picker" @click="openCalendar">
+          <view class="uni-input">
+            <text :class="{ placeholder: !userInfo.birthday }">{{
+              userInfo.birthday || "选择生日"
+              }}</text>
+            <text v-if="userInfo.birthday" class="constellation">{{
+              userInfo.xinzuo
+              }}</text>
+          </view>
           <image src="/static/me/step/dlzc_icon_arrow.png" mode="aspectFit" class="arrow-icon"></image>
         </view>
+        <uni-calendar :date="userInfo.birthday||'2000-01-01'" ref="calendar" :insert="false" @confirm="confirmBirthday" />
       </view>
     </view>
 
@@ -182,10 +181,12 @@
 </template>
 
 <script> 
-import permission from '@/common/permission.js'; 
+import permission from '@/common/permission.js';  
 
 export default {
-  components: {},
+  components: {
+     
+  },
   data() {
     return {
       currentStep: 1,
@@ -592,15 +593,15 @@ export default {
     },
     async checkCameraPermission() {
       const hasPermission = await permission.request(permission.PermissionType.CAMERA, {
-        title: '相机权限申请',
-        describe: '需要使用相机拍摄照片，用于帮助您完成图片制作、图片拍摄、图片上传等功能'
+       title: "“萌创星球”想访问你的相机",
+					describe: "萌创星球想访问您的摄像头，便于拍摄获取图片来替换头像图片"
       });
       return hasPermission;
     },
     async checkPhotoLibraryPermission() {
       const hasPermission = await permission.request(permission.PermissionType.PHOTO_LIBRARY, {
-        title: '相册权限申请',
-        describe: '需要访问相册选择照片，用于帮助您完成图片制作、图片拍摄、图片上传等功能'
+       title: "“萌创星球”想访问你的照片图库",
+					describe: "萌创星球想访问您本地照片图库，便于获取图片来替换头像图片"
       });
       return hasPermission;
     },
@@ -759,61 +760,41 @@ export default {
       }
       this.userInfo.nickname = result;
     },
-    bindDateChange(e) {
-      const selectedDate = new Date(e.detail.value);
-      const now = new Date();
-
-      if (selectedDate > now) {
-        uni.showToast({
-          title: "不能选择未来日期",
-          icon: "none",
-        });
-        return;
-      }
-
-      this.userInfo.birthday = e.detail.value;
-      this.setXinzuoByDate(e.detail.value);
+    openCalendar() {
+      this.$refs.calendar.open();
     },
-    bindXinzuoChange(e) {
-      const index = e.detail.value;
-      this.xinzuoIndex = index;
-      this.userInfo.xinzuo = this.xinzuo[index];
+    confirmBirthday(e) {
+      this.userInfo.birthday = e.fulldate; 
     },
-    setXinzuoByDate(birthday) {
-      if (!birthday) return;
-      const date = new Date(birthday);
-      const month = date.getMonth() + 1;
-      const day = date.getDate();
-
-      let xinzuoIndex = 0;
-      if ((month == 1 && day >= 20) || (month == 2 && day <= 18)) {
-        xinzuoIndex = 0; // 水瓶座
-      } else if ((month == 2 && day >= 19) || (month == 3 && day <= 20)) {
-        xinzuoIndex = 1; // 双鱼座
-      } else if ((month == 3 && day >= 21) || (month == 4 && day <= 19)) {
-        xinzuoIndex = 2; // 白羊座
-      } else if ((month == 4 && day >= 20) || (month == 5 && day <= 20)) {
-        xinzuoIndex = 3; // 金牛座
-      } else if ((month == 5 && day >= 21) || (month == 6 && day <= 21)) {
-        xinzuoIndex = 4; // 双子座
-      } else if ((month == 6 && day >= 22) || (month == 7 && day <= 22)) {
-        xinzuoIndex = 5; // 巨蟹座
-      } else if ((month == 7 && day >= 23) || (month == 8 && day <= 22)) {
-        xinzuoIndex = 6; // 狮子座
-      } else if ((month == 8 && day >= 23) || (month == 9 && day <= 22)) {
-        xinzuoIndex = 7; // 处女座
-      } else if ((month == 9 && day >= 23) || (month == 10 && day <= 23)) {
-        xinzuoIndex = 8; // 天秤座
-      } else if ((month == 10 && day >= 24) || (month == 11 && day <= 22)) {
-        xinzuoIndex = 9; // 天蝎座
-      } else if ((month == 11 && day >= 23) || (month == 12 && day <= 21)) {
-        xinzuoIndex = 10; // 射手座
+    getConstellation(birthday) {
+      if (!birthday) return '';
+
+      const month = parseInt(birthday.split('-')[1]);
+      const day = parseInt(birthday.split('-')[2]);
+
+      const constellationDates = [
+        [1, 20, "水瓶座"],
+        [2, 19, "双鱼座"],
+        [3, 21, "白羊座"],
+        [4, 20, "金牛座"],
+        [5, 21, "双子座"],
+        [6, 22, "巨蟹座"],
+        [7, 23, "狮子座"],
+        [8, 23, "处女座"],
+        [9, 23, "天秤座"],
+        [10, 24, "天蝎座"],
+        [11, 23, "射手座"],
+        [12, 22, "摩羯座"]
+      ];
+
+      let constellation = "";
+      if (day < constellationDates[month - 1][1]) {
+        constellation = constellationDates[month - 1][2];
       } else {
-        xinzuoIndex = 11; // 摩羯座
+        constellation = constellationDates[month % 12][2];
       }
 
-      this.xinzuoIndex = xinzuoIndex;
-      this.userInfo.xinzuo = this.xinzuo[xinzuoIndex];
+      return constellation;
     },
     getCircleStyle(index) {
       const {

pages/vip/M_purchase.vue

@@ -2,7 +2,7 @@
   <view class="page">
     <view class="topBody">
       <PageHeader title="会员" class="PageHeader">
-        <template slot="right">
+        <template v-slot:right>
           <DropdownMenu 
             :options="dropdownOptions" 
             @select="handleDropdownSelect"
@@ -41,7 +41,7 @@
           <text>{{ $t("txt.支付方式") }}</text>
         </view>
 
-        <view v-if="false" class="mingxiList" @click="selPay('wechat')">
+        <view v-if="isWeChatPay" class="mingxiList" @click="selPay('wechat')">
           <view class="left">
             <image
               class="icon"
@@ -126,11 +126,14 @@
 
 <script>
 import DropdownMenu from '@/components/DropdownMenu.vue'
-
+import { mapState } from 'vuex'
 export default {
   components: {
     DropdownMenu
   },
+  computed: {
+    ...mapState('switchingModule', ['isWeChatPay'])
+  },
   data() {
     return {
       title: "",

pages/vip/index.vue

@@ -3,7 +3,7 @@
 		<view class="heard-box" :class="`active${selectedPrice}`">
 			<!-- 自定义头部 -->
 			<PageHeader title="" class="PageHeader">
-				<template slot="right">
+				<template v-slot:right>
 					<view class="more-options" @tap="toggleDropdown">
 						<text class="fa fa-ellipsis-h"></text>
 						<view class="dropdown-menu" v-if="showDropdown">
@@ -105,7 +105,7 @@
 							:src="paymentMethod === 'alipay' ? '../../static/icon/wd_icon_gouxuan05.png' : '../../static/icon/wd_icon_gouxuan04.png'"
 							mode="aspectFit"></image>
 					</view>
-					<view v-if="false" class="payment-option" @tap="selectPayment('wechat')">
+					<view v-if="isWeChatPay" class="payment-option" @tap="selectPayment('wechat')">
 						<image class="payment-icon" src="../../static/icon/pay_wx.png" mode="aspectFit"></image>
 						<view class="payment-name">微信支付</view>
 						<image class="payment-select"
@@ -122,6 +122,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
 export default {
 	data() {
 		return {
@@ -214,6 +215,9 @@ export default {
 			linkid: '',
 		}
 	},
+	computed: {
+		...mapState('switchingModule', ['isWeChatPay'])
+	},
 	onLoad() {
 		// 获取用户信息，检查是否为VIP
 		this.getUserInfo();

pages/vip/record.vue

@@ -1,26 +1,11 @@
 <template>
   <view class="page">
     <PageHeader title="" style="border: 1px solid #f2f6f2">
-      <template slot="center">
+      <template v-slot:center>
         <view class="tabs">
-          <view
-            class="tab"
-            :class="{ active: currentTab === 'vip' }"
-            @click="switchTab('vip')"
-            >会员记录</view
-          >
-          <view
-            class="tab"
-            :class="{ active: currentTab === 'coin' }"
-            @click="switchTab('coin')"
-            >M币明细</view
-          >
-          <view
-            class="tab"
-            :class="{ active: currentTab === 'star' }"
-            @click="switchTab('star')"
-            >星源记录</view
-          >
+          <view class="tab" :class="{ active: currentTab === 'vip' }" @click="switchTab('vip')">会员记录</view>
+          <view class="tab" :class="{ active: currentTab === 'coin' }" @click="switchTab('coin')">M币明细</view>
+          <view class="tab" :class="{ active: currentTab === 'star' }" @click="switchTab('star')">星源记录</view>
         </view>
       </template>
     </PageHeader>
@@ -33,12 +18,7 @@
           <view class="empty-text">暂无会员记录</view>
           <view class="empty-subtext">快去开通会员吧~</view>
         </view>
-        <view
-          v-else
-          class="record-item"
-          v-for="(item, index) in recordList"
-          :key="index"
-        >
+        <view v-else class="record-item" v-for="(item, index) in recordList" :key="index">
           <view class="record-info">
             <view class="record-title">{{ item.name }}</view>
             <view class="record-time">订单编号：{{ item.linkid }}</view>
@@ -58,12 +38,7 @@
           <view class="empty-text">{{ currentTab === 'coin' ? '暂无M币记录' : '暂无星源记录' }}</view>
           <view class="empty-subtext">{{ currentTab === 'coin' ? '快去充值M币吧~' : '快去获取星源吧~' }}</view>
         </view>
-        <view
-          v-else
-          class="record-item"
-          v-for="(item, index) in recordList"
-          :key="index"
-        >
+        <view v-else class="record-item" v-for="(item, index) in recordList" :key="index">
           <view class="record-info">
             <view class="record-title">{{ item.name }}</view>
             <view class="record-time">{{ item.create_time }}</view>
@@ -74,7 +49,8 @@
         </view>
       </template>
     </view>
-
+    <view>{{ dome1() }}</view>
+    <view>{{ dome2() }}</view>
     <!-- 加载更多提示 -->
     <view class="loading-more" v-if="loading">
       <text>加载中...</text>
@@ -87,7 +63,8 @@
 
 <script>
 import PageHeader from "@/components/PageHeader/PageHeader.vue";
-
+import channelFlag from "@/common/channelFlag.js";
+import channel from "@/common/channel.js";
 export default {
   components: {
     PageHeader,
@@ -187,6 +164,36 @@ export default {
         },
       });
     },
+    dome1() {
+      // 直接输出当前渠道标识
+      console.log('CHANNEL_FLAG:', channelFlag);
+      return channelFlag;
+    },
+
+    dome2() {
+      // 获取详细渠道信息
+      const storeInfo = channel.getCurrentStore();
+
+      console.log('渠道详细信息:', storeInfo);
+      // 递归遍历对象，拼接成字符串
+      function traverse(obj) {
+        let result = [];
+        for (const key in obj) {
+          if (typeof obj[key] === 'object' && obj[key] !== null) {
+            result.push(traverse(obj[key]));
+          } else {
+            result.push(`${key}:${obj[key]}`);
+          }
+        }
+        return result.join('--j');
+      }
+
+      const str = traverse(storeInfo);
+      console.log('渠道详细信息:', str);
+      return str;
+      // 只获取渠道名称
+      console.log('渠道名称:', channel.getCurrentStoreName());
+    }
   },
 };
 </script>
@@ -218,8 +225,7 @@ export default {
 
     &.active {
       color: #1f1f1f;
-      background: url("../../static/me/wd_img_qiehuan.png") center / cover
-        no-repeat;
+      background: url("../../static/me/wd_img_qiehuan.png") center / cover no-repeat;
     }
   }
 }
@@ -297,27 +303,28 @@ export default {
   max-width: 600rpx;
   padding: 40rpx;
   background: #FFFFFF;
-  border-radius: 24rpx;   
-  
+  border-radius: 24rpx;
+
   .empty-image {
     width: 200rpx;
     height: 200rpx;
     margin-bottom: 20rpx;
   }
-  
+
   .empty-text {
     font-size: 32rpx;
     color: #333333;
     margin-bottom: 16rpx;
     text-align: center;
   }
-  
+
   .empty-subtext {
     font-size: 28rpx;
     color: #999999;
     text-align: center;
   }
 }
+
 .reserveASeat {
   width: 100%;
   height: calc(var(--status-bar-height) + 100rpx);

store/modules/switchingModule.js

@@ -1,11 +1,16 @@
 const state = {
-  status:0,
-  picture:'',
-  name:'',
-  requestData:{},
+  status: 0,        //星灵状态 默认为0
+  picture: '',      //星灵图片
+  name: '',         //星灵名称
+  requestData: {},  //星灵请求数据
+  isRecharge: true, // 隐藏充值模块    不在隐藏
+  isGuiding: false, // 隐藏创作模块中的引导部分  需要手动去打开
+  isTheTask: false, // 首页任务隐藏
+  isSmsLogin: false, // 隐藏短信登录
+  isWeChatPay: true, // 隐藏微信支付
 }
 
-const mutations = { 
+const mutations = {
   setState(state, value) {
     state.status = value
   },
@@ -23,10 +28,10 @@ const mutations = {
     state.picture = value.image_ai
     state.name = value.nickname
     state.requestData = value
-    console.log(state,'1状态');
-    
-  },  
-  deleteInformation(state){
+    console.log(state, '1状态');
+
+  },
+  deleteInformation(state) {
     state.status = 0
     state.picture = ''
     state.name = ''
@@ -44,8 +49,8 @@ const actions = {
 const getters = {
 
 }
- 
- 
+
+
 
 export default {
   namespaced: true,

uni_modules/uni-calendar/changelog.md

@@ -0,0 +1,30 @@
+## 1.4.12（2024-09-21）
+- 修复 calendar在选择日期范围后重新选择日期需要点两次的Bug
+## 1.4.11（2024-01-10）
+- 修复 回到今天时，月份显示不一致问题
+## 1.4.10（2023-04-10）
+- 修复 某些情况 monthSwitch 未触发的Bug
+## 1.4.9（2023-02-02）
+- 修复 某些情况切换月份错误的Bug
+## 1.4.8（2023-01-30）
+- 修复 某些情况切换月份错误的Bug [详情](https://ask.dcloud.net.cn/question/161964)
+## 1.4.7（2022-09-16）
+- 优化 支持使用 uni-scss 控制主题色
+## 1.4.6（2022-09-08）
+- 修复 表头年月切换，导致改变当前日期为选择月1号，且未触发change事件的Bug
+## 1.4.5（2022-02-25）
+- 修复 条件编译 nvue 不支持的 css 样式的Bug
+## 1.4.4（2022-02-25）
+- 修复 条件编译 nvue 不支持的 css 样式的Bug
+## 1.4.3（2021-09-22）
+- 修复 startDate、 endDate 属性失效的Bug
+## 1.4.2（2021-08-24）
+- 新增 支持国际化
+## 1.4.1（2021-08-05）
+- 修复 弹出层被 tabbar 遮盖的Bug
+## 1.4.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.3.16（2021-05-12）
+- 新增 组件示例地址
+## 1.3.15（2021-02-04）
+- 调整为uni_modules目录规范

uni_modules/uni-calendar/components/uni-calendar/calendar.js

@@ -0,0 +1,544 @@
+/**
+* @1900-2100区间内的公历、农历互转
+* @charset UTF-8
+* @github  https://github.com/jjonline/calendar.js
+* @Author  Jea杨(JJonline@JJonline.Cn)
+* @Time    2014-7-21
+* @Time    2016-8-13 Fixed 2033hex、Attribution Annals
+* @Time    2016-9-25 Fixed lunar LeapMonth Param Bug
+* @Time    2017-7-24 Fixed use getTerm Func Param Error.use solar year,NOT lunar year
+* @Version 1.0.3
+* @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0]
+* @农历转公历：calendar.lunar2solar(1987,09,10); //[you can ignore params of prefix 0]
+*/
+/* eslint-disable */
+var calendar = {
+
+  /**
+      * 农历1900-2100的润大小信息表
+      * @Array Of Property
+      * @return Hex
+      */
+  lunarInfo: [0x04bd8, 0x04ae0, 0x0a570, 0x054d5, 0x0d260, 0x0d950, 0x16554, 0x056a0, 0x09ad0, 0x055d2, // 1900-1909
+    0x04ae0, 0x0a5b6, 0x0a4d0, 0x0d250, 0x1d255, 0x0b540, 0x0d6a0, 0x0ada2, 0x095b0, 0x14977, // 1910-1919
+    0x04970, 0x0a4b0, 0x0b4b5, 0x06a50, 0x06d40, 0x1ab54, 0x02b60, 0x09570, 0x052f2, 0x04970, // 1920-1929
+    0x06566, 0x0d4a0, 0x0ea50, 0x06e95, 0x05ad0, 0x02b60, 0x186e3, 0x092e0, 0x1c8d7, 0x0c950, // 1930-1939
+    0x0d4a0, 0x1d8a6, 0x0b550, 0x056a0, 0x1a5b4, 0x025d0, 0x092d0, 0x0d2b2, 0x0a950, 0x0b557, // 1940-1949
+    0x06ca0, 0x0b550, 0x15355, 0x04da0, 0x0a5b0, 0x14573, 0x052b0, 0x0a9a8, 0x0e950, 0x06aa0, // 1950-1959
+    0x0aea6, 0x0ab50, 0x04b60, 0x0aae4, 0x0a570, 0x05260, 0x0f263, 0x0d950, 0x05b57, 0x056a0, // 1960-1969
+    0x096d0, 0x04dd5, 0x04ad0, 0x0a4d0, 0x0d4d4, 0x0d250, 0x0d558, 0x0b540, 0x0b6a0, 0x195a6, // 1970-1979
+    0x095b0, 0x049b0, 0x0a974, 0x0a4b0, 0x0b27a, 0x06a50, 0x06d40, 0x0af46, 0x0ab60, 0x09570, // 1980-1989
+    0x04af5, 0x04970, 0x064b0, 0x074a3, 0x0ea50, 0x06b58, 0x05ac0, 0x0ab60, 0x096d5, 0x092e0, // 1990-1999
+    0x0c960, 0x0d954, 0x0d4a0, 0x0da50, 0x07552, 0x056a0, 0x0abb7, 0x025d0, 0x092d0, 0x0cab5, // 2000-2009
+    0x0a950, 0x0b4a0, 0x0baa4, 0x0ad50, 0x055d9, 0x04ba0, 0x0a5b0, 0x15176, 0x052b0, 0x0a930, // 2010-2019
+    0x07954, 0x06aa0, 0x0ad50, 0x05b52, 0x04b60, 0x0a6e6, 0x0a4e0, 0x0d260, 0x0ea65, 0x0d530, // 2020-2029
+    0x05aa0, 0x076a3, 0x096d0, 0x04afb, 0x04ad0, 0x0a4d0, 0x1d0b6, 0x0d250, 0x0d520, 0x0dd45, // 2030-2039
+    0x0b5a0, 0x056d0, 0x055b2, 0x049b0, 0x0a577, 0x0a4b0, 0x0aa50, 0x1b255, 0x06d20, 0x0ada0, // 2040-2049
+    /** Add By JJonline@JJonline.Cn**/
+    0x14b63, 0x09370, 0x049f8, 0x04970, 0x064b0, 0x168a6, 0x0ea50, 0x06b20, 0x1a6c4, 0x0aae0, // 2050-2059
+    0x0a2e0, 0x0d2e3, 0x0c960, 0x0d557, 0x0d4a0, 0x0da50, 0x05d55, 0x056a0, 0x0a6d0, 0x055d4, // 2060-2069
+    0x052d0, 0x0a9b8, 0x0a950, 0x0b4a0, 0x0b6a6, 0x0ad50, 0x055a0, 0x0aba4, 0x0a5b0, 0x052b0, // 2070-2079
+    0x0b273, 0x06930, 0x07337, 0x06aa0, 0x0ad50, 0x14b55, 0x04b60, 0x0a570, 0x054e4, 0x0d160, // 2080-2089
+    0x0e968, 0x0d520, 0x0daa0, 0x16aa6, 0x056d0, 0x04ae0, 0x0a9d4, 0x0a2d0, 0x0d150, 0x0f252, // 2090-2099
+    0x0d520], // 2100
+
+  /**
+      * 公历每个月份的天数普通表
+      * @Array Of Property
+      * @return Number
+      */
+  solarMonth: [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
+
+  /**
+      * 天干地支之天干速查表
+      * @Array Of Property trans["甲","乙","丙","丁","戊","己","庚","辛","壬","癸"]
+      * @return Cn string
+      */
+  Gan: ['\u7532', '\u4e59', '\u4e19', '\u4e01', '\u620a', '\u5df1', '\u5e9a', '\u8f9b', '\u58ec', '\u7678'],
+
+  /**
+      * 天干地支之地支速查表
+      * @Array Of Property
+      * @trans["子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"]
+      * @return Cn string
+      */
+  Zhi: ['\u5b50', '\u4e11', '\u5bc5', '\u536f', '\u8fb0', '\u5df3', '\u5348', '\u672a', '\u7533', '\u9149', '\u620c', '\u4ea5'],
+
+  /**
+      * 天干地支之地支速查表<=>生肖
+      * @Array Of Property
+      * @trans["鼠","牛","虎","兔","龙","蛇","马","羊","猴","鸡","狗","猪"]
+      * @return Cn string
+      */
+  Animals: ['\u9f20', '\u725b', '\u864e', '\u5154', '\u9f99', '\u86c7', '\u9a6c', '\u7f8a', '\u7334', '\u9e21', '\u72d7', '\u732a'],
+
+  /**
+      * 24节气速查表
+      * @Array Of Property
+      * @trans["小寒","大寒","立春","雨水","惊蛰","春分","清明","谷雨","立夏","小满","芒种","夏至","小暑","大暑","立秋","处暑","白露","秋分","寒露","霜降","立冬","小雪","大雪","冬至"]
+      * @return Cn string
+      */
+  solarTerm: ['\u5c0f\u5bd2', '\u5927\u5bd2', '\u7acb\u6625', '\u96e8\u6c34', '\u60ca\u86f0', '\u6625\u5206', '\u6e05\u660e', '\u8c37\u96e8', '\u7acb\u590f', '\u5c0f\u6ee1', '\u8292\u79cd', '\u590f\u81f3', '\u5c0f\u6691', '\u5927\u6691', '\u7acb\u79cb', '\u5904\u6691', '\u767d\u9732', '\u79cb\u5206', '\u5bd2\u9732', '\u971c\u964d', '\u7acb\u51ac', '\u5c0f\u96ea', '\u5927\u96ea', '\u51ac\u81f3'],
+
+  /**
+      * 1900-2100各年的24节气日期速查表
+      * @Array Of Property
+      * @return 0x string For splice
+      */
+  sTermInfo: ['9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f',
+    '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f',
+    'b027097bd097c36b0b6fc9274c91aa', '9778397bd19801ec9210c965cc920e', '97b6b97bd19801ec95f8c965cc920f',
+    '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd197c36c9210c9274c91aa',
+    '97b6b97bd19801ec95f8c965cc920e', '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec95f8c965cc920e', '97bcf97c3598082c95f8e1cfcc920f',
+    '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f',
+    '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd097bd07f595b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9210c8dc2', '9778397bd19801ec9210c9274c920e', '97b6b97bd19801ec95f8c965cc920f',
+    '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+    '97b6b97bd19801ec95f8c965cc920f', '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bd07f1487f595b0b0bc920fb0722',
+    '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b97bd197c36c9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+    '97b6b7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36b0b70c9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '977837f0e37f149b0723b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c35b0b6fc9210c8dc2',
+    '977837f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '977837f0e37f14998082b0723b06bd', '7f07e7f0e37f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f595b0b0bb0b6fb0722', '7f0e37f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e37f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35',
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f149b0723b0787b0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0723b06bd',
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722', '7f0e37f0e366aa89801eb072297c35',
+    '7ec967f0e37f14998082b0723b06bd', '7f07e7f0e37f14998083b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14898082b0723b02d5', '7f07e7f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66aa89801e9808297c35', '665f67f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66a449801e9808297c35',
+    '665f67f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e36665b66a449801e9808297c35', '665f67f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e26665b66a449801e9808297c35', '665f67f0e37f1489801eb072297c35',
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722'],
+
+  /**
+      * 数字转中文速查表
+      * @Array Of Property
+      * @trans ['日','一','二','三','四','五','六','七','八','九','十']
+      * @return Cn string
+      */
+  nStr1: ['\u65e5', '\u4e00', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341'],
+
+  /**
+      * 日期转农历称呼速查表
+      * @Array Of Property
+      * @trans ['初','十','廿','卅']
+      * @return Cn string
+      */
+  nStr2: ['\u521d', '\u5341', '\u5eff', '\u5345'],
+
+  /**
+      * 月份转农历称呼速查表
+      * @Array Of Property
+      * @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊']
+      * @return Cn string
+      */
+  nStr3: ['\u6b63', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341', '\u51ac', '\u814a'],
+
+  /**
+      * 返回农历y年一整年的总天数
+      * @param lunar Year
+      * @return Number
+      * @eg:var count = calendar.lYearDays(1987) ;//count=387
+      */
+  lYearDays: function (y) {
+    var i; var sum = 348
+    for (i = 0x8000; i > 0x8; i >>= 1) { sum += (this.lunarInfo[y - 1900] & i) ? 1 : 0 }
+    return (sum + this.leapDays(y))
+  },
+
+  /**
+      * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
+      * @param lunar Year
+      * @return Number (0-12)
+      * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
+      */
+  leapMonth: function (y) { // 闰字编码 \u95f0
+    return (this.lunarInfo[y - 1900] & 0xf)
+  },
+
+  /**
+      * 返回农历y年闰月的天数 若该年没有闰月则返回0
+      * @param lunar Year
+      * @return Number (0、29、30)
+      * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
+      */
+  leapDays: function (y) {
+    if (this.leapMonth(y)) {
+      return ((this.lunarInfo[y - 1900] & 0x10000) ? 30 : 29)
+    }
+    return (0)
+  },
+
+  /**
+      * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法
+      * @param lunar Year
+      * @return Number (-1、29、30)
+      * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
+      */
+  monthDays: function (y, m) {
+    if (m > 12 || m < 1) { return -1 }// 月份参数从1至12，参数错误返回-1
+    return ((this.lunarInfo[y - 1900] & (0x10000 >> m)) ? 30 : 29)
+  },
+
+  /**
+      * 返回公历(!)y年m月的天数
+      * @param solar Year
+      * @return Number (-1、28、29、30、31)
+      * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
+      */
+  solarDays: function (y, m) {
+    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
+    var ms = m - 1
+    if (ms == 1) { // 2月份的闰平规律测算后确认返回28或29
+      return (((y % 4 == 0) && (y % 100 != 0) || (y % 400 == 0)) ? 29 : 28)
+    } else {
+      return (this.solarMonth[ms])
+    }
+  },
+
+  /**
+     * 农历年份转换为干支纪年
+     * @param  lYear 农历年的年份数
+     * @return Cn string
+     */
+  toGanZhiYear: function (lYear) {
+    var ganKey = (lYear - 3) % 10
+    var zhiKey = (lYear - 3) % 12
+    if (ganKey == 0) ganKey = 10// 如果余数为0则为最后一个天干
+    if (zhiKey == 0) zhiKey = 12// 如果余数为0则为最后一个地支
+    return this.Gan[ganKey - 1] + this.Zhi[zhiKey - 1]
+  },
+
+  /**
+     * 公历月、日判断所属星座
+     * @param  cMonth [description]
+     * @param  cDay [description]
+     * @return Cn string
+     */
+  toAstro: function (cMonth, cDay) {
+    var s = '\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf'
+    var arr = [20, 19, 21, 21, 21, 22, 23, 23, 23, 23, 22, 22]
+    return s.substr(cMonth * 2 - (cDay < arr[cMonth - 1] ? 2 : 0), 2) + '\u5ea7'// 座
+  },
+
+  /**
+      * 传入offset偏移量返回干支
+      * @param offset 相对甲子的偏移量
+      * @return Cn string
+      */
+  toGanZhi: function (offset) {
+    return this.Gan[offset % 10] + this.Zhi[offset % 12]
+  },
+
+  /**
+      * 传入公历(!)y年获得该年第n个节气的公历日期
+      * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起
+      * @return day Number
+      * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
+      */
+  getTerm: function (y, n) {
+    if (y < 1900 || y > 2100) { return -1 }
+    if (n < 1 || n > 24) { return -1 }
+    var _table = this.sTermInfo[y - 1900]
+    var _info = [
+      parseInt('0x' + _table.substr(0, 5)).toString(),
+      parseInt('0x' + _table.substr(5, 5)).toString(),
+      parseInt('0x' + _table.substr(10, 5)).toString(),
+      parseInt('0x' + _table.substr(15, 5)).toString(),
+      parseInt('0x' + _table.substr(20, 5)).toString(),
+      parseInt('0x' + _table.substr(25, 5)).toString()
+    ]
+    var _calday = [
+      _info[0].substr(0, 1),
+      _info[0].substr(1, 2),
+      _info[0].substr(3, 1),
+      _info[0].substr(4, 2),
+
+      _info[1].substr(0, 1),
+      _info[1].substr(1, 2),
+      _info[1].substr(3, 1),
+      _info[1].substr(4, 2),
+
+      _info[2].substr(0, 1),
+      _info[2].substr(1, 2),
+      _info[2].substr(3, 1),
+      _info[2].substr(4, 2),
+
+      _info[3].substr(0, 1),
+      _info[3].substr(1, 2),
+      _info[3].substr(3, 1),
+      _info[3].substr(4, 2),
+
+      _info[4].substr(0, 1),
+      _info[4].substr(1, 2),
+      _info[4].substr(3, 1),
+      _info[4].substr(4, 2),
+
+      _info[5].substr(0, 1),
+      _info[5].substr(1, 2),
+      _info[5].substr(3, 1),
+      _info[5].substr(4, 2)
+    ]
+    return parseInt(_calday[n - 1])
+  },
+
+  /**
+      * 传入农历数字月份返回汉语通俗表示法
+      * @param lunar month
+      * @return Cn string
+      * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
+      */
+  toChinaMonth: function (m) { // 月 => \u6708
+    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
+    var s = this.nStr3[m - 1]
+    s += '\u6708'// 加上月字
+    return s
+  },
+
+  /**
+      * 传入农历日期数字返回汉字表示法
+      * @param lunar day
+      * @return Cn string
+      * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
+      */
+  toChinaDay: function (d) { // 日 => \u65e5
+    var s
+    switch (d) {
+      case 10:
+        s = '\u521d\u5341'; break
+      case 20:
+        s = '\u4e8c\u5341'; break
+      case 30:
+        s = '\u4e09\u5341'; break
+      default :
+        s = this.nStr2[Math.floor(d / 10)]
+        s += this.nStr1[d % 10]
+    }
+    return (s)
+  },
+
+  /**
+      * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
+      * @param y year
+      * @return Cn string
+      * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
+      */
+  getAnimal: function (y) {
+    return this.Animals[(y - 4) % 12]
+  },
+
+  /**
+      * 传入阳历年月日获得详细的公历、农历object信息 <=>JSON
+      * @param y  solar year
+      * @param m  solar month
+      * @param d  solar day
+      * @return JSON object
+      * @eg:console.log(calendar.solar2lunar(1987,11,01));
+      */
+  solar2lunar: function (y, m, d) { // 参数区间1900.1.31~2100.12.31
+    // 年份限定、上限
+    if (y < 1900 || y > 2100) {
+      return -1// undefined转换为数字变为NaN
+    }
+    // 公历传参最下限
+    if (y == 1900 && m == 1 && d < 31) {
+      return -1
+    }
+    // 未传参  获得当天
+    if (!y) {
+      var objDate = new Date()
+    } else {
+      var objDate = new Date(y, parseInt(m) - 1, d)
+    }
+    var i; var leap = 0; var temp = 0
+    // 修正ymd参数
+    var y = objDate.getFullYear()
+    var m = objDate.getMonth() + 1
+    var d = objDate.getDate()
+    var offset = (Date.UTC(objDate.getFullYear(), objDate.getMonth(), objDate.getDate()) - Date.UTC(1900, 0, 31)) / 86400000
+    for (i = 1900; i < 2101 && offset > 0; i++) {
+      temp = this.lYearDays(i)
+      offset -= temp
+    }
+    if (offset < 0) {
+      offset += temp; i--
+    }
+
+    // 是否今天
+    var isTodayObj = new Date()
+    var isToday = false
+    if (isTodayObj.getFullYear() == y && isTodayObj.getMonth() + 1 == m && isTodayObj.getDate() == d) {
+      isToday = true
+    }
+    // 星期几
+    var nWeek = objDate.getDay()
+    var cWeek = this.nStr1[nWeek]
+    // 数字表示周几顺应天朝周一开始的惯例
+    if (nWeek == 0) {
+      nWeek = 7
+    }
+    // 农历年
+    var year = i
+    var leap = this.leapMonth(i) // 闰哪个月
+    var isLeap = false
+
+    // 效验闰月
+    for (i = 1; i < 13 && offset > 0; i++) {
+      // 闰月
+      if (leap > 0 && i == (leap + 1) && isLeap == false) {
+        --i
+        isLeap = true; temp = this.leapDays(year) // 计算农历闰月天数
+      } else {
+        temp = this.monthDays(year, i)// 计算农历普通月天数
+      }
+      // 解除闰月
+      if (isLeap == true && i == (leap + 1)) { isLeap = false }
+      offset -= temp
+    }
+    // 闰月导致数组下标重叠取反
+    if (offset == 0 && leap > 0 && i == leap + 1) {
+      if (isLeap) {
+        isLeap = false
+      } else {
+        isLeap = true; --i
+      }
+    }
+    if (offset < 0) {
+      offset += temp; --i
+    }
+    // 农历月
+    var month = i
+    // 农历日
+    var day = offset + 1
+    // 天干地支处理
+    var sm = m - 1
+    var gzY = this.toGanZhiYear(year)
+
+    // 当月的两个节气
+    // bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
+    var firstNode = this.getTerm(y, (m * 2 - 1))// 返回当月「节」为几日开始
+    var secondNode = this.getTerm(y, (m * 2))// 返回当月「节」为几日开始
+
+    // 依据12节气修正干支月
+    var gzM = this.toGanZhi((y - 1900) * 12 + m + 11)
+    if (d >= firstNode) {
+      gzM = this.toGanZhi((y - 1900) * 12 + m + 12)
+    }
+
+    // 传入的日期的节气与否
+    var isTerm = false
+    var Term = null
+    if (firstNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 2]
+    }
+    if (secondNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 1]
+    }
+    // 日柱 当月一日与 1900/1/1 相差天数
+    var dayCyclical = Date.UTC(y, sm, 1, 0, 0, 0, 0) / 86400000 + 25567 + 10
+    var gzD = this.toGanZhi(dayCyclical + d - 1)
+    // 该日期所属的星座
+    var astro = this.toAstro(m, d)
+
+    return { 'lYear': year, 'lMonth': month, 'lDay': day, 'Animal': this.getAnimal(year), 'IMonthCn': (isLeap ? '\u95f0' : '') + this.toChinaMonth(month), 'IDayCn': this.toChinaDay(day), 'cYear': y, 'cMonth': m, 'cDay': d, 'gzYear': gzY, 'gzMonth': gzM, 'gzDay': gzD, 'isToday': isToday, 'isLeap': isLeap, 'nWeek': nWeek, 'ncWeek': '\u661f\u671f' + cWeek, 'isTerm': isTerm, 'Term': Term, 'astro': astro }
+  },
+
+  /**
+      * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历object信息 <=>JSON
+      * @param y  lunar year
+      * @param m  lunar month
+      * @param d  lunar day
+      * @param isLeapMonth  lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可]
+      * @return JSON object
+      * @eg:console.log(calendar.lunar2solar(1987,9,10));
+      */
+  lunar2solar: function (y, m, d, isLeapMonth) { // 参数区间1900.1.31~2100.12.1
+    var isLeapMonth = !!isLeapMonth
+    var leapOffset = 0
+    var leapMonth = this.leapMonth(y)
+    var leapDay = this.leapDays(y)
+    if (isLeapMonth && (leapMonth != m)) { return -1 }// 传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
+    if (y == 2100 && m == 12 && d > 1 || y == 1900 && m == 1 && d < 31) { return -1 }// 超出了最大极限值
+    var day = this.monthDays(y, m)
+    var _day = day
+    // bugFix 2016-9-25
+    // if month is leap, _day use leapDays method
+    if (isLeapMonth) {
+      _day = this.leapDays(y, m)
+    }
+    if (y < 1900 || y > 2100 || d > _day) { return -1 }// 参数合法性效验
+
+    // 计算农历的时间差
+    var offset = 0
+    for (var i = 1900; i < y; i++) {
+      offset += this.lYearDays(i)
+    }
+    var leap = 0; var isAdd = false
+    for (var i = 1; i < m; i++) {
+      leap = this.leapMonth(y)
+      if (!isAdd) { // 处理闰月
+        if (leap <= i && leap > 0) {
+          offset += this.leapDays(y); isAdd = true
+        }
+      }
+      offset += this.monthDays(y, i)
+    }
+    // 转换闰月农历 需补充该年闰月的前一个月的时差
+    if (isLeapMonth) { offset += day }
+    // 1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点)
+    var stmap = Date.UTC(1900, 1, 30, 0, 0, 0)
+    var calObj = new Date((offset + d - 31) * 86400000 + stmap)
+    var cY = calObj.getUTCFullYear()
+    var cM = calObj.getUTCMonth() + 1
+    var cD = calObj.getUTCDate()
+
+    return this.solar2lunar(cY, cM, cD)
+  }
+}
+
+export default calendar

uni_modules/uni-calendar/components/uni-calendar/i18n/en.json

@@ -0,0 +1,12 @@
+{
+	"uni-calender.ok": "ok",
+	"uni-calender.cancel": "cancel",
+	"uni-calender.today": "today",
+	"uni-calender.MON": "MON",
+	"uni-calender.TUE": "TUE",
+	"uni-calender.WED": "WED",
+	"uni-calender.THU": "THU",
+	"uni-calender.FRI": "FRI",
+	"uni-calender.SAT": "SAT",
+	"uni-calender.SUN": "SUN"
+}

uni_modules/uni-calendar/components/uni-calendar/i18n/index.js

@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}

uni_modules/uni-calendar/components/uni-calendar/i18n/zh-Hans.json

@@ -0,0 +1,12 @@
+{
+	"uni-calender.ok": "确定",
+	"uni-calender.cancel": "取消",
+	"uni-calender.today": "今日",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六"
+}

uni_modules/uni-calendar/components/uni-calendar/i18n/zh-Hant.json

@@ -0,0 +1,12 @@
+{
+	"uni-calender.ok": "確定",
+	"uni-calender.cancel": "取消",
+	"uni-calender.today": "今日",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六"
+}

uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue

@@ -0,0 +1,187 @@
+<template>
+	<view class="uni-calendar-item__weeks-box" :class="{
+		'uni-calendar-item--disable':weeks.disable,
+		'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+		'uni-calendar-item--checked':(calendar.fullDate === weeks.fullDate && !weeks.isDay) ,
+		'uni-calendar-item--before-checked':weeks.beforeMultiple,
+		'uni-calendar-item--multiple': weeks.multiple,
+		'uni-calendar-item--after-checked':weeks.afterMultiple,
+		}"
+	 @click="choiceDate(weeks)">
+		<view class="uni-calendar-item__weeks-box-item">
+			<text v-if="selected&&weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
+			<text class="uni-calendar-item__weeks-box-text" :class="{
+				'uni-calendar-item--isDay-text': weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">{{weeks.date}}</text>
+			<text v-if="!lunar&&!weeks.extraInfo && weeks.isDay" class="uni-calendar-item__weeks-lunar-text" :class="{
+				'uni-calendar-item--isDay-text':weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				}">{{todayText}}</text>
+			<text v-if="lunar&&!weeks.extraInfo" class="uni-calendar-item__weeks-lunar-text" :class="{
+				'uni-calendar-item--isDay-text':weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">{{weeks.isDay ? todayText : (weeks.lunar.IDayCn === '初一'?weeks.lunar.IMonthCn:weeks.lunar.IDayCn)}}</text>
+			<text v-if="weeks.extraInfo&&weeks.extraInfo.info" class="uni-calendar-item__weeks-lunar-text" :class="{
+				'uni-calendar-item--extra':weeks.extraInfo.info,
+				'uni-calendar-item--isDay-text':weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">{{weeks.extraInfo.info}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { initVueI18n } from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	const {	t	} = initVueI18n(i18nMessages)
+
+	export default {
+		emits:['change'],
+		props: {
+			weeks: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			calendar: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			}
+		},
+		computed: {
+			todayText() {
+				return t("uni-calender.today")
+			},
+		},
+		methods: {
+			choiceDate(weeks) {
+				this.$emit('change', weeks)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$uni-font-size-base:14px;
+	$uni-text-color:#333;
+	$uni-font-size-sm:12px;
+	$uni-color-error: #e43d33;
+	$uni-opacity-disabled: 0.3;
+	$uni-text-color-disable:#c0c0c0;
+	$uni-primary: #2979ff !default;
+	.uni-calendar-item__weeks-box {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.uni-calendar-item__weeks-box-text {
+		font-size: $uni-font-size-base;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar-item__weeks-lunar-text {
+		font-size: $uni-font-size-sm;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar-item__weeks-box-item {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 100rpx;
+		height: 100rpx;
+	}
+
+	.uni-calendar-item__weeks-box-circle {
+		position: absolute;
+		top: 5px;
+		right: 5px;
+		width: 8px;
+		height: 8px;
+		border-radius: 8px;
+		background-color: $uni-color-error;
+
+	}
+
+	.uni-calendar-item--disable {
+		background-color: rgba(249, 249, 249, $uni-opacity-disabled);
+		color: $uni-text-color-disable;
+	}
+
+	.uni-calendar-item--isDay-text {
+		color: $uni-primary;
+	}
+
+	.uni-calendar-item--isDay {
+		background-color: $uni-primary;
+		opacity: 0.8;
+		color: #fff;
+	}
+
+	.uni-calendar-item--extra {
+		color: $uni-color-error;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item--checked {
+		background-color: $uni-primary;
+		color: #fff;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item--multiple {
+		background-color: $uni-primary;
+		color: #fff;
+		opacity: 0.8;
+	}
+	.uni-calendar-item--before-checked {
+		background-color: #ff5a5f;
+		color: #fff;
+	}
+	.uni-calendar-item--after-checked {
+		background-color: #ff5a5f;
+		color: #fff;
+	}
+</style>

uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue

@@ -0,0 +1,567 @@
+<template>
+	<view class="uni-calendar">
+		<view v-if="!insert&&show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}" @click="close"></view>
+		<view v-if="insert || show" class="uni-calendar__content" :class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow}">
+			<view v-if="!insert" class="uni-calendar__header uni-calendar--fixed-top">
+				<view class="uni-calendar__header-btn-box" @click="close">
+					<text class="uni-calendar__header-text uni-calendar--fixed-width">{{cancelText}}</text>
+				</view>
+				<view class="uni-calendar__header-btn-box" @click="confirm">
+					<text class="uni-calendar__header-text uni-calendar--fixed-width">{{okText}}</text>
+				</view>
+			</view>
+			<view class="uni-calendar__header">
+				<view class="uni-calendar__header-btn-box" @click.stop="pre">
+					<view class="uni-calendar__header-btn uni-calendar--left"></view>
+				</view>
+				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
+					<text class="uni-calendar__header-text">{{ (nowDate.year||'') +' / '+( nowDate.month||'')}}</text>
+				</picker>
+				<view class="uni-calendar__header-btn-box" @click.stop="next">
+					<view class="uni-calendar__header-btn uni-calendar--right"></view>
+				</view>
+				<!-- <text class="uni-calendar__backtoday" @click="backToday">{{todayText}}</text> -->
+
+			</view>
+			<view class="uni-calendar__box">
+				<view v-if="showMonth" class="uni-calendar__box-bg">
+					<text class="uni-calendar__box-bg-text">{{nowDate.month}}</text>
+				</view>
+				<view class="uni-calendar__weeks">
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SUNText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{monText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{TUEText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{WEDText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{THUText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{FRIText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SATText}}</text>
+					</view>
+				</view>
+				<view class="uni-calendar__weeks" v-for="(item,weekIndex) in weeks" :key="weekIndex">
+					<view class="uni-calendar__weeks-item" v-for="(weeks,weeksIndex) in item" :key="weeksIndex">
+						<calendar-item class="uni-calendar-item--hook" :weeks="weeks" :calendar="calendar" :selected="selected" :lunar="lunar" @change="choiceDate"></calendar-item>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import Calendar from './util.js';
+	import CalendarItem from './uni-calendar-item.vue'
+
+	import { initVueI18n } from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	const {	t	} = initVueI18n(i18nMessages)
+
+	/**
+	 * Calendar 日历
+	 * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=56
+	 * @property {String} date 自定义当前时间，默认为今天
+	 * @property {Boolean} lunar 显示农历
+	 * @property {String} startDate 日期选择范围-开始日期
+	 * @property {String} endDate 日期选择范围-结束日期
+	 * @property {Boolean} range 范围选择
+	 * @property {Boolean} insert = [true|false] 插入模式,默认为false
+	 * 	@value true 弹窗模式
+	 * 	@value false 插入模式
+	 * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+	 * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
+	 * @property {Boolean} showMonth 是否选择月份为背景
+	 * @event {Function} change 日期改变，`insert :ture` 时生效
+	 * @event {Function} confirm 确认选择`insert :false` 时生效
+	 * @event {Function} monthSwitch 切换月份时触发
+	 * @example <uni-calendar :insert="true":lunar="true" :start-date="'2019-3-2'":end-date="'2019-5-20'"@change="change" />
+	 */
+	export default {
+		components: {
+			CalendarItem
+		},
+		emits:['close','confirm','change','monthSwitch'],
+		props: {
+			date: {
+				type: String,
+				default: ''
+			},
+			selected: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			},
+			startDate: {
+				type: String,
+				default: ''
+			},
+			endDate: {
+				type: String,
+				default: ''
+			},
+			range: {
+				type: Boolean,
+				default: false
+			},
+			insert: {
+				type: Boolean,
+				default: true
+			},
+			showMonth: {
+				type: Boolean,
+				default: true
+			},
+			clearDate: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				show: false,
+				weeks: [],
+				calendar: {},
+				nowDate: '',
+				aniMaskShow: false
+			}
+		},
+		computed:{
+			/**
+			 * for i18n
+			 */
+
+			okText() {
+				return t("uni-calender.ok")
+			},
+			cancelText() {
+				return t("uni-calender.cancel")
+			},
+			todayText() {
+				return t("uni-calender.today")
+			},
+			monText() {
+				return t("uni-calender.MON")
+			},
+			TUEText() {
+				return t("uni-calender.TUE")
+			},
+			WEDText() {
+				return t("uni-calender.WED")
+			},
+			THUText() {
+				return t("uni-calender.THU")
+			},
+			FRIText() {
+				return t("uni-calender.FRI")
+			},
+			SATText() {
+				return t("uni-calender.SAT")
+			},
+			SUNText() {
+				return t("uni-calender.SUN")
+			},
+		},
+		watch: {
+			date(newVal) {
+				// this.cale.setDate(newVal)
+				this.init(newVal)
+			},
+			startDate(val){
+				this.cale.resetSatrtDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			endDate(val){
+				this.cale.resetEndDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			selected(newVal) {
+				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
+				this.weeks = this.cale.weeks
+			}
+		},
+		created() {
+			this.cale = new Calendar({
+				selected: this.selected,
+				startDate: this.startDate,
+				endDate: this.endDate,
+				range: this.range,
+			})
+			this.init(this.date)
+		},
+		methods: {
+			// 取消穿透
+			clean() {},
+			bindDateChange(e) {
+				const value = e.detail.value + '-1'
+				this.setDate(value)
+
+				const { year,month } = this.cale.getDate(value)
+        this.$emit('monthSwitch', {
+            year,
+            month
+        })
+			},
+			/**
+			 * 初始化日期显示
+			 * @param {Object} date
+			 */
+			init(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.calendar = this.cale.getInfo(date)
+			},
+			/**
+			 * 打开日历弹窗
+			 */
+			open() {
+				// 弹窗模式并且清理数据
+				if (this.clearDate && !this.insert) {
+					this.cale.cleanMultipleStatus()
+					// this.cale.setDate(this.date)
+					this.init(this.date)
+				}
+				this.show = true
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.aniMaskShow = true
+					}, 50)
+				})
+			},
+			/**
+			 * 关闭日历弹窗
+			 */
+			close() {
+				this.aniMaskShow = false
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.show = false
+						this.$emit('close')
+					}, 300)
+				})
+			},
+			/**
+			 * 确认按钮
+			 */
+			confirm() {
+				this.setEmit('confirm')
+				this.close()
+			},
+			/**
+			 * 变化触发
+			 */
+			change() {
+				if (!this.insert) return
+				this.setEmit('change')
+			},
+			/**
+			 * 选择月份触发
+			 */
+			monthSwitch() {
+				let {
+					year,
+					month
+				} = this.nowDate
+				this.$emit('monthSwitch', {
+					year,
+					month: Number(month)
+				})
+			},
+			/**
+			 * 派发事件
+			 * @param {Object} name
+			 */
+			setEmit(name) {
+				let {
+					year,
+					month,
+					date,
+					fullDate,
+					lunar,
+					extraInfo
+				} = this.calendar
+				this.$emit(name, {
+					range: this.cale.multipleStatus,
+					year,
+					month,
+					date,
+					fulldate: fullDate,
+					lunar,
+					extraInfo: extraInfo || {}
+				})
+			},
+			/**
+			 * 选择天触发
+			 * @param {Object} weeks
+			 */
+			choiceDate(weeks) {
+				if (weeks.disable) return
+				this.calendar = weeks
+				// 设置多选
+				this.cale.setMultiple(this.calendar.fullDate)
+				this.weeks = this.cale.weeks
+				this.change()
+			},
+			/**
+			 * 回到今天
+			 */
+			backToday() {
+				const nowYearMonth = `${this.nowDate.year}-${this.nowDate.month}`
+				const date = this.cale.getDate(new Date())
+        const todayYearMonth = `${date.year}-${date.month}`
+
+				this.init(date.fullDate)
+
+        if(nowYearMonth !== todayYearMonth) {
+          this.monthSwitch()
+        }
+
+				this.change()
+			},
+			/**
+			 * 上个月
+			 */
+			pre() {
+				const preDate = this.cale.getDate(this.nowDate.fullDate, -1, 'month').fullDate
+				this.setDate(preDate)
+				this.monthSwitch()
+
+			},
+			/**
+			 * 下个月
+			 */
+			next() {
+				const nextDate = this.cale.getDate(this.nowDate.fullDate, +1, 'month').fullDate
+				this.setDate(nextDate)
+				this.monthSwitch()
+			},
+			/**
+			 * 设置日期
+			 * @param {Object} date
+			 */
+			setDate(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$uni-bg-color-mask: rgba($color: #000000, $alpha: 0.4);
+	$uni-border-color: #EDEDED;
+	$uni-text-color: #333;
+	$uni-bg-color-hover:#f1f1f1;
+	$uni-font-size-base:14px;
+	$uni-text-color-placeholder: #808080;
+	$uni-color-subtitle: #555555;
+	$uni-text-color-grey:#999;
+	.uni-calendar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-calendar__mask {
+		position: fixed;
+		bottom: 0;
+		top: 0;
+		left: 0;
+		right: 0;
+		background-color: $uni-bg-color-mask;
+		transition-property: opacity;
+		transition-duration: 0.3s;
+		opacity: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--mask-show {
+		opacity: 1
+	}
+
+	.uni-calendar--fixed {
+		position: fixed;
+		/* #ifdef APP-NVUE */
+		bottom: 0;
+		/* #endif */
+		left: 0;
+		right: 0;
+		transition-property: transform;
+		transition-duration: 0.3s;
+		transform: translateY(460px);
+		/* #ifndef APP-NVUE */
+		bottom: calc(var(--window-bottom));
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--ani-show {
+		transform: translateY(0);
+	}
+
+	.uni-calendar__content {
+		background-color: #fff;
+	}
+
+	.uni-calendar__header {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 50px;
+		border-bottom-color: $uni-border-color;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar--fixed-top {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		border-top-color: $uni-border-color;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--fixed-width {
+		width: 50px;
+	}
+
+	.uni-calendar__backtoday {
+		position: absolute;
+		right: 0;
+		top: 25rpx;
+		padding: 0 5px;
+		padding-left: 10px;
+		height: 25px;
+		line-height: 25px;
+		font-size: 12px;
+		border-top-left-radius: 25px;
+		border-bottom-left-radius: 25px;
+		color: $uni-text-color;
+		background-color: $uni-bg-color-hover;
+	}
+
+	.uni-calendar__header-text {
+		text-align: center;
+		width: 100px;
+		font-size: $uni-font-size-base;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar__header-btn-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		width: 50px;
+		height: 50px;
+	}
+
+	.uni-calendar__header-btn {
+		width: 10px;
+		height: 10px;
+		border-left-color: $uni-text-color-placeholder;
+		border-left-style: solid;
+		border-left-width: 2px;
+		border-top-color: $uni-color-subtitle;
+		border-top-style: solid;
+		border-top-width: 2px;
+	}
+
+	.uni-calendar--left {
+		transform: rotate(-45deg);
+	}
+
+	.uni-calendar--right {
+		transform: rotate(135deg);
+	}
+
+
+	.uni-calendar__weeks {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-calendar__weeks-item {
+		flex: 1;
+	}
+
+	.uni-calendar__weeks-day {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 45px;
+		border-bottom-color: #F5F5F5;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar__weeks-day-text {
+		font-size: 14px;
+	}
+
+	.uni-calendar__box {
+		position: relative;
+	}
+
+	.uni-calendar__box-bg {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.uni-calendar__box-bg-text {
+		font-size: 200px;
+		font-weight: bold;
+		color: $uni-text-color-grey;
+		opacity: 0.1;
+		text-align: center;
+		/* #ifndef APP-NVUE */
+		line-height: 1;
+		/* #endif */
+	}
+</style>

uni_modules/uni-calendar/components/uni-calendar/util.js

@@ -0,0 +1,360 @@
+import CALENDAR from './calendar.js'
+
+class Calendar {
+	constructor({
+		date,
+		selected,
+		startDate,
+		endDate,
+		range
+	} = {}) {
+		// 当前日期
+		this.date = this.getDate(new Date()) // 当前初入日期
+		// 打点信息
+		this.selected = selected || [];
+		// 范围开始
+		this.startDate = startDate
+		// 范围结束
+		this.endDate = endDate
+		this.range = range
+		// 多选状态
+		this.cleanMultipleStatus()
+		// 每周日期
+		this.weeks = {}
+		// this._getWeek(this.date.fullDate)
+	}
+	/**
+	 * 设置日期
+	 * @param {Object} date
+	 */
+	setDate(date) {
+		this.selectDate = this.getDate(date)
+		this._getWeek(this.selectDate.fullDate)
+	}
+
+	/**
+	 * 清理多选状态
+	 */
+	cleanMultipleStatus() {
+		this.multipleStatus = {
+			before: '',
+			after: '',
+			data: []
+		}
+	}
+
+	/**
+	 * 重置开始日期
+	 */
+	resetSatrtDate(startDate) {
+		// 范围开始
+		this.startDate = startDate
+
+	}
+
+	/**
+	 * 重置结束日期
+	 */
+	resetEndDate(endDate) {
+		// 范围结束
+		this.endDate = endDate
+	}
+
+	/**
+	 * 获取任意时间
+	 */
+	getDate(date, AddDayCount = 0, str = 'day') {
+		if (!date) {
+			date = new Date()
+		}
+		if (typeof date !== 'object') {
+			date = date.replace(/-/g, '/')
+		}
+		const dd = new Date(date)
+		switch (str) {
+			case 'day':
+				dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+			case 'month':
+				if (dd.getDate() === 31 && AddDayCount>0) {
+					dd.setDate(dd.getDate() + AddDayCount)
+				} else {
+					const preMonth = dd.getMonth()
+					dd.setMonth(preMonth + AddDayCount) // 获取AddDayCount天后的日期
+					const nextMonth = dd.getMonth()
+					// 处理 pre 切换月份目标月份为2月没有当前日(30 31) 切换错误问题
+					if(AddDayCount<0 && preMonth!==0 && nextMonth-preMonth>AddDayCount){
+						dd.setMonth(nextMonth+(nextMonth-preMonth+AddDayCount))
+					}
+					// 处理 next 切换月份目标月份为2月没有当前日(30 31) 切换错误问题
+					if(AddDayCount>0 && nextMonth-preMonth>AddDayCount){
+						dd.setMonth(nextMonth-(nextMonth-preMonth-AddDayCount))
+					}
+				}
+				break
+			case 'year':
+				dd.setFullYear(dd.getFullYear() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+		}
+		const y = dd.getFullYear()
+		const m = dd.getMonth() + 1 < 10 ? '0' + (dd.getMonth() + 1) : dd.getMonth() + 1 // 获取当前月份的日期，不足10补0
+		const d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0
+		return {
+			fullDate: y + '-' + m + '-' + d,
+			year: y,
+			month: m,
+			date: d,
+			day: dd.getDay()
+		}
+	}
+
+
+	/**
+	 * 获取上月剩余天数
+	 */
+	_getLastMonthDays(firstDay, full) {
+		let dateArr = []
+		for (let i = firstDay; i > 0; i--) {
+			const beforeDate = new Date(full.year, full.month - 1, -i + 1).getDate()
+			dateArr.push({
+				date: beforeDate,
+				month: full.month - 1,
+				lunar: this.getlunar(full.year, full.month - 1, beforeDate),
+				disable: true
+			})
+		}
+		return dateArr
+	}
+	/**
+	 * 获取本月天数
+	 */
+	_currentMonthDys(dateData, full) {
+		let dateArr = []
+		let fullDate = this.date.fullDate
+		for (let i = 1; i <= dateData; i++) {
+			let nowDate = full.year + '-' + (full.month < 10 ?
+				full.month : full.month) + '-' + (i < 10 ?
+				'0' + i : i)
+			// 是否今天
+			let isDay = fullDate === nowDate
+			// 获取打点信息
+			let info = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(nowDate, item.date)) {
+					return item
+				}
+			})
+
+			// 日期禁用
+			let disableBefore = true
+			let disableAfter = true
+			if (this.startDate) {
+				// let dateCompBefore = this.dateCompare(this.startDate, fullDate)
+				// disableBefore = this.dateCompare(dateCompBefore ? this.startDate : fullDate, nowDate)
+				disableBefore = this.dateCompare(this.startDate, nowDate)
+			}
+
+			if (this.endDate) {
+				// let dateCompAfter = this.dateCompare(fullDate, this.endDate)
+				// disableAfter = this.dateCompare(nowDate, dateCompAfter ? this.endDate : fullDate)
+				disableAfter = this.dateCompare(nowDate, this.endDate)
+			}
+			let multiples = this.multipleStatus.data
+			let checked = false
+			let multiplesStatus = -1
+			if (this.range) {
+				if (multiples) {
+					multiplesStatus = multiples.findIndex((item) => {
+						return this.dateEqual(item, nowDate)
+					})
+				}
+				if (multiplesStatus !== -1) {
+					checked = true
+				}
+			}
+			let data = {
+				fullDate: nowDate,
+				year: full.year,
+				date: i,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.dateEqual(this.multipleStatus.before, nowDate),
+				afterMultiple: this.dateEqual(this.multipleStatus.after, nowDate),
+				month: full.month,
+				lunar: this.getlunar(full.year, full.month, i),
+				disable: !(disableBefore && disableAfter),
+				isDay
+			}
+			if (info) {
+				data.extraInfo = info
+			}
+
+			dateArr.push(data)
+		}
+		return dateArr
+	}
+	/**
+	 * 获取下月天数
+	 */
+	_getNextMonthDays(surplus, full) {
+		let dateArr = []
+		for (let i = 1; i < surplus + 1; i++) {
+			dateArr.push({
+				date: i,
+				month: Number(full.month) + 1,
+				lunar: this.getlunar(full.year, Number(full.month) + 1, i),
+				disable: true
+			})
+		}
+		return dateArr
+	}
+
+	/**
+	 * 获取当前日期详情
+	 * @param {Object} date
+	 */
+	getInfo(date) {
+		if (!date) {
+			date = new Date()
+		}
+		const dateInfo = this.canlender.find(item => item.fullDate === this.getDate(date).fullDate)
+		return dateInfo
+	}
+
+	/**
+	 * 比较时间大小
+	 */
+	dateCompare(startDate, endDate) {
+		// 计算截止时间
+		startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+		if (startDate <= endDate) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+	/**
+	 * 比较时间是否相等
+	 */
+	dateEqual(before, after) {
+		// 计算截止时间
+		before = new Date(before.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		after = new Date(after.replace('-', '/').replace('-', '/'))
+		if (before.getTime() - after.getTime() === 0) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+
+	/**
+	 * 获取日期范围内所有日期
+	 * @param {Object} begin
+	 * @param {Object} end
+	 */
+	geDateAll(begin, end) {
+		var arr = []
+		var ab = begin.split('-')
+		var ae = end.split('-')
+		var db = new Date()
+		db.setFullYear(ab[0], ab[1] - 1, ab[2])
+		var de = new Date()
+		de.setFullYear(ae[0], ae[1] - 1, ae[2])
+		var unixDb = db.getTime() - 24 * 60 * 60 * 1000
+		var unixDe = de.getTime() - 24 * 60 * 60 * 1000
+		for (var k = unixDb; k <= unixDe;) {
+			k = k + 24 * 60 * 60 * 1000
+			arr.push(this.getDate(new Date(parseInt(k))).fullDate)
+		}
+		return arr
+	}
+	/**
+	 * 计算阴历日期显示
+	 */
+	getlunar(year, month, date) {
+		return CALENDAR.solar2lunar(year, month, date)
+	}
+	/**
+	 * 设置打点
+	 */
+	setSelectInfo(data, value) {
+		this.selected = value
+		this._getWeek(data)
+	}
+
+	/**
+	 *  获取多选状态
+	 */
+	setMultiple(fullDate) {
+		let {
+			before,
+			after
+		} = this.multipleStatus
+
+		if (!this.range) return
+		if (before && after) {
+			this.multipleStatus.before = fullDate
+			this.multipleStatus.after = ''
+			this.multipleStatus.data = []
+		} else {
+			if (!before) {
+				this.multipleStatus.before = fullDate
+			} else {
+				this.multipleStatus.after = fullDate
+				if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus.after);
+				} else {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus.before);
+				}
+			}
+		}
+		this._getWeek(fullDate)
+	}
+
+	/**
+	 * 获取每周数据
+	 * @param {Object} dateData
+	 */
+	_getWeek(dateData) {
+		const {
+			year,
+			month
+		} = this.getDate(dateData)
+		let firstDay = new Date(year, month - 1, 1).getDay()
+		let currentDay = new Date(year, month, 0).getDate()
+		let dates = {
+			lastMonthDays: this._getLastMonthDays(firstDay, this.getDate(dateData)), // 上个月末尾几天
+			currentMonthDys: this._currentMonthDys(currentDay, this.getDate(dateData)), // 本月天数
+			nextMonthDays: [], // 下个月开始几天
+			weeks: []
+		}
+		let canlender = []
+		const surplus = 42 - (dates.lastMonthDays.length + dates.currentMonthDys.length)
+		dates.nextMonthDays = this._getNextMonthDays(surplus, this.getDate(dateData))
+		canlender = canlender.concat(dates.lastMonthDays, dates.currentMonthDys, dates.nextMonthDays)
+		let weeks = {}
+		// 拼接数组  上个月开始几天 + 本月天数+ 下个月开始几天
+		for (let i = 0; i < canlender.length; i++) {
+			if (i % 7 === 0) {
+				weeks[parseInt(i / 7)] = new Array(7)
+			}
+			weeks[parseInt(i / 7)][i % 7] = canlender[i]
+		}
+		this.canlender = canlender
+		this.weeks = weeks
+	}
+
+	//静态方法
+	// static init(date) {
+	// 	if (!this.instance) {
+	// 		this.instance = new Calendar(date);
+	// 	}
+	// 	return this.instance;
+	// }
+}
+
+
+export default Calendar

uni_modules/uni-calendar/package.json

@@ -0,0 +1,86 @@
+{
+  "id": "uni-calendar",
+  "displayName": "uni-calendar 日历",
+  "version": "1.4.12",
+  "description": "日历组件",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "日历",
+    "",
+    "打卡",
+    "日历选择"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-calendar/readme.md

@@ -0,0 +1,103 @@
+
+
+## Calendar 日历
+> **组件名：uni-calendar**
+> 代码块： `uCalendar`
+
+
+日历组件
+
+> **注意事项**
+> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
+> - 本组件农历转换使用的js是 [@1900-2100区间内的公历、农历互转](https://github.com/jjonline/calendar.js)  
+> - 仅支持自定义组件模式
+> - `date`属性传入的应该是一个 String ，如： 2019-06-27 ，而不是 new Date()
+> - 通过 `insert` 属性来确定当前的事件是 @change 还是 @confirm 。理应合并为一个事件，但是为了区分模式，现使用两个事件，这里需要注意
+> - 弹窗模式下无法阻止后面的元素滚动，如有需要阻止，请在弹窗弹出后，手动设置滚动元素为不可滚动
+
+
+### 安装方式
+
+本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
+
+如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
+
+### 基本用法
+
+在 ``template`` 中使用组件
+
+```html
+<view>
+	<uni-calendar 
+	:insert="true"
+	:lunar="true" 
+	:start-date="'2019-3-2'"
+	:end-date="'2019-5-20'"
+	@change="change"
+	 />
+</view>
+```
+
+### 通过方法打开日历
+
+需要设置 `insert` 为 `false`
+
+```html
+<view>
+	<uni-calendar 
+	ref="calendar"
+	:insert="false"
+	@confirm="confirm"
+	 />
+	 <button @click="open">打开日历</button>
+</view>
+```
+
+```javascript
+
+export default {
+	data() {
+		return {};
+	},
+	methods: {
+		open(){
+			this.$refs.calendar.open();
+		},
+		confirm(e) {
+			console.log(e);
+		}
+	}
+};
+
+```
+
+
+## API
+
+### Calendar Props
+
+|  属性名	|    类型	| 默认值| 说明																													|
+| -	| -	| - | - |
+| date		| String	|-		| 自定义当前时间，默认为今天																							|
+| lunar		| Boolean	| false	| 显示农历																												|
+| startDate	| String	|-		| 日期选择范围-开始日期																									|
+| endDate	| String	|-		| 日期选择范围-结束日期																									|
+| range		| Boolean	| false	| 范围选择																												|
+| insert	| Boolean	| false	| 插入模式,可选值，ture：插入模式；false：弹窗模式；默认为插入模式														|
+|clearDate	|Boolean	|true	|弹窗模式是否清空上次选择内容	|
+| selected	| Array		|-		| 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]	|
+|showMonth	| Boolean	| true	| 是否显示月份为背景																									|
+
+### Calendar Events
+
+|  事件名		| 说明								|返回值|
+| -	|	-	| -	|
+| open	| 弹出日历组件，`insert :false` 时生效|- 	|
+
+
+
+
+
+## 组件示例
+
+点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/calendar/calendar](https://hellouniapp.dcloud.net.cn/pages/extUI/calendar/calendar)