init

README.md

-# wuxing
-计算生辰八字和五行的小程序
 
 
-![gh_2a8469b335b5_258](https://github.com/1091214370/wuxing/assets/17852999/9c3b3a45-7442-4f04-a30d-b2deb929e89f)
-
 

api.js

+var WxApiRoot = 'https://quanku.wanwudezhi.com/wx/xundao/';
+// var WxApiRoot = 'http://127.0.0.1:5555/wx/xundao/';
+
+module.exports = {
+    WuxingCalcUrl: WxApiRoot + 'wuxing/calc', //获取五行计算结果
+    WuxingRecommend: WxApiRoot + 'wuxing/get_wx_items', //获取五行推荐好物
+}
\ No newline at end of file

app.json

 {
-  "pages":[
+  "pages": [
     "pages/index/index",
-    "pages/wuxingres/index"
+    "pages/wuxingres/index",
+    "pages/recommend/index"
   ],
-  "window":{
-    "backgroundTextStyle":"light",
+  "window": {
+    "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "快捷计算",
-    "navigationBarTextStyle":"black"
+    "navigationBarTitleText": "巽岛",
+    "navigationBarTextStyle": "black",
+    "navigationStyle": "default"
   },
   "style": "v2",
   "sitemapLocation": "sitemap.json"

components/card/index.js

+Component({
+  properties: {
+    item: {
+      type: Object,
+      value: {}
+    }
+  },
+  methods: {
+    gotoHC(e) {
+      /**
+       * 跳到换藏去购买
+       */
+      wx.navigateToMiniProgram({
+        appId: 'wx5b4409448bf2c72b',
+        path: this.data.item.url, //要打开B小程序的页面
+        extraData: {}, //需要传递给目标小程序的数据，目标小程序可在 App.onLaunch，App.onShow 中获取到这份数据
+        envVersion: 'release', //打开的对应小程序环境：开发develop、体验trial、生产release
+        success(res) {
+          console.log('打开成功', res)
+        },
+        fail(err) {
+          console.log('失败', err)
+        }
+      })
+    }
+  }
+});
\ No newline at end of file

components/card/index.json

+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file

components/card/index.wxml

+<view class="item-c" bindtap="gotoHC">
+  <view class="item-img">
+     <image src="{{item.img}}" mode="scaleToFill" style="border-radius: 20rpx;"></image>
+  </view>
+  <view style="background-color: white; height: 80rpx;width: 100%; display: flex; flex-direction: column;">
+     <text style="font-size: small; margin-left: 10rpx;">{{item.name}}</text>
+	 <text style="font-size: small; margin-left: 10rpx; font-weight: bolder;">{{item.price}}</text>
+  </view>
+</view>
\ No newline at end of file

components/card/index.wxss

+.item-c {
+	display: flex;
+	/* justify-content: center; */
+	align-items: center;
+	margin-bottom: 20rpx;
+	/* left: -20rpx; */
+	flex-direction: column;
+  }
+
+.item-img {
+	/* background-size: cover; */
+	/* justify-content: center;
+	background-repeat: no-repeat;
+	width: 100%; */
+	/* height: 400rpx; */
+	width: 500rpx;
+	margin-bottom: -10rpx;
+}
\ No newline at end of file

components/fall/index.js

+/**
+ * 一个奇葩的瀑布流组件
+ * 组件暂时只支持双列流
+ */
+Component({
+  properties: {
+    // 整体宽度，单位rpx
+    containerWidth: {
+      type: Number,
+      value: 750
+    },
+    // 流间距
+    gapWidth: {
+      type: Number,
+      value: 10
+    },
+    // 数据
+    items: {
+      type: Array,
+      value: [],
+      observer: function (newVal, oldVal) {
+        this._readyData = this._readyData.concat(newVal.slice(oldVal.length, newVal.length));
+        // 仅在追加时或数据异步时执行这个render
+        if (oldVal.length > 0 || this._isReadyRender) {
+          this._render();
+        }
+      }
+    }
+  },
+
+  data: {
+    // 流数（当前只支持两条流）
+    fallNum: 2,
+    // 分流后数据
+    itemArray: []
+  },
+
+  created () {
+    // 待渲染数据
+    this._readyData = [];
+    // 当前激活流
+    this._activeFall = 0;
+  },
+
+  attached () {
+    /**
+     * 数据初始化
+     */
+    this.setData({
+      itemArray: Array(this.data.fallNum).fill().map(() => [])
+    });
+  },
+
+  ready () {
+    // 首次渲染数据
+    this._render();
+    // 主要用于处理异步数据
+    this._isReadyRender = true;
+    // 添加监听器（需要写在ready里，否则基础库2.7.1（含）以下不生效）
+    // https://developers.weixin.qq.com/community/develop/doc/000e20e79ecf789290399941a51000
+    this._addOberver();
+  },
+
+  detached () {
+    for (const o of this._obervers) {
+      o.disconnect();
+    }
+  },
+
+  methods: {
+    /**
+     * 添加触达监听
+     */
+    _addOberver () {
+      // 存储监听器
+      this._obervers = [];
+      // 首排标识
+      let flag = 1;
+
+      for (let i = 0; i < this.data.fallNum; i++) {
+        const o = this.createIntersectionObserver();
+        o.relativeTo('.f-detector').observe(`.f-l${i}`, res => {
+
+          // 判断渲染流
+          if (flag < this.data.fallNum) {
+            this._activeFall++;
+            this._render();
+            flag++;
+          } else if (res.intersectionRatio === 0) {
+            this._activeFall = i;
+            this._render();
+          } else {
+            this._activeFall = 0;
+          }
+
+        });
+        this._obervers.push(o)
+      }
+    },
+
+    /**
+     * 数据分流渲染
+     */
+    _render () {
+      if (this._readyData.length > 0) {
+        const i = this.data.itemArray[this._activeFall].length;
+        this.setData({
+          [`itemArray[${this._activeFall}][${i}]`]: this._readyData.shift()
+        }, () => {
+          // 超时处理
+          clearTimeout(this._renderTimeout);
+          this._renderTimeout = setTimeout(() => {
+            this._render();
+          }, 100);
+        });
+      }
+    }
+  }
+});

components/fall/index.json

+{
+  "component": true,
+  "usingComponents": {},
+  "componentGenerics": {
+    "card": true
+  }
+}
\ No newline at end of file

components/fall/index.wxml

+<!-- 瀑布流 -->
+<view class="f-container" style="width: {{containerWidth}}rpx;">
+  <!-- 瀑布流容器 -->
+  <view class="f-layout">
+    <!-- 单流容器 -->
+    <view 
+      wx:for="{{fallNum}}"
+      wx:key="index"
+      class="f-onefall f-l{{index}}"
+      style="margin-left: {{index && gapWidth}}rpx;">
+      <view 
+        wx:for="{{itemArray[index]}}"
+        wx:for-index="i"
+        wx:key="_{{index}}{{i}}">
+        <card item="{{item}}"></card>
+      </view>
+    </view>
+  </view>
+  <!-- 检测元素 -->
+  <view class="f-detector"></view>
+</view>
\ No newline at end of file

components/fall/index.wxss

+.f-container {
+	position: relative;
+	overflow: hidden;
+  }
+  
+  .f-layout {
+	overflow: hidden;
+	display: flex;
+	justify-content: space-between;
+	align-items: flex-start;
+  }
+  
+  .f-onefall {
+	flex: 1;
+	overflow: hidden;
+  }
+  
+  .f-detector {
+	height: 1rpx;
+	width: 100%;
+	position: absolute;
+	bottom: 0;
+	opacity: 0;
+	z-index: -1;
+  }
\ No newline at end of file

pages/index/index.js

@@ -2,7 +2,13 @@ import {formatTime} from '../../utils/util';
 
 const DATAH = [];
 for (let i = 0; i< 24; i++) {
-  DATAH.push({value: i, label: `${i}点`})
+  DATAH.push({value: i, label: `${i}时`})
+}
+
+const DATAR = []
+const RAW_PROVINCE = ["浙江","江苏","山东","安徽","福建","江西","河南","湖北","湖南","广东","广西","海南","四川","贵州","云南","重庆","上海","北京","天津","河北","山西","内蒙古","辽宁","吉林","黑龙江","西藏","青海","陕西","甘肃","新疆","宁夏","台湾"]
+for (let i = 0; i< RAW_PROVINCE.length; i++) {
+  DATAR.push({value: i, label: RAW_PROVINCE[i]})
 }
 Page({
   data: {
@@ -10,29 +16,31 @@ Page({
     valueH: '0',
     res: {},
     dataH: DATAH,
+    dataR: DATAR,
+    dataRP: RAW_PROVINCE
   },
 
   onLoad() {
-    this.echart =this.selectComponent('#mychart');
+    // this.echart =this.selectComponent('#mychart');
     // 在页面中定义插屏广告
-let interstitialAd = null
+// let interstitialAd = null
 
-// 在页面onLoad回调事件中创建插屏广告实例
-if (wx.createInterstitialAd) {
-  interstitialAd = wx.createInterstitialAd({
-    adUnitId: 'adunit-a4fab2c7a6cb6510'
-  })
-  interstitialAd.onLoad(() => {})
-  interstitialAd.onError((err) => {})
-  interstitialAd.onClose(() => {})
-}
+// // 在页面onLoad回调事件中创建插屏广告实例
+// if (wx.createInterstitialAd) {
+//   interstitialAd = wx.createInterstitialAd({
+//     adUnitId: 'adunit-a4fab2c7a6cb6510'
+//   })
+//   interstitialAd.onLoad(() => {})
+//   interstitialAd.onError((err) => {})
+//   interstitialAd.onClose(() => {})
+// }
 
-// 在适合的场景显示插屏广告
-if (interstitialAd) {
-  interstitialAd.show().catch((err) => {
-    console.error(err)
-  })
-}
+// // 在适合的场景显示插屏广告
+// if (interstitialAd) {
+//   interstitialAd.show().catch((err) => {
+//     console.error(err)
+//   })
+// }
   },
 
   handleDate(e) {
@@ -45,10 +53,15 @@ if (interstitialAd) {
       valueH: e.detail.value,
     })
   },
+  handleRegion(e) {
+    this.setData({
+      valueR: e.detail.value,
+    })
+  },
   handleScle() {
-    const { valueDate, valueH } = this.data;
+    const { valueDate, valueH, valueR, dataRP} = this.data;
     wx.redirectTo({
-      url: `/pages/wuxingres/index?valueDate=${valueDate}&valueH=${valueH}&flag=1`,
+      url: `/pages/wuxingres/index?valueDate=${valueDate}&valueH=${valueH}&valueR=${dataRP[valueR]}&flag=1`,
     })
   },
 })

pages/index/index.wxml

 <view class="page">
   <view class="header">
-    <view class="title">选择日期时间计算</view>
+    <view class="title">选择出生时间</view>
   </view>
   <view class="center">
     <view>
@@ -12,12 +12,17 @@
       <date-picker />
       <picker bindchange="handleHour" range-key="label" value="{{valueH}}" range="{{dataH}}">
         <view class="form-item">
-          选择时间：{{valueH}}点
+          选择时间：{{valueH}}时
+        </view>
+      </picker>
+      <picker bindchange="handleRegion" range-key="label" value="{{valueR}}" range="{{dataR}}">
+        <view class="form-item">
+          选择出生省：{{dataRP[valueR]}}
         </view>
       </picker>
     </view>
   </view>
-  <button type="primary" class="button" bind:tap="handleScle">计算</button>
+  <button type="primary" class="button" bind:tap="handleScle">测一测</button>
   <view style="position: absolute; bottom: 0;width: 100%;">
     <ad unit-id="adunit-3c035a6664e81e3b" ad-type="video" ad-theme="white"></ad>
   </view>

pages/recommend/index.js

+const api = require('../../api.js');
+const util = require('../../utils/util.js')
+
+Page({
+  data: {
+    isEnd: false,
+    items: [],
+    need_wx: "",
+  },
+
+  _id: 0,
+
+  onLoad (options) {
+    this.setData({
+      need_wx:options.need_wx
+    })
+    this._render();
+  },
+
+  onReachBottom () {
+    // this._render();
+  },
+
+  _render () {
+
+    if (this.data.isEnd) {
+      return;
+    }
+
+    wx.showLoading({
+      title: '数据加载中'
+    });
+
+    this._getItems().then(({isEnd, data}) => {
+      wx.hideLoading();
+      // 优化数据的添加
+      let items = this.data.items;
+      let index = items.length++;
+      let newObj = {};
+      data.forEach(item => {
+        newObj[`items[${index++}]`] = item;
+      });
+      if (isEnd) newObj.isEnd = isEnd;
+      this.setData(newObj);
+    });
+  },
+
+  getWxItems() {
+    let that = this;
+    util.request(api.WuxingRecommend, {
+      need_wx:this.data.need_wx 
+    }).then(function(res) {
+      if (res.code === 1001) {
+        that.setData({
+           items:res.data.items
+        });
+      }
+    });
+  },
+
+  /**
+   * 模拟获取数据
+   */
+  _getItems () {
+    let data = [];
+    this.getWxItems();
+    let dataLen = this.data.items.length
+    for (let i = 0; i < dataLen; i++) {
+      data.push({
+        name: items[i].name,
+        img: items[i].img,
+        price: items[i].price,
+        url: items[i].url
+      });
+    }
+    return new Promise (resolve => {
+      setTimeout(() => {
+        resolve({
+          isEnd: true,
+          data
+        });
+      }, 250);
+    });
+  }
+});

pages/recommend/index.json

+{
+  "onReachBottomDistance": 100,
+  "usingComponents": {
+    "fall": "../../components/fall",
+    "card": "../../components/card"
+  }
+}
\ No newline at end of file

pages/recommend/index.wxml

+<view class="fall-box">
+  <view style="text-align: center;margin-bottom: 10rpx;background-color: burlywood;">
+     <text style="color: white;font-weight: bolder; font-size: x-large;" >增补{{need_wx}}的好物</text>
+  </view>
+  <fall 
+    items="{{items}}" 
+    container-width="690" 
+    gap-width="20"
+    generic:card="card"></fall>
+  <view wx:if="{{isEnd}}" class="no-more">没有更多了~</view>
+</view>
\ No newline at end of file

pages/recommend/index.wxss

+.fall-box {
+	background: #eee;
+	padding: 30rpx;
+  }
+  
+  .no-more {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-size: 24rpx;
+	color: #8799a3;
+	margin-top: 20rpx;
+	margin-bottom: 50rpx;
+  }

pages/wuxingres/index.js

-import calendarFormatter from '../../utils/calendarFormatter';
 import * as echarts from '../../components/ec-canvas/echarts';
+const api = require('../../api.js');
+const util = require('../../utils/util.js')
 
 const G = ["甲","乙","丙","丁","戊","己","庚","辛","壬","癸"]
 const Z = ["子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"]
@@ -19,17 +20,16 @@ Page({
   data: {
     valueDate: undefined,
     valueH: undefined,
+    valueR: undefined,
     flag: false,
     pengyouquan: false,
     res: {},
     dataH: DATAH,
-    wuxing: {
-      jin: 0,
-      mu: 0,
-      shui: 0,
-      huo: 0,
-      tu: 0,
-    },
+    bazi:{},
+    loc_wx:"",
+    bz_wx:{},
+    now_wx:{},
+    stat_wx:{},
     ec: {
       lazyLoad: true,
     },
@@ -45,16 +45,21 @@ Page({
       'rgb(98,92,51)',
       'rgb(179,214,110)',
     ],
+    xtWxChart: undefined,
+    slWxChart: undefined,
+    statWxChart: undefined,
+    lunarInfo: {},
+    recommend: "",
+    need_wx:"",
   },
 
   onLoad(e) {
-    const { valueDate, valueH, flag, pengyouquan } = e;
-    this.setData({valueDate, valueH, flag: flag === '1', pengyouquan: pengyouquan === '1' });
+    const { valueDate, valueH, valueR, flag, pengyouquan } = e;
+    this.setData({valueDate, valueH, valueR, flag: flag === '1', pengyouquan: pengyouquan === '1' });
+    this.calcWuXing();
   },
 
   onShow(){
-    this.echart =this.selectComponent('#mychart');
-    this.handleScle();
   },
 
   onShareAppMessage() {
@@ -71,67 +76,73 @@ Page({
       promise 
     }
   },
+
+
+  calcWuXing() {
+    let that = this;
+    util.request(api.WuxingCalcUrl, {
+      born_time: that.data.valueDate + "-" + that.data.valueH,
+      province: that.data.valueR,
+    }).then(function(res) {
+      if (res.code === 1001) {
+        that.setData({
+           bazi : res.data.bazi,
+           loc_wx : res.data.loc_wx,
+           bz_wx : res.data.bz_wx,
+           now_wx : res.data.now_wx,
+           stat_wx : res.data.stat_wx,
+           lunarInfo : res.data.lunarInfo,
+           recommend : res.data.recommend.join("\n"),
+           need_wx:res.data.need_wx,
+        });
+        // that.setData({
+        //   goodsList: that.data.goodsList.concat(res.data.goodsList),
+        //   totalPages: res.data.totalPages
+        // });
+        that.xtWxChart = that.selectComponent('#xtWxChart');
+        that.slWxChart = that.selectComponent('#slWxChart');
+        that.statWxChart = that.selectComponent('#statWxChart');
+        // that.handleXtScle();
+        // that.handleSlScle();
+        that.handleStatScle();
+      }
+    });
+  },
   onShareTimeline() {
-    const { valueDate, valueH } = this.data;
+    const { valueDate, valueH, valueR } = this.data;
     return {
       title: '我的八字与五行分布',
-      query: `valueDate=${valueDate}&valueH=${valueH}&pengyouquan=1`,
+      query: `valueDate=${valueDate}&valueH=${valueH}&valueR=${valueR}&pengyouquan=1`,
     }
   },
   
-  handleScle() {
-    const { valueDate, valueH } = this.data;
-    const temp = valueDate.split('-');
-    const v = calendarFormatter.solar2lunar(temp[0],temp[1],temp[2]);
-    const d = v.gzDay[0];
-    const i =  G.indexOf(d);
-    const r = i > 4 ? i - 5 : i;
-    const h = Math.floor((Number(valueH) + 1) / 2);
-    v.gzHour = SGZ[r][h > 0 && h < 12 ? h : 0];
-    const wuxing = this.getWuxing(v);
-    this.initChart(wuxing);
-    this.setData({
-      res: v,
-      wuxing,
-    });
+  handleXtScle() {
+    this.initChart(this.data.bz_wx, this.xtWxChart);
   },
-  getWuxing(v) {
-    const wuxing = [...`${v.gzYear}${v.gzMonth}${v.gzDay}${v.gzHour}`];
-    const res = {
-      jin: 0,
-      mu: 0,
-      shui: 0,
-      huo: 0,
-      tu: 0,
-    };
-    wuxing.forEach(i => {
-      switch (true) {
-        case '庚辛申酉'.indexOf(i) > -1:
-          res.jin += 1;
-          break;
-        case '甲乙寅卯'.indexOf(i) > -1:
-          res.mu += 1;
-          break;
-        case '壬癸亥子'.indexOf(i) > -1:
-          res.shui += 1;
-          break;
-        case '丙丁巳午'.indexOf(i) > -1:
-          res.huo += 1;
-          break;
-        case '戊己辰戌丑未'.indexOf(i) > -1:
-          res.tu += 1;
-          break;
-      }
-    });
-    return res;
+  handleSlScle() {
+    this.initChart(this.data.now_wx, this.slWxChart);
+  },
+  handleStatScle() {
+    this.initChart(this.data.stat_wx, this.statWxChart);
   },
   goback() {
     wx.redirectTo({
       url: '/pages/index/index',
     })
   },
+  tobuychuan() {
+    wx.navigateTo({
+      url: `/pages/recommend/index?need_wx=`+this.data.need_wx,
+    })
+  },
+  // 如果数据是0，那么补0.01用来让图片展示
+  ifZeroThenFill:function(data) {
+      if (data < 0.01) return 0.01
+      return data
+  },
   /**设置图表映射 */
-  initChart: function(wuxing) {
+  initChart: function(wuxing, chart) {
+    console.log(wuxing)
     const option = {
       series: [
         {
@@ -144,17 +155,17 @@ Page({
             borderRadius: 5
           },
           data: [
-            { value: wuxing.jin, name: '金' },
-            { value: wuxing.mu, name: '木' },
-            { value: wuxing.shui, name: '水' },
-            { value: wuxing.huo, name: '火' },
-            { value: wuxing.tu, name: '土' },
+            { value: this.ifZeroThenFill(wuxing['金']), name: '金' },
+            { value: this.ifZeroThenFill(wuxing['木']), name: '木' },
+            { value: this.ifZeroThenFill(wuxing['水']), name: '水' },
+            { value: this.ifZeroThenFill(wuxing['火']), name: '火' },
+            { value: this.ifZeroThenFill(wuxing['土']), name: '土' },
           ]
         }
       ]
     };
     //echarts会继承父元素的宽高,所以我们一定要设置echarts组件父元素的高度。
-    this.echart.init((canvas) => {
+    chart.init((canvas) => {
       const chart = echarts.init(canvas, null, {
         width: 400,
         height: 400,

pages/wuxingres/index.wxml

 <view class="page">
   <view class="header">
-    <view class="title">计算结果</view>
+    <view class="title" style="background-color: gold;">五行态势</view>
   </view>
   <view class="result" >
     <view class="flex-box nongli">
-    公历日期: {{valueDate}} | 时间：{{valueH || '--'}} 点
+    农历日期: {{lunarInfo.year}}{{lunarInfo.animal}}年 {{lunarInfo.month}} {{lunarInfo.day}}
+    </view>
+    <view class="flex-box">
+      <view class="res-title">出生地五行：</view>
+    <view class="flex-content">
+      <view style="background-color: {{allColors[4]}};">{{loc_wx}}</view>
     </view>
-    <view class="flex-box nongli">
-    农历日期: {{res.gzYear}}{{res.Animal}}年 {{res.IMonthCn}} {{res.IDayCn}}
     </view>
     <view class="flex-box">
     <view class="res-title">四柱：</view>
     <view class="flex-content">
-      <view style="background-color: {{allColors[4]}};">{{res.gzYear}}</view>
-      <view style="background-color: {{allColors[1]}};">{{res.gzMonth}}</view>
-      <view style="background-color: {{allColors[2]}};">{{res.gzDay}}</view>
-      <view style="background-color: {{allColors[3]}};">{{res.gzHour}}</view>
+      <view style="background-color: {{allColors[4]}};">{{bazi[0]}}</view>
+      <view style="background-color: {{allColors[1]}};">{{bazi[1]}}</view>
+      <view style="background-color: {{allColors[2]}};">{{bazi[2]}}</view>
+      <view style="background-color: {{allColors[3]}};">{{bazi[3]}}</view>
+    </view>
+    </view>
+    <view class="flex-box">
+    <view class="res-title">先天：  </view>
+    <view class="flex-content wx">
+      <view style="background-color: rgb(179, 63, 56);">金 {{bz_wx['金']}}</view>
+      <view style="background-color: rgb(53,70,83);">木 {{bz_wx['木']}}</view>
+      <view style="background-color: rgb(110,158,165);">水 {{bz_wx['水']}}</view>
+      <view style="background-color: rgb(201,134,108);">火 {{bz_wx['火']}}</view>
+      <view style="background-color: rgb(155,195,174);">土 {{bz_wx['土']}}</view>
     </view>
     </view>
+    <!-- <view class="echart">
+      <ec-canvas id="xtWxChart" canvas-id="xtWxChart" ec="{{ ec }}"></ec-canvas>
+    </view> -->
     <view class="flex-box">
-    <view class="res-title">五行：</view>
+    <view class="res-title">天时：  </view>
     <view class="flex-content wx">
-      <view style="background-color: rgb(179, 63, 56);">金：{{wuxing.jin}}</view>
-      <view style="background-color: rgb(53,70,83);">木：{{wuxing.mu}}</view>
-      <view style="background-color: rgb(110,158,165);">水：{{wuxing.shui}}</view>
-      <view style="background-color: rgb(201,134,108);">火：{{wuxing.huo}}</view>
-      <view style="background-color: rgb(155,195,174);">土：{{wuxing.tu}}</view>
+      <view style="background-color: rgb(179, 63, 56);">金 {{now_wx['金']}}</view>
+      <view style="background-color: rgb(53,70,83);">木 {{now_wx['木']}}</view>
+      <view style="background-color: rgb(110,158,165);">水 {{now_wx['水']}}</view>
+      <view style="background-color: rgb(201,134,108);">火 {{now_wx['火']}}</view>
+      <view style="background-color: rgb(155,195,174);">土 {{now_wx['土']}}</view>
     </view>
   </view>
+  <view class="flex-box">
+    <view class="res-title">五行强弱：</view>
+    <view class="flex-content wx">
+      <view style="background-color: rgb(179, 63, 56);">金{{stat_wx['金']}}</view>
+      <view style="background-color: rgb(53,70,83);">木{{stat_wx['木']}}</view>
+      <view style="background-color: rgb(110,158,165);">水{{stat_wx['水']}}</view>
+      <view style="background-color: rgb(201,134,108);">火{{stat_wx['火']}}</view>
+      <view style="background-color: rgb(155,195,174);">土{{stat_wx['土']}}</view>
+    </view>
+  </view>
+    <!-- <view class="echart">
+      <ec-canvas id="slWxChart" canvas-id="slWxChart" ec="{{ ec }}"></ec-canvas>
+    </view> -->
     <view class="echart">
-      <ec-canvas id="mychart" canvas-id="mychart" ec="{{ ec }}"></ec-canvas>
+      <ec-canvas id="statWxChart" canvas-id="statWxChart" ec="{{ ec }}"></ec-canvas>
     </view>
-    <view class="btns">    
-      <button wx:if="{{res.gzYear && flag}}" type="primary" open-type="share" class="button">分享给好友</button>
-      <button wx:if="{{res.gzYear && !pengyouquan}}" type="default" class="button" bind:tap="goback">{{ flag ? '重新计算' : '我也算算'}}</button>
-      <button wx:else type="default" class="button" bind:tap="goback">我也算算</button>
+    <view class="flex-box">
+    <view class="res-title">本月建议：</view>
+    <view class="text-box" scroll-y="true" scroll-top="999" style="border: orangered;border-style: solid;border-width: 1px;">
+        <text style="color: orange; font-size: smaller; margin: 100rpx; margin-top: 30rpx;">{{recommend}}</text>
+        <button wx:if="{{lunarInfo.year && flag}}" type="primary" open-type="default" class="button" bind:tap="tobuychuan" style="width:250rpx; font-size:small;margin-bottom: 10rpx; margin-top: 30rpx;">五行增强好物</button>
       </view>
   </view>
-  <view style="width: 100%;">
-    <ad unit-id="adunit-5d509a2d2926ec2a"></ad>
+    <view class="btns">    
+      <button wx:if="{{lunarInfo.year && flag}}" type="default" open-type="share" class="button" style="font-size: x-small;width: 200rpx;">分享给好友</button>
+      <button wx:if="{{lunarInfo.year && !pengyouquan}}" type="default" class="button" bind:tap="goback" style="font-size: x-small; width: min-content; color: black;">{{ flag ? '重新测测' : '我也测测'}}</button>
+      <button wx:else type="default" class="button" bind:tap="goback">我也测测</button>
+    </view>
     </view>
-
 </view>
\ No newline at end of file

pages/wuxingres/index.wxss

@@ -28,8 +28,6 @@
 }
 
 .button {
-  width: 100%;
-  margin: 32rpx 0;
   z-index: 8;
 }
 

project.config.json

@@ -48,5 +48,5 @@
     "ignore": [],
     "include": []
   },
-  "appid": "wxd04889271323534c"
+  "appid": "wxaa17d598e8e075ba"
 }
\ No newline at end of file

project.private.config.json

 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "wuxing",
+  "projectname": "xundao",
   "setting": {
-    "compileHotReLoad": true
+    "compileHotReLoad": true,
+    "urlCheck": false
   }
 }
\ No newline at end of file

sitemap.json

 {
-  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "desc":"巽岛-有风岛",
   "rules": [{
   "action": "allow",
   "page": "*"

utils/calendarFormatter.js

-/**
-* @1900-2100区间内的公历、农历互转
-* @charset UTF-8
-* @Author  jiangjiazhi
-* @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0]
-* @农历转公历：calendar.lunar2solar(1987,09,10); //[you can ignore params of prefix 0]
-*/
- 
- 
- 
-/**
-* 农历1900-2100的润大小信息表
-* @Array Of Property
-* @return Hex
-*/
- 
-var 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
-
-  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
-
- 
-
-var solarMonth = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
-
- 
-
-/**
-* 天干地支之天干速查表
-* @Array Of Property trans['甲','乙','丙','丁','戊','己','庚','辛','壬','癸']
-* @return Cn string
-*/
-
-var Gan = ['\u7532', '\u4e59', '\u4e19', '\u4e01', '\u620a', '\u5df1', '\u5e9a', '\u8f9b', '\u58ec', '\u7678']
-
- 
-
-/**
-* 天干地支之地支速查表
-* @Array Of Property
-* @trans['子','丑','寅','卯','辰','巳','午','未','申','酉','戌','亥']
-* @return Cn string
-*/
-
-var Zhi = ['\u5b50', '\u4e11', '\u5bc5', '\u536f', '\u8fb0', '\u5df3', '\u5348', '\u672a', '\u7533', '\u9149', '\u620c', '\u4ea5']
-
- 
-
-/**
-* 天干地支之地支速查表<=>生肖
-* @Array Of Property
-* @trans['鼠','牛','虎','兔','龙','蛇','马','羊','猴','鸡','狗','猪']
-* @return Cn string
-*/
-
-var Animals = ['\u9f20', '\u725b', '\u864e', '\u5154', '\u9f99', '\u86c7', '\u9a6c', '\u7f8a', '\u7334', '\u9e21', '\u72d7', '\u732a']
-
- 
-
-/**
-* 24节气速查表
-* @Array Of Property
-* @trans['小寒','大寒','立春','雨水','惊蛰','春分','清明','谷雨','立夏','小满','芒种','夏至','小暑','大暑','立秋','处暑','白露','秋分','寒露','霜降','立冬','小雪','大雪','冬至']
-* @return Cn string
-*/
-
-var 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
-*/
-
-var 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
- */
-
-var nStr1 = ['\u65e5', '\u4e00', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341']
-
- 
-
-/**
-* 日期转农历称呼速查表
-* @Array Of Property
-* @trans ['初','十','廿','卅']
-* @return Cn string
-*/
-
-var nStr2 = ['\u521d', '\u5341', '\u5eff', '\u5345']
-
- 
-
-/**
-* 月份转农历称呼速查表
-* @Array Of Property
-* @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊']
-* @return Cn string
-*/
-
-var 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
-*/
-
-function lYearDays (y) {
-  var i
-
-  var sum = 348
-
-  for (i = 0x8000; i > 0x8; i >>= 1) { sum += (lunarInfo[y - 1900] & i) ? 1 : 0 }
-
-  return (sum + leapDays(y))
-
-}
-
- 
-
-/**
-* 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
-* @param lunar Year
-* @return Number (0-12)
- * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
-*/
-
-function leapMonth (y) { // 闰字编码 \u95f0
-
-  return (lunarInfo[y - 1900] & 0xf)
-
-}
-
- 
-
-/**
-* 返回农历y年闰月的天数 若该年没有闰月则返回0
-* @param lunar Year
-* @return Number (0、29、30)
-* @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
-*/
-
-function leapDays (y) {
-  if (leapMonth(y)) {
-    return ((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
-*/
-
-function monthDays (y, m) {
-  if (m > 12 || m < 1) { return -1 }// 月份参数从1至12，参数错误返回-1
-
-  return ((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
-*/
-
-function solarDays (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 (solarMonth[ms])
-
-  }
-
-}
-
- 
-
-/**
-* 农历年份转换为干支纪年
-* @param  lYear 农历年的年份数
-* @return Cn string
-*/
-
-function toGanZhiYear (lYear) {
-  var ganKey = (lYear - 3) % 10
-
-  var zhiKey = (lYear - 3) % 12
-
-  if (ganKey === 0) ganKey = 10 // 如果余数为0则为最后一个天干
-
-  if (zhiKey === 0) zhiKey = 12 // 如果余数为0则为最后一个地支
-
-  return Gan[ganKey - 1] + Zhi[zhiKey - 1]
-
-}
-
- 
-
-/**
-* 公历月、日判断所属星座
-* @param  cMonth [description]
-* @param  cDay [description]
-* @return Cn string
-*/
-
-function toAstro (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
-*/
-
-function toGanZhi (offset) {
-  return Gan[offset % 10] + 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日立春
-*/
-
-function getTerm (y, n) {
-  if (y < 1900 || y > 2100) { return -1 }
-
-  if (n < 1 || n > 24) { return -1 }
-
-  var _table = 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='腊月'
-*/
-
-function toChinaMonth (m) { // 月 => \u6708
-
-  if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
-
-  var s = nStr3[m - 1]
-
-  s += '\u6708' // 加上月字
-
-  return s
-
-}
-
- 
-
-/**
-* 传入农历日期数字返回汉字表示法
-* @param lunar day
-* @return Cn string
-* @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
-*/
-
-function toChinaDay (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 = nStr2[Math.floor(d / 10)]
-
-      s += nStr1[d % 10]
-
-  }
-
-  return (s)
-
-}
-
- 
-
-/**
-* 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
-* @param y year
-* @return Cn string
-* @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
-*/
-
-function getAnimal (y) {
-  return 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));
-*/
-
-function solar2lunar (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
-
-  }
-
-  // 未传参  获得当天
-
-  var objDate = null
-
-  if (!y) {
-    objDate = new Date()
-
-  } else {
-    objDate = new Date(y, parseInt(m) - 1, d)
-
-  }
-
-  var i
-
-  var leap = 0
-
-  var temp = 0
-
-  // 修正ymd参数
-
-  y = objDate.getFullYear()
-
-  m = objDate.getMonth() + 1
-
-  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 = 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 = nStr1[nWeek]
-
-  // 数字表示周几顺应天朝周一开始的惯例
-
-  if (nWeek === 0) {
-    nWeek = 7
-
-  }
-
-  // 农历年
-
-  var year = i
-
-  leap = 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 = leapDays(year) // 计算农历闰月天数
-
-    } else {
-      temp = 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 = toGanZhiYear(year)
-
- 
-
-  // 当月的两个节气
-
-  // bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
-
-  var firstNode = getTerm(y, (m * 2 - 1)) // 返回当月「节」为几日开始
-
-  var secondNode = getTerm(y, (m * 2)) // 返回当月「节」为几日开始
-
- 
-
-  // 依据12节气修正干支月
-
-  var gzM = toGanZhi((y - 1900) * 12 + m + 11)
-
-  if (d >= firstNode) {
-    gzM = toGanZhi((y - 1900) * 12 + m + 12)
-
-  }
-
-  // 传入的日期的节气与否
-
-  var isTerm = false
-
-  var Term = null
-
-  if (firstNode === d) {
-    isTerm = true
-
-    Term = solarTerm[m * 2 - 2]
-
-  }
-
-  if (secondNode === d) {
-    isTerm = true
-
-    Term = solarTerm[m * 2 - 1]
-
-  }
-
-  // 日柱 当月一日与 1900/1/1 相差天数
-
-  var dayCyclical = Date.UTC(y, sm, 1, 0, 0, 0, 0) / 86400000 + 25567 + 10
-
-  var gzD = toGanZhi(dayCyclical + d - 1)
-
-  // 该日期所属的星座
-
-  var astro = toAstro(m, d)
-
-  return {'lYear': year, 'lMonth': month, 'lDay': day, 'Animal': getAnimal(year), 'IMonthCn': (isLeap ? '\u95f0' : '') + toChinaMonth(month), 'IDayCn': 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}
-
-}
-
- 
-
-
-  var calendarFormatter = {
-    // 传入阳历年月日获得详细的公历、农历object信息 <=>JSON
-
-    solar2lunar:function(y, m, d){ // 参数区间1900.1.31~2100.12.31
-
-      return solar2lunar(y, m, d)
-
-    },
-
-    /**
-    * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历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
-
-      isLeapMonth = !!isLeapMonth
-
-      if (isLeapMonth && (leapMonth !== m)) { return -1 }// 传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
-
-      if (y === 2100 && m === 12 && d > 1 || y === 1900 && m === 1 && d < 31) { return -1 } // 超出了最大极限值
-
-      var day = monthDays(y, m)
-
-      var _day = day
-
-      // bugFix 2016-9-25
-
-      // if month is leap, _day use leapDays method
-
-      if (isLeapMonth) {
-        _day = leapDays(y, m)
-
-      }
-
-      if (y < 1900 || y > 2100 || d > _day) { return -1 }// 参数合法性效验
-
- 
-
-      // 计算农历的时间差
-
-      var offset = 0
-
-      for (var i = 1900; i < y; i++) {
-        offset += lYearDays(i)
-
-      }
-
-      var leap = 0
-
-      var isAdd = false
-
-      for (i = 1; i < m; i++) {
-        leap = leapMonth(y)
-
-        if (!isAdd) { // 处理闰月
-
-          if (leap <= i && leap > 0) {
-            offset += leapDays(y); isAdd = true
-
-          }
-
-        }
-
-        offset += 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 solar2lunar(cY, cM, cD)
-
-    }
-
-  }
-
-export default calendarFormatter
\ No newline at end of file

utils/util.js

@@ -9,11 +9,56 @@ const formatTime = date => {
   return `${[year, month, day].map(formatNumber).join('-')}`
 }
 
+/**
+ * 封封微信的的request
+ */
+function request(url, data = {}, method = "GET") {
+  return new Promise(function(resolve, reject) {
+    wx.request({
+      url: url,
+      data: data,
+      method: method,
+      header: {
+        'Content-Type': 'application/json',
+        'X-Dts-Token': wx.getStorageSync('token')
+      },
+      success: function(res) {
+
+        if (res.statusCode == 200) {
+
+          if (res.data.errno == 501) {
+            // 清除登录相关内容
+            try {
+              wx.removeStorageSync('userInfo');
+              wx.removeStorageSync('token');
+            } catch (e) {
+              // Do something when catch error
+            }
+            // 切换到登录页面
+            wx.navigateTo({
+              url: '/pages/auth/login/login'
+            });
+          } else {
+            resolve(res.data);
+          }
+        } else {
+          reject(res.errMsg);
+        }
+
+      },
+      fail: function(err) {
+        reject(err)
+      }
+    })
+  });
+}
+
 const formatNumber = n => {
   n = n.toString()
   return n[1] ? n : `0${n}`
 }
 
 module.exports = {
-  formatTime
+  formatTime,
+  request
 }