Merge branch 'master' of ssh://dev.zhiheiot.com:29418/mob-components

Tevin

2022-08-26 4b774f04653a89513bc8f847920529c08507f564

 common/Tools.js

@@ -517,11 +517,28 @@
    }

    /**
     * 转换周数到日期
     * @param year
     * @param week
     * @param weekDay 需要输出星期几对应的日期 (1~7)
     * @return {Date}
     */
    static transWeekIndexToDate(year, week, weekDay) {
        const yearStart = moment([year, 0, 1]);
        const dayLong = 24 * 60 * 60 * 1000;
        const firstWeekLong = (7 - yearStart.day()) * dayLong;
        const weeksLong = (week - 1) * 7 * dayLong;
        const weekDayLong = weekDay * dayLong;
        const dayTimestamp = yearStart.valueOf() + firstWeekLong + weeksLong + weekDayLong;
        return moment(dayTimestamp).format('YYYY-MM-DD');
    }

    /**
     * 显示调试面板（仅支持H5）
     * @param cssSelector
     * @param callback
     */
    static showDevConsole(cssSelector, callback) {
    static $_showDevConsole(cssSelector, callback) {
        // 只支持 h5 编译
        if (process.env.TARO_ENV !== 'h5') {
            return;
@@ -575,4 +592,6 @@
        const px = (value - p1.x) * (p2.y - p1.y) / (p2.x - p1.x) + p1.y;
        console.info(Math.round(px) + 'px');
    };
}
}

global.Tools = Tools;