Commit ba439aa7 authored by linlinjava's avatar linlinjava
Browse files

Merge branch 'dev' of https://github.com/linlinjava/litemall into dev

parents c13ccea8 69de3b54
...@@ -4,6 +4,17 @@ var user = require('./utils/user.js'); ...@@ -4,6 +4,17 @@ var user = require('./utils/user.js');
App({ App({
onLaunch: function() { onLaunch: function() {
Promise.prototype.finally = function(callback){
let P = this.constructor;
return this.then(
value => {
P.resolve(callback()).then(() => value)
},
reason => {
P.resolve(callback()).then(() => { throw reason })
}
)
}
const updateManager = wx.getUpdateManager(); const updateManager = wx.getUpdateManager();
wx.getUpdateManager().onUpdateReady(function() { wx.getUpdateManager().onUpdateReady(function() {
wx.showModal({ wx.showModal({
......
...@@ -4,7 +4,20 @@ var user = require('./utils/user.js'); ...@@ -4,7 +4,20 @@ var user = require('./utils/user.js');
App({ App({
onLaunch: function() { onLaunch: function() {
Promise.prototype.finally = function(callback){
let P = this.constructor;
return this.then(
value => {
P.resolve(callback()).then(() => value)
},
reason => {
P.resolve(callback()).then(() => { throw reason })
}
)
}
const updateManager = wx.getUpdateManager(); const updateManager = wx.getUpdateManager();
wx.getUpdateManager().onUpdateReady(function() { wx.getUpdateManager().onUpdateReady(function() {
wx.showModal({ wx.showModal({
title: '更新提示', title: '更新提示',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment