Authored by 李奇

Merge remote-tracking branch 'origin/master' into feature/coupons-expansion

@@ -185,7 +185,7 @@ function bind_qiniu_upload() { @@ -185,7 +185,7 @@ function bind_qiniu_upload() {
185 185
186 // why? reference: https://github.com/qiniu/js-sdk/issues/266 186 // why? reference: https://github.com/qiniu/js-sdk/issues/266
187 Promise.all([ 187 Promise.all([
188 - require('moxie/bin/js/moxie'), 188 + require('mOxie/bin/js/moxie'),
189 require('plupload/js/plupload.dev'), 189 require('plupload/js/plupload.dev'),
190 require('qiniu-js') 190 require('qiniu-js')
191 ]).then(([moxie, plupload]) => { 191 ]).then(([moxie, plupload]) => {