From 3b1b5f0d88bd864069a45400e700d8b89b3d145e Mon Sep 17 00:00:00 2001 From: H1d3rOne Date: Fri, 6 Mar 2026 04:30:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=A5=87=E9=97=A8?= =?UTF-8?q?=E9=81=81=E7=94=B2=E6=8E=92=E7=9B=98=E5=8A=9F=E8=83=BD=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增后端QiMenController控制器，提供奇门遁甲排盘API接口 - 新增前端奇门遁甲输入页面qimen.vue，支持姓名、占事、日期、时间等参数设置 - 新增前端奇门遁甲结果页面result.vue，展示九宫排盘、三盘信息、吉凶判断等 - 更新api.js添加qimenApi接口 - 更新pages.json添加结果页面路由 --- .../java/xuan/controller/QiMenController.java | 222 +++++++ .../java/xuan/controller/ZiWeiController.java | 191 ++++++ xuan-deduct-uniapp/src/App.vue | 3 +- xuan-deduct-uniapp/src/pages.json | 20 +- xuan-deduct-uniapp/src/pages/qimen/qimen.vue | 429 +++++++++++- xuan-deduct-uniapp/src/pages/qimen/result.vue | 541 +++++++++++++++ xuan-deduct-uniapp/src/pages/ziwei/result.vue | 626 ++++++++++++++++++ xuan-deduct-uniapp/src/pages/ziwei/ziwei.vue | 363 +++++++++- xuan-deduct-uniapp/src/utils/api.js | 24 + 9 files changed, 2370 insertions(+), 49 deletions(-) create mode 100644 src/main/java/xuan/controller/QiMenController.java create mode 100644 src/main/java/xuan/controller/ZiWeiController.java create mode 100644 xuan-deduct-uniapp/src/pages/qimen/result.vue create mode 100644 xuan-deduct-uniapp/src/pages/ziwei/result.vue diff --git a/src/main/java/xuan/controller/QiMenController.java b/src/main/java/xuan/controller/QiMenController.java new file mode 100644 index 0000000..cb35273 --- /dev/null +++ b/src/main/java/xuan/controller/QiMenController.java @@ -0,0 +1,222 @@ +package xuan.controller; + +import org.springframework.web.bind.annotation.*; +import xuan.core.qimen.zhuan.QiMenZhuanPan; +import xuan.core.qimen.zhuan.settings.QiMenZhuanPanJiChuSetting; + +import java.util.HashMap; +import java.util.Map; + +@RestController +@RequestMapping("/api/qimen") +public class QiMenController { + + @PostMapping("/paipan") + public Map paiPan(@RequestBody QiMenRequest request) { + Map result = new HashMap<>(); + try { + QiMenZhuanPanJiChuSetting setting = new QiMenZhuanPanJiChuSetting(); + setting.setName(request.getName() != null ? request.getName() : "某人"); + setting.setOccupy(request.getOccupy() != null ? request.getOccupy() : "某事"); + setting.setSex(request.getSex() != null ? request.getSex() : 1); + setting.setDate(request.getDate() != null ? request.getDate() : "2024-01-01 00:00:00"); + setting.setDateType(request.getDateType() != null ? request.getDateType() : 0); + setting.setLeapMonthType(request.getLeapMonthType() != null ? request.getLeapMonthType() : 0); + setting.setXuShiSuiType(request.getXuShiSuiType() != null ? request.getXuShiSuiType() : 0); + setting.setJieQiType(request.getJieQiType() != null ? request.getJieQiType() : 1); + setting.setPaiPanType(request.getPaiPanType() != null ? request.getPaiPanType() : 3); + setting.setZhiShiType(request.getZhiShiType() != null ? request.getZhiShiType() : 0); + setting.setYueJiaQiJuType(request.getYueJiaQiJuType() != null ? request.getYueJiaQiJuType() : 1); + setting.setYearGanZhiType(request.getYearGanZhiType() != null ? request.getYearGanZhiType() : 2); + setting.setMonthGanZhiType(request.getMonthGanZhiType() != null ? request.getMonthGanZhiType() : 1); + setting.setDayGanZhiType(request.getDayGanZhiType() != null ? request.getDayGanZhiType() : 0); + + QiMenZhuanPan qiMen = new QiMenZhuanPan(setting); + + result.put("success", true); + result.put("data", buildQiMenData(qiMen)); + } catch (Exception e) { + result.put("success", false); + result.put("error", e.getMessage()); + } + return result; + } + + private Map buildQiMenData(QiMenZhuanPan qiMen) { + Map data = new HashMap<>(); + + data.put("name", qiMen.getName()); + data.put("occupy", qiMen.getOccupy()); + data.put("sex", qiMen.getSex()); + data.put("age", qiMen.getAge()); + data.put("zao", qiMen.getZao()); + data.put("solar", qiMen.getSolarStr2()); + data.put("lunar", qiMen.getLunarStr2()); + data.put("xingQi", qiMen.getXingQi()); + data.put("jiJie", qiMen.getJiJie()); + data.put("shengXiao", qiMen.getShengXiao()); + data.put("xingZuo", qiMen.getXingZuo()); + data.put("yueXiang", qiMen.getYueXiang()); + data.put("yueJiang", qiMen.getYueJiang()); + data.put("yueJiangShen", qiMen.getYueJiangShen()); + data.put("wuBuYuShi", qiMen.getWuBuYuShi()); + + data.put("yearGan", qiMen.getYearGan()); + data.put("monthGan", qiMen.getMonthGan()); + data.put("dayGan", qiMen.getDayGan()); + data.put("hourGan", qiMen.getHourGan()); + data.put("yearZhi", qiMen.getYearZhi()); + data.put("monthZhi", qiMen.getMonthZhi()); + data.put("dayZhi", qiMen.getDayZhi()); + data.put("hourZhi", qiMen.getHourZhi()); + data.put("yearGanZhi", qiMen.getYearGanZhi()); + data.put("monthGanZhi", qiMen.getMonthGanZhi()); + data.put("dayGanZhi", qiMen.getDayGanZhi()); + data.put("hourGanZhi", qiMen.getHourGanZhi()); + + data.put("yearGanWuXing", qiMen.getYearGanWuXing()); + data.put("monthGanWuXing", qiMen.getMonthGanWuXing()); + data.put("dayGanWuXing", qiMen.getDayGanWuXing()); + data.put("hourGanWuXing", qiMen.getHourGanWuXing()); + data.put("yearZhiWuXing", qiMen.getYearZhiWuXing()); + data.put("monthZhiWuXing", qiMen.getMonthZhiWuXing()); + data.put("dayZhiWuXing", qiMen.getDayZhiWuXing()); + data.put("hourZhiWuXing", qiMen.getHourZhiWuXing()); + data.put("yearGanZhiWuXing", qiMen.getYearGanZhiWuXing()); + data.put("monthGanZhiWuXing", qiMen.getMonthGanZhiWuXing()); + data.put("dayGanZhiWuXing", qiMen.getDayGanZhiWuXing()); + data.put("hourGanZhiWuXing", qiMen.getHourGanZhiWuXing()); + + data.put("yearGanZhiNaYin", qiMen.getYearGanZhiNaYin()); + data.put("monthGanZhiNaYin", qiMen.getMonthGanZhiNaYin()); + data.put("dayGanZhiNaYin", qiMen.getDayGanZhiNaYin()); + data.put("hourGanZhiNaYin", qiMen.getHourGanZhiNaYin()); + data.put("yearGanZhiKongWang", qiMen.getYearGanZhiKongWang()); + data.put("monthGanZhiKongWang", qiMen.getMonthGanZhiKongWang()); + data.put("dayGanZhiKongWang", qiMen.getDayGanZhiKongWang()); + data.put("hourGanZhiKongWang", qiMen.getHourGanZhiKongWang()); + + data.put("prevJie", qiMen.getPrevJie()); + data.put("prevJieDateStr", qiMen.getPrevJieDateStr()); + data.put("prevJieDay", qiMen.getPrevJieDay()); + data.put("nextJie", qiMen.getNextJie()); + data.put("nextJieDateStr", qiMen.getNextJieDateStr()); + data.put("nextJieDay", qiMen.getNextJieDay()); + data.put("chuShengJie", qiMen.getChuShengJie()); + data.put("prevQi", qiMen.getPrevQi()); + data.put("prevQiDateStr", qiMen.getPrevQiDateStr()); + data.put("prevQiDay", qiMen.getPrevQiDay()); + data.put("nextQi", qiMen.getNextQi()); + data.put("nextQiDateStr", qiMen.getNextQiDateStr()); + data.put("nextQiDay", qiMen.getNextQiDay()); + data.put("chuShengQi", qiMen.getChuShengQi()); + + data.put("fuTou", qiMen.getFuTou()); + data.put("jieQi", qiMen.getJieQi()); + data.put("sanYuan", qiMen.getSanYuan()); + data.put("juShu", qiMen.getJuShu()); + data.put("yinYangDun", qiMen.getYinYangDun()); + data.put("xunShou", qiMen.getXunShou()); + data.put("xunShouYiZhang", qiMen.getXunShouYiZhang()); + data.put("zhiFu", qiMen.getZhiFu()); + data.put("zhiShi", qiMen.getZhiShi()); + + data.put("liuJiaXunKong", qiMen.getLiuJiaXunKong()); + data.put("liuJiaXunKongGongWei", qiMen.getLiuJiaXunKongGongWei()); + data.put("liuJiaXunKongGongWeiMark", qiMen.getLiuJiaXunKongGongWeiMark()); + data.put("yiMa", qiMen.getYiMa()); + data.put("yiMaGongWei", qiMen.getYiMaGongWei()); + data.put("yiMaGongWeiMark", qiMen.getYiMaGongWeiMark()); + + data.put("diPan", qiMen.getDiPan()); + data.put("tianPan", qiMen.getTianPan()); + data.put("renPan", qiMen.getRenPan()); + data.put("shenPan", qiMen.getShenPan()); + data.put("tianPanQiYiTianQinNo", qiMen.getTianPanQiYiTianQinNo()); + data.put("tianPanQiYiTianQinYes", qiMen.getTianPanQiYiTianQinYes()); + + data.put("tianYi", qiMen.getTianYi()); + data.put("diYi", qiMen.getDiYi()); + data.put("taiYi", qiMen.getTaiYi()); + data.put("jiuDun", qiMen.getJiuDun()); + data.put("neiWaiGongWeiMark", qiMen.getNeiWaiGongWeiMark()); + data.put("neiWaiGongWeiInfo", qiMen.getNeiWaiGongWeiInfo()); + data.put("tianMen", qiMen.getTianMen()); + data.put("diHu", qiMen.getDiHu()); + + data.put("fuYin", qiMen.getFuYin()); + data.put("fanYin", qiMen.getFanYin()); + data.put("liuYiJiXing", qiMen.getLiuYiJiXing()); + data.put("qiYiRuMu", qiMen.getQiYiRuMu()); + data.put("liuYiJiXingRuMuTianQinNoStatus", qiMen.getLiuYiJiXingRuMuTianQinNoStatus()); + data.put("liuYiJiXingRuMuTianQinYesStatus", qiMen.getLiuYiJiXingRuMuTianQinYesStatus()); + data.put("menPoStatus", qiMen.getMenPoStatus()); + + data.put("shiGanKeYing", qiMen.getShiGanKeYing()); + data.put("baMenKeYing", qiMen.getBaMenKeYing()); + data.put("baMenJingYing", qiMen.getBaMenJingYing()); + data.put("baMenDongYing", qiMen.getBaMenDongYing()); + data.put("xingMenKeYing", qiMen.getXingMenKeYing()); + data.put("jiuXingShiYing", qiMen.getJiuXingShiYing()); + + data.put("baGuaWangShuai", qiMen.getBaGuaWangShuai()); + data.put("baMenWangShuai", qiMen.getBaMenWangShuai()); + data.put("jiuXingWangShuai", qiMen.getJiuXingWangShuai()); + data.put("baShenLuoGongStatus", qiMen.getBaShenLuoGongStatus()); + data.put("baMenLuoGongStatus", qiMen.getBaMenLuoGongStatus()); + data.put("jiuXingLuoGongStatus", qiMen.getJiuXingLuoGongStatus()); + + data.put("diPanQiYiLuoGongLink", qiMen.getDiPanQiYiLuoGongLink()); + data.put("tianPanQiYiLuoGongTianQinNoLink", qiMen.getTianPanQiYiLuoGongTianQinNoLink()); + data.put("tianPanQiYiLuoGongTianQinYesLink", qiMen.getTianPanQiYiLuoGongTianQinYesLink()); + + return data; + } + + public static class QiMenRequest { + private String name; + private String occupy; + private Integer sex; + private String date; + private Integer dateType; + private Integer leapMonthType; + private Integer xuShiSuiType; + private Integer jieQiType; + private Integer paiPanType; + private Integer zhiShiType; + private Integer yueJiaQiJuType; + private Integer yearGanZhiType; + private Integer monthGanZhiType; + private Integer dayGanZhiType; + + public String getName() { return name; } + public void setName(String name) { this.name = name; } + public String getOccupy() { return occupy; } + public void setOccupy(String occupy) { this.occupy = occupy; } + public Integer getSex() { return sex; } + public void setSex(Integer sex) { this.sex = sex; } + public String getDate() { return date; } + public void setDate(String date) { this.date = date; } + public Integer getDateType() { return dateType; } + public void setDateType(Integer dateType) { this.dateType = dateType; } + public Integer getLeapMonthType() { return leapMonthType; } + public void setLeapMonthType(Integer leapMonthType) { this.leapMonthType = leapMonthType; } + public Integer getXuShiSuiType() { return xuShiSuiType; } + public void setXuShiSuiType(Integer xuShiSuiType) { this.xuShiSuiType = xuShiSuiType; } + public Integer getJieQiType() { return jieQiType; } + public void setJieQiType(Integer jieQiType) { this.jieQiType = jieQiType; } + public Integer getPaiPanType() { return paiPanType; } + public void setPaiPanType(Integer paiPanType) { this.paiPanType = paiPanType; } + public Integer getZhiShiType() { return zhiShiType; } + public void setZhiShiType(Integer zhiShiType) { this.zhiShiType = zhiShiType; } + public Integer getYueJiaQiJuType() { return yueJiaQiJuType; } + public void setYueJiaQiJuType(Integer yueJiaQiJuType) { this.yueJiaQiJuType = yueJiaQiJuType; } + public Integer getYearGanZhiType() { return yearGanZhiType; } + public void setYearGanZhiType(Integer yearGanZhiType) { this.yearGanZhiType = yearGanZhiType; } + public Integer getMonthGanZhiType() { return monthGanZhiType; } + public void setMonthGanZhiType(Integer monthGanZhiType) { this.monthGanZhiType = monthGanZhiType; } + public Integer getDayGanZhiType() { return dayGanZhiType; } + public void setDayGanZhiType(Integer dayGanZhiType) { this.dayGanZhiType = dayGanZhiType; } + } + +} diff --git a/src/main/java/xuan/controller/ZiWeiController.java b/src/main/java/xuan/controller/ZiWeiController.java new file mode 100644 index 0000000..b4edf92 --- /dev/null +++ b/src/main/java/xuan/controller/ZiWeiController.java @@ -0,0 +1,191 @@ +package xuan.controller; + +import org.springframework.web.bind.annotation.*; +import xuan.core.ziwei.ZiWei; +import xuan.core.ziwei.settings.ZiWeiJiChuSetting; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/api/ziwei") +public class ZiWeiController { + + @PostMapping("/paipan") + public Map paiPan(@RequestBody ZiWeiRequest request) { + Map result = new HashMap<>(); + try { + ZiWeiJiChuSetting setting = new ZiWeiJiChuSetting(); + setting.setName(request.getName() != null ? request.getName() : "某人"); + setting.setOccupy(request.getOccupy() != null ? request.getOccupy() : "某事"); + setting.setSex(request.getSex() != null ? request.getSex() : 1); + setting.setDate(request.getDate() != null ? request.getDate() : "2024-01-01 00:00:00"); + setting.setDateType(request.getDateType() != null ? request.getDateType() : 0); + setting.setLeapMonthType(request.getLeapMonthType() != null ? request.getLeapMonthType() : 0); + setting.setXuShiSuiType(request.getXuShiSuiType() != null ? request.getXuShiSuiType() : 0); + setting.setJieQiType(request.getJieQiType() != null ? request.getJieQiType() : 1); + setting.setWuXingJuType(request.getWuXingJuType() != null ? request.getWuXingJuType() : 0); + setting.setYearGanZhiType(request.getYearGanZhiType() != null ? request.getYearGanZhiType() : 2); + setting.setMonthGanZhiType(request.getMonthGanZhiType() != null ? request.getMonthGanZhiType() : 1); + setting.setDayGanZhiType(request.getDayGanZhiType() != null ? request.getDayGanZhiType() : 0); + + ZiWei ziWei = new ZiWei(setting); + + result.put("success", true); + result.put("data", buildZiWeiData(ziWei)); + } catch (Exception e) { + result.put("success", false); + result.put("error", e.getMessage()); + } + return result; + } + + private Map buildZiWeiData(ZiWei ziWei) { + Map data = new HashMap<>(); + + data.put("name", ziWei.getName()); + data.put("occupy", ziWei.getOccupy()); + data.put("sex", ziWei.getSex()); + data.put("age", ziWei.getAge()); + data.put("zao", ziWei.getZao()); + + data.put("solar", ziWei.getSolarStr2()); + data.put("lunar", ziWei.getLunarStr2()); + data.put("xingQi", ziWei.getXingQi()); + data.put("jiJie", ziWei.getJiJie()); + data.put("shengXiao", ziWei.getShengXiao()); + data.put("xingZuo", ziWei.getXingZuo()); + data.put("yueXiang", ziWei.getYueXiang()); + data.put("yueJiang", ziWei.getYueJiang()); + data.put("yueJiangShen", ziWei.getYueJiangShen()); + data.put("wuBuYuShi", ziWei.getWuBuYuShi()); + + data.put("yearGan", ziWei.getYearGan()); + data.put("monthGan", ziWei.getMonthGan()); + data.put("dayGan", ziWei.getDayGan()); + data.put("hourGan", ziWei.getHourGan()); + data.put("yearZhi", ziWei.getYearZhi()); + data.put("monthZhi", ziWei.getMonthZhi()); + data.put("dayZhi", ziWei.getDayZhi()); + data.put("hourZhi", ziWei.getHourZhi()); + + data.put("yearGanZhi", ziWei.getYearGanZhi()); + data.put("monthGanZhi", ziWei.getMonthGanZhi()); + data.put("dayGanZhi", ziWei.getDayGanZhi()); + data.put("hourGanZhi", ziWei.getHourGanZhi()); + + data.put("yearGanZhiNaYin", ziWei.getYearGanZhiNaYin()); + data.put("monthGanZhiNaYin", ziWei.getMonthGanZhiNaYin()); + data.put("dayGanZhiNaYin", ziWei.getDayGanZhiNaYin()); + data.put("hourGanZhiNaYin", ziWei.getHourGanZhiNaYin()); + + data.put("nanNvYinYang", ziWei.getNanNvYinYang()); + data.put("mingGongGongWei", ziWei.getMingGongGongWei()); + data.put("shenGongGongWei", ziWei.getShenGongGongWei()); + data.put("mingGongDiZhi", ziWei.getMingGongDiZhi()); + data.put("shenGongDiZhi", ziWei.getShenGongDiZhi()); + + data.put("wuXingJu", ziWei.getWuXingJu()); + + data.put("shiErGongDiZhi", ziWei.getShiErGongDiZhi()); + data.put("shiErGongTianGan", ziWei.getShiErGongTianGan()); + data.put("shiErMingGong", ziWei.getShiErMingGong()); + data.put("shiErShenGong", ziWei.getShiErShenGong()); + + data.put("ziWeiXingGongWei", ziWei.getZiWeiXingGongWei()); + data.put("tianFuXingGongWei", ziWei.getTianFuXingGongWei()); + data.put("ziWeiXingGongDiZhi", ziWei.getZiWeiXingGongDiZhi()); + data.put("tianFuXingGongDiZhi", ziWei.getTianFuXingGongDiZhi()); + + data.put("ziWeiXingXiZhuXing", ziWei.getZiWeiXingXiZhuXing()); + data.put("tianFuXingXiZhuXing", ziWei.getTianFuXingXiZhuXing()); + data.put("shiZhiZhuXing", ziWei.getShiZhiZhuXing()); + data.put("yueZhiZhuXing", ziWei.getYueZhiZhuXing()); + data.put("nianGanZhuXing", ziWei.getNianGanZhuXing()); + data.put("nianZhiZhuXing", ziWei.getNianZhiZhuXing()); + data.put("dayZhuXing", ziWei.getDayZhuXing()); + + data.put("shiErZhangSheng", ziWei.getShiErZhangSheng()); + data.put("jieLuKongWang", ziWei.getJieLuKongWang()); + data.put("xunZhongKongWang", ziWei.getXunZhongKongWang()); + data.put("tianShangTianShiXing", ziWei.getTianShangTianShiXing()); + + data.put("daXian", ziWei.getDaXian()); + data.put("xiaoXian", ziWei.getXiaoXian()); + data.put("shiErGongBoShi", ziWei.getShiErGongBoShi()); + data.put("liuNianSuiQianZhuXing", ziWei.getLiuNianSuiQianZhuXing()); + data.put("liuNianJiangQianZhuXing", ziWei.getLiuNianJiangQianZhuXing()); + + data.put("shiErGongZhuXing", ziWei.getShiErGongZhuXing(false)); + data.put("shiErGongZhuXingGuanXi", ziWei.getShiErGongZhuXingGuanXi()); + + data.put("huaLuXingGongWei", ziWei.getHuaLuXingGongWei()); + data.put("huaQuanXingGongWei", ziWei.getHuaQuanXingGongWei()); + data.put("huaKeXingGongWei", ziWei.getHuaKeXingGongWei()); + data.put("huaJiXingGongWei", ziWei.getHuaJiXingGongWei()); + + data.put("huaLuXingGongWeiJieDu", ziWei.getHuaLuXingGongWeiJieDu()); + data.put("huaQuanXingGongWeiJieDu", ziWei.getHuaQuanXingGongWeiJieDu()); + data.put("huaKeXingGongWeiJieDu", ziWei.getHuaKeXingGongWeiJieDu()); + data.put("huaJiXingGongWeiJieDu", ziWei.getHuaJiXingGongWeiJieDu()); + + data.put("shiErGongSiHuaXing", ziWei.getShiErGongSiHuaXing()); + data.put("shiErGongSiHuaXingGuanXi", ziWei.getShiErGongSiHuaXingGuanXi()); + + data.put("mingZhu", ziWei.getMingZhu()); + data.put("shenZhu", ziWei.getShenZhu()); + data.put("ziDou", ziWei.getZiDou()); + data.put("liuDou", ziWei.getLiuDou()); + + data.put("prevJie", ziWei.getPrevJie()); + data.put("nextJie", ziWei.getNextJie()); + data.put("chuShengJie", ziWei.getChuShengJie()); + data.put("prevQi", ziWei.getPrevQi()); + data.put("nextQi", ziWei.getNextQi()); + data.put("chuShengQi", ziWei.getChuShengQi()); + + return data; + } + + public static class ZiWeiRequest { + private String name; + private String occupy; + private Integer sex; + private String date; + private Integer dateType; + private Integer leapMonthType; + private Integer xuShiSuiType; + private Integer jieQiType; + private Integer wuXingJuType; + private Integer yearGanZhiType; + private Integer monthGanZhiType; + private Integer dayGanZhiType; + + public String getName() { return name; } + public void setName(String name) { this.name = name; } + public String getOccupy() { return occupy; } + public void setOccupy(String occupy) { this.occupy = occupy; } + public Integer getSex() { return sex; } + public void setSex(Integer sex) { this.sex = sex; } + public String getDate() { return date; } + public void setDate(String date) { this.date = date; } + public Integer getDateType() { return dateType; } + public void setDateType(Integer dateType) { this.dateType = dateType; } + public Integer getLeapMonthType() { return leapMonthType; } + public void setLeapMonthType(Integer leapMonthType) { this.leapMonthType = leapMonthType; } + public Integer getXuShiSuiType() { return xuShiSuiType; } + public void setXuShiSuiType(Integer xuShiSuiType) { this.xuShiSuiType = xuShiSuiType; } + public Integer getJieQiType() { return jieQiType; } + public void setJieQiType(Integer jieQiType) { this.jieQiType = jieQiType; } + public Integer getWuXingJuType() { return wuXingJuType; } + public void setWuXingJuType(Integer wuXingJuType) { this.wuXingJuType = wuXingJuType; } + public Integer getYearGanZhiType() { return yearGanZhiType; } + public void setYearGanZhiType(Integer yearGanZhiType) { this.yearGanZhiType = yearGanZhiType; } + public Integer getMonthGanZhiType() { return monthGanZhiType; } + public void setMonthGanZhiType(Integer monthGanZhiType) { this.monthGanZhiType = monthGanZhiType; } + public Integer getDayGanZhiType() { return dayGanZhiType; } + public void setDayGanZhiType(Integer dayGanZhiType) { this.dayGanZhiType = dayGanZhiType; } + } + +} diff --git a/xuan-deduct-uniapp/src/App.vue b/xuan-deduct-uniapp/src/App.vue index 2d4fab8..5aca8ed 100644 --- a/xuan-deduct-uniapp/src/App.vue +++ b/xuan-deduct-uniapp/src/App.vue @@ -10,7 +10,8 @@ export default { console.log('App Hide') }, globalData: { - baziResult: null + baziResult: null, + ziweiResult: null } } diff --git a/xuan-deduct-uniapp/src/pages.json b/xuan-deduct-uniapp/src/pages.json index 0527863..50e8175 100644 --- a/xuan-deduct-uniapp/src/pages.json +++ b/xuan-deduct-uniapp/src/pages.json @@ -61,7 +61,15 @@ "path": "pages/qimen/qimen", "style": { "navigationBarTitleText": "奇门遁甲排盘", - "navigationBarBackgroundColor": "#D97706", + "navigationBarBackgroundColor": "#6366F1", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/qimen/result", + "style": { + "navigationBarTitleText": "奇门遁甲命盘", + "navigationBarBackgroundColor": "#6366F1", "navigationBarTextStyle": "white" } }, @@ -85,7 +93,15 @@ "path": "pages/ziwei/ziwei", "style": { "navigationBarTitleText": "紫微斗数排盘", - "navigationBarBackgroundColor": "#DB2777", + "navigationBarBackgroundColor": "#7C3AED", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/ziwei/result", + "style": { + "navigationBarTitleText": "紫微命盘", + "navigationBarBackgroundColor": "#7C3AED", "navigationBarTextStyle": "white" } } diff --git a/xuan-deduct-uniapp/src/pages/qimen/qimen.vue b/xuan-deduct-uniapp/src/pages/qimen/qimen.vue index cc36eff..0c41f91 100644 --- a/xuan-deduct-uniapp/src/pages/qimen/qimen.vue +++ b/xuan-deduct-uniapp/src/pages/qimen/qimen.vue @@ -1,52 +1,435 @@ - diff --git a/xuan-deduct-uniapp/src/pages/qimen/result.vue b/xuan-deduct-uniapp/src/pages/qimen/result.vue new file mode 100644 index 0000000..0aa8a30 --- /dev/null +++ b/xuan-deduct-uniapp/src/pages/qimen/result.vue @@ -0,0 +1,541 @@ + + + + + diff --git a/xuan-deduct-uniapp/src/pages/ziwei/result.vue b/xuan-deduct-uniapp/src/pages/ziwei/result.vue new file mode 100644 index 0000000..ece1161 --- /dev/null +++ b/xuan-deduct-uniapp/src/pages/ziwei/result.vue @@ -0,0 +1,626 @@ + + + + + diff --git a/xuan-deduct-uniapp/src/pages/ziwei/ziwei.vue b/xuan-deduct-uniapp/src/pages/ziwei/ziwei.vue index 0fef7d5..43ed725 100644 --- a/xuan-deduct-uniapp/src/pages/ziwei/ziwei.vue +++ b/xuan-deduct-uniapp/src/pages/ziwei/ziwei.vue @@ -1,52 +1,369 @@ - diff --git a/xuan-deduct-uniapp/src/utils/api.js b/xuan-deduct-uniapp/src/utils/api.js index 7e353ef..85f8050 100644 --- a/xuan-deduct-uniapp/src/utils/api.js +++ b/xuan-deduct-uniapp/src/utils/api.js @@ -125,10 +125,34 @@ const qimenApi = { } } +const ziweiApi = { + paiPan: (data) => { + return request({ + url: '/ziwei/paipan', + method: 'POST', + data: { + name: data.name || '某人', + occupy: data.occupy || '某事', + sex: data.sex || 1, + date: data.date, + dateType: data.dateType || 0, + leapMonthType: data.leapMonthType || 0, + xuShiSuiType: data.xuShiSuiType || 0, + jieQiType: data.jieQiType || 1, + wuXingJuType: data.wuXingJuType || 0, + yearGanZhiType: data.yearGanZhiType || 2, + monthGanZhiType: data.monthGanZhiType || 1, + dayGanZhiType: data.dayGanZhiType || 0 + } + }) + } +} + export default { baziApi, liuyaoApi, daliurenApi, qimenApi, + ziweiApi, request }