Authored by weiqingting

Merge branch 'feature/qrcode' into develop

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