📦 节气日历显示农历

package-lock.json

@@ -23,7 +23,7 @@
         "@dcloudio/uni-mp-weixin": "3.0.0-4030620241128001",
         "@dcloudio/uni-mp-xhs": "3.0.0-4030620241128001",
         "@dcloudio/uni-quickapp-webview": "3.0.0-4030620241128001",
-        "@imengyu/imengyu-utils": "^0.0.16",
+        "@imengyu/imengyu-utils": "^0.0.19",
         "@imengyu/js-request-transform": "^0.3.3",
         "@imengyu/vue-dynamic-form": "^0.1.1",
         "async-validator": "^4.2.5",
@@ -61,7 +61,7 @@
     },
     "node_modules/@antfu/utils": {
       "version": "0.7.10",
-      "resolved": "https://registry.npmmirror.com/@antfu@imengyu/imengyu-utils/dist/uniapp/DialogAction-/utils-0.7.10.tgz",
+      "resolved": "https://registry.npmmirror.com/@antfu@/components/utils/DialogAction-/utils-0.7.10.tgz",
       "integrity": "sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==",
       "license": "MIT",
       "funding": {
@@ -2891,9 +2891,9 @@
       }
     },
     "node_modules/@imengyu/imengyu-utils": {
-      "version": "0.0.16",
-      "resolved": "https://registry.npmmirror.com/@imengyu/imengyu-utils/-/imengyu-utils-0.0.16.tgz",
-      "integrity": "sha512-PhiHoat0ZL+2LGJR2W3MWVsd/dx+N4Tb3GGsOQQ+6HpBB8a/plhY1lNlqngDqlb3H6p6B6kap00Bdhcu9gYh+w==",
+      "version": "0.0.19",
+      "resolved": "https://registry.npmmirror.com/@imengyu/imengyu-utils/-/imengyu-utils-0.0.19.tgz",
+      "integrity": "sha512-McRfq8JksU1rjkji21eB2G0xffSiJcKsVvOwMPWUdEQzXy5qPRZzsWrB+e/Irm86Qj+pA789pA9VA93gW6ALSw==",
       "license": "MIT",
       "dependencies": {
         "@imengyu/js-request-transform": "^0.3.6"
@@ -3307,6 +3307,13 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
+    "node_modules/@jimp@/components/utils/DialogActionnode_modules/regenerator-runtime": {
+      "version": "0.13.11",
+      "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+      "extraneous": true,
+      "license": "MIT"
+    },
     "node_modules/@jimp/bmp": {
       "version": "0.10.3",
       "resolved": "https://registry.npmmirror.com/@jimp/bmp/-/bmp-0.10.3.tgz",
@@ -3780,7 +3787,7 @@
     },
     "node_modules/@jimp/utils": {
       "version": "0.10.3",
-      "resolved": "https://registry.npmmirror.com/@jimp@imengyu/imengyu-utils/dist/uniapp/DialogAction-/utils-0.10.3.tgz",
+      "resolved": "https://registry.npmmirror.com/@jimp@/components/utils/DialogAction-/utils-0.10.3.tgz",
       "integrity": "sha512-VcSlQhkil4ReYmg1KkN+WqHyYfZ2XfZxDsKAHSfST1GEz/RQHxKZbX+KhFKtKflnL0F4e6DlNQj3vznMNXCR2w==",
       "license": "MIT",
       "dependencies": {
@@ -3789,7 +3796,7 @@
         "regenerator-runtime": "^0.13.3"
       }
     },
-    "node_modules/@jimp@imengyu/imengyu-utils/dist/uniapp/DialogActionnode_modules/regenerator-runtime": {
+    "node_modules/@jimp/utils/node_modules/regenerator-runtime": {
       "version": "0.13.11",
       "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
       "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",

package.json

@@ -50,7 +50,7 @@
     "@dcloudio/uni-mp-weixin": "3.0.0-4030620241128001",
     "@dcloudio/uni-mp-xhs": "3.0.0-4030620241128001",
     "@dcloudio/uni-quickapp-webview": "3.0.0-4030620241128001",
-    "@imengyu/imengyu-utils": "^0.0.16",
+    "@imengyu/imengyu-utils": "^0.0.19",
     "@imengyu/js-request-transform": "^0.3.3",
     "@imengyu/vue-dynamic-form": "^0.1.1",
     "async-validator": "^4.2.5",

src/api/CommonContent.ts

@@ -2,7 +2,7 @@ import { DataModel, transformArrayDataModel, type NewDataModel } from '@imengyu/
 import { AppServerRequestModule } from './RequestModules';
 import ApiCofig from '@/common/config/ApiCofig';
 import { transformSomeToArray } from './Utils';
-import type { QueryParams } from '@imengyu/imengyu-utils/dist/request';
+import type { QueryParams } from '@imengyu/imengyu-utils';
 
 export class GetColumListParams extends DataModel<GetColumListParams> {
   

src/api/RequestModules.ts

@@ -8,13 +8,14 @@
 
 import AppCofig, { isDev } from "../common/config/AppCofig";
 import ApiCofig from "@/common/config/ApiCofig";
-import uniappImplementer from "@imengyu/imengyu-utils/dist/request/implementer/Uniapp";
 import { 
   RequestCoreInstance, RequestOptions, RequestApiError, RequestApiResult, type RequestApiErrorType,
   defaultResponseDataGetErrorInfo, defaultResponseDataHandlerCatch,
   RequestResponse,
-} from "@imengyu/imengyu-utils/dist/request";
-import { appendGetUrlParams, appendPostParams } from "@imengyu/imengyu-utils/dist/request/utils/Utils";
+  appendGetUrlParams, 
+  appendPostParams,
+  UniappImplementer,
+} from "@imengyu/imengyu-utils";
 import type { DataModel, KeyValue, NewDataModel } from "@imengyu/js-request-transform";
 import { StringUtils } from "@imengyu/imengyu-utils";
 
@@ -217,7 +218,7 @@ export function reportError<T extends DataModel>(instance: RequestCoreInstance<T
  */
 export class AppServerRequestModule<T extends DataModel> extends RequestCoreInstance<T> {
   constructor() {
-    super(uniappImplementer);
+    super(UniappImplementer);
     this.config.baseUrl = ApiCofig.serverProd;
     this.config.errCodes = []; //
     this.config.requestInceptor = requestInceptor;
@@ -231,7 +232,7 @@ export class AppServerRequestModule<T extends DataModel> extends RequestCoreInst
  */
 export class AppServerRequestModule2<T extends DataModel> extends RequestCoreInstance<T> {
   constructor() {
-    super(uniappImplementer);
+    super(UniappImplementer);
     this.config.baseUrl = 'https://huli-app.wenlvti.net';
     this.config.errCodes = []; //
     this.config.requestInceptor = requestInceptor;

src/api/inheritor/MoveableContent.ts

@@ -1,6 +1,6 @@
 import type { DataModel, NewDataModel } from '@imengyu/js-request-transform';
 import { CommonContentApi, GetContentListItem, GetContentListParams } from '../CommonContent';
-import type { QueryParams } from '@imengyu/imengyu-utils/dist/request';
+import type { QueryParams } from '@imengyu/imengyu-utils';
 
 export class MoveableContentApi extends CommonContentApi {
 

src/api/inheritor/UnmoveableContent.ts

@@ -1,6 +1,6 @@
 import type { DataModel, NewDataModel } from '@imengyu/js-request-transform';
 import { CommonContentApi, GetContentListItem, GetContentListParams } from '../CommonContent';
-import type { QueryParams } from '@imengyu/imengyu-utils/dist/request';
+import type { QueryParams } from '@imengyu/imengyu-utils';
 
 export class UnmoveableContentApi extends CommonContentApi {
 

src/common/components/RequireLogin.vue

@@ -8,7 +8,7 @@
 
 <script setup lang="ts">
 import { useAuthStore } from '@/store/auth';
-import { navTo } from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
+import { navTo } from '@/components/utils/PageAction';
 import { computed } from 'vue';
 
 const authStore = useAuthStore();

src/common/components/form/SimpleDynamicFormUni.vue

@@ -20,7 +20,7 @@ import { computed, onMounted, provide, reactive, ref, toRef, watch, type PropTyp
 import type { FormDefine, FormDefineItem, FormExport } from '.';
 import SimpleDynamicFormCate from './SimpleDynamicFormCate.vue';
 import { waitTimeOut } from '@imengyu/imengyu-utils';
-import { toast } from '@imengyu/imengyu-utils/dist/uniapp/DialogAction';
+import { toast } from '@/components/utils/DialogAction';
 
 const props = defineProps({	
   formDefine: {

src/common/components/form/components/RichTextEditor.vue

@@ -11,7 +11,7 @@
 
 <script setup lang="ts">
 import { onPageShow } from '@dcloudio/uni-app';
-import { navTo } from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
+import { navTo } from '@/components/utils/PageAction';
 
 const props = defineProps({	
   modelValue: { 

src/common/composeabe/RequireLogin.ts

@@ -1,6 +1,6 @@
 import { useAuthStore } from "@/store/auth";
-import { confirm } from "@imengyu/imengyu-utils/dist/uniapp/DialogAction";
-import { navTo } from "@imengyu/imengyu-utils/dist/uniapp/PageAction";
+import { confirm } from "@/components/utils/DialogAction";
+import { navTo } from "@/components/utils/PageAction";
 
 export function useReqireLogin() {
   const authStore = useAuthStore();

src/common/composeabe/SimpleAudioPlayer.ts

@@ -1,6 +1,6 @@
 import { computed, onMounted, onUnmounted, ref, type Ref } from "vue";
 import { TimeUtils } from "@imengyu/imengyu-utils";
-import { toast } from "@imengyu/imengyu-utils/dist/uniapp/DialogAction";
+import { toast } from "@/components/utils/DialogAction";
 
 export function useSimpleAudioPlayer(config: {
   onEnded?: () => void;

src/components/utils/DialogAction.ts

@@ -0,0 +1,78 @@
+import { type App } from "vue";
+
+/**
+ * 说明：对话框相关的封装
+ */
+
+/**
+ * 显示一个文本提示框
+ * @param content - 要显示的提示内容
+ */
+function toast(content: string) {
+  if (typeof content!=='string')
+    content = '' + content;
+  uni.showToast({
+    title: content,
+    icon: 'none',
+  })
+}
+/**
+ * 显示一个确认对话框
+ * @param option - 对话框的配置选项
+ * @param option.title - 对话框的标题，可选
+ * @param option.content - 对话框的内容，可选
+ */
+function alert(option: {
+  title?: string,
+  content?: string,
+}) {
+  uni.showModal({
+    title: option.title,
+    content: option.content,
+  })
+};
+/**
+ * 显示一个确认对话框
+ * @param option - 对话框的配置选项
+ * @param option.title - 对话框的标题，可选
+ * @param option.content - 对话框的内容，可选
+ * @param option.cancelText - 取消按钮的文本，可选
+ * @param option.confirmText - 确认按钮的文本，可选
+ * @returns - 返回一个 Promise 对象，当用户点击确定按钮时，Promise 的结果为 true，否则为 false
+ */
+function confirm(option: {
+  title?: string,
+  content?: string,
+  cancelText?: string, 
+  confirmText?: string,
+}) {
+  return new Promise<boolean>((resolve, reject) => {
+    uni.showModal({
+      title: option.title || '',
+      content: option.content || '',
+      showCancel: true,
+      cancelText: option.cancelText || '取消',
+      confirmText: option.confirmText || '确定',
+      success(res) {
+        resolve(res.confirm);
+      },
+      fail(res) {
+        reject(res);
+      }
+    })
+  })
+}
+
+export {
+  toast,
+  alert,
+  confirm, 
+}
+
+export default {
+  install(app: App<Element>) : void {
+    app.config.globalProperties.$toast = toast;
+    app.config.globalProperties.$alert = alert;
+    app.config.globalProperties.$confirm = confirm;
+  },
+}

src/components/utils/PageAction.ts

@@ -0,0 +1,101 @@
+import { type App } from "vue";
+
+/**
+ * 说明：页面导航相关函数封装。
+ */
+
+/**
+ * 页面跳转: 后退至上一个页面。
+ */
+function back() {
+  uni.navigateBack({ delta: 1 });
+}
+/**
+ * 页面跳转: 后退并返回数据至上一个页面的 onPageBack 方法。
+ * @param data 要返回的数据
+ */
+function backReturnData(data: Record<string, unknown>) {
+  var pages = getCurrentPages(); // 获取页面栈
+  var prevPage = pages[pages.length - 2] as { $vm: Record<string, unknown> }; // 上一个页面
+
+  for (const key in data) {
+    if (Object.prototype.hasOwnProperty.call(data, key)) {
+      prevPage.$vm[key] = data[key];
+    }
+  }
+
+  uni.navigateBack({ delta: 1 });
+}
+/**
+ * 页面跳转: 跳转到指定页面
+ * @param url 页面路径
+ * @param data 要传递的数据
+ */
+function navTo(url: string, data: Record<string, unknown> = {}) {
+  var dataString = '';
+
+  for (const key in data) {
+    if (Object.prototype.hasOwnProperty.call(data, key))
+      dataString += `&${key}=${data[key]}`;
+  }
+
+  uni.navigateTo({ 
+    url: url + '?' + dataString,
+    fail: (err) => {
+      console.error('页面跳转失败:', err);
+    },
+  });
+}
+/**
+ * 页面数据传递: 调用上一个页面的 onPageBack 方法
+ * @param name 方法名
+ * @param data 要传递的数据
+ */
+function callPrevOnPageBack(name: string, data: Record<string, unknown>) {
+  var pages = getCurrentPages(); // 获取页面栈
+  var prevPage = pages[pages.length - 2] as { $vm: Record<string, unknown> }; // 上一个页面
+
+  if (typeof prevPage.$vm.onPageBack === 'function')
+    prevPage.$vm.onPageBack(name, data);
+}
+/**
+ * 页面跳转: 调用上一个页面的 onPageBack 方法并返回至上一个页面
+ * @param name 方法名
+ * @param data 要传递的数据
+ */
+function backAndCallOnPageBack(name: string, data: Record<string, unknown>) {
+  var pages = getCurrentPages(); // 获取页面栈
+  var prevPage = pages[pages.length - 2] as { $vm: Record<string, unknown> }; // 上一个页面
+
+  if (typeof prevPage.$vm.onPageBack === 'function')
+    prevPage.$vm.onPageBack(name, data);
+
+  uni.navigateBack({ delta: 1 });
+}
+
+export {
+  back,
+  backReturnData,
+  backAndCallOnPageBack, 
+  navTo,
+  callPrevOnPageBack,
+}
+
+export function getCurrentPageUrl() {
+  const pages = getCurrentPages();
+  const currentPagePath = pages[pages.length - 1]?.route
+  return currentPagePath
+}
+
+export default {
+  install(app: App<Element>) : void {
+    const p = {
+      back,
+      backReturnData,
+      backAndCallOnPageBack,
+      callPrevOnPageBack,
+      navTo,
+    };
+    app.config.globalProperties.$p = p;
+  },
+}

src/main.ts

@@ -3,8 +3,8 @@ import { createSSRApp } from 'vue';
 import { createPinia } from 'pinia';
 import { registryConvert } from './common/utils/ConvertRgeistry';
 
-import DialogAction from '@imengyu/imengyu-utils/dist/uniapp/DialogAction';
-import PageAction from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
+import DialogAction from '@/components/utils/DialogAction';
+import PageAction from '@/components/utils/PageAction';
 
 export function createApp() {
   const app = createSSRApp(App);

src/pages/article/common/CommonContent.ts

@@ -1,6 +1,6 @@
 import CommonContent, { GetContentListItem, GetContentListParams } from "@/api/CommonContent";
 import { useSimpleDataLoader, type ISimpleDataLoader } from "@/common/composeabe/SimpleDataLoader";
-import { navTo } from "@imengyu/imengyu-utils/dist/uniapp/PageAction";
+import { navTo } from "@/components/utils/PageAction";
 
 export interface IHomePageMiniCommonListGoMoreAndGoDetail {
   loader: ISimpleDataLoader<GetContentListItem[], any>;

src/pages/article/common/CommonListPage.vue

@@ -132,7 +132,7 @@ import Box2LineLargeImageUserShadow from '@/pages/parts/Box2LineLargeImageUserSh
 import Box2LineImageRightShadow from '@/pages/parts/Box2LineImageRightShadow.vue';
 import SimpleDropDownPicker, { type SimpleDropDownPickerItem } from '@/common/components/SimpleDropDownPicker.vue';
 import AppCofig from '@/common/config/AppCofig';
-import { navTo } from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
+import { navTo } from '@/components/utils/PageAction';
 
 function getImage(item: any) {
   return item.thumbnail || item.image || AppCofig.defaultImage

src/pages/article/editor/editor.vue

@@ -21,8 +21,8 @@
 
 <script setup lang="ts">
 import { showError } from '@/common/composeabe/ErrorDisplay';
-import { confirm } from '@imengyu/imengyu-utils/dist/uniapp/DialogAction';
-import { back, backAndCallOnPageBack } from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
+import { confirm } from '@/components/utils/DialogAction';
+import { back, backAndCallOnPageBack } from '@/components/utils/PageAction';
 import spEditor from '@/uni_modules/sp-editor/components/sp-editor/sp-editor.vue';
 
 function cancel() {

src/pages/discover.vue

@@ -136,7 +136,7 @@
 import { onShareTimeline, onShareAppMessage } from '@dcloudio/uni-app';
 import { useSimpleDataLoader } from '@/common/composeabe/SimpleDataLoader';
 import { useHomePageMiniCommonListGoMoreAndGoDetail } from './article/common/CommonContent';
-import { navTo } from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
+import { navTo } from '@/components/utils/PageAction';
 import Tabbar from '@/common/components/tabs/tabbar.vue';
 import Box2LineRightSlot from './parts/Box2LineRightSlot.vue';
 import Box2LineLargeImageUserShadow from './parts/Box2LineLargeImageUserShadow.vue';

src/pages/home.vue

@@ -190,7 +190,7 @@ const ImageTest = 'https://mncdn.wenlvti.net/app_static/minnan/images/home/Image
 
 import { ref, watch } from 'vue';
 import { onShareTimeline, onShareAppMessage } from '@dcloudio/uni-app';
-import { navTo } from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
+import { navTo } from '@/components/utils/PageAction';
 import { useSimpleDataLoader } from '@/common/composeabe/SimpleDataLoader';
 import { useSimpleListAudioPlayer } from '@/common/composeabe/SimpleAudioPlayer';
 import CommonContent, { GetContentListParams } from '@/api/CommonContent';

src/pages/home/introduction.vue

@@ -62,7 +62,7 @@ import commonParserStyle from '@/common/style/commonParserStyle';
 import SimplePageContentLoader from '@/common/components/SimplePageContentLoader.vue';
 import { useSimplePageListLoader } from '@/common/composeabe/SimplePageListLoader';
 import { DataDateUtils } from '@imengyu/js-request-transform';
-import { navTo } from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
+import { navTo } from '@/components/utils/PageAction';
 import { onMounted } from 'vue';
 
 const introdData = useSimpleDataLoader(async () => {

src/pages/inhert.vue

@@ -201,7 +201,7 @@
 </template>
 
 <script setup lang="ts">
-import { navTo } from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
+import { navTo } from '@/components/utils/PageAction';
 import { useSimpleDataLoader } from '@/common/composeabe/SimpleDataLoader';
 import { GetContentListParams } from '@/api/CommonContent';
 import Tabbar from '@/common/components/tabs/tabbar.vue';

src/pages/inhert/artifact/details.vue

@@ -90,7 +90,7 @@
 <script setup lang="ts">
 import type { TabControlItem } from "@/common/composeabe/TabControl";
 import { ref, type Ref } from "vue";
-import { navTo } from "@imengyu/imengyu-utils/dist/uniapp/PageAction";
+import { navTo } from "@/components/utils/PageAction";
 import UnmoveableContent from "@/api/inheritor/UnmoveableContent";
 import commonParserStyle from "@/common/style/commonParserStyle";
 import IntroBlock from "@/pages/article/common/IntroBlock.vue";

src/pages/inhert/artifact/list.vue

@@ -60,7 +60,7 @@
 import { ref, watch } from 'vue';
 import CommonContent, { GetContentListParams } from '@/api/CommonContent';
 import { useSimplePageListLoader } from '@/common/composeabe/SimplePageListLoader';
-import { navTo } from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
+import { navTo } from '@/components/utils/PageAction';
 import MoveableContent from '@/api/inheritor/MoveableContent';
 import UnmoveableContent from '@/api/inheritor/UnmoveableContent';
 import SimplePageListLoader from '@/common/components/SimplePageListLoader.vue';

src/pages/inhert/intangible/DetailsCommon.vue

@@ -201,7 +201,7 @@ import IntroBlock from "@/pages/article/common/IntroBlock.vue";
 import { useLoadQuerys } from "@/common/composeabe/LoadQuerys";
 import type { TabControlItem } from "@/common/composeabe/TabControl";
 import { ref, type Ref } from "vue";
-import { navTo } from "@imengyu/imengyu-utils/dist/uniapp/PageAction";
+import { navTo } from "@/components/utils/PageAction";
 import { StringUtils } from "@imengyu/imengyu-utils";
 import InheritorContent from "@/api/inheritor/InheritorContent";
 import ProductsContent from "@/api/inheritor/ProductsContent";

src/pages/inhert/intangible/list.vue

@@ -29,7 +29,7 @@ import CommonContent, { GetContentListParams } from '@/api/CommonContent';
 import ProductsContent from '@/api/inheritor/ProductsContent';
 import ProjectsContent from '@/api/inheritor/ProjectsContent';
 import SeminarContent from '@/api/inheritor/SeminarContent';
-import { navTo } from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
+import { navTo } from '@/components/utils/PageAction';
 import CommonListPage, { type DropDownNames } from '@/pages/article/common/CommonListPage.vue';
 import { onLoad } from '@dcloudio/uni-app';
 import { waitTimeOut } from '@imengyu/imengyu-utils';

src/pages/inhert/language/list.vue

@@ -86,7 +86,7 @@
 import { ref, watch } from 'vue';
 import { useSimplePageListLoader } from '@/common/composeabe/SimplePageListLoader';
 import { useSimpleDataLoader } from '@/common/composeabe/SimpleDataLoader';
-import { navTo } from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
+import { navTo } from '@/components/utils/PageAction';
 import CommonContent, { GetContentListParams } from '@/api/CommonContent';
 import SimplePageListLoader from '@/common/components/SimplePageListLoader.vue';
 import AppCofig from '@/common/config/AppCofig';

src/pages/inhert/map/index.vue

@@ -51,7 +51,7 @@
 <script setup lang="ts">
 import { ref, watch } from 'vue';
 import { useSimplePageListLoader } from '@/common/composeabe/SimplePageListLoader';
-import { navTo } from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
+import { navTo } from '@/components/utils/PageAction';
 import { useSimpleDataLoader } from '@/common/composeabe/SimpleDataLoader';
 import SimpleDropDownPicker from '@/common/components/SimpleDropDownPicker.vue';
 import SeminarContent from '@/api/inheritor/SeminarContent';

src/pages/inhert/village/details.vue

@@ -120,7 +120,7 @@ import Box2LineLargeImageUserShadow from '@/pages/parts/Box2LineLargeImageUserSh
 import { ref, toRefs, type Ref } from 'vue';
 import { useLoadQuerys } from '@/common/composeabe/LoadQuerys';
 import { useSwiperImagePreview } from '@/common/composeabe/SwiperImagePreview';
-import { navTo } from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
+import { navTo } from '@/components/utils/PageAction';
 import { useSimpleDataLoader } from '@/common/composeabe/SimpleDataLoader';
 import { useHomePageMiniCommonListGoMoreAndGoDetail, type IHomePageMiniCommonListGoMoreAndGoDetail } from '@/pages/article/common/CommonContent';
 import ContentNote from '@/pages/parts/ContentNote.vue';

src/pages/inhert/village/list.vue

@@ -18,7 +18,7 @@
 import CommonListPage, { type DropDownNames } from '@/pages/article/common/CommonListPage.vue';
 import { onMounted, ref } from 'vue';
 import VillageApi from '@/api/inhert/VillageApi';
-import { navTo } from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
+import { navTo } from '@/components/utils/PageAction';
 import CommonContent from '@/api/CommonContent';
 import { waitTimeOut } from '@imengyu/imengyu-utils';
 

src/pages/travel.vue

@@ -123,7 +123,7 @@
 <script setup lang="ts">
 import { useHomePageMiniCommonListGoMoreAndGoDetail } from './article/common/CommonContent';
 import { useSimpleDataLoader } from '@/common/composeabe/SimpleDataLoader';
-import { navTo } from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
+import { navTo } from '@/components/utils/PageAction';
 import { onShareTimeline, onShareAppMessage } from '@dcloudio/uni-app';
 import Tabbar from '@/common/components/tabs/tabbar.vue';
 import Box2LineLargeImageUserShadow from './parts/Box2LineLargeImageUserShadow.vue';

src/pages/travel/calendar.vue

@@ -20,7 +20,7 @@
         <view class="year">
           <text class="iconfont icon-arrow-left" @click="changeYear(currentYear - 1)"></text>
           <picker mode="date" :value="currentYear" @change="(e: any) => changeYear(e.detail.value)" fields="year">
-            <view class="current-year">{{ currentYear }} 年</view>
+            <view class="current-year">公历{{ currentYear }}年</view>
           </picker>
           <text class="iconfont icon-arrow-right" @click="changeYear(currentYear + 1)"></text>
         </view>
@@ -69,6 +69,7 @@
                 <view v-if="item" class="item">
                   <view class="head" :id="'month' + item.month">
                     <view class="year-month">{{ item.year }}年{{ item.month }}月</view>
+                    <text>{{ item.lunar }}</text>
                     <view>本月活动 <text>{{ item.data.length }}</text></view>
                   </view>
                   <view v-if="item.data.length == 0" class="activity">
@@ -104,9 +105,10 @@ import { GetContentListParams } from '@/api/CommonContent';
 import CalendarContent from '@/api/fusion/CalendarContent';
 import SimplePageContentLoader from '@/common/components/SimplePageContentLoader.vue';
 import { useSimplePageContentLoader } from '@/common/composeabe/SimplePageContentLoader';
-import { navTo } from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
+import { navTo } from '@/components/utils/PageAction';
 import { onLoad } from '@dcloudio/uni-app';
 import { ref } from 'vue';
+import { CalendarUtils, DateUtils } from '@imengyu/imengyu-utils';
 
 const tabs = [
   {
@@ -183,6 +185,7 @@ interface ListItem {
   id: number;
   month: number,
   year: number,
+  lunar: string,
   data: {
     id: number,
     title: string,
@@ -197,10 +200,14 @@ const listLoader = useSimplePageContentLoader<ListItem[]>(async () => {
   const res = (await CalendarContent.getCalendarList(new GetContentListParams(), 1, 100));
   const res2 : ListItem[] = [];
   for (let i = 0; i < 12; i++) {
+    const month = i + 1;
+    const startDay = CalendarUtils.solar2lunar(currentYear.value, month, 1);
+    const endDay = CalendarUtils.solar2lunar(currentYear.value, month, DateUtils.getMonthDays(currentYear.value, month - 1));
     res2[i] = {
       id: i,
       month: i + 1,
       year: currentYear.value,
+      lunar:  `${startDay.IMonthCn}${startDay.IDayCn} - ${endDay.IMonthCn}${endDay.IDayCn}`,
       data: []
     }
   }
@@ -285,6 +292,7 @@ $color-primary: map.get($colors, "primary");
         color: #111111;
         padding: 12rpx 42rpx 12rpx 50rpx;
         display: flex;
+        flex-direction: column;
         align-items: center;
         font-size: 24rpx;
 

src/pages/travel/nav/navto.vue

@@ -25,10 +25,10 @@
 import { showError } from '@/common/composeabe/ErrorDisplay';
 import { useLoadQuerys } from '@/common/composeabe/LoadQuerys';
 import AppCofig from '@/common/config/AppCofig';
-import { back } from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
+import { back } from '@/components/utils/PageAction';
 import { ref } from 'vue';
 import amapFile from '@/libs/amap-wx.130';
-import { toast } from '@imengyu/imengyu-utils/dist/uniapp/DialogAction';
+import { toast } from '@/components/utils/DialogAction';
 
 const mapCtx = uni.createMapContext('map');
 const polyline = ref();

src/pages/user/contribute/list.vue

@@ -33,7 +33,7 @@ import { GetContentListItem } from '@/api/CommonContent';
 import SimplePageListLoader from '@/common/components/SimplePageListLoader.vue';
 import { useSimplePageListLoader } from '@/common/composeabe/SimplePageListLoader';
 import { ref } from 'vue';
-import { navTo } from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
+import { navTo } from '@/components/utils/PageAction';
 import { onLoad } from '@dcloudio/uni-app';
 import ContributeApi from '@/api/user/ContributeApi';
 import Box2LineImageRightShadow from '@/pages/parts/Box2LineImageRightShadow.vue';

src/pages/user/index.vue

@@ -88,8 +88,8 @@
 
 <script setup lang="ts">
 import Tabbar from '@/common/components/tabs/tabbar.vue';
-import { confirm } from '@imengyu/imengyu-utils/dist/uniapp/DialogAction';
-import { navTo } from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
+import { confirm } from '@/components/utils/DialogAction';
+import { navTo } from '@/components/utils/PageAction';
 import { useAuthStore } from '@/store/auth';
 import { computed } from 'vue';
 import { useReqireLogin } from '@/common/composeabe/RequireLogin';

src/pages/user/login.vue

@@ -61,8 +61,8 @@
 <script setup lang="ts">
 import { useAuthStore } from '@/store/auth';
 import { onLoad } from '@dcloudio/uni-app';
-import { back } from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
-import { toast } from '@imengyu/imengyu-utils/dist/uniapp/DialogAction';
+import { back } from '@/components/utils/PageAction';
+import { toast } from '@/components/utils/DialogAction';
 import { ref } from 'vue';
 import { showError } from '@/common/composeabe/ErrorDisplay';
 

src/pages/video/list.vue

@@ -39,7 +39,7 @@
 import { GetContentListItem, GetContentListParams } from '@/api/CommonContent';
 import { useSimplePageListLoader } from '@/common/composeabe/SimplePageListLoader';
 import { ref } from 'vue';
-import { navTo } from '@imengyu/imengyu-utils/dist/uniapp/PageAction';
+import { navTo } from '@/components/utils/PageAction';
 import { onLoad } from '@dcloudio/uni-app';
 import NewsIndexContent from '@/api/news/NewsIndexContent';
 import SimplePageListLoader from '@/common/components/SimplePageListLoader.vue';