Authored by weiqingting

Merge branch 'feature/qrcode' into develop

# Conflicts:
#	apps/home/models/QRcode.js
... ... @@ -12,11 +12,7 @@ exports.getQRcodeData = (id, uid) => {
return api.get('', {
method: 'app.SpaceOrders.getQrByOrderCode',
order_code: id,
// debug: 'XYZ',
uid: uid
}, {
cache: true
}).then(result => {
if (result && result.code === 200) {
return result.data;
... ...