diff --git a/.eslintrc.js b/.eslintrc.js index 254100e..8bfe8a3 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -36,6 +36,7 @@ module.exports = { "allow": ["log", "warn", "error", "info"] // "allow" 是个字符串数组,包含允许使用的console 对象的方法 } ], + "no-debugger": "off", //禁止空格和 tab 的混合缩进 "no-mixed-spaces-and-tabs": [ "error", "smart-tabs" diff --git a/project.config.json b/project.config.json index 039b7e4..f61efa7 100644 --- a/project.config.json +++ b/project.config.json @@ -17,6 +17,7 @@ "checkInvalidKey": true, "checkSiteMap": true, "uploadWithSourceMap": true, + "compileHotReLoad": false, "babelSetting": { "ignore": [], "disablePlugins": [], @@ -24,8 +25,7 @@ }, "useIsolateContext": true, "useCompilerModule": false, - "userConfirmedUseCompilerModuleSwitch": false, - "compileHotReLoad": false + "userConfirmedUseCompilerModuleSwitch": false }, "compileType": "miniprogram", "libVersion": "2.8.2", @@ -59,7 +59,7 @@ "list": [] }, "miniprogram": { - "current": 0, + "current": -1, "list": [ { "id": 0, @@ -82,32 +82,11 @@ "query": "scene=gridLeader", "scene": 1011 }, - { - "id": 3, - "name": "pages/index/index", - "pathName": "pages/index/index", - "query": "", - "scene": null - }, - { - "id": 4, - "name": "pages/indexNew/indexNew", - "pathName": "pages/indexNew/indexNew", - "query": "", - "scene": null - }, - { - "id": -1, - "name": "完善信息", - "pathName": "pages/complete/complete", - "query": "", - "scene": null - }, { "id": -1, - "name": "subpages/associationNew/pages/eventlist/eventlist", - "pathName": "subpages/associationNew/pages/eventlist/eventlist", - "query": "partyGroupId=4048a5a044a047d9a3dc135a0d756eee&topicType=1", + "name": "subpages/home/pages/newsDetail/newsDetail", + "pathName": "subpages/home/pages/newsDetail/newsDetail", + "query": "id=7c8bc749ff4b6380bf1d902c0bde0ba1", "scene": null } ] diff --git a/subpages/home/pages/newsDetail/newsDetail.js b/subpages/home/pages/newsDetail/newsDetail.js index 282fe26..a114cb8 100644 --- a/subpages/home/pages/newsDetail/newsDetail.js +++ b/subpages/home/pages/newsDetail/newsDetail.js @@ -196,7 +196,7 @@ Page({ }, 1000) }, // 加积分 - browsePoints (){ + browsePoints () { let that = this const para = { newsId: that.data.detailId diff --git a/utils/eventBus.js b/utils/eventBus.js new file mode 100644 index 0000000..d61b162 --- /dev/null +++ b/utils/eventBus.js @@ -0,0 +1,54 @@ +/** + * EventBus 全局事件总线 + * on(msgName, func) 订阅消息 msgName订阅的事件名称 func 事件回调 + * once(msgName, func) 仅订阅一次消息 后订阅的会替换前面订阅的消息 + * emit(msgName,data) 发布消息 msgName消息名称 data-数据 + * off(msgName) 移除消息 + */ +class EventBus { + + constructor () { + this.msgQueues = {} + } + + // 将消息 绑定到 消息队列中 + on (msgName, func) { + if (this.msgQueues[msgName]) { + if (typeof this.msgQueues[msgName] === "function") { + this.msgQueues[msgName] = [this.msgQueues[msgName], func] + } else { + this.msgQueues[msgName] = [...this.msgQueues[msgName], func] + } + } else { + this.msgQueues[msgName] = func; + } + } + + // 消息队列中仅保存一个消息 + once (msgName, func) { + this.msgQueues[msgName] = func + } + + // 发送消息 + emit (msgName, data = "") { + if (!this.msgQueues[msgName]) { + return + } + if (typeof this.msgQueues[msgName] === "function") { + this.msgQueues[msgName](data) + } else { + this.msgQueues[msgName].forEach(fn => fn(data)) + } + } + + // 移除消息 + off (msgName) { + if (!this.msgQueues[msgName]) { + return + } + delete this.msgQueues[msgName] + } + +} + +export default new EventBus() \ No newline at end of file diff --git a/utils/filter.wxs b/utils/filter.wxs index 9a6513f..b377d7f 100644 --- a/utils/filter.wxs +++ b/utils/filter.wxs @@ -1,28 +1,28 @@ var formatTime = function (strDate, format = "yyyy-MM-dd hh:mm:ss") { - // 解决ios出现NaN问题 - var realDate = strDate ? getDate(strDate.replace(getRegExp('-', 'g'), '/')) : getDate(); - var regYear = getRegExp("(y+)", "i"); - var date = [ - ["M+", realDate.getMonth() + 1], - ["d+", realDate.getDate()], - ["h+", realDate.getHours()], - ["m+", realDate.getMinutes()], - ["s+", realDate.getSeconds()], - ["q+", Math.floor((realDate.getMonth() + 3) / 3)], - ["S+", realDate.getMilliseconds()], - ]; - var reg1 = regYear.exec(format); - if (reg1) { - format = format.replace(reg1[1], (realDate.getFullYear() + '').substring(4 - reg1[1].length)); + // 解决ios出现NaN问题 + var realDate = strDate ? getDate(strDate.replace(getRegExp("-", "g"), "/")) : getDate(); + var regYear = getRegExp("(y+)", "i"); + var date = [ + ["M+", realDate.getMonth() + 1], + ["d+", realDate.getDate()], + ["h+", realDate.getHours()], + ["m+", realDate.getMinutes()], + ["s+", realDate.getSeconds()], + ["q+", Math.floor((realDate.getMonth() + 3) / 3)], + ["S+", realDate.getMilliseconds()], + ]; + var reg1 = regYear.exec(format); + if (reg1) { + format = format.replace(reg1[1], (realDate.getFullYear() + "").substring(4 - reg1[1].length)); + } + for (var i = 0; i < date.length; i++) { + var reg2 = getRegExp("(" + date[i][0] + ")").exec(format); + if (reg2) { + format = format.replace(reg2[1], reg2[1].length == 1 ? v : ("00" + date[i][1]).substring(("" + date[i][1]).length)); } - for (var i = 0; i < date.length; i++) { - var reg2 = getRegExp("(" + date[i][0] + ")").exec(format); - if (reg2) { - format = format.replace(reg2[1], reg2[1].length == 1 ? v : ("00" + date[i][1]).substring(("" + date[i][1]).length)); - } - } - return format; + } + return format; } module.exports = { - formatTime: formatTime,//日期格式化 + formatTime: formatTime,//日期格式化 } \ No newline at end of file