企业信息列表

api/enterprise/index.js

@@ -0,0 +1,25 @@
+import request from '@/utils/request'
+
+/**
+ * 创建企业
+ * @param {Object} data
+ */
+export function createEnterPrise(data) {
+	return request({
+		url: `/system/enterprise/create`,
+		method: 'POST',
+		data
+	})
+}
+
+/**
+ * 获取企业列表
+ * @param {Object} params
+ */
+export function getEnterPriseList(params) {
+	return request({
+		url: `/system/enterprise/page`,
+		method: 'GET',
+		params
+	})
+}

api/enterprise/prove.js

@@ -0,0 +1,38 @@
+import request from '@/utils/request'
+
+/**
+ * 新增资质
+ * @param {Object} data
+ */
+export function createProve(data) {
+	return request({
+		url: `/system/enterprise-qualification/create`,
+		method: 'POST',
+		data
+	})
+}
+
+
+/**
+ * 更新资质
+ * @param {Object} data
+ */
+export function updateProve(data) {
+	return request({
+		url: `/system/enterprise-qualification/update`,
+		method: 'PUT',
+		data
+	})
+}
+
+/**
+ * 获取资质列表
+ * @param {Object} data
+ */
+export function getProveList(data) {
+	return request({
+		url: `/system/enterprise-qualification/page`,
+		method: 'GET',
+		data
+	})
+}

api/system/file.js

@@ -0,0 +1,10 @@
+import upload from '@/utils/upload'
+
+export function uploadFile(data) {
+	return upload({
+		url: '/admin-api/infra/file/upload',
+		method: 'POST',
+		name: data.name,
+		filePath: data.filePath
+	})
+}

components/cs-page/index.vue

@@ -8,7 +8,7 @@
         <slot></slot>
       </view>
     </view>
-    <s-tabber v-if="isTab" :selected="selected" />
+    <s-tabber :selected="selected" :isTab="isTab" />
   </view>
 </template>
 
@@ -40,11 +40,11 @@ export default {
   grid-template-rows: auto 1fr auto;
   height: 100vh;
   width: 100vw;
-  display: grid;
   .view {
     position: relative;
     .inner {
       position: absolute;
+      overflow: hidden;
       inset: 0;
     }
   }

main.js

@@ -4,6 +4,8 @@ import store from './store' // store
 import plugins from './plugins' // plugins
 import './permission' // permission
 import * as dict from '@/utils/dict.js'
+import * as util from '@/utils/ruoyi.js'
+
 // 引入uView
 import uView from '@/uni_modules/uview-ui'
 // import mpShare from '@/uni_modules/uview-ui/libs/mixin/mpShare.js'
@@ -16,6 +18,7 @@ Vue.config.productionTip = false
 // 挂载vuex
 Vue.prototype.$store = store
 Vue.prototype.$dict = dict
+Vue.prototype.$util = util
 
 App.mpType = 'app'
 

pages.json

@@ -14,7 +14,11 @@
 		{
 			"path": "pages/enterprise",
 			"style": {
-				"navigationBarTitleText": "企业"
+				"navigationBarTitleText": "企业",
+				"usingComponents": {
+					"van-dropdown-menu": "/wxcomponents/vant/dropdown-menu/index",
+					"van-dropdown-item": "/wxcomponents/vant/dropdown-item/index"
+				}
 			}
 		},
 		{
@@ -51,6 +55,8 @@
 			"path": "owner/invite"
 		}, {
 			"path": "enterprise/edit"
+		}, {
+			"path": "common/waiting"
 		}]
 	}],
 	"tabBar": {

pages/enterprise.vue

@@ -1,13 +1,35 @@
 <template>
-	<cs-page :selected="3" isTab></cs-page>
+  <cs-page :selected="3" title="企业信息" isTab>
+    <view class="page-container"></view>
+  </cs-page>
 </template>
 
 <script>
+import { getEnterPriseList } from '@/api/enterprise/index.js'
 export default {
-	data() {
-		return {}
-	}
+  data() {
+    return {
+      queryParams: {
+        pageSize: 10,
+        pageNo: 1
+      }
+    }
+  },
+  onShow() {
+    this.getList()
+  },
+  methods: {
+    async getList() {
+      const res = await getEnterPriseList(this.queryParams)
+      console.log(res)
+    }
+  }
 }
 </script>
 
-<style lang="scss"></style>
+<style lang="scss" scoped>
+.page-container {
+  height: 100%;
+  overflow: hidden;
+}
+</style>

pages/index.vue

@@ -1,37 +1,11 @@
 <template>
-	<cs-page :selected="0" title="智慧环保" isTab></cs-page>
+  <cs-page :selected="0" title="智慧环保" isTab></cs-page>
 </template>
 
 <script>
 export default {
-	onLoad: function () {}
+  onLoad: function () {}
 }
 </script>
 
-<style>
-.content {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-}
-
-.logo {
-	height: 200rpx;
-	width: 200rpx;
-	margin-top: 200rpx;
-	margin-left: auto;
-	margin-right: auto;
-	margin-bottom: 50rpx;
-}
-
-.text-area {
-	display: flex;
-	justify-content: center;
-}
-
-.title {
-	font-size: 36rpx;
-	color: #8f8f94;
-}
-</style>
+<style></style>

pages/login.vue

@@ -21,45 +21,68 @@ export default {
     }
   },
   onLoad(res) {
-    this.invateId = res.invateId
+    if (res.invateId) {
+      this.invateId = res.invateId
+    }
     this.init()
   },
   methods: {
     init() {
       uni.login({
         success: res => {
+          const data = {
+            type: 34,
+            code: res.code,
+            state: 'default',
+            userType: this.getUserType()
+          }
           // 系统登录
-          this.$store
-            .dispatch('Login', {
-              type: 34,
-              code: res.code,
-              state: 'default'
-            })
-            .then(() => {
-              this.loginSuccess()
-            })
+          this.$store.dispatch('Login', data).then(() => {
+            this.loginSuccess()
+          })
         }
       })
     },
+    getUserType() {
+      // 企业邀请
+      if (this.invateId) return 2
+      // if (this.type == 'internal') return 3
+      // return 1
+      return 3
+    },
     loginSuccess() {
       this.$store.dispatch('GetInfo').then(res => {
-        const { data } = res
-        const { user } = data
-        if (this.invateId) {
-          uni.navigateTo({
-            url: `/sub/enterprise/edit?invateId=${this.invateId}`
-          })
-          return
-        }
-        if (user.audit) {
-          uni.switchTab({
-            url: '/pages/index'
-          })
-          return
-        }
+        this.handlerNavigateTo(res.data.user)
+      })
+    },
+    handlerNavigateTo(user) {
+      // 邀请企业
+      if (this.invateId) {
+        uni.navigateTo({
+          url: `/sub/enterprise/edit?invateId=${this.invateId}`
+        })
+        return
+      }
+
+      // 审核中
+      if (user.audit == 1) {
         uni.navigateTo({
-          url: '/sub/owner/edit'
+          url: '/sub/common/waiting'
         })
+        return
+      }
+
+      // 审核通过
+      if (user.audit == 2) {
+        uni.switchTab({
+          url: '/pages/index'
+        })
+        return
+      }
+
+      // 局内用户首次登录
+      uni.navigateTo({
+        url: '/sub/owner/edit'
       })
     }
   }

sub/common/waiting.vue

@@ -0,0 +1,24 @@
+<template>
+  <cs-page isCustom>
+    <template #header>
+      <view class="wd-flex wd-items-center" style="gap: 10px">
+        <u--image src="/static/favicon.png" width="20px" height="20px" mode="aspectFit"></u--image>
+        <view class="wd-text-16 wd-font-800">智慧生态</view>
+      </view>
+    </template>
+    <view class="wd-flex wd-flex-col wd-flex-center" style="height: 100%; gap: 10px">
+      <icon type="waiting" size="40" />
+      <text class="wd-text-18">审核中</text>
+    </view>
+  </cs-page>
+</template>
+
+<script>
+export default {
+  data() {
+    return {}
+  }
+}
+</script>
+
+<style lang="scss"></style>

sub/enterprise/edit.vue

@@ -0,0 +1,431 @@
+<template>
+  <cs-page isCustom>
+    <template #header>
+      <view class="wd-flex wd-flex-row wd-items-center" style="gap: 8px">
+        <view class="icon-box" v-if="!invateId">
+          <u-icon name="arrow-left" size="12"></u-icon>
+        </view>
+        <text class="wd-font-800 wd-text-16">编辑企业信息</text>
+      </view>
+    </template>
+    <view class="container">
+      <uni-steps :options="step.options" :active="step.active"></uni-steps>
+      <scroll-view scroll-y="true" class="info-container" v-if="step.active == 0">
+        <u--form :model="info.form" ref="infoFormRef">
+          <!-- 企业名称 -->
+          <u-form-item label="名称" prop="enterprisesName" borderBottom>
+            <u-input v-model="info.form.enterprisesName" border="none" placeholder="请输入名称" />
+          </u-form-item>
+          <!-- 企业类型 -->
+          <u-form-item label="类型" prop="type" borderBottom @tap="showPicker('enterprises_type', 'type')">
+            <text v-if="info.form.type">
+              {{ $dict.echoDicValue(dictMap.enterprises_type, info.form.type.toString()) }}
+            </text>
+            <text class="placeholder" v-else>请选择类型</text>
+            <u-icon slot="right" name="arrow-right"></u-icon>
+          </u-form-item>
+          <!-- 企业地址 -->
+          <u-form-item label="地址" prop="address" borderBottom>
+            <u-input v-model="info.form.address" border="none" placeholder="请输入地址" />
+          </u-form-item>
+
+          <!-- 环保负责人 -->
+          <u-form-item label="环保负责人" prop="contactName" borderBottom labelWidth="80">
+            <u-input v-model="info.form.contactName" border="none" placeholder="请输入环保负责人姓名" />
+          </u-form-item>
+          <!-- 联系方式 -->
+          <u-form-item label="联系方式" prop="environmentalContactPhone" borderBottom labelWidth="80">
+            <u-input v-model="info.form.environmentalContactPhone" border="none" placeholder="请输入联系方式" />
+          </u-form-item>
+          <!-- 成立时间 -->
+          <u-form-item
+            label="成立时间"
+            prop="establishmentDate"
+            borderBottom
+            labelWidth="80"
+            @tap="showCalendar('establishmentDate')"
+          >
+            <text v-if="info.form.establishmentDate">{{ info.form.establishmentDate }}</text>
+            <text class="placeholder" v-else>请选择时间</text>
+            <u-icon slot="right" name="arrow-right"></u-icon>
+          </u-form-item>
+          <!-- 企业照片 -->
+          <u-form-item label="企业照片" borderBottom labelPosition="top" labelWidth="80">
+            <u-upload
+              :fileList="info.form.photo"
+              @afterRead="addEnterprisePhoto"
+              @delete="delEnterprisePhoto"
+              multiple
+              :maxCount="3"
+            ></u-upload>
+          </u-form-item>
+          <!-- 企业简介 -->
+          <u-form-item label="简介" prop="introduction" borderBottom labelPosition="top">
+            <u--textarea
+              v-model="info.form.introduction"
+              placeholder="请输入简介"
+              border="none"
+              count="true"
+            ></u--textarea>
+          </u-form-item>
+          <u-form-item>
+            <u-button shape="circle" type="primary" @click="submitInfo">提交</u-button>
+          </u-form-item>
+        </u--form>
+      </scroll-view>
+      <view class="prove-container" v-else>
+        <u--form :model="prove.form" ref="proveFormRef" v-if="prove.isEdit">
+          <u-form-item
+            label="资质名称"
+            prop="qualificationName"
+            borderBottom
+            labelWidth="80"
+            @tap="showPicker('enterprise_qua', 'qualificationName')"
+          >
+            <text v-if="prove.form.qualificationName">
+              {{ $dict.echoDicValue(dictMap.enterprise_qua, prove.form.qualificationName.toString()) }}
+            </text>
+            <text class="placeholder" v-else>请选择资质名称</text>
+            <u-icon slot="right" name="arrow-right"></u-icon>
+          </u-form-item>
+          <u-form-item label="资质编号" prop="enterpriseAuth" borderBottom labelWidth="80">
+            <u-input v-model="prove.form.enterpriseAuth" border="none" placeholder="请输入编号" />
+          </u-form-item>
+          <u-form-item
+            label="办理日期"
+            prop="handleDate"
+            borderBottom
+            labelWidth="80"
+            @tap="showCalendar('handleDate')"
+          >
+            <text v-if="prove.form.handleDate">{{ prove.form.handleDate }}</text>
+            <text class="placeholder" v-else>请选择办理日期</text>
+            <u-icon slot="right" name="arrow-right"></u-icon>
+          </u-form-item>
+          <u-form-item
+            label="到期日期"
+            prop="expiryDate"
+            borderBottom
+            labelWidth="80"
+            @tap="showCalendar('expiryDate')"
+          >
+            <text v-if="prove.form.expiryDate">{{ prove.form.expiryDate }}</text>
+            <text class="placeholder" v-else>请选择到期日期</text>
+            <u-icon slot="right" name="arrow-right"></u-icon>
+          </u-form-item>
+          <u-form-item label="描述" prop="qualificationDescription" borderBottom labelPosition="top">
+            <u--textarea
+              v-model="prove.form.qualificationDescription"
+              placeholder="请输入描述"
+              border="none"
+              count="true"
+            ></u--textarea>
+          </u-form-item>
+        </u--form>
+        <view class="prove-list" v-else>
+          <view class="prove" v-for="prove in prove.list" :key="prove.id" @click="editProve(prove)">
+            <view class="wd-font-800" style="margin-bottom: 5px">
+              {{ $dict.echoDicValue(dictMap.enterprise_qua, prove.qualificationName.toString()) }}
+            </view>
+            <view class="">
+              {{ $util.formatDate(prove.expiryDate, 'YYYY年M月D日') }}-
+              {{ $util.formatDate(prove.handleDate, 'YYYY年M月D日') }}
+            </view>
+          </view>
+        </view>
+        <view class="operation" v-if="prove.isEdit">
+          <u-button shape="circle" type="primary" @click="submitProve">提交</u-button>
+        </view>
+        <view class="operation" v-else>
+          <u-button shape="circle" type="info" @click="addProve">添加资质</u-button>
+          <u-button shape="circle" type="success" v-if="invateId" @click="handlerDone">完成</u-button>
+        </view>
+      </view>
+    </view>
+    <u-picker
+      :show="picker.show"
+      :columns="picker.data"
+      @cancel="closePicker"
+      closeOnClickOverlay
+      keyName="label"
+      ref="uPicker"
+      @close="closePicker"
+      @confirm="confirmPicker"
+    ></u-picker>
+    <uni-calendar ref="calendarRef" :insert="false" @confirm="confirmCalendar" />
+  </cs-page>
+</template>
+
+<script>
+import { uploadFile } from '@/api/system/file.js'
+import { getDictBatchByType } from '@/api/system/dict.js'
+import { showConfirm } from '@/utils/common'
+import { createEnterPrise } from '@/api/enterprise/index.js'
+import { createProve, getProveList, updateProve } from '@/api/enterprise/prove.js'
+export default {
+  data() {
+    return {
+      invateId: undefined,
+      // 企业基本信息
+      info: {
+        form: {
+          id: '',
+          enterprisesName: '',
+          type: '', // 企业类型
+          introduction: '', // 企业地址
+          address: '', // 企业简介
+          photo: [], // 企业照片
+          contactName: '', // 环保负责人
+          environmentalContactPhone: '', // 联系方式
+          establishmentDate: '' // 成立时间
+        },
+        rules: {
+          enterprisesName: {
+            required: true,
+            message: '请输入企业名称',
+            trigger: ['blur']
+          },
+          type: {
+            type: 'string',
+            required: true,
+            message: '请选择企业类型',
+            trigger: ['blur']
+          },
+          address: {
+            required: true,
+            message: '请输入企业地址',
+            trigger: ['blur']
+          },
+          contactName: {
+            required: true,
+            message: '请输入环保负责人',
+            trigger: ['blur']
+          },
+          environmentalContactPhone: {
+            required: true,
+            message: '请输入联系方式',
+            trigger: ['blur']
+          }
+        }
+      },
+      dictMap: {},
+      picker: {
+        show: false,
+        key: null,
+        data: []
+      },
+      calendar: {
+        key: null
+      },
+      step: {
+        options: [
+          {
+            title: '基本信息'
+          },
+          {
+            title: '资质信息'
+          }
+        ],
+        active: 0
+      },
+      // 资质相关
+      prove: {
+        list: [],
+        isEdit: false,
+        loading: false,
+        form: {
+          enterpriseId: '',
+          id: '',
+          qualificationName: '',
+          expiryDate: '',
+          qualificationDescription: '',
+          handleDate: '',
+          enterpriseAuth: ''
+        }
+      }
+    }
+  },
+  onLoad(res) {
+    if (res.invateId) {
+      this.invateId = res.invateId
+    }
+    this.getDict()
+  },
+  onReady() {
+    this.step.active == 0 && this.$refs.infoFormRef.setRules(this.info.rules)
+    this.initProveList()
+  },
+  methods: {
+    async addEnterprisePhoto(e) {
+      this.info.form.photo = e.file.map(p => {
+        return {
+          ...p,
+          status: 'uploading',
+          message: '上传中'
+        }
+      })
+      await Promise.all(
+        this.info.form.photo.map(async (p, i) => {
+          const res = await uploadFile({ name: `file`, filePath: p.url })
+          return {
+            ...res.data,
+            status: 'success',
+            message: ''
+          }
+        })
+      ).then(res => {
+        this.info.form.photo = res
+      })
+    },
+    delEnterprisePhoto(e) {
+      this.info.form.photo.splice(e.index, 1)
+    },
+    showPicker(type, key) {
+      this.picker.data.push(this.dictMap[type])
+      this.picker.key = key
+      this.picker.show = true
+    },
+    async getDict() {
+      const dict = await getDictBatchByType({ type: ['enterprises_type', 'enterprise_qua'].join(',') })
+      this.dictMap = {
+        ...dict.data
+      }
+    },
+    confirmPicker(e) {
+      const { value } = e
+      if (this.step.active == 1) {
+        this.prove.form[this.picker.key] = value[0].value
+      } else {
+        this.info.form[this.picker.key] = value[0].value
+      }
+      this.closePicker()
+    },
+    closePicker() {
+      this.picker = {
+        show: false,
+        key: '',
+        data: []
+      }
+    },
+    showCalendar(key) {
+      this.$refs.calendarRef.open()
+      this.calendar = {
+        key
+      }
+    },
+    confirmCalendar(e) {
+      if (this.step.active == 1) {
+        this.prove.form[this.calendar.key] = e.fulldate
+      } else {
+        this.info.form[this.calendar.key] = e.fulldate
+      }
+      this.closeCalendar()
+    },
+    closeCalendar() {
+      this.calendar = {
+        key: null
+      }
+    },
+    submitInfo() {
+      this.$refs.infoFormRef.validate().then(async res => {
+        this.handlerInfoApi()
+      })
+    },
+    async handlerInfoApi() {
+      const data = this.info.form
+      data.fileIds = this.info.form.photo.map(p => p.file_id)
+      data.userId = this.invateId
+      let enterprise
+      if (this.info.form.id) {
+      } else {
+        enterprise = await createEnterPrise(data)
+        this.info.form.id = enterprise.data
+        this.step.active = 1
+      }
+      this.initProveList()
+    },
+    addProve() {
+      this.prove.isEdit = true
+    },
+    submitProve() {
+      this.handlerProveApi()
+    },
+    async initProveList() {
+      this.prove.loading = true
+      const res = await getProveList({ pageSize: -1, enterpriseId: this.info.form.id })
+      this.prove.list = res.data.list
+      this.prove.loading = false
+    },
+    async handlerProveApi() {
+      let prove
+      const data = this.prove.form
+      data.enterpriseId = this.info.form.id
+      if (data.id) {
+        prove = await updateProve(data)
+      } else {
+        prove = await createProve(data)
+      }
+      this.prove.isEdit = false
+      this.initProveList()
+    },
+    editProve(prove) {
+      this.prove.form = prove
+      this.prove.form.handleDate = this.$util.formatDate(prove.handleDate, 'YYYY-MM-DD')
+      this.prove.form.expiryDate = this.$util.formatDate(prove.expiryDate, 'YYYY-MM-DD')
+      this.prove.isEdit = true
+    },
+    handlerDone() {
+      uni.navigateTo({
+        url: '/sub/common/waiting'
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+  background-color: #fff;
+  padding: 10px;
+  overflow: hidden;
+  display: flex;
+  flex-flow: column nowrap;
+  height: 100%;
+  .info-container {
+    max-height: 75vh;
+    padding: 0 10px;
+    margin-top: 10px;
+  }
+  .prove-container {
+    flex: 1;
+    position: relative;
+    padding: 0 10px;
+    margin-top: 10px;
+    .prove-list {
+      .prove {
+        margin-bottom: 10px;
+        padding: 10px 0;
+        border-bottom: 1px dashed #c0c4cc;
+      }
+    }
+    .operation {
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      width: 100%;
+      padding: 10px;
+      display: flex;
+      flex-flow: row nowrap;
+      gap: 10px;
+    }
+  }
+}
+.placeholder {
+  color: #c0c4cc;
+}
+::v-deep .u-form-item__body {
+  gap: 5px;
+}
+.address {
+}
+</style>

sub/owner/invite.vue

@@ -0,0 +1,28 @@
+<template>
+  <cs-page title="邀请企业" @goback="goback"></cs-page>
+</template>
+
+<script>
+import storage from '@/utils/storage'
+export default {
+  data() {
+    return {}
+  },
+  onShareAppMessage(res) {
+    return {
+      title: '邀请企业',
+      path: `/pages/login?invateId=${this.$store.getters.userId}`,
+      imageUrl: '/static/images/invateImage.png'
+    }
+  },
+  methods: {
+    goback() {
+      uni.switchTab({
+        url: '/pages/owner'
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss"></style>

uni_modules/s-components/s-header/index.vue

@@ -47,6 +47,8 @@ export default {
 .container {
   background-color: #fff;
   box-shadow: 0 1px 2px 1px $cs-shadow-color;
+  z-index: 1;
+  margin-bottom: 2px;
   .fit-content {
     height: 6vh;
   }
@@ -54,6 +56,8 @@ export default {
     padding: 10px;
     .title {
       color: #000;
+      font-size: 18px;
+      font-weight: bold;
     }
     .icon-box {
       padding: 5px;
@@ -62,4 +66,4 @@ export default {
     }
   }
 }
-</style>
+</style>

uni_modules/s-components/s-tabber/index.vue

@@ -1,96 +1,113 @@
 <template>
-	<view class="container">
-		<view class="tabber">
-			<view :class="{ tab: true, isActive: tab.code == selected }" v-for="(tab, index) in tabbers" :key="index" @click="changeTab(tab)">
-				<u--image :src="tab.icon" width="42px" height="42px" v-if="tab.type == 'middle'"></u--image>
-				<u--image :src="selected == tab.code ? tab.selectIcon : tab.icon" width="24px" height="24px" v-else></u--image>
-				<view class="name">
-					{{ tab.name }}
-				</view>
-			</view>
-		</view>
-		<view class="fit-content"></view>
-	</view>
+  <view :class="setClass">
+    <view class="tabber" v-if="isTab">
+      <view
+        :class="{ tab: true, isActive: tab.code == selected }"
+        v-for="(tab, index) in tabbers"
+        :key="index"
+        @click="changeTab(tab)"
+      >
+        <u--image :src="tab.icon" width="42px" height="42px" v-if="tab.type == 'middle'"></u--image>
+        <u--image :src="selected == tab.code ? tab.selectIcon : tab.icon" width="24px" height="24px" v-else></u--image>
+        <view class="name">
+          {{ tab.name }}
+        </view>
+      </view>
+    </view>
+    <view class="fit-content"></view>
+  </view>
 </template>
 
 <script>
 export default {
-	props: {
-		selected: Number
-	},
-	data() {
-		return {
-			tabbers: [
-				{
-					name: '首页',
-					path: '/pages/index',
-					icon: '/static/images/tabbers/home.png',
-					selectIcon: '/static/images/tabbers/home-select.png',
-					code: 0
-				},
-				{
-					name: '任务',
-					path: '/pages/task',
-					icon: '/static/images/tabbers/task.png',
-					selectIcon: '/static/images/tabbers/task-select.png',
-					code: 1
-				},
-				{
-					name: '',
-					path: '/pages/chat',
-					icon: '/static/images/tabbers/chat.png',
-					type: 'middle',
-					code: 2
-				},
-				{
-					name: '企业',
-					path: '/pages/enterprise',
-					icon: '/static/images/tabbers/position.png',
-					selectIcon: '/static/images/tabbers/position-select.png',
-					code: 3
-				},
-				{
-					name: '我的',
-					path: '/pages/owner',
-					icon: '/static/images/tabbers/user.png',
-					selectIcon: '/static/images/tabbers/user-select.png',
-					code: 4
-				}
-			]
-		}
-	},
-	methods: {
-		changeTab(tab) {
-			uni.switchTab({
-				url: tab.path,
-				success: () => {
-					this.isActive = tab.code
-				}
-			})
-		}
-	}
+  props: {
+    selected: Number,
+    isTab: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      tabbers: [
+        {
+          name: '首页',
+          path: '/pages/index',
+          icon: '/static/images/tabbers/home.png',
+          selectIcon: '/static/images/tabbers/home-select.png',
+          code: 0
+        },
+        {
+          name: '任务',
+          path: '/pages/task',
+          icon: '/static/images/tabbers/task.png',
+          selectIcon: '/static/images/tabbers/task-select.png',
+          code: 1
+        },
+        {
+          name: '',
+          path: '/pages/chat',
+          icon: '/static/images/tabbers/chat.png',
+          type: 'middle',
+          code: 2
+        },
+        {
+          name: '企业',
+          path: '/pages/enterprise',
+          icon: '/static/images/tabbers/position.png',
+          selectIcon: '/static/images/tabbers/position-select.png',
+          code: 3
+        },
+        {
+          name: '我的',
+          path: '/pages/owner',
+          icon: '/static/images/tabbers/user.png',
+          selectIcon: '/static/images/tabbers/user-select.png',
+          code: 4
+        }
+      ]
+    }
+  },
+  computed: {
+    setClass() {
+      return this.$props.isTab ? 'container' : 'noTab'
+    }
+  },
+  methods: {
+    changeTab(tab) {
+      uni.switchTab({
+        url: tab.path,
+        success: () => {
+          this.isActive = tab.code
+        }
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss">
 .container {
-	background-color: #fff;
-	box-shadow: 0 -1px 2px 1px $cs-shadow-color;
-	.fit-content {
-		height: 20px;
-	}
-	.tabber {
-		height: 60px;
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: space-around;
-		align-items: center;
-		.tab {
-			transition: 0.2s all;
-		}
-		.isActive {
-			color: #22c55e;
-		}
-	}
+  background-color: #fff;
+  box-shadow: 0 -1px 2px 1px $cs-shadow-color;
+}
+.noTab {
+  background-color: #fff;
+}
+.fit-content {
+  height: 20px;
+}
+.tabber {
+  height: 60px;
+  display: flex;
+  flex-flow: row nowrap;
+  justify-content: space-around;
+  align-items: center;
+  .tab {
+    transition: 0.2s all;
+  }
+  .isActive {
+    color: #22c55e;
+  }
 }
 </style>

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